From 0483e1676a176c71a5076da2e0ea3dffa1b00096 Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Thu, 14 Jul 2022 11:45:37 +0200 Subject: [PATCH] [provider] Rename sendRawTransaction -> sendTransaction To be consistent with ethers.js --- ethers/provider.nim | 8 +++++--- ethers/providers/jsonrpc.nim | 2 +- ethers/wallet.nim | 2 +- testmodule/testWallet.nim | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ethers/provider.nim b/ethers/provider.nim index 15508b6..bc15c25 100644 --- a/ethers/provider.nim +++ b/ethers/provider.nim @@ -75,6 +75,11 @@ method getTransactionReceipt*(provider: Provider, Future[?TransactionReceipt] {.base.} = doAssert false, "not implemented" +method sendTransaction*(provider: Provider, + rawTransaction: seq[byte]): + Future[TransactionResponse] {.base.} = + doAssert false, "not implemented" + method estimateGas*(provider: Provider, transaction: Transaction): Future[UInt256] {.base.} = doAssert false, "not implemented" @@ -82,9 +87,6 @@ method estimateGas*(provider: Provider, method getChainId*(provider: Provider): Future[UInt256] {.base.} = doAssert false, "not implemented" -method sendRawTransaction*(provider: Provider, rawTransaction: seq[byte]): Future[TransactionResponse] {.base, async.} = - doAssert false, "not implemented" - method subscribe*(provider: Provider, filter: Filter, callback: LogHandler): diff --git a/ethers/providers/jsonrpc.nim b/ethers/providers/jsonrpc.nim index 1f8f468..4d3399f 100644 --- a/ethers/providers/jsonrpc.nim +++ b/ethers/providers/jsonrpc.nim @@ -151,7 +151,7 @@ method getChainId*(provider: JsonRpcProvider): Future[UInt256] {.async.} = except CatchableError: return parse(await client.net_version(), UInt256) -method sendRawTransaction*(provider: JsonRpcProvider, rawTransaction: seq[byte]): Future[TransactionResponse] {.async.} = +method sendTransaction*(provider: JsonRpcProvider, rawTransaction: seq[byte]): Future[TransactionResponse] {.async.} = convertError: let client = await provider.client diff --git a/ethers/wallet.nim b/ethers/wallet.nim index f861955..bd609dd 100644 --- a/ethers/wallet.nim +++ b/ethers/wallet.nim @@ -108,7 +108,7 @@ proc signTransaction*(wallet: Wallet, tx: transaction.Transaction): Future[seq[b method sendTransaction*(wallet: Wallet, tx: transaction.Transaction): Future[TransactionResponse] {.async.} = let rawTX = await signTransaction(wallet, tx) - return await wallet.provider.get.sendRawTransaction(rawTX) + return await wallet.provider.get.sendTransaction(rawTX) #TODO add functionality to sign messages diff --git a/testmodule/testWallet.nim b/testmodule/testWallet.nim index 3c882d6..0c6bb3a 100644 --- a/testmodule/testWallet.nim +++ b/testmodule/testWallet.nim @@ -101,7 +101,7 @@ suite "Wallet": gasLimit: some 21_000.u256, ) let signedTx = await wallet.signTransaction(tx) - let txHash = await provider.sendRawTransaction(signedTx) + let txHash = await provider.sendTransaction(signedTx) check txHash.hash == TransactionHash([167.byte, 105, 79, 222, 144, 123, 214, 138, 4, 199, 124, 181, 35, 236, 79, 93, 84, 4, 85, 172, 40, 50, 189, 187, 219, 6, 172, 98, 243, 196, 93, 64]) test "Can call state-changing function automatically":