Added senderAddress and receiverAddress along with the transactionDetails API
This commit is contained in:
parent
e4dd64f7a1
commit
2686bb70fc
@ -70,11 +70,9 @@ def blockdetailhelper(blockdetail):
|
|||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
|
|
||||||
if blockHash:
|
if blockHash:
|
||||||
c.execute(
|
c.execute(f"select jsonData from latestBlocks where blockHash='{blockHash}'")
|
||||||
f"select jsonData from latestBlocks where blockHash='{blockHash}'")
|
|
||||||
elif blockHeight:
|
elif blockHeight:
|
||||||
c.execute(
|
c.execute(f"select jsonData from latestBlocks where blockNumber='{blockHeight}'")
|
||||||
f"select jsonData from latestBlocks where blockNumber='{blockHeight}'")
|
|
||||||
|
|
||||||
blockJson = c.fetchall()
|
blockJson = c.fetchall()
|
||||||
return blockJson
|
return blockJson
|
||||||
@ -175,6 +173,15 @@ def fetchContractStatus(contractName, contractAddress):
|
|||||||
else:
|
else:
|
||||||
return status[0][0]
|
return status[0][0]
|
||||||
|
|
||||||
|
def extract_ip_op_addresses(transactionJson):
|
||||||
|
sender_address = transactionJson['vin'][0]['addr']
|
||||||
|
receiver_address = None
|
||||||
|
for utxo in transactionJson['vout']:
|
||||||
|
if utxo['scriptPubKey']['addresses'][0] == sender_address:
|
||||||
|
continue
|
||||||
|
receiver_address = utxo['scriptPubKey']['addresses'][0]
|
||||||
|
return sender_address, receiver_address
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
async def welcome_msg():
|
async def welcome_msg():
|
||||||
@ -1717,6 +1724,7 @@ async def transactiondetails1(transactionHash):
|
|||||||
parseResult = json.loads(transactionJsonData[0][1])
|
parseResult = json.loads(transactionJsonData[0][1])
|
||||||
operation = transactionJsonData[0][2]
|
operation = transactionJsonData[0][2]
|
||||||
db_reference = transactionJsonData[0][3]
|
db_reference = transactionJsonData[0][3]
|
||||||
|
sender_address, receiver_address = extract_ip_op_addresses(transactionJson)
|
||||||
|
|
||||||
operationDetails = {}
|
operationDetails = {}
|
||||||
|
|
||||||
@ -1782,7 +1790,7 @@ async def transactiondetails1(transactionHash):
|
|||||||
if winningAmount[0][0] is not None:
|
if winningAmount[0][0] is not None:
|
||||||
operationDetails['winningAmount'] = winningAmount[0][0]
|
operationDetails['winningAmount'] = winningAmount[0][0]
|
||||||
|
|
||||||
return jsonify(parsedFloData=parseResult, transactionDetails=transactionJson, transactionHash=transactionHash, operation=operation, operationDetails=operationDetails), 200
|
return jsonify(parsedFloData=parseResult, transactionDetails=transactionJson, transactionHash=transactionHash, operation=operation, operationDetails=operationDetails, senderAddress=sender_address, receiverAddress=receiver_address), 200
|
||||||
else:
|
else:
|
||||||
return jsonify(description='Transaction doesn\'t exist in database'), 404
|
return jsonify(description='Transaction doesn\'t exist in database'), 404
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user