From f4beb3a46e379f225ddbf8409ab6728165a7cbd9 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 14:39:22 -0500 Subject: [PATCH 01/18] Factor out common commands and re-enable non-Ganache jobs --- .travis.yml | 67 ++++++++++++++++++++-------------------------------- package.json | 3 +-- 2 files changed, 26 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdda0e18..e3f7d4b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,55 +12,38 @@ before_install: - git checkout cpk-test - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build -install: - - yarn global add ganache-cli@6.9.1 - - yarn install +before_script: + - SAFE_RELAY_CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) + +after_script: + - docker-compose down + - docker logs $PROVIDER_CONTAINER_ID + - docker stop $PROVIDER_CONTAINER_ID + - docker rm $PROVIDER_CONTAINER_ID jobs: include: - name: Ganache before_script: - - CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) - - ganache-cli -d --defaultBalanceEther 10000 -h 0.0.0.0 --noVMErrorsOnRPCResponse > /dev/null & - - sleep 60 - script: - - yarn test - after_script: - - docker logs $CONTAINER_ID - - docker stop $CONTAINER_ID - - docker rm $CONTAINER_ID + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli --defaultBalanceEther 10000) + - yarn wait-port -t 10000 localhost:8545 - #- name: Ganache with --noVMErrorsOnRPCResponse - # before_script: - # - CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) - # - sleep 60 - # script: - # - yarn test-rpc - # after_script: - # - docker logs $CONTAINER_ID - # - docker stop $CONTAINER_ID - # - docker rm $CONTAINER_ID + - name: Ganache with --noVMErrorsOnRPCResponse + before_script: + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + - yarn wait-port -t 10000 localhost:8545 - #- name: Geth - # before_script: - # - yarn geth-dev-assistant --accounts 2 --gasLimit 6721975 - # script: - # - yarn test - # after_script: - # - docker stop geth-client + - name: Geth + before_script: + - yarn geth-dev-assistant --accounts 10 --gasLimit 6721975 --balance 10000 + - PROVIDER_CONTAINER_ID=geth-client - #- name: OpenEthereum - # before_script: - # - PASSFILE=$(mktemp) - # - echo '' > $PASSFILE - # - chmod 644 $PASSFILE - # - CONTAINER_ID=$(docker run -d -p 8545:8545 -p 8546:8546 -v $PASSFILE:$PASSFILE openethereum/openethereum --config dev --jsonrpc-interface=all --ws-interface=all --unlock 0x00a329c0648769a73afac7f9381e08fb43dbea72 --password $PASSFILE) - # - yarn wait-port -t 10000 localhost:8545 - # script: - # - yarn test - # after_script: - # - docker logs $CONTAINER_ID - # - docker stop $CONTAINER_ID - # - docker rm $CONTAINER_ID + - name: OpenEthereum + before_script: + - PASSFILE=$(mktemp) + - echo '' > $PASSFILE + - chmod 644 $PASSFILE + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 -p 8546:8546 -v $PASSFILE:$PASSFILE openethereum/openethereum --config dev --jsonrpc-interface=all --ws-interface=all --unlock 0x00a329c0648769a73afac7f9381e08fb43dbea72 --password $PASSFILE) + - yarn wait-port -t 10000 localhost:8545 after_success: yarn coverage diff --git a/package.json b/package.json index 6a93ef92..0c86d807 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,8 @@ "scripts": { "generate-types": "typechain --target=truffle-v5 './build/contracts/*.json'", "migrate": "tsc -p ./tsconfig.migrate.json --outDir ./migrations && truffle migrate --network local", - "test-ts": "TS_NODE_PROJECT='./tsconfig.cjs.json' nyc mocha -t 20000 -r ts-node/register -r jsdom-global/register ./test/contract-proxy-kit.ts --exit", + "test-ts": "cross-env TS_NODE_PROJECT='./tsconfig.cjs.json' nyc mocha -t 20000 -r ts-node/register -r jsdom-global/register ./test/contract-proxy-kit.ts --exit", "test": "yarn generate-types && yarn migrate && yarn test-ts", - "test-rpc": "run-with-testrpc --noVMErrorsOnRPCResponse 'yarn test'", "coverage": "nyc report --reporter=text-lcov | coveralls", "format": "prettier-eslint --write $PWD/'src/**/*.{js,ts,json}' $PWD/'test/**/*.{js,ts,json}'", "build": "tsc && tsc -p tsconfig.cjs.json", From f7014ca3b36ce0f8c74c7bcaae3b1aaea7b95b1e Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 14:52:17 -0500 Subject: [PATCH 02/18] In test build, cd into safe-relay-service temporarily --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3f7d4b0..14a3273d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,18 @@ services: - docker before_install: - - git clone https://github.com/gnosis/safe-relay-service.git - - cd safe-relay-service - - git checkout cpk-test - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build + - git clone --depth=1 --branch=cpk-test https://github.com/gnosis/safe-relay-service.git before_script: + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build - SAFE_RELAY_CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) + - cd .. after_script: + - cd safe-relay-service - docker-compose down + - cd .. - docker logs $PROVIDER_CONTAINER_ID - docker stop $PROVIDER_CONTAINER_ID - docker rm $PROVIDER_CONTAINER_ID From 3101cf5afad5c93b41ec48b3730f5d7364c1323b Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 15:39:11 -0500 Subject: [PATCH 03/18] Add cross-env --- package.json | 1 + yarn.lock | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c86d807..c40a8f83 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "coveralls": "^3.1.0", + "cross-env": "^7.0.2", "dotenv": "^8.2.0", "eslint": "^7.10.0", "eslint-config-prettier": "^6.12.0", diff --git a/yarn.lock b/yarn.lock index cf386c3a..eade42ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2679,6 +2679,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-env@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9" + integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw== + dependencies: + cross-spawn "^7.0.1" + cross-fetch@^2.1.0, cross-fetch@^2.1.1: version "2.2.3" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz#e8a0b3c54598136e037f8650f8e823ccdfac198e" @@ -2698,7 +2705,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.2: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== From 400704206b3f4143b68d59e26e49c1acaf618954 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 16:01:35 -0500 Subject: [PATCH 04/18] Move Safe Relay setup into before_install and don't echo provider container logs --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14a3273d..76a4f3cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ services: before_install: - git clone --depth=1 --branch=cpk-test https://github.com/gnosis/safe-relay-service.git - -before_script: - cd safe-relay-service - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build - SAFE_RELAY_CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) @@ -19,7 +17,6 @@ after_script: - cd safe-relay-service - docker-compose down - cd .. - - docker logs $PROVIDER_CONTAINER_ID - docker stop $PROVIDER_CONTAINER_ID - docker rm $PROVIDER_CONTAINER_ID From bea3f69b4f067e66a6571fecdf8a8d7ba85bd1dc Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 16:33:08 -0500 Subject: [PATCH 05/18] Get logs about relay service web container --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 76a4f3cb..d751d637 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ before_install: after_script: - cd safe-relay-service + - docker-compose logs web - docker-compose down - cd .. - docker stop $PROVIDER_CONTAINER_ID From 9011c92112a9e88c356200b86380313c5f7f5f22 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 21 Sep 2020 17:14:34 -0500 Subject: [PATCH 06/18] Make Ganache run in deterministic mode --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d751d637..68743187 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,12 @@ jobs: include: - name: Ganache before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli --defaultBalanceEther 10000) + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000) - yarn wait-port -t 10000 localhost:8545 - name: Ganache with --noVMErrorsOnRPCResponse before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - yarn wait-port -t 10000 localhost:8545 - name: Geth From 7157e061bd49be22647dcff0c608943b4aa7e025 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 22 Sep 2020 11:02:37 -0500 Subject: [PATCH 07/18] Have Ganache listen on all interfaces --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68743187..9aa5bc43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,12 @@ jobs: include: - name: Ganache before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000) + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000) - yarn wait-port -t 10000 localhost:8545 - name: Ganache with --noVMErrorsOnRPCResponse before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - yarn wait-port -t 10000 localhost:8545 - name: Geth From 5fafc164fe9991d7854bab6a7544ea151e8d7159 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 22 Sep 2020 11:20:05 -0500 Subject: [PATCH 08/18] Try directly running Ganache bound to all interfaces --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9aa5bc43..d03523e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,14 @@ jobs: include: - name: Ganache before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000) + # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000) + - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 - yarn wait-port -t 10000 localhost:8545 - name: Ganache with --noVMErrorsOnRPCResponse before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse - yarn wait-port -t 10000 localhost:8545 - name: Geth From bd559b241a164b813cedb8afcb659ddf9d861b84 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 22 Sep 2020 11:39:22 -0500 Subject: [PATCH 09/18] Background Ganache CLI --- .travis.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d03523e1..bbb06ffb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,14 +26,26 @@ jobs: - name: Ganache before_script: # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000) - - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 + - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 & - yarn wait-port -t 10000 localhost:8545 - + after_script: + - cd safe-relay-service + - docker-compose logs web + - docker-compose down + - cd .. + - killall ganache-cli + - name: Ganache with --noVMErrorsOnRPCResponse before_script: # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse + - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse & - yarn wait-port -t 10000 localhost:8545 + after_script: + - cd safe-relay-service + - docker-compose logs web + - docker-compose down + - cd .. + - killall ganache-cli - name: Geth before_script: From 92f4285689d88ca59aeb6e0db468bee4b3c79195 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 22 Sep 2020 16:41:41 -0500 Subject: [PATCH 10/18] Move Relay service build after provider --- .travis.yml | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbb06ffb..8cbf2fd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,16 @@ services: before_install: - git clone --depth=1 --branch=cpk-test https://github.com/gnosis/safe-relay-service.git + # - cd safe-relay-service + # - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build + # - cd .. + +before_script: + - yarn wait-port -t 10000 localhost:8545 - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build - - SAFE_RELAY_CONTAINER_ID=$(docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d) + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - cd .. + - yarn wait-port -t 10000 localhost:8000 after_script: - cd safe-relay-service @@ -24,40 +30,23 @@ after_script: jobs: include: - name: Ganache - before_script: - # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000) - - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 & - - yarn wait-port -t 10000 localhost:8545 - after_script: - - cd safe-relay-service - - docker-compose logs web - - docker-compose down - - cd .. - - killall ganache-cli - + after_install: + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000) + - name: Ganache with --noVMErrorsOnRPCResponse - before_script: - # - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - - yarn ganache-cli -h 0.0.0.0 -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse & - - yarn wait-port -t 10000 localhost:8545 - after_script: - - cd safe-relay-service - - docker-compose logs web - - docker-compose down - - cd .. - - killall ganache-cli + after_install: + - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - name: Geth - before_script: + after_install: - yarn geth-dev-assistant --accounts 10 --gasLimit 6721975 --balance 10000 - PROVIDER_CONTAINER_ID=geth-client - name: OpenEthereum - before_script: + after_install: - PASSFILE=$(mktemp) - echo '' > $PASSFILE - chmod 644 $PASSFILE - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 -p 8546:8546 -v $PASSFILE:$PASSFILE openethereum/openethereum --config dev --jsonrpc-interface=all --ws-interface=all --unlock 0x00a329c0648769a73afac7f9381e08fb43dbea72 --password $PASSFILE) - - yarn wait-port -t 10000 localhost:8545 after_success: yarn coverage From 59daba87f181450e48c56ca676be2829929c4200 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 22 Sep 2020 17:15:33 -0500 Subject: [PATCH 11/18] Try with a real hook --- .travis.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cbf2fd8..e7967130 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,6 @@ before_install: # - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build # - cd .. -before_script: - - yarn wait-port -t 10000 localhost:8545 - - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - - cd .. - - yarn wait-port -t 10000 localhost:8000 - after_script: - cd safe-relay-service - docker-compose logs web @@ -30,23 +23,43 @@ after_script: jobs: include: - name: Ganache - after_install: + before_script: - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000) + - yarn wait-port -t 10000 localhost:8545 + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + - cd .. + - yarn wait-port -t 10000 localhost:8000 - name: Ganache with --noVMErrorsOnRPCResponse - after_install: + before_script: - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) + - yarn wait-port -t 10000 localhost:8545 + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + - cd .. + - yarn wait-port -t 10000 localhost:8000 - name: Geth - after_install: + before_script: - yarn geth-dev-assistant --accounts 10 --gasLimit 6721975 --balance 10000 - PROVIDER_CONTAINER_ID=geth-client + - yarn wait-port -t 10000 localhost:8545 + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + - cd .. + - yarn wait-port -t 10000 localhost:8000 - name: OpenEthereum - after_install: + before_script: - PASSFILE=$(mktemp) - echo '' > $PASSFILE - chmod 644 $PASSFILE - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 -p 8546:8546 -v $PASSFILE:$PASSFILE openethereum/openethereum --config dev --jsonrpc-interface=all --ws-interface=all --unlock 0x00a329c0648769a73afac7f9381e08fb43dbea72 --password $PASSFILE) + - yarn wait-port -t 10000 localhost:8545 + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + - cd .. + - yarn wait-port -t 10000 localhost:8000 after_success: yarn coverage From efe51a1ab540053d0cc483606c363c9c202880c2 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 27 Oct 2020 11:27:01 -0500 Subject: [PATCH 12/18] Try with Gunash --- .travis.yml | 53 ++++++++--------------------- migrations/1-deploy-contracts.js | 2 +- package.json | 1 + yarn.lock | 58 ++++++++++++++++++++++++++++++-- 4 files changed, 72 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7967130..dc0c657c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,58 +8,33 @@ services: before_install: - git clone --depth=1 --branch=cpk-test https://github.com/gnosis/safe-relay-service.git - # - cd safe-relay-service - # - docker-compose -f docker-compose.yml -f docker-compose.dev.yml build - # - cd .. + +before_script: + - yarn gunash --node-type $NODE_TYPE + - cd safe-relay-service + - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d + - cd .. + - yarn wait-port -t 10000 localhost:8000 after_script: - cd safe-relay-service - docker-compose logs web - docker-compose down - cd .. - - docker stop $PROVIDER_CONTAINER_ID - - docker rm $PROVIDER_CONTAINER_ID + - yarn gunash stop jobs: include: - name: Ganache - before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000) - - yarn wait-port -t 10000 localhost:8545 - - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - - cd .. - - yarn wait-port -t 10000 localhost:8000 - - - name: Ganache with --noVMErrorsOnRPCResponse - before_script: - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 trufflesuite/ganache-cli -d --defaultBalanceEther 10000 --noVMErrorsOnRPCResponse) - - yarn wait-port -t 10000 localhost:8545 - - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - - cd .. - - yarn wait-port -t 10000 localhost:8000 + env: NODE_TYPE=ganache - name: Geth - before_script: - - yarn geth-dev-assistant --accounts 10 --gasLimit 6721975 --balance 10000 - - PROVIDER_CONTAINER_ID=geth-client - - yarn wait-port -t 10000 localhost:8545 - - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - - cd .. - - yarn wait-port -t 10000 localhost:8000 + env: NODE_TYPE=geth - name: OpenEthereum - before_script: - - PASSFILE=$(mktemp) - - echo '' > $PASSFILE - - chmod 644 $PASSFILE - - PROVIDER_CONTAINER_ID=$(docker run -d -p 8545:8545 -p 8546:8546 -v $PASSFILE:$PASSFILE openethereum/openethereum --config dev --jsonrpc-interface=all --ws-interface=all --unlock 0x00a329c0648769a73afac7f9381e08fb43dbea72 --password $PASSFILE) - - yarn wait-port -t 10000 localhost:8545 - - cd safe-relay-service - - docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d - - cd .. - - yarn wait-port -t 10000 localhost:8000 + env: NODE_TYPE=openethereum + + - name: Nethermind + env: NODE_TYPE=nethermind after_success: yarn coverage diff --git a/migrations/1-deploy-contracts.js b/migrations/1-deploy-contracts.js index d8b634f2..75869618 100644 --- a/migrations/1-deploy-contracts.js +++ b/migrations/1-deploy-contracts.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); module.exports = function (deployer, network) { - var deploy = function (name) { return deployer.deploy(artifacts.require(name)); }; + const deploy = (name) => deployer.deploy(artifacts.require(name)); ['Migrations', 'CPKFactory'].forEach(deploy); if (network === 'test' || network === 'local') { [ diff --git a/package.json b/package.json index c40a8f83..cfe16ab3 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "ethers-5": "npm:ethers@^5.0.14", "ganache-cli": "^6.10.2", "geth-dev-assistant": "^0.1.7", + "gunash": "^0.1.0", "jsdom": "^16.4.0", "jsdom-global": "^3.0.2", "nyc": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index eade42ec..90c1225f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2466,6 +2466,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz#ef180f26c8d9bff3927ee52428bfec2090427981" + integrity sha512-Gj3QHTkVMPKqwP3f7B4KPkBZRMR9r4rfi5bXFpg1a+Svvj8l7q5CnkBkVQzfxT5DFSsGk2+PascOgL0JYkL2kw== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + clone-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" @@ -3297,6 +3306,11 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3: d "^1.0.1" ext "^1.1.2" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -4396,7 +4410,7 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -4568,6 +4582,14 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== +gunash@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.1.0.tgz#a1db7b6571f169dbb356802b329909aafc927d56" + integrity sha512-3qH5+ltasYQcS9wav2wU3hhfOZLClYFloAU57pXwa399XSBXcgKeUuL4clprsrGAxaVM9u74IcFfwrJ9BpMr0Q== + dependencies: + web3 "^1.3.0" + yargs "^16.1.0" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -8207,7 +8229,7 @@ wait-port@^0.2.9: commander "^3.0.2" debug "^4.1.1" -"web3-1-3@npm:web3@^1.3.0", web3@*, web3@^1.0.0-beta.34, web3@^1.2.9: +"web3-1-3@npm:web3@^1.3.0", web3@*, web3@^1.0.0-beta.34, web3@^1.2.9, web3@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349" integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw== @@ -9057,6 +9079,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -9179,6 +9210,11 @@ y18n@^4.0.0: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== +y18n@^5.0.2: + version "5.0.5" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" + integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + yaeti@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577" @@ -9213,6 +9249,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.2.2: + version "20.2.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz#92419ba867b858c868acf8bae9bf74af0dd0ce26" + integrity sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww== + yargs-unparser@1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.1.tgz#bd4b0ee05b4c94d058929c32cb09e3fce71d3c5f" @@ -9291,6 +9332,19 @@ yargs@^15.0.2: y18n "^4.0.0" yargs-parser "^18.1.2" +yargs@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.0.tgz#fc333fe4791660eace5a894b39d42f851cd48f2a" + integrity sha512-upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.2" + yargs-parser "^20.2.2" + yauzl@^2.4.2: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From 04e7c32d19abbdd246ea14396cd20b408f0d09d5 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Tue, 27 Oct 2020 15:56:35 -0500 Subject: [PATCH 13/18] Upgrade Gunash --- package.json | 2 +- yarn.lock | 170 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 121 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index cfe16ab3..e15cd5ac 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "ethers-5": "npm:ethers@^5.0.14", "ganache-cli": "^6.10.2", "geth-dev-assistant": "^0.1.7", - "gunash": "^0.1.0", + "gunash": "^0.2.0", "jsdom": "^16.4.0", "jsdom-global": "^3.0.2", "nyc": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 90c1225f..9df34b30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -268,10 +268,21 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.4.tgz#8669bcbd02f4b64f4cede0a10e84df6d964ec9d3" - integrity sha512-CIjAeG6zNehbpJTi0sgwUvaH2ZICiAV9XkCBaFy5tjuEVFpQNeqd6f+B7RowcNO7Eut+QbhcQ5CVLkmP5zhL9A== +"@ethersproject/abstract-signer@^5.0.6": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.7.tgz#cdbd3bd479edf77c71b7f6a6156b0275b1176ded" + integrity sha512-8W8gy/QutEL60EoMEpvxZ8MFAEWs/JvH5nmZ6xeLXoZvmBCasGmxqHdYjo2cxg0nevkPkq9SeenSsBBZSCx+SQ== + dependencies: + "@ethersproject/abstract-provider" "^5.0.4" + "@ethersproject/bignumber" "^5.0.7" + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.3" + +"@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.5.tgz#2caa65f6b7125015395b1b54c985ee0b27059cc7" + integrity sha512-DpkQ6rwk9jTefrRsJzEm6nhRiJd9pvhn1xN0rw5N/jswXG5r7BLk/GVA0mMAVWAsYfvi2xSc5L41FMox43RYEA== dependencies: "@ethersproject/bignumber" "^5.0.7" "@ethersproject/bytes" "^5.0.4" @@ -295,26 +306,26 @@ "@ethersproject/bytes" "^5.0.4" "@ethersproject/properties" "^5.0.3" -"@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7": - version "5.0.7" - resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.7.tgz#720b3e3df3e125a99669ee869478106d0afe7b76" - integrity sha512-wwKgDJ+KA7IpgJwc8Fc0AjKIRuDskKA2cque29/+SgII9/1K/38JpqVNPKIovkLwTC2DDofIyzHcxeaKpMFouQ== +"@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8": + version "5.0.8" + resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.8.tgz#cee33bd8eb0266176def0d371b45274b1d2c4ec0" + integrity sha512-KXFVAFKS1jdTXYN8BE5Oj+ZfPMh28iRdFeNGBVT6cUFdtiPVqeXqc0ggvBqA3A1VoFFGgM7oAeaagA393aORHA== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" bn.js "^4.4.0" "@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.4.tgz#328d9d929a3e970964ecf5d62e12568a187189f1" - integrity sha512-9R6A6l9JN8x1U4s1dJCR+9h3MZTT3xQofr/Xx8wbDvj6NnY4CbBB0o8ZgHXvR74yV90pY2EzCekpkMBJnRzkSw== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.5.tgz#688b70000e550de0c97a151a21f15b87d7f97d7c" + integrity sha512-IEj9HpZB+ACS6cZ+QQMTqmu/cnUK2fYNE6ms/PVxjoBjoxc6HCraLpam1KuRvreMy0i523PLmjN8OYeikRdcUQ== dependencies: "@ethersproject/logger" "^5.0.5" "@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.4.tgz#9ddaa5f3c738a94e5adc4b3f71b36206fa5cdf88" - integrity sha512-Df32lcXDHPgZRPgp1dgmByNbNe4Ki1QoXR+wU61on5nggQGTqWR1Bb7pp9VtI5Go9kyE/JflFc4Te6o9MvYt8A== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.5.tgz#0ed19b002e8404bdf6d135234dc86a7d9bcf9b71" + integrity sha512-foaQVmxp2+ik9FrLUCtVrLZCj4M3Ibgkqvh+Xw/vFRSerkjVSYePApaVE5essxhoSlF1U9oXfWY09QI2AXtgKA== dependencies: "@ethersproject/bignumber" "^5.0.7" @@ -333,7 +344,21 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/properties" "^5.0.3" -"@ethersproject/hash@>=5.0.0-beta.128", "@ethersproject/hash@^5.0.4": +"@ethersproject/hash@>=5.0.0-beta.128": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.6.tgz#2a2e8a1470685421217e9e86e9971ca636e609ce" + integrity sha512-Gvh57v6BWhwnud6l7tMfQm32PRQ2DYx2WaAAQmAxAfYvmzUkpQCBstnGeNMXIL8/2wdkvcB2u+WZRWaZtsFuUQ== + dependencies: + "@ethersproject/abstract-signer" "^5.0.6" + "@ethersproject/address" "^5.0.5" + "@ethersproject/bignumber" "^5.0.8" + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/keccak256" "^5.0.3" + "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.4" + "@ethersproject/strings" "^5.0.4" + +"@ethersproject/hash@^5.0.4": version "5.0.4" resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.4.tgz#385642786405d236f3d2f1acdfaf250ab519cdac" integrity sha512-VCs/bFBU8AQFhHcT1cQH6x7a4zjulR6fJmAOcPxUgrN7bxOQ7QkpBKF+YCDJhFtkLdaljIsr/r831TuWU4Ysfg== @@ -381,17 +406,17 @@ scrypt-js "3.0.1" "@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.3.tgz#f094a8fca3bb913c044593c4f382be424292e588" - integrity sha512-VhW3mgZMBZlETV6AyOmjNeNG+Pg68igiKkPpat8/FZl0CKnfgQ+KZQZ/ee1vT+X0IUM8/djqnei6btmtbA27Ug== + version "5.0.4" + resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.4.tgz#36ca0a7d1ae2a272da5654cb886776d0c680ef3a" + integrity sha512-GNpiOUm9PGUxFNqOxYKDQBM0u68bG9XC9iOulEQ8I0tOx/4qUpgVzvgXL6ugxr0RY554Gz/NQsVqknqPzUcxpQ== dependencies: "@ethersproject/bytes" "^5.0.4" js-sha3 "0.5.7" "@ethersproject/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.5.tgz#e3ba3d0bcf9f5be4da5f043b1e328eb98b80002f" - integrity sha512-gJj72WGzQhUtCk6kfvI8elTaPOQyMvrMghp/nbz0ivTo39fZ7IjypFh/ySDeUSdBNplAwhzWKKejQhdpyefg/w== + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.6.tgz#faa484203e86e08be9e07fef826afeef7183fe88" + integrity sha512-FrX0Vnb3JZ1md/7GIZfmJ06XOAA8r3q9Uqt9O5orr4ZiksnbpXKlyDzQtlZ5Yv18RS8CAUbiKH9vwidJg1BPmQ== "@ethersproject/networks@^5.0.3": version "5.0.3" @@ -408,10 +433,10 @@ "@ethersproject/bytes" "^5.0.4" "@ethersproject/sha2" "^5.0.3" -"@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.3.tgz#991aef39a5f87d4645cee76cec4df868bfb08be6" - integrity sha512-wLCSrbywkQgTO6tIF9ZdKsH9AIxPEqAJF/z5xcPkz1DK4mMAZgAXRNw1MrKYhyb+7CqNHbj3vxenNKFavGY/IA== +"@ethersproject/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.4.tgz#a67a1f5a52c30850b5062c861631e73d131f666e" + integrity sha512-UdyX3GqBxFt15B0uSESdDNmhvEbK3ACdDXl2soshoPcneXuTswHDeA0LoPlnaZzhbgk4p6jqb4GMms5C26Qu6A== dependencies: "@ethersproject/logger" "^5.0.5" @@ -449,9 +474,9 @@ "@ethersproject/logger" "^5.0.5" "@ethersproject/rlp@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.3.tgz#841a5edfdf725f92155fe74424f5510c9043c13a" - integrity sha512-Hz4yyA/ilGafASAqtTlLWkA/YqwhQmhbDAq2LSIp1AJNx+wtbKWFAKSckpeZ+WG/xZmT+fw5OFKK7a5IZ4DR5g== + version "5.0.4" + resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.4.tgz#0090a0271e84ea803016a112a79f5cfd80271a77" + integrity sha512-5qrrZad7VTjofxSsm7Zg/7Dr4ZOln4S2CqiDdOuTv6MBKnXj0CiBojXyuDy52M8O3wxH0CyE924hXWTDV1PQWQ== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" @@ -466,9 +491,9 @@ hash.js "1.1.3" "@ethersproject/signing-key@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.4.tgz#a5334ce8a52d4e9736dc8fb6ecc384704ecf8783" - integrity sha512-I6pJoga1IvhtjYK5yXzCjs4ZpxrVbt9ZRAlpEw0SW9UuV020YfJH5EIVEGR2evdRceS3nAQIggqbsXSkP8Y1Dg== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.5.tgz#acfd06fc05a14180df7e027688bbd23fc4baf782" + integrity sha512-Z1wY7JC1HVO4CvQWY2TyTTuAr8xK3bJijZw1a9G92JEmKdv1j255R/0YLBBcFTl2J65LUjtXynNJ2GbArPGi5g== dependencies: "@ethersproject/bytes" "^5.0.4" "@ethersproject/logger" "^5.0.5" @@ -487,15 +512,30 @@ "@ethersproject/strings" "^5.0.4" "@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.4.tgz#67cda604eee3ffcc004cb9f3bd03516e1c7b09a0" - integrity sha512-azXFHaNkDXzefhr4LVVzzDMFwj3kH9EOKlATu51HjxabQafuUyVLPFgmxRFmCynnAi0Bmmp7nr+qK1pVDgRDLQ== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.5.tgz#ed7e99a282a02f40757691b04a24cd83f3752195" + integrity sha512-JED6WaIV00xM/gvj8vSnd+0VWtDYdidTmavFRCTQakqfz+4tDo6Jz5LHgG+dd45h7ah7ykCHW0C7ZXWEDROCXQ== + dependencies: + "@ethersproject/bytes" "^5.0.4" + "@ethersproject/constants" "^5.0.4" + "@ethersproject/logger" "^5.0.5" + +"@ethersproject/transactions@^5.0.0-beta.135": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.6.tgz#b8b27938be6e9ed671dbdd35fe98af8b14d0df7c" + integrity sha512-htsFhOD+NMBxx676A8ehSuwVV49iqpSB+CkjPZ02tpNew0K6p8g0CZ46Z1ZP946gIHAU80xQ0NACHYrjIUaCFA== dependencies: + "@ethersproject/address" "^5.0.4" + "@ethersproject/bignumber" "^5.0.7" "@ethersproject/bytes" "^5.0.4" "@ethersproject/constants" "^5.0.4" + "@ethersproject/keccak256" "^5.0.3" "@ethersproject/logger" "^5.0.5" + "@ethersproject/properties" "^5.0.3" + "@ethersproject/rlp" "^5.0.3" + "@ethersproject/signing-key" "^5.0.4" -"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5": +"@ethersproject/transactions@^5.0.5": version "5.0.5" resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.5.tgz#9a966f9ef4817b1752265d4efee0f1e9fd6aeaad" integrity sha512-1Ga/QmbcB74DItggP8/DK1tggu4ErEvwTkIwIlUXUcvIAuRNXXE7kgQhlp+w1xA/SAQFhv56SqCoyqPiiLCvVA== @@ -895,16 +935,21 @@ form-data "^3.0.0" "@types/node@*": - version "14.11.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.2.tgz#2de1ed6670439387da1c9f549a2ade2b0a799256" - integrity sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA== + version "14.14.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.5.tgz#e92d3b8f76583efa26c1a63a21c9d3c1143daa29" + integrity sha512-H5Wn24s/ZOukBmDn03nnGTp18A60ny9AmCwnEcgJiTgSGsCO7k+NWP7zjCCbhlcnVCoI+co52dUAt9GMhOSULw== "@types/node@^10.12.18", "@types/node@^10.3.2": version "10.17.35" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.35.tgz#58058f29b870e6ae57b20e4f6e928f02b7129f56" integrity sha512-gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA== -"@types/node@^12.12.6", "@types/node@^12.6.1": +"@types/node@^12.12.6": + version "12.19.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.2.tgz#9565ed5c72ba96038fc3add643edd5e7820598e7" + integrity sha512-SRH6QM0IMOBBFmDiJ75vlhcbUEYEquvSuhsVW9ijG20JvdFTfOrB1p6ddZxz5y/JNnbf+9HoHhjhOVSX2hsJyA== + +"@types/node@^12.6.1": version "12.12.62" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.62.tgz#733923d73669188d35950253dd18a21570085d2b" integrity sha512-qAfo81CsD7yQIM9mVyh6B/U47li5g7cfpVQEDMfQeF8pSZVwzbhwU3crc0qG4DmpsebpJPR49AKOExQyJ05Cpg== @@ -1139,7 +1184,7 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.9.1: +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.9.1: version "6.12.5" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== @@ -1149,6 +1194,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.9.1: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ansi-colors@4.1.1, ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -1202,7 +1257,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -1915,7 +1977,7 @@ base-x@^3.0.2, base-x@^3.0.8: dependencies: safe-buffer "^5.0.1" -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== @@ -2229,7 +2291,15 @@ buffer-xor@^1.0.3: resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= -buffer@^5.0.5, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.0.5, buffer@^5.5.0, buffer@^5.6.0: + version "5.6.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.1.tgz#b99419405f4290a7a1f20b51037cee9f1fbd7f6a" + integrity sha512-2z15UUHpS9/3tk9mY/q+Rl3rydOi7yMp5XWNQnRvoz+mJwiv8brqYwp9a+nOCtma6dwuEIxljD8W3ysVBZ05Vg== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +buffer@^5.2.1: version "5.6.0" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786" integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw== @@ -4582,10 +4652,10 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -gunash@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.1.0.tgz#a1db7b6571f169dbb356802b329909aafc927d56" - integrity sha512-3qH5+ltasYQcS9wav2wU3hhfOZLClYFloAU57pXwa399XSBXcgKeUuL4clprsrGAxaVM9u74IcFfwrJ9BpMr0Q== +gunash@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.2.0.tgz#280819e1ab38c52f34bc127d8b9f195a6764f59b" + integrity sha512-isyQACWL4TA32/BWrd1q/XlCvqGXZYD+CO6hSfUi8eXnI+JIkho+YcVCpj1mK9YV1gVIrt+HrTuBUSXegE31zg== dependencies: web3 "^1.3.0" yargs "^16.1.0" @@ -8176,9 +8246,9 @@ v8-compile-cache@^2.0.3: integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ== varint@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.1.tgz#d65c148f4c3bddc8201297474873a324d266a1dd" - integrity sha512-nd1E35rKooOyDPhAeHS3hWVrTRBP4Cpn86Zxg/G73C9vA4Un2RXn9pvPF3SVOvTALCDL9wFSCwfI5ENAPzLWDA== + version "5.0.2" + resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" + integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow== vary@^1, vary@~1.1.2: version "1.1.2" From 3107b4de5076b41f1add8af612da0aa70eb54dfe Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 30 Oct 2020 12:33:47 -0500 Subject: [PATCH 14/18] Upgrade Gunash again --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e15cd5ac..04ac08c7 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "ethers-5": "npm:ethers@^5.0.14", "ganache-cli": "^6.10.2", "geth-dev-assistant": "^0.1.7", - "gunash": "^0.2.0", + "gunash": "^0.2.2", "jsdom": "^16.4.0", "jsdom-global": "^3.0.2", "nyc": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 9df34b30..f65d7771 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4652,10 +4652,10 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -gunash@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.2.0.tgz#280819e1ab38c52f34bc127d8b9f195a6764f59b" - integrity sha512-isyQACWL4TA32/BWrd1q/XlCvqGXZYD+CO6hSfUi8eXnI+JIkho+YcVCpj1mK9YV1gVIrt+HrTuBUSXegE31zg== +gunash@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.2.2.tgz#dfa454d67ebbbc9e7b9a1534b6c506ff746f1602" + integrity sha512-uoPNqALVLFDTS6zdl1+rgMTEQHSUmd8hUDY38ZH8Nbzq5JQxGQDPF1UhV1JUTbkjeXJrTM1idpCur2JCvdqxKA== dependencies: web3 "^1.3.0" yargs "^16.1.0" From a2afd09923d15afcbec6291dc9d59ae31c516347 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Fri, 30 Oct 2020 16:35:50 -0500 Subject: [PATCH 15/18] Remove Nethermind build for now --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc0c657c..33b859fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,4 @@ jobs: - name: OpenEthereum env: NODE_TYPE=openethereum - - name: Nethermind - env: NODE_TYPE=nethermind - after_success: yarn coverage From cd9d051e7de71beeb2de60bc214176f186da3eb1 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 2 Nov 2020 13:56:59 -0600 Subject: [PATCH 16/18] Upgrade Gunash again again and put --noVMErrorsOnRPCResponse on Ganache --- .travis.yml | 4 ++-- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33b859fa..baa76900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ after_script: jobs: include: - - name: Ganache - env: NODE_TYPE=ganache + - name: Ganache with --noVMErrorsOnRPCResponse + env: NODE_TYPE=ganache --noVMErrorsOnRPCResponse - name: Geth env: NODE_TYPE=geth diff --git a/package.json b/package.json index 04ac08c7..0b5cfcc0 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "ethers-5": "npm:ethers@^5.0.14", "ganache-cli": "^6.10.2", "geth-dev-assistant": "^0.1.7", - "gunash": "^0.2.2", + "gunash": "^0.2.3", "jsdom": "^16.4.0", "jsdom-global": "^3.0.2", "nyc": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index f65d7771..e6054023 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4652,10 +4652,10 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -gunash@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.2.2.tgz#dfa454d67ebbbc9e7b9a1534b6c506ff746f1602" - integrity sha512-uoPNqALVLFDTS6zdl1+rgMTEQHSUmd8hUDY38ZH8Nbzq5JQxGQDPF1UhV1JUTbkjeXJrTM1idpCur2JCvdqxKA== +gunash@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/gunash/-/gunash-0.2.3.tgz#cb0229e1880d4e45e48c549dbcfefd7c6ea6924f" + integrity sha512-500ms8pYOxlOABGRst4dKd1ULc0IlSpwHVGAZyQVq3qOr8t2oAykHRBOHUBokuKpMR2XJbPLRx4D/t7HOr2jQg== dependencies: web3 "^1.3.0" yargs "^16.1.0" From a07e80676b1056821d9c8df92f4f5e326a8bf704 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 2 Nov 2020 14:05:43 -0600 Subject: [PATCH 17/18] Remove Geth because tests fail with latest Geth --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index baa76900..74734b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,6 @@ jobs: - name: Ganache with --noVMErrorsOnRPCResponse env: NODE_TYPE=ganache --noVMErrorsOnRPCResponse - - name: Geth - env: NODE_TYPE=geth - - name: OpenEthereum env: NODE_TYPE=openethereum From 0914b0eb31e202d54d60b7a5542c9e90c144dafd Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Mon, 2 Nov 2020 15:29:53 -0600 Subject: [PATCH 18/18] Quote env value with spaces in Travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74734b8a..3df456f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ after_script: jobs: include: - name: Ganache with --noVMErrorsOnRPCResponse - env: NODE_TYPE=ganache --noVMErrorsOnRPCResponse + env: NODE_TYPE="ganache --noVMErrorsOnRPCResponse" - name: OpenEthereum env: NODE_TYPE=openethereum