update waffle

packages/apps/package.json

@@ -24,7 +24,7 @@
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.5",
     "chai": "^4.2.0",
-    "ethereum-waffle": "^1.0.5",
+    "ethereum-waffle": "2.0.0-beta.0",
     "ethers": "4.0.20",
     "mocha": "^4.1.0",
     "solium": "1.1.8",

packages/contracts/package.json

@@ -34,7 +34,7 @@
     "chai": "^4.2.0",
     "dotenv": "^6.1.0",
     "eth-gas-reporter": "0.1.12",
-    "ethereum-waffle": "1.0.5",
+    "ethereum-waffle": "2.0.0-beta.0",
     "ethers": "4.0.20",
     "ganache-cli": "6.2.5",
     "openzeppelin-eth": "^2.0.2",

packages/typescript-typings/package.json

@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "copyfiles": "^2.0.0",
-    "ethereum-waffle": "^1.0.5",
+    "ethereum-waffle": "2.0.0-beta.0",
     "ethers": "4.0.20",
     "tslint": "5.11.0",
     "typescript": "^3.1.2"

yarn.lock

@@ -3680,6 +3680,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+command-exists@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
+  integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
+
 [email protected]:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -4963,23 +4968,14 @@ ethereum-common@^0.0.18:
   resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
   integrity sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=
 
-[email protected]:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ethereum-waffle/-/ethereum-waffle-1.0.5.tgz#929cddf5ad6151afa6278f584bf3a92bf1f17173"
-  integrity sha512-rm7VE92fmJtA9g03DxNkan7vRU5IIvHwZSRNwTcony84xCkAbONCH/C2YVbbdE9jUSMbtsdQgzeInWqn4wFhpw==
-  dependencies:
-    ethers "^4.0.0"
-    ganache-core "2.2.1"
-    solc "^0.4.24"
-
-ethereum-waffle@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/ethereum-waffle/-/ethereum-waffle-1.0.6.tgz#49514745e58e0bdc848a05e39e36cd8efeded50e"
-  integrity sha512-euZidN4wJiTzQyLnS2OV8B1nKNZv16kD4if4eQ5eVfLKtjCT+AwYc4incf/wo99XMp/qPMI5tIWtLE5aj6WaKg==
+[email protected]:
+  version "2.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/ethereum-waffle/-/ethereum-waffle-2.0.0-beta.0.tgz#00f88686b6dd0308dfc0f0b7d93f52fe45ccff23"
+  integrity sha512-6++soEVVPPPIIPD4Qbvyg4sYGjM/cxfji+RkSueXDNsVAwFH0Enh+MCBPvGCuBHPM/RryEceN8yUS0f4HWrw0A==
   dependencies:
     ethers "^4.0.0"
     ganache-core "2.2.1"
-    solc "^0.4.24"
+    solc "^0.5.1"
 
 [email protected], ethereumjs-abi@^0.6.5:
   version "0.6.5"
@@ -10504,6 +10500,11 @@ require-from-string@^1.1.0:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
   integrity sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=
 
+require-from-string@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -11151,7 +11152,7 @@ [email protected]:
     semver "^5.3.0"
     yargs "^4.7.1"
 
-[email protected], solc@^0.4.2, solc@^0.4.24, solc@^0.4.25:
+[email protected], solc@^0.4.2, solc@^0.4.25:
   version "0.4.25"
   resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"
   integrity sha512-jU1YygRVy6zatgXrLY2rRm7HW1d7a8CkkEgNJwvH2VLpWhMFsMdWcJn6kUqZwcSz/Vm+w89dy7Z/aB5p6AFTrg==
@@ -11162,6 +11163,20 @@ [email protected], solc@^0.4.2, solc@^0.4.24, solc@^0.4.25:
     semver "^5.3.0"
     yargs "^4.7.1"
 
+solc@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.2.tgz#45d5d11569e41c2b2535f3a50fe0616ca771a347"
+  integrity sha512-gZSRM+2HKe8TXeXE+RJtdPq9+8IxpukMnUXXfphJ4d5duHfKfi7lu0eBFh6WSWvnYQ8xis+sfidiurOop2q1KQ==
+  dependencies:
+    command-exists "^1.2.8"
+    fs-extra "^0.30.0"
+    keccak "^1.0.2"
+    memorystream "^0.3.1"
+    require-from-string "^2.0.0"
+    semver "^5.5.0"
+    tmp "0.0.33"
+    yargs "^11.0.0"
+
 [email protected]:
   version "0.5.11"
   resolved "https://registry.yarnpkg.com/solidity-coverage/-/solidity-coverage-0.5.11.tgz#1ee45f6d98b75a615aadb8f9aa7db4a2b32258e7"
@@ -11220,24 +11235,6 @@ [email protected]:
     solparse "2.2.5"
     text-table "^0.2.0"
 
-solium@^1.1.8:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/solium/-/solium-1.2.0.tgz#17520a4c1323f04f17c640c1304d31e8a46fd55f"
-  integrity sha512-bimekyJTudFb0m31HZFBYMg0+DQQV7FchxXn/5G/iU/5kINnvQBguNSmPIG2KyvJsGLO+TCDOeYj2gV+E0ehnw==
-  dependencies:
-    ajv "^5.2.2"
-    chokidar "^1.6.0"
-    colors "^1.1.2"
-    commander "^2.9.0"
-    eol "^0.9.1"
-    js-string-escape "^1.0.1"
-    lodash "^4.14.2"
-    sol-digger "0.0.2"
-    sol-explore "1.6.1"
-    solium-plugin-security "0.1.1"
-    solparse "2.2.6"
-    text-table "^0.2.0"
-
 [email protected]:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/solparse/-/solparse-2.2.5.tgz#72709c867cd6bfc50ec2325f4b81d2b3ea365d99"
@@ -11247,15 +11244,6 @@ [email protected]:
     pegjs "^0.10.0"
     yargs "^10.0.3"
 
-[email protected]:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/solparse/-/solparse-2.2.6.tgz#e66bca4b77b3d1886d57f6a62c282708916844b9"
-  integrity sha512-PceVEKx1DATJtICwAu8AeE1xzLaSfAbrGhtCYuWXCk7fAiTihkLf2Tivu9N19sf6FULqt7Q1wSUD9ofX4eMQpw==
-  dependencies:
-    mocha "^4.0.1"
-    pegjs "^0.10.0"
-    yargs "^10.0.3"
-
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -11914,7 +11902,7 @@ [email protected]:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@^0.0.33:
+tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==