zksync-sso 0.0.0-beta.8 → 0.1.0

package/dist/_esm/client/ecdsa/types.js

@@ -0,0 +1,61 @@
+import { createWalletClient, custom, hashTypedData } from "viem";
+import { toAccount } from "viem/accounts";
+import { signTypedData } from "viem/actions";
+import { getAction } from "viem/utils";
+import { serializeTransaction } from "viem/zksync";
+import { getEip712Domain } from "../utils/getEip712Domain.js";
+export async function toOwner({ owner, address, }) {
+    if ("type" in owner && owner.type === "local") {
+        return owner;
+    }
+    let walletClient = undefined;
+    if ("request" in owner) {
+        if (!address) {
+            try {
+                [address] = await owner.request({
+                    method: "eth_requestAccounts",
+                });
+            }
+            catch {
+                [address] = await owner.request({
+                    method: "eth_accounts",
+                });
+            }
+        }
+        if (!address) {
+            // For TS to be happy
+            throw new Error("address is required");
+        }
+        walletClient = createWalletClient({
+            account: address,
+            transport: custom(owner),
+        });
+    }
+    if (!walletClient) {
+        walletClient = owner;
+    }
+    return toAccount({
+        address: walletClient.account.address,
+        async signMessage({ message }) {
+            return walletClient.signMessage({ message });
+        },
+        async signTransaction(transaction) {
+            const signableTransaction = {
+                ...transaction,
+                from: this.address,
+                type: "eip712",
+            };
+            const eip712DomainAndMessage = getEip712Domain(signableTransaction);
+            const digest = hashTypedData(eip712DomainAndMessage);
+            const signedMessage = await walletClient.signMessage({ message: digest });
+            return serializeTransaction({
+                ...signableTransaction,
+                customSignature: signedMessage,
+            });
+        },
+        async signTypedData(typedData) {
+            return getAction(walletClient, signTypedData, "signTypedData")(typedData);
+        },
+    });
+}
+//# sourceMappingURL=types.js.map

package/dist/_esm/client/ecdsa/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/client/ecdsa/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAAE,MAAM,EAE1B,aAAa,EAIM,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAA4C,MAAM,aAAa,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAY9D,MAAM,CAAC,KAAK,UAAU,OAAO,CAAoC,EAC/D,KAAK,EACL,OAAO,GAQR;IACC,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC9C,OAAO,KAAqB,CAAC;IAC/B,CAAC;IAED,IAAI,YAAY,GAEA,SAAS,CAAC;IAE1B,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC;gBACH,CAAC,OAAO,CAAC,GAAG,MAAO,KAA0B,CAAC,OAAO,CAAC;oBACpD,MAAM,EAAE,qBAAqB;iBAC9B,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,CAAC,OAAO,CAAC,GAAG,MAAO,KAA0B,CAAC,OAAO,CAAC;oBACpD,MAAM,EAAE,cAAc;iBACvB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,qBAAqB;YACrB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QACD,YAAY,GAAG,kBAAkB,CAAC;YAChC,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,MAAM,CAAC,KAAyB,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,KAId,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC;QACf,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO;QACrC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW;YAC/B,MAAM,mBAAmB,GAAG;gBAC1B,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,CAAC,OAAQ;gBACnB,IAAI,EAAE,QAAQ;aACwB,CAAC;YAEzC,MAAM,sBAAsB,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC;YACpE,MAAM,MAAM,GAAG,aAAa,CAAC,sBAAsB,CAAC,CAAC;YAErD,MAAM,aAAa,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAE1E,OAAO,oBAAoB,CAAC;gBAC1B,GAAG,mBAAmB;gBACtB,eAAe,EAAE,aAAa;aAC/B,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,SAAS,CACd,YAAY,EACZ,aAAa,EACb,eAAe,CAChB,CAAC,SAAgB,CAAC,CAAC;QACtB,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/dist/_esm/client/index.js

@@ -1,3 +1,6 @@
+export { deployAccount as deployEcdsaAccount, fetchAccount as fetchEcdsaAccount } from "./ecdsa/actions/account.js";
 export { deployAccount, fetchAccount } from "./passkey/actions/account.js";
+export * from "./recovery/actions/recovery.js";
+export * from "./recovery/client.js";
 export * from "./session/client.js";
 //# sourceMappingURL=index.js.map

package/dist/_esm/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC3E,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC3E,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}

package/dist/_esm/client/passkey/actions/account.js

