Merge pull request #196 from poanetwork/use-chainId-instead-of-networkId

Use chainId instead of networkId
omni · Mar 27, 2019 · 4777813 · 4777813
2 parents 5546733 + 86c1bfa
commit 4777813
Show file tree

Hide file tree

Showing 18 changed files with 15,826 additions and 9,106 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,8 @@
+{
+  "extends": "react-app",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "legacyDecorators": true
+    }
+  }
+}
diff --git a/config-overrides.js b/config-overrides.js
@@ -1,9 +1,10 @@
-const rewireMobX = require('react-app-rewire-mobx');
+const {
+  addDecoratorsLegacy,
+  disableEsLint,
+  override
+} = require("customize-cra");
 
-/* config-overrides.js */
-module.exports = function override(config, env) {
-  // use the MobX rewire
-  config = rewireMobX(config,env);
-
-  return config;
-}
+module.exports = override(
+    addDecoratorsLegacy(),
+    disableEsLint()
+  );
diff --git a/e2e-script/parity/Dockerfile b/e2e-script/parity/Dockerfile
@@ -1,4 +1,4 @@
-FROM parity/parity:v1.11.11
+FROM parity/parity:v2.2.11
 
 WORKDIR /stuff
 

diff --git a/e2e-script/parity/Dockerfile-foreign b/e2e-script/parity/Dockerfile-foreign
@@ -1,4 +1,4 @@
-FROM parity/parity:v1.11.11
+FROM parity/parity:v2.2.11
 
 WORKDIR /stuff
 

diff --git a/e2e-script/parity/chain-foreign.json b/e2e-script/parity/chain-foreign.json
@@ -16,7 +16,6 @@
 		"eip161dTransition": "0x0",
 		"eip155Transition": "0x0",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0",
 		"eip140Transition": "0x0",

diff --git a/e2e-script/parity/chain.json b/e2e-script/parity/chain.json
@@ -16,7 +16,6 @@
 		"eip161dTransition": "0x0",
 		"eip155Transition": "0x0",
 		"eip98Transition": "0x7fffffffffffff",
-		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0",
 		"eip140Transition": "0x0",

diff --git a/e2e-script/run-tests.sh b/e2e-script/run-tests.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-docker-compose up -d --build
+docker-compose up -d --build --force-recreate
 cd ..
 npm run start:blocks &
 cd e2e-script