diff --git a/ethers/contract.nim b/ethers/contract.nim index 20704ac..c590313 100644 --- a/ethers/contract.nim +++ b/ethers/contract.nim @@ -3,13 +3,11 @@ import std/macros import std/sequtils import pkg/chronos import pkg/contractabi -import pkg/stew/byteutils import ./basics import ./provider import ./signer import ./events import ./fields -import ./exceptions export basics export provider diff --git a/ethers/exceptions.nim b/ethers/exceptions.nim deleted file mode 100644 index b7f3b72..0000000 --- a/ethers/exceptions.nim +++ /dev/null @@ -1,7 +0,0 @@ -import ./basics - -func msgStack*(error: ref EthersError): string = - var msg = error.msg - if not error.parent.isNil: - msg &= " -- Parent exception: " & error.parent.msg - return msg diff --git a/ethers/providers/jsonrpc.nim b/ethers/providers/jsonrpc.nim index 315ae2e..505944d 100644 --- a/ethers/providers/jsonrpc.nim +++ b/ethers/providers/jsonrpc.nim @@ -3,7 +3,6 @@ import std/tables import std/uri import pkg/json_rpc/rpcclient import pkg/json_rpc/errors -import pkg/stew/byteutils import ../basics import ../provider import ../signer diff --git a/ethers/signer.nim b/ethers/signer.nim index 301d66e..021f329 100644 --- a/ethers/signer.nim +++ b/ethers/signer.nim @@ -1,12 +1,7 @@ import ./basics import ./provider -import pkg/chronicles export basics -export chronicles - -logScope: - topics = "ethers signer" type Signer* = ref object of RootObj @@ -107,9 +102,9 @@ method populateTransaction*(signer: Signer, var populated = transaction - if populated.sender.isNone: + if transaction.sender.isNone: populated.sender = some(await signer.getAddress()) - if populated.chainId.isNone: + if transaction.chainId.isNone: populated.chainId = some(await signer.getChainId()) if transaction.gasPrice.isNone and (transaction.maxFee.isNone or transaction.maxPriorityFee.isNone): populated.gasPrice = some(await signer.getGasPrice())