Skip to content

Commit 53d08cb

Browse files
tanishqjasoriaLukaszRozmej
tanishqjasoria
and
LukaszRozmej
authored
Gray glacier - EIP-5133 (#4159)
* add difficulty bomb delay upgrade * add tests * add todo to modify placeholder values * set the name of update * update values for delay and fork block number * add todo * update fork ids * clean todo * simple GetSpec refactoring to switch expressions * remove old comment Co-authored-by: lukasz.rozmej <[email protected]>
1 parent c5420c2 commit 53d08cb

18 files changed

+183
-216
lines changed

‎src/Nethermind/Chains/foundation.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@
139139
"0x6f1580": "0x1e8480",
140140
"0x8C6180": "0x3D0900",
141141
"0xC5D488": "0xAAE60",
142-
"0xD228C8": "0xF4240"
142+
"0xD228C8": "0xF4240",
143+
"0xE5A510": "0xAAE60"
143144
}
144145
}
145146
}

‎src/Nethermind/Nethermind.Ethash.Test/DifficultyCalculatorTests.cs

+10
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,16 @@ public void ArrowGlacier_calculation_should_not_be_equal_to_London0(long blocksA
8383
Calculation_should_not_be_equal_on_different_difficulty_hard_forks(blocksAbove,
8484
London.Instance, ArrowGlacier.Instance);
8585
}
86+
87+
// previous difficulty bomb + InitialDifficultyBombBlock + offset
88+
[TestCase(10700000 + EthashDifficultyCalculator.InitialDifficultyBombBlock + 1)]
89+
[TestCase(10700000 + EthashDifficultyCalculator.InitialDifficultyBombBlock + 3)]
90+
[TestCase(10700000 + EthashDifficultyCalculator.InitialDifficultyBombBlock + 730000)]
91+
public void GrayGlacier_calculation_should_not_be_equal_to_ArrowGlacier(long blocksAbove)
92+
{
93+
Calculation_should_not_be_equal_on_different_difficulty_hard_forks(blocksAbove,
94+
ArrowGlacier.Instance, GrayGlacier.Instance);
95+
}
8696

8797
private void Calculation_should_not_be_equal_on_different_difficulty_hard_forks(
8898
long blocksAbove, IReleaseSpec firstHardfork, IReleaseSpec secondHardfork)

‎src/Nethermind/Nethermind.Network.Test/ForkInfoTests.cs

+9-7
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,24 @@ public class ForkInfoTests
5151
[TestCase(12_964_999, "0x0eb440f6", 12_965_000, "Last Berlin")]
5252
[TestCase(12_965_000, "0xb715077d", 13_773_000L, "First London")]
5353
[TestCase(13_772_999, "0xb715077d", 13_773_000L, "Last London")]
54-
[TestCase(13_773_000, "0x20c327fc", 0L, "First Arrow Glacier")]
55-
[TestCase(14_811_000, "0x20c327fc", 0L, "Future Arrow Glacier")]
54+
[TestCase(13_773_000, "0x20c327fc", 15_050_000L, "First Arrow Glacier")]
55+
[TestCase(15_049_999, "0x20c327fc", 15_050_000L, "Last Arrow Glacier")]
56+
[TestCase(15_050_000, "0xf0afd0e3", 0L, "First Gray Glacier")]
57+
[TestCase(20_000_000, "0xf0afd0e3", 0L, "Future Gray Glacier")]
5658
public void Fork_id_and_hash_as_expected(long head, string forkHashHex, long next, string description)
5759
{
5860
Test(head, KnownHashes.MainnetGenesis, forkHashHex, next, description, MainnetSpecProvider.Instance, "foundation.json");
5961
}
6062

