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

Move WalletError into its own module

This commit is contained in:
Mark Spanbroek 2023-07-04 10:40:22 +02:00 committed by markspanbroek
parent c89701016a
commit f1a1221d14
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ethers/wallet.nim
View File

@ -5,8 +5,10 @@ import eth/common/transaction as ct
import ./provider import ./provider
import ./transaction as tx import ./transaction as tx
import ./signer import ./signer
import ./wallet/error
export keys export keys
export WalletError
var rng {.threadvar.}: ref HmacDrbgContext var rng {.threadvar.}: ref HmacDrbgContext
@ -17,7 +19,6 @@ proc getRng: ref HmacDrbgContext =
type SignableTransaction = common.Transaction type SignableTransaction = common.Transaction
type WalletError* = object of EthersError
type Wallet* = ref object of Signer type Wallet* = ref object of Signer
privateKey*: PrivateKey privateKey*: PrivateKey
publicKey*: PublicKey publicKey*: PublicKey
@ -51,7 +52,7 @@ proc createRandom*(_: type Wallet, provider: Provider): Wallet =
method provider*(wallet: Wallet): Provider = method provider*(wallet: Wallet): Provider =
without provider =? wallet.provider: without provider =? wallet.provider:
raise newException(WalletError, "Wallet has no provider") raiseWalletError "Wallet has no provider"
provider provider
method getAddress(wallet: Wallet): Future[Address] {.async.} = method getAddress(wallet: Wallet): Future[Address] {.async.} =
@ -77,14 +78,14 @@ proc signTransaction(tr: var SignableTransaction, pk: PrivateKey) =
of TxEip1559: of TxEip1559:
tr.V = int64(v) tr.V = int64(v)
else: else:
raise newException(WalletError, "Transaction type not supported") raiseWalletError "Transaction type not supported"
proc signTransaction*(wallet: Wallet, tx: tx.Transaction): Future[seq[byte]] {.async.} = proc signTransaction*(wallet: Wallet, tx: tx.Transaction): Future[seq[byte]] {.async.} =
if sender =? tx.sender and sender != wallet.address: if sender =? tx.sender and sender != wallet.address:
raise newException(WalletError, "from address mismatch") raiseWalletError "from address mismatch"
without nonce =? tx.nonce and chainId =? tx.chainId and gasLimit =? tx.gasLimit: without nonce =? tx.nonce and chainId =? tx.chainId and gasLimit =? tx.gasLimit:
raise newException(WalletError, "Transaction is properly populated") raiseWalletError "Transaction is not properly populated"
var s: SignableTransaction var s: SignableTransaction
@ -96,7 +97,7 @@ proc signTransaction*(wallet: Wallet, tx: tx.Transaction): Future[seq[byte]] {.a
s.txType = TxLegacy s.txType = TxLegacy
s.gasPrice = GasInt(gasPrice.truncate(uint64)) s.gasPrice = GasInt(gasPrice.truncate(uint64))
else: else:
raise newException(WalletError, "Transaction is properly populated") raiseWalletError "Transaction is not properly populated"
s.chainId = ChainId(chainId.truncate(uint64)) s.chainId = ChainId(chainId.truncate(uint64))
s.gasLimit = GasInt(gasLimit.truncate(uint64)) s.gasLimit = GasInt(gasLimit.truncate(uint64))

7
ethers/wallet/error.nim Normal file
View File

@ -0,0 +1,7 @@
import ../basics
type
WalletError* = object of EthersError
func raiseWalletError*(message: string) =
raise newException(WalletError, message)