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

resolve conflicts

This commit is contained in:
andri lim 2018-12-03 17:59:32 +07:00
parent 1ff02f433b 2521ff1950
commit 535ed67de7
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nimbus/rpc/debug.nim
View File

@ -28,7 +28,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
if not chainDB.getBlockBody(hash, result):
raise newException(ValueError, "Error when retrieving block body")
rpcsrv.rpc("debug_traceTransaction") do(data: HexDataStr, options: Option[TraceTxOptions]) -> JsonNode:
rpcsrv.rpc("debug_traceTransaction") do(data: EthHashStr, options: Option[TraceTxOptions]) -> JsonNode:
## The traceTransaction debugging method will attempt to run the transaction in the exact
## same manner as it was executed on the network. It will replay any transaction that may
## have been executed prior to this one before it will finally attempt to execute the
@ -41,7 +41,7 @@ proc setupDebugRpc*(chainDB: BaseChainDB, rpcsrv: RpcServer) =
## * disableMemory: BOOL. Setting this to true will disable memory capture (default = false).
## * disableStack: BOOL. Setting this to true will disable stack capture (default = false).
let
txHash = strToHash(data.string)
txHash = toHash(data.string)
txDetails = chainDB.getTransactionKey(txHash)
blockHeader = chainDB.getBlockHeader(txDetails.blockNumber)
blockHash = chainDB.getBlockHash(txDetails.blockNumber)

8
nimbus/rpc/p2p.nim
View File

@ -29,14 +29,6 @@ import
proc `%`*(value: Time): JsonNode =
result = %value.toSeconds
func toAddress(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string)
func toHash(value: array[32, byte]): Hash256 {.inline.} =
result.data = value
func toHash(value: EthHashStr): Hash256 {.inline.} =
result = hexToPaddedByteArray[32](value.string).toHash
template balance(addressDb: AccountStateDb, address: EthAddress): GasInt =
# TODO: Account balance u256 but GasInt is int64?
addressDb.getBalance(address).truncate(int64)

7
nimbus/rpc/rpc_utils.nim
View File

@ -9,10 +9,11 @@
import hexstrings, nimcrypto, eth_common, byteutils
func strToAddress*(value: string): EthAddress = hexToPaddedByteArray[20](value)
func toAddress*(value: EthAddressStr): EthAddress = hexToPaddedByteArray[20](value.string)
func toHash*(value: array[32, byte]): Hash256 {.inline.} =
result.data = value
func strToHash*(value: string): Hash256 {.inline.} =
result = hexToPaddedByteArray[32](value).toHash
func toHash*(value: EthHashStr): Hash256 {.inline.} =
result = hexToPaddedByteArray[32](value.string).toHash