Skip to content

[ETCM-1152] Populate berlin fork block number in test config #1116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2021
Merged

[ETCM-1152] Populate berlin fork block number in test config #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/main/scala/io/iohk/ethereum/jsonrpc/TestJsonMethodsImplicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
homesteadForkBlock <- optionalQuantity(blockchainParamsJson \ "homesteadForkBlock")
constantinopleForkBlock <- optionalQuantity(blockchainParamsJson \ "constantinopleForkBlock")
istanbulForkBlock <- optionalQuantity(blockchainParamsJson \ "istanbulForkBlock")
berlinForkBlock <- optionalQuantity(blockchainParamsJson \ "berlinForkBlock")
} yield BlockchainParams(
EIP150ForkBlock = eIP150ForkBlock,
EIP158ForkBlock = eIP158ForkBlock,
Expand All @@ -110,7 +111,8 @@ object TestJsonMethodsImplicits extends JsonMethodsImplicits {
homesteadForkBlock = homesteadForkBlock,
maximumExtraDataSize = 0,
constantinopleForkBlock = constantinopleForkBlock,
istanbulForkBlock = istanbulForkBlock
istanbulForkBlock = istanbulForkBlock,
berlinForkBlock = berlinForkBlock
)

override def encodeJson(t: SetChainParamsResponse): JValue = true
Expand Down
7 changes: 5 additions & 2 deletions src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ object TestService {
homesteadForkBlock: Option[BigInt],
maximumExtraDataSize: BigInt,
constantinopleForkBlock: Option[BigInt],
istanbulForkBlock: Option[BigInt]
istanbulForkBlock: Option[BigInt],
berlinForkBlock: Option[BigInt]
)

case class ChainParams(
Expand Down Expand Up @@ -215,6 +216,7 @@ class TestService(
private def buildNewConfig(blockchainParams: BlockchainParams) = {
val byzantiumBlockNumber: BigInt = blockchainParams.byzantiumForkBlock.getOrElse(neverOccurringBlock)
val istanbulForkBlockNumber: BigInt = blockchainParams.istanbulForkBlock.getOrElse(neverOccurringBlock)
val berlinForkBlockNumber: BigInt = blockchainParams.berlinForkBlock.getOrElse(neverOccurringBlock)

// For block number which are not specified by retesteth, we try to align the number to another fork
node.blockchainConfig.copy(
Expand All @@ -230,7 +232,8 @@ class TestService(
aghartaBlockNumber = istanbulForkBlockNumber,
istanbulBlockNumber = istanbulForkBlockNumber,
atlantisBlockNumber = istanbulForkBlockNumber,
phoenixBlockNumber = istanbulForkBlockNumber
phoenixBlockNumber = istanbulForkBlockNumber,
berlinBlockNumber = berlinForkBlockNumber
),
accountStartNonce = UInt256(blockchainParams.accountStartNonce),
networkId = 1,
Expand Down