Skip to content

Commit

Permalink
update diff go-ethereum patch
Browse files Browse the repository at this point in the history
  • Loading branch information
buddh0 committed Nov 22, 2024
1 parent 23c9c97 commit dcd4061
Showing 1 changed file with 41 additions and 25 deletions.
66 changes: 41 additions & 25 deletions tests/0001-diff-go-ethereum.patch
Original file line number Diff line number Diff line change
@@ -1,47 +1,63 @@
From 32329440626abd6e9668c2d5bd2e7b719e951e01 Mon Sep 17 00:00:00 2001
From: NathanBSC <[email protected]>
Date: Wed, 31 Jul 2024 15:01:28 +0800
From 0cca8c531b5af345104311d72ff78a512a00cd33 Mon Sep 17 00:00:00 2001
From: buddh0 <[email protected]>
Date: Fri, 22 Nov 2024 09:58:24 +0800
Subject: [PATCH] diff go ethereum

---
core/vm/contracts.go | 10 ----------
core/vm/contracts.go | 19 -------------------
core/vm/jump_table.go | 2 +-
params/protocol_params.go | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)
3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 38a6cac24..7eb29c3ed 100644
index ab8a9e9db..acedafe40 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -84,9 +84,6 @@ var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{9}): &blake2F{},
@@ -92,9 +92,6 @@ var PrecompiledContractsIstanbul = PrecompiledContracts{
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulIstanbul{},
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{0x9}): &blake2F{},
-
- common.BytesToAddress([]byte{100}): &tmHeaderValidate{},
- common.BytesToAddress([]byte{101}): &iavlMerkleProofValidate{},
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidate{},
}

var PrecompiledContractsNano = map[common.Address]PrecompiledContract{
@@ -239,13 +236,6 @@ var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{9}): &blake2F{},
var PrecompiledContractsNano = PrecompiledContracts{
@@ -247,13 +244,6 @@ var PrecompiledContractsCancun = PrecompiledContracts{
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{0x9}): &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{},
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidatePlato{},
- common.BytesToAddress([]byte{0x66}): &blsSignatureVerify{},
- common.BytesToAddress([]byte{0x67}): &cometBFTLightBlockValidateHertz{},
- common.BytesToAddress([]byte{0x68}): &verifyDoubleSignEvidence{},
- common.BytesToAddress([]byte{0x69}): &secp256k1SignatureRecover{},
}

// PrecompiledContractsHaber contains the default set of pre-compiled Ethereum
@@ -302,15 +292,6 @@ var PrecompiledContractsPrague = PrecompiledContracts{
common.BytesToAddress([]byte{0x11}): &bls12381Pairing{},
common.BytesToAddress([]byte{0x12}): &bls12381MapG1{},
common.BytesToAddress([]byte{0x13}): &bls12381MapG2{},
-
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidatePlato{},
- common.BytesToAddress([]byte{0x66}): &blsSignatureVerify{},
- common.BytesToAddress([]byte{0x67}): &cometBFTLightBlockValidateHertz{},
- common.BytesToAddress([]byte{0x68}): &verifyDoubleSignEvidence{},
- common.BytesToAddress([]byte{0x69}): &secp256k1SignatureRecover{},
-
- common.BytesToAddress([]byte{0x01, 0x00}): &p256Verify{},
}

var PrecompiledContractsBLS = PrecompiledContractsPrague
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 70c543f14..65716f944 100644
index 5fbde1804..6b2950194 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -91,7 +91,7 @@ func newCancunInstructionSet() JumpTable {
@@ -98,7 +98,7 @@ func newCancunInstructionSet() JumpTable {
}

func newShanghaiInstructionSet() JumpTable {
Expand All @@ -51,7 +67,7 @@ index 70c543f14..65716f944 100644
enable3860(&instructionSet) // Limit and meter initcode

diff --git a/params/protocol_params.go b/params/protocol_params.go
index 65b2d942c..bb085512f 100644
index d86070983..d108626a3 100644
--- a/params/protocol_params.go
+++ b/params/protocol_params.go
@@ -23,7 +23,7 @@ import (
Expand Down

0 comments on commit dcd4061

Please sign in to comment.