test fixes

test/signing.ts

@@ -3,27 +3,61 @@ import { loadFixture } from "@nomicfoundation/hardhat-network-helpers"
 import { expect } from "chai"
 import { ethers } from "hardhat"
 
-import { signWithMech } from "../sdk"
+import {
+  calculateERC721TokenboundMechAddress,
+  deployERC721TokenboundMech,
+  deployERC721TokenboundMechMastercopy,
+  signWithMech,
+} from "../sdk/src"
+import { ERC721TokenboundMech__factory } from "../typechain-types"
+
+import { deployFactories } from "./utils"
 
 describe("signing", () => {
   // We define a fixture to reuse the same setup in every test. We use
   // loadFixture to run this setup once, snapshot that state, and reset Hardhat
   // Network to that snapshot in every test.
   async function deployMech1() {
-    const TestToken = await ethers.getContractFactory("ERC721Token")
-    const ERC721TokenboundMech = await ethers.getContractFactory(
-      "ERC721TokenboundMech"
-    )
-    const [deployer, alice, bob, eve] = await ethers.getSigners()
+    const { deployerClient, erc6551Registry, alice, bob } =
+      await deployFactories()
 
+    await deployERC721TokenboundMechMastercopy(deployerClient)
+
+    const TestToken = await ethers.getContractFactory("ERC721Token")
     const testToken = await TestToken.deploy()
-    const mech1 = await ERC721TokenboundMech.deploy(testToken.getAddress(), 1)
+    const testTokenAddress = (await testToken.getAddress()) as `0x${string}`
+
+    const chainId = deployerClient.chain.id
+    const registryAddress =
+      (await erc6551Registry.getAddress()) as `0x${string}`
+
+    await deployERC721TokenboundMech(deployerClient, {
+      token: testTokenAddress,
+      tokenId: 1n,
+      from: registryAddress,
+    })
+
+    const mech1 = ERC721TokenboundMech__factory.connect(
+      calculateERC721TokenboundMechAddress({
+        chainId,
+        token: testTokenAddress,
+        tokenId: 1n,
+        from: registryAddress,
+      }),
+      ethers.provider
+    )
 
-    await mech1.waitForDeployment()
-    await testToken.mintToken(alice.getAddress(), 1)
+    // make alice the operator of mech1
+    await testToken.mintToken(await alice.getAddress(), 1n)
 
     // Fixtures can return anything you consider useful for your tests
-    return { ERC721TokenboundMech, testToken, mech1, alice, bob, eve }
+    return {
+      testToken,
+      mech1,
+      alice,
+      bob,
+      chainId,
+    }
   }
 
   describe("signWithMech()", () => {
@@ -39,7 +73,7 @@ describe("signing", () => {
       )
 
       const isValidSig = await verifyMessage({
-        signer: mech1.getAddress(),
+        signer: await mech1.getAddress(),
         message,
         signature: mechSignature,
         provider: ethers.provider,

test/utils.ts

@@ -1,15 +1,12 @@
 import hre, { ethers } from "hardhat"
-import { createWalletClient, custom as customTransport } from "viem"
+import {
+  createTestClient,
+  custom as customTransport,
+  walletActions,
+} from "viem"
 import { hardhat } from "viem/chains"
 
-import {
-  deployERC1155ThresholdMechMastercopy,
-  deployERC1155TokenboundMechMastercopy,
-  deployERC2470SingletonFactory,
-  deployERC721TokenboundMechMastercopy,
-  deployMechFactory,
-  deployZodiacMechMastercopy,
-} from "../sdk"
+import { deployERC2470SingletonFactory, deployMechFactory } from "../sdk/src"
 
 /** deploy ERC2470 singleton factory, MechFactory, and ERC6551 registry */
 export async function deployFactories() {
@@ -20,16 +17,17 @@ export async function deployFactories() {
 
   const ERC6551Registry = await ethers.getContractFactory("ERC6551Registry")
   const erc6551Registry = await ERC6551Registry.deploy()
-
-  const deployerClient = createWalletClient({
+  deployer.populateTransaction
+  const deployerClient = createTestClient({
+    account: deployer.address as `0x${string}`,
     chain: hardhat,
-    account: (await signer.getAddress()) as `0x${string}`,
+    mode: "hardhat",
     transport: customTransport({
-      request({ method, params }) {
-        return hre.ethers.provider.send(method, params)
+      async request({ method, params }) {
+        return deployer.provider.send(method, params)
       },
     }),
-  })
+  }).extend(walletActions)
 
   await deployERC2470SingletonFactory(deployerClient)
   await deployMechFactory(deployerClient)