fix(nonce): indentation mistake after last merge (#92)

* fix an indentation mistake after last merge

* add assertion to ensure nonce is not populated

* assert populated nonce is populated, not transaction
This commit is contained in:
Eric 2024-11-02 02:49:06 +11:00 committed by GitHub
parent 80b2ead97c
commit 0ce6abf0fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -119,18 +119,18 @@ method populateTransaction*(
if transaction.gasPrice.isNone and (transaction.maxFee.isNone or transaction.maxPriorityFee.isNone):
populated.gasPrice = some(await signer.getGasPrice())
if transaction.nonce.isNone and transaction.gasLimit.isNone:
# when both nonce and gasLimit are not populated, we must ensure getNonce is
# followed by an estimateGas so we can determine if there was an error. If
# there is an error, the nonce must be decreased to prevent nonce gaps and
# stuck transactions
populated.nonce = some(await signer.getNonce())
try:
populated.gasLimit = some(await signer.estimateGas(populated, BlockTag.pending))
except EstimateGasError as e:
raise e
except ProviderError as e:
raiseSignerError(e.msg)
if transaction.nonce.isNone and transaction.gasLimit.isNone:
# when both nonce and gasLimit are not populated, we must ensure getNonce is
# followed by an estimateGas so we can determine if there was an error. If
# there is an error, the nonce must be decreased to prevent nonce gaps and
# stuck transactions
populated.nonce = some(await signer.getNonce())
try:
populated.gasLimit = some(await signer.estimateGas(populated, BlockTag.pending))
except EstimateGasError as e:
raise e
except ProviderError as e:
raiseSignerError(e.msg)
else:
if transaction.nonce.isNone:
@ -139,6 +139,8 @@ method populateTransaction*(
if transaction.gasLimit.isNone:
populated.gasLimit = some(await signer.estimateGas(populated, BlockTag.pending))
doAssert populated.nonce.isSome, "nonce not populated!"
return populated
method cancelTransaction*(