Skip to content

Commit 09ec57d

Browse files
committed
core/vm: fix invalid merkle root caused by PR #627 (#1033)
1 parent ff64270 commit 09ec57d

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/vm/evm.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ func (evm *EVM) StaticCall(caller ContractRef, addr common.Address, input []byte
366366
// This doesn't matter on Mainnet, where all empties are gone at the time of Byzantium,
367367
// but is the correct thing to do and matters on other networks, in tests, and potential
368368
// future scenarios
369-
evm.StateDB.AddBalance(addr, big0)
369+
if evm.ChainConfig().IsTIPXDCXCancellationFee(evm.Context.BlockNumber) {
370+
evm.StateDB.AddBalance(addr, big0)
371+
}
370372

371373
// Invoke tracer hooks that signal entering/exiting a call frame
372374
if evm.Config.Tracer != nil {

0 commit comments

Comments
 (0)