core/vm: fix PrecompiledContractsCancun

bnb-chain · Mar 20, 2024 · 574981c · 574981c
1 parent 10ae179
commit 574981c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -221,7 +221,7 @@ var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
 	common.BytesToAddress([]byte{100}): &tmHeaderValidate{},
 	common.BytesToAddress([]byte{101}): &iavlMerkleProofValidatePlato{},
 	common.BytesToAddress([]byte{102}): &blsSignatureVerify{},
-	common.BytesToAddress([]byte{103}): &cometBFTLightBlockValidate{},
+	common.BytesToAddress([]byte{103}): &cometBFTLightBlockValidateHertz{},
 	common.BytesToAddress([]byte{104}): &verifyDoubleSignEvidence{},
 	common.BytesToAddress([]byte{105}): &secp256k1SignatureRecover{},
 }
@@ -263,6 +263,7 @@ var PrecompiledContractsBLS = map[common.Address]PrecompiledContract{
 
 var (
 	PrecompiledAddressesCancun    []common.Address
+	PrecompiledAddressesFeynman   []common.Address
 	PrecompiledAddressesHertz     []common.Address
 	PrecompiledAddressesPlato     []common.Address
 	PrecompiledAddressesLuban     []common.Address
@@ -273,7 +274,6 @@ var (
 	PrecompiledAddressesIstanbul  []common.Address
 	PrecompiledAddressesByzantium []common.Address
 	PrecompiledAddressesHomestead []common.Address
-	PrecompiledAddressesFeynman   []common.Address
 )
 
 func init() {
@@ -307,12 +307,12 @@ func init() {
 	for k := range PrecompiledContractsHertz {
 		PrecompiledAddressesHertz = append(PrecompiledAddressesHertz, k)
 	}
-	for k := range PrecompiledContractsCancun {
-		PrecompiledAddressesCancun = append(PrecompiledAddressesCancun, k)
-	}
 	for k := range PrecompiledContractsFeynman {
 		PrecompiledAddressesFeynman = append(PrecompiledAddressesFeynman, k)
 	}
+	for k := range PrecompiledContractsCancun {
+		PrecompiledAddressesCancun = append(PrecompiledAddressesCancun, k)
+	}
 }
 
 // ActivePrecompiles returns the precompiles enabled with the current configuration.

diff --git a/tests/0001-diff-go-ethereum.patch b/tests/0001-diff-go-ethereum.patch
@@ -1,8 +1,8 @@
 diff --git a/core/vm/contracts.go b/core/vm/contracts.go
-index 36d33e41c..adb10883e 100644
+index 3c43848e5..533663ebc 100644
 --- a/core/vm/contracts.go
 +++ b/core/vm/contracts.go
-@@ -78,9 +78,6 @@ var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
+@@ -83,9 +83,6 @@ var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
  	common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
  	common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
  	common.BytesToAddress([]byte{9}): &blake2F{},
@@ -12,6 +12,20 @@ index 36d33e41c..adb10883e 100644
  }
 
  var PrecompiledContractsNano = map[common.Address]PrecompiledContract{
+@@ -217,13 +214,6 @@ var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
+ 	common.BytesToAddress([]byte{8}):    &bn256PairingIstanbul{},
+ 	common.BytesToAddress([]byte{9}):    &blake2F{},
+ 	common.BytesToAddress([]byte{0x0a}): &kzgPointEvaluation{},
+-
+-	common.BytesToAddress([]byte{100}): &tmHeaderValidate{},
+-	common.BytesToAddress([]byte{101}): &iavlMerkleProofValidatePlato{},
+-	common.BytesToAddress([]byte{102}): &blsSignatureVerify{},
+-	common.BytesToAddress([]byte{103}): &cometBFTLightBlockValidateHertz{},
+-	common.BytesToAddress([]byte{104}): &verifyDoubleSignEvidence{},
+-	common.BytesToAddress([]byte{105}): &secp256k1SignatureRecover{},
+ }
+
+ // PrecompiledContractsFeynman contains the default set of pre-compiled Ethereum
 diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
 index 70c543f14..65716f944 100644
 --- a/core/vm/jump_table.go
@@ -26,7 +40,7 @@ index 70c543f14..65716f944 100644
  	enable3860(&instructionSet) // Limit and meter initcode
 
 diff --git a/params/protocol_params.go b/params/protocol_params.go
-index b32b4d943..8b544af08 100644
+index b84fa148f..97bf6c4d2 100644
 --- a/params/protocol_params.go
 +++ b/params/protocol_params.go
 @@ -23,7 +23,7 @@ import (

diff --git a/tests/init_test.go b/tests/init_test.go
@@ -252,10 +252,6 @@ func (tm *testMatcher) runTestFile(t *testing.T, path, name string, runTest inte
 				if r, _ := tm.findSkip(name); r != "" {
 					t.Skip(r)
 				}
-				// TODO(Nathan): fix before enable Cancun
-				if strings.Contains(key, "Cancun") {
-					return
-				}
 				runTestFunc(runTest, t, name, m, key)
 			})
 		}