Merge pull request #249 from BitGo/WIN-6575

chore: ethers migration v6, added signal for creating recovery wallet

Author: yogeshwar-bitgo

.prettierignore

@@ -1 +1,2 @@
 typechain
+typechain-types

.prettierrc

@@ -1,11 +1,10 @@
- 
 {
     "useTabs": false,
     "printWidth": 80,
     "tabWidth": 2,
     "singleQuote": true,
     "trailingComma": "none",
-    "jsxBracketSameLine": false,
+    "bracketSameLine": false,
     "semi": true,
-    "bracketSpacing": true,
+    "bracketSpacing": true
 }

contracts/recoveryContracts/RecoveryWalletFactory.sol

@@ -6,6 +6,9 @@ import '../CloneFactory.sol';
 contract RecoveryWalletFactory is CloneFactory {
   address public immutable implementationAddress;
 
+  // Emitted when a new recovery wallet clone is created
+  event WalletCreated(address indexed newWalletAddress);
+
   constructor(address _implementationAddress) {
     implementationAddress = _implementationAddress;
   }
@@ -18,5 +21,7 @@ contract RecoveryWalletFactory is CloneFactory {
 
     address payable clone = createClone(implementationAddress, finalSalt);
     RecoveryWalletSimple(clone).init(allowedSigners[2]);
+
+    emit WalletCreated(clone);
   }
 }

deployUtils.ts

@@ -1,6 +1,6 @@
 import hre, { ethers } from 'hardhat';
 import fs from 'fs';
-import { Contract } from 'ethers';
+import { BaseContract, getCreateAddress } from 'ethers';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { verifyOnCustomEtherscan } from './scripts/customContractVerifier';
 