61-
[TestCase(13_773_000, "0x20c327fc", 15_000_000L, "First Arrow Glacier")]
62-
[TestCase(15_000_000, "0xe3abe201", 0L, "First Merge Fork Id test")]
63-
[TestCase(15_811_000, "0xe3abe201", 0L, "Future Merge Fork Id test")]
63+
[TestCase(15_050_000, "0xf0afd0e3", 21_000_000L, "First Gray Glacier")]
64+
[TestCase(21_000_000, "0x3f5fd195", 0L, "First Merge Fork Id test")]
65+
[TestCase(21_811_000, "0x3f5fd195", 0L, "Future Merge Fork Id test")]
6466
public void Fork_id_and_hash_as_expected_with_merge_fork_id(long head, string forkHashHex, long next, string description)
6567
{
6668
ChainSpecLoader loader = new ChainSpecLoader(new EthereumJsonSerializer());
6769
ChainSpec spec = loader.Load(File.ReadAllText(Path.Combine("../../../../Chains", "foundation.json")));
68-
spec.Parameters.MergeForkIdTransition = 15_000_000L;
69-
spec.MergeForkIdBlockNumber = 15_000_000L;
70+
spec.Parameters.MergeForkIdTransition = 21_000_000L;
71+
spec.MergeForkIdBlockNumber = 21_000_000L;
7072
ChainSpecBasedSpecProvider provider = new ChainSpecBasedSpecProvider(spec);
7173
Test(head, KnownHashes.MainnetGenesis, forkHashHex, next, description, provider);
7274
}

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ public void Mainnet_loads_properly()
148148
MainnetSpecProvider.LondonBlockNumber,
149149
MainnetSpecProvider.ArrowGlacierBlockNumber - 1,
150150
MainnetSpecProvider.ArrowGlacierBlockNumber,
151+
MainnetSpecProvider.GrayGlacierBlockNumber - 1,
152+
MainnetSpecProvider.GrayGlacierBlockNumber,
151153
99_000_000, // far in the future
152154
};
153155

@@ -166,7 +168,9 @@ public void Mainnet_loads_properly()
166168
Assert.AreEqual(9_700_000, provider.GetSpec(12_965_000).DifficultyBombDelay);
167169
Assert.AreEqual(9_700_000, provider.GetSpec(13_772_999).DifficultyBombDelay);
168170
Assert.AreEqual(10_700_000, provider.GetSpec(13_773_000).DifficultyBombDelay);
169-
Assert.AreEqual(10_700_000, provider.GetSpec(99_414_000).DifficultyBombDelay);
171+
Assert.AreEqual(10_700_000, provider.GetSpec(15_049_999).DifficultyBombDelay);
172+
Assert.AreEqual(11_400_000, provider.GetSpec(15_050_000).DifficultyBombDelay);
173+
Assert.AreEqual(11_400_000, provider.GetSpec(99_414_000).DifficultyBombDelay);
170174
}
171175

172176
private static void CompareSpecProviders(

‎src/Nethermind/Nethermind.Specs.Test/ChainSpecStyle/ChainSpecLoaderTests.cs

+2
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ public void Can_load_mainnet()
293293
chainSpec.BerlinBlockNumber.Should().Be(MainnetSpecProvider.BerlinBlockNumber);
294294
chainSpec.LondonBlockNumber.Should().Be(MainnetSpecProvider.LondonBlockNumber);
295295
chainSpec.ArrowGlacierBlockNumber.Should().Be(MainnetSpecProvider.ArrowGlacierBlockNumber);
296+
chainSpec.GrayGlacierBlockNumber.Should().Be(MainnetSpecProvider.GrayGlacierBlockNumber);
296297
}
297298

298299
[Test]
@@ -363,6 +364,7 @@ public void Can_load_spaceneth()
363364
chainSpec.BerlinBlockNumber.Should().Be(0L);
364365
chainSpec.LondonBlockNumber.Should().Be(0L);
365366
chainSpec.ArrowGlacierBlockNumber.Should().Be(null);
367+
chainSpec.GrayGlacierBlockNumber.Should().Be(null);
366368
}
367369

368370
[Test]

‎src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpec.cs

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ public class ChainSpec
8080

8181
public long? ArrowGlacierBlockNumber { get; set; }
8282

83+
public long? GrayGlacierBlockNumber { get; set; }
84+
8385
public long? MergeForkIdBlockNumber { get; set; }
8486

8587
public long? TerminalPoWBlockNumber { get; set; }

‎src/Nethermind/Nethermind.Specs/ChainSpecStyle/ChainSpecLoader.cs

