chore: ID-4134: add tests

Author: naveen-imtb

tests/ERC165.spec.ts

@@ -8,6 +8,7 @@ import {
   MainModuleDynamicAuth,
   StartupWalletImpl,
   LatestWalletImplLocator,
+  ImmutableSigner,
   Factory,
   Factory__factory,
   MainModule__factory,
@@ -16,6 +17,7 @@ import {
   ERC165CheckerMock__factory,
   StartupWalletImpl__factory,
   LatestWalletImplLocator__factory,
+  ImmutableSigner__factory,
 } from '../src'
 
 ethers.utils.Logger.setLogLevel(ethers.utils.Logger.levels.ERROR)
@@ -51,6 +53,7 @@ contract('ERC165', () => {
   let moduleDynamicAuth: MainModuleDynamicAuth
   let startupWalletImpl: StartupWalletImpl
   let moduleLocator: LatestWalletImplLocator
+  let immutableSigner: ImmutableSigner
 
   let owner: ethers.Wallet
   let wallet: MainModule
@@ -70,10 +73,12 @@ contract('ERC165', () => {
     // Startup and Locator
     moduleLocator = await new LatestWalletImplLocator__factory().connect(signer).deploy(await signer.getAddress(), await signer.getAddress())
     startupWalletImpl = await new StartupWalletImpl__factory().connect(signer).deploy(moduleLocator.address)
+    // Deploy ImmutableSigner
+    immutableSigner = await new ImmutableSigner__factory().connect(signer).deploy(await signer.getAddress(), await signer.getAddress(), await signer.getAddress())
     // Deploy MainModule
     mainModule = await new MainModule__factory().connect(signer).deploy(factory.address)
     moduleUpgradable = await new MainModuleUpgradable__factory().connect(signer).deploy()
-    moduleDynamicAuth = await new MainModuleDynamicAuth__factory().connect(signer).deploy(factory.address, startupWalletImpl.address)
+    moduleDynamicAuth = await new MainModuleDynamicAuth__factory().connect(signer).deploy(factory.address, startupWalletImpl.address, immutableSigner.address)
     // Deploy ERC165 Checker
     erc165checker = await new ERC165CheckerMock__factory().connect(signer).deploy()
 

tests/ImmutableDeployment.spec.ts

@@ -93,7 +93,7 @@ describe('E2E Immutable Wallet Deployment', () => {
     // Nonce 5
     mainModuleDynamicAuth = await new MainModuleDynamicAuth__factory()
       .connect(contractDeployerEOA)
-      .deploy(factory.address, startupWallet.address)
+      .deploy(factory.address, startupWallet.address, immutableSigner.address)
 
     // Setup the latest implementation address
     await moduleLocator
@@ -283,7 +283,7 @@ describe('E2E Immutable Wallet Deployment', () => {
     )
 
     await expect(wallet.execute([transaction], nonce, signature)).to.be.revertedWith(
-      'ModuleAuth#_signatureValidation: INVALID_SIGNATURE'
+      'ModuleAuthDynamic#_signatureValidation: INVALID_SIGNATURE'
     )
   })
 
@@ -336,7 +336,7 @@ describe('E2E Immutable Wallet Deployment', () => {
     )
 
     await expect(wallet.execute([transaction], nonce, signature)).to.be.revertedWith(
-      'ModuleAuth#_signatureValidation: INVALID_SIGNATURE'
+      'ModuleAuthDynamic#_signatureValidation: INVALID_SIGNATURE'
     )
   })
 
@@ -393,7 +393,7 @@ describe('E2E Immutable Wallet Deployment', () => {
     )
 
     await expect(wallet.execute([transaction], nonce, signature)).to.be.revertedWith(
-      'ModuleAuth#_signatureValidation: INVALID_SIGNATURE'
+      'ModuleAuthDynamic#_signatureValidation: INVALID_SIGNATURE'
     )
   })
 })

tests/ImmutableStartup.spec.ts

@@ -23,8 +23,12 @@ describe('Wallet Factory', function () {
     const StartupWalletImpl= await ethers.getContractFactory('StartupWalletImpl')
     const startupWalletImpl = await StartupWalletImpl.deploy(latestWalletImplLocator.address)
 
+    // Deploy ImmutableSigner contract for use in MainModuleMock deployments
+    const ImmutableSigner = await ethers.getContractFactory('ImmutableSigner')
+    const immutableSigner = await ImmutableSigner.deploy(owner.address, owner.address, owner.address)
+
     const MainModule = await ethers.getContractFactory('MainModuleMockV1')
-    const mainModuleV1 = await MainModule.deploy(factory.address, startupWalletImpl.address)
+    const mainModuleV1 = await MainModule.deploy(factory.address, startupWalletImpl.address, immutableSigner.address)
 
     await latestWalletImplLocator.changeWalletImplementation(mainModuleV1.address)
 
@@ -41,7 +45,8 @@ describe('Wallet Factory', function () {
       mainModuleV1,
       startupWalletImpl,
       salt,
-      latestWalletImplLocator
+      latestWalletImplLocator,
+      immutableSigner
 
     }
   }
@@ -132,7 +137,7 @@ describe('Wallet Factory', function () {
 
 
     it('Should be able to upgrade implementation contracts', async function () {
-      const { factory, startupWalletImpl } = await loadFixture(setupStartupFixture)
+      const { factory, startupWalletImpl, immutableSigner } = await loadFixture(setupStartupFixture)
 
       const acc = ethers.Wallet.createRandom()
       const salt = encodeImageHash(1, [{ weight: 1, address: acc.address }])
@@ -151,7 +156,7 @@ describe('Wallet Factory', function () {
 
       //console.log("Deploy MainModuleMockV2")
       const MainModuleV2 = await ethers.getContractFactory('MainModuleMockV2')
-      const mainModuleV2 = await MainModuleV2.deploy(factory.address, startupWalletImpl.address)
+      const mainModuleV2 = await MainModuleV2.deploy(factory.address, startupWalletImpl.address, immutableSigner.address)
 
       // console.log("Upgrade wallet proxy to using MainModuleMockV2")
       const networkId = (await ethers.provider.getNetwork()).chainId
@@ -201,10 +206,10 @@ describe('Wallet Factory', function () {
 
 
     it('Deploying using upgrade should work', async function () {
-      const { factory, startupWalletImpl, latestWalletImplLocator } = await loadFixture(setupStartupFixture)
+      const { factory, startupWalletImpl, latestWalletImplLocator, immutableSigner } = await loadFixture(setupStartupFixture)
 
       const MainModuleV2 = await ethers.getContractFactory('MainModuleMockV2')
-      const mainModuleV2 = await MainModuleV2.deploy(factory.address, startupWalletImpl.address)
+      const mainModuleV2 = await MainModuleV2.deploy(factory.address, startupWalletImpl.address, immutableSigner.address)
 
       await latestWalletImplLocator.changeWalletImplementation(mainModuleV2.address)