9ec1223f4d
* remove i386 linux tests * test: fix building of tests * return empty logs instead of nil in receipts * keep InitialBaseFee same with geth, so not break a ton of cases * fix eth dir * fix subdir of core * fix subdir of eth * fix cmd/geth dir * fix ethtest by adding UpgradeStatusMsg when handshake * fix ethclient_test.go * fix ethclient/simulated * fix internal * fix graphql * fix consensus * fix accounts * fix log * fix p2p * fix metrics * fix tests dir * fix golangci-lint --------- Co-authored-by: Matus Kysel <matus.kysel@bnbchain.org>
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
|
|
index 36d33e41c..adb10883e 100644
|
|
--- a/core/vm/contracts.go
|
|
+++ b/core/vm/contracts.go
|
|
@@ -78,9 +78,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{
|
|
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 b32b4d943..8b544af08 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.
|