From 06dc6c4d6576181adb80db12c6151210d10ee1f9 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:53:24 +1100 Subject: [PATCH] clean up --- ethers/provider.nim | 12 ++---------- ethers/providers/jsonrpc.nim | 7 ------- ethers/providers/jsonrpc/signatures.nim | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ethers/provider.nim b/ethers/provider.nim index 25ba3c7..46bec4b 100644 --- a/ethers/provider.nim +++ b/ethers/provider.nim @@ -73,7 +73,7 @@ type transactionType*: ?TransactionType chainId*: ?UInt256 value*: UInt256 - v*, r*, s* : UInt256 + v*, r*, s*: UInt256 const EthersDefaultConfirmations* {.intdefine.} = 12 const EthersReceiptTimeoutBlks* {.intdefine.} = 50 # in blocks @@ -81,9 +81,6 @@ const EthersReceiptTimeoutBlks* {.intdefine.} = 50 # in blocks logScope: topics = "ethers provider" -template raiseProviderError(message: string) = - raise newException(ProviderError, message) - func toTransaction*(past: PastTransaction): Transaction = Transaction( sender: some past.sender, @@ -102,11 +99,6 @@ method getBlockNumber*(provider: Provider): Future[UInt256] {.base, gcsafe.} = method getBlock*(provider: Provider, tag: BlockTag): Future[?Block] {.base, gcsafe.} = doAssert false, "not implemented" -method call*(provider: Provider, - tx: JsonNode, - blockTag = BlockTag.latest): Future[seq[byte]] {.base, gcsafe.} = - doAssert false, "not implemented" - method call*(provider: Provider, tx: Transaction, blockTag = BlockTag.latest): Future[seq[byte]] {.base, gcsafe.} = @@ -200,7 +192,7 @@ method getRevertReason*( without blockNumber =? receipt.blockNumber: return none string - return await provider.getRevertReason(receipt.transactionHash, blockNumber) + return await provider.getRevertReason(receipt.transactionHash, blockNumber - 1) proc confirm*(tx: TransactionResponse, confirmations = EthersDefaultConfirmations, diff --git a/ethers/providers/jsonrpc.nim b/ethers/providers/jsonrpc.nim index 8050e49..37d1257 100644 --- a/ethers/providers/jsonrpc.nim +++ b/ethers/providers/jsonrpc.nim @@ -123,13 +123,6 @@ method getBlock*(provider: JsonRpcProvider, let client = await provider.client return await client.eth_getBlockByNumber(tag, false) -method call*(provider: JsonRpcProvider, - tx: JsonNode, - blockTag = BlockTag.latest): Future[seq[byte]] {.async.} = - convertError: - let client = await provider.client - return await client.eth_call(tx, blockTag) - method call*(provider: JsonRpcProvider, tx: Transaction, blockTag = BlockTag.latest): Future[seq[byte]] {.async.} = diff --git a/ethers/providers/jsonrpc/signatures.nim b/ethers/providers/jsonrpc/signatures.nim index d621cdd..668acbc 100644 --- a/ethers/providers/jsonrpc/signatures.nim +++ b/ethers/providers/jsonrpc/signatures.nim @@ -2,8 +2,6 @@ proc net_version(): string proc eth_accounts: seq[Address] proc eth_blockNumber: UInt256 proc eth_call(transaction: Transaction, blockTag: BlockTag): seq[byte] -proc eth_call(transaction: PastTransaction, blockTag: BlockTag): seq[byte] -proc eth_call(transaction: JsonNode, blockTag: BlockTag): seq[byte] proc eth_gasPrice(): UInt256 proc eth_getBlockByNumber(blockTag: BlockTag, includeTransactions: bool): ?Block proc eth_getLogs(filter: EventFilter | Filter | FilterByBlockHash): JsonNode