Update for compatibility with SDK v0.3.1 (#21)

- Update for compatibility with SDK v0.3.0+
- Remove dead package deps
- Rename `sdk` folder to `app`

contracts/HelloWorld.sol

@@ -34,6 +34,18 @@ contract HelloWorld is Router {
         string message
     );
 
+    constructor(
+        address _abacusConnectionManager,
+        address _interchainGasPaymaster
+    ) {
+        // Transfer ownership of the contract to deployer
+        _transferOwnership(msg.sender);
+        // Set the addresses for the ACM and IGP
+        // Alternatively, this could be done later in an initialize method
+        _setAbacusConnectionManager(_abacusConnectionManager);
+        _setInterchainGasPaymaster(_interchainGasPaymaster);
+    }
+
     // ============ External functions ============
 
     /**

hardhat.config.ts

@@ -1,5 +1,4 @@
-import '@abacus-network/hardhat';
-import "@nomiclabs/hardhat-ethers";
+import '@nomiclabs/hardhat-ethers';
 import '@nomiclabs/hardhat-waffle';
 import '@typechain/hardhat';
 import 'hardhat-gas-reporter';

package.json

@@ -1,28 +1,25 @@
 {
   "name": "@abacus-network/helloworld",
   "description": "A basic skeleton of an Abacus app",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "dependencies": {
-    "@abacus-network/app": "0.2.3",
-    "@abacus-network/sdk": "0.2.3",
+    "@abacus-network/sdk": "^0.3.1",
     "@openzeppelin/contracts-upgradeable": "^4.6.0",
-    "ethers": "^5.4.7"
+    "ethers": "^5.6.8"
   },
   "devDependencies": {
-    "@abacus-network/core": "0.2.3",
-    "@abacus-network/deploy": "0.2.3",
-    "@abacus-network/hardhat": "0.2.3",
-    "@nomiclabs/hardhat-ethers": "^2.0.1",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@nomiclabs/hardhat-ethers": "^2.0.5",
+    "@nomiclabs/hardhat-waffle": "^2.0.2",
     "@typechain/ethers-v5": "10.0.0",
-    "@typechain/hardhat": "6.0.0",
+    "@typechain/hardhat": "^6.0.0",
     "@types/mocha": "^9.1.0",
     "@typescript-eslint/eslint-plugin": "^5.27.0",
     "@typescript-eslint/parser": "^5.27.0",
     "chai": "^4.3.0",
     "eslint": "^8.16.0",
     "eslint-config-prettier": "^8.5.0",
-    "hardhat": "^2.8.3",
+    "ethereum-waffle": "^3.4.4",
+    "hardhat": "^2.8.4",
     "hardhat-gas-reporter": "^1.0.7",
     "prettier": "^2.4.1",
     "prettier-plugin-solidity": "^1.0.0-beta.5",
@@ -45,7 +42,7 @@
     "Typescript"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.js",
+  "main": "dist/src/index.js",
   "packageManager": "yarn@3.2.0",
   "repository": {
     "type": "git",
@@ -57,7 +54,7 @@
     "coverage": "hardhat coverage",
     "lint": "eslint . --ext .ts",
     "prettier": "prettier --write ./contracts ./src",
-    "test": "hardhat test ./src/test/*"
+    "test": "hardhat test ./src/test/**/*.test.ts"
   },
-  "types": "dist/index.d.ts"
+  "types": "dist/src/index.d.ts"
 }

src/deploy/check.ts

@@ -1,7 +1,6 @@
-import { AbacusRouterChecker } from '@abacus-network/deploy';
-import { ChainName } from '@abacus-network/sdk';
-import { HelloWorldApp } from '../sdk/app';
-import { HelloWorldContracts } from '../sdk/contracts';
+import { ChainName, AbacusRouterChecker } from '@abacus-network/sdk';
+import { HelloWorldApp } from '../app/app';
+import { HelloWorldContracts } from '../app/contracts';
 import { HelloWorldConfig } from './config';
 
 export class HelloWorldChecker<

src/deploy/config.ts

@@ -1,8 +1,8 @@
-import { RouterConfig } from '@abacus-network/deploy';
 import {
   chainConnectionConfigs,
   ChainMap,
   TestChainNames,
+  RouterConfig,
 } from '@abacus-network/sdk';
 
 export type HelloWorldConfig = RouterConfig;

src/deploy/deploy.ts

@@ -1,6 +1,6 @@
-import { AbacusRouterDeployer } from '@abacus-network/deploy';
 import {
   AbacusCore,
+  AbacusRouterDeployer,
   ChainMap,
   ChainName,
   MultiProvider,
@@ -9,7 +9,7 @@ import {
   HelloWorldContracts,
   helloWorldFactories,
   HelloWorldFactories,
-} from '../sdk/contracts';
+} from '../app/contracts';
 import { HelloWorldConfig } from './config';
 
 export class HelloWorldDeployer<
