From e42a4cb94493611c7b109f3e7a48c7a11c593e46 Mon Sep 17 00:00:00 2001 From: Austin Roberts Date: Tue, 24 Oct 2023 09:29:09 -0500 Subject: [PATCH 1/3] Use EIP160 case instead of EIP158 --- core/vm/jump_table_export.go | 1 - 1 file changed, 1 deletion(-) diff --git a/core/vm/jump_table_export.go b/core/vm/jump_table_export.go index 5f4a71a6e..78b30c577 100644 --- a/core/vm/jump_table_export.go +++ b/core/vm/jump_table_export.go @@ -49,7 +49,6 @@ func LookupInstructionSet(rules params.Rules) (JumpTable, error) { // Begin plugeth injection case rules.IsEIP160: // End plugeth injection - case rules.IsEIP158: return newSpuriousDragonInstructionSet(), nil case rules.IsEIP150: return newTangerineWhistleInstructionSet(), nil From cd9d109d65aaaa64b24b764a187b2323fcb892cd Mon Sep 17 00:00:00 2001 From: Austin Roberts Date: Tue, 24 Oct 2023 10:58:21 -0500 Subject: [PATCH 2/3] Fix interpreter instruction set selection --- core/vm/interpreter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 8d6270b77..bf1b18971 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -72,7 +72,7 @@ func NewEVMInterpreter(evm *EVM) *EVMInterpreter { table = &constantinopleInstructionSet case evm.chainRules.IsByzantium: table = &byzantiumInstructionSet - case evm.chainRules.IsEIP158: + case evm.chainRules.IsEIP160: table = &spuriousDragonInstructionSet case evm.chainRules.IsEIP150: table = &tangerineWhistleInstructionSet From 20a51847a8c7b1db5ad61ec266e9c2410c9d73a7 Mon Sep 17 00:00:00 2001 From: Austin Roberts Date: Tue, 24 Oct 2023 11:06:29 -0500 Subject: [PATCH 3/3] Add plugeth injection comment --- core/vm/interpreter.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index bf1b18971..83f530e0a 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -72,7 +72,9 @@ func NewEVMInterpreter(evm *EVM) *EVMInterpreter { table = &constantinopleInstructionSet case evm.chainRules.IsByzantium: table = &byzantiumInstructionSet + // begin PluGeth injection case evm.chainRules.IsEIP160: + // end PluGeth injection table = &spuriousDragonInstructionSet case evm.chainRules.IsEIP150: table = &tangerineWhistleInstructionSet