waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add timeout to tx receipt query

This commit is contained in:
Sergei Tikhomirov 2024-12-20 12:04:01 +01:00
parent 4c57cbca5e
commit e9df168f50
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
waku/incentivization/txid_proof.nim
View File

@ -3,6 +3,7 @@ import std/options, chronos, web3, stew/byteutils, stint, results, chronicles
import waku/incentivization/rpc import waku/incentivization/rpc
const SimpleTransferGasUsed = Quantity(21000) const SimpleTransferGasUsed = Quantity(21000)
const TxReceiptQueryTimeout = 3.seconds
proc getTransactionByHash( proc getTransactionByHash(
txHash: TxHash, web3: Web3 txHash: TxHash, web3: Web3
@ -11,17 +12,25 @@ proc getTransactionByHash(
proc getMinedTransactionReceipt( proc getMinedTransactionReceipt(
txHash: TxHash, web3: Web3 txHash: TxHash, web3: Web3
): Future[ReceiptObject] {.async.} = ): Future[Result[ReceiptObject, string]] {.async.} =
await web3.getMinedTransactionReceipt(txHash) let txReceipt = web3.getMinedTransactionReceipt(txHash)
if (await txReceipt.withTimeout(TxReceiptQueryTimeout)):
return ok(txReceipt.value())
else:
return err("Timeout on tx receipt query")
proc getTxAndTxReceipt( proc getTxAndTxReceipt(
txHash: TxHash, web3: Web3 txHash: TxHash, web3: Web3
): Future[(TransactionObject, ReceiptObject)] {.async.} = ): Future[Result[(TransactionObject, ReceiptObject), string]] {.async.} =
# get tx
let txFuture = getTransactionByHash(txHash, web3) let txFuture = getTransactionByHash(txHash, web3)
let receiptFuture = getMinedTransactionReceipt(txHash, web3)
let tx = await txFuture let tx = await txFuture
# get tx receipt
let receiptFuture = getMinedTransactionReceipt(txHash, web3)
let txReceipt = await receiptFuture let txReceipt = await receiptFuture
return (tx, txReceipt) if txReceipt.isErr:
return err("Cannot get tx receipt")
return ok((tx, txReceipt.value()))
proc isEligibleTxId*( proc isEligibleTxId*(
eligibilityProof: EligibilityProof, eligibilityProof: EligibilityProof,
@ -33,7 +42,7 @@ proc isEligibleTxId*(
## in the context of service incentivization PoC, ## in the context of service incentivization PoC,
## if it is confirmed and pays the expected amount to the server's address. ## if it is confirmed and pays the expected amount to the server's address.
## See spec: https://github.com/waku-org/specs/blob/master/standards/core/incentivization.md ## See spec: https://github.com/waku-org/specs/blob/master/standards/core/incentivization.md
if eligibilityProof.proofOfPayment.isNone(): if eligibilityProof.proofOfPayment.isNone:
return err("Eligibility proof is empty") return err("Eligibility proof is empty")
var web3: Web3 var web3: Web3
try: try:
@ -46,12 +55,10 @@ proc isEligibleTxId*(
var tx: TransactionObject var tx: TransactionObject
var txReceipt: ReceiptObject var txReceipt: ReceiptObject
let txHash = TxHash.fromHex(byteutils.toHex(eligibilityProof.proofOfPayment.get())) let txHash = TxHash.fromHex(byteutils.toHex(eligibilityProof.proofOfPayment.get()))
try: let txAndTxReceipt = await getTxAndTxReceipt(txHash, web3)
(tx, txReceipt) = await getTxAndTxReceipt(txHash, web3) txAndTxReceipt.isOkOr:
except ValueError: return err("Failed to fetch tx or tx receipt")
let errorMsg = "Failed to fetch tx or tx receipt: " & getCurrentExceptionMsg() (tx, txReceipt) = txAndTxReceipt.value()
error "exception in isEligibleTxId", error = $errorMsg
return err($errorMsg)
# check that it is not a contract creation tx # check that it is not a contract creation tx
let toAddressOption = txReceipt.to let toAddressOption = txReceipt.to
if toAddressOption.isNone: if toAddressOption.isNone: