Skip to content

Commit 62f034e

Browse files
smartprogrammer93kamilchodola
authored andcommitted
remove cancun timestamp temporarily (#6052)
1 parent f356206 commit 62f034e

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

src/Nethermind/Chains/holesky.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@
3939
"eip3855TransitionTimestamp": "0x6505e360",
4040
"eip3860TransitionTimestamp": "0x6505e360",
4141
"eip4895TransitionTimestamp": "0x6505e360",
42-
"eip4844TransitionTimestamp": "0x77359400",
43-
"eip4788TransitionTimestamp": "0x77359400",
44-
"eip4788ContractAddress": "0x000000000000000000000000000000000000000b",
45-
"eip1153TransitionTimestamp": "0x77359400",
46-
"eip5656TransitionTimestamp": "0x77359400",
47-
"eip6780TransitionTimestamp": "0x77359400",
4842
"terminalTotalDifficulty": "0x0",
4943
"gasLimitBoundDivisor": "0x400",
5044
"maxCodeSize": "0x6000",

src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecBasedSpecProviderTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ public void Holesky_loads_properly()
155155
new ForkActivation(0, HoleskySpecProvider.GenesisTimestamp),
156156
new ForkActivation(1, HoleskySpecProvider.ShanghaiTimestamp),
157157
new ForkActivation(3, HoleskySpecProvider.ShanghaiTimestamp + 24),
158-
new ForkActivation(4, HoleskySpecProvider.CancunTimestamp),
159-
new ForkActivation(5, HoleskySpecProvider.CancunTimestamp + 12),
158+
//new ForkActivation(4, HoleskySpecProvider.CancunTimestamp),
159+
//new ForkActivation(5, HoleskySpecProvider.CancunTimestamp + 12),
160160
};
161161

162162
CompareSpecProviders(hardCodedSpec, provider, forkActivationsToTest);
@@ -166,9 +166,8 @@ public void Holesky_loads_properly()
166166
Assert.That(provider.ChainId, Is.EqualTo(BlockchainIds.Holesky));
167167
Assert.That(provider.NetworkId, Is.EqualTo(BlockchainIds.Holesky));
168168

169-
// Still commented since Cancun timestamp is set to be very far but not a 256 slot multiple
170-
//GetTransitionTimestamps(chainSpec.Parameters).Should().AllSatisfy(
171-
// t => ValidateSlotByTimestamp(t, HoleskySpecProvider.GenesisTimestamp).Should().BeTrue());
169+
GetTransitionTimestamps(chainSpec.Parameters).Should().AllSatisfy(
170+
t => ValidateSlotByTimestamp(t, HoleskySpecProvider.GenesisTimestamp).Should().BeTrue());
172171
}
173172

174173
[Test]

src/Nethermind/Nethermind.Specs/HoleskySpecProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class HoleskySpecProvider : ISpecProvider
1212
{
1313
public const ulong GenesisTimestamp = 0x65046360;
1414
public const ulong ShanghaiTimestamp = 0x6505e360;
15-
public const ulong CancunTimestamp = 0x77359400;
15+
// public const ulong CancunTimestamp = 0x77359400;
1616

1717
private HoleskySpecProvider() { }
1818

@@ -21,8 +21,8 @@ public IReleaseSpec GetSpec(ForkActivation forkActivation)
2121
return forkActivation.Timestamp switch
2222
{
2323
null or < ShanghaiTimestamp => GenesisSpec,
24-
< CancunTimestamp => Shanghai.Instance,
25-
_ => Cancun.Instance
24+
// < CancunTimestamp => Shanghai.Instance,
25+
_ => Shanghai.Instance
2626
};
2727
}
2828

@@ -44,7 +44,7 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
4444
public ForkActivation[] TransitionActivations { get; } =
4545
{
4646
(1, ShanghaiTimestamp),
47-
(2, CancunTimestamp)
47+
// (2, CancunTimestamp)
4848
};
4949

5050
public static readonly HoleskySpecProvider Instance = new();

0 commit comments

Comments
 (0)