aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package.json3
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/base-contract/package.json2
-rw-r--r--packages/contract-wrappers/package.json2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/fill-scenarios/package.json2
-rw-r--r--packages/metacoin/package.json2
-rw-r--r--packages/migrations/package.json2
-rw-r--r--packages/order-utils/package.json2
-rw-r--r--packages/order-watcher/package.json2
-rw-r--r--packages/utils/package.json2
-rw-r--r--packages/web3-wrapper/package.json2
-rw-r--r--yarn.lock27
13 files changed, 34 insertions, 18 deletions
diff --git a/package.json b/package.json
index 04ca89fd1..61223aa78 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,5 @@
"source-map-support": "^0.5.6",
"typescript": "3.0.1",
"wsrun": "^2.2.0"
- },
- "resolutions": {
- "ethers": "0xproject/ethers.js#eip-838-reasons"
}
}
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index bf929a835..6de57f210 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -84,7 +84,7 @@
"@0xproject/utils": "^1.0.8",
"@0xproject/web3-wrapper": "^2.0.2",
"ethereum-types": "^1.0.6",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5",
"web3-provider-engine": "14.0.6"
},
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index 6542f48df..4f7f571cc 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -44,7 +44,7 @@
"@0xproject/utils": "^1.0.8",
"@0xproject/web3-wrapper": "^2.0.2",
"ethereum-types": "^1.0.6",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index ece5c9649..0d830f6c2 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -84,7 +84,7 @@
"ethereum-types": "^1.0.6",
"ethereumjs-blockstream": "5.0.0",
"ethereumjs-util": "^5.1.1",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"js-sha3": "^0.7.0",
"lodash": "^4.17.5",
"uuid": "^3.1.0"
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 1c912d3a7..628e74a78 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -83,7 +83,7 @@
"ethereum-types": "^1.0.6",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"js-combinatorics": "^0.5.3",
"lodash": "^4.17.5"
}
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 4592ca091..5598b2b5f 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -44,7 +44,7 @@
"@0xproject/utils": "^1.0.8",
"@0xproject/web3-wrapper": "^2.0.2",
"ethereum-types": "^1.0.6",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 9246c1961..433995686 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -40,7 +40,7 @@
"@types/mocha": "^5.2.2",
"copyfiles": "^2.0.0",
"ethereum-types": "^1.0.6",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5",
"run-s": "^0.0.0"
},
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 5938ac224..a669b3fef 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -53,7 +53,7 @@
"@0xproject/web3-wrapper": "^2.0.2",
"@ledgerhq/hw-app-eth": "^4.3.0",
"ethereum-types": "^1.0.6",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"optionalDependencies": {
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index b3f93ff2e..a114c1751 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -69,7 +69,7 @@
"ethereum-types": "^1.0.6",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "^5.1.1",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index a07e0f795..07040a421 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -83,7 +83,7 @@
"bintrees": "^1.0.2",
"ethereum-types": "^1.0.6",
"ethereumjs-blockstream": "5.0.0",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 831b6c819..c9e8fba83 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -49,7 +49,7 @@
"detect-node": "2.0.3",
"ethereum-types": "^1.0.6",
"ethereumjs-util": "^5.1.1",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"isomorphic-fetch": "^2.2.1",
"js-sha3": "^0.7.0",
"lodash": "^4.17.5"
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 05ea4da17..cad814d8d 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -59,7 +59,7 @@
"@0xproject/utils": "^1.0.8",
"ethereum-types": "^1.0.6",
"ethereumjs-util": "^5.1.1",
- "ethers": "3.0.22",
+ "ethers": "^4.0.0-beta.14",
"lodash": "^4.17.5"
},
"publishConfig": {
diff --git a/yarn.lock b/yarn.lock
index aa30946a8..16648eb79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1071,6 +1071,10 @@
version "9.6.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
+"@types/node@^10.3.2":
+ version "10.9.4"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
+
"@types/node@^10.5.3":
version "10.5.7"
resolved "https://registry.npmjs.org/@types/node/-/node-10.5.7.tgz#960d9feb3ade2233bcc9843c918d740b4f78a7cf"
@@ -5296,9 +5300,9 @@ ethereumjs-wallet@~0.6.0:
utf8 "^3.0.0"
uuid "^3.3.2"
-ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
- version "3.0.18"
- resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447"
+ethers@3.0.22:
+ version "3.0.22"
+ resolved "https://registry.yarnpkg.com/ethers/-/ethers-3.0.22.tgz#7fab1ea16521705837aa43c15831877b2716b436"
dependencies:
aes-js "3.0.0"
bn.js "^4.4.0"
@@ -5311,6 +5315,21 @@ ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
uuid "2.0.1"
xmlhttprequest "1.8.0"
+ethers@^4.0.0-beta.14:
+ version "4.0.0-beta.14"
+ resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.0-beta.14.tgz#76aa9257b9c93a7604ff4dc11f2a445d07f6459d"
+ dependencies:
+ "@types/node" "^10.3.2"
+ aes-js "3.0.0"
+ bn.js "^4.4.0"
+ elliptic "6.3.3"
+ hash.js "1.1.3"
+ js-sha3 "0.5.7"
+ scrypt-js "2.0.3"
+ setimmediate "1.0.4"
+ uuid "2.0.1"
+ xmlhttprequest "1.8.0"
+
ethjs-abi@0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/ethjs-abi/-/ethjs-abi-0.1.8.tgz#cd288583ed628cdfadaf8adefa3ba1dbcbca6c18"
@@ -6710,7 +6729,7 @@ hash-base@^3.0.0:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-hash.js@^1.0.0, hash.js@^1.0.3:
+hash.js@1.1.3, hash.js@^1.0.0, hash.js@^1.0.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
dependencies:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:39:06 +0800