From 26c1e6e9157a0c6be923b5eed8d4c0cdd79a7146 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Fri, 10 Feb 2023 11:33:12 +0100 Subject: [PATCH 1/2] params: schedule shanghai fork on sepolia --- core/forkid/forkid_test.go | 8 +++++--- params/config.go | 3 +++ params/config_test.go | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index c4b46bf411d0..60ce0e26354a 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -147,9 +147,11 @@ func TestCreation(t *testing.T) { params.SepoliaChainConfig, params.SepoliaGenesisHash, []testcase{ - {0, 0, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople, Petersburg, Istanbul, Berlin and first London block - {1735370, 0, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Last London block - {1735371, 0, ID{Hash: checksumToBytes(0xb96cbd13), Next: 0}}, // First MergeNetsplit block + {0, 0, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople, Petersburg, Istanbul, Berlin and first London block + {1735370, 0, ID{Hash: checksumToBytes(0xfe3366e7), Next: 1735371}}, // Last London block + {1735371, 0, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // First MergeNetsplit block + {1735372, 1677557087, ID{Hash: checksumToBytes(0xb96cbd13), Next: 1677557088}}, // Last MergeNetsplit block + {1735372, 1677557088, ID{Hash: checksumToBytes(0xf7f9bc08), Next: 0}}, // First Shanghai block }, }, // Temporary timestamped test cases diff --git a/params/config.go b/params/config.go index 3196a31de0ce..cc88d1ced5a0 100644 --- a/params/config.go +++ b/params/config.go @@ -53,6 +53,8 @@ var CheckpointOracles = map[common.Hash]*CheckpointOracleConfig{ GoerliGenesisHash: GoerliCheckpointOracle, } +func u64(val uint64) *uint64 { return &val } + var ( MainnetTerminalTotalDifficulty, _ = new(big.Int).SetString("58_750_000_000_000_000_000_000", 0) @@ -163,6 +165,7 @@ var ( TerminalTotalDifficulty: big.NewInt(17_000_000_000_000_000), TerminalTotalDifficultyPassed: true, MergeNetsplitBlock: big.NewInt(1735371), + ShanghaiTime: u64(1677557088), Ethash: new(EthashConfig), } diff --git a/params/config_test.go b/params/config_test.go index f3911f433f3c..ed727039f10a 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -25,8 +25,6 @@ import ( "github.com/ethereum/go-ethereum/common/math" ) -func u64(val uint64) *uint64 { return &val } - func TestCheckCompatible(t *testing.T) { type test struct { stored, new *ChainConfig From 9cf01d0b925efb289dfa49bf58c6de49c6452e5e Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Fri, 10 Feb 2023 12:32:36 +0100 Subject: [PATCH 2/2] params: u64 -> newUint64 --- params/config.go | 4 ++-- params/config_test.go | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/params/config.go b/params/config.go index cc88d1ced5a0..c287adf3bc2b 100644 --- a/params/config.go +++ b/params/config.go @@ -53,7 +53,7 @@ var CheckpointOracles = map[common.Hash]*CheckpointOracleConfig{ GoerliGenesisHash: GoerliCheckpointOracle, } -func u64(val uint64) *uint64 { return &val } +func newUint64(val uint64) *uint64 { return &val } var ( MainnetTerminalTotalDifficulty, _ = new(big.Int).SetString("58_750_000_000_000_000_000_000", 0) @@ -165,7 +165,7 @@ var ( TerminalTotalDifficulty: big.NewInt(17_000_000_000_000_000), TerminalTotalDifficultyPassed: true, MergeNetsplitBlock: big.NewInt(1735371), - ShanghaiTime: u64(1677557088), + ShanghaiTime: newUint64(1677557088), Ethash: new(EthashConfig), } diff --git a/params/config_test.go b/params/config_test.go index ed727039f10a..5634569e29f0 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -93,19 +93,19 @@ func TestCheckCompatible(t *testing.T) { }, }, { - stored: &ChainConfig{ShanghaiTime: u64(10)}, - new: &ChainConfig{ShanghaiTime: u64(20)}, + stored: &ChainConfig{ShanghaiTime: newUint64(10)}, + new: &ChainConfig{ShanghaiTime: newUint64(20)}, headTimestamp: 9, wantErr: nil, }, { - stored: &ChainConfig{ShanghaiTime: u64(10)}, - new: &ChainConfig{ShanghaiTime: u64(20)}, + stored: &ChainConfig{ShanghaiTime: newUint64(10)}, + new: &ChainConfig{ShanghaiTime: newUint64(20)}, headTimestamp: 25, wantErr: &ConfigCompatError{ What: "Shanghai fork timestamp", - StoredTime: u64(10), - NewTime: u64(20), + StoredTime: newUint64(10), + NewTime: newUint64(20), RewindToTime: 9, }, }, @@ -121,7 +121,7 @@ func TestCheckCompatible(t *testing.T) { func TestConfigRules(t *testing.T) { c := &ChainConfig{ - ShanghaiTime: u64(500), + ShanghaiTime: newUint64(500), } var stamp uint64 if r := c.Rules(big.NewInt(0), true, stamp); r.IsShanghai {