Skip to content

Commit fbd5e22

Browse files
authored
Schedule Pectra for Chiado (#13935)
Port PR #13898 into `release/2.61`
1 parent 3eb57db commit fbd5e22

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

cl/clparams/config.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,18 +904,20 @@ func gnosisConfig() BeaconChainConfig {
904904
cfg.BellatrixForkVersion = 0x02000064
905905
cfg.CapellaForkEpoch = 648704
906906
cfg.CapellaForkVersion = 0x03000064
907+
cfg.DenebForkEpoch = 889856
908+
cfg.DenebForkVersion = 0x04000064
907909
cfg.TerminalTotalDifficulty = "8626000000000000000000058750000000000000000000"
908910
cfg.DepositContractAddress = "0x0B98057eA310F4d31F2a452B414647007d1645d9"
909911
cfg.BaseRewardFactor = 25
910912
cfg.SlotsPerEpoch = 16
911913
cfg.EpochsPerSyncCommitteePeriod = 512
912-
cfg.DenebForkEpoch = 889856
913-
cfg.DenebForkVersion = 0x04000064
914914
cfg.InactivityScoreRecoveryRate = 16
915915
cfg.InactivityScoreBias = 4
916916
cfg.MaxWithdrawalsPerPayload = 8
917917
cfg.MaxValidatorsPerWithdrawalsSweep = 8192
918+
cfg.MaxBlobsPerBlock = 2
918919
cfg.MaxPerEpochActivationChurnLimit = 2
920+
cfg.MaxPerEpochActivationExitChurnLimit = 64_000_000_000
919921
cfg.InitializeForkSchedule()
920922
return cfg
921923
}
@@ -941,12 +943,16 @@ func chiadoConfig() BeaconChainConfig {
941943
cfg.CapellaForkVersion = 0x0300006f
942944
cfg.DenebForkEpoch = 516608
943945
cfg.DenebForkVersion = 0x0400006f
946+
cfg.ElectraForkEpoch = 948224
947+
cfg.ElectraForkVersion = 0x0500006f
944948
cfg.TerminalTotalDifficulty = "231707791542740786049188744689299064356246512"
945949
cfg.DepositContractAddress = "0xb97036A26259B7147018913bD58a774cf91acf25"
946950
cfg.BaseRewardFactor = 25
947951
cfg.SlotsPerEpoch = 16
948952
cfg.EpochsPerSyncCommitteePeriod = 512
953+
cfg.MaxBlobsPerBlock = 2
949954
cfg.MaxPerEpochActivationChurnLimit = 2
955+
cfg.MaxPerEpochActivationExitChurnLimit = 64_000_000_000
950956
cfg.InitializeForkSchedule()
951957
return cfg
952958
}

core/forkid/forkid_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,13 @@ func TestCreation(t *testing.T) {
164164
params.ChiadoGenesisHash,
165165
[]testcase{
166166
{0, 0, ID{Hash: checksumToBytes(0x50d39d7b), Next: 1684934220}},
167-
{4100418, 1684934215, ID{Hash: checksumToBytes(0x50d39d7b), Next: 1684934220}}, // Last pre-Shanghai block
168-
{4100419, 1684934220, ID{Hash: checksumToBytes(0xa15a4252), Next: 1706724940}}, // First Shanghai block
169-
{8021277, 1706724930, ID{Hash: checksumToBytes(0xa15a4252), Next: 1706724940}}, // Last Shanghai block
170-
{8021278, 1706724940, ID{Hash: checksumToBytes(0x5fbc16bc), Next: 0}}, // First Cancun block
171-
{10000000, 1800000000, ID{Hash: checksumToBytes(0x5fbc16bc), Next: 0}}, // Future Cancun block (mock)
167+
{4100418, 1684934215, ID{Hash: checksumToBytes(0x50d39d7b), Next: 1684934220}}, // Last pre-Shanghai block
168+
{4100419, 1684934220, ID{Hash: checksumToBytes(0xa15a4252), Next: 1706724940}}, // First Shanghai block
169+
{8021277, 1706724930, ID{Hash: checksumToBytes(0xa15a4252), Next: 1706724940}}, // Last Shanghai block
170+
{8021278, 1706724940, ID{Hash: checksumToBytes(0x5fbc16bc), Next: 1741254220}}, // First Cancun block
171+
{14655798, 1741254215, ID{Hash: checksumToBytes(0x5fbc16bc), Next: 1741254220}}, // Last Cancun block (approx)
172+
{14655799, 1741254220, ID{Hash: checksumToBytes(0x8ba51786), Next: 0}}, // First Prague block (approx)
173+
{20000000, 1800000000, ID{Hash: checksumToBytes(0x8ba51786), Next: 0}}, // Future Prague block (mock)
172174
},
173175
},
174176
// Mumbai test cases

params/chainspecs/chiado.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"terminalTotalDifficultyPassed": true,
1616
"shanghaiTime": 1684934220,
1717
"cancunTime": 1706724940,
18+
"pragueTime": 1741254220,
1819
"minBlobGasPrice": 1000000000,
1920
"blobSchedule": {
2021
"cancun": {

0 commit comments

Comments
 (0)