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

Disable EIP-98 transition by default (#9955) 

* Change eip98Transition default to BlockNumber::max_value

* Remove accidential ethereum/tests submodule change
This commit is contained in:
Wei Tang 2018-11-26 02:59:27 +08:00 committed by Afri Schoedon
parent c880716f16
commit 34d22a35dd
24 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,6 @@
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip98Transition": "0xffffffffffffffff",
"eip140Transition": "0x0",
"eip211Transition": "0x0",
"eip214Transition": "0x0",

1
ethcore/res/ethereum/callisto.json
View File

@ -32,7 +32,6 @@
"eip161abcTransition": 10,
"eip161dTransition": 10,
"eip155Transition": 10,
"eip98Transition": "0xffffffffffffffff",
"eip140Transition": 20,
"eip211Transition": 20,
"eip214Transition": 20,

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

@ -30,8 +30,7 @@
"eip160Transition": 3000000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": 3000000,
"eip98Transition": "0x7fffffffffffff"
"eip155Transition": 3000000
},
"genesis": {
"seal": {

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

@ -24,7 +24,6 @@
"networkID" : "0x1",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0",
"eip98Transition": "0xffffffffffffffff",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",

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

@ -26,8 +26,7 @@
"eip160Transition": "0x0",
"eip155Transition": "0x0",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff"
"eip161dTransition": "0x7fffffffffffffff"
},
"genesis": {
"seal": {

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

@ -22,7 +22,6 @@
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffffff",
"eip155Transition": "0x7fffffffffffffff",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x7fffffffffffffff"

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

@ -22,7 +22,6 @@
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",
"eip161dTransition": "0x0",
"eip98Transition": "0x7fffffffffffffff",
"eip155Transition": "0x0",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0"

1
ethcore/res/ethereum/eip210_test.json
View File

@ -20,7 +20,6 @@
"networkID" : "0x1",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0",
"eip98Transition": "0xffffffffffffffff",
"eip150Transition": "0x0",
"eip160Transition": "0x0",
"eip161abcTransition": "0x0",

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

@ -28,7 +28,6 @@
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff",
"wasmActivationTransition": 2000000,
"eip140Transition": 2000000,
"eip211Transition": 2000000,

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

@ -41,7 +41,6 @@
"eip160Transition": "0x927C0",
"eip161abcTransition": "0x927C0",
"eip161dTransition": "0x927C0",
"eip98Transition": "0x7fffffffffffff",
"eip155Transition": "0x927C0",
"eip140Transition": "0xC3500",
"eip211Transition": "0xC3500",

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

@ -153,7 +153,6 @@
"eip161abcTransition": 2675000,
"eip161dTransition": 2675000,
"eip155Transition": 2675000,
"eip98Transition": "0x7fffffffffffff",
"maxCodeSize": 24576,
"maxCodeSizeTransition": 2675000,
"eip140Transition": 4370000,

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

@ -142,7 +142,6 @@
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff"
},
"genesis": {

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

@ -22,7 +22,6 @@
"eip160Transition": "0x7fffffffffffffff",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip98Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff"
},
"genesis": {

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

@ -18,7 +18,6 @@
"maximumExtraDataSize": "0x20",
"minGasLimit": "0x1388",
"networkID" : "0x1",
"eip98Transition": "0x7fffffffffffff",
"eip155Transition": "0x7fffffffffffffff",
"eip150Transition": "0x7fffffffffffffff",
"eip160Transition": "0x7fffffffffffffff",

1
ethcore/res/ethereum/kovan.json
View File

@ -39,6 +39,7 @@
"maxCodeSizeTransition": 6600000,
"validateChainIdTransition": 1000000,
"validateReceiptsTransition" : 1000000,
"eip98Transition": 0,
"eip140Transition": 5067000,
"eip211Transition": 5067000,
"eip214Transition": 5067000,

1
ethcore/res/ethereum/kovan_wasm_test.json
View File

@ -35,6 +35,7 @@
"forkBlock": 4297256,
"forkCanonHash": "0x0a66d93c2f727dca618fabaf70c39b37018c73d78b939d8b11efbbd09034778f",
"validateReceiptsTransition" : 1000000,
"eip98Transition": 0,
"eip155Transition": 1000000,
"validateChainIdTransition": 1000000,
"eip140Transition": 5067000,

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

@ -27,7 +27,6 @@
"eip160Transition":"0x7fffffffffffff",
"eip161abcTransition":"0x7fffffffffffff",
"eip161dTransition":"0x7fffffffffffff",
"eip98Transition":"0x7fffffffffffff",
"eip140Transition":"0x7fffffffffffff",
"eip155Transition":"0x7fffffffffffff",
"eip211Transition":"0x7fffffffffffff",

3
ethcore/res/ethereum/mix.json
View File

@ -44,8 +44,7 @@
"eip140Transition": 3000000,
"eip211Transition": 3000000,
"eip214Transition": 3000000,
"eip658Transition": 3000000,
"eip98Transition": "0x7fffffffffffff"
"eip658Transition": 3000000
},
"nodes": [
"enode://aeb6070deb50efeb41c5e4283a6a3b08ff701fef90e3522161c145f30df2852af3dfc51ba74591f7c9d96b11ca4c3c2b354bf58dd243f2d877f6eecc2373fd1d@139.162.15.124:30313",

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

@ -30,8 +30,7 @@
"eip160Transition": 1915000,
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": 1915000,
"eip98Transition": "0x7fffffffffffff"
"eip155Transition": 1915000
},
"genesis": {
"seal": {

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

@ -31,7 +31,6 @@
"eip160Transition":"0x21e88e",
"eip161abcTransition":"0x21e88e",
"eip161dTransition":"0x21e88e",
"eip98Transition":"0x7fffffffffffff",
"eip140Transition":"0x21e88e",
"eip155Transition":"0x21e88e",
"eip211Transition":"0x21e88e",

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

@ -37,7 +37,6 @@
"eip161abcTransition": 10,
"eip161dTransition": 10,
"eip155Transition": 10,
"eip98Transition": "0x7fffffffffffff",
"eip140Transition": 1700000,
"eip211Transition": 1700000,
"eip214Transition": 1700000,

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

@ -26,8 +26,7 @@
"eip160Transition": "0x0",
"eip161abcTransition": "0x7fffffffffffffff",
"eip161dTransition": "0x7fffffffffffffff",
"eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff"
"eip155Transition": "0x0"
},
"genesis": {
"seal": {

1
ethcore/res/ethereum/tobalaba.json
View File

@ -16,6 +16,7 @@
"gasLimitBoundDivisor": "0x400",
"minGasLimit": "0x1388",
"networkID": "0x62121",
"eip98Transition": 0,
"wasmActivationTransition": 7250000,
"eip140Transition": 7250000,
"eip211Transition": 7250000,

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

@ -250,7 +250,10 @@ impl From<ethjson::spec::Params> for CommonParams {
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_else(
BlockNumber::max_value,
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_chain_id_transition: p.validate_chain_id_transition.map_or(0, Into::into),