@@ -1,16 +1,14 @@
-import { getAddress, parseAbi, toHex } from "viem";
+import { getAddress, keccak256, parseEventLogs, toHex } from "viem";
 import { readContract, waitForTransactionReceipt, writeContract } from "viem/actions";
 import { getGeneralPaymasterInput } from "viem/zksync";
-import { FactoryAbi } from "../../../abi/Factory.js";
+import { AAFactoryAbi } from "../../../abi/AAFactory.js";
+import { WebAuthValidatorAbi } from "../../../abi/WebAuthValidator.js";
 import { encodeModuleData, encodePasskeyModuleParameters, encodeSession } from "../../../utils/encoding.js";
 import { noThrow } from "../../../utils/helpers.js";
-import { getPasskeySignatureFromPublicKeyBytes, getPublicKeyBytesFromPasskeySignature } from "../../../utils/passkey.js";
+import { base64UrlToUint8Array, getPasskeySignatureFromPublicKeyBytes, getPublicKeyBytesFromPasskeySignature } from "../../../utils/passkey.js";
 const NULL_ADDRESS = "0x0000000000000000000000000000000000000000";
 export const deployAccount = async (client, // Account deployer (any viem client)
 args) => {
-    if (!args.salt) {
-        args.salt = crypto.getRandomValues(new Uint8Array(32));
-    }
     let origin = args.expectedOrigin;
     if (!origin) {
         try {
@@ -22,6 +20,7 @@ args) => {
     }
     const passkeyPublicKey = getPublicKeyBytesFromPasskeySignature(args.credentialPublicKey);
     const encodedPasskeyParameters = encodePasskeyModuleParameters({
+        credentialId: args.credentialId,
         passkeyPublicKey,
         expectedOrigin: origin,
     });
@@ -34,16 +33,19 @@ args) => {
         address: args.contracts.session,
         parameters: args.initialSession ? encodeSession(args.initialSession) : "0x",
     });
+    const encodedGuardianRecoveryModuleData = encodeModuleData({
+        address: args.contracts.recovery,
+        parameters: "0x",
+    });
     let deployProxyArgs = {
         account: client.account,
         chain: client.chain,
         address: args.contracts.accountFactory,
-        abi: FactoryAbi,
+        abi: AAFactoryAbi,
         functionName: "deployProxySsoAccount",
         args: [
-            toHex(args.salt),
-            accountId,
-            [encodedPasskeyModuleData, encodedSessionKeyModuleData],
+            keccak256(toHex(accountId)),
+            [encodedPasskeyModuleData, encodedSessionKeyModuleData, encodedGuardianRecoveryModuleData],
             [],
         ],
     };
@@ -61,12 +63,21 @@ args) => {
     const transactionReceipt = await waitForTransactionReceipt(client, { hash: transactionHash });
     if (transactionReceipt.status !== "success")
         throw new Error("Account deployment transaction reverted");
-    const proxyAccountAddress = transactionReceipt.contractAddress;
-    if (!proxyAccountAddress) {
-        throw new Error("No contract address in transaction receipt");
-    }
+    const getAccountId = () => {
+        if (transactionReceipt.contractAddress) {
+            return transactionReceipt.contractAddress;
+        }
+        const accountCreatedEvent = parseEventLogs({ abi: AAFactoryAbi, logs: transactionReceipt.logs })
+            .find((log) => log && log.eventName === "AccountCreated");
+        if (!accountCreatedEvent) {
+            throw new Error("No contract address in transaction receipt");
+        }
+        const { accountAddress } = accountCreatedEvent.args;
+        return accountAddress;
+    };
+    const accountAddress = getAccountId();
     return {
-        address: getAddress(proxyAccountAddress),
+        address: getAddress(accountAddress),
         transactionReceipt: transactionReceipt,
     };
 };
@@ -81,8 +92,6 @@ args) => {
             throw new Error("Can't identify expectedOrigin, please provide it manually");
         }
     }
-    if (!args.contracts.accountFactory)
-        throw new Error("Account factory address is not set");
     if (!args.contracts.passkey)
         throw new Error("Passkey module address is not set");
     let username = args.uniqueAccountId;
@@ -104,29 +113,24 @@ args) => {
     }
     if (!username)
         throw new Error("No account found");
+    const credentialId = toHex(base64UrlToUint8Array(username));
     const accountAddress = await readContract(client, {
-        abi: parseAbi(["function accountMappings(string) view returns (address)"]),
-        address: args.contracts.accountFactory,
-        functionName: "accountMappings",
-        args: [username],
+        abi: WebAuthValidatorAbi,
+        address: args.contracts.passkey,
+        functionName: "registeredAddress",
+        args: [origin, credentialId],
     });
     if (!accountAddress || accountAddress == NULL_ADDRESS)
         throw new Error(`No account found for username: ${username}`);
