Upgrade parity to 1.8.3 beta

JoinColony · Dec 12, 2017 · ccab8a8 · ccab8a8
1 parent 0b95566
commit ccab8a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/circle.yml b/circle.yml
@@ -16,17 +16,14 @@ dependencies:
     - git submodule update --init
 
     # Set up parity
-    - wget http://d1h4xl4cr1h0mo.cloudfront.net/v1.5.12/x86_64-unknown-linux-gnu/parity_1.5.12_amd64.deb
-    - sudo dpkg -i parity_1.5.12_amd64.deb
+    - wget https://parity-downloads-mirror.parity.io/v1.8.3/x86_64-unknown-linux-gnu/parity_1.8.3_amd64.deb
+    - sudo dpkg -i parity_1.8.3_amd64.deb
     - echo "password" > parityPassword
     - cp ./parity-genesis.template.json ./parity-genesis.json
-    - parity --keys-path ./keys --password ./parityPassword account new
-    - parity --keys-path ./keys --password ./parityPassword account new
-    - parity --keys-path ./keys --password ./parityPassword account new
     # Update our parity genesis file
-    - sed -i "s/xxxxx/$(parity --keys-path ./keys account list | sed 's/\[//g' | sed 's/\]//g' | awk '{split($0, a, ", "); print a[1]}')/g" ./parity-genesis.json
-    - sed -i "s/yyyyy/$(parity --keys-path ./keys account list | sed 's/\[//g' | sed 's/\]//g' | awk '{split($0, a, ", "); print a[2]}')/g" ./parity-genesis.json
-    - sed -i "s/zzzzz/$(parity --keys-path ./keys account list | sed 's/\[//g' | sed 's/\]//g' | awk '{split($0, a, ", "); print a[3]}')/g" ./parity-genesis.json
+    - sed -i "s/xxxxx/$(parity --keys-path ./keys --password ./parityPassword account new)/g" ./parity-genesis.json
+    - sed -i "s/yyyyy/$(parity --keys-path ./keys --password ./parityPassword account new)/g" ./parity-genesis.json
+    - sed -i "s/zzzzz/$(parity --keys-path ./keys --password ./parityPassword account new)/g" ./parity-genesis.json
 
 test:
   pre:

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -102,20 +102,16 @@ gulp.task('testrpc', async () => {
 });
 
 gulp.task('parity', async () => {
-  const out = await executeWithOutput('parity --keys-path ./keys account list');
-  const addresses = out.replace(/(\[|\]|\n)/g, '').split(', ');
-
-  if (!addresses.length) {
-    throw new Error('No parity addresses found. Did you initialise it correctly?');
-  }
+  const addresses = await executeWithOutput('parity --keys-path ./keys account list');
   const cmd = makeCmd(`
     parity --chain ./parity-genesis.json
     --author ${addresses[2]}
     --unlock ${addresses[0]},${addresses[1]},${addresses[2]}
-    --password ./parityPassword --keys-path ./keys --geth --no-dapps
+    --keys-path ./keys --geth --no-dapps
     --tx-gas-limit 0x47E7C4 --gasprice 0x0 --gas-floor-target 0x47E7C4
     --reseal-on-txs all --reseal-min-period 0
     --jsonrpc-interface all --jsonrpc-hosts all --jsonrpc-cors="http://localhost:3000"
+    --password ./parityPassword
     `);
   executeDetached(cmd);
   return waitForPort('8545');

diff --git a/parity-genesis.template.json b/parity-genesis.template.json
@@ -1,10 +1,11 @@
 {
     "name": "ethereum",
     "engine": {
-        "instantSeal": { "params": {} }
+        "instantSeal": null
     },
     "params": {
         "accountStartNonce": "0x0100000",
+        "gasLimitBoundDivisor": "0x400",
         "maximumExtraDataSize": "0x20",
         "minGasLimit": "0x1388",
         "networkID" : "0x2"