+3
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ private static void LoadTransitions(ChainSpecJson chainSpecJson, ChainSpec chain
219219
chainSpec.ArrowGlacierBlockNumber = chainSpec.Ethash?.DifficultyBombDelays.Count > 4 ?
220220
chainSpec.Ethash?.DifficultyBombDelays.Keys.ToArray()[4]
221221
: null;
222+
chainSpec.GrayGlacierBlockNumber = chainSpec.Ethash?.DifficultyBombDelays.Count > 5 ?
223+
chainSpec.Ethash?.DifficultyBombDelays.Keys.ToArray()[5]
224+
: null;
222225

223226
// TheMerge parameters
224227
chainSpec.MergeForkIdBlockNumber = chainSpec.Parameters.MergeForkIdTransition;

‎src/Nethermind/Nethermind.Specs/Forks/14_GrayGlacier.cs

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// Copyright (c) 2021 Demerzel Solutions Limited
2+
// This file is part of the Nethermind library.
3+
//
4+
// The Nethermind library is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Lesser General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// The Nethermind library is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Lesser General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Lesser General Public License
15+
// along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
16+
//
17+
18+
using System.Threading;
19+
using Nethermind.Core;
20+
using Nethermind.Core.Specs;
21+
using Nethermind.Int256;
22+
23+
namespace Nethermind.Specs.Forks
24+
{
25+
public class GrayGlacier : IReleaseSpec
26+
{
27+
private static IReleaseSpec _instance;
28+
29+
private GrayGlacier() { }
30+
31+
public static IReleaseSpec Instance => LazyInitializer.EnsureInitialized(ref _instance, () => new GrayGlacier());
32+
33+
public string Name => "Gray Glacier";
34+
public long MaximumExtraDataSize => 32;
35+
public long MaxCodeSize => 24576;
36+
public long MinGasLimit => 5000;
37+
public long GasLimitBoundDivisor => 0x0400;
38+
public UInt256 BlockReward { get; } = UInt256.Parse("2000000000000000000");
39+
public long DifficultyBombDelay => 11400000L;
40+
public long DifficultyBoundDivisor => 0x0800;
41+
public long? FixedDifficulty => null;
42+
public int MaximumUncleCount => 2;
43+
public bool IsTimeAdjustmentPostOlympic => true;
44+
public bool IsEip2Enabled => true;
45+
public bool IsEip7Enabled => true;
46+
public bool IsEip100Enabled => true;
47+
public bool IsEip140Enabled => true;
48+
public bool IsEip150Enabled => true;
49+
public bool IsEip155Enabled => true;
50+
public bool IsEip158Enabled => true;
51+
public bool IsEip160Enabled => true;
52+
public bool IsEip170Enabled => true;
53+
public bool IsEip196Enabled => true;
54+
public bool IsEip197Enabled => true;
55+
public bool IsEip198Enabled => true;
56+
public bool IsEip211Enabled => true;
57+
public bool IsEip214Enabled => true;
58+
public bool IsEip649Enabled => true;
59+
public bool IsEip658Enabled => true;
60+
public bool IsEip145Enabled => true;
61+
public bool IsEip1014Enabled => true;
62+
public bool IsEip1052Enabled => true;
63+
public bool IsEip1283Enabled => false;
64+
public bool IsEip1234Enabled => true;
65+
public bool IsEip1344Enabled => true;
66+
public bool IsEip2028Enabled => true;
67+
public bool IsEip152Enabled => true;
68+
public bool IsEip1108Enabled => true;
69+
public bool IsEip1884Enabled => true;
70+
public bool IsEip2200Enabled => true;
71+
public bool IsEip2315Enabled => false;
72+
public bool IsEip2537Enabled => false;
73+
public bool IsEip2565Enabled => true;
74+
public bool IsEip2929Enabled => true;
75+
public bool IsEip2930Enabled => true;
76+
public bool IsEip158IgnoredAccount(Address address) => false;
77+
public bool IsEip1559Enabled => true;
78+
public bool IsEip3198Enabled => true;
79+
public bool IsEip3529Enabled => true;
80+
public bool IsEip3541Enabled => true;
81+
public bool IsEip3607Enabled => true;
82+
public long Eip1559TransitionBlock => 12965000;
83+
}
84+
}

‎src/Nethermind/Nethermind.Specs/FrontierSpecProvider.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
3737
public UInt256? TerminalTotalDifficulty { get; private set; }
3838
public IReleaseSpec GenesisSpec => Frontier.Instance;
3939

40-
public IReleaseSpec GetSpec(long blockNumber)
41-
{
42-
return Frontier.Instance;
43-
}
40+
public IReleaseSpec GetSpec(long blockNumber) => Frontier.Instance;
4441

4542
public long? DaoBlockNumber { get; } = null;
4643

‎src/Nethermind/Nethermind.Specs/GoerliSpecProvider.cs

+10-21
Original file line numberDiff line numberDiff line change
@@ -46,30 +46,19 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
4646

4747
private IReleaseSpec LondonNoBomb { get; } = London.Instance;
4848

49-
public IReleaseSpec GetSpec(long blockNumber)
50-
{
51-
if (blockNumber < IstanbulBlockNumber)
52-
{
53-
return GenesisSpec;
54-
}
55-
56-
if (blockNumber < BerlinBlockNumber)
57-
{
58-
return IstanbulNoBomb;
59-
}
60-
61-
if (blockNumber < LondonBlockNumber)
49+
public IReleaseSpec GetSpec(long blockNumber) =>
50+
blockNumber switch
6251
{
63-
return BerlinNoBomb;
64-
}
65-
66-
return LondonNoBomb;
67-
}
52+
< IstanbulBlockNumber => GenesisSpec,
53+
< BerlinBlockNumber => IstanbulNoBomb,
54+
< LondonBlockNumber => BerlinNoBomb,
55+
_ => LondonNoBomb
56+
};
6857