-    const lowerKeyHalfBytes = await readContract(client, {
-        abi: parseAbi(["function lowerKeyHalf(string,address) view returns (bytes32)"]),
-        address: args.contracts.passkey,
-        functionName: "lowerKeyHalf",
-        args: [origin, accountAddress],
-    });
-    const upperKeyHalfBytes = await readContract(client, {
-        abi: parseAbi(["function upperKeyHalf(string,address) view returns (bytes32)"]),
+    const publicKey = await readContract(client, {
+        abi: WebAuthValidatorAbi,
         address: args.contracts.passkey,
-        functionName: "upperKeyHalf",
-        args: [origin, accountAddress],
+        functionName: "getAccountKey",
+        args: [origin, credentialId, accountAddress],
     });
-    if (!lowerKeyHalfBytes || !upperKeyHalfBytes)
+    if (!publicKey || !publicKey[0] || !publicKey[1])
         throw new Error(`Passkey credentials not found in on-chain module for passkey ${username}`);
-    const passkeyPublicKey = getPasskeySignatureFromPublicKeyBytes([lowerKeyHalfBytes, upperKeyHalfBytes]);
+    const passkeyPublicKey = getPasskeySignatureFromPublicKeyBytes(publicKey);
     return {
         username,
         address: accountAddress,

package/dist/_esm/client/passkey/actions/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../../src/client/passkey/actions/account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../../src/client/passkey/actions/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,UAAU,EAAuB,SAAS,EAAE,cAAc,EAAiB,KAAK,EAA2C,MAAM,MAAM,CAAC;AACtM,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,qCAAqC,EAAE,qCAAqC,EAAE,MAAM,2BAA2B,CAAC;AAyChJ,MAAM,YAAY,GAAG,4CAA4C,CAAC;AAElE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAKhC,MAAyC,EAAE,qCAAqC;AAChF,IAAiC,EACC,EAAE;IACpC,IAAI,MAAM,GAAuB,IAAI,CAAC,cAAc,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,qCAAqC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACzF,MAAM,wBAAwB,GAAG,6BAA6B,CAAC;QAC7D,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,gBAAgB;QAChB,cAAc,EAAE,MAAM;KACvB,CAAC,CAAC;IACH,MAAM,wBAAwB,GAAG,gBAAgB,CAAC;QAChD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;QAC/B,UAAU,EAAE,wBAAwB;KACrC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,IAAI,wBAAwB,CAAC;IAEnE,MAAM,2BAA2B,GAAG,gBAAgB,CAAC;QACnD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;QAC/B,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5E,CAAC,CAAC;IAEH,MAAM,iCAAiC,GAAG,gBAAgB,CAAC;QACzD,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ;QAChC,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,eAAe,GAAG;QACpB,OAAO,EAAE,MAAM,CAAC,OAAQ;QACxB,KAAK,EAAE,MAAM,CAAC,KAAM;QACpB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc;QACtC,GAAG,EAAE,YAAY;QACjB,YAAY,EAAE,uBAAuB;QACrC,IAAI,EAAE;YACJ,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC3B,CAAC,wBAAwB,EAAE,2BAA2B,EAAE,iCAAiC,CAAC;YAC1F,EAAE;SACH;KACK,CAAC;IAET,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,eAAe,GAAG;YAChB,GAAG,eAAe;YAClB,SAAS,EAAE,IAAI,CAAC,gBAAgB;YAChC,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,wBAAwB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;SACtF,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IACrE,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,yBAAyB,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC9F,IAAI,kBAAkB,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IACxG,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,kBAAkB,CAAC,eAAe,EAAE,CAAC;YACvC,OAAO,kBAAkB,CAAC,eAAe,CAAC;QAC5C,CAAC;QACD,MAAM,mBAAmB,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,kBAAkB,CAAC,IAAI,EAAE,CAAC;aAC7F,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC;QAE5D,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAC,IAAI,CAAC;QACpD,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,YAAY,EAAE,CAAC;IAEtC,OAAO;QACL,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC;QACnC,kBAAkB,EAAE,kBAAkB;KACvC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAK/B,MAAyC,EAAE,qCAAqC;AAChF,IAAgC,EACC,EAAE;IACnC,IAAI,MAAM,GAAuB,IAAI,CAAC,cAAc,CAAC;IACrD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAElF,IAAI,QAAQ,GAAuB,IAAI,CAAC,eAAe,CAAC;IACxD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC;gBACjD,SAAS,EAAE;oBACT,SAAS,EAAE,IAAI,UAAU,CAAC,EAAE,CAAC;oBAC7B,gBAAgB,EAAE,aAAa;iBAChC;aACF,CAA+B,CAAC;YAEjC,IAAI,CAAC,UAAU;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC3D,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE;QAChD,GAAG,EAAE,mBAAmB;QACxB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;QAC/B,YAAY,EAAE,mBAAmB;QACjC,IAAI,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,IAAI,cAAc,IAAI,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,QAAQ,EAAE,CAAC,CAAC;IAErH,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE;QAC3C,GAAG,EAAE,mBAAmB;QACxB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO;QAC/B,YAAY,EAAE,eAAe;QAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,cAAc,CAAC;KAC7C,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gEAAgE,QAAQ,EAAE,CAAC,CAAC;IAE9I,MAAM,gBAAgB,GAAG,qCAAqC,CAAC,SAAS,CAAC,CAAC;IAE1E,OAAO;QACL,QAAQ;QACR,OAAO,EAAE,cAAc;QACvB,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}

package/dist/_esm/client/passkey/actions/passkey.js

@@ -1,8 +1,12 @@
 import { startAuthentication, startRegistration } from "@simplewebauthn/browser";
 import { generateAuthenticationOptions, generateRegistrationOptions, verifyAuthenticationResponse, verifyRegistrationResponse } from "@simplewebauthn/server";
 import {} from "@simplewebauthn/types";
-import { toBytes } from "viem";
-import { writeContract } from "viem/actions";
+import { encodeFunctionData, toBytes, toHex } from "viem";
+import { waitForTransactionReceipt } from "viem/actions";
+import { getGeneralPaymasterInput, sendTransaction } from "viem/zksync";
+import { WebAuthValidatorAbi } from "../../../abi/WebAuthValidator.js";
+import { noThrow } from "../../../utils/helpers.js";
+import { base64UrlToUint8Array } from "../../../utils/passkey.js";
 const identifyPasskeyParams = () => {
     let rpName;
     let rpID;
@@ -110,14 +114,29 @@ export const requestPasskeyAuthentication = async (args) => {
     };
 };
 export const addAccountOwnerPasskey = async (client, args) => {
-    /* TODO: Implement set owner passkey */
-    const transactionHash = await writeContract(client, {
-        address: args.contracts.session,
-        args: [args.passkeyPublicKey],
-        abi: [],
-        functionName: "USE_ACTUAL_METHOD_HERE",
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const callData = encodeFunctionData({
+        abi: WebAuthValidatorAbi,
+        functionName: "addValidationKey",
+        args: [toHex(base64UrlToUint8Array(args.credentialId)), args.rawPublicKey, args.origin],
     });
-    return transactionHash;
+    const sendTransactionArgs = {
+        account: client.account,
+        to: args.contracts.passkey,
+        paymaster: args.paymaster?.address,
+        paymasterInput: args.paymaster?.address ? (args.paymaster?.paymasterInput || getGeneralPaymasterInput({ innerInput: "0x" })) : undefined,
+        data: callData,
+        gas: 10000000n, // TODO: Remove when gas estimation is fixed
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    };
+    const transactionHash = await sendTransaction(client, sendTransactionArgs);
+    if (args.onTransactionSent) {
+        noThrow(() => args.onTransactionSent?.(transactionHash));
+    }
+    const transactionReceipt = await waitForTransactionReceipt(client, { hash: transactionHash });
+    if (transactionReceipt.status !== "success")
+        throw new Error("addValidationKey transaction reverted");
+    return {
+        transactionReceipt,
+    };
 };
 //# sourceMappingURL=passkey.js.map

package/dist/_esm/client/passkey/actions/passkey.js.map

@@ -1 +1 @@
-{"version":3,"file":"passkey.js","sourceRoot":"","sources":["../../../../../src/client/passkey/actions/passkey.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"passkey.js","sourceRoot":"","sources":["../../../../../src/client/passkey/actions/passkey.ts"],"names":[],"mappings":"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"}

package/dist/_esm/client/passkey/client.js

@@ -19,7 +19,7 @@ export function createZksyncPasskeyClient(_parameters) {
                 challenge: hash,
                 credentialPublicKey: parameters.credentialPublicKey,
             });
-            return passkeyHashSignatureResponseFormat(passkeySignature.passkeyAuthenticationResponse.response, parameters.contracts);
+            return passkeyHashSignatureResponseFormat(passkeySignature.passkeyAuthenticationResponse.id, passkeySignature.passkeyAuthenticationResponse.response, parameters.contracts);
         },
     });
     const client = createClient({

package/dist/_esm/client/passkey/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/passkey/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,YAAY,EAAE,UAAU,EAAqC,aAAa,EAA4E,aAAa,EAAiD,MAAM,MAAM,CAAC;AAC/R,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,kCAAkC,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAgC,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAEvE,MAAM,UAAU,yBAAyB,CAIvC,WAAsE;IAEtE,MAAM,UAAU,GAGZ;QACF,GAAG,WAAW;QACd,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,EAAE,WAAW,CAAC,GAAG,IAAI,2BAA2B;QACnD,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,2BAA2B;KACtD,CAAC;IAEF,MAAM,OAAO,GAAG,gBAAgB,CAAC;QAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,gBAAgB,GAAG,MAAM,4BAA4B,CAAC;gBAC1D,SAAS,EAAE,IAAI;gBACf,mBAAmB,EAAE,UAAU,CAAC,mBAAmB;aACpD,CAAC,CAAC;YAEH,OAAO,kCAAkC,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3H,CAAC;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,YAAY,CAAuC;QAChE,GAAG,UAAU;QACb,OAAO;QACP,IAAI,EAAE,cAAc;KACrB,CAAC;SACC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACb,mBAAmB,EAAE,UAAU,CAAC,mBAAmB;QACnD,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,eAAe,EAAE,UAAU,CAAC,eAAe;QAC3C,SAAS,EAAE,UAAU,CAAC,SAAS;KAChC,CAAC,CAAC;SACF,MAAM,CAAC,aAAa,CAAC;SACrB,MAAM,CAAC,aAAa,CAAC;SACrB,MAAM,CAAC,mBAAmB,EAAE,CAAC;SAC7B,MAAM,CAAC,uBAAuB,CAAC;SAC/B,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/client/passkey/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,YAAY,EAAE,UAAU,EAAqC,aAAa,EAA4E,aAAa,EAAiD,MAAM,MAAM,CAAC;AAC/R,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGlD,OAAO,EAAE,kCAAkC,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAgC,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAEvE,MAAM,UAAU,yBAAyB,CAIvC,WAAsE;IAEtE,MAAM,UAAU,GAGZ;QACF,GAAG,WAAW;QACd,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,EAAE,WAAW,CAAC,GAAG,IAAI,2BAA2B;QACnD,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,2BAA2B;KACtD,CAAC;IAEF,MAAM,OAAO,GAAG,gBAAgB,CAAC;QAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,MAAM,gBAAgB,GAAG,MAAM,4BAA4B,CAAC;gBAC1D,SAAS,EAAE,IAAI;gBACf,mBAAmB,EAAE,UAAU,CAAC,mBAAmB;aACpD,CAAC,CAAC;YAEH,OAAO,kCAAkC,CACvC,gBAAgB,CAAC,6BAA6B,CAAC,EAAE,EACjD,gBAAgB,CAAC,6BAA6B,CAAC,QAAQ,EACvD,UAAU,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,YAAY,CAAuC;QAChE,GAAG,UAAU;QACb,OAAO;QACP,IAAI,EAAE,cAAc;KACrB,CAAC;SACC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACb,mBAAmB,EAAE,UAAU,CAAC,mBAAmB;QACnD,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,eAAe,EAAE,UAAU,CAAC,eAAe;QAC3C,SAAS,EAAE,UAAU,CAAC,SAAS;KAChC,CAAC,CAAC;SACF,MAAM,CAAC,aAAa,CAAC;SACrB,MAAM,CAAC,aAAa,CAAC;SACrB,MAAM,CAAC,mBAAmB,EAAE,CAAC;SAC7B,MAAM,CAAC,uBAAuB,CAAC;SAC/B,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/_esm/client/passkey/decorators/passkey.js

@@ -1,4 +1,5 @@
 import {} from "viem";
+import { confirmGuardian, proposeGuardian, removeGuardian, } from "../../recovery/actions/recovery.js";
 import { createSession, revokeSession, } from "../../session/actions/session.js";
 export function zksyncSsoPasskeyActions(client) {
     return {
@@ -14,6 +15,24 @@ export function zksyncSsoPasskeyActions(client) {
                 contracts: client.contracts,
             });
         },
+        proposeGuardian: async (args) => {
+            return await proposeGuardian(client, {
+                ...args,
+                contracts: client.contracts,
+            });
+        },
+        confirmGuardian: async (args) => {
+            return await confirmGuardian(client, {
+                ...args,
+                contracts: client.contracts,
+            });
+        },
+        removeGuardian: async (args) => {
+            return await removeGuardian(client, {
+                ...args,
+                contracts: client.contracts,
+            });
+        },
     };
 }
 //# sourceMappingURL=passkey.js.map

package/dist/_esm/client/passkey/decorators/passkey.js.map

@@ -1 +1 @@
-{"version":3,"file":"passkey.js","sourceRoot":"","sources":["../../../../../src/client/passkey/decorators/passkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,MAAM,MAAM,CAAC;AAElD,OAAO,EACL,aAAa,EACb,aAAa,GACd,MAAM,kCAAkC,CAAC;AAQ1C,MAAM,UAAU,uBAAuB,CAGrC,MAAwD;IACxD,OAAO;QACL,aAAa,EAAE,KAAK,EAAE,IAA0C,EAAE,EAAE;YAClE,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;gBACjC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAA0C,EAAE,EAAE;YAClE,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;gBACjC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"passkey.js","sourceRoot":"","sources":["../../../../../src/client/passkey/decorators/passkey.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,MAAM,MAAM,CAAC;AAElD,OAAO,EACL,eAAe,EACf,eAAe,EACf,cAAc,GACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,aAAa,GACd,MAAM,kCAAkC,CAAC;AAW1C,MAAM,UAAU,uBAAuB,CAGrC,MAAwD;IACxD,OAAO;QACL,aAAa,EAAE,KAAK,EAAE,IAA0C,EAAE,EAAE;YAClE,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;gBACjC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,IAA0C,EAAE,EAAE;YAClE,OAAO,MAAM,aAAa,CAAC,MAAM,EAAE;gBACjC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,eAAe,EAAE,KAAK,EAAE,IAA4C,EAAE,EAAE;YACtE,OAAO,MAAM,eAAe,CAAC,MAAM,EAAE;gBACnC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,eAAe,EAAE,KAAK,EAAE,IAA4C,EAAE,EAAE;YACtE,OAAO,MAAM,eAAe,CAAC,MAAM,EAAE;gBACnC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,cAAc,EAAE,KAAK,EAAE,IAA2C,EAAE,EAAE;YACpE,OAAO,MAAM,cAAc,CAAC,MAAM,EAAE;gBAClC,GAAG,IAAI;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;aAC5B,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/_esm/client/passkey/decorators/wallet.js

@@ -1,6 +1,7 @@
 import { bytesToHex, formatTransaction } from "viem";
 import { deployContract, getAddresses, getChainId, sendRawTransaction, signMessage, signTypedData, writeContract } from "viem/actions";
 import { signTransaction } from "viem/zksync";
+import { getTransactionWithPaymasterData } from "../../../paymaster/index.js";
 import { sendEip712Transaction } from "../../session/actions/sendEip712Transaction.js";
 export function zksyncSsoPasskeyWalletActions(client) {
     return {
@@ -20,17 +21,25 @@ export function zksyncSsoPasskeyWalletActions(client) {
                 unformattedTx.paymasterInput = eip712Meta.paymasterParams?.paymasterInput ? bytesToHex(new Uint8Array(eip712Meta.paymasterParams?.paymasterInput)) : undefined;
                 delete unformattedTx.eip712Meta;
             }
+            /* eslint-disable @typescript-eslint/no-unused-vars */
+            const { chainId: _, ...unformattedTxWithPaymaster } = await getTransactionWithPaymasterData(client.chain.id, client.account.address, unformattedTx, client.paymasterHandler);
             const formatters = client.chain?.formatters;
             const format = formatters?.transaction?.format || formatTransaction;
             const tx = {
-                ...format(unformattedTx),
+                ...format(unformattedTxWithPaymaster),
                 type: "eip712",
             };
             return await sendEip712Transaction(client, tx);
         },
         signMessage: (args) => signMessage(client, args),
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        signTransaction: (args) => signTransaction(client, args),
+        signTransaction: async (args) => {
+            /* eslint-disable @typescript-eslint/no-unused-vars */
+            const { chainId: _, ...unformattedTxWithPaymaster } = await getTransactionWithPaymasterData(client.chain.id, client.account.address, args, client.paymasterHandler);
+            return signTransaction(client, {
+                ...args,
+                unformattedTxWithPaymaster,
+            });
+        },
         signTypedData: (args) => signTypedData(client, args),
         writeContract: (args) => writeContract(client, args),
     };

package/dist/_esm/client/passkey/decorators/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../../src/client/passkey/decorators/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAc,iBAAiB,EAAsC,MAAM,MAAM,CAAC;AACnH,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACvI,OAAO,EAAE,eAAe,EAAyB,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AAOvF,MAAM,UAAU,6BAA6B,CAI3C,MAAwD;IACxD,OAAO;QACL,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC;QACtD,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;QACxC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QACpC,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC;QAC9D,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC9B,8DAA8D;YAC9D,MAAM,aAAa,GAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAEnD,IAAI,YAAY,IAAI,aAAa,EAAE,CAAC;gBAClC,MAAM,UAAU,GAAG,aAAa,CAAC,UAA8B,CAAC;gBAChE,aAAa,CAAC,aAAa,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACtG,aAAa,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;gBACnD,aAAa,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;gBAC3D,aAAa,CAAC,SAAS,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC;gBAChE,aAAa,CAAC,cAAc,GAAG,UAAU,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC/J,OAAO,aAAa,CAAC,UAAU,CAAC;YAClC,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC;YAC5C,MAAM,MAAM,GAAG,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,iBAAiB,CAAC;YAEpE,MAAM,EAAE,GAAG;gBACT,GAAG,MAAM,CAAC,aAAa,CAAC;gBACxB,IAAI,EAAE,QAAQ;aACf,CAAC;YAEF,OAAO,MAAM,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC;QAChD,8DAA8D;QAC9D,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,IAAW,CAAC;QAC/D,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC;QACpD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC;KACrD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../../src/client/passkey/decorators/wallet.ts"],"names":[],"mappings":"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"}

package/dist/_esm/client/recovery/account.js

@@ -0,0 +1,43 @@
+import { hashMessage, hashTypedData } from "viem";
+import { toAccount } from "viem/accounts";
+import { serializeTransaction } from "viem/zksync";
+import { getEip712Domain } from "../utils/getEip712Domain.js";
+export function toRecoveryAccount(parameters) {
+    const { address, signTransaction } = parameters;
+    const account = toAccount({
+        address,
+        async signTransaction(transaction) {
+            const signableTransaction = {
+                ...transaction,
+                from: this.address,
+                type: "eip712",
+            };
+            const eip712DomainAndMessage = getEip712Domain(signableTransaction);
+            const digest = hashTypedData(eip712DomainAndMessage);
+            return serializeTransaction({
+                ...signableTransaction,
+                customSignature: await signTransaction({
+                    hash: digest,
+                }),
+            });
+        },
+        async sign({ hash }) {
+            return signTransaction({ hash });
+        },
+        async signMessage({ message }) {
+            return signTransaction({
+                hash: hashMessage(message),
+            });
+        },
+        async signTypedData(typedData) {
+            return signTransaction({
+                hash: hashTypedData(typedData),
+            });
+        },
+    });
+    return {
+        ...account,
+        source: "ssoRecoveryAccount",
+    };
+}
+//# sourceMappingURL=account.js.map

package/dist/_esm/client/recovery/account.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../../src/client/recovery/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,WAAW,EAAE,aAAa,EAA+B,MAAM,MAAM,CAAC;AAC7G,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAA4C,MAAM,aAAa,CAAC;AAE7F,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAY9D,MAAM,UAAU,iBAAiB,CAC/B,UAAuC;IAEvC,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;IAEhD,MAAM,OAAO,GAAG,SAAS,CAAC;QACxB,OAAO;QACP,KAAK,CAAC,eAAe,CAAC,WAAW;YAC/B,MAAM,mBAAmB,GAAG;gBAC1B,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,CAAC,OAAQ;gBACnB,IAAI,EAAE,QAAQ;aACwB,CAAC;YAEzC,MAAM,sBAAsB,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC;YACpE,MAAM,MAAM,GAAG,aAAa,CAAC,sBAAsB,CAAC,CAAC;YAErD,OAAO,oBAAoB,CAAC;gBAC1B,GAAG,mBAAmB;gBACtB,eAAe,EAAE,MAAM,eAAe,CAAC;oBACrC,IAAI,EAAE,MAAM;iBACb,CAAC;aACH,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACnC,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,eAAe,CAAC;gBACrB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,eAAe,CAAC;gBACrB,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC;aAC/B,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,oBAAoB;KACV,CAAC;AACvB,CAAC"}

package/dist/_esm/client/recovery/actions/recovery.js

@@ -0,0 +1,111 @@
+import { encodeFunctionData, keccak256, toHex } from "viem";
+import { waitForTransactionReceipt } from "viem/actions";
+import { getGeneralPaymasterInput, sendTransaction } from "viem/zksync";
+import { GuardianRecoveryModuleAbi } from "../../../abi/GuardianRecoveryModule.js";
+import { noThrow } from "../../../utils/helpers.js";
+export const proposeGuardian = async (client, args) => {
+    let origin = args.origin;
+    if (!origin) {
+        try {
+            origin = window.location.origin;
+        }
+        catch {
+            throw new Error("Can't identify expectedOrigin, please provide it manually");
+        }
+    }
+    const callData = encodeFunctionData({
+        abi: GuardianRecoveryModuleAbi,
+        functionName: "proposeGuardian",
+        args: [keccak256(toHex(origin)), args.newGuardian],
+    });
+    const sendTransactionArgs = {
+        account: client.account,
+        to: args.contracts.recovery,
+        paymaster: args.paymaster?.address,
+        paymasterInput: args.paymaster?.address ? (args.paymaster?.paymasterInput || getGeneralPaymasterInput({ innerInput: "0x" })) : undefined,
+        data: callData,
+        gas: 10000000n, // TODO: Remove when gas estimation is fixed
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    };
+    const transactionHash = await sendTransaction(client, sendTransactionArgs);
+    if (args.onTransactionSent) {
+        noThrow(() => args.onTransactionSent?.(transactionHash));
+    }
+    const transactionReceipt = await waitForTransactionReceipt(client, { hash: transactionHash });
+    if (transactionReceipt.status !== "success")
+        throw new Error("proposeGuardian transaction reverted");
+    return {
+        transactionReceipt,
+    };
+};
+export const confirmGuardian = async (client, args) => {
+    let origin = args.origin;
+    if (!origin) {
+        try {
+            origin = window.location.origin;
+        }
+        catch {
+            throw new Error("Can't identify expectedOrigin, please provide it manually");
+        }
+    }
+    const callData = encodeFunctionData({
+        abi: GuardianRecoveryModuleAbi,
+        functionName: "addGuardian",
+        args: [keccak256(toHex(origin)), args.accountToGuard],
+    });
+    const sendTransactionArgs = {
+        account: client.account,
+        to: args.contracts.recovery,
+        paymaster: args.paymaster?.address,
+        paymasterInput: args.paymaster?.address ? (args.paymaster?.paymasterInput || getGeneralPaymasterInput({ innerInput: "0x" })) : undefined,
+        data: callData,
+        gas: 10000000n, // TODO: Remove when gas estimation is fixed
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    };
+    const transactionHash = await sendTransaction(client, sendTransactionArgs);
+    if (args.onTransactionSent) {
+        noThrow(() => args.onTransactionSent?.(transactionHash));
+    }
+    const transactionReceipt = await waitForTransactionReceipt(client, { hash: transactionHash });
+    if (transactionReceipt.status !== "success")
+        throw new Error("confirmGuardian transaction reverted");
+    return {
+        transactionReceipt,
+    };
+};
+export const removeGuardian = async (client, args) => {
+    let origin = args.origin;
+    if (!origin) {
+        try {
+            origin = window.location.origin;
+        }
+        catch {
+            throw new Error("Can't identify expectedOrigin, please provide it manually");
+        }
+    }
+    const callData = encodeFunctionData({
+        abi: GuardianRecoveryModuleAbi,
+        functionName: "removeGuardian",
+        args: [keccak256(toHex(origin)), args.guardian],
+    });
+    const sendTransactionArgs = {
+        account: client.account,
+        to: args.contracts.recovery,
+        paymaster: args.paymaster?.address,
+        paymasterInput: args.paymaster?.address ? (args.paymaster?.paymasterInput || getGeneralPaymasterInput({ innerInput: "0x" })) : undefined,
+        data: callData,
+        gas: 10000000n, // TODO: Remove when gas estimation is fixed
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    };
+    const transactionHash = await sendTransaction(client, sendTransactionArgs);
+    if (args.onTransactionSent) {
+        noThrow(() => args.onTransactionSent?.(transactionHash));
+    }
+    const transactionReceipt = await waitForTransactionReceipt(client, { hash: transactionHash });
+    if (transactionReceipt.status !== "success")
+        throw new Error("removeGuardian transaction reverted");
+    return {
+        transactionReceipt,
+    };
+};
+//# sourceMappingURL=recovery.js.map

package/dist/_esm/client/recovery/actions/recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../../../src/client/recovery/actions/recovery.ts"],"names":[],"mappings":"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"}