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

Remove fork distinguished procs, handle in applyCreateMessage

This commit is contained in:
coffeepots 2018-09-17 19:35:07 +01:00
parent c300044474
commit d484420f5b
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nimbus/vm/computation.nim
View File

@ -85,7 +85,7 @@ proc prepareChildMessage*(
code, code,
childOptions) childOptions)
proc applyFrontierMessage(computation: var BaseComputation) = proc applyMessage(computation: var BaseComputation) =
# TODO: Snapshots/Journaling, see: https://github.com/status-im/nimbus/issues/142 # TODO: Snapshots/Journaling, see: https://github.com/status-im/nimbus/issues/142
#let snapshot = computation.vmState.snapshot() #let snapshot = computation.vmState.snapshot()
@ -122,21 +122,36 @@ proc applyFrontierMessage(computation: var BaseComputation) =
computation.vmState.commit(snapshot) computation.vmState.commit(snapshot)
]# ]#
proc createFrontierMessage(computation: var BaseComputation) = proc applyCreateMessage(fork: Fork, computation: var BaseComputation) =
computation.applyFrontierMessage() computation.applyMessage()
if fork >= FkFrontier:
# TODO: Take snapshot
discard
if computation.isError: if computation.isError:
if fork == FkSpurious:
# TODO: Revert snapshot
discard
return return
else: else:
let contractCode = computation.output let contractCode = computation.output
if contractCode.len > 0: if contractCode.len > 0:
if fork >= FkSpurious and contractCode.len >= EIP170_CODE_SIZE_LIMIT:
# TODO: Revert snapshot
raise newException(OutOfGas, &"Contract code size exceeds EIP170 limit of {EIP170_CODE_SIZE_LIMIT}. Got code of size: {contractCode.len}")
try: try:
computation.gasMeter.consumeGas( computation.gasMeter.consumeGas(
computation.gasCosts[Create].m_handler(0, 0, contractCode.len), computation.gasCosts[Create].m_handler(0, 0, contractCode.len),
reason="Write contract code for CREATE") reason = "Write contract code for CREATE")
except OutOfGas: except OutOfGas:
computation.output = @[] if fork == FkFrontier:
computation.output = @[]
else:
# Different from Frontier:
# Reverts state on gas failure while writing contract code.
# TODO: Revert snapshot
discard
else: else:
let storageAddr = computation.msg.storage_address let storageAddr = computation.msg.storage_address
debug "SETTING CODE", debug "SETTING CODE",
@ -152,17 +167,9 @@ proc generateChildComputation*(fork: Fork, computation: BaseComputation, childMs
computation.vmState.blockHeader.blockNumber, computation.vmState.blockHeader.blockNumber,
childMsg) childMsg)
if childMsg.isCreate: if childMsg.isCreate:
case fork fork.applyCreateMessage(childComp)
of FkFrontier:
createFrontierMessage(childComp)
else:
raise newException(NotImplementedError, "Create message not yet implemented for fork " & $fork)
else: else:
case fork applyMessage(childComp)
of FkFrontier:
applyFrontierMessage(childComp)
else:
raise newException(NotImplementedError, "Apply message not yet implemented for fork " & $fork)
return childComp return childComp
proc addChildComputation(fork: Fork, computation: BaseComputation, child: BaseComputation) = proc addChildComputation(fork: Fork, computation: BaseComputation, child: BaseComputation) =