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

Use chainId on sender instead of networkId
omni · Mar 23, 2019 · b565569 · b565569
2 parents 212c0e3 + 46a0e91
commit b565569
Show file tree

Hide file tree

Showing 10 changed files with 1,494 additions and 1,212 deletions.
diff --git a/e2e/package-lock.json b/e2e/package-lock.json
diff --git a/e2e/package.json b/e2e/package.json
@@ -16,7 +16,8 @@
     "promise-retry": "^1.1.1",
     "shelljs": "^0.8.2",
     "tree-kill": "^1.2.0",
-    "web3": "^1.0.0-beta.34"
+    "web3": "1.0.0-beta.34",
+    "websocket": "^1.0.28"
   },
   "engines": {
     "node": ">= 8.9"

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

diff --git a/e2e/parity/chain.json b/e2e/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/run-tests.sh b/e2e/run-tests.sh
@@ -1,4 +1,4 @@
-docker-compose up -d --build
+docker-compose up -d --build --force-recreate
 docker-compose run e2e npm run deploy
 docker-compose run -d bridge npm run watcher:signature-request
 docker-compose run -d bridge npm run watcher:collected-signatures