RanchiMall/ranchimallflo-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to accomodate blockbook transaciton format

Browse Source
This commit is contained in:
RanchiMall Dev 2023-08-30 18:29:37 +00:00
parent 48a39f377a
commit b1c3851564
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ranchimallflo_api.py
View File

@ -231,7 +231,7 @@ def fetchContractStatus(contractName, contractAddress):
return status[0][0] return status[0][0]
def extract_ip_op_addresses(transactionJson): def extract_ip_op_addresses(transactionJson):
sender_address = transactionJson['vin'][0]['addr'] sender_address = transactionJson['vin'][0]['addresses'][0]
receiver_address = None receiver_address = None
for utxo in transactionJson['vout']: for utxo in transactionJson['vout']:
if utxo['scriptPubKey']['addresses'][0] == sender_address: if utxo['scriptPubKey']['addresses'][0] == sender_address:
@ -2119,7 +2119,6 @@ async def smartcontracttransactions():
if contractName is None: if contractName is None:
return jsonify(description='Smart Contract\'s name hasn\'t been passed'), 400 return jsonify(description='Smart Contract\'s name hasn\'t been passed'), 400
contractName = contractName.strip().lower() contractName = contractName.strip().lower()
contractAddress = request.args.get('contractAddress') contractAddress = request.args.get('contractAddress')
if contractAddress is None: if contractAddress is None:
return jsonify(description='Smart Contract\'s address hasn\'t been passed'), 400 return jsonify(description='Smart Contract\'s address hasn\'t been passed'), 400
@ -2366,10 +2365,10 @@ async def blocktransactions(blockHash):
blockJson = blockdetailhelper(blockHash) blockJson = blockdetailhelper(blockHash)
if len(blockJson) != 0: if len(blockJson) != 0:
blockJson = json.loads(blockJson[0][0]) blockJson = json.loads(blockJson[0][0])
blocktxlist = blockJson['tx'] blocktxlist = blockJson['txs']
blocktxs = {} blocktxs = []
for i in range(len(blocktxlist)): for i in range(len(blocktxlist)):
temptx = transactiondetailhelper(blocktxlist[i]) temptx = transactiondetailhelper(blocktxlist[i]['txid'])
transactionJson = json.loads(temptx[0][0]) transactionJson = json.loads(temptx[0][0])
parseResult = json.loads(temptx[0][1]) parseResult = json.loads(temptx[0][1])
# blocktxs[blocktxlist[i]] = { # blocktxs[blocktxlist[i]] = {
@ -2377,7 +2376,7 @@ async def blocktransactions(blockHash):
# "transactionDetails" : transactionJson # "transactionDetails" : transactionJson
# } # }
blocktxs = {**parseResult , **transactionJson} blocktxs.append({**parseResult , **transactionJson})
# TODO (CRITICAL): Write conditions to include and filter on chain and offchain transactions # TODO (CRITICAL): Write conditions to include and filter on chain and offchain transactions
blocktxs['onChain'] = True blocktxs['onChain'] = True
return jsonify(transactions=blocktxs, blockKeyword=blockHash), 200 return jsonify(transactions=blocktxs, blockKeyword=blockHash), 200