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

RPC: Prepare rpcSetupComputation to support estimateGas 

The RPC `estimateGas` behaves differently from RPC `call` in a number of ways.

These differences may be bugs due to `rpcEstimateGas` calling the EVM in a very
different way than `rpcDoCall`, or they may be intentional.  To be sure, we'll
need to test behaviour with Geth, Infura etc to find out (their documentation
isn't enough.)  For now, though, we'll keep the same behaviour as we always had.

`rpcEstimateGas` cannot use `rpcSetupComputation` as it is, because
`estimateGas` accounts for "intrinsic gas", and `call` does not.

This patch changes `rpcSetupComputation` to accomodate both behaviours.

Signed-off-by: Jamie Lokier <jamie@shareable.org>
This commit is contained in:
Jamie Lokier 2021-05-03 10:04:15 +01:00
parent f3f872d707
commit 76c4c72abb
No known key found for this signature in database
GPG Key ID: CBC25C68435C30A2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nimbus/transaction/call_evm.nim
View File

@ -8,7 +8,7 @@
import import
eth/common/eth_types, stint, options, stew/byteutils, eth/common/eth_types, stint, options, stew/byteutils,
".."/[vm_types, vm_types2, vm_state, vm_computation], ".."/[vm_types, vm_types2, vm_state, vm_computation, utils],
".."/[db/db_chain, config, vm_state_transactions, rpc/hexstrings], ".."/[db/db_chain, config, vm_state_transactions, rpc/hexstrings],
".."/[db/accounts_cache, p2p/executor], eth/trie/db ".."/[db/accounts_cache, p2p/executor], eth/trie/db
@ -22,23 +22,28 @@ type
data*: seq[byte] data*: seq[byte]
contractCreation*: bool contractCreation*: bool
proc rpcSetupComputation*(vmState: BaseVMState, call: RpcCallData, fork: Fork): Computation = proc rpcSetupComputation*(vmState: BaseVMState, call: RpcCallData,
fork: Fork, gasLimit: GasInt): Computation =
vmState.setupTxContext( vmState.setupTxContext(
origin = call.source, origin = call.source,
gasPrice = call.gasPrice, gasPrice = call.gasPrice,
forkOverride = some(fork) forkOverride = some(fork)
) )
let msg = Message( var msg = Message(
kind: evmcCall, kind: if call.contractCreation: evmcCreate else: evmcCall,
depth: 0, depth: 0,
gas: call.gas, gas: gasLimit,
sender: call.source, sender: call.source,
contractAddress: call.to, contractAddress:
if not call.contractCreation:
call.to
else:
generateAddress(call.source, vmState.readOnlyStateDB.getNonce(call.source)),
codeAddress: call.to, codeAddress: call.to,
value: call.value, value: call.value,
data: call.data data: call.data
) )
return newComputation(vmState, msg) return newComputation(vmState, msg)
@ -50,7 +55,7 @@ proc rpcDoCall*(call: RpcCallData, header: BlockHeader, chain: BaseChainDB): Hex
# which use previous block stateRoot # which use previous block stateRoot
vmState = newBaseVMState(header.stateRoot, header, chain) vmState = newBaseVMState(header.stateRoot, header, chain)
fork = toFork(chain.config, header.blockNumber) fork = toFork(chain.config, header.blockNumber)
comp = rpcSetupComputation(vmState, call, fork) comp = rpcSetupComputation(vmState, call, fork, call.gas)
comp.execComputation() comp.execComputation()
result = hexDataStr(comp.output) result = hexDataStr(comp.output)
@ -62,7 +67,7 @@ proc rpcMakeCall*(call: RpcCallData, header: BlockHeader, chain: BaseChainDB): (
# which use previous block stateRoot # which use previous block stateRoot
vmState = newBaseVMState(header.stateRoot, header, chain) vmState = newBaseVMState(header.stateRoot, header, chain)
fork = toFork(chain.config, header.blockNumber) fork = toFork(chain.config, header.blockNumber)
comp = rpcSetupComputation(vmState, call, fork) comp = rpcSetupComputation(vmState, call, fork, call.gas)
let gas = comp.gasMeter.gasRemaining let gas = comp.gasMeter.gasRemaining
comp.execComputation() comp.execComputation()