status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-13 22:04:52 +00:00
Code Issues Projects Releases Wiki Activity

fix block 299804 problem

Browse Source
This commit is contained in:
andri lim 2019-02-25 17:03:43 +07:00
parent 230e1d6fd0
commit 3dd18bd8ec
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nimbus/vm/computation.nim
View File

@ -182,7 +182,7 @@ proc applyMessage(computation: var BaseComputation, opCode: static[Op]) =
debug "applyMessageAux failed", msg = computation.error.info debug "applyMessageAux failed", msg = computation.error.info
return return
if computation.gasMeter.gasRemaining <= 0: if computation.gasMeter.gasRemaining < 0:
snapshot.commit() snapshot.commit()
return return

5
nimbus/vm/interpreter/opcodes_impl.nim
View File

@ -700,6 +700,9 @@ template genCall(callName: untyped, opCode: Op): untyped =
else: else:
(memOutPos, memOutLen) (memOutPos, memOutLen)
if gas > high(GasInt).u256:
raise newException(TypeError, "GasInt Overflow (" & callName.astToStr & ")")
let (childGasFee, childGasLimit) = computation.gasCosts[opCode].c_handler( let (childGasFee, childGasLimit) = computation.gasCosts[opCode].c_handler(
value, value,
GasParams(kind: Call, GasParams(kind: Call,
@ -742,6 +745,8 @@ template genCall(callName: untyped, opCode: Op): untyped =
if sender != ZERO_ADDRESS: if sender != ZERO_ADDRESS:
childMsg.sender = sender childMsg.sender = sender
else:
childMsg.sender = computation.msg.storageAddress
if opCode == CallCode: if opCode == CallCode:
childMsg.storageAddress = computation.msg.storageAddress childMsg.storageAddress = computation.msg.storageAddress