Skip to content

Avoid shell for bitcoin-cli calls #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Asylian21 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid shell for bitcoin-cli calls #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions scripts/vicariousbitcoin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
from os.path import exists
from urllib3.exceptions import InsecureRequestWarning
import json
import os
import random
import re
import requests
import shlex
import shutil
import subprocess
import time
import vicariousnetwork
Expand All @@ -21,9 +24,19 @@ def loadJSONData(dataFile=None, default={}):
return j

def binaryExists(binName):
cmd = f"which {binName} | wc -l"
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
return int(cmdoutput) > 0
return shutil.which(binName) is not None

def getBitcoinCLICommand(*args):
cliargs = []
if isinstance(bitcoinCLIOptions, str) and len(bitcoinCLIOptions.strip()) > 0:
cliargs = [
os.path.expanduser(os.path.expandvars(arg))
for arg in shlex.split(bitcoinCLIOptions)
]
return ["bitcoin-cli"] + cliargs + [str(arg) for arg in args]

def runBitcoinCLI(*args, stderr=None):
return subprocess.check_output(getBitcoinCLICommand(*args), stderr=stderr).decode("utf-8")

# ------ Bitcoin Core Related ------------------------------------------------------

Expand Down Expand Up @@ -124,9 +137,8 @@ def getblock(blocknum, verbosity=1):
if prunedBlockHeight > blocknum:
print(f"Call to getblock for blocknum {blocknum} below pruned height {prunedBlockHeight}")
else:
cmd = f"bitcoin-cli {bitcoinCLIOptions} getblock {blockhash} {verbosity}"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("getblock", blockhash, verbosity)
j = json.loads(cmdoutput)
except subprocess.CalledProcessError as e:
print(e)
Expand Down Expand Up @@ -155,9 +167,8 @@ def getblockchaininfo():
if j is not None and "result" in j:
j = j["result"]
if bitcoinMode == "CLI" and isBitcoinAvailable():
cmd = f"bitcoin-cli {bitcoinCLIOptions} getblockchaininfo"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("getblockchaininfo")
j = json.loads(cmdoutput)
except subprocess.CalledProcessError as e:
print(e)
Expand Down Expand Up @@ -186,9 +197,8 @@ def getblockhash(blocknum=1):
if prunedBlockHeight > blocknum:
print(f"Call to getblockhash for blocknum {blocknum} below pruned height {prunedBlockHeight}")
else:
cmd = f"bitcoin-cli {bitcoinCLIOptions} getblockhash {blocknum}"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("getblockhash", blocknum)
j = cmdoutput
except subprocess.CalledProcessError as e:
print(e)
Expand Down Expand Up @@ -347,9 +357,8 @@ def getblockstats(blocknum):
if prunedBlockHeight > blocknum:
print(f"Call to getblock for blocknum {blocknum} below pruned height {prunedBlockHeight}")
else:
cmd = f"bitcoin-cli {bitcoinCLIOptions} getblockstats {blocknum}"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("getblockstats", blocknum)
j = json.loads(cmdoutput)
except subprocess.CalledProcessError as e:
print(e)
Expand Down Expand Up @@ -427,9 +436,8 @@ def getestimatesmartfee(targetblocks=1):
if bitcoinMode == "CLI" and isBitcoinAvailable():
if prunedBlockHeight is None:
setPrunedBlockHeight()
cmd = f"bitcoin-cli {bitcoinCLIOptions} estimatesmartfee {targetblocks}"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("estimatesmartfee", targetblocks)
j = json.loads(cmdoutput)
except subprocess.CalledProcessError as e:
print(e)
Expand Down Expand Up @@ -472,9 +480,8 @@ def getmempool():
if j is not None and "result" in j:
j = j["result"]
if bitcoinMode == "CLI" and isBitcoinAvailable():
cmd = "bitcoin-cli " + bitcoinCLIOptions + " getrawmempool"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdoutput = runBitcoinCLI("getrawmempool")
j = json.loads(cmdoutput)
except subprocess.CalledProcessError as e:
print(e)
Expand All @@ -500,9 +507,11 @@ def gettransaction(txid, blockhash=""):
if j is not None and "result" in j:
j = j["result"]
if bitcoinMode == "CLI" and isBitcoinAvailable():
cmd = f"bitcoin-cli {bitcoinCLIOptions} getrawtransaction {txid} true {blockhash} 2>&1"
try:
cmdoutput = subprocess.check_output(cmd, shell=True).decode("utf-8")
cmdargs = ["getrawtransaction", txid, "true"]
if len(blockhash) > 0:
cmdargs.append(blockhash)
cmdoutput = runBitcoinCLI(*cmdargs, stderr=subprocess.STDOUT)
j = json.loads(cmdoutput)
return j
except subprocess.CalledProcessError as e:
Expand Down