Bump web3.js to 1.2.2 (#1277)

* Bump web3 to 1.2.2 * Remove @types/web3 * Patch typing of web3.eth.getStorageAt * Fix Web3 contract typings for v1.2.2 * Remove outdated lib-complex * Use yarn instead of lerna bootstrap on integration test * Clean up root yarn lock * Remove lib-complex example from CI * CI cache bust * Pin dependencies on web3-eth-contract * Update required CI checks for mergify * Update packages/lib/src/artifacts/ZWeb3.ts Co-Authored-By: Nicolás Venturo <[email protected]>
OpenZeppelin · Nov 7, 2019 · 28dbea4 · 28dbea4
1 parent e14f9a9
commit 28dbea4
Show file tree

Hide file tree

Showing 29 changed files with 327 additions and 1,007 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,14 +25,14 @@ commands:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-v4-{{ checksum "yarn.lock" }}
+          key: dependency-cache-v5-{{ checksum "yarn.lock" }}
       - attach_workspace:
           at: ~/openzeppelin
       - when:
           condition: << parameters.run-yarn >>
           steps:
             - restore_cache:
-                key: yarn-cache-v6-
+                key: yarn-cache-v7-
             - run:
                 command: yarn
                 working_directory: "~/openzeppelin/<< parameters.workspace >>"
@@ -55,22 +55,22 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - dependency-cache-v4-{{ checksum "yarn.lock" }}
-            - yarn-cache-v6-
+            - dependency-cache-v5-{{ checksum "yarn.lock" }}
+            - yarn-cache-v7-
       - run:
           name: Install dependencies and build
           command: yarn
       - run:
           name: Lint check
           command: yarn lint:check
       - save_cache:
-          key: dependency-cache-v4-{{ checksum "yarn.lock" }}
+          key: dependency-cache-v5-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
             - packages/cli/node_modules
             - packages/lib/node_modules
       - save_cache:
-          key: yarn-cache-v6-{{ checksum "yarn.lock" }}
+          key: yarn-cache-v7-{{ checksum "yarn.lock" }}
           paths:
             - ~/.cache/yarn/v6
       - persist_to_workspace:
@@ -100,13 +100,6 @@ jobs:
           workspace: examples/lib-simple
           run-yarn: true
 
-  example-lib-complex:
-    <<: *defaults
-    steps:
-      - test:
-          workspace: examples/lib-complex
-          run-yarn: true
-
   example-create-instances-from-solidity:
     <<: *defaults
     steps:
@@ -167,8 +160,6 @@ workflows:
           requires: [setup]
       - example-lib-simple:
           requires: [test-lib]
-      - example-lib-complex:
-          requires: [test-lib]
       - example-create-instances-from-solidity:
           requires: [test-lib, test-cli]
       - example-cli-create2:

diff --git a/.mergify.yml b/.mergify.yml
@@ -14,9 +14,11 @@ pull_request_rules:
   - 'status-success="ci/circleci: test-lib"'
   - 'status-success="ci/circleci: example-create-instances-from-solidity"'
   - 'status-success="ci/circleci: example-lib-simple"'
-  - 'status-success="ci/circleci: example-lib-complex"'
+  - 'status-success="ci/circleci: example-cli-create2"'
+  - 'status-success="ci/circleci: example-first-project"'
   - 'status-success="ci/circleci: integration-cli-geth"'
   - 'status-success="ci/circleci: integration-cli-hdwallet"'
+  - 'status-success="ci/circleci: integration-cli-kits"'
 - name: delete head branch after merge
   conditions:
   - merged

diff --git a/examples/cli-create2/package.json b/examples/cli-create2/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@openzeppelin/cli": "^2.6.0-rc.0",
     "@openzeppelin/upgrades": "^2.6.0-rc.0",
-    "web3": "1.2.1"
+    "web3": "1.2.2"
   },
   "devDependencies": {
     "chai": "^4.2.0",

diff --git a/examples/first-project/package.json b/examples/first-project/package.json
@@ -10,7 +10,7 @@
     "test": "scripts/test-ci.sh"
   },
   "dependencies": {
-    "web3": "1.2.1"
+    "web3": "1.2.2"
   },
   "devDependencies": {
     "@openzeppelin/cli": "^2.6.0-rc.0",

diff --git a/examples/lib-complex/.babelrc b/examples/lib-complex/.babelrc
diff --git a/examples/lib-complex/.gitignore b/examples/lib-complex/.gitignore
diff --git a/examples/lib-complex/README.md b/examples/lib-complex/README.md
diff --git a/examples/lib-complex/contracts/DonationsV1.sol b/examples/lib-complex/contracts/DonationsV1.sol
diff --git a/examples/lib-complex/contracts/DonationsV2.sol b/examples/lib-complex/contracts/DonationsV2.sol
diff --git a/examples/lib-complex/index.js b/examples/lib-complex/index.js
diff --git a/examples/lib-complex/migrations/notes.md b/examples/lib-complex/migrations/notes.md
diff --git a/examples/lib-complex/package.json b/examples/lib-complex/package.json
diff --git a/examples/lib-complex/test/App.test.js b/examples/lib-complex/test/App.test.js