grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor EIP150, EIP160 and EIP161 forks to be specified in CommonParams (#8614)

Browse Source 
* Allow post-homestead forks to be specified in CommonParams

* Fix all json configs

* Fix test in json crate

* Fix test in ethcore

* Fix all chain configs to use tabs

Given we use tabs in .editorconfig and the majority of chain configs.
This change is done in Emacs using `mark-whole-buffer` and `indent-region`.
This commit is contained in:
Wei Tang 2018-05-22 12:24:09 +08:00 committed by Marek Kotewicz
parent 3c2f13f88b
commit 3fde07b2e1
25 changed files with 9664 additions and 9680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ethcore/res/ethereum/byzantium_test.json
View File

@ -8,10 +8,6 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip649Reward": "0x29A2241AF62C0000", "eip649Reward": "0x29A2241AF62C0000",
"eip100bTransition": "0x0", "eip100bTransition": "0x0",
"eip649Transition": "0x0" "eip649Transition": "0x0"
@ -27,6 +23,10 @@
"networkID" : "0x1", "networkID" : "0x1",
"maxCodeSize": 24576, "maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0", "maxCodeSizeTransition": "0x0",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip98Transition": "0xffffffffffffffff", "eip98Transition": "0xffffffffffffffff",
"eip140Transition": "0x0", "eip140Transition": "0x0",
"eip211Transition": "0x0", "eip211Transition": "0x0",

8
ethcore/res/ethereum/classic.json
View File

@ -9,13 +9,9 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": 1150000, "homesteadTransition": 1150000,
"eip150Transition": 2500000,
"eip160Transition": 3000000,
"ecip1010PauseTransition": 3000000, "ecip1010PauseTransition": 3000000,
"ecip1010ContinueTransition": 5000000, "ecip1010ContinueTransition": 5000000,
"ecip1017EraRounds": 5000000, "ecip1017EraRounds": 5000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"bombDefuseTransition": 5900000 "bombDefuseTransition": 5900000
} }
} }
@ -30,6 +26,10 @@
"chainID": "0x3d", "chainID": "0x3d",
"forkBlock": "0x1d4c00", "forkBlock": "0x1d4c00",
"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f", "forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
"eip150Transition": 2500000,
"eip160Transition": 3000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": 3000000, "eip155Transition": 3000000,
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff" "eip86Transition": "0x7fffffffffffff"

8
ethcore/res/ethereum/constantinople_test.json
View File

@ -8,10 +8,6 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip649Reward": "0x29A2241AF62C0000", "eip649Reward": "0x29A2241AF62C0000",
"eip100bTransition": "0x0", "eip100bTransition": "0x0",
"eip649Transition": "0x0" "eip649Transition": "0x0"
@ -28,6 +24,10 @@
"maxCodeSize": 24576, "maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0", "maxCodeSizeTransition": "0x0",
"eip98Transition": "0xffffffffffffffff", "eip98Transition": "0xffffffffffffffff",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip140Transition": "0x0", "eip140Transition": "0x0",
"eip210Transition": "0x0", "eip210Transition": "0x0",
"eip211Transition": "0x0", "eip211Transition": "0x0",

10
ethcore/res/ethereum/easthub.json
View File

@ -10,11 +10,7 @@
"blockReward": "0x2B5E3AF16B1880000", "blockReward": "0x2B5E3AF16B1880000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0",
"bombDefuseTransition": "0x0", "bombDefuseTransition": "0x0",
"eip150Transition": "0x0", "ecip1017EraRounds": 5000000
"eip160Transition": "0x0",
"ecip1017EraRounds": 5000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -26,7 +22,11 @@
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID": "0x7", "networkID": "0x7",
"chainID": "0x7", "chainID": "0x7",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip155Transition": "0x0", "eip155Transition": "0x0",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff" "eip86Transition": "0x7fffffffffffff"
}, },

10
ethcore/res/ethereum/eip150_test.json
View File

