Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/Nethermind/Chains/chiado.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,6 @@
"eip7623TransitionTimestamp": "0x67c96e4c",
"eip7702TransitionTimestamp": "0x67c96e4c",
"eip4844FeeCollectorTransitionTimestamp": "0x67c96e4c",
"eip7594TransitionTimestamp": "0x68f74e4c",
"eip7823TransitionTimestamp": "0x68f74e4c",
"eip7825TransitionTimestamp": "0x68f74e4c",
"eip7883TransitionTimestamp": "0x68f74e4c",
"eip7918TransitionTimestamp": "0x68f74e4c",
"eip7934TransitionTimestamp": "0x68f74e4c",
"eip7939TransitionTimestamp": "0x68f74e4c",
"eip7951TransitionTimestamp": "0x68f74e4c",
"depositContractAddress": "0xb97036a26259b7147018913bd58a774cf91acf25",
"blobSchedule": [
{
Expand Down
9 changes: 5 additions & 4 deletions src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,11 @@ public void Fork_id_and_hash_as_expected_on_gnosis(long head, ulong headTimestam
[TestCase(3945317, ChiadoSpecProvider.ShanghaiTimestamp, "0xa15a4252", ChiadoSpecProvider.CancunTimestamp, "First Shanghai timestamp")]
[TestCase(4_000_000, ChiadoSpecProvider.CancunTimestamp, "0x5fbc16bc", 1741254220ul, "First Cancun timestamp")]
[TestCase(5_000_000, 1741254219u, "0x5fbc16bc", 1741254220ul, "Future Cancun timestamp")]
[TestCase(5_000_000, 1741254220u, "0x8ba51786", 1761037900ul, "First Prague timestamp")]
[TestCase(5_000_000, 1741254420u, "0x8ba51786", 1761037900ul, "Future Prague timestamp")]
[TestCase(5_000_000, 1761037900u, "0x82612523", 0ul, "First Osaka timestamp")]
[TestCase(5_000_000, 1761038000u, "0x82612523", 0ul, "Future Osaka timestamp")]
[TestCase(5_000_000, 1741254220u, "0x8ba51786", 0ul, "First Prague timestamp")]
[TestCase(5_000_000, 1741254420u, "0x8ba51786", 0ul, "Future Prague timestamp")]
// [TestCase(5_000_000, 1741254420u, "0x8ba51786", 1761037900ul, "Future Prague timestamp")]
// [TestCase(5_000_000, 1761037900u, "0x82612523", 0ul, "First Osaka timestamp")]
// [TestCase(5_000_000, 1761038000u, "0x82612523", 0ul, "Future Osaka timestamp")]
public void Fork_id_and_hash_as_expected_on_chiado(long head, ulong headTimestamp, string forkHashHex, ulong next, string description)
{
ChainSpecFileLoader loader = new(new EthereumJsonSerializer(), LimboTraceLogger.Instance);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,10 @@ public static IEnumerable<TestCaseData> ChiadoActivations
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.CancunTimestamp)) { TestName = "Cancun" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.PragueTimestamp - 1)) { TestName = "Before Prague" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.PragueTimestamp)) { TestName = "Prague" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp - 1)) { TestName = "Before Osaka" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp)) { TestName = "Osaka" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp + 100000000)) { TestName = "Future" };
yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.PragueTimestamp + 100000000)) { TestName = "Future" };
// yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp - 1)) { TestName = "Before Osaka" };
// yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp)) { TestName = "Osaka" };
// yield return new TestCaseData((ForkActivation)(1, ChiadoSpecProvider.OsakaTimestamp + 100000000)) { TestName = "Future" };
}
}

Expand All @@ -407,12 +408,12 @@ public void Chiado_loads_properly(ForkActivation forkActivation)
IReleaseSpec? postCancunSpec = provider.GetSpec((1, ChiadoSpecProvider.CancunTimestamp));
IReleaseSpec? prePragueSpec = provider.GetSpec((1, ChiadoSpecProvider.PragueTimestamp - 1));
IReleaseSpec? postPragueSpec = provider.GetSpec((1, ChiadoSpecProvider.PragueTimestamp));
IReleaseSpec? postOsakaSpec = provider.GetSpec((1, ChiadoSpecProvider.OsakaTimestamp));
// IReleaseSpec? postOsakaSpec = provider.GetSpec((1, ChiadoSpecProvider.OsakaTimestamp));

VerifyGnosisShanghaiSpecifics(preShanghaiSpec, postShanghaiSpec);
VerifyGnosisCancunSpecifics(postCancunSpec);
VerifyGnosisPragueSpecifics(prePragueSpec, postPragueSpec, ChiadoSpecProvider.FeeCollector);
VerifyGnosisOsakaSpecifics(postOsakaSpec, ChiadoSpecProvider.FeeCollector);
// VerifyGnosisOsakaSpecifics(postOsakaSpec, ChiadoSpecProvider.FeeCollector);

using (Assert.EnterMultipleScope())
{
Expand Down
2 changes: 1 addition & 1 deletion src/Nethermind/Nethermind.Specs/ChiadoSpecProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ChiadoSpecProvider : ISpecProvider
public const ulong ShanghaiTimestamp = 0x646e0e4c;
public const ulong CancunTimestamp = 0x65ba8e4c;
public const ulong PragueTimestamp = 0x67c96e4c;
public const ulong OsakaTimestamp = 0x68f74e4c;
public const ulong OsakaTimestamp = ulong.MaxValue - 1;

public static readonly Address FeeCollector = new("0x1559000000000000000000000000000000000000");

Expand Down