Merge pull request #235 from fei-protocol/feat/remove-web3

Removes web3, fixes some dependencies that openzeppelin test-helpers has on web3

Author: Caleb Ditchfield

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     working_directory: ~/repo
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     resource_class: xlarge
     steps:
       - checkout
@@ -34,7 +34,7 @@ jobs:
   lint:
     working_directory: ~/repo
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     steps:
       - restore_cache:
           keys:
@@ -45,7 +45,7 @@ jobs:
   test:
     working_directory: ~/repo
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     resource_class: xlarge
     steps:
       - restore_cache:
@@ -58,7 +58,7 @@ jobs:
   e2e-test:
     working_directory: ~/repo
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     resource_class: xlarge
     steps:
       - restore_cache:

contract-addresses/mainnetAddresses.ts

@@ -97,9 +97,9 @@ const MainnetAddresses = {
     artifactName: 'ERC20CompoundPCVDeposit',
     address: '0x243C601CC5DaA3Ac250B14509804188347bd2aFB'
   },
-  curve3crv: { artifactName: 'IStableSwap3', address: '0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490' },
-  curve3pool: { artifactName: 'IStableSwap3', address: '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' },
-  curveMetapool: { artifactName: 'IStableSwap2', address: '0x06cb22615ba53e60d67bf6c341a0fd5e718e1655' },
+  curve3crv: { artifactName: 'unknown', address: '0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490' },
+  curve3pool: { artifactName: 'unknown', address: '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' },
+  curveMetapool: { artifactName: 'unknown', address: '0x06cb22615ba53e60d67bf6c341a0fd5e718e1655' },
   curve3Metapool: { artifactName: 'IERC20', address: '0x06cb22615BA53E60D67Bf6C341a0fD5E718E1655' },
   dai: { artifactName: 'IERC20', address: '0x6B175474E89094C44Da98b954EedeAC495271d0F' },
   daiBondingCurve: { artifactName: 'BondingCurve', address: '0xC0afe0E649e32528666F993ce63822c3840e941a' },

hardhat.config.ts

@@ -1,7 +1,6 @@
 import { HardhatUserConfig } from 'hardhat/config';
 import '@nomiclabs/hardhat-waffle';
 import '@nomiclabs/hardhat-ethers';
-import '@nomiclabs/hardhat-web3';
 import '@typechain/hardhat';
 import '@idle-finance/hardhat-proposals-plugin';
 import 'hardhat-gas-reporter';
@@ -55,7 +54,7 @@ export default {
       forking: enableMainnetForking
         ? {
             url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`,
-            blockNumber: 13375357
+            blockNumber: 13398685
           }
         : undefined
     },