@ -7,11 +7,7 @@
"difficultyBoundDivisor": "0x0800", "difficultyBoundDivisor": "0x0800",
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0"
"eip150Transition": "0x0",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -22,6 +18,10 @@
"maximumExtraDataSize": "0x20", "maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID" : "0x1", "networkID" : "0x1",
"eip150Transition": "0x0",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffffff", "eip98Transition": "0x7fffffffffffffff",
"eip86Transition": "0x7fffffffffffffff", "eip86Transition": "0x7fffffffffffffff",
"eip155Transition": "0x7fffffffffffffff", "eip155Transition": "0x7fffffffffffffff",

10
ethcore/res/ethereum/eip161_test.json
View File

@ -7,11 +7,7 @@
"difficultyBoundDivisor": "0x0800", "difficultyBoundDivisor": "0x0800",
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0"
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0"
} }
} }
}, },
@ -22,6 +18,10 @@
"maximumExtraDataSize": "0x20", "maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID" : "0x1", "networkID" : "0x1",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip98Transition": "0x7fffffffffffffff", "eip98Transition": "0x7fffffffffffffff",
"eip86Transition": "0x7fffffffffffffff", "eip86Transition": "0x7fffffffffffffff",
"eip155Transition": "0x7fffffffffffffff", "eip155Transition": "0x7fffffffffffffff",

8
ethcore/res/ethereum/ellaism.json
View File

@ -10,11 +10,7 @@
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0",
"bombDefuseTransition": "0x0", "bombDefuseTransition": "0x0",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"ecip1017EraRounds": 10000000, "ecip1017EraRounds": 10000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip100bTransition": 2000000 "eip100bTransition": 2000000
} }
} }
@ -27,6 +23,10 @@
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID": "0x40", "networkID": "0x40",
"chainID": "0x40", "chainID": "0x40",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": "0x0", "eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",

8
ethcore/res/ethereum/expanse.json
View File

@ -13,10 +13,6 @@
"difficultyHardforkTransition": "0x59d9", "difficultyHardforkTransition": "0x59d9",
"difficultyHardforkBoundDivisor": "0x0200", "difficultyHardforkBoundDivisor": "0x0200",
"bombDefuseTransition": "0x30d40", "bombDefuseTransition": "0x30d40",
"eip150Transition": "0x927C0",
"eip160Transition": "0x927C0",
"eip161abcTransition": "0x927C0",
"eip161dTransition": "0x927C0",
"eip100bTransition": "0xC3500", "eip100bTransition": "0xC3500",
"metropolisDifficultyIncrementDivisor": "0x1E", "metropolisDifficultyIncrementDivisor": "0x1E",
"eip649Transition": "0xC3500", "eip649Transition": "0xC3500",
@ -37,6 +33,10 @@
"forkBlock": "0xDBBA0", "forkBlock": "0xDBBA0",
"forkCanonHash": "0x8e7bed51e24f5174090408664ac476b90b5e1199a947af7442f1ac88263fc8c7", "forkCanonHash": "0x8e7bed51e24f5174090408664ac476b90b5e1199a947af7442f1ac88263fc8c7",
"subprotocolName": "exp", "subprotocolName": "exp",
"eip150Transition": "0x927C0",
"eip160Transition": "0x927C0",
"eip161abcTransition": "0x927C0",
"eip161dTransition": "0x927C0",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",
"eip155Transition": "0x927C0", "eip155Transition": "0x927C0",

8
ethcore/res/ethereum/foundation.json
View File

@ -129,10 +129,6 @@
"0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
"0x807640a13483f8ac783c557fcdf27be11ea4ac7a" "0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
], ],
"eip150Transition": "0x259518",
"eip160Transition": 2675000,
"eip161abcTransition": 2675000,
"eip161dTransition": 2675000,
"eip649Reward": "0x29A2241AF62C0000", "eip649Reward": "0x29A2241AF62C0000",
"eip100bTransition": 4370000, "eip100bTransition": 4370000,
"eip649Transition": 4370000 "eip649Transition": 4370000
@ -148,6 +144,10 @@
"networkID" : "0x1", "networkID" : "0x1",
"forkBlock": "0x1d4c00", "forkBlock": "0x1d4c00",
"forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb", "forkCanonHash": "0x4985f5ca3d2afbec36529aa96f74de3cc10a2a4a6c44f2157a57d2c6059a11bb",
"eip150Transition": "0x259518",
"eip160Transition": 2675000,
"eip161abcTransition": 2675000,
"eip161dTransition": 2675000,
"eip155Transition": 2675000, "eip155Transition": 2675000,
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",

