status-im
/
nim-ethers
mirror of https://github.com/status-im/nim-ethers.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

wrap try/finally around populateTransaction logic to ensure the lock is always released in the case of an error

This commit is contained in:
Eric 2023-10-26 10:17:08 +11:00 committed by markspanbroek
parent 2428b756d6
commit 16b28f4535
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethers/signer.nim
View File

@ -103,6 +103,7 @@ method populateTransaction*(signer: Signer,
var populated = transaction var populated = transaction
try:
if transaction.sender.isNone: if transaction.sender.isNone:
populated.sender = some(await signer.getAddress()) populated.sender = some(await signer.getAddress())
if transaction.chainId.isNone: if transaction.chainId.isNone:
@ -122,8 +123,6 @@ method populateTransaction*(signer: Signer,
let e = getCurrentException() let e = getCurrentException()
signer.decreaseNonce() signer.decreaseNonce()
raise e raise e
finally:
signer.populateLock.release()
else: else:
if transaction.nonce.isNone: if transaction.nonce.isNone:
@ -131,6 +130,9 @@ method populateTransaction*(signer: Signer,
if transaction.gasLimit.isNone: if transaction.gasLimit.isNone:
populated.gasLimit = some(await signer.estimateGas(populated)) populated.gasLimit = some(await signer.estimateGas(populated))
finally:
signer.populateLock.release()
return populated return populated
method cancelTransaction*( method cancelTransaction*(