Handle openethereum/parity-ethereum#9480, updates to parity config

ethereum · Sep 10, 2018 · dce0089 · dce0089
1 parent db66f61
commit dce0089
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/clients/parity:master/chain.json b/clients/parity:master/chain.json
@@ -4,7 +4,9 @@
     "Ethash": {
       "params": {
         "minimumDifficulty": "0x020000",
-        "blockReward": "0x4563918244F40000",
+        "blockReward": {
+          "0": "0x4563918244F40000",
+        },
         "difficultyBoundDivisor": "0x0800",
         "durationLimit": "0x0d",
         "frontierCompatibilityModeLimit": "0x0",

diff --git a/clients/parity:master/parity.sh b/clients/parity:master/parity.sh
@@ -109,8 +109,9 @@ if [ "$HIVE_FORK_BYZANTIUM" != "" ]; then
 #	chainconfig=`echo $chainconfig | jq "setpath([\"params\", \"eip98Transition\"]; \"0x$HIVE_FORK_BYZANTIUM\")"`
 
 	# Ethash params
-	chainconfig=`echo $chainconfig | jq "setpath([\"engine\", \"Ethash\", \"params\", \"eip649Reward\"]; \"0x29A2241AF62C0000\")"`
-	chainconfig=`echo $chainconfig | jq "setpath([\"engine\", \"Ethash\", \"params\", \"eip649Transition\"]; \"0x$HIVE_FORK_BYZANTIUM\")"`
+	#  Set blockreward to 3M for byzantium
+	chainconfig=`echo $chainconfig | jq "setpath([\"engine\", \"Ethash\", \"params\", \"blockReward\",\"0x$HIVE_FORK_BYZANTIUM\"]; \"0x29A2241AF62C0000\")"`
+	# difficulty calculation -- aka bomb delay
 	chainconfig=`echo $chainconfig | jq "setpath([\"engine\", \"Ethash\", \"params\", \"eip100bTransition\"]; \"0x$HIVE_FORK_BYZANTIUM\")"`
 
 	# General params
@@ -136,6 +137,9 @@ if [ "$HIVE_FORK_CONSTANTINOPLE" != "" ]; then
 	chainconfig=`echo $chainconfig | jq "setpath([\"params\", \"eip1283Transition\"]; \"0x$HIVE_FORK_CONSTANTINOPLE\")"`
 	# Skinny create 2 (overloaded on eip86 for some reason)
 	chainconfig=`echo $chainconfig | jq "setpath([\"params\", \"eip86Transition\"]; \"0x$HIVE_FORK_CONSTANTINOPLE\")"`
+	# Ethash params
+	#  Set blockreward to 2M for constantinople
+	chainconfig=`echo $chainconfig | jq "setpath([\"engine\", \"Ethash\", \"params\", \"blockReward\",\"0x$HIVE_FORK_CONSTANTINOPLE\"]; \"0x1BC16D674EC80000\")"`
 
 fi
 echo $chainconfig > /chain.json