diff --git a/.gitignore b/.gitignore index 8443e503d..179c54e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ */**/*tx_database* */**/*dapps* vendor/github.com/ethereum/go-ethereum/vendor -/node_modules/ +node_modules/ tags #* diff --git a/Makefile b/Makefile index c41b367bf..b458e5c2e 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ statusgo-ios-simulator-mainnet: xgo @echo "iOS framework cross compilation done (mainnet)." generate: ##@other Regenerate assets and other auto-generated stuff - cp ./node_modules/web3/dist/web3.js ./static/scripts/web3.js + cp ./_assets/node_modules/web3/dist/web3.min.js ./static/scripts/web3.js go generate ./static rm ./static/scripts/web3.js diff --git a/t/e2e/README.md b/t/e2e/README.md index 796c72cab..84efe9db5 100644 --- a/t/e2e/README.md +++ b/t/e2e/README.md @@ -56,7 +56,7 @@ popd Update config for tests with new accounts `static/config/public-chain-accounts.json`: -``` +```json { "Account1": { "Address": "0xb6120ddd881593537c2bd4280bae509ec94b1a6b" @@ -70,11 +70,12 @@ Update config for tests with new accounts `static/config/public-chain-accounts.j Embed keys as a binary data, you will need to install `npm` tool and web3.js lib: ```bash -npm install web3 +(cd _assets && npm install web3) make generate ``` As a final step request funds from faucet for a chosen network: + - [Rinkeby](https://faucet.rinkeby.io/) - [Ropsten](http://faucet.ropsten.be:3001/)