10
ethcore/res/ethereum/frontier_like_test.json
View File

@ -127,11 +127,7 @@
"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97", "0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
"0xbb9bc244d798123fde783fcc1c72d3bb8c189413", "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
"0x807640a13483f8ac783c557fcdf27be11ea4ac7a" "0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
], ]
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -142,6 +138,10 @@
"maximumExtraDataSize": "0x20", "maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID" : "0x1", "networkID" : "0x1",
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff" "eip155Transition": "0x7fffffffffffffff"

10
ethcore/res/ethereum/frontier_test.json
View File

@ -7,11 +7,7 @@
"difficultyBoundDivisor": "0x0800", "difficultyBoundDivisor": "0x0800",
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x7fffffffffffffff", "homesteadTransition": "0x7fffffffffffffff"
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -22,6 +18,10 @@
"maximumExtraDataSize": "0x20", "maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID" : "0x1", "networkID" : "0x1",
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff" "eip155Transition": "0x7fffffffffffffff"

12
ethcore/res/ethereum/homestead_test.json
View File

@ -7,11 +7,7 @@
"difficultyBoundDivisor": "0x0800", "difficultyBoundDivisor": "0x0800",
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0"
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -24,7 +20,11 @@
"networkID" : "0x1", "networkID" : "0x1",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff" "eip155Transition": "0x7fffffffffffffff",
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
}, },
"genesis": { "genesis": {
"seal": { "seal": {

8
ethcore/res/ethereum/mcip3_test.json
View File

@ -9,10 +9,6 @@
"durationLimit":"0x0d", "durationLimit":"0x0d",
"homesteadTransition":"0x118c30", "homesteadTransition":"0x118c30",
"eip100bTransition":"0x7fffffffffffff", "eip100bTransition":"0x7fffffffffffff",
"eip150Transition":"0x7fffffffffffff",
"eip160Transition":"0x7fffffffffffff",
"eip161abcTransition":"0x7fffffffffffff",
"eip161dTransition":"0x7fffffffffffff",
"eip649Transition":"0x7fffffffffffff", "eip649Transition":"0x7fffffffffffff",
"blockReward":"0x1105a0185b50a80000", "blockReward":"0x1105a0185b50a80000",
"mcip3Transition":"0x00", "mcip3Transition":"0x00",
@ -33,6 +29,10 @@
"networkID":"0x76740b", "networkID":"0x76740b",
"forkBlock":"0x5b6", "forkBlock":"0x5b6",
"forkCanonHash":"0xa5e88ad9e34d113e264e307bc27e8471452c8fc13780324bb3abb96fd0558343", "forkCanonHash":"0xa5e88ad9e34d113e264e307bc27e8471452c8fc13780324bb3abb96fd0558343",
"eip150Transition":"0x7fffffffffffff",
"eip160Transition":"0x7fffffffffffff",
"eip161abcTransition":"0x7fffffffffffff",
"eip161dTransition":"0x7fffffffffffff",
"eip86Transition":"0x7fffffffffffff", "eip86Transition":"0x7fffffffffffff",
"eip98Transition":"0x7fffffffffffff", "eip98Transition":"0x7fffffffffffff",
"eip140Transition":"0x7fffffffffffff", "eip140Transition":"0x7fffffffffffff",

8
ethcore/res/ethereum/mcip6_byz.json
View File

@ -9,10 +9,6 @@
"durationLimit":"0x0d", "durationLimit":"0x0d",
"homesteadTransition":"0x17", "homesteadTransition":"0x17",
"eip100bTransition":"0x2a", "eip100bTransition":"0x2a",
"eip150Transition":"0x2a",
"eip160Transition":"0x7fffffffffffff",
"eip161abcTransition":"0x7fffffffffffff",
"eip161dTransition":"0x7fffffffffffff",
"eip649Transition":"0x2a", "eip649Transition":"0x2a",
"blockReward":"0x1105a0185b50a80000", "blockReward":"0x1105a0185b50a80000",
"mcip3Transition":"0x17", "mcip3Transition":"0x17",
@ -33,6 +29,10 @@
"networkID":"0x76740c", "networkID":"0x76740c",
"forkBlock":"0x2b", "forkBlock":"0x2b",
"forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9", "forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
"eip150Transition":"0x2a",
"eip160Transition":"0x7fffffffffffff",
"eip161abcTransition":"0x7fffffffffffff",
"eip161dTransition":"0x7fffffffffffff",
"eip86Transition":"0x7fffffffffffff", "eip86Transition":"0x7fffffffffffff",
"eip98Transition":"0x7fffffffffffff", "eip98Transition":"0x7fffffffffffff",
"eip140Transition":"0x2a", "eip140Transition":"0x2a",

8
ethcore/res/ethereum/morden.json
View File

@ -9,13 +9,9 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": 494000, "homesteadTransition": 494000,
"eip150Transition": 1783000,
"eip160Transition": 1915000,
"ecip1010PauseTransition": 1915000, "ecip1010PauseTransition": 1915000,
"ecip1010ContinueTransition": 3415000, "ecip1010ContinueTransition": 3415000,
"ecip1017EraRounds": 2000000, "ecip1017EraRounds": 2000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"bombDefuseTransition": 2300000 "bombDefuseTransition": 2300000
} }
} }
@ -30,6 +26,10 @@
"chainID": "0x3e", "chainID": "0x3e",
"forkBlock": "0x1b34d8", "forkBlock": "0x1b34d8",
"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145", "forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
"eip150Transition": 1783000,
"eip160Transition": 1915000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": 1915000, "eip155Transition": 1915000,
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff" "eip86Transition": "0x7fffffffffffff"

