Skip to content

Commit dcd4061

Browse files
committed
update diff go-ethereum patch
1 parent 23c9c97 commit dcd4061

File tree

1 file changed

+41
-25
lines changed

1 file changed

+41
-25
lines changed

tests/0001-diff-go-ethereum.patch

+41-25
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,63 @@
1-
From 32329440626abd6e9668c2d5bd2e7b719e951e01 Mon Sep 17 00:00:00 2001
2-
From: NathanBSC <Nathan.l@nodereal.io>
3-
Date: Wed, 31 Jul 2024 15:01:28 +0800
1+
From 0cca8c531b5af345104311d72ff78a512a00cd33 Mon Sep 17 00:00:00 2001
2+
From: buddh0 <galaxystroller@gmail.com>
3+
Date: Fri, 22 Nov 2024 09:58:24 +0800
44
Subject: [PATCH] diff go ethereum
55

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

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

25-
var PrecompiledContractsNano = map[common.Address]PrecompiledContract{
26-
@@ -239,13 +236,6 @@ var PrecompiledContractsCancun = map[common.Address]PrecompiledContract{
27-
common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
28-
common.BytesToAddress([]byte{9}): &blake2F{},
25+
var PrecompiledContractsNano = PrecompiledContracts{
26+
@@ -247,13 +244,6 @@ var PrecompiledContractsCancun = PrecompiledContracts{
27+
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
28+
common.BytesToAddress([]byte{0x9}): &blake2F{},
2929
common.BytesToAddress([]byte{0x0a}): &kzgPointEvaluation{},
3030
-
31-
- common.BytesToAddress([]byte{100}): &tmHeaderValidate{},
32-
- common.BytesToAddress([]byte{101}): &iavlMerkleProofValidatePlato{},
33-
- common.BytesToAddress([]byte{102}): &blsSignatureVerify{},
34-
- common.BytesToAddress([]byte{103}): &cometBFTLightBlockValidateHertz{},
35-
- common.BytesToAddress([]byte{104}): &verifyDoubleSignEvidence{},
36-
- common.BytesToAddress([]byte{105}): &secp256k1SignatureRecover{},
31+
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
32+
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidatePlato{},
33+
- common.BytesToAddress([]byte{0x66}): &blsSignatureVerify{},
34+
- common.BytesToAddress([]byte{0x67}): &cometBFTLightBlockValidateHertz{},
35+
- common.BytesToAddress([]byte{0x68}): &verifyDoubleSignEvidence{},
36+
- common.BytesToAddress([]byte{0x69}): &secp256k1SignatureRecover{},
3737
}
3838

3939
// PrecompiledContractsHaber contains the default set of pre-compiled Ethereum
40+
@@ -302,15 +292,6 @@ var PrecompiledContractsPrague = PrecompiledContracts{
41+
common.BytesToAddress([]byte{0x11}): &bls12381Pairing{},
42+
common.BytesToAddress([]byte{0x12}): &bls12381MapG1{},
43+
common.BytesToAddress([]byte{0x13}): &bls12381MapG2{},
44+
-
45+
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
46+
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidatePlato{},
47+
- common.BytesToAddress([]byte{0x66}): &blsSignatureVerify{},
48+
- common.BytesToAddress([]byte{0x67}): &cometBFTLightBlockValidateHertz{},
49+
- common.BytesToAddress([]byte{0x68}): &verifyDoubleSignEvidence{},
50+
- common.BytesToAddress([]byte{0x69}): &secp256k1SignatureRecover{},
51+
-
52+
- common.BytesToAddress([]byte{0x01, 0x00}): &p256Verify{},
53+
}
54+
55+
var PrecompiledContractsBLS = PrecompiledContractsPrague
4056
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
41-
index 70c543f14..65716f944 100644
57+
index 5fbde1804..6b2950194 100644
4258
--- a/core/vm/jump_table.go
4359
+++ b/core/vm/jump_table.go
44-
@@ -91,7 +91,7 @@ func newCancunInstructionSet() JumpTable {
60+
@@ -98,7 +98,7 @@ func newCancunInstructionSet() JumpTable {
4561
}
4662

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

5369
diff --git a/params/protocol_params.go b/params/protocol_params.go
54-
index 65b2d942c..bb085512f 100644
70+
index d86070983..d108626a3 100644
5571
--- a/params/protocol_params.go
5672
+++ b/params/protocol_params.go
5773
@@ -23,7 +23,7 @@ import (

0 commit comments

Comments
 (0)