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

Assembler: Change assembler tests to use shared `setupComputation` 

Signed-off-by: Jamie Lokier <jamie@shareable.org>
This commit is contained in:
Jamie Lokier 2021-05-17 11:02:22 +01:00
parent c655d59b5f
commit 8b33cbe568
No known key found for this signature in database
GPG Key ID: CBC25C68435C30A2
1 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
nimbus/transaction/call_evm.nim
View File

@ -264,36 +264,6 @@ proc txCallEvm*(tx: Transaction, sender: EthAddress, vmState: BaseVMState, fork:
txRefundGas(tx, sender, c) txRefundGas(tx, sender, c)
return tx.gasLimit - c.gasMeter.gasRemaining return tx.gasLimit - c.gasMeter.gasRemaining
proc asmSetupComputation(tx: Transaction, sender: EthAddress, vmState: BaseVMState,
data: seq[byte], forkOverride = none(Fork)): Computation =
let gasUsed = 0 #tx.payload.intrinsicGas.GasInt + gasFees[fork][GasTXCreate]
# For these tests, create the new contract like `CREATE`,
# but then execute it like it's `CALL`.
doAssert tx.isContractCreation
let contractAddress = generateAddress(sender, vmState.readOnlyStateDB.getNonce(sender))
vmState.mutateStateDB:
db.setCode(contractAddress, tx.payload)
vmState.setupTxContext(
origin = sender,
gasPrice = tx.gasPrice,
forkOverride = forkOverride,
)
let msg = Message(
kind: evmcCall,
depth: 0,
gas: tx.gasLimit - gasUsed,
sender: sender,
contractAddress: contractAddress,
codeAddress: contractAddress,
value: tx.value,
data: data
)
return newComputation(vmState, msg)
proc asmSetupComputation(blockNumber: Uint256, chainDB: BaseChainDB, code, proc asmSetupComputation(blockNumber: Uint256, chainDB: BaseChainDB, code,
data: seq[byte], forkOverride = none(Fork)): Computation = data: seq[byte], forkOverride = none(Fork)): Computation =
let let
@ -303,14 +273,32 @@ proc asmSetupComputation(blockNumber: Uint256, chainDB: BaseChainDB, code,
headerHash = header.blockHash headerHash = header.blockHash
body = chainDB.getBlockBody(headerHash) body = chainDB.getBlockBody(headerHash)
vmState = newBaseVMState(parent.stateRoot, header, chainDB) vmState = newBaseVMState(parent.stateRoot, header, chainDB)
var
tx = body.transactions[0] tx = body.transactions[0]
sender = transaction.getSender(tx) sender = transaction.getSender(tx)
gasLimit = 500000000
gasUsed = 0 #tx.payload.intrinsicGas.GasInt + gasFees[fork][GasTXCreate]
tx.payload = code # This is an odd sort of test, where some fields are taken from
tx.gasLimit = 500000000 # `body.transactions[0]` but other fields (like `gasLimit`) are not. Also it
return asmSetupComputation(tx, sender, vmState, data, forkOverride) # creates the new contract using `code` like `CREATE`, but then executes the
# contract like it's `CALL`.
doAssert tx.isContractCreation
let contractAddress = generateAddress(sender, vmState.readOnlyStateDB.getNonce(sender))
vmState.mutateStateDB:
db.setCode(contractAddress, code)
return setupComputation(CallParams(
vmState: vmState,
forkOverride: forkOverride,
gasPrice: tx.gasPrice,
gasLimit: gasLimit - gasUsed,
sender: sender,
to: contractAddress,
isCreate: false,
value: tx.value,
input: data
))
type type
AsmResult* = object AsmResult* = object