8
ethcore/res/ethereum/musicoin.json
View File

@ -9,10 +9,6 @@
"durationLimit":"0x0d", "durationLimit":"0x0d",
"homesteadTransition":"0x118c30", "homesteadTransition":"0x118c30",
"eip100bTransition":"0x21e88e", "eip100bTransition":"0x21e88e",
"eip150Transition":"0x21e88e",
"eip160Transition":"0x21e88e",
"eip161abcTransition":"0x21e88e",
"eip161dTransition":"0x21e88e",
"eip649Transition":"0x21e88e", "eip649Transition":"0x21e88e",
"blockReward":"0x1105a0185b50a80000", "blockReward":"0x1105a0185b50a80000",
"mcip3Transition":"0x124f81", "mcip3Transition":"0x124f81",
@ -33,6 +29,10 @@
"networkID":"0x76740f", "networkID":"0x76740f",
"forkBlock":"0x1d8015", "forkBlock":"0x1d8015",
"forkCanonHash":"0x380602acf82b629a0be6b5adb2b4a801e960a07dc8261bf196d21befdbb8f2f9", "forkCanonHash":"0x380602acf82b629a0be6b5adb2b4a801e960a07dc8261bf196d21befdbb8f2f9",
"eip150Transition":"0x21e88e",
"eip160Transition":"0x21e88e",
"eip161abcTransition":"0x21e88e",
"eip161dTransition":"0x21e88e",
"eip86Transition":"0x7fffffffffffff", "eip86Transition":"0x7fffffffffffff",
"eip98Transition":"0x7fffffffffffff", "eip98Transition":"0x7fffffffffffff",
"eip140Transition":"0x21e88e", "eip140Transition":"0x21e88e",

10
ethcore/res/ethereum/olympic.json
View File

@ -7,11 +7,7 @@
"difficultyBoundDivisor": "0x0800", "difficultyBoundDivisor": "0x0800",
"durationLimit": "0x08", "durationLimit": "0x08",
"blockReward": "0x14D1120D7B160000", "blockReward": "0x14D1120D7B160000",
"homesteadTransition": "0x7fffffffffffffff", "homesteadTransition": "0x7fffffffffffffff"
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -22,6 +18,10 @@
"maximumExtraDataSize": "0x0400", "maximumExtraDataSize": "0x0400",
"minGasLimit": "125000", "minGasLimit": "125000",
"networkID" : "0x0", "networkID" : "0x0",
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff" "eip155Transition": "0x7fffffffffffffff"

8
ethcore/res/ethereum/ropsten.json
View File