6958
public long? DaoBlockNumber => null;
70-
public static long IstanbulBlockNumber => 1_561_651;
71-
public static long BerlinBlockNumber => 4_460_644;
72-
public static long LondonBlockNumber => 5_062_605;
59+
public const long IstanbulBlockNumber = 1_561_651;
60+
public const long BerlinBlockNumber = 4_460_644;
61+
public const long LondonBlockNumber = 5_062_605;
7362
public ulong ChainId => Core.ChainId.Goerli;
7463

7564
public long[] TransitionBlocks { get; } =

‎src/Nethermind/Nethermind.Specs/MainNetSpecProvider.cs

+18-59
Original file line numberDiff line numberDiff line change
@@ -36,65 +36,23 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
3636
public UInt256? TerminalTotalDifficulty { get; private set; }
3737
public IReleaseSpec GenesisSpec => Frontier.Instance;
3838

39-
public IReleaseSpec GetSpec(long blockNumber)
40-
{
41-
if (blockNumber < HomesteadBlockNumber)
42-
{
43-
return Frontier.Instance;
44-
}
45-
46-
if (blockNumber < DaoBlockNumber)
47-
{
48-
return Homestead.Instance;
49-
}
50-
51-
if (blockNumber < TangerineWhistleBlockNumber)
52-
{
53-
return Dao.Instance;
54-
}
55-
56-
if (blockNumber < SpuriousDragonBlockNumber)
57-
{
58-
return TangerineWhistle.Instance;
59-
}
60-
61-
if (blockNumber < ByzantiumBlockNumber)
39+
public IReleaseSpec GetSpec(long blockNumber) =>
40+
blockNumber switch
6241
{
63-
return SpuriousDragon.Instance;
64-
}
65-
66-
if (blockNumber < ConstantinopleFixBlockNumber)
67-
{
68-
return Byzantium.Instance;
69-
}
70-
71-
if (blockNumber < IstanbulBlockNumber)
72-
{
73-
return ConstantinopleFix.Instance;
74-
}
75-
76-
if (blockNumber < MuirGlacierBlockNumber)
77-
{
78-
return Istanbul.Instance;
79-
}
80-
81-
if (blockNumber < BerlinBlockNumber)
82-
{
83-
return MuirGlacier.Instance;
84-
}
85-
86-
if (blockNumber < LondonBlockNumber)
87-
{
88-
return Berlin.Instance;
89-
}
90-
91-
if (blockNumber < ArrowGlacierBlockNumber)
92-
{
93-
return London.Instance;
94-
}
95-
96-
return ArrowGlacier.Instance;
97-
}
42+
< HomesteadBlockNumber => Frontier.Instance,
43+
< DaoBlockNumberConst => Homestead.Instance,
44+
< TangerineWhistleBlockNumber => Dao.Instance,
45+
< SpuriousDragonBlockNumber => TangerineWhistle.Instance,
46+
< ByzantiumBlockNumber => SpuriousDragon.Instance,
47+
< ConstantinopleFixBlockNumber => Byzantium.Instance,
48+
< IstanbulBlockNumber => ConstantinopleFix.Instance,
49+
< MuirGlacierBlockNumber => Istanbul.Instance,
50+
< BerlinBlockNumber => MuirGlacier.Instance,
51+
< LondonBlockNumber => Berlin.Instance,
52+
< ArrowGlacierBlockNumber => London.Instance,
53+
< GrayGlacierBlockNumber => ArrowGlacier.Instance,
54+
_ => GrayGlacier.Instance
55+
};
9856