@@ -28,10 +28,13 @@ export class HelloWorldDeployer<
     super(multiProvider, configMap, helloWorldFactories, {});
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  // Custom contract deployment logic can go here
+  // If no custom logic is needed, call deployContract for the router
   async deployContracts(chain: Chain, config: HelloWorldConfig) {
-    const acm = this.core.getContracts(chain).abacusConnectionManager.address;
-    const router = await this.deployRouter(chain, [], [acm]);
+    const router = await this.deployContract(chain, 'router', [
+      config.abacusConnectionManager,
+      config.interchainGasPaymaster,
+    ]);
     return {
       router,
     };

src/index.ts

@@ -1,6 +1,10 @@
 export { HelloWorldChecker } from './deploy/check';
 export { HelloWorldConfig } from './deploy/config';
 export { HelloWorldDeployer } from './deploy/deploy';
-export { HelloWorldApp } from './sdk/app';
-export { HelloWorldContracts } from './sdk/contracts';
+export { HelloWorldApp } from './app/app';
+export {
+  HelloWorldContracts,
+  HelloWorldFactories,
+  helloWorldFactories,
+} from './app/contracts';
 export * as types from './types';

src/scripts/check.ts

@@ -1,20 +1,20 @@
-import { utils } from '@abacus-network/deploy';
 import {
   AbacusCore,
   buildContracts,
   ChainMap,
   ChainName,
+  getMultiProviderFromConfigAndSigner,
 } from '@abacus-network/sdk';
 import { ethers } from 'hardhat';
 import { HelloWorldChecker } from '../deploy/check';
 import { getConfigMap, testConfigs } from '../deploy/config';
-import { HelloWorldApp } from '../sdk/app';
-import { HelloWorldContracts, helloWorldFactories } from '../sdk/contracts';
-import testEnvironmentAddresses from '../sdk/environments/test.json';
+import { HelloWorldApp } from '../app/app';
+import { HelloWorldContracts, helloWorldFactories } from '../app/contracts';
+import testEnvironmentAddresses from '../app/environments/test.json';
 
 async function check() {
   const [signer] = await ethers.getSigners();
-  const multiProvider = utils.getMultiProviderFromConfigAndSigner(
+  const multiProvider = getMultiProviderFromConfigAndSigner(
     testConfigs,
     signer,
   );
@@ -27,7 +27,7 @@ async function check() {
   const app = new HelloWorldApp(contractsMap, multiProvider);
 
   const core = AbacusCore.fromEnvironment('test', multiProvider);
-  const config = core.extendWithConnectionManagers(
+  const config = core.extendWithConnectionClientConfig(
     getConfigMap(signer.address),
   );
 

src/scripts/deploy.ts

@@ -1,5 +1,8 @@
-import { utils } from '@abacus-network/deploy';
-import { AbacusCore, serializeContracts } from '@abacus-network/sdk';
+import {
+  AbacusCore,
+  getMultiProviderFromConfigAndSigner,
+  serializeContracts,
+} from '@abacus-network/sdk';
 import '@nomiclabs/hardhat-ethers';
 import { ethers } from 'hardhat';
 import { getConfigMap, testConfigs } from '../deploy/config';
@@ -7,13 +10,13 @@ import { HelloWorldDeployer } from '../deploy/deploy';
 
 async function main() {
   const [signer] = await ethers.getSigners();
-  const multiProvider = utils.getMultiProviderFromConfigAndSigner(
+  const multiProvider = getMultiProviderFromConfigAndSigner(
     testConfigs,
     signer,
   );
 
   const core = AbacusCore.fromEnvironment('test', multiProvider);
-  const config = core.extendWithConnectionManagers(
+  const config = core.extendWithConnectionClientConfig(
     getConfigMap(signer.address),
   );
 

src/test/deploy.test.ts

@@ -1,16 +1,18 @@
-import { utils } from '@abacus-network/deploy';
-// TODO export TestCoreApp from @abacus-network/hardhat properly
-import { TestCoreApp } from '@abacus-network/hardhat/dist/src/TestCoreApp';
-// TODO export TestCoreDeploy from @abacus-network/hardhat properly
-import { TestCoreDeploy } from '@abacus-network/hardhat/dist/src/TestCoreDeploy';
-import { ChainMap, MultiProvider, TestChainNames } from '@abacus-network/sdk';
+import {
+  ChainMap,
+  getMultiProviderFromConfigAndSigner,
+  MultiProvider,
+  TestChainNames,
+  TestCoreApp,
+  TestCoreDeployer,
+} from '@abacus-network/sdk';
 import '@nomiclabs/hardhat-waffle';
 import { ethers } from 'hardhat';
 import { HelloWorldChecker } from '../deploy/check';
 import { getConfigMap, HelloWorldConfig, testConfigs } from '../deploy/config';
 import { HelloWorldDeployer } from '../deploy/deploy';
-import { HelloWorldApp } from '../sdk/app';
-import { HelloWorldContracts } from '../sdk/contracts';
+import { HelloWorldApp } from '../app/app';
+import { HelloWorldContracts } from '../app/contracts';
 
 describe('deploy', async () => {
   let multiProvider: MultiProvider<TestChainNames>;
@@ -22,15 +24,14 @@ describe('deploy', async () => {
 
   before(async () => {
     const [signer] = await ethers.getSigners();
-    multiProvider = utils.getMultiProviderFromConfigAndSigner(
-      testConfigs,
-      signer,
-    );
+    multiProvider = getMultiProviderFromConfigAndSigner(testConfigs, signer);
 
-    const coreDeployer = new TestCoreDeploy(multiProvider);
+    const coreDeployer = new TestCoreDeployer(multiProvider);
     const coreContractsMaps = await coreDeployer.deploy();
     core = new TestCoreApp(coreContractsMaps, multiProvider);
-    config = core.extendWithConnectionManagers(getConfigMap(signer.address));
+    config = core.extendWithConnectionClientConfig(
+      getConfigMap(signer.address),
+    );
     deployer = new HelloWorldDeployer(multiProvider, config, core);
   });
 

src/test/helloworld.test.ts

@@ -1,14 +1,11 @@
-import { utils as deployUtils } from '@abacus-network/deploy';
-import '@abacus-network/hardhat';
-// TODO export TestCoreApp from @abacus-network/hardhat properly
-import { TestCoreApp } from '@abacus-network/hardhat/dist/src/TestCoreApp';
-// TODO export TestCoreDeploy from @abacus-network/hardhat properly
-import { TestCoreDeploy } from '@abacus-network/hardhat/dist/src/TestCoreDeploy';
 import {
   ChainMap,
   ChainNameToDomainId,
+  getMultiProviderFromConfigAndSigner,
   MultiProvider,
   TestChainNames,
+  TestCoreApp,
+  TestCoreDeployer,
 } from '@abacus-network/sdk';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { expect } from 'chai';
@@ -33,15 +30,14 @@ describe('HelloWorld', async () => {
   before(async () => {
     [signer] = await ethers.getSigners();
 
-    multiProvider = deployUtils.getMultiProviderFromConfigAndSigner(
-      testConfigs,
-      signer,
-    );
+    multiProvider = getMultiProviderFromConfigAndSigner(testConfigs, signer);
 
-    const coreDeployer = new TestCoreDeploy(multiProvider);
+    const coreDeployer = new TestCoreDeployer(multiProvider);
     const coreContractsMaps = await coreDeployer.deploy();
     coreApp = new TestCoreApp(coreContractsMaps, multiProvider);
-    config = coreApp.extendWithConnectionManagers(getConfigMap(signer.address));
+    config = coreApp.extendWithConnectionClientConfig(
+      getConfigMap(signer.address),
+    );
   });
 
   beforeEach(async () => {

tsconfig.json

@@ -10,7 +10,7 @@
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
-    "noImplicitAny": true,
+    "noImplicitAny": false,
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "preserveSymlinks": true,
@@ -20,9 +20,10 @@
     "target": "es6",
     "strict": true,
     "outDir": "./dist",
-    "rootDir": "./src",
+    "rootDir": "./",
     "resolveJsonModule": true
   },
   "exclude": ["./node_modules/", "./dist/", "./src/types/hardhat.d.ts"],
-  "include": ["./src/"]
+  "include": ["./src/"],
+  "files": ["hardhat.config.ts"]
 }

yarn.lock

@@ -5,60 +5,35 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@abacus-network/app@npm:0.2.3, @abacus-network/app@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/app@npm:0.2.3"
+"@abacus-network/app@npm:0.3.1":
+  version: 0.3.1
+  resolution: "@abacus-network/app@npm:0.3.1"
   dependencies:
-    "@abacus-network/core": ^0.2.3
-    "@abacus-network/utils": ^0.2.3
+    "@abacus-network/core": 0.3.1
+    "@abacus-network/utils": 0.3.1
     "@openzeppelin/contracts-upgradeable": ^4.5.0
-  checksum: 83a673b03d8a03a9a1d413212721dec23dede11d3b6bc968b9130c3206b24e2498c5bea833bdc8291568a4b176cf9ad804aea7049a89df65c41a01347ff0f74a
-  languageName: node
-  linkType: hard
-
-"@abacus-network/core@npm:0.2.3, @abacus-network/core@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/core@npm:0.2.3"
-  dependencies:
-    "@abacus-network/utils": ^0.2.3
-    "@openzeppelin/contracts": ^4.6.0
-    "@openzeppelin/contracts-upgradeable": ^4.6.0
-    "@summa-tx/memview-sol": ^2.0.0
-  checksum: f4740e8e14a40f01a65c5a6576e86eeb69e911fa4dd8d14cb3e1514d6e47139ea3bedeaecc9fb8c7301b11cb1ba766caa97331cc74a3e45943c8793da11d52ba
+  checksum: 9cfc42d4f496792b02c5d95e4f55fe161e0e4c539f0e28a8822b05ddc33ab24635d026b874fcf2a3bafc21db64254bb96c5369487c3c85f9bde37a4e98ac1eb0
   languageName: node
   linkType: hard
 
-"@abacus-network/deploy@npm:0.2.3, @abacus-network/deploy@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/deploy@npm:0.2.3"
-  dependencies:
-    "@abacus-network/app": ^0.2.3
-    "@abacus-network/core": ^0.2.3
-    "@abacus-network/sdk": ^0.2.3
-    "@abacus-network/utils": ^0.2.3
-    "@types/debug": ^4.1.7
-    "@types/yargs": ^17.0.10
-    axios: ^0.21.3
-    debug: ^4.3.4
-    yargs: ^17.4.1
-  checksum: 7b551a5409eb569e30a72f46bed49745fac2b20dc4800c008dee73dbc9c7b2358e84df6e5f880bc044bd45be207b9fb5f1bc53c6545016b8ef0097c5c4096527
+"@abacus-network/celo-ethers-provider@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@abacus-network/celo-ethers-provider@npm:0.1.0"
+  peerDependencies:
+    ethers: ^5
+  checksum: 06f440366bbd9ddf9962aa46c471be1fb587909c4da71a0d816497a5c0c8597e9b315d70fe9ae728ed51fc936097da50da2cd18f750861f3d602660b8ea1ecfd
   languageName: node
   linkType: hard
 
-"@abacus-network/hardhat@npm:0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/hardhat@npm:0.2.3"
+"@abacus-network/core@npm:0.3.1":
+  version: 0.3.1
+  resolution: "@abacus-network/core@npm:0.3.1"
   dependencies:
-    "@abacus-network/core": ^0.2.3
-    "@abacus-network/deploy": ^0.2.3
-    "@abacus-network/sdk": ^0.2.3
-    "@abacus-network/utils": ^0.2.3
-    "@nomiclabs/hardhat-ethers": ^2.0.5
-    "@nomiclabs/hardhat-waffle": ^2.0.2
-    ethereum-waffle: ^3.2.2
-    ethers: ^5.6.8
-    hardhat: ^2.8.4
-  checksum: e58577f4023391c339f7a8c2d8e2949e71aa957c3fa8ce0f034d37ea194f7e83ddb941eeda1f0cfb738893c3e6515722fdf497394638233f1e9407c3641d07f0
+    "@abacus-network/utils": 0.3.1
+    "@openzeppelin/contracts": ^4.6.0
+    "@openzeppelin/contracts-upgradeable": ^4.6.0
+    "@summa-tx/memview-sol": ^2.0.0
+  checksum: 0e3ec428059d8488be742e27e32cfcbe983704dd32c359ad4389c686adb13506043f067c2e38dafdc2703d9d7c224a9d05b4b148a939a059f672e3960cda5dd0
   languageName: node
   linkType: hard
 
@@ -66,24 +41,21 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@abacus-network/helloworld@workspace:."
   dependencies:
-    "@abacus-network/app": 0.2.3
-    "@abacus-network/core": 0.2.3
-    "@abacus-network/deploy": 0.2.3
-    "@abacus-network/hardhat": 0.2.3
-    "@abacus-network/sdk": 0.2.3
-    "@nomiclabs/hardhat-ethers": ^2.0.1
-    "@nomiclabs/hardhat-waffle": ^2.0.1
+    "@abacus-network/sdk": ^0.3.1
+    "@nomiclabs/hardhat-ethers": ^2.0.5
+    "@nomiclabs/hardhat-waffle": ^2.0.2
     "@openzeppelin/contracts-upgradeable": ^4.6.0
     "@typechain/ethers-v5": 10.0.0
-    "@typechain/hardhat": 6.0.0
+    "@typechain/hardhat": ^6.0.0
     "@types/mocha": ^9.1.0
     "@typescript-eslint/eslint-plugin": ^5.27.0
     "@typescript-eslint/parser": ^5.27.0
     chai: ^4.3.0
     eslint: ^8.16.0
     eslint-config-prettier: ^8.5.0
-    ethers: ^5.4.7
-    hardhat: ^2.8.3
+    ethereum-waffle: ^3.4.4
+    ethers: ^5.6.8
+    hardhat: ^2.8.4
     hardhat-gas-reporter: ^1.0.7
     prettier: ^2.4.1
     prettier-plugin-solidity: ^1.0.0-beta.5
@@ -96,25 +68,28 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@abacus-network/sdk@npm:0.2.3, @abacus-network/sdk@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/sdk@npm:0.2.3"
+"@abacus-network/sdk@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@abacus-network/sdk@npm:0.3.1"
   dependencies:
-    "@abacus-network/core": ^0.2.3
-    "@abacus-network/utils": ^0.2.3
-    "@celo-tools/celo-ethers-wrapper": ^0.2.0
+    "@abacus-network/app": 0.3.1
+    "@abacus-network/celo-ethers-provider": ^0.1.0
+    "@abacus-network/core": 0.3.1
+    "@abacus-network/utils": 0.3.1
+    "@types/debug": ^4.1.7
+    cross-fetch: ^3.1.5
+    debug: ^4.3.4
     ethers: ^5.6.8
-  checksum: d79f9c33a3b21140f583808430200777fa2e076cfea3629eb5f21b998fbe9e259520e5245d7459c368ce51c17e7cc1c2f903eb2e3706dc9dbcfad0472a169a0d
+  checksum: 53081f88aa9f8cf8750d5a4135d01b618505843681ac199387a98d0794904cc9ef23dbcb2a63db92ff31f6e1f1a34c5b52612c914cc618617285d0a73383b077
   languageName: node
   linkType: hard
 
-"@abacus-network/utils@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@abacus-network/utils@npm:0.2.3"
+"@abacus-network/utils@npm:0.3.1":
+  version: 0.3.1
+  resolution: "@abacus-network/utils@npm:0.3.1"
   dependencies:
-    chai: ^4.3.0
     ethers: ^5.6.8
-  checksum: 5399694f2395b2e0f532f412053670a558b0eba35303dcd0e01f9a4877ff69a917569bdf7a597bc6bcb8c9ad990a0c87d73b72b03ed361d5d6fa6988fd18a344
+  checksum: b0871b3c28f523348e1c12a1dd5c3a4c037cb671d767010e71ebdd46d7e8af918c8bae80875662720b0f8973ca71af53df1178f31e6a9b390a14c3bcd16577c7
   languageName: node
   linkType: hard
 
@@ -145,15 +120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@celo-tools/celo-ethers-wrapper@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@celo-tools/celo-ethers-wrapper@npm:0.2.0"
-  peerDependencies:
-    ethers: ^5
-  checksum: 204177c8845003738a36d20ed5c1d64015c6ba95b2d01d186b709345f5cda1c09892471f47e7981bd5424ab50c13edc33cca5dfbb80ac607c7fadb6b8c16d0c2
-  languageName: node
-  linkType: hard
-
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -882,17 +848,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nomiclabs/hardhat-ethers@npm:^2.0.1, @nomiclabs/hardhat-ethers@npm:^2.0.5":
-  version: 2.0.6
-  resolution: "@nomiclabs/hardhat-ethers@npm:2.0.6"
+"@nomiclabs/hardhat-ethers@npm:^2.0.5":
+  version: 2.1.0
+  resolution: "@nomiclabs/hardhat-ethers@npm:2.1.0"
   peerDependencies:
     ethers: ^5.0.0
     hardhat: ^2.0.0
-  checksum: 82319a2615804abae2ca70834a20bfc2874c742094fadeaea55e5c788e589794836a3a2eaaf19d8aecdadf1fd0bd7a4f9eac2c32bbda9ed081c8e2e3d4fe55cc
+  checksum: 16fcde7fbce0b953daa3520148b0054d4951434d39d454b13dedb795d10b89893b199f1c3ed2856c196a229fc470c6cbd3ceff5895a94f52996b99a55515525d
   languageName: node
   linkType: hard
 
-"@nomiclabs/hardhat-waffle@npm:^2.0.1, @nomiclabs/hardhat-waffle@npm:^2.0.2":
+"@nomiclabs/hardhat-waffle@npm:^2.0.2":
   version: 2.0.3
   resolution: "@nomiclabs/hardhat-waffle@npm:2.0.3"
   dependencies:
@@ -1112,6 +1078,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@solidity-parser/parser@npm:^0.14.2":
+  version: 0.14.2
+  resolution: "@solidity-parser/parser@npm:0.14.2"
+  dependencies:
+    antlr4ts: ^0.5.0-alpha.4
+  checksum: 7d1dd44beb27e8a6ad2cca6f99d2536eaafd9ec156b6bfff64475e1c85e2e1d3cd84f697e275d7c0742aa365ecade6f68b15ed8cd8b0f339ee239a91fdbda37c
+  languageName: node
+  linkType: hard
+
 "@summa-tx/memview-sol@npm:^2.0.0":
   version: 2.0.1
   resolution: "@summa-tx/memview-sol@npm:2.0.1"
@@ -1221,20 +1196,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typechain/hardhat@npm:6.0.0":
-  version: 6.0.0
-  resolution: "@typechain/hardhat@npm:6.0.0"
+"@typechain/hardhat@npm:^6.0.0":
+  version: 6.1.2
+  resolution: "@typechain/hardhat@npm:6.1.2"
   dependencies:
     fs-extra: ^9.1.0
     lodash: ^4.17.15
   peerDependencies:
     "@ethersproject/abi": ^5.4.7
     "@ethersproject/providers": ^5.4.7
-    "@typechain/ethers-v5": ^10.0.0
+    "@typechain/ethers-v5": ^10.1.0
     ethers: ^5.4.7
-    hardhat: ^2.0.10
-    typechain: ^8.0.0
-  checksum: 9011ad633cf96ccbf29c3ce458f2f7cd058f0635493d179dfe1fa47512cceaad7597f051525379edcd5db48910a79b910fbe58bd75e5ae43979833bbf34d5a15
+    hardhat: ^2.9.9
+    typechain: ^8.1.0
+  checksum: 875753de831825c95c30e6792949f38f69fcee888c1936042414c8d030ecc181817cc0f5cbf6f1764f30779b5f840201eb29addda45713fd0b58a71693102a2c
   languageName: node
   linkType: hard
 
@@ -1509,22 +1484,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/yargs-parser@npm:*":
-  version: 21.0.0
-  resolution: "@types/yargs-parser@npm:21.0.0"
-  checksum: b2f4c8d12ac18a567440379909127cf2cec393daffb73f246d0a25df36ea983b93b7e9e824251f959e9f928cbc7c1aab6728d0a0ff15d6145f66cec2be67d9a2
-  languageName: node
-  linkType: hard
-
-"@types/yargs@npm:^17.0.10":
-  version: 17.0.10
-  resolution: "@types/yargs@npm:17.0.10"
-  dependencies:
-    "@types/yargs-parser": "*"
-  checksum: f0673cbfc08e17239dc58952a88350d6c4db04a027a28a06fbad27d87b670e909f9cd9e66f9c64cebdd5071d1096261e33454a55868395f125297e5c50992ca8
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/eslint-plugin@npm:^5.27.0":
   version: 5.27.1
   resolution: "@typescript-eslint/eslint-plugin@npm:5.27.1"
@@ -2260,15 +2219,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.3":
-  version: 0.21.4
-  resolution: "axios@npm:0.21.4"
-  dependencies:
-    follow-redirects: ^1.14.0
-  checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c
-  languageName: node
-  linkType: hard
-
 "babel-code-frame@npm:^6.26.0":
   version: 6.26.0
   resolution: "babel-code-frame@npm:6.26.0"
@@ -4035,6 +3985,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cross-fetch@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "cross-fetch@npm:3.1.5"
+  dependencies:
+    node-fetch: 2.6.7
+  checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb
+  languageName: node
+  linkType: hard
+
 "cross-spawn@npm:^6.0.5":
   version: 6.0.5
   resolution: "cross-spawn@npm:6.0.5"
@@ -4129,7 +4088,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -4141,18 +4100,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4.3.3":
-  version: 4.3.3
-  resolution: "debug@npm:4.3.3"
-  dependencies:
-    ms: 2.1.2
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 14472d56fe4a94dbcfaa6dbed2dd3849f1d72ba78104a1a328047bb564643ca49df0224c3a17fa63533fd11dd3d4c8636cd861191232a2c6735af00cc2d4de16
-  languageName: node
-  linkType: hard
-
 "debug@npm:^3.1.0":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
@@ -5199,7 +5146,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-cryptography@npm:^0.1.2, ethereum-cryptography@npm:^0.1.3":
+"ethereum-cryptography@npm:^0.1.3":
   version: 0.1.3
   resolution: "ethereum-cryptography@npm:0.1.3"
   dependencies:
@@ -5234,7 +5181,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-waffle@npm:^3.2.2":
+"ethereum-waffle@npm:^3.4.4":
   version: 3.4.4
   resolution: "ethereum-waffle@npm:3.4.4"
   dependencies:
@@ -5511,7 +5458,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethers@npm:^5.0.1, ethers@npm:^5.0.2, ethers@npm:^5.4.7, ethers@npm:^5.5.2, ethers@npm:^5.6.8":
+"ethers@npm:^5.0.1, ethers@npm:^5.0.2, ethers@npm:^5.5.2, ethers@npm:^5.6.8":
   version: 5.6.8
   resolution: "ethers@npm:5.6.8"
   dependencies:
@@ -6000,7 +5947,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0":
+"follow-redirects@npm:^1.12.1":
   version: 1.15.1
   resolution: "follow-redirects@npm:1.15.1"
   peerDependenciesMeta:
@@ -6711,9 +6658,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hardhat@npm:^2.8.3, hardhat@npm:^2.8.4":
-  version: 2.9.9
-  resolution: "hardhat@npm:2.9.9"
+"hardhat@npm:^2.8.4":
+  version: 2.10.0
+  resolution: "hardhat@npm:2.10.0"
   dependencies:
     "@ethereumjs/block": ^3.6.2
     "@ethereumjs/blockchain": ^5.5.2
@@ -6723,7 +6670,7 @@ __metadata:
     "@ethersproject/abi": ^5.1.2
     "@metamask/eth-sig-util": ^4.0.0
     "@sentry/node": ^5.18.1
-    "@solidity-parser/parser": ^0.14.1
+    "@solidity-parser/parser": ^0.14.2
     "@types/bn.js": ^5.1.0
     "@types/lru-cache": ^5.1.0
     abort-controller: ^3.0.0
@@ -6736,7 +6683,7 @@ __metadata:
     debug: ^4.1.1
     enquirer: ^2.3.0
     env-paths: ^2.2.0
-    ethereum-cryptography: ^0.1.2
+    ethereum-cryptography: ^1.0.3
     ethereumjs-abi: ^0.6.8
     ethereumjs-util: ^7.1.4
     find-up: ^2.1.0
@@ -6748,7 +6695,7 @@ __metadata:
     lodash: ^4.17.11
     merkle-patricia-tree: ^4.2.4
     mnemonist: ^0.38.0
-    mocha: ^9.2.0
+    mocha: ^10.0.0
     p-map: ^4.0.0
     qs: ^6.7.0
     raw-body: ^2.4.1
@@ -6773,7 +6720,7 @@ __metadata:
       optional: true
   bin:
     hardhat: internal/cli/cli.js
-  checksum: 1d30f4b5e56de82608e0fc8436b8338d5f6eb79125229236d65e32f4f0da39e9649c3a7138e743c62bb2fa1b00eac91e67cdb1775cd934fb8daedb1ede6eea01
+  checksum: 5e5a006fb7e0fdf3554aec07399cbc676d789c4335b916b76db6ec5b5c355db5984572e0e17fd5120dcf1f79011b10b414d9b8718bcd213139835807c2588a23
   languageName: node
   linkType: hard
 
@@ -8901,12 +8848,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:4.2.1":
-  version: 4.2.1
-  resolution: "minimatch@npm:4.2.1"
+"minimatch@npm:5.0.1":
+  version: 5.0.1
+  resolution: "minimatch@npm:5.0.1"
   dependencies:
-    brace-expansion: ^1.1.7
-  checksum: 2b1514e3d0f29a549912f0db7ae7b82c5cab4a8f2dd0369f1c6451a325b3f12b2cf473c95873b6157bb8df183d6cf6db82ff03614b6adaaf1d7e055beccdfd01
+    brace-expansion: ^2.0.1
+  checksum: b34b98463da4754bc526b244d680c69d4d6089451ebe512edaf6dd9eeed0279399cfa3edb19233513b8f830bf4bfcad911dddcdf125e75074100d52f724774f0
   languageName: node
   linkType: hard
 
@@ -9074,6 +9021,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mocha@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "mocha@npm:10.0.0"
+  dependencies:
+    "@ungap/promise-all-settled": 1.1.2
+    ansi-colors: 4.1.1
+    browser-stdout: 1.3.1
+    chokidar: 3.5.3
+    debug: 4.3.4
+    diff: 5.0.0
+    escape-string-regexp: 4.0.0
+    find-up: 5.0.0
+    glob: 7.2.0
+    he: 1.2.0
+    js-yaml: 4.1.0
+    log-symbols: 4.1.0
+    minimatch: 5.0.1
+    ms: 2.1.3
+    nanoid: 3.3.3
+    serialize-javascript: 6.0.0
+    strip-json-comments: 3.1.1
+    supports-color: 8.1.1
+    workerpool: 6.2.1
+    yargs: 16.2.0
+    yargs-parser: 20.2.4
+    yargs-unparser: 2.0.0
+  bin:
+    _mocha: bin/_mocha
+    mocha: bin/mocha.js
+  checksum: ba49ddcf8015a467e744b06c396aab361b1281302e38e7c1269af25ba51ff9ab681a9c36e9046bb7491e751cd7d5ce85e276a00ce7e204f96b2c418e4595edfe
+  languageName: node
+  linkType: hard
+
 "mocha@npm:^7.1.1":
   version: 7.2.0
   resolution: "mocha@npm:7.2.0"
@@ -9109,41 +9089,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mocha@npm:^9.2.0":
-  version: 9.2.2
-  resolution: "mocha@npm:9.2.2"
-  dependencies:
-    "@ungap/promise-all-settled": 1.1.2
-    ansi-colors: 4.1.1
-    browser-stdout: 1.3.1
-    chokidar: 3.5.3
-    debug: 4.3.3
-    diff: 5.0.0
-    escape-string-regexp: 4.0.0
-    find-up: 5.0.0
-    glob: 7.2.0
-    growl: 1.10.5
-    he: 1.2.0
-    js-yaml: 4.1.0
-    log-symbols: 4.1.0
-    minimatch: 4.2.1
-    ms: 2.1.3
-    nanoid: 3.3.1
-    serialize-javascript: 6.0.0
-    strip-json-comments: 3.1.1
-    supports-color: 8.1.1
-    which: 2.0.2
-    workerpool: 6.2.0
-    yargs: 16.2.0
-    yargs-parser: 20.2.4
-    yargs-unparser: 2.0.0
-  bin:
-    _mocha: bin/_mocha
-    mocha: bin/mocha
-  checksum: 4d5ca4ce33fc66627e63acdf09a634e2358c9a00f61de7788b1091b6aad430da04f97f9ecb82d56dc034b623cb833b65576136fd010d77679c03fcea5bc1e12d
-  languageName: node
-  linkType: hard
-
 "mock-fs@npm:^4.1.0":
   version: 4.14.0
   resolution: "mock-fs@npm:4.14.0"
@@ -9243,12 +9188,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:3.3.1":
-  version: 3.3.1
-  resolution: "nanoid@npm:3.3.1"
+"nanoid@npm:3.3.3":
+  version: 3.3.3
+  resolution: "nanoid@npm:3.3.3"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 4ef0969e1bbe866fc223eb32276cbccb0961900bfe79104fa5abe34361979dead8d0e061410a5c03bc3d47455685adf32c09d6f27790f4a6898fb51f7df7ec86
+  checksum: ada019402a07464a694553c61d2dca8a4353645a7d92f2830f0d487fedff403678a0bee5323a46522752b2eab95a0bc3da98b6cccaa7c0c55cd9975130e6d6f0
   languageName: node
   linkType: hard
 
@@ -9334,7 +9279,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
+"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7":
   version: 2.6.7
   resolution: "node-fetch@npm:2.6.7"
   dependencies:
@@ -13671,7 +13616,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:2.0.2, which@npm:^2.0.1, which@npm:^2.0.2":
+"which@npm:^2.0.1, which@npm:^2.0.2":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
   dependencies:
@@ -13733,10 +13678,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workerpool@npm:6.2.0":
-  version: 6.2.0
-  resolution: "workerpool@npm:6.2.0"
-  checksum: 3493b4f0ef979a23d2c1583d7ef85f62fc9463cc02f82829d3e7e663b517f8ae9707da0249b382e46ac58986deb0ca2232ee1081713741211bda9254b429c9bb
+"workerpool@npm:6.2.1":
+  version: 6.2.1
+  resolution: "workerpool@npm:6.2.1"
+  checksum: c2c6eebbc5225f10f758d599a5c016fa04798bcc44e4c1dffb34050cd361d7be2e97891aa44419e7afe647b1f767b1dc0b85a5e046c409d890163f655028b09d
   languageName: node
   linkType: hard
 
@@ -13982,13 +13927,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^21.0.0":
-  version: 21.0.1
-  resolution: "yargs-parser@npm:21.0.1"
-  checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a
-  languageName: node
-  linkType: hard
-
 "yargs-unparser@npm:1.6.0":
   version: 1.6.0
   resolution: "yargs-unparser@npm:1.6.0"
@@ -14045,21 +13983,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.4.1":
-  version: 17.5.1
-  resolution: "yargs@npm:17.5.1"
-  dependencies:
-    cliui: ^7.0.2
-    escalade: ^3.1.1
-    get-caller-file: ^2.0.5
-    require-directory: ^2.1.1
-    string-width: ^4.2.3
-    y18n: ^5.0.5
-    yargs-parser: ^21.0.0
-  checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde
-  languageName: node
-  linkType: hard
-
 "yargs@npm:^4.7.1":
   version: 4.8.1
   resolution: "yargs@npm:4.8.1"