Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Enable all Constantinople hard fork changes in constantinople_test.json #9505

Merged
merged 6 commits into from
Sep 11, 2018
Merged

Enable all Constantinople hard fork changes in constantinople_test.json #9505

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32ab7d7
Enable all Constantinople hard fork changes in constantinople_test.json
sorpaas Sep 10, 2018
522c9b9
Address grumbles
sorpaas Sep 10, 2018
c47df60
Remove EIP-210 activation
sorpaas Sep 10, 2018
ad7aa97
8m -> 5m
sorpaas Sep 11, 2018
6216700
Temporarily add back eip210 transition so we can get test passed
sorpaas Sep 11, 2018
5f0c7c3
Add eip210_test and remove eip210 transition from const_test
sorpaas Sep 11, 2018
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
10 changes: 6 additions & 4 deletions ethcore/res/ethereum/constantinople_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "Byzantium (Test)",
"name": "Constantinople (test)",
"engine": {
"Ethash": {
"params": {
"minimumDifficulty": "0x020000",
"difficultyBoundDivisor": "0x0800",
"durationLimit": "0x0d",
"blockReward": "0x29A2241AF62C0000",
"blockReward": "0x1BC16D674EC80000",
"homesteadTransition": "0x0",
"eip100bTransition": "0x0",
"difficultyBombDelays": {
"0": 3000000
"0": 8000000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 8_000_000? What about

				"difficultyBombDelays": {
					"0": 3000000
					"5": 2000000
				}

to match eip 649, 1234?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think those json test are used in a all or nothing basis (eg from ethereum test), so putting the sum of eip 649 and 1234 together at 0 makes sense (on two line it would be better but I think json dont allow to identical keys). I got a doubt 649 was a 3 million delay and 1234 another additional 5 million ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine by me. 649 is 3 million, 1234 is 2 million. sum is 5 million.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake, when reading 1234, " 5 million blocks later than previously specified with the Homestead fork" gave me the wrong impression of additional 5M but it would have been only true if refering to byzantium fork.
So yes we need to use 5M instead of 8M for this line.

}
}
}
Expand All @@ -30,11 +30,13 @@
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip140Transition": "0x0",
"eip210Transition": "0x0",
"eip211Transition": "0x0",
"eip214Transition": "0x0",
"eip155Transition": "0x0",
"eip658Transition": "0x0",
"eip145Transition": "0x0",
"eip1014Transition": "0x0",
"eip1052Transition": "0x0",
"eip1283Transition": "0x0"
},
"genesis": {
Expand Down