Skip to content

Commit 70352dd

Browse files
lukasz-golebiewskikrzysztofpaliga-iohk
lukasz-golebiewski
authored and
krzysztofpaliga-iohk
committed
[ETCM-354] Move difficulty bomb block numbers to ForkBlockNumbers (#1014)
1 parent ce8f98f commit 70352dd

File tree

9 files changed

+36
-33
lines changed

9 files changed

+36
-33
lines changed

‎src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
2424
forkBlockNumbers = ForkBlockNumbers(
2525
frontierBlockNumber = 0,
2626
homesteadBlockNumber = 1150000,
27+
difficultyBombPauseBlockNumber = Long.MaxValue,
28+
difficultyBombContinueBlockNumber = Long.MaxValue,
29+
difficultyBombRemovalBlockNumber = Long.MaxValue,
2730
eip106BlockNumber = Long.MaxValue,
2831
eip150BlockNumber = 2500000,
2932
eip160BlockNumber = 3000000,
@@ -44,9 +47,6 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
4447
customGenesisFileOpt = None,
4548
customGenesisJsonOpt = None,
4649
daoForkConfig = None,
47-
difficultyBombPauseBlockNumber = Long.MaxValue,
48-
difficultyBombContinueBlockNumber = Long.MaxValue,
49-
difficultyBombRemovalBlockNumber = Long.MaxValue,
5050
bootstrapNodes = Set(),
5151
accountStartNonce = UInt256.Zero,
5252
ethCompatibleStorage = true,

‎src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ class ForksTest extends AnyFlatSpec with Matchers {
2323
eip155BlockNumber = 0,
2424
eip106BlockNumber = Long.MaxValue,
2525
eip161BlockNumber = Long.MaxValue,
26+
difficultyBombPauseBlockNumber = Long.MaxValue,
27+
difficultyBombContinueBlockNumber = Long.MaxValue,
28+
difficultyBombRemovalBlockNumber = Long.MaxValue,
2629
byzantiumBlockNumber = Long.MaxValue,
2730
constantinopleBlockNumber = Long.MaxValue,
2831
istanbulBlockNumber = Long.MaxValue,
@@ -43,9 +46,6 @@ class ForksTest extends AnyFlatSpec with Matchers {
4346
maxCodeSize = None,
4447
customGenesisFileOpt = None,
4548
customGenesisJsonOpt = None,
46-
difficultyBombPauseBlockNumber = Long.MaxValue,
47-
difficultyBombContinueBlockNumber = Long.MaxValue,
48-
difficultyBombRemovalBlockNumber = Long.MaxValue,
4949
accountStartNonce = UInt256.Zero,
5050
daoForkConfig = None,
5151
gasTieBreaker = false,

‎src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ class TestService(
187187
eip155BlockNumber = byzantiumBlockNumber,
188188
eip160BlockNumber = byzantiumBlockNumber,
189189
eip161BlockNumber = byzantiumBlockNumber,
190+
difficultyBombPauseBlockNumber = neverOccuringBlock,
191+
difficultyBombContinueBlockNumber = neverOccuringBlock,
192+
difficultyBombRemovalBlockNumber = neverOccuringBlock,
190193
byzantiumBlockNumber = byzantiumBlockNumber,
191194
ecip1049BlockNumber = None,
192195
ecip1097BlockNumber = neverOccuringBlock,

‎src/main/scala/io/iohk/ethereum/utils/BlockchainConfig.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ case class BlockchainConfig(
1515
forkBlockNumbers: ForkBlockNumbers,
1616
treasuryAddress: Address,
1717
maxCodeSize: Option[BigInt],
18-
difficultyBombPauseBlockNumber: BigInt,
19-
difficultyBombContinueBlockNumber: BigInt,
20-
difficultyBombRemovalBlockNumber: BigInt,
2118
customGenesisFileOpt: Option[String],
2219
customGenesisJsonOpt: Option[String],
2320
daoForkConfig: Option[DaoForkConfig],
@@ -46,6 +43,9 @@ case class ForkBlockNumbers(
4643
eip155BlockNumber: BigInt,
4744
eip160BlockNumber: BigInt,
4845
eip161BlockNumber: BigInt,
46+
difficultyBombPauseBlockNumber: BigInt,
47+
difficultyBombContinueBlockNumber: BigInt,
48+
difficultyBombRemovalBlockNumber: BigInt,
4949
byzantiumBlockNumber: BigInt,
5050
constantinopleBlockNumber: BigInt,
5151
istanbulBlockNumber: BigInt,
@@ -139,6 +139,9 @@ object BlockchainConfig {
139139
eip155BlockNumber = eip155BlockNumber,
140140
eip160BlockNumber = eip160BlockNumber,
141141
eip161BlockNumber = eip161BlockNumber,
142+
difficultyBombPauseBlockNumber = difficultyBombPauseBlockNumber,
143+
difficultyBombContinueBlockNumber = difficultyBombContinueBlockNumber,
144+
difficultyBombRemovalBlockNumber = difficultyBombRemovalBlockNumber,
142145
byzantiumBlockNumber = byzantiumBlockNumber,
143146
constantinopleBlockNumber = constantinopleBlockNumber,
144147
istanbulBlockNumber = istanbulBlockNumber,
@@ -153,9 +156,6 @@ object BlockchainConfig {
153156
),
154157
treasuryAddress = treasuryAddress,
155158
maxCodeSize = maxCodeSize,
156-
difficultyBombPauseBlockNumber = difficultyBombPauseBlockNumber,
157-
difficultyBombContinueBlockNumber = difficultyBombContinueBlockNumber,
158-
difficultyBombRemovalBlockNumber = difficultyBombRemovalBlockNumber,
159159
customGenesisFileOpt = customGenesisFileOpt,
160160
customGenesisJsonOpt = customGenesisJsonOpt,
161161
daoForkConfig = daoForkConfig,

‎src/test/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSpec.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
203203

204204
it should "generate block before eip155 and filter out chain specific tx" in new TestSetup {
205205
override lazy val blockchainConfig = BlockchainConfig(
206-
difficultyBombPauseBlockNumber = 3000000,
207-
difficultyBombContinueBlockNumber = 5000000,
208-
difficultyBombRemovalBlockNumber = 5900000,
209206
chainId = 0x3d.toByte,
210207
networkId = 1,
211208
customGenesisFileOpt = Some("test-genesis.json"),
@@ -223,6 +220,9 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
223220
forkBlockNumbers = ForkBlockNumbers(
224221
frontierBlockNumber = 0,
225222
homesteadBlockNumber = 1150000,
223+
difficultyBombPauseBlockNumber = 3000000,
224+
difficultyBombContinueBlockNumber = 5000000,
225+
difficultyBombRemovalBlockNumber = 5900000,
226226
eip155BlockNumber = Long.MaxValue,
227227
eip106BlockNumber = Long.MaxValue,
228228
byzantiumBlockNumber = Long.MaxValue,
@@ -284,6 +284,9 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
284284
homesteadBlockNumber = 1150000,
285285
eip155BlockNumber = Long.MaxValue,
286286
eip106BlockNumber = Long.MaxValue,
287+
difficultyBombPauseBlockNumber = 3000000,
288+
difficultyBombContinueBlockNumber = 5000000,
289+
difficultyBombRemovalBlockNumber = 5900000,
287290
byzantiumBlockNumber = Long.MaxValue,
288291
constantinopleBlockNumber = Long.MaxValue,
289292
istanbulBlockNumber = Long.MaxValue,
@@ -299,9 +302,6 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
299302
ecip1099BlockNumber = Long.MaxValue,
300303
ecip1049BlockNumber = None
301304
),
302-
difficultyBombPauseBlockNumber = 3000000,
303-
difficultyBombContinueBlockNumber = 5000000,
304-
difficultyBombRemovalBlockNumber = 5900000,
305305
chainId = 0x3d.toByte,
306306
networkId = 1,
307307
customGenesisFileOpt = Some("test-genesis.json"),
@@ -657,6 +657,9 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
657657
eip155BlockNumber = 0,
658658
eip106BlockNumber = Long.MaxValue,
659659
byzantiumBlockNumber = Long.MaxValue,
660+
difficultyBombPauseBlockNumber = 3000000,
661+
difficultyBombContinueBlockNumber = 5000000,
662+
difficultyBombRemovalBlockNumber = 5900000,
660663
constantinopleBlockNumber = Long.MaxValue,
661664
istanbulBlockNumber = Long.MaxValue,
662665
eip160BlockNumber = Long.MaxValue,
@@ -671,9 +674,6 @@ class BlockGeneratorSpec extends AnyFlatSpec with Matchers with ScalaCheckProper
671674
ecip1099BlockNumber = Long.MaxValue,
672675
ecip1049BlockNumber = None
673676
),
674-
difficultyBombPauseBlockNumber = 3000000,
675-
difficultyBombContinueBlockNumber = 5000000,
676-
difficultyBombRemovalBlockNumber = 5900000,
677677
chainId = 0x3d.toByte,
678678
networkId = 1,
679679
customGenesisFileOpt = Some("test-genesis.json"),

‎src/test/scala/io/iohk/ethereum/consensus/pow/validators/EthashBlockHeaderValidatorSpec.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,9 @@ class EthashBlockHeaderValidatorSpec
379379
forkBlockNumbers = ForkBlockNumbers(
380380
frontierBlockNumber = 0,
381381
homesteadBlockNumber = 1150000,
382+
difficultyBombPauseBlockNumber = 3000000,
383+
difficultyBombContinueBlockNumber = 5000000,
384+
difficultyBombRemovalBlockNumber = 5900000,
382385
byzantiumBlockNumber = 4370000,
383386
constantinopleBlockNumber = 7280000,
384387
istanbulBlockNumber = 9069000,
@@ -396,9 +399,6 @@ class EthashBlockHeaderValidatorSpec
396399
ecip1099BlockNumber = Long.MaxValue,
397400
ecip1049BlockNumber = None
398401
),
399-
difficultyBombPauseBlockNumber = 3000000,
400-
difficultyBombContinueBlockNumber = 5000000,
401-
difficultyBombRemovalBlockNumber = 5900000,
402402
daoForkConfig = Some(new DaoForkConfig {
403403
override val blockExtraData: Option[ByteString] =
404404
if (supportsDaoFork) Some(ProDaoForkBlock.header.extraData) else None

‎src/test/scala/io/iohk/ethereum/consensus/pow/validators/RestrictedEthashBlockHeaderValidatorSpec.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ class RestrictedEthashBlockHeaderValidatorSpec
7171
forkBlockNumbers = ForkBlockNumbers(
7272
frontierBlockNumber = 0,
7373
homesteadBlockNumber = 1150000,
74+
difficultyBombPauseBlockNumber = 3000000,
75+
difficultyBombContinueBlockNumber = 5000000,
76+
difficultyBombRemovalBlockNumber = 5900000,
7477
byzantiumBlockNumber = 4370000,
7578
constantinopleBlockNumber = 7280000,
7679
istanbulBlockNumber = 9069000,
@@ -88,9 +91,6 @@ class RestrictedEthashBlockHeaderValidatorSpec
8891
ecip1099BlockNumber = Long.MaxValue,
8992
ecip1049BlockNumber = None
9093
),
91-
difficultyBombPauseBlockNumber = 3000000,
92-
difficultyBombContinueBlockNumber = 5000000,
93-
difficultyBombRemovalBlockNumber = 5900000,
9494
daoForkConfig = None,
9595
// unused
9696
maxCodeSize = None,

‎src/test/scala/io/iohk/ethereum/jsonrpc/PersonalServiceSpec.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,9 @@ class PersonalServiceSpec
404404
eip155BlockNumber = 12345,
405405
eip161BlockNumber = 0,
406406
frontierBlockNumber = 0,
407+
difficultyBombPauseBlockNumber = 0,
408+
difficultyBombContinueBlockNumber = 0,
409+
difficultyBombRemovalBlockNumber = Long.MaxValue,
407410
homesteadBlockNumber = 0,
408411
eip150BlockNumber = 0,
409412
eip160BlockNumber = 0,
@@ -420,9 +423,6 @@ class PersonalServiceSpec
420423
ecip1099BlockNumber = Long.MaxValue,
421424
ecip1049BlockNumber = None
422425
),
423-
difficultyBombPauseBlockNumber = 0,
424-
difficultyBombContinueBlockNumber = 0,
425-
difficultyBombRemovalBlockNumber = Long.MaxValue,
426426
customGenesisFileOpt = None,
427427
customGenesisJsonOpt = None,
428428
accountStartNonce = UInt256.Zero,

‎src/test/scala/io/iohk/ethereum/ledger/StxLedgerSpec.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ trait ScenarioSetup extends EphemBlockchainTestSetup {
111111
eip161BlockNumber = 0,
112112
frontierBlockNumber = 0,
113113
homesteadBlockNumber = 0,
114+
difficultyBombPauseBlockNumber = 0,
115+
difficultyBombContinueBlockNumber = 0,
116+
difficultyBombRemovalBlockNumber = Long.MaxValue,
114117
eip150BlockNumber = 0,
115118
eip160BlockNumber = 0,
116119
eip106BlockNumber = 0,
@@ -129,9 +132,6 @@ trait ScenarioSetup extends EphemBlockchainTestSetup {
129132
chainId = 0x03.toByte,
130133
networkId = 1,
131134
maxCodeSize = None,
132-
difficultyBombPauseBlockNumber = 0,
133-
difficultyBombContinueBlockNumber = 0,
134-
difficultyBombRemovalBlockNumber = Long.MaxValue,
135135
customGenesisFileOpt = None,
136136
customGenesisJsonOpt = None,
137137
accountStartNonce = UInt256.Zero,

0 commit comments

Comments
 (0)