-
Notifications
You must be signed in to change notification settings - Fork 1.6k
/
Copy path0001-diff-go-ethereum.patch
84 lines (75 loc) · 3.57 KB
/
0001-diff-go-ethereum.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
From dba05084d6425657211702dd690ebef0c9c45448 Mon Sep 17 00:00:00 2001
From: buddh0 <[email protected]>
Date: Wed, 5 Feb 2025 20:34:36 +0800
Subject: [PATCH] diff go ethereum
---
core/vm/contracts.go | 19 -------------------
core/vm/jump_table.go | 2 +-
params/protocol_params.go | 2 +-
3 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index ddde8b0c9..39065b2f7 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -91,9 +91,6 @@ var PrecompiledContractsIstanbul = PrecompiledContracts{
common.BytesToAddress([]byte{0x7}): &bn256ScalarMulIstanbul{},
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{0x9}): &blake2F{},
-
- common.BytesToAddress([]byte{0x64}): &tmHeaderValidate{},
- common.BytesToAddress([]byte{0x65}): &iavlMerkleProofValidate{},
}
var PrecompiledContractsNano = PrecompiledContracts{
@@ -246,13 +243,6 @@ var PrecompiledContractsCancun = PrecompiledContracts{
common.BytesToAddress([]byte{0x8}): &bn256PairingIstanbul{},
common.BytesToAddress([]byte{0x9}): &blake2F{},
common.BytesToAddress([]byte{0x0a}): &kzgPointEvaluation{},
-
- 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
@@ -299,15 +289,6 @@ var PrecompiledContractsPrague = PrecompiledContracts{
common.BytesToAddress([]byte{0x0f}): &bls12381Pairing{},
common.BytesToAddress([]byte{0x10}): &bls12381MapG1{},
common.BytesToAddress([]byte{0x11}): &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 299ee4c55..6610fa7f9 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -119,7 +119,7 @@ func newCancunInstructionSet() JumpTable {
}
func newShanghaiInstructionSet() JumpTable {
- instructionSet := newLondonInstructionSet()
+ instructionSet := newMergeInstructionSet()
enable3855(&instructionSet) // PUSH0 instruction
enable3860(&instructionSet) // Limit and meter initcode
diff --git a/params/protocol_params.go b/params/protocol_params.go
index c83e330a8..903e758df 100644
--- a/params/protocol_params.go
+++ b/params/protocol_params.go
@@ -23,7 +23,7 @@ import (
)
const (
- GasLimitBoundDivisor uint64 = 256 // The bound divisor of the gas limit, used in update calculations.
+ GasLimitBoundDivisor uint64 = 1024 // The bound divisor of the gas limit, used in update calculations.
MinGasLimit uint64 = 5000 // Minimum the gas limit may ever be.
MaxGasLimit uint64 = 0x7fffffffffffffff // Maximum the gas limit (2^63-1).
GenesisGasLimit uint64 = 4712388 // Gas limit of the Genesis block.
--
2.41.0