backports from upstream (#3)

* rpc(debug_getBadBlocks): fix test (openethereum#9502) * Generalized blockReward and difficultyBombDelays config (openethereum#9480) * Implement multi blockReward * Implement difficultyBombDelays * Fix json crate compile * json keys can only be string * parity: print correct keys path on startup (openethereum#9501)
goerli · Sep 9, 2018 · 5db7277 · 5db7277
1 parent a670db5
commit 5db7277
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 186 deletions.
diff --git a/ethcore/res/ethereum/byzantium_test.json b/ethcore/res/ethereum/byzantium_test.json
@@ -6,11 +6,12 @@
  "minimumDifficulty": "0x020000",
  "difficultyBoundDivisor": "0x0800",
  "durationLimit": "0x0d",
- "blockReward": "0x4563918244F40000",
+ "blockReward": "0x29A2241AF62C0000",
  "homesteadTransition": "0x0",
- "eip649Reward": "0x29A2241AF62C0000",
  "eip100bTransition": "0x0",
- "eip649Transition": "0x0"
+ "difficultyBombDelays": {
+ "0": 3000000
+ }
  }
  }
  },

diff --git a/ethcore/res/ethereum/constantinople_test.json b/ethcore/res/ethereum/constantinople_test.json
@@ -6,11 +6,12 @@
  "minimumDifficulty": "0x020000",
  "difficultyBoundDivisor": "0x0800",
  "durationLimit": "0x0d",
- "blockReward": "0x4563918244F40000",
+ "blockReward": "0x29A2241AF62C0000",
  "homesteadTransition": "0x0",
- "eip649Reward": "0x29A2241AF62C0000",
  "eip100bTransition": "0x0",
- "eip649Transition": "0x0"
+ "difficultyBombDelays": {
+ "0": 3000000
+ }
  }
  }
  },

diff --git a/ethcore/res/ethereum/expanse.json b/ethcore/res/ethereum/expanse.json
@@ -8,15 +8,19 @@
  "difficultyBoundDivisor": "0x0800",
  "difficultyIncrementDivisor": "0x3C",
  "durationLimit": "0x3C",
- "blockReward": "0x6f05b59d3b200000",
+ "blockReward": {
+ "0x0": "0x6f05b59d3b200000",
+ "0xC3500": "0x3782DACE9D900000"
+ },
  "homesteadTransition": "0x30d40",
  "difficultyHardforkTransition": "0x59d9",
  "difficultyHardforkBoundDivisor": "0x0200",
  "bombDefuseTransition": "0x30d40",
  "eip100bTransition": "0xC3500",
  "metropolisDifficultyIncrementDivisor": "0x1E",
- "eip649Transition": "0xC3500",
- "eip649Reward": "0x3782DACE9D900000",
+ "difficultyBombDelays": {
+ "0xC3500": 3000000
+ },
  "expip2Transition": "0xC3500",
  "expip2DurationLimit": "0x1E"
  }

diff --git a/ethcore/res/ethereum/foundation.json b/ethcore/res/ethereum/foundation.json
@@ -7,7 +7,10 @@
  "minimumDifficulty": "0x020000",
  "difficultyBoundDivisor": "0x0800",
  "durationLimit": "0x0d",
- "blockReward": "0x4563918244F40000",
+ "blockReward": {
+ "0": "0x4563918244F40000",
+ "4370000": "0x29A2241AF62C0000"
+ },
  "homesteadTransition": "0x118c30",
  "daoHardforkTransition": "0x1d4c00",
  "daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
@@ -129,9 +132,10 @@
  "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
  "0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
  ],
- "eip649Reward": "0x29A2241AF62C0000",
  "eip100bTransition": 4370000,
- "eip649Transition": 4370000
+ "difficultyBombDelays": {
+ "4370000": 3000000
+ }
  }
  }
  },

diff --git a/ethcore/res/ethereum/mcip3_test.json b/ethcore/res/ethereum/mcip3_test.json
@@ -9,7 +9,6 @@
  "durationLimit":"0x0d",
  "homesteadTransition":"0x118c30",
  "eip100bTransition":"0x7fffffffffffff",
- "eip649Transition":"0x7fffffffffffff",
  "blockReward":"0x1105a0185b50a80000",
  "mcip3Transition":"0x00",
  "mcip3MinerReward":"0xd8d726b7177a80000",

diff --git a/ethcore/res/ethereum/mcip6_byz.json b/ethcore/res/ethereum/mcip6_byz.json
@@ -1,157 +1,159 @@
 {
- "name":"Musicoin Byzantium Test",
- "dataDir":"mcip6test",
- "engine":{
- "Ethash":{
- "params":{
- "minimumDifficulty":"0x020000",
- "difficultyBoundDivisor":"0x0800",
- "durationLimit":"0x0d",
- "homesteadTransition":"0x17",
- "eip100bTransition":"0x2a",
- "eip649Transition":"0x2a",
- "blockReward":"0x1105a0185b50a80000",
- "mcip3Transition":"0x17",
- "mcip3MinerReward":"0xd8d726b7177a80000",
- "mcip3UbiReward":"0x2b5e3af16b1880000",
- "mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
- "mcip3DevReward":"0xc249fdd327780000",
- "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+ "name": "Musicoin Byzantium Test",
+ "dataDir": "mcip6test",
+ "engine": {
+ "Ethash": {
+ "params": {
+ "minimumDifficulty": "0x020000",
+ "difficultyBoundDivisor": "0x0800",
+ "durationLimit": "0x0d",
+ "homesteadTransition": "0x17",
+ "eip100bTransition": "0x2a",
+ "blockReward": "0x1105a0185b50a80000",
+ "mcip3Transition": "0x17",
+ "mcip3MinerReward": "0xd8d726b7177a80000",
+ "mcip3UbiReward": "0x2b5e3af16b1880000",
+ "mcip3UbiContract": "0x00efdd5883ec628983e9063c7d969fe268bbf310",
+ "mcip3DevReward": "0xc249fdd327780000",
+ "mcip3DevContract": "0x00756cf8159095948496617f5fb17ed95059f536",
+ "difficultyBombDelays": {
+ "0x2a": 3000000
+ }
  }
  }
  },
- "params":{
- "gasLimitBoundDivisor":"0x0400",
- "registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
- "accountStartNonce":"0x00",
- "maximumExtraDataSize":"0x20",
- "minGasLimit":"0x1388",
- "networkID":"0x76740c",
- "forkBlock":"0x2b",
- "forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
- "eip150Transition":"0x2a",
- "eip160Transition":"0x7fffffffffffff",
- "eip161abcTransition":"0x7fffffffffffff",
- "eip161dTransition":"0x7fffffffffffff",
- "eip98Transition":"0x7fffffffffffff",
- "eip140Transition":"0x2a",
- "eip155Transition":"0x2a",
- "eip211Transition":"0x2a",
- "eip214Transition":"0x2a",
- "eip658Transition":"0x2a",
- "maxCodeSize":"0x6000",
+ "params": {
+ "gasLimitBoundDivisor": "0x0400",
+ "registrar": "0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+ "accountStartNonce": "0x00",
+ "maximumExtraDataSize": "0x20",
+ "minGasLimit": "0x1388",
+ "networkID": "0x76740c",
+ "forkBlock": "0x2b",
+ "forkCanonHash": "0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
+ "eip150Transition": "0x2a",
+ "eip160Transition": "0x7fffffffffffff",
+ "eip161abcTransition": "0x7fffffffffffff",
+ "eip161dTransition": "0x7fffffffffffff",
+ "eip98Transition": "0x7fffffffffffff",
+ "eip140Transition": "0x2a",
+ "eip155Transition": "0x2a",
+ "eip211Transition": "0x2a",
+ "eip214Transition": "0x2a",
+ "eip658Transition": "0x2a",
+ "maxCodeSize": "0x6000",
  "maxCodeSizeTransition": "0x7fffffffffffff"
  },
- "genesis":{
- "seal":{
- "ethereum":{
- "nonce":"0x000000000000002a",
- "mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
+ "genesis": {
+ "seal": {
+ "ethereum": {
+ "nonce": "0x000000000000002a",
+ "mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
  }
  },
- "difficulty":"0x3d0900",
- "author":"0x0000000000000000000000000000000000000000",
- "timestamp":"0x00",
- "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
- "extraData":"",
- "gasLimit":"0x7a1200"
+ "difficulty": "0x3d0900",
+ "author": "0x0000000000000000000000000000000000000000",
+ "timestamp": "0x00",
+ "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "extraData": "",
+ "gasLimit": "0x7a1200"
  },
- "nodes":[
+ "nodes": [
  "enode://5ddc110733f6d34101973cdef3f9b43484159acf6f816d3b1ee92bc3c98ea453e857bb1207edf0ec0242008ab3a0f9f05eeaee99d47bd414c08a5bdf4847de13@176.9.3.148:30303",
  "enode://38f074f4db8e64dfbaf87984bf290eef67772a901a7113d1b62f36216be152b8450c393d6fc562a5e38f04f99bc8f439a99010a230b1d92dc1df43bf0bd00615@176.9.3.148:30403"
  ],
- "accounts":{
- "0000000000000000000000000000000000000001":{
- "balance":"1",
- "builtin":{
- "name":"ecrecover",
- "pricing":{
- "linear":{
- "base":3000,
- "word":0
+ "accounts": {
+ "0000000000000000000000000000000000000001": {
+ "balance": "1",
+ "builtin": {
+ "name": "ecrecover",
+ "pricing": {
+ "linear": {
+ "base": 3000,
+ "word": 0
  }
  }
  }
  },
- "0000000000000000000000000000000000000002":{
- "balance":"1",
- "builtin":{
- "name":"sha256",
- "pricing":{
- "linear":{
- "base":60,
- "word":12
+ "0000000000000000000000000000000000000002": {
+ "balance": "1",
+ "builtin": {
+ "name": "sha256",
+ "pricing": {
+ "linear": {
+ "base": 60,
+ "word": 12
  }
  }
  }
  },
- "0000000000000000000000000000000000000003":{
- "balance":"1",
- "builtin":{
- "name":"ripemd160",
- "pricing":{
- "linear":{
- "base":600,
- "word":120
+ "0000000000000000000000000000000000000003": {
+ "balance": "1",
+ "builtin": {
+ "name": "ripemd160",
+ "pricing": {
+ "linear": {
+ "base": 600,
+ "word": 120
  }
  }
  }
  },
- "0000000000000000000000000000000000000004":{
- "balance":"1",
- "builtin":{
- "name":"identity",
- "pricing":{
- "linear":{
- "base":15,
- "word":3
+ "0000000000000000000000000000000000000004": {
+ "balance": "1",
+ "builtin": {
+ "name": "identity",
+ "pricing": {
+ "linear": {
+ "base": 15,
+ "word": 3
  }
  }
  }
  },
- "0000000000000000000000000000000000000005":{
- "builtin":{
- "name":"modexp",
- "activate_at":"0x2a",
- "pricing":{
- "modexp":{
- "divisor":20
+ "0000000000000000000000000000000000000005": {
+ "builtin": {
+ "name": "modexp",
+ "activate_at": "0x2a",
+ "pricing": {
+ "modexp": {
+ "divisor": 20
  }
  }
  }
  },
- "0000000000000000000000000000000000000006":{
- "builtin":{
- "name":"alt_bn128_add",
- "activate_at":"0x2a",
- "pricing":{
- "linear":{
- "base":500,
- "word":0
+ "0000000000000000000000000000000000000006": {
+ "builtin": {
+ "name": "alt_bn128_add",
+ "activate_at": "0x2a",
+ "pricing": {
+ "linear": {
+ "base": 500,
+ "word": 0
  }
  }
  }
  },
- "0000000000000000000000000000000000000007":{
- "builtin":{
- "name":"alt_bn128_mul",
- "activate_at":"0x2a",
- "pricing":{
- "linear":{
- "base":40000,
- "word":0
+ "0000000000000000000000000000000000000007": {
+ "builtin": {
+ "name": "alt_bn128_mul",
+ "activate_at": "0x2a",
+ "pricing": {
+ "linear": {
+ "base": 40000,
+ "word": 0
  }
  }
  }
  },
- "0000000000000000000000000000000000000008":{
- "builtin":{
- "name":"alt_bn128_pairing",
- "activate_at":"0x2a",
- "pricing":{
- "alt_bn128_pairing":{
- "base":100000,
- "pair":80000
+ "0000000000000000000000000000000000000008": {
+ "builtin": {
+ "name": "alt_bn128_pairing",
+ "activate_at": "0x2a",
+ "pricing": {
+ "alt_bn128_pairing": {
+ "base": 100000,
+ "pair": 80000
  }
  }
  }

diff --git a/ethcore/res/ethereum/musicoin.json b/ethcore/res/ethereum/musicoin.json
@@ -9,14 +9,16 @@
  "durationLimit":"0x0d",
  "homesteadTransition":"0x118c30",
  "eip100bTransition":"0x21e88e",
- "eip649Transition":"0x21e88e",
  "blockReward":"0x1105a0185b50a80000",
  "mcip3Transition":"0x124f81",
  "mcip3MinerReward":"0xd8d726b7177a80000",
  "mcip3UbiReward":"0x2b5e3af16b1880000",
  "mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
  "mcip3DevReward":"0xc249fdd327780000",
- "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+ "mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536",
+ "difficultyBombDelays": {
+ "0x21e88e": 3000000
+ }
  }
  }
  },

diff --git a/ethcore/res/ethereum/ropsten.json b/ethcore/res/ethereum/ropsten.json
@@ -7,11 +7,15 @@
  "minimumDifficulty": "0x020000",
  "difficultyBoundDivisor": "0x0800",
  "durationLimit": "0x0d",
- "blockReward": "0x4563918244F40000",
+ "blockReward": {
+ "0": "0x4563918244F40000",
+ "1700000": "0x29A2241AF62C0000"
+ },
  "homesteadTransition": 0,
- "eip649Reward": "0x29A2241AF62C0000",
  "eip100bTransition": 1700000,
- "eip649Transition": 1700000
+ "difficultyBombDelays": {
+ "1700000": 3000000
+ }
  }
  }
  },