fix: fix most of the tests

package.json

@@ -36,7 +36,7 @@
     "test": "hardhat test"
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
+    "@nomicfoundation/hardhat-network-helpers": "^1.0.10",
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "@ethereumjs/rlp": "^4.0.1",
     "@ethereumjs/trie": "^5.0.4",
@@ -49,7 +49,7 @@
     "chai": "^4.3.7",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
-    "hardhat": "2.14.0",
+    "hardhat": "^2.19.2",
     "mocha": "^10.2.0",
     "prettier": "^2.8.4",
     "prettier-plugin-solidity": "^1.1.3",

scripts/const-addr-deployer.ts

@@ -2,6 +2,7 @@ import {
   AbiCoder,
   Contract,
   ContractFactory,
+  HDNodeWallet,
   InterfaceAbi,
   keccak256,
   Wallet,
@@ -21,7 +22,7 @@ const getSaltFromKey = (key: string) => {
 }
 
 export const estimateGasForDeploy = async (
-  wallet: Wallet,
+  wallet: Wallet | HDNodeWallet,
   contractJson: ContractOutputJSON,
   args: Arg[] = []
 ) => {
@@ -59,7 +60,7 @@ export const estimateGasForDeployAndInit = async (
 }
 
 export const deployContractConstant = async (
-  wallet: Wallet,
+  wallet: Wallet | HDNodeWallet,
   contractJson: ContractOutputJSON,
   key: string,
   args: Arg[] = [],

test/topos-core/BurnableMintableCappedERC20.test.ts

@@ -1,41 +1,44 @@
-import { ethers } from 'hardhat'
+import { EventLog } from 'ethers'
 import { expect } from 'chai'
+import { ethers } from 'hardhat'
 
+import { BurnableMintableCappedERC20__factory } from '../../typechain-types/factories/contracts/topos-core/BurnableMintableCappedERC20__factory'
+import { TokenDeployer__factory } from '../../typechain-types/factories/contracts/topos-core/TokenDeployer__factory'
 import * as tc from './shared/constants/tokens'
 
 describe('BurnableMintableCappedERC20', () => {
   async function deployTokenFixture() {
     const [deployer, operator, user1] = await ethers.getSigners()
-    const tokenSalt = ethers.utils.keccak256(
-      Buffer.from(deployer.address),
-      Buffer.from(tc.TOKEN_SYMBOL_X)
+    const tokenSalt = ethers.keccak256(
+      Buffer.concat([
+        Buffer.from(deployer.address),
+        Buffer.from(tc.TOKEN_SYMBOL_X),
+      ])
     )
 
-    const tokenDeployerFactory = await ethers.getContractFactory(
-      'TokenDeployer'
-    )
-    const BurnableMintableCappedERC20Factory = await ethers.getContractFactory(
-      'BurnableMintableCappedERC20'
-    )
+    const tokenDeployer = await new TokenDeployer__factory(deployer).deploy()
+    await tokenDeployer.waitForDeployment()
 
-    const tokenDeployer = await tokenDeployerFactory.deploy()
-    await tokenDeployer.deployed()
-
-    const tx = await tokenDeployer.deployToken(
+    const deployTokenTx = await tokenDeployer.deployToken(
       tc.TOKEN_NAME,
       tc.TOKEN_SYMBOL_X,
       tc.MINT_CAP_100_000_000,
       tc.INITIAL_SUPPLY_10_000_000,
       deployer.address,
       operator.address,
-      tokenSalt
+      tokenSalt,
+      {}
+    )
+
+    const txReceipt = await deployTokenTx.wait()
+    const log = txReceipt!.logs?.find(
+      (l) => (l as EventLog).eventName === 'Deployed'
     )
-    const txReceipt = await tx.wait()
-    const logs = txReceipt.events?.find(
-      (e: { event: string }) => e.event === 'Deployed'
+    const tokenAddress = (log as EventLog).args['tokenAddress']
+    const token = BurnableMintableCappedERC20__factory.connect(
+      tokenAddress,
+      deployer
     )
-    const tokenAddress = logs?.args?.tokenAddress
-    const token = BurnableMintableCappedERC20Factory.attach(tokenAddress)
 
     return { deployer, operator, user1, token }
   }
@@ -105,7 +108,7 @@ describe('BurnableMintableCappedERC20', () => {
       const { deployer, operator, user1, token } = await deployTokenFixture()
       await token
         .connect(deployer)
-        .revokeRole(ethers.utils.id('OPERATOR_ROLE'), operator.address)
+        .revokeRole(ethers.id('OPERATOR_ROLE'), operator.address)
       await expect(
         token.connect(operator).mint(user1.address, tc.MINT_AMOUNT_100)
       ).to.be.revertedWith(
@@ -117,10 +120,10 @@ describe('BurnableMintableCappedERC20', () => {
       const { deployer, operator, user1, token } = await deployTokenFixture()
       await token
         .connect(deployer)
-        .revokeRole(ethers.utils.id('OPERATOR_ROLE'), operator.address)
+        .revokeRole(ethers.id('OPERATOR_ROLE'), operator.address)
       await token
         .connect(deployer)
-        .grantRole(ethers.utils.id('OPERATOR_ROLE'), operator.address)
+        .grantRole(ethers.id('OPERATOR_ROLE'), operator.address)
       await token.connect(operator).mint(user1.address, tc.MINT_AMOUNT_100)
       await expect(token.balanceOf(user1.address)).to.eventually.equal(
         tc.MINT_AMOUNT_100
@@ -132,7 +135,7 @@ describe('BurnableMintableCappedERC20', () => {
       await expect(
         token
           .connect(operator)
-          .grantRole(ethers.utils.id('OPERATOR_ROLE'), user1.address)
+          .grantRole(ethers.id('OPERATOR_ROLE'), user1.address)
       ).to.be.reverted
     })
 
@@ -141,7 +144,7 @@ describe('BurnableMintableCappedERC20', () => {
       await expect(
         token
           .connect(operator)
-          .revokeRole(ethers.utils.id('OPERATOR_ROLE'), user1.address)
+          .revokeRole(ethers.id('OPERATOR_ROLE'), user1.address)
       ).to.be.reverted
     })
   })

test/topos-core/Bytes32Sets.test.ts

@@ -5,13 +5,13 @@ import { expect } from 'chai'
 describe('Bytes32Sets', () => {
   let bytes32SetsTest: Contract
 
-  const key1 = ethers.utils.formatBytes32String('key1')
-  const key2 = ethers.utils.formatBytes32String('key2')
+  const key1 = ethers.encodeBytes32String('key1')
+  const key2 = ethers.encodeBytes32String('key2')
 
   beforeEach(async () => {
     const Bytes32SetsTest = await ethers.getContractFactory('Bytes32SetsTest')
     bytes32SetsTest = await Bytes32SetsTest.deploy()
-    await bytes32SetsTest.deployed()
+    await bytes32SetsTest.waitForDeployment()
   })
 
   describe('insert', () => {

test/topos-core/SubnetRegistrator.test.ts

@@ -1,25 +1,25 @@
-import { Contract, Wallet } from 'ethers'
+import { Signer, Wallet } from 'ethers'
 import { ethers } from 'hardhat'
 import { expect } from 'chai'
 
-describe('SubnetRegistrator', () => {
-  let subnetRegistrator: Contract
+import { SubnetRegistrator__factory } from '../../typechain-types/factories/contracts/topos-core/SubnetRegistrator__factory'
+import { SubnetRegistrator } from '../../typechain-types'
 
+describe('SubnetRegistrator', () => {
   const chainId = 1
   const currencySymbol = 'SUB'
   const endpointHttp = 'http://127.0.0.1'
   const endpointWs = 'ws://127.0.0.1'
   const logoURL = 'http://image-url.com'
   const name = 'Test Subnet'
-  const subnetId = ethers.utils.formatBytes32String('subnetId')
+  const subnetId = ethers.encodeBytes32String('subnetId')
 
   async function deploySubnetRegistratorFixture() {
     const [admin, nonAdmin, toposDeployer] = await ethers.getSigners()
-    const SubnetRegistrator = await ethers.getContractFactory(
-      'SubnetRegistrator'
-    )
-    subnetRegistrator = await SubnetRegistrator.connect(toposDeployer).deploy()
-    await subnetRegistrator.deployed()
+    const subnetRegistrator = await new SubnetRegistrator__factory(
+      toposDeployer
+    ).deploy()
+    await subnetRegistrator.waitForDeployment()
     await subnetRegistrator.initialize(admin.address)
     return {
       admin,
@@ -177,7 +177,8 @@ describe('SubnetRegistrator', () => {
 
   describe('removeSubnet', () => {
     it('reverts if non-admin tries to remove a subnet', async () => {
-      const [, nonAdmin] = await ethers.getSigners()
+      const { nonAdmin, subnetRegistrator } =
+        await deploySubnetRegistratorFixture()
       await expect(
         subnetRegistrator.connect(nonAdmin).removeSubnet(subnetId)
       ).to.be.revertedWith('Ownable: caller is not the owner')
@@ -212,15 +213,15 @@ describe('SubnetRegistrator', () => {
   })
 
   async function registerSubnet(
-    admin: Wallet,
+    admin: Signer,
     chainId: number,
     currencySymbol: string,
     endpointHttp: string,
     endpointWs: string,
     logoURL: string,
     name: string,
     subnetId: string,
-    subnetRegistrator: Contract
+    subnetRegistrator: SubnetRegistrator
   ) {
     return await subnetRegistrator
       .connect(admin)
@@ -237,8 +238,8 @@ describe('SubnetRegistrator', () => {
 
   async function removeSubnet(
     subnetId: string,
-    subnetRegistrator: Contract,
-    admin: Wallet
+    subnetRegistrator: SubnetRegistrator,
+    admin: Signer
   ) {
     return await subnetRegistrator.connect(admin).removeSubnet(subnetId)
   }