diff --git a/src/Nethermind/Chains/chiado.json b/src/Nethermind/Chains/chiado.json index 0ed220833d9a..60a243dbe2c5 100644 --- a/src/Nethermind/Chains/chiado.json +++ b/src/Nethermind/Chains/chiado.json @@ -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": [ { diff --git a/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs b/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs index 1ea0081cdc6d..f377009b8514 100644 --- a/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs +++ b/src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs @@ -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); diff --git a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecBasedSpecProviderTests.cs b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecBasedSpecProviderTests.cs index 29a82c734184..2f129dc18535 100644 --- a/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecBasedSpecProviderTests.cs +++ b/src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecBasedSpecProviderTests.cs @@ -379,9 +379,10 @@ public static IEnumerable 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" }; } } @@ -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()) { diff --git a/src/Nethermind/Nethermind.Specs/ChiadoSpecProvider.cs b/src/Nethermind/Nethermind.Specs/ChiadoSpecProvider.cs index 9ef94e5708c2..006775826f26 100644 --- a/src/Nethermind/Nethermind.Specs/ChiadoSpecProvider.cs +++ b/src/Nethermind/Nethermind.Specs/ChiadoSpecProvider.cs @@ -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");