9957
public const long HomesteadBlockNumber = 1_150_000;
10058
public long? DaoBlockNumber => DaoBlockNumberConst;
@@ -108,6 +66,7 @@ public IReleaseSpec GetSpec(long blockNumber)
10866
public const long BerlinBlockNumber = 12_244_000;
10967
public const long LondonBlockNumber = 12_965_000;
11068
public const long ArrowGlacierBlockNumber = 13_773_000;
69+
public const long GrayGlacierBlockNumber = 15_050_000;
11170
public const long ShanghaiBlockNumber = long.MaxValue - 4;
11271
public const long CancunBlockNumber = long.MaxValue - 3;
11372
public const long PragueBlockNumber = long.MaxValue - 2;
@@ -119,7 +78,7 @@ public IReleaseSpec GetSpec(long blockNumber)
11978
{
12079
HomesteadBlockNumber, DaoBlockNumberConst, TangerineWhistleBlockNumber, SpuriousDragonBlockNumber,
12180
ByzantiumBlockNumber, ConstantinopleFixBlockNumber, IstanbulBlockNumber, MuirGlacierBlockNumber,
122-
BerlinBlockNumber, LondonBlockNumber, ArrowGlacierBlockNumber
81+
BerlinBlockNumber, LondonBlockNumber, ArrowGlacierBlockNumber, GrayGlacierBlockNumber
12382
};
12483

12584
private MainnetSpecProvider() { }

‎src/Nethermind/Nethermind.Specs/MordenSpecProvider.cs

+6-13
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,13 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
3636
public UInt256? TerminalTotalDifficulty { get; private set; }
3737
public IReleaseSpec GenesisSpec => Frontier.Instance;
3838

39-
public IReleaseSpec GetSpec(long blockNumber)
40-
{
41-
if (blockNumber < 494000)
42-
{
43-
return Frontier.Instance;
44-
}
45-
46-
if (blockNumber < 1885000)
39+
public IReleaseSpec GetSpec(long blockNumber) =>
40+
blockNumber switch
4741
{
48-
return Homestead.Instance;
49-
}
50-
51-
return SpuriousDragon.Instance;
52-
}
42+
< 494000 => Frontier.Instance,
43+
< 1885000 => Homestead.Instance,
44+
_ => SpuriousDragon.Instance
45+
};
5346

5447
public long? DaoBlockNumber => null;
5548

‎src/Nethermind/Nethermind.Specs/OlympicSpecProvider.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ public void UpdateMergeTransitionInfo(long? blockNumber, UInt256? terminalTotalD
3636
public UInt256? TerminalTotalDifficulty { get; private set; }
3737
public IReleaseSpec GenesisSpec => Olympic.Instance;
3838

39-
public IReleaseSpec GetSpec(long blockNumber)
40-
{
41-
return Olympic.Instance;
42-
}
39+
public IReleaseSpec GetSpec(long blockNumber) => Olympic.Instance;
4340

4441
public long? DaoBlockNumber => 0L;
4542

0 commit comments

Comments
 (0)