From ba0a380df9074b860ed7cc9fc246c67b8d5410db Mon Sep 17 00:00:00 2001 From: /raw PONG _GHMoaCXLT <58883403+q9f@users.noreply.github.com> Date: Fri, 13 Mar 2020 10:59:50 +0100 Subject: [PATCH] ethcore/res: enable ecip-1088 phoenix upgrade for kotti and mordor testnets (#11529) * ethcore/res: enable ecip-1088 phoenix upgrade for classic * ethcore/res: fix eip-2200 config for the classic networks * ethcore/res: add fork block checkpoint for mordor classic * ethcore/res: fix whitespacing for mordor classic config * ethcore/res: fix mordor bootnode entries * ethcore/res: shuffle mordor bootnodes * ethcore/res: use hex prefix for classic specs * ethcore/res: revert classic spec to pre-phoenix Co-authored-by: q9f --- ethcore/res/ethereum/kotti.json | 20 ++- ethcore/res/ethereum/mordor.json | 294 +++++++++++++++++-------------- 2 files changed, 168 insertions(+), 146 deletions(-) diff --git a/ethcore/res/ethereum/kotti.json b/ethcore/res/ethereum/kotti.json index aeea86b08..960ee4c4a 100644 --- a/ethcore/res/ethereum/kotti.json +++ b/ethcore/res/ethereum/kotti.json @@ -24,11 +24,13 @@ "eip658Transition": "0xaef49", "eip1014Transition": "0x1a064d", "eip1052Transition": "0x1a064d", - "eip1283Transition": "0x1f67cf", - "eip1344Transition": "0x1f67cf", - "eip1706Transition": "0x1f67cf", - "eip2028Transition": "0x1f67cf", - "eip2200AdvanceTransition": "0x1f67cf", + "eip1283Transition": "0x0", + "eip1283DisableTransition": "0x0", + "eip1283ReenableTransition": "0x2191cd", + "eip1344Transition": "0x2191cd", + "eip1706Transition": "0x2191cd", + "eip1884Transition": "0x2191cd", + "eip2028Transition": "0x2191cd", "gasLimitBoundDivisor": "0x400", "maxCodeSize": "0x6000", "maxCodeSizeTransition": "0xaef49", @@ -129,7 +131,7 @@ "0xaef49": { "price": { "alt_bn128_const_operations": { "price": 500 }} }, - "0x1f67cf": { + "0x2191cd": { "info": "EIP 1108 transition", "price": { "alt_bn128_const_operations": { "price": 150 }} } @@ -144,7 +146,7 @@ "0xaef49": { "price": { "alt_bn128_const_operations": { "price": 40000 }} }, - "0x1f67cf": { + "0x2191cd": { "info": "EIP 1108 transition", "price": { "alt_bn128_const_operations": { "price": 6000 }} } @@ -159,7 +161,7 @@ "0xaef49": { "price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }} }, - "0x1f67cf": { + "0x2191cd": { "info": "EIP 1108 transition", "price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }} } @@ -170,7 +172,7 @@ "balance": "0x1", "builtin": { "name": "blake2_f", - "activate_at": "0x1f67cf", + "activate_at": "0x2191cd", "pricing": { "blake2_f": { "gas_per_round": 1 diff --git a/ethcore/res/ethereum/mordor.json b/ethcore/res/ethereum/mordor.json index e33c14518..357648d2d 100644 --- a/ethcore/res/ethereum/mordor.json +++ b/ethcore/res/ethereum/mordor.json @@ -1,193 +1,213 @@ { - "name":"Mordor Classic Testnet", - "dataDir":"mordor", - "engine":{ - "Ethash":{ - "params":{ - "minimumDifficulty":"0x20000", - "difficultyBoundDivisor":"0x800", - "durationLimit":"0xd", - "blockReward":"0x4563918244F40000", - "homesteadTransition":"0x0", - "ecip1010PauseTransition":"0x0", - "ecip1010ContinueTransition":"0x0", - "ecip1017EraRounds":"0x1e8480", - "bombDefuseTransition":"0x0", - "eip100bTransition":"0x0" + "name": "Mordor Classic Testnet", + "dataDir": "mordor", + "engine": { + "Ethash": { + "params": { + "minimumDifficulty": "0x20000", + "difficultyBoundDivisor": "0x800", + "durationLimit": "0xd", + "blockReward": "0x4563918244F40000", + "homesteadTransition": "0x0", + "ecip1010PauseTransition": "0x0", + "ecip1010ContinueTransition": "0x0", + "ecip1017EraRounds": "0x1e8480", + "bombDefuseTransition": "0x0", + "eip100bTransition": "0x0" } } }, - "params":{ - "gasLimitBoundDivisor":"0x400", - "accountStartNonce":"0x0", - "maximumExtraDataSize":"0x20", - "minGasLimit":"0x1388", - "networkID":"0x7", - "chainID":"0x3f", - "eip150Transition":"0x0", - "eip160Transition":"0x0", - "eip161abcTransition":"0x0", - "eip161dTransition":"0x0", - "eip155Transition":"0x0", - "maxCodeSize":"0x6000", - "maxCodeSizeTransition":"0x0", - "eip140Transition":"0x0", - "eip211Transition":"0x0", - "eip214Transition":"0x0", - "eip658Transition":"0x0", - "eip145Transition":"0x498bb", - "eip1014Transition":"0x498bb", - "eip1052Transition":"0x498bb", - "eip1283Transition":"0xbe10b", - "eip1344Transition":"0xbe10b", - "eip1706Transition":"0xbe10b", - "eip2028Transition":"0xbe10b", - "eip2200AdvanceTransition": "0xbe10b" + "params": { + "gasLimitBoundDivisor": "0x400", + "accountStartNonce": "0x0", + "maximumExtraDataSize": "0x20", + "minGasLimit": "0x1388", + "networkID": "0x7", + "chainID": "0x3f", + "forkBlock": "0xcd16a", + "forkCanonHash": "0x7b4145006cddae9e88c13b47d6aeee2ab4c37d561b929cf688f6f35d58d1966b", + "eip150Transition": "0x0", + "eip160Transition": "0x0", + "eip161abcTransition": "0x0", + "eip161dTransition": "0x0", + "eip155Transition": "0x0", + "maxCodeSize": "0x6000", + "maxCodeSizeTransition": "0x0", + "eip140Transition": "0x0", + "eip211Transition": "0x0", + "eip214Transition": "0x0", + "eip658Transition": "0x0", + "eip145Transition": "0x498bb", + "eip1014Transition": "0x498bb", + "eip1052Transition": "0x498bb", + "eip1283Transition": "0x0", + "eip1283DisableTransition": "0x0", + "eip1283ReenableTransition": "0xf422f", + "eip1344Transition": "0xf422f", + "eip1706Transition": "0xf422f", + "eip1884Transition": "0xf422f", + "eip2028Transition": "0xf422f" }, - "genesis":{ - "seal":{ - "ethereum":{ - "nonce":"0x0000000000000000", - "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000" + "genesis": { + "seal": { + "ethereum": { + "nonce": "0x0000000000000000", + "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000" } }, - "difficulty":"0x20000", - "author":"0x0000000000000000000000000000000000000000", - "timestamp":"0x5d9676db", - "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000", - "extraData":"0x70686f656e697820636869636b656e206162737572642062616e616e61", - "gasLimit":"0x2fefd8" + "difficulty": "0x20000", + "author": "0x0000000000000000000000000000000000000000", + "timestamp": "0x5d9676db", + "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", + "extraData": "0x70686f656e697820636869636b656e206162737572642062616e616e61", + "gasLimit": "0x2fefd8" }, "nodes":[ - "enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303", - "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:38556", - "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@34.69.121.227:30303", + "enode://f50f52b5fe18fd281748905bf5dad5439471f32cc02d99fecf960a983c1f4eba701ffca96afd2f2a68dcf6f97c5d02b566bafce1f361b51717e1a03c1dd9a836@157.230.42.102:30303", "enode://03b133f731049e3f7be827339c3759be92778c05e54a1847d178c0fdb56fa168aa1e7e61fc77791a7afdd0328a00318f73c01212eb3f3bbe919f5ce8f5b4a314@192.227.105.4:32000", - "enode://621e28e529146fd501709194885f50540c494f1a2985d1fb4ec8769226b5cb0b0d1a11545926077821474c2767cdd87888ead8a2509a2c9069dd5584e4b1c3b8@10.28.223.8:30000", + "enode://859ed8c19ea04eaea41f1cf17c8d2710e2e0affb97328c8392a79f1764118edf2344f1941299f0d676772fa6054447e6f9b3af96444e350b417442bfd7cc832b@34.68.243.226:30303", + "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:51240", + "enode://642cf9650dd8869d42525dbf6858012e3b4d64f475e733847ab6f7742341a4397414865d953874e8f5ed91b0e4e1c533dee14ad1d6bb276a5459b2471460ff0d@157.230.152.87:30303", + "enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000", + "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@34.69.50.155:42078", + "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:30000", "enode://2592745efd35b4be443b8ee25fd2099de132e037951f9f6d3e8805e0a78f213537f71264b973f1a83a57372f57bbe6acac8d6ae678f39393221c045ccbe3b18c@51.15.116.226:30304", - "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.15.116.226:30303", + "enode://b45f008ab8ad73966d0c8c0c923c50f47c0ae50c37a9ea05cc28b00cb94802145a4158412a526fdadd7e539db5eaab72f06a9046a34576ecf5a68efc41ba9d01@34.68.40.145:30303", + "enode://617a2009783a09085ed0d5d5e7250e2e3c142f73448bf28200284bf4825c5926a80f3e9fb481edf38b89ade2aa0ad5a2f14cc935f3150e36e648eddda674fd70@35.225.5.185:51320", + "enode://534d18fd46c5cd5ba48a68250c47cea27a1376869755ed631c94b91386328039eb607cf10dd8d0aa173f5ec21e3fb45c5d7a7aa904f97bc2557e9cb4ccc703f1@51.158.190.99:30303", + "enode://15b6ae4e9e18772f297c90d83645b0fbdb56667ce2d747d6d575b21d7b60c2d3cd52b11dec24e418438caf80ddc433232b3685320ed5d0e768e3972596385bfc@51.158.191.43:41235", + "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:38556", + "enode://014ebf612cd362d87215d8668bd34a6db6c009a5b77c01e05fe638948054ebe91684ce05f1baf384ae9964316b9ac0eaf87dc43edd7e63467fb0b34db0f2c1d7@51.158.190.99:34567", + "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@35.225.124.17:39306", + "enode://1f378945c9b2eeb292d910f461911fd99520a23beda1bc5c8aea12be09e249f8d92615aa3d4d75c938004db5281dabad4a9cf7a0f07ec7c1fc8e7721addc7c85@34.205.41.164:40218", + "enode://9b1bf9613d859ac2071d88509ab40a111b75c1cfc51f4ad78a1fdbb429ff2405de0dc5ea8ae75e6ac88e03e51a465f0b27b517e78517f7220ae163a2e0692991@51.158.190.99:30426", + "enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303", + "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@34.69.121.227:30303", "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30303", - "enode://1813e90a0afdd7c1e4892c5376960e3577a9e6c5a4f86fa405a405c7421a4a1608248d77cc90333842f13d8954d82113dec480cfb76b4fef8cb475157cf4d5f2@10.28.224.3:30000", - "enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000" + "enode://0d70715514674189792de4ad294b658c96d0ec40fe517fbe9cb7949d3792f25f82357ec77d1bd8bed6ec719ca0c1d608bb34cc702bf3d4bb4507f7280f835452@154.5.137.161:61410", + "enode://4ca79bbff7491fed82221259e3f27492e27b95b600594e2f8d5f1fa011123ea267e71873a0db3993e5109845d519d8b849ba2c7e4b48b09bedebb99e1c2ce304@35.238.132.8:30303", + "enode://651b484b652c07c72adebfaaf8bc2bd95b420b16952ef3de76a9c00ef63f07cca02a20bd2363426f9e6fe372cef96a42b0fec3c747d118f79fd5e02f2a4ebd4e@51.158.190.99:45678", + "enode://c0afb552bfe932c72598caa245aef82d55c23555622c5ab946d4e49bb0ab694e46086dcff6793a606527f323ef94d0eb499d01ceb26aefb6fa3f8977105d7dd8@157.230.152.87:52138", + "enode://111bd28d5b2c1378d748383fd83ff59572967c317c3063a9f475a26ad3f1517642a164338fb5268d4e32ea1cc48e663bd627dec572f1d201c7198518e5a506b1@88.99.216.30:45834" ], - "accounts":{ - "0x0000000000000000000000000000000000000001":{ - "builtin":{ - "name":"ecrecover", - "pricing":{ - "linear":{ - "base":3000, - "word":0 + "accounts": { + "0x0000000000000000000000000000000000000001": { + "builtin": { + "name": "ecrecover", + "pricing": { + "linear": { + "base": 3000, + "word": 0 } } } }, - "0x0000000000000000000000000000000000000002":{ - "builtin":{ - "name":"sha256", - "pricing":{ - "linear":{ - "base":60, - "word":12 + "0x0000000000000000000000000000000000000002": { + "builtin": { + "name": "sha256", + "pricing": { + "linear": { + "base": 60, + "word": 12 } } } }, - "0x0000000000000000000000000000000000000003":{ - "builtin":{ - "name":"ripemd160", - "pricing":{ - "linear":{ - "base":600, - "word":120 + "0x0000000000000000000000000000000000000003": { + "builtin": { + "name": "ripemd160", + "pricing": { + "linear": { + "base": 600, + "word": 120 } } } }, - "0x0000000000000000000000000000000000000004":{ - "builtin":{ - "name":"identity", - "pricing":{ - "linear":{ - "base":15, - "word":3 + "0x0000000000000000000000000000000000000004": { + "builtin": { + "name": "identity", + "pricing": { + "linear": { + "base": 15, + "word": 3 } } } }, - "0x0000000000000000000000000000000000000005":{ - "builtin":{ - "activate_at":"0x0", - "name":"modexp", - "pricing":{ - "modexp":{ - "divisor":20 + "0x0000000000000000000000000000000000000005": { + "builtin": { + "activate_at": "0x0", + "name": "modexp", + "pricing": { + "modexp": { + "divisor": 20 } } } }, - "0x0000000000000000000000000000000000000006":{ - "builtin":{ - "name":"alt_bn128_add", - "pricing":{ - "0x0":{ - "price":{ - "alt_bn128_const_operations":{ - "price":500 + "0x0000000000000000000000000000000000000006": { + "builtin": { + "name": "alt_bn128_add", + "pricing": { + "0x0": { + "price": { + "alt_bn128_const_operations": { + "price": 500 } } }, - "0xbe10b":{ - "info":"EIP 1108 transition", - "price":{ - "alt_bn128_const_operations":{ - "price":150 + "0xf422f": { + "info": "EIP 1108 transition", + "price": { + "alt_bn128_const_operations": { + "price": 150 } } } } } }, - "0x0000000000000000000000000000000000000007":{ - "builtin":{ - "name":"alt_bn128_mul", - "pricing":{ - "0x0":{ - "price":{ - "alt_bn128_const_operations":{ - "price":40000 + "0x0000000000000000000000000000000000000007": { + "builtin": { + "name": "alt_bn128_mul", + "pricing": { + "0x0": { + "price": { + "alt_bn128_const_operations": { + "price": 40000 } } }, - "0xbe10b":{ - "info":"EIP 1108 transition", - "price":{ - "alt_bn128_const_operations":{ - "price":6000 + "0xf422f": { + "info": "EIP 1108 transition", + "price": { + "alt_bn128_const_operations": { + "price": 6000 } } } } } }, - "0x0000000000000000000000000000000000000008":{ - "builtin":{ - "name":"alt_bn128_pairing", - "pricing":{ - "0x0":{ - "price":{ - "alt_bn128_pairing":{ - "base":100000, - "pair":80000 + "0x0000000000000000000000000000000000000008": { + "builtin": { + "name": "alt_bn128_pairing", + "pricing": { + "0x0": { + "price": { + "alt_bn128_pairing": { + "base": 100000, + "pair": 80000 } } }, - "0xbe10b":{ - "info":"EIP 1108 transition", - "price":{ - "alt_bn128_pairing":{ - "base":45000, - "pair":34000 + "0xf422f": { + "info": "EIP 1108 transition", + "price": { + "alt_bn128_pairing": { + "base": 45000, + "pair": 34000 } } } @@ -197,7 +217,7 @@ "0x0000000000000000000000000000000000000009": { "builtin": { "name": "blake2_f", - "activate_at": "0xbe10b", + "activate_at": "0xf422f", "pricing": { "blake2_f": { "gas_per_round": 1