Upgrade to `nim-json-rpc` v0.4.2 and chronos v4 (#64)
* Add json de/serialization lib from codex to handle conversions
json-rpc now requires nim-json-serialization to convert types to/from json. Use the nim-json-serialization signatures to call the json serialization lib from nim-codex (should be moved to its own lib)
* Add ethers implementation for setMethodHandler
Was removed in json-rpc
* More json conversion updates
* Fix json_rpc.call returning JsonString instead of JsonNode
* Update exceptions
Use {.async: (raises: [...].} where needed
Annotate provider with {.push raises:[].}
Format signatures
* Start fixing tests (mainly conversion fixes)
* rename sender to `from`, update json error logging, add more conversions
* Refactor exceptions for providers and signers, fix more tests
- signer procs raise SignerError, provider procs raise ProviderError
- WalletError now inherits from SignerError
- move wallet module under signers
- create jsonrpo moudle under signers
- bump nim-json-rpc for null-handling fixes
- All jsonrpc provider tests passing, still need to fix others
* remove raises from async annotation for dynamic dispatch
- removes async: raises from getAddress and signTransaction because derived JsonRpcSigner methods were not being used when dynamically dispatched. Once `raises` was removed from the async annotation, the dynamic dispatch worked again. This is only the case for getAddress and signTransaction.
- add gcsafe annotation to wallet.provider so that it matches the base method
* Catch EstimateGasError before ProviderError
EstimateGasError is now a ProviderError (it is a SignerError, and SignerError is a ProviderError), so EstimateGasErrors were not being caught
* clean up - all tests passing
* support nim 2.0
* lock in chronos version
* Add serde options to the json util, along with tests
next step is to:
1. change back any ethers var names that were changed for serialization purposes, eg `from` and `type`
2. move the json util to its own lib
* bump json-rpc to 0.4.0 and fix test
* fix: specify raises for getAddress and sendTransaction
Fixes issue where getAddress and sendTransaction could not be found for MockSigner in tests. The problem was that the async: raises update had not been applied to the MockSigner.
* handle exceptions during jsonrpc init
There are too many exceptions to catch individually, including chronos raising CatchableError exceptions in await expansion. There are also many other errors captured inside of the new proc with CatchableError. Instead of making it more complicated and harder to read, I think sticking with excepting CatchableError inside of convertError is a sensible solution
* cleanup
* deserialize key defaults to serialize key
* Add more tests for OptIn/OptOut/Strict modes, fix logic
* use nim-serde instead of json util
Allows aliasing of de/serialized fields, so revert changes of sender to `from` and transactionType to `type`
* Move hash* shim to its own module
* address PR feedback
- add comments to hashes shim
- remove .catch from callback condition
- derive SignerError from EthersError instead of ProviderError. This allows Providers and Signers to be separate, as Ledger does it, to isolate functionality. Some signer functions now raise both ProviderError and SignerError
- Update reverts to check for SignerError
- Update ERC-20 method comment
* rename subscriptions.init > subscriptions.start
2024-02-19 05:50:46 +00:00
|
|
|
import eth/keys
|
|
|
|
|
import ../basics
|
|
|
|
|
import ../provider
|
|
|
|
|
import ../transaction
|
|
|
|
|
import ../signer
|
|
|
|
|
import ./wallet/error
|
|
|
|
|
import ./wallet/signing
|
|
|
|
|
|
|
|
|
|
export keys
|
|
|
|
|
export WalletError
|
|
|
|
|
export signing
|
|
|
|
|
|
|
|
|
|
{.push raises: [].}
|
|
|
|
|
|
|
|
|
|
var rng {.threadvar.}: ref HmacDrbgContext
|
|
|
|
|
|
|
|
|
|
proc getRng: ref HmacDrbgContext =
|
|
|
|
|
if rng.isNil:
|
|
|
|
|
rng = newRng()
|
|
|
|
|
rng
|
|
|
|
|
|
|
|
|
|
type Wallet* = ref object of Signer
|
|
|
|
|
privateKey*: PrivateKey
|
|
|
|
|
publicKey*: PublicKey
|
|
|
|
|
address*: Address
|
|
|
|
|
provider*: ?Provider
|
|
|
|
|
|
|
|
|
|
proc new*(_: type Wallet, privateKey: PrivateKey): Wallet =
|
|
|
|
|
let publicKey = privateKey.toPublicKey()
|
|
|
|
|
let address = Address.init(publicKey.toCanonicalAddress())
|
|
|
|
|
Wallet(privateKey: privateKey, publicKey: publicKey, address: address)
|
|
|
|
|
|
|
|
|
|
proc new*(_: type Wallet, privateKey: PrivateKey, provider: Provider): Wallet =
|
|
|
|
|
let wallet = Wallet.new(privateKey)
|
|
|
|
|
wallet.provider = some provider
|
|
|
|
|
wallet
|
|
|
|
|
|
|
|
|
|
proc new*(_: type Wallet, privateKey: string): ?!Wallet =
|
|
|
|
|
let keyResult = PrivateKey.fromHex(privateKey)
|
|
|
|
|
if keyResult.isErr:
|
|
|
|
|
return failure newException(WalletError, "invalid key: " & $keyResult.error)
|
|
|
|
|
success Wallet.new(keyResult.get())
|
|
|
|
|
|
|
|
|
|
proc new*(_: type Wallet, privateKey: string, provider: Provider): ?!Wallet =
|
|
|
|
|
let wallet = ? Wallet.new(privateKey)
|
|
|
|
|
wallet.provider = some provider
|
|
|
|
|
success wallet
|
|
|
|
|
|
|
|
|
|
proc connect*(wallet: Wallet, provider: Provider) =
|
|
|
|
|
wallet.provider = some provider
|
|
|
|
|
|
|
|
|
|
proc createRandom*(_: type Wallet): Wallet =
|
|
|
|
|
result = Wallet()
|
|
|
|
|
result.privateKey = PrivateKey.random(getRng()[])
|
|
|
|
|
result.publicKey = result.privateKey.toPublicKey()
|
|
|
|
|
result.address = Address.init(result.publicKey.toCanonicalAddress())
|
|
|
|
|
|
|
|
|
|
proc createRandom*(_: type Wallet, provider: Provider): Wallet =
|
|
|
|
|
result = Wallet()
|
|
|
|
|
result.privateKey = PrivateKey.random(getRng()[])
|
|
|
|
|
result.publicKey = result.privateKey.toPublicKey()
|
|
|
|
|
result.address = Address.init(result.publicKey.toCanonicalAddress())
|
|
|
|
|
result.provider = some provider
|
|
|
|
|
|
|
|
|
|
method provider*(wallet: Wallet): Provider {.gcsafe, raises: [SignerError].} =
|
|
|
|
|
without provider =? wallet.provider:
|
|
|
|
|
raiseWalletError "Wallet has no provider"
|
|
|
|
|
provider
|
|
|
|
|
|
|
|
|
|
method getAddress*(
|
|
|
|
|
wallet: Wallet): Future[Address]
|
|
|
|
|
{.async: (raises:[ProviderError, SignerError]).} =
|
|
|
|
|
|
|
|
|
|
return wallet.address
|
|
|
|
|
|
|
|
|
|
proc signTransaction*(wallet: Wallet,
|
|
|
|
|
transaction: Transaction): Future[seq[byte]] {.async: (raises:[WalletError]).} =
|
|
|
|
|
if sender =? transaction.sender and sender != wallet.address:
|
|
|
|
|
raiseWalletError "from address mismatch"
|
|
|
|
|
|
|
|
|
|
return wallet.privateKey.sign(transaction)
|
|
|
|
|
|
|
|
|
|
method sendTransaction*(
|
|
|
|
|
wallet: Wallet,
|
|
|
|
|
transaction: Transaction): Future[TransactionResponse]
|
2024-03-20 14:01:48 +00:00
|
|
|
{.async: (raises:[SignerError, ProviderError]).} =
|
Upgrade to `nim-json-rpc` v0.4.2 and chronos v4 (#64)
* Add json de/serialization lib from codex to handle conversions
json-rpc now requires nim-json-serialization to convert types to/from json. Use the nim-json-serialization signatures to call the json serialization lib from nim-codex (should be moved to its own lib)
* Add ethers implementation for setMethodHandler
Was removed in json-rpc
* More json conversion updates
* Fix json_rpc.call returning JsonString instead of JsonNode
* Update exceptions
Use {.async: (raises: [...].} where needed
Annotate provider with {.push raises:[].}
Format signatures
* Start fixing tests (mainly conversion fixes)
* rename sender to `from`, update json error logging, add more conversions
* Refactor exceptions for providers and signers, fix more tests
- signer procs raise SignerError, provider procs raise ProviderError
- WalletError now inherits from SignerError
- move wallet module under signers
- create jsonrpo moudle under signers
- bump nim-json-rpc for null-handling fixes
- All jsonrpc provider tests passing, still need to fix others
* remove raises from async annotation for dynamic dispatch
- removes async: raises from getAddress and signTransaction because derived JsonRpcSigner methods were not being used when dynamically dispatched. Once `raises` was removed from the async annotation, the dynamic dispatch worked again. This is only the case for getAddress and signTransaction.
- add gcsafe annotation to wallet.provider so that it matches the base method
* Catch EstimateGasError before ProviderError
EstimateGasError is now a ProviderError (it is a SignerError, and SignerError is a ProviderError), so EstimateGasErrors were not being caught
* clean up - all tests passing
* support nim 2.0
* lock in chronos version
* Add serde options to the json util, along with tests
next step is to:
1. change back any ethers var names that were changed for serialization purposes, eg `from` and `type`
2. move the json util to its own lib
* bump json-rpc to 0.4.0 and fix test
* fix: specify raises for getAddress and sendTransaction
Fixes issue where getAddress and sendTransaction could not be found for MockSigner in tests. The problem was that the async: raises update had not been applied to the MockSigner.
* handle exceptions during jsonrpc init
There are too many exceptions to catch individually, including chronos raising CatchableError exceptions in await expansion. There are also many other errors captured inside of the new proc with CatchableError. Instead of making it more complicated and harder to read, I think sticking with excepting CatchableError inside of convertError is a sensible solution
* cleanup
* deserialize key defaults to serialize key
* Add more tests for OptIn/OptOut/Strict modes, fix logic
* use nim-serde instead of json util
Allows aliasing of de/serialized fields, so revert changes of sender to `from` and transactionType to `type`
* Move hash* shim to its own module
* address PR feedback
- add comments to hashes shim
- remove .catch from callback condition
- derive SignerError from EthersError instead of ProviderError. This allows Providers and Signers to be separate, as Ledger does it, to isolate functionality. Some signer functions now raise both ProviderError and SignerError
- Update reverts to check for SignerError
- Update ERC-20 method comment
* rename subscriptions.init > subscriptions.start
2024-02-19 05:50:46 +00:00
|
|
|
|
2024-03-20 14:01:48 +00:00
|
|
|
let signed = await signTransaction(wallet, transaction)
|
|
|
|
|
return await provider(wallet).sendTransaction(signed)
|
