add debug2

src/contracts/modules/commons/ModuleAuth.sol

@@ -118,7 +118,7 @@ abstract contract ModuleAuth is IModuleAuth, ModuleERC165, SignatureValidator, I
         (signature, rindex) = _signature.readBytes(rindex, size);
         console.log("ModuleAuth: isValidSignature");
         console.logBool(isValidSignature(_hash, addr, signature));
-        require(isValidSignature(_hash, addr, signature), "ModuleAuth#_signatureValidation: INVALID_SIGNATURE");
+      require(isValidSignature(_hash, addr, signature), "ModuleAuth#_signatureValidation: INVALID_SIGNATURE");
 
         // Acumulate total weight of the signature
         totalWeight += addrWeight;
@@ -127,6 +127,7 @@ abstract contract ModuleAuth is IModuleAuth, ModuleERC165, SignatureValidator, I
       }
 
       // Write weight and address to image
+      console.log("Calculating image hash for %s with weight %s", addr, addrWeight);
       imageHash = keccak256(abi.encode(imageHash, addrWeight, addr));
     }
 

src/contracts/modules/commons/ModuleAuthDynamic.sol

@@ -28,7 +28,36 @@ abstract contract ModuleAuthDynamic is ModuleAuthUpgradable {
    * @return true if the signature image is valid, and true if the image hash needs to be updated
    */
   function _isValidImage(bytes32 _imageHash) internal view override returns (bool, bool) {
+      console.log("IS VALID IMAGE 1:");
+      console.logBytes32(_imageHash);
+      console.log("GOT %s", address(
+        uint160(uint256(
+          keccak256(
+            abi.encodePacked(
+              bytes1(0xff),
+              FACTORY,
+              _imageHash,
+              INIT_CODE_HASH
+            )
+          )
+        ))
+      ));
+    console.log("WANT %s", address(this));
     bytes32 storedImageHash = ModuleStorage.readBytes32(ImageHashKey.IMAGE_HASH_KEY);
+    console.log("STORED IMAGE HASH: ");
+    console.logBytes32(storedImageHash);
+    address(
+        uint160(uint256(
+          keccak256(
+            abi.encodePacked(
+              bytes1(0xff),
+              FACTORY,
+              _imageHash,
+              INIT_CODE_HASH
+            )
+          )
+        ))
+      );
     if (storedImageHash == 0) {
       // No image hash stored. Check that the image hash was used as the salt when 
       // deploying the wallet proxy contract.
@@ -47,7 +76,7 @@ abstract contract ModuleAuthDynamic is ModuleAuthUpgradable {
       // Indicate need to update = true. This will trigger a call to store the image hash
       return (authenticated, true);
     }
-
+    
     // Image hash has been stored. 
     return ((_imageHash != bytes32(0) && _imageHash == storedImageHash), false);
   }

tests/EIP712Debug.ts

@@ -9,6 +9,10 @@ import { ethers, network } from 'hardhat'
 // Do signature verification
 // inspect console.log lines
 
+// "passport": {
+//     "zkevm_eth_address": "0x3878cadc6a521dceb1f46599913ce726c430a8e1",
+//     "zkevm_user_admin_address": "0xa110e9ccdc3714d1dabb2f25e8883061f75011bd"
+
 async function main() {
   // Get signature values
   const typedHash = '0x0b8f209be8d541a4ded6b82c0414aac2cee9cb89f19518b6ee1502ba555cb16c'

tests/EIP712Debug2.ts

@@ -0,0 +1,85 @@
+import { ethers, network } from 'hardhat'
+
+// Fork network @ https://rpc.testnet.immutable.com/
+// Attach contract at LatestWalletImplLocator
+// Get MainModuleDynamicAuth address
+// Deploy MainModuleDynamicAuth (with console logs)
+// Get code at the newly deployed MainModuleDynamicAuth (w/ logs)
+// Set the code at the MainModuleDynamicAuth to be the newly deployed MainModuleDynamicAuth (w/ logs)
+// Do signature verification
+// inspect console.log lines
+
+//   "passport": {
+  // "zkevm_eth_address": "0x3878cadc6a521dceb1f46599913ce726c430a8e1",
+  // "zkevm_user_admin_address": "0xa110e9ccdc3714d1dabb2f25e8883061f75011bd"
+
+async function main() {
+  // Get signature values
+  const typedHash = '0xe8a936e6c05a3cfea78c9df4bbcec02a3253d7358ba15b42f78aba327e25c180'
+  const messageSubDigest = '0xede3e129db20579573bccededc094e9a0f3cb8c8df59bbf3526eb7072bffa6f3'
+  const packedAggregateSignature =
+    '0x000202011b1d383526a2815d26550eb314b5d7e0551327330043a9b3a8608b3f49eaeedaa13f60967982a8b40abe3203f027787b125b273f780f669b07583967f86e2ad0f4100094b91586b5d89bde8e6fcd0236f5ece8ffd4391b01030001294c4e19c04efff53c34ed7a2997bb9161b0c7f33db3af1148c66eb63d6593a668bb0da9bd32fcc3bbed426d515dff22886245a3583d2e275add28418ca2c63e1b02'
+  const relayerSig =
+    '0xc9d1d1d25201bd592da3eb99a5c4568105a79c168b93eebe2444ddf1f7a61174394b2b8616ba8ce9aae7741e2131caf66b80773f3557e18ec0d93a68a17090cb1b01'
+
+  // Recover signer
+//   const signer = await ethers.getContractFactory('SignerCheck')
+//   const signerDeployed = await signer.deploy()
+//   await signerDeployed.deployed()
+//   const signerRet = await signerDeployed.recover(messageSubDigest, relayerSig)
+
+  // Verify supplied signature against Immutable signer
+//   const immutableSignerAddr = '0x1B1D383526A2815d26550eb314B5d7e055132733'
+//   const immutableSigner = await ethers.getContractAt('ImmutableSigner', immutableSignerAddr)
+//   const immutableSignerPubKey = await immutableSigner.primarySigner()
+
+//   // Verify returned signer against Immutable signer
+//   if (signerRet !== immutableSignerPubKey) {
+//     console.log('Signer mismatch')
+//     process.exit(0)
+//   }
+
+  // Set addresses
+  const scwAddr = '0x0aa0bbd0bde831fd2288bc397b6b76f73d960650'
+  const factoryAddr = '0x55b9d1cd803d5acA8ea23ccd96f6a756DED9f5a9'
+  const startupAddr = '0x8df826438e652f7124fe07F413fA3556cd57edB5'
+  const walletImplLocatorAddr = '0x657d339b8616033fee25f66ea1d00c3f30b14171'
+
+  // Get MainModuleDynamicAuth address
+  const walletImplLocator = await ethers.getContractAt('LatestWalletImplLocator', walletImplLocatorAddr)
+  const mainModuleAddr = await walletImplLocator.latestWalletImplementation()
+
+  // Deploy new MainModuleDynamicAuthLog
+  const ModuleLog = await ethers.getContractFactory('MainModuleDynamicAuthLog')
+  const moduleLog = await ModuleLog.deploy(factoryAddr, startupAddr)
+  await moduleLog.deployed()
+
+  // Get code for logging
+  const modLogCode = await ethers.provider.getCode(moduleLog.address)
+
+  // Get address for main module
+  const walletProxy = await ethers.getContractAt('IWalletProxy', scwAddr)
+
+  // Set code
+  //   await network.provider.send('hardhat_setCode', [mainModuleAddr, modLogCode])
+  //   await network.provider.send('hardhat_mine', ["0x100"])
+//   console.log('MAIN MODULE ADDDR: ', moduleLog.address)
+  console.log("STORAGE AT: ", await ethers.provider.getStorageAt(scwAddr, scwAddr));
+  console.log('PROXY IMPLEMENTATION: ', await walletProxy.PROXY_getImplementation())
+  const implementationValue = "0x000000000000000000000000" + moduleLog.address.substring(2);
+  await network.provider.send('hardhat_setStorageAt', [scwAddr, scwAddr, implementationValue])
+
+
+  // Do signature verification
+  // Attatch to SCW
+  const moduleAuth = await ethers.getContractAt('ModuleAuth', scwAddr)
+  //   Verify 2-of-2 signature
+  const magicValue = await moduleAuth['isValidSignature(bytes32,bytes)'](typedHash, packedAggregateSignature)
+
+  console.log('MAGIC VALUE', magicValue)
+}
+
+main().catch(error => {
+  console.error(error)
+  process.exit(1)
+})