Skip to content

Commit

Permalink
Merge branch 'master' into release0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hkalodner authored Jun 9, 2020
2 parents 30de972 + 80a18a2 commit 45fc9e7
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 16 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
- run:
name: test arb-provider-ethers
command: |
yarn
yarn test --coverage --ci --runInBand --reporters=default --reporters=jest-junit
yarn lint --format junit -o ${TEST_RESULTS}/arb-provider-ethers-lint.xml
environment:
Expand Down
6 changes: 5 additions & 1 deletion packages/arb-provider-ethers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"scripts": {
"prepublishOnly": "yarn build && yarn format && yarn test",
"preversion": "yarn lint",
"prepare": "install-peers",
"build": "./scripts/builder",
"watch": "tsc --watch",
"test": "jest --config jest.config.js",
Expand All @@ -26,12 +27,15 @@
"update-abi": "./scripts/update-abi && yarn format"
},
"dependencies": {
"ethers": "^4.0.47",
"jayson": "^3.2.0",
"promise-poller": "^1.9.1"
},
"peerDependencies": {
"ethers": "~4.0.47"
},
"devDependencies": {
"@types/jest": "^25.1.1",
"install-peers-cli": "^2.2.0",
"jest": "^25.1.0",
"jest-junit": "^10.0.0",
"ts-jest": "^25.2.0",
Expand Down
42 changes: 27 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5105,21 +5105,6 @@ ethers@^4.0.0-beta.1, ethers@^4.0.32:
uuid "2.0.1"
xmlhttprequest "1.8.0"

ethers@^4.0.47:
version "4.0.47"
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.47.tgz#91b9cd80473b1136dd547095ff9171bd1fc68c85"
integrity sha512-hssRYhngV4hiDNeZmVU/k5/E8xmLG8UpcNUzg6mb7lqhgpFPH/t7nuv20RjRrEf0gblzvi2XwR5Te+V3ZFc9pQ==
dependencies:
aes-js "3.0.0"
bn.js "^4.4.0"
elliptic "6.5.2"
hash.js "1.1.3"
js-sha3 "0.5.7"
scrypt-js "2.0.4"
setimmediate "1.0.4"
uuid "2.0.1"
xmlhttprequest "1.8.0"

ethjs-abi@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ethjs-abi/-/ethjs-abi-0.2.1.tgz#e0a7a93a7e81163a94477bad56ede524ab6de533"
Expand Down Expand Up @@ -5227,6 +5212,13 @@ execa@^4.0.0:
signal-exit "^3.0.2"
strip-final-newline "^2.0.0"

executioner@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/executioner/-/executioner-2.0.1.tgz#add328e03bc45dd598f358fbb529fc0be0ec6fcd"
integrity sha1-rdMo4DvEXdWY81j7tSn8C+Dsb80=
dependencies:
mixly "^1.0.0"

exit@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
Expand Down Expand Up @@ -5814,6 +5806,11 @@ fsevents@^2.1.2, fsevents@~2.1.1:
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==

fulcon@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/fulcon/-/fulcon-1.0.2.tgz#8a4dfda4c73fcd9cc62a79d5045c392b45547320"
integrity sha1-ik39pMc/zZzGKnnVBFw5K0VUcyA=

function-bind@^1.0.2, function-bind@^1.1.1, function-bind@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
Expand Down Expand Up @@ -6666,6 +6663,14 @@ inquirer@^7.0.0:
strip-ansi "^6.0.0"
through "^2.3.6"

install-peers-cli@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/install-peers-cli/-/install-peers-cli-2.2.0.tgz#f76f1ec8ac9fa7f920c05743e011554edad85f8d"
integrity sha512-scSNvF49HDOLNm2xLFwST23g/OvfsceiA087bcGBgZP/ZNCrvpSaCn5IrWNZ2XYmFFykXF/6J1Zgm+D/JgRgtA==
dependencies:
commander "^2.20.0"
executioner "^2.0.1"

internal-ip@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
Expand Down Expand Up @@ -8880,6 +8885,13 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"

mixly@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/mixly/-/mixly-1.0.0.tgz#9b5a2e1f63e6dfba0d30e6797ffae62ab1dc24ef"
integrity sha1-m1ouH2Pm37oNMOZ5f/rmKrHcJO8=
dependencies:
fulcon "^1.0.1"

mkdirp-promise@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
Expand Down

0 comments on commit 45fc9e7

Please sign in to comment.