Merge pull request #67 from cometh-hq/develop

fix: multichain

Author: yoanslvy

packages/sdk/package.json

@@ -6,7 +6,7 @@
       "name": "yoanslvy"
     }
   ],
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "SDK Cometh Connect 4337",
   "repository": "https://github.com/cometh-hq/connect-sdk-4337.git",
   "keywords": [

packages/sdk/src/core/signers/passkeys/passkeyService.ts

@@ -360,17 +360,36 @@ const getPasskeySigner = async ({
     const webAuthnSignerForGivenChain = signingWebAuthnSigners.find(
         (signer) => +signer.chainId === chain.id
     );
-    if (!webAuthnSignerForGivenChain)
+
+    let passkeyWithCoordinates: PasskeyLocalStorageFormat;
+
+    if (
+        signingWebAuthnSigners[0]?.signerAddress !==
+            safeWebAuthnSharedSignerAddress &&
+        !webAuthnSignerForGivenChain
+    ) {
         throw new NoPasskeySignerFoundForGivenChain();
+    }
 
-    const passkeyWithCoordinates: PasskeyLocalStorageFormat = {
-        id: webAuthnSignerForGivenChain.publicKeyId as Hex,
-        pubkeyCoordinates: {
-            x: webAuthnSignerForGivenChain.publicKeyX as Hex,
-            y: webAuthnSignerForGivenChain.publicKeyY as Hex,
-        },
-        signerAddress: webAuthnSignerForGivenChain.signerAddress as Address,
-    };
+    if (webAuthnSignerForGivenChain) {
+        passkeyWithCoordinates = {
+            id: webAuthnSignerForGivenChain.publicKeyId as Hex,
+            pubkeyCoordinates: {
+                x: webAuthnSignerForGivenChain.publicKeyX as Hex,
+                y: webAuthnSignerForGivenChain.publicKeyY as Hex,
+            },
+            signerAddress: webAuthnSignerForGivenChain.signerAddress as Address,
+        };
+    } else {
+        passkeyWithCoordinates = {
+            id: signingWebAuthnSigners[0].publicKeyId as Hex,
+            pubkeyCoordinates: {
+                x: signingWebAuthnSigners[0].publicKeyX as Hex,
+                y: signingWebAuthnSigners[0].publicKeyY as Hex,
+            },
+            signerAddress: signingWebAuthnSigners[0].signerAddress as Address,
+        };
+    }
 
     setPasskeyInStorage(
         smartAccountAddress,
@@ -491,4 +510,4 @@ export {
     sign,
     retrieveSmartAccountAddressFromPasskey,
     retrieveSmartAccountAddressFromPasskeyId,
-};
+};