@@ -33,7 +33,7 @@ export async function deployIfNeededAtNonce(
   contractName: string,
   deployFn: () => Promise<string>
 ): Promise<string> {
-  const predictedAddress = ethers.utils.getContractAddress({
+  const predictedAddress = getCreateAddress({
     from: deployerAddress,
     nonce: expectedNonce
   });
@@ -115,7 +115,7 @@ export function saveOutput(output: DeploymentAddresses) {
  */
 export async function waitAndVerify(
   hre: HardhatRuntimeEnvironment,
-  contract: Contract,
+  contract: BaseContract,
   contractName: string,
   constructorArguments: string[] = []
 ) {
@@ -132,8 +132,15 @@ export async function waitAndVerify(
   const artifact = await hre.artifacts.readArtifact(contractName);
   const verificationString = `${artifact.sourceName}:${artifact.contractName}`;
   console.log(`Verification string: ${verificationString}`);
-  await contract.deployTransaction.wait(confirmationCount);
-  logger.success(`Contract confirmed on the network at ${contract.address}.`);
+
+  const deployTx = contract.deploymentTransaction();
+  await deployTx?.wait(confirmationCount);
+
+  logger.success(
+    `Contract ${contractName} confirmed on the network after ${confirmationCount} confirmations.`
+  );
+  const contractAddress = await contract.getAddress();
+  logger.success(`Contract confirmed on the network at ${contractAddress}.`);
 
   const maxRetries = 20;
   const retryDelay = 180000; // 180 seconds
@@ -144,7 +151,7 @@ export async function waitAndVerify(
       // --- Primary Attempt: Standard Verifier ---
       logger.info('Attempting verification with standard Hardhat verifier...');
       await hre.run('verify:verify', {
-        address: contract.address,
+        address: contractAddress,
         constructorArguments: constructorArguments,
         contract: verificationString
       });
@@ -153,7 +160,6 @@ export async function waitAndVerify(
     } catch (standardError: any) {
       logger.warn(`Standard verifier failed: ${standardError.message}`);
 
-      // If already verified by standard verifier, we're done.
       if (standardError.message.toLowerCase().includes('already verified')) {
         logger.success('Contract is already verified.');
         return;
@@ -164,20 +170,18 @@ export async function waitAndVerify(
       try {
         await verifyOnCustomEtherscan({
           hre,
-          contractAddress: contract.address,
+          contractAddress: contractAddress, // Use the fetched address
           contractName: contractName,
           constructorArguments: constructorArguments
         });
         logger.success('Custom verifier fallback successful!');
         return; // Success, exit the loop.
       } catch (customError: any) {
-        // If already verified by custom verifier, we're done.
         if (customError.message.toLowerCase().includes('already verified')) {
           logger.success('Contract is already verified.');
           return;
         }
 
-        // Log the custom verifier failure and decide whether to retry the whole process
         logger.warn(
           `Custom verifier fallback also failed: ${customError.message}`
         );

hardhat.config.ts

@@ -1,10 +1,8 @@
 import * as dotenv from 'dotenv';
 dotenv.config();
 import { HardhatUserConfig } from 'hardhat/config';
+import '@nomicfoundation/hardhat-toolbox';
 import '@nomicfoundation/hardhat-verify';
-import '@nomiclabs/hardhat-waffle';
-import '@nomiclabs/hardhat-truffle5';
-import '@typechain/hardhat';
 import 'hardhat-gas-reporter';
 import 'solidity-coverage';
 import { CHAIN_IDS } from './config/chainIds';
@@ -275,7 +273,7 @@ const config: HardhatUserConfig = {
       ]
     },
     stt: {
-      url: `https://rpc.somnia.network`,
+      url: `https://api.infra.mainnet.somnia.network`,
       accounts: [
         `${PRIVATE_KEY_FOR_V4_CONTRACT_DEPLOYMENT}`,
         `${PLACEHOLDER_KEY}`,
@@ -939,8 +937,8 @@ const config: HardhatUserConfig = {
         network: 'somniaMainnet',
         chainId: CHAIN_IDS.SOMNIA,
         urls: {
-          apiURL: 'https://api.infra.mainnet.somnia.network/',
-          browserURL: 'https://shannon-explorer.somnia.network/' //TODO: WIN-5278: change it with mainnet explorer, when its available
+          apiURL: 'https://mainnet.somnia.w3us.site/api',
+          browserURL: 'https://mainnet.somnia.w3us.site/'
         }
       },
       {

package.json

@@ -15,7 +15,7 @@
     "test": "hardhat test",
     "coverage": "hardhat coverage",
     "solhint": "./node_modules/.bin/solhint --fix 'contracts/**/*.sol'",
-    "prettier-check": "./node_modules/.bin/prettier --config .prettierrc --check './**/*.js' './**/*.ts'",
+    "prettier-check": "prettier --config .prettierrc --check \"**/*.{js,ts}\"",
     "prettier-lint": "./node_modules/.bin/prettier --config .prettierrc --write './**/*.js' './**/*.ts'",
     "prettier:solidity": "./node_modules/.bin/prettier --write contracts/*.sol",
     "lint": "npm run prettier-check"
@@ -26,42 +26,28 @@
     "ethereum"
   ],
   "dependencies": {
-    "@ethersproject/bytes": "^5.8.0",
-    "@ethersproject/wallet": "^5.8.0",
     "@msgpack/msgpack": "^3.1.2",
-    "@noble/hashes": "^1.8.0",
-    "@noble/secp256k1": "^2.3.0",
+    "@nomicfoundation/hardhat-toolbox": "^3.0.0",
     "@openzeppelin/contracts": "5.0.0",
-    "@truffle/hdwallet-provider": "^2.0.0",
-    "bignumber.js": "^9.0.0",
-    "bluebird": "^3.3.5",
-    "bn": "^1.0.1",
-    "bn.js": "^4.11.3",
-    "ethereumjs-abi": "^0.6.8",
-    "ethereumjs-util": "^7.0.4",
-    "ethers": "^5.7.0",
-    "ganache-cli": "^6.12.2",
-    "lodash": "^4.12.0",
-    "mocha": "^9.1.0",
-    "q": "^1.5.1",
-    "should": "^8.3.1",
-    "solc": "0.8.20"
+    "chai": "^4.3.4",
+    "ethereum-waffle": "^3.4.4",
+    "ethereumjs-util": "^7.1.5",
+    "ethers": "^6.7.0"
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-verify": "^2.0.14",
-    "@nomiclabs/hardhat-ethers": "^2.0.4",
-    "@nomiclabs/hardhat-truffle5": "^2.0.3",
-    "@nomiclabs/hardhat-waffle": "^2.0.2",
-    "@nomiclabs/hardhat-web3": "^2.0.0",
+    "@nomicfoundation/hardhat-chai-matchers": "^2.1.0",
+    "@nomicfoundation/hardhat-ethers": "^3.1.0",
+    "@nomicfoundation/hardhat-network-helpers": "^1.1.0",
+    "@nomicfoundation/hardhat-verify": "^1.1.1",
     "@openzeppelin/test-helpers": "^0.5.15",
-    "@typechain/ethers-v5": "^7.2.0",
-    "@typechain/hardhat": "^2.3.1",
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.1.0",
+    "@typechain/ethers-v6": "^0.4.3",
+    "@typechain/hardhat": "^8.0.3",
+    "@types/chai": "^4.3.20",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^12.20.43",
+    "@types/sinon": "^17.0.4",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "chai": "^4.3.6",
     "dotenv": "^10.0.0",
     "dotenv-cli": "^8.0.0",
     "eslint": "^7.32.0",
@@ -71,18 +57,17 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-promise": "^5.2.0",
-    "ethereum-waffle": "^3.4.0",
-    "hardhat": "^2.17.4",
+    "hardhat": "^2.26.2",
     "hardhat-gas-reporter": "^1.0.10",
     "prettier": "^2.5.1",
     "prettier-plugin-solidity": "^1.0.0-beta.13",
     "sinon": "^21.0.0",
     "solhint": "^3.3.6",
     "solhint-plugin-prettier": "0.0.5",
-    "solidity-coverage": "^0.7.18",
+    "solidity-coverage": "^0.8.16",
     "truffle-assertions": "^0.9.2",
     "ts-node": "^10.4.0",
-    "typechain": "^5.2.0",
+    "typechain": "^8.3.2",
     "typescript": "^4.5.5",
     "web3": "^1.7.0"
   },