Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use chainId instead of networkId #196

Merged
merged 10 commits into from
Mar 27, 2019
Merged

Use chainId instead of networkId #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
db04b12
Update web3 version
patitonar Mar 26, 2019
50380d0
Fixes for new web3 version
patitonar Mar 26, 2019
90db9f2
Use getChainId method from web3
patitonar Mar 26, 2019
30bcac2
Update parity version on e2e tests
patitonar Mar 26, 2019
aa9416b
Update e2e test script
patitonar Mar 26, 2019
810f356
Fix on getBridgeValidators
patitonar Mar 26, 2019
58f220b
Update react build dependencies
patitonar Mar 27, 2019
bafe844
Web3 fixes
patitonar Mar 27, 2019
d42b6c6
Fix on TxStore
patitonar Mar 27, 2019
86c1bfa
Remove console.log
patitonar Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "react-app",
"parserOptions": {
"ecmaFeatures": {
"legacyDecorators": true
}
}
}
17 changes: 9 additions & 8 deletions config-overrides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
);
2 changes: 1 addition & 1 deletion e2e-script/parity/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM parity/parity:v1.11.11
FROM parity/parity:v2.2.11

WORKDIR /stuff

Expand Down
2 changes: 1 addition & 1 deletion e2e-script/parity/Dockerfile-foreign
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM parity/parity:v1.11.11
FROM parity/parity:v2.2.11

WORKDIR /stuff

Expand Down
1 change: 0 additions & 1 deletion e2e-script/parity/chain-foreign.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"eip161dTransition": "0x0",
"eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0",
"eip140Transition": "0x0",
Expand Down
1 change: 0 additions & 1 deletion e2e-script/parity/chain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"eip161dTransition": "0x0",
"eip155Transition": "0x0",
"eip98Transition": "0x7fffffffffffff",
"eip86Transition": "0x7fffffffffffff",
"maxCodeSize": 24576,
"maxCodeSizeTransition": "0x0",
"eip140Transition": "0x0",
Expand Down
2 changes: 1 addition & 1 deletion e2e-script/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading