vm: spec fixes (#493)

Signed-off-by: Ignacio Hagopian <[email protected]>
gballet · Sep 11, 2024 · e920a82 · e920a82
1 parent 568ea84
commit e920a82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -58,6 +58,10 @@ func (evm *EVM) precompile(addr common.Address) (PrecompiledContract, bool) {
 	return p, ok
 }
 
+func (evm *EVM) isSystemContract(addr common.Address) bool {
+	return addr == params.HistoryStorageAddress
+}
+
 // BlockContext provides the EVM with auxiliary information. Once provided
 // it shouldn't be modified.
 type BlockContext struct {

diff --git a/core/vm/operations_verkle.go b/core/vm/operations_verkle.go
@@ -61,7 +61,7 @@ func gasExtCodeSize4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory,
 
 func gasExtCodeHash4762(evm *EVM, contract *Contract, stack *Stack, mem *Memory, memorySize uint64) (uint64, error) {
 	address := stack.peek().Bytes20()
-	if _, isPrecompile := evm.precompile(address); isPrecompile {
+	if _, isPrecompile := evm.precompile(address); isPrecompile || evm.isSystemContract(address) {
 		return 0, nil
 	}
 	codehashgas := evm.Accesses.TouchCodeHash(address[:], false)
@@ -132,6 +132,10 @@ func gasExtCodeCopyEIP4762(evm *EVM, contract *Contract, stack *Stack, mem *Memo
 		return 0, err
 	}
 	addr := common.Address(stack.peek().Bytes20())
+
+	if _, isPrecompile := evm.precompile(addr); isPrecompile {
+		return gas, nil
+	}
 	wgas := evm.Accesses.TouchBasicData(addr[:], false)
 	if wgas == 0 {
 		wgas = params.WarmStorageReadCostEIP2929