55 lines
2.5 KiB
Diff
55 lines
2.5 KiB
Diff
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
|
|
index 5988bb15f..c92cbf542 100644
|
|
--- a/core/vm/contracts.go
|
|
+++ b/core/vm/contracts.go
|
|
@@ -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{},
|
|
-
|
|
- common.BytesToAddress([]byte{100}): &tmHeaderValidate{},
|
|
- common.BytesToAddress([]byte{101}): &iavlMerkleProofValidate{},
|
|
}
|
|
|
|
var PrecompiledContractsNano = map[common.Address]PrecompiledContract{
|
|
@@ -238,13 +235,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{},
|
|
}
|
|
|
|
// PrecompiledContractsBLS contains the 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
|
|
+++ b/core/vm/jump_table.go
|
|
@@ -91,7 +91,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 b84fa148f..97bf6c4d2 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.
|