Skip to content

Commit

Permalink
fixes rpc compilation error
Browse files Browse the repository at this point in the history
  • Loading branch information
jangko authored and zah committed Jan 23, 2020
1 parent d23a33a commit e8ec170
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions nimbus/rpc/debug.nim
Expand Up @@ -56,7 +56,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
blockBody = chainDB.getBlockBody(blockHash)
flags = traceOptionsToFlags(options)

traceTransaction(chainDB, blockHeader, blockBody, txDetails.index, flags)
result = traceTransaction(chainDB, blockHeader, blockBody, txDetails.index, flags)

rpcsrv.rpc("debug_dumpBlockStateByNumber") do(quantityTag: string) -> JsonNode:
## Retrieves the state that corresponds to the block number and returns
Expand All @@ -69,7 +69,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
blockHash = chainDB.getBlockHash(header.blockNumber)
body = chainDB.getBlockBody(blockHash)

dumpBlockState(chainDB, header, body)
result = dumpBlockState(chainDB, header, body)

rpcsrv.rpc("debug_dumpBlockStateByHash") do(data: EthHashStr) -> JsonNode:
## Retrieves the state that corresponds to the block number and returns
Expand All @@ -82,7 +82,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
blockHash = chainDB.getBlockHash(header.blockNumber)
body = chainDB.getBlockBody(blockHash)

dumpBlockState(chainDB, header, body)
result = dumpBlockState(chainDB, header, body)

rpcsrv.rpc("debug_traceBlockByNumber") do(quantityTag: string, options: Option[TraceOptions]) -> JsonNode:
## The traceBlock method will return a full stack trace of all invoked opcodes of all transaction
Expand All @@ -97,7 +97,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
body = chainDB.getBlockBody(blockHash)
flags = traceOptionsToFlags(options)

traceBlock(chainDB, header, body, flags)
result = traceBlock(chainDB, header, body, flags)

rpcsrv.rpc("debug_traceBlockByHash") do(data: EthHashStr, options: Option[TraceOptions]) -> JsonNode:
## The traceBlock method will return a full stack trace of all invoked opcodes of all transaction
Expand All @@ -112,7 +112,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
body = chainDB.getBlockBody(blockHash)
flags = traceOptionsToFlags(options)

traceBlock(chainDB, header, body, flags)
result = traceBlock(chainDB, header, body, flags)

rpcsrv.rpc("debug_setHead") do(quantityTag: string):
## Sets the current head of the local chain by block number.
Expand Down
6 changes: 3 additions & 3 deletions nimbus/rpc/p2p.nim
Expand Up @@ -462,7 +462,7 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
header = chain.getBlockHeader(txDetails.blockNumber)
blockHash = chain.getBlockHash(txDetails.blockNumber)
transaction = getBlockBody(blockHash).transactions[txDetails.index]
populateTransactionObject(transaction, txDetails.index, header, blockHash)
result = populateTransactionObject(transaction, txDetails.index, header, blockHash)
# TODO: if the requested transaction not in blockchain
# try to look for pending transaction in txpool

Expand All @@ -476,7 +476,7 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
blockHash = data.toHash()
header = chain.getBlockHeader(blockHash)
transaction = getBlockBody(blockHash).transactions[quantity]
populateTransactionObject(transaction, quantity, header, blockHash)
result = populateTransactionObject(transaction, quantity, header, blockHash)

rpcsrv.rpc("eth_getTransactionByBlockNumberAndIndex") do(quantityTag: string, quantity: int) -> TransactionObject:
## Returns information about a transaction by block number and transaction index position.
Expand All @@ -487,7 +487,7 @@ proc setupEthRpc*(node: EthereumNode, chain: BaseChainDB, rpcsrv: RpcServer) =
header = chain.headerFromTag(quantityTag)
blockHash = header.hash
transaction = getBlockBody(blockHash).transactions[quantity]
populateTransactionObject(transaction, quantity, header, blockHash)
result = populateTransactionObject(transaction, quantity, header, blockHash)

proc populateReceipt(receipt: Receipt, gasUsed: GasInt, tx: Transaction, txIndex: int, blockHeader: BlockHeader): ReceiptObject =
result.transactionHash = tx.rlpHash
Expand Down

0 comments on commit e8ec170

Please sign in to comment.