logos-storage/nim-ethers
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-ethers.git synced 2026-01-24 16:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch EstimateGasError before ProviderError

Browse Source 
EstimateGasError is now a ProviderError (it is a SignerError, and SignerError is a ProviderError), so EstimateGasErrors were not being caught
This commit is contained in:
Eric 2024-01-30 17:41:25 +11:00
parent 1172b7e56a
commit 873124ccf7
No known key found for this signature in database
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ethers/signer.nim
View File

@ -128,8 +128,11 @@ method populateTransaction*(
transaction: Transaction): Future[Transaction]
{.base, async: (raises: [CancelledError, AsyncLockError, SignerError]).} =
echo "[signer.populatetransaction] signer type: ", typeof signer
if sender =? transaction.`from` and sender != await signer.getAddress():
var address: Address
convertError:
address = await signer.getAddress()
if sender =? transaction.`from` and sender != address:
raiseSignerError("from address mismatch")
if chainId =? transaction.chainId and chainId != await signer.getChainId():
raiseSignerError("chain id mismatch")
@ -143,7 +146,7 @@ method populateTransaction*(
try:
if transaction.`from`.isNone:
populated.`from` = some(await signer.getAddress())
populated.`from` = some(address)
if transaction.chainId.isNone:
populated.chainId = some(await signer.getChainId())
if transaction.gasPrice.isNone and (transaction.maxFee.isNone or transaction.maxPriorityFee.isNone):
@ -157,12 +160,12 @@ method populateTransaction*(
populated.nonce = some(await signer.getNonce())
try:
populated.gasLimit = some(await signer.estimateGas(populated))
except ProviderError as e:
signer.decreaseNonce()
raiseSignerError(e.msg)
except EstimateGasError as e:
signer.decreaseNonce()
raise e
except ProviderError as e:
signer.decreaseNonce()
raiseSignerError(e.msg)
else:
if transaction.nonce.isNone: