Merge pull request #69 from cometh-hq/develop

Fix/bitwarden (#68)

Author: yoanslvy

bun.lockb

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

packages/sdk/package.json

@@ -197,7 +197,7 @@ const sign = async ({
         [
             toHex(new Uint8Array(assertion.response.authenticatorData)),
             extractClientDataFields(assertion.response) as Hex,
-            extractSignature(assertion.response),
+            extractSignature(assertion.response.signature),
         ]
     );
 
@@ -510,4 +510,4 @@ export {
     sign,
     retrieveSmartAccountAddressFromPasskey,
     retrieveSmartAccountAddressFromPasskeyId,
-};
+};

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

@@ -195,18 +195,18 @@ export function extractClientDataFields(
  * - <https://en.wikipedia.org/wiki/X.690#BER_encoding>
  */
 export function extractSignature(
-    response: AuthenticatorAssertionResponse
+    signature: ArrayBuffer | Uint8Array
 ): [bigint, bigint] {
     const check = (x: boolean): void => {
         if (!x) {
             throw new Error("invalid signature encoding");
         }
     };
 
-    // Decode the DER signature. Note that we assume that all lengths fit into 8-bit integers,
-    // which is true for the kinds of signatures we are decoding but generally false. I.e. this
-    // code should not be used in any serious application.
-    const view = new DataView(response.signature);
+    // Convert Uint8Array to ArrayBuffer if needed
+    const buffer =
+        signature instanceof Uint8Array ? signature.buffer : signature;
+    const view = new DataView(buffer);
 
     // check that the sequence header is valid
     check(view.getUint8(0) === 0x30);
@@ -218,7 +218,7 @@ export function extractSignature(
         const len = view.getUint8(offset + 1);
         const start = offset + 2;
         const end = start + len;
-        const n = BigInt(toHex(new Uint8Array(view.buffer.slice(start, end))));
+        const n = BigInt(toHex(new Uint8Array(buffer.slice(start, end))));
         check(n < maxUint256);
         return [n, end] as const;
     };

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

@@ -0,0 +1,72 @@
+import { createWalletClient, custom } from "viem";
+
+import type {
+    Account,
+    Chain,
+    EIP1193Provider,
+    Hex,
+    SignableMessage,
+    Transport,
+    TypedData,
+    TypedDataDefinition,
+    WalletClient,
+} from "viem";
+
+import { signTypedData } from "viem/actions";
+
+export function walletClientToSmartAccountSigner<
+    TChain extends Chain | undefined = Chain | undefined,
+>(walletClient: WalletClient<Transport, TChain, Account>) {
+    return {
+        address: walletClient.account.address,
+        type: "local",
+        source: "custom",
+        publicKey: walletClient.account.address,
+        signMessage: async ({
+            message,
+        }: { message: SignableMessage }): Promise<Hex> => {
+            return walletClient.signMessage({ message });
+        },
+        async signTypedData<
+            const TTypedData extends TypedData | Record<string, unknown>,
+            TPrimaryType extends
+                | keyof TTypedData
+                | "EIP712Domain" = keyof TTypedData,
+        >(typedData: TypedDataDefinition<TTypedData, TPrimaryType>) {
+            return signTypedData<TTypedData, TPrimaryType, TChain, Account>(
+                walletClient,
+                {
+                    account: walletClient.account,
+                    ...typedData,
+                }
+            );
+        },
+    };
+}
+
+export const providerToSmartAccountSigner = async (
+    provider: EIP1193Provider,
+    params?: {
+        signerAddress: Hex;
+    }
+) => {
+    let account: Hex;
+    if (!params) {
+        try {
+            [account] = await provider.request({
+                method: "eth_requestAccounts",
+            });
+        } catch {
+            [account] = await provider.request({
+                method: "eth_accounts",
+            });
+        }
+    } else {
+        account = params.signerAddress;
+    }
+    const walletClient = createWalletClient({
+        account: account as Hex,
+        transport: custom(provider),
+    });
+    return walletClientToSmartAccountSigner(walletClient);
+};

packages/sdk/src/core/signers/utils.ts

@@ -49,6 +49,7 @@ import type {
     CreateSessionDataParams,
     GrantPermissionResponse,
 } from "./core/modules/sessionKey/types";
+import { providerToSmartAccountSigner } from "./core/signers/utils";
 
 export {
     createSigner,
@@ -67,6 +68,7 @@ export {
     erc7579Actions,
     smartSessionActions,
     toSmartSessionsSigner,
+    providerToSmartAccountSigner,
     ENTRYPOINT_ADDRESS_V07,
     customChains,
     SmartSessionMode,