@ -9,10 +9,6 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": 0, "homesteadTransition": 0,
"eip150Transition": 0,
"eip160Transition": 10,
"eip161abcTransition": 10,
"eip161dTransition": 10,
"eip649Reward": "0x29A2241AF62C0000", "eip649Reward": "0x29A2241AF62C0000",
"eip100bTransition": 1700000, "eip100bTransition": 1700000,
"eip649Transition": 1700000 "eip649Transition": 1700000
@ -30,6 +26,10 @@
"forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb", "forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb",
"maxCodeSize": 24576, "maxCodeSize": 24576,
"maxCodeSizeTransition": 10, "maxCodeSizeTransition": 10,
"eip150Transition": 0,
"eip160Transition": 10,
"eip161abcTransition": 10,
"eip161dTransition": 10,
"eip155Transition": 10, "eip155Transition": 10,
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff", "eip86Transition": "0x7fffffffffffff",

10
ethcore/res/ethereum/social.json
View File

@ -10,11 +10,7 @@
"blockReward": "0x2B5E3AF16B1880000", "blockReward": "0x2B5E3AF16B1880000",
"homesteadTransition": "0x0", "homesteadTransition": "0x0",
"bombDefuseTransition": "0x0", "bombDefuseTransition": "0x0",
"eip150Transition": "0x0", "ecip1017EraRounds": 5000000
"eip160Transition": "0x0",
"ecip1017EraRounds": 5000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff"
} }
} }
}, },
@ -26,6 +22,10 @@
"minGasLimit": "0x1388", "minGasLimit": "0x1388",
"networkID": "0x1C", "networkID": "0x1C",
"chainID": "0x1C", "chainID": "0x1C",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": "0x0", "eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff", "eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff" "eip86Transition": "0x7fffffffffffff"

8
ethcore/res/ethereum/transition_test.json
View File

@ -8,10 +8,6 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": "0x4563918244F40000", "blockReward": "0x4563918244F40000",
"homesteadTransition": "0", "homesteadTransition": "0",
"eip150Transition": "0",
"eip160Transition": "0",
"eip161abcTransition": "0",
"eip161dTransition": "0",
"eip649Reward": "0x29A2241AF62C0000", "eip649Reward": "0x29A2241AF62C0000",
"eip100bTransition": "5", "eip100bTransition": "5",
"eip649Transition": "5" "eip649Transition": "5"
@ -27,6 +23,10 @@
"networkID" : "0x1", "networkID" : "0x1",
"maxCodeSize": 24576, "maxCodeSize": 24576,
"maxCodeSizeTransition": "0", "maxCodeSizeTransition": "0",
"eip150Transition": "0",
"eip160Transition": "0",
"eip161abcTransition": "0",
"eip161dTransition": "0",
"eip98Transition": "5", "eip98Transition": "5",
"eip140Transition": "5", "eip140Transition": "5",
"eip211Transition": "5", "eip211Transition": "5",

29
ethcore/src/machine.rs
View File

@ -46,14 +46,6 @@ pub const PARITY_GAS_LIMIT_DETERMINANT: U256 = U256([37, 0, 0, 0]);
pub struct EthashExtensions { pub struct EthashExtensions {
/// Homestead transition block number. /// Homestead transition block number.
pub homestead_transition: BlockNumber, pub homestead_transition: BlockNumber,
/// EIP150 transition block number.
pub eip150_transition: BlockNumber,
/// Number of first block where EIP-160 rules begin.
pub eip160_transition: u64,
/// Number of first block where EIP-161.abc begin.
pub eip161abc_transition: u64,
/// Number of first block where EIP-161.d begins.
pub eip161d_transition: u64,
/// DAO hard-fork transition block (X). /// DAO hard-fork transition block (X).
pub dao_hardfork_transition: u64, pub dao_hardfork_transition: u64,
/// DAO hard-fork refund contract address (C). /// DAO hard-fork refund contract address (C).
@ -66,10 +58,6 @@ impl From<::ethjson::spec::EthashParams> for EthashExtensions {
fn from(p: ::ethjson::spec::EthashParams) -> Self { fn from(p: ::ethjson::spec::EthashParams) -> Self {
EthashExtensions { EthashExtensions {
homestead_transition: p.homestead_transition.map_or(0, Into::into), homestead_transition: p.homestead_transition.map_or(0, Into::into),
eip150_transition: p.eip150_transition.map_or(0, Into::into),
eip160_transition: p.eip160_transition.map_or(0, Into::into),
eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
eip161d_transition: p.eip161d_transition.map_or(u64::max_value(), Into::into),
dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into), dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into),
dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into), dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into),
dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(), dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
@ -267,19 +255,8 @@ impl EthereumMachine {
Some(ref ext) => { Some(ref ext) => {
if block_number < ext.homestead_transition { if block_number < ext.homestead_transition {
Schedule::new_frontier() Schedule::new_frontier()
} else if block_number < ext.eip150_transition {
Schedule::new_homestead()
} else { } else {
let max_code_size = self.params.max_code_size(block_number); self.params.schedule(block_number)
let mut schedule = Schedule::new_post_eip150(
max_code_size as _,
block_number >= ext.eip160_transition,
block_number >= ext.eip161abc_transition,
block_number >= ext.eip161d_transition
);
self.params.update_schedule(block_number, &mut schedule);
schedule
} }
} }
}; };
@ -503,10 +480,6 @@ mod tests {
fn get_default_ethash_extensions() -> EthashExtensions { fn get_default_ethash_extensions() -> EthashExtensions {
EthashExtensions { EthashExtensions {
homestead_transition: 1150000, homestead_transition: 1150000,
eip150_transition: u64::max_value(),
eip160_transition: u64::max_value(),
eip161abc_transition: u64::max_value(),
eip161d_transition: u64::max_value(),
dao_hardfork_transition: u64::max_value(), dao_hardfork_transition: u64::max_value(),
dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(), dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(),
dao_hardfork_accounts: Vec::new(), dao_hardfork_accounts: Vec::new(),

25
ethcore/src/spec/spec.rs
View File

@ -78,6 +78,14 @@ pub struct CommonParams {
pub min_gas_limit: U256, pub min_gas_limit: U256,
/// Fork block to check. /// Fork block to check.
pub fork_block: Option<(BlockNumber, H256)>, pub fork_block: Option<(BlockNumber, H256)>,
/// EIP150 transition block number.
pub eip150_transition: BlockNumber,
/// Number of first block where EIP-160 rules begin.
pub eip160_transition: u64,
/// Number of first block where EIP-161.abc begin.
pub eip161abc_transition: u64,
/// Number of first block where EIP-161.d begins.
pub eip161d_transition: u64,
/// Number of first block where EIP-98 rules begin. /// Number of first block where EIP-98 rules begin.
pub eip98_transition: BlockNumber, pub eip98_transition: BlockNumber,
/// Number of first block where EIP-658 rules begin. /// Number of first block where EIP-658 rules begin.
@ -134,10 +142,21 @@ pub struct CommonParams {
impl CommonParams { impl CommonParams {
/// Schedule for an EVM in the post-EIP-150-era of the Ethereum main net. /// Schedule for an EVM in the post-EIP-150-era of the Ethereum main net.
pub fn schedule(&self, block_number: u64) -> ::vm::Schedule { pub fn schedule(&self, block_number: u64) -> ::vm::Schedule {
let mut schedule = ::vm::Schedule::new_post_eip150(self.max_code_size(block_number) as _, true, true, true); if block_number < self.eip150_transition {
::vm::Schedule::new_homestead()
} else {
let max_code_size = self.max_code_size(block_number);
let mut schedule = ::vm::Schedule::new_post_eip150(
max_code_size as _,
block_number >= self.eip160_transition,
block_number >= self.eip161abc_transition,
block_number >= self.eip161d_transition
);
self.update_schedule(block_number, &mut schedule); self.update_schedule(block_number, &mut schedule);
schedule schedule
} }
}
/// Returns max code size at given block. /// Returns max code size at given block.
pub fn max_code_size(&self, block_number: u64) -> u64 { pub fn max_code_size(&self, block_number: u64) -> u64 {
@ -197,6 +216,10 @@ impl From<ethjson::spec::Params> for CommonParams {
} else { } else {
None None
}, },
eip150_transition: p.eip150_transition.map_or(0, Into::into),
eip160_transition: p.eip160_transition.map_or(0, Into::into),
eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
eip161d_transition: p.eip161d_transition.map_or(0, Into::into),
eip98_transition: p.eip98_transition.map_or(0, Into::into), eip98_transition: p.eip98_transition.map_or(0, Into::into),
eip155_transition: p.eip155_transition.map_or(0, Into::into), eip155_transition: p.eip155_transition.map_or(0, Into::into),
validate_receipts_transition: p.validate_receipts_transition.map_or(0, Into::into), validate_receipts_transition: p.validate_receipts_transition.map_or(0, Into::into),

29
json/src/spec/ethash.rs
View File

@ -73,21 +73,6 @@ pub struct EthashParams {
#[serde(rename="eip100bTransition")] #[serde(rename="eip100bTransition")]
pub eip100b_transition: Option<Uint>, pub eip100b_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip150Transition")]
pub eip150_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip160Transition")]
pub eip160_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip161abcTransition")]
pub eip161abc_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip161dTransition")]
pub eip161d_transition: Option<Uint>,
/// See main EthashParams docs. /// See main EthashParams docs.
#[serde(rename="ecip1010PauseTransition")] #[serde(rename="ecip1010PauseTransition")]
pub ecip1010_pause_transition: Option<Uint>, pub ecip1010_pause_transition: Option<Uint>,
@ -190,11 +175,7 @@ mod tests {
"difficultyHardforkTransition": "0x59d9", "difficultyHardforkTransition": "0x59d9",
"difficultyHardforkBoundDivisor": "0x0200", "difficultyHardforkBoundDivisor": "0x0200",
"bombDefuseTransition": "0x41", "bombDefuseTransition": "0x41",
"eip100bTransition": "0x42", "eip100bTransition": "0x42"
"eip150Transition": "0x43",
"eip160Transition": "0x45",
"eip161abcTransition": "0x46",
"eip161dTransition": "0x47"
} }
}"#; }"#;
@ -237,10 +218,6 @@ mod tests {
difficulty_hardfork_bound_divisor: Some(Uint(U256::from(0x0200))), difficulty_hardfork_bound_divisor: Some(Uint(U256::from(0x0200))),
bomb_defuse_transition: Some(Uint(U256::from(0x41))), bomb_defuse_transition: Some(Uint(U256::from(0x41))),
eip100b_transition: Some(Uint(U256::from(0x42))), eip100b_transition: Some(Uint(U256::from(0x42))),
eip150_transition: Some(Uint(U256::from(0x43))),
eip160_transition: Some(Uint(U256::from(0x45))),
eip161abc_transition: Some(Uint(U256::from(0x46))),
eip161d_transition: Some(Uint(U256::from(0x47))),
ecip1010_pause_transition: None, ecip1010_pause_transition: None,
ecip1010_continue_transition: None, ecip1010_continue_transition: None,
ecip1017_era_rounds: None, ecip1017_era_rounds: None,
@ -285,10 +262,6 @@ mod tests {
difficulty_hardfork_bound_divisor: None, difficulty_hardfork_bound_divisor: None,
bomb_defuse_transition: None, bomb_defuse_transition: None,
eip100b_transition: None, eip100b_transition: None,
eip150_transition: None,
eip160_transition: None,
eip161abc_transition: None,
eip161d_transition: None,
ecip1010_pause_transition: None, ecip1010_pause_transition: None,
ecip1010_continue_transition: None, ecip1010_continue_transition: None,
ecip1017_era_rounds: None, ecip1017_era_rounds: None,

15
json/src/spec/params.rs
View File

@ -51,6 +51,21 @@ pub struct Params {
#[serde(rename="forkCanonHash")] #[serde(rename="forkCanonHash")]
pub fork_hash: Option<H256>, pub fork_hash: Option<H256>,
/// See main EthashParams docs.
#[serde(rename="eip150Transition")]
pub eip150_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip160Transition")]
pub eip160_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip161abcTransition")]
pub eip161abc_transition: Option<Uint>,
/// See main EthashParams docs.
#[serde(rename="eip161dTransition")]
pub eip161d_transition: Option<Uint>,
/// See `CommonParams` docs. /// See `CommonParams` docs.
#[serde(rename="eip98Transition")] #[serde(rename="eip98Transition")]
pub eip98_transition: Option<Uint>, pub eip98_transition: Option<Uint>,