@crossmint/client-sdk-smart-wallet 0.1.0 → 0.1.2

package/package.json

@@ -1,46 +1,47 @@
 {
-    "name": "@crossmint/client-sdk-smart-wallet",
-    "version": "0.1.0",
-    "repository": "https://github.com/Crossmint/crossmint-sdk",
-    "license": "Apache-2.0",
-    "author": "Paella Labs Inc",
-    "sideEffects": false,
-    "type": "module",
-    "exports": {
-        "import": "./dist/index.js",
-        "require": "./dist/index.cjs"
-    },
-    "main": "./dist/index.cjs",
-    "module": "./dist/index.js",
-    "types": "./dist/index.d.ts",
-    "files": [
-        "dist",
-        "src",
-        "LICENSE"
-    ],
-    "scripts": {
-        "build": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --minify --dts --sourcemap",
-        "build-no-minify": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --dts --sourcemap",
-        "dev": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --dts --sourcemap --watch",
-        "link:common-sdk-base": "yalc add @crossmint/common-sdk-base && yalc link @crossmint/common-sdk-base && pnpm i && pnpm build && yalc push",
-        "test": "cross-env NODE_ENV=test jest",
-        "test-coverage": "cross-env NODE_ENV=test jest --coverage",
-        "unlink:common-sdk-base": "yalc remove @crossmint/common-sdk-base && pnpm i"
-    },
-    "dependencies": {
-        "@crossmint/common-sdk-base": "0.0.13",
-        "@datadog/browser-logs": "4.42.2",
-        "@zerodev/ecdsa-validator": "5.3.1",
-        "@zerodev/passkey-validator": "5.4.0",
-        "@zerodev/sdk": "5.3.3",
-        "@zerodev/webauthn-key": "5.3.1",
-        "permissionless": "0.1.36",
-        "uuid": "10.0.0",
-        "viem": "2.17.5"
-    },
-    "devDependencies": {
-        "@playwright/test": "^1.41.2",
-        "@types/node": "20.12.7",
-        "@types/uuid": "10.0.0"
-    }
-}
+  "name": "@crossmint/client-sdk-smart-wallet",
+  "version": "0.1.2",
+  "repository": "https://github.com/Crossmint/crossmint-sdk",
+  "license": "Apache-2.0",
+  "author": "Paella Labs Inc",
+  "sideEffects": false,
+  "type": "module",
+  "exports": {
+    "import": "./dist/index.js",
+    "require": "./dist/index.cjs"
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "@datadog/browser-logs": "4.42.2",
+    "@zerodev/ecdsa-validator": "5.3.1",
+    "@zerodev/passkey-validator": "5.4.0",
+    "@zerodev/sdk": "5.3.3",
+    "@zerodev/webauthn-key": "5.3.1",
+    "permissionless": "0.1.36",
+    "uuid": "10.0.0",
+    "viem": "2.17.5",
+    "@crossmint/common-sdk-base": "0.1.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.41.2",
+    "@types/node": "20.12.7",
+    "@types/uuid": "10.0.0"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --minify --dts --sourcemap",
+    "build-no-minify": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --dts --sourcemap",
+    "dev": "tsup src/index.ts --clean --format esm,cjs --outDir ./dist --dts --sourcemap --watch",
+    "link:common-sdk-base": "yalc add @crossmint/common-sdk-base && yalc link @crossmint/common-sdk-base && pnpm i && pnpm build && yalc push",
+    "test": "cross-env NODE_ENV=test jest",
+    "test-coverage": "cross-env NODE_ENV=test jest --coverage",
+    "test:starter": "pnpm run build && pnpm --filter @crossmint/client-sdk-smart-wallet-react-starter exec playwright test",
+    "unlink:common-sdk-base": "yalc remove @crossmint/common-sdk-base && pnpm i"
+  }
+}

package/src/SmartWalletSDK.ts

@@ -1,8 +1,9 @@
 import { stringify } from "viem";
 
-import { EVMBlockchainIncludingTestnet, validateAPIKey } from "@crossmint/common-sdk-base";
+import { validateAPIKey } from "@crossmint/common-sdk-base";
 
 import { CrossmintWalletService } from "./api/CrossmintWalletService";
+import { SmartWalletChain } from "./blockchain/chains";
 import type { EVMSmartWallet } from "./blockchain/wallets";
 import { ClientDecorator } from "./blockchain/wallets/clientDecorator";
 import { SmartWalletService } from "./blockchain/wallets/service";
@@ -54,7 +55,7 @@ export class SmartWalletSDK extends LoggerWrapper {
      */
     async getOrCreateWallet(
         user: UserParams,
-        chain: EVMBlockchainIncludingTestnet,
+        chain: SmartWalletChain,
         walletParams: WalletParams = { signer: { type: "PASSKEY" } }
     ): Promise<EVMSmartWallet> {
         return logPerformance(

package/src/api/APIErrorService.ts

@@ -64,6 +64,9 @@ export class APIErrorService {
                 throw new CrossmintServiceError(body.message, response.status);
             }
         } catch (e) {
+            if (e instanceof SmartWalletSDKError) {
+                throw e;
+            }
             console.error("Error parsing response", e);
         }
 

package/src/api/CrossmintWalletService.ts

@@ -1,13 +1,10 @@
+import { SmartWalletChain } from "@/blockchain/chains";
 import { SignerData, StoreSmartWalletParams } from "@/types/API";
 import type { UserParams } from "@/types/Config";
 import { API_VERSION } from "@/utils/constants";
 
-import type { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
-
 import { BaseCrossmintService } from "./BaseCrossmintService";
 
-export { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
-
 export class CrossmintWalletService extends BaseCrossmintService {
     async idempotentCreateSmartWallet(user: UserParams, input: StoreSmartWalletParams) {
         return this.fetchCrossmintAPI(
@@ -20,7 +17,7 @@ export class CrossmintWalletService extends BaseCrossmintService {
 
     async getSmartWalletConfig(
         user: UserParams,
-        chain: EVMBlockchainIncludingTestnet
+        chain: SmartWalletChain
     ): Promise<{
         kernelVersion: string;
         entryPointVersion: string;
@@ -36,7 +33,7 @@ export class CrossmintWalletService extends BaseCrossmintService {
         );
     }
 
-    async fetchNFTs(address: string, chain: EVMBlockchainIncludingTestnet) {
+    async fetchNFTs(address: string, chain: SmartWalletChain) {
         return this.fetchCrossmintAPI(
             `v1-alpha1/wallets/${chain}:${address}/nfts`,
             { method: "GET" },

package/src/blockchain/chains.ts

@@ -0,0 +1,43 @@
+import { BUNDLER_RPC } from "@/utils/constants";
+import { Chain, base, baseSepolia, polygon, polygonAmoy } from "viem/chains";
+
+import { BlockchainIncludingTestnet as Blockchain, ObjectValues, objectValues } from "@crossmint/common-sdk-base";
+
+export const SmartWalletTestnet = {
+    BASE_SEPOLIA: Blockchain.BASE_SEPOLIA,
+    POLYGON_AMOY: Blockchain.POLYGON_AMOY,
+} as const;
+export type SmartWalletTestnet = ObjectValues<typeof SmartWalletTestnet>;
+export const SMART_WALLET_TESTNETS = objectValues(SmartWalletTestnet);
+
+export const SmartWalletMainnet = {
+    BASE: Blockchain.BASE,
+    POLYGON: Blockchain.POLYGON,
+} as const;
+export type SmartWalletMainnet = ObjectValues<typeof SmartWalletMainnet>;
+export const SMART_WALLET_MAINNETS = objectValues(SmartWalletMainnet);
+
+export const SmartWalletChain = {
+    ...SmartWalletTestnet,
+    ...SmartWalletMainnet,
+} as const;
+export type SmartWalletChain = ObjectValues<typeof SmartWalletChain>;
+export const SMART_WALLET_CHAINS = objectValues(SmartWalletChain);
+
+export const zerodevProjects: Record<SmartWalletChain, string> = {
+    polygon: "5c9f4865-ca8e-44bb-9b9e-3810b2b46f9f",
+    "polygon-amoy": "3deef404-ca06-4a5d-9a58-907c99e7ef00",
+    "base-sepolia": "5a127978-6473-4784-9dfb-f74395b220a6",
+    base: "e8b3020f-4dde-4176-8a7d-be8102527a5c",
+};
+
+export const viemNetworks: Record<SmartWalletChain, Chain> = {
+    polygon: polygon,
+    "polygon-amoy": polygonAmoy,
+    base: base,
+    "base-sepolia": baseSepolia,
+};
+
+export const getBundlerRPC = (chain: SmartWalletChain) => {
+    return BUNDLER_RPC + zerodevProjects[chain];
+};

package/src/blockchain/wallets/EVMSmartWallet.ts

@@ -1,14 +1,13 @@
 import { logError } from "@/services/logging";
 import { type HttpTransport, type PublicClient, isAddress, publicActions } from "viem";
 
-import { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
-
 import type { CrossmintWalletService } from "../../api/CrossmintWalletService";
 import { TransferError } from "../../error";
 import type { TransferType } from "../../types/Tokens";
 import { SmartWalletClient } from "../../types/internal";
 import { SCW_SERVICE } from "../../utils/constants";
 import { LoggerWrapper, errorToJSON } from "../../utils/log";
+import { SmartWalletChain } from "../chains";
 import { transferParams } from "../transfer";
 
 /**
@@ -16,7 +15,7 @@ import { transferParams } from "../transfer";
  * Core functionality is exposed via [viem](https://viem.sh/) clients within the `client` property of the class.
  */
 export class EVMSmartWallet extends LoggerWrapper {
-    public readonly chain: EVMBlockchainIncludingTestnet;
+    public readonly chain: SmartWalletChain;
 
     /**
      * [viem](https://viem.sh/) clients that provide an interface for core wallet functionality.
@@ -37,7 +36,7 @@ export class EVMSmartWallet extends LoggerWrapper {
         private readonly crossmintService: CrossmintWalletService,
         private readonly accountClient: SmartWalletClient,
         publicClient: PublicClient<HttpTransport>,
-        chain: EVMBlockchainIncludingTestnet
+        chain: SmartWalletChain
     ) {
         super("EVMSmartWallet", { chain, address: accountClient.account.address });
         this.chain = chain;

package/src/blockchain/wallets/clientDecorator.ts

@@ -7,7 +7,7 @@ import type { SmartAccountClient } from "permissionless";
 import type { EntryPoint } from "permissionless/types/entrypoint";
 import { stringify } from "viem";
 
-import { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
+import { SmartWalletChain } from "../chains";
 
 const transactionMethods = [
     "sendTransaction",
@@ -44,7 +44,7 @@ export class ClientDecorator {
         crossmintChain,
         smartAccountClient,
     }: {
-        crossmintChain: EVMBlockchainIncludingTestnet;
+        crossmintChain: SmartWalletChain;
         smartAccountClient: Client;
     }): Client {
         return new Proxy(smartAccountClient, {
@@ -73,7 +73,7 @@ export class ClientDecorator {
         // eslint-disable-next-line @typescript-eslint/ban-types
         originalMethod: Function,
         args: any[],
-        crossmintChain: EVMBlockchainIncludingTestnet
+        crossmintChain: SmartWalletChain
     ) {
         try {
             logInfo(`[CrossmintSmartWallet.${prop}] - params: ${stringify(args)}`);
@@ -88,7 +88,7 @@ export class ClientDecorator {
         }
     }
 
-    private processTxnArgs(prop: TxnMethod, crossmintChain: EVMBlockchainIncludingTestnet, args: any[]): any[] {
+    private processTxnArgs(prop: TxnMethod, crossmintChain: SmartWalletChain, args: any[]): any[] {
         if (prop === "sendUserOperation") {
             const [{ userOperation, middleware, account }] = args as Parameters<
                 SmartAccountClient<EntryPoint>["sendUserOperation"]
@@ -115,7 +115,7 @@ export class ClientDecorator {
      * https://docs.zerodev.app/sdk/faqs/use-with-gelato#transaction-configuration
      */
     private addGelatoBundlerProperties(
-        crossmintChain: EVMBlockchainIncludingTestnet,
+        crossmintChain: SmartWalletChain,
         txnParams: { maxFeePerGas?: bigint; maxPriorityFeePerGas?: bigint }
     ) {
         if (usesGelatoBundler(crossmintChain)) {

package/src/blockchain/wallets/passkey.ts

@@ -3,11 +3,17 @@ import { type PasskeySignerData, displayPasskey } from "@/types/API";
 import type { PasskeySigner, UserParams, WalletParams } from "@/types/Config";
 import type { AccountAndSigner, PasskeyValidatorSerializedData, WalletCreationParams } from "@/types/internal";
 import { PasskeyValidatorContractVersion, WebAuthnMode, toPasskeyValidator } from "@zerodev/passkey-validator";
-import { type KernelValidator, createKernelAccount } from "@zerodev/sdk";
-import { WebAuthnKey, toWebAuthnKey } from "@zerodev/webauthn-key";
+import { type KernelSmartAccount, type KernelValidator, createKernelAccount } from "@zerodev/sdk";
+import { type WebAuthnKey, toWebAuthnKey } from "@zerodev/webauthn-key";
+import type { SmartAccount } from "permissionless/accounts";
 import type { EntryPoint } from "permissionless/types/entrypoint";
 
-import { PasskeyMismatchError } from "../../error";
+import {
+    PasskeyIncompatibleAuthenticatorError,
+    PasskeyMismatchError,
+    PasskeyPromptError,
+    PasskeyRegistrationError,
+} from "../../error";
 
 export interface PasskeyWalletParams extends WalletCreationParams {
     walletParams: WalletParams & { signer: PasskeySigner };
@@ -20,7 +26,6 @@ export function isPasskeyParams(params: WalletCreationParams): params is Passkey
 type PasskeyValidator = KernelValidator<EntryPoint, "WebAuthnValidator"> & {
     getSerializedData: () => string;
 };
-
 export class PasskeyAccountService {
     constructor(private readonly crossmintService: CrossmintWalletService) {}
 
@@ -36,28 +41,32 @@ export class PasskeyAccountService {
             );
         }
 
-        const passkey = await this.getPasskey(user, inputPasskeyName, existingSignerConfig);
-
-        const latestValidatorVersion = PasskeyValidatorContractVersion.V0_0_2;
-        const validatorContractVersion =
-            existingSignerConfig == null ? latestValidatorVersion : existingSignerConfig.validatorContractVersion;
-        const validator = await toPasskeyValidator(publicClient, {
-            webAuthnKey: passkey,
-            entryPoint: entryPoint.address,
-            validatorContractVersion,
-            kernelVersion,
-        });
+        try {
+            const passkey = await this.getPasskey(user, inputPasskeyName, existingSignerConfig);
+
+            const latestValidatorVersion = PasskeyValidatorContractVersion.V0_0_2;
+            const validatorContractVersion =
+                existingSignerConfig == null ? latestValidatorVersion : existingSignerConfig.validatorContractVersion;
+            const validator = await toPasskeyValidator(publicClient, {
+                webAuthnKey: passkey,
+                entryPoint: entryPoint.address,
+                validatorContractVersion,
+                kernelVersion,
+            });
+
+            const kernelAccount = await createKernelAccount(publicClient, {
+                plugins: { sudo: validator },
+                entryPoint: entryPoint.address,
+                kernelVersion,
+            });
 
-        const kernelAccount = await createKernelAccount(publicClient, {
-            plugins: { sudo: validator },
-            entryPoint: entryPoint.address,
-            kernelVersion,
-        });
-
-        return {
-            signerData: this.getSignerData(validator, validatorContractVersion, inputPasskeyName),
-            account: kernelAccount,
-        };
+            return {
+                signerData: this.getSignerData(validator, validatorContractVersion, inputPasskeyName),
+                account: this.decorate(kernelAccount, inputPasskeyName),
+            };
+        } catch (error) {
+            throw this.mapError(error, inputPasskeyName);
+        }
     }
 
     private async getPasskey(
@@ -102,6 +111,52 @@ export class PasskeyAccountService {
             Authorization: `Bearer ${user.jwt}`,
         };
     }
+
+    private mapError(error: any, passkeyName: string) {
+        if (error.code === 0 && error.name === "DataError") {
+            return new PasskeyIncompatibleAuthenticatorError(passkeyName);
+        }
+
+        if (error.message === "Registration not verified") {
+            return new PasskeyRegistrationError(passkeyName);
+        }
+
+        if (error.code === "ERROR_PASSTHROUGH_SEE_CAUSE_PROPERTY" && error.name === "NotAllowedError") {
+            return new PasskeyPromptError(passkeyName);
+        }
+
+        return error;
+    }
+
+    private decorate<Account extends KernelSmartAccount<EntryPoint>>(account: Account, passkeyName: string): Account {
+        return new Proxy(account, {
+            get: (target, prop, receiver) => {
+                const original = Reflect.get(target, prop, receiver);
+                if (typeof original !== "function" || typeof prop !== "string" || !isAccountSigningMethod(prop)) {
+                    return original;
+                }
+
+                return async (...args: any[]) => {
+                    try {
+                        return await original.call(target, ...args);
+                    } catch (error) {
+                        throw this.mapError(error, passkeyName);
+                    }
+                };
+            },
+        });
+    }
+}
+
+const accountSigningMethods = [
+    "signMessage",
+    "signTypedData",
+    "signUserOperation",
+    "signTransaction",
+] as const satisfies readonly (keyof SmartAccount<EntryPoint>)[];
+
+function isAccountSigningMethod(method: string): method is (typeof accountSigningMethods)[number] {
+    return accountSigningMethods.includes(method as any);
 }
 
 const deserializePasskeyValidatorData = (params: string) => {

package/src/blockchain/wallets/paymaster.ts

@@ -1,27 +1,18 @@
-import { PAYMASTER_RPC, PM_BASE_RPC, PM_BASE_SEPOLIA_RPC } from "@/utils/constants";
+import { PAYMASTER_RPC } from "@/utils/constants";
 import { createZeroDevPaymasterClient } from "@zerodev/sdk";
 import { Middleware } from "permissionless/actions/smartAccount";
 import { EntryPoint } from "permissionless/types/entrypoint";
 import { http } from "viem";
 
-import { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
-
 import { usesGelatoBundler } from "../../utils/blockchain";
-import { getViemNetwork, getZeroDevProjectIdByBlockchain } from "../BlockchainNetworks";
+import { SmartWalletChain, viemNetworks, zerodevProjects } from "../chains";
 
-export function usePaymaster(chain: EVMBlockchainIncludingTestnet) {
+export function usePaymaster(chain: SmartWalletChain) {
     return !usesGelatoBundler(chain);
 }
 
-const getPaymasterRPC = (chain: EVMBlockchainIncludingTestnet) => {
-    switch (chain) {
-        case EVMBlockchainIncludingTestnet.BASE_SEPOLIA:
-            return PM_BASE_SEPOLIA_RPC;
-        case EVMBlockchainIncludingTestnet.BASE:
-            return PM_BASE_RPC;
-        default:
-            return PAYMASTER_RPC + getZeroDevProjectIdByBlockchain(chain) + "?paymasterProvider=STACKUP";
-    }
+const getPaymasterRPC = (chain: SmartWalletChain) => {
+    return PAYMASTER_RPC + zerodevProjects[chain];
 };
 
 export function paymasterMiddleware({
@@ -29,13 +20,13 @@ export function paymasterMiddleware({
     chain,
 }: {
     entryPoint: EntryPoint;
-    chain: EVMBlockchainIncludingTestnet;
+    chain: SmartWalletChain;
 }): Middleware<EntryPoint> {
     return {
         middleware: {
             sponsorUserOperation: async ({ userOperation }) => {
                 const paymasterClient = createZeroDevPaymasterClient({
-                    chain: getViemNetwork(chain),
+                    chain: viemNetworks[chain],
                     transport: http(getPaymasterRPC(chain)),
                     entryPoint,
                 });

package/src/blockchain/wallets/service.ts

@@ -7,7 +7,7 @@ import { Address, type HttpTransport, createPublicClient, getAddress, http } fro
 
 import { blockchainToChainId } from "@crossmint/common-sdk-base";
 
-import type { CrossmintWalletService, EVMBlockchainIncludingTestnet } from "../../api/CrossmintWalletService";
+import type { CrossmintWalletService } from "../../api/CrossmintWalletService";
 import {
     AdminMismatchError,
     CrossmintServiceError,
@@ -25,7 +25,7 @@ import {
     isSupportedKernelVersion,
 } from "../../types/internal";
 import { CURRENT_VERSION, ZERO_DEV_TYPE } from "../../utils/constants";
-import { getBundlerRPC, getViemNetwork } from "../BlockchainNetworks";
+import { SmartWalletChain, getBundlerRPC, viemNetworks } from "../chains";
 import { EVMSmartWallet } from "./EVMSmartWallet";
 import { ClientDecorator } from "./clientDecorator";
 import { EOAAccountService, type EOAWalletParams } from "./eoa";
@@ -44,7 +44,7 @@ export class SmartWalletService {
 
     public async getOrCreate(
         user: UserParams,
-        chain: EVMBlockchainIncludingTestnet,
+        chain: SmartWalletChain,
         walletParams: WalletParams
     ): Promise<EVMSmartWallet> {
         const { entryPoint, kernelVersion, existingSignerConfig, smartContractWalletAddress, userId } =
@@ -82,7 +82,7 @@ export class SmartWalletService {
 
         const kernelAccountClient: SmartWalletClient = createKernelAccountClient({
             account,
-            chain: getViemNetwork(chain),
+            chain: viemNetworks[chain],
             entryPoint: account.entryPoint,
             bundlerTransport: http(getBundlerRPC(chain)),
             ...(usePaymaster(chain) && paymasterMiddleware({ entryPoint: account.entryPoint, chain })),
@@ -98,7 +98,7 @@ export class SmartWalletService {
 
     private async fetchConfig(
         user: UserParams,
-        chain: EVMBlockchainIncludingTestnet
+        chain: SmartWalletChain
     ): Promise<{
         entryPoint: EntryPointDetails;
         kernelVersion: SupportedKernelVersion;

package/src/error/index.ts

@@ -13,7 +13,11 @@ export const SmartWalletErrors = {
     ERROR_WALLET_CONFIG: "smart-wallet:wallet-config.error",
     ERROR_ADMIN_MISMATCH: "smart-wallet:wallet-config.admin-mismatch",
     ERROR_PASSKEY_MISMATCH: "smart-wallet:wallet-config.passkey-mismatch",
+    ERROR_PASSKEY_PROMPT: "smart-wallet:passkey.prompt",
+    ERROR_PASSKEY_INCOMPATIBLE_AUTHENTICATOR: "smart-wallet.passkey.incompatible-authenticator",
+    ERROR_PASSKEY_REGISTRATION: "smart-wallet:passkey.registration",
     ERROR_ADMIN_SIGNER_ALREADY_USED: "smart-wallet:wallet-config.admin-signer-already-used",
+    ERROR_PROJECT_NONCUSTODIAL_WALLETS_NOT_ENABLED: "smart-wallet:wallet-config.non-custodial-wallets-not-enabled",
     UNCATEGORIZED: "smart-wallet:uncategorized", // catch-all error code
 } as const;
 export type SmartWalletErrorCode = (typeof SmartWalletErrors)[keyof typeof SmartWalletErrors];
@@ -118,6 +122,45 @@ export class UserWalletAlreadyCreatedError extends SmartWalletSDKError {
     }
 }
 
+export class PasskeyPromptError extends SmartWalletSDKError {
+    public passkeyName: string;
+
+    constructor(passkeyName: string) {
+        super(
+            `Prompt was either cancelled or timed out for passkey ${passkeyName}`,
+            undefined,
+            SmartWalletErrors.ERROR_PASSKEY_PROMPT
+        );
+        this.passkeyName = passkeyName;
+    }
+}
+
+export class PasskeyRegistrationError extends SmartWalletSDKError {
+    public passkeyName: string;
+
+    constructor(passkeyName: string) {
+        super(
+            `Registration for passkey ${passkeyName} failed, either the registration took too long, or passkey signature vaildation failed.`,
+            undefined,
+            SmartWalletErrors.ERROR_PASSKEY_REGISTRATION
+        );
+        this.passkeyName = passkeyName;
+    }
+}
+
+export class PasskeyIncompatibleAuthenticatorError extends SmartWalletSDKError {
+    public passkeyName: string;
+
+    constructor(passkeyName: string) {
+        super(
+            `User selected authenticator for passkey ${passkeyName} is not compatible with Crossmint's Smart Wallets.`,
+            undefined,
+            SmartWalletErrors.ERROR_PASSKEY_INCOMPATIBLE_AUTHENTICATOR
+        );
+        this.passkeyName = passkeyName;
+    }
+}
+
 export class OutOfCreditsError extends SmartWalletSDKError {
     constructor(message?: string) {
         super(
@@ -142,6 +185,7 @@ export class AdminAlreadyUsedError extends ConfigError {
 }
 
 export class NonCustodialWalletsNotEnabledError extends ConfigError {
+    public readonly code = SmartWalletErrors.ERROR_PROJECT_NONCUSTODIAL_WALLETS_NOT_ENABLED;
     constructor() {
         super("Non-custodial wallets are not enabled for this project");
     }

package/src/index.ts

@@ -1,4 +1,4 @@
-export { EVMBlockchainIncludingTestnet as Blockchain, blockchainToChainId } from "@crossmint/common-sdk-base";
+export { blockchainToChainId, EVMBlockchainIncludingTestnet as Chain } from "@crossmint/common-sdk-base";
 
 export { EVMSmartWallet } from "./blockchain/wallets/EVMSmartWallet";
 
@@ -27,6 +27,9 @@ export {
     AdminAlreadyUsedError,
     AdminMismatchError,
     PasskeyMismatchError,
+    PasskeyPromptError,
+    PasskeyRegistrationError,
+    PasskeyIncompatibleAuthenticatorError,
     ConfigError,
     NonCustodialWalletsNotEnabledError,
 } from "./error";

package/src/types/Tokens.ts

@@ -1,7 +1,7 @@
-import { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
+import type { SmartWalletChain } from "../blockchain/chains";
 
 export interface EVMToken {
-    chain: EVMBlockchainIncludingTestnet;
+    chain: SmartWalletChain;
     contractAddress: string;
 }
 

package/src/types/internal.ts

@@ -4,8 +4,7 @@ import type { SmartAccount } from "permissionless/accounts";
 import type { EntryPoint } from "permissionless/types/entrypoint";
 import type { Chain, Hex, HttpTransport, PublicClient } from "viem";
 
-import type { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
-
+import type { SmartWalletChain } from "../blockchain/chains";
 import type { SignerData } from "./API";
 import type { EntryPointDetails, UserParams, WalletParams } from "./Config";
 
@@ -25,7 +24,7 @@ export function isSupportedEntryPointVersion(version: string): version is Suppor
 
 export interface WalletCreationParams {
     user: UserParams & { id: string };
-    chain: EVMBlockchainIncludingTestnet;
+    chain: SmartWalletChain;
     publicClient: PublicClient<HttpTransport>;
     walletParams: WalletParams;
     entryPoint: EntryPointDetails;

package/src/utils/blockchain.ts

@@ -1,15 +1,5 @@
-import { EVMBlockchainIncludingTestnet } from "@crossmint/common-sdk-base";
+import { SmartWalletChain } from "../blockchain/chains";
 
-function isPolygonCDK(chain: EVMBlockchainIncludingTestnet) {
-    const polygonCDKchains: EVMBlockchainIncludingTestnet[] = [
-        EVMBlockchainIncludingTestnet.ZKYOTO,
-        EVMBlockchainIncludingTestnet.ZKATANA,
-        EVMBlockchainIncludingTestnet.ASTAR_ZKEVM,
-        EVMBlockchainIncludingTestnet.HYPERSONIC_TESTNET,
-    ];
-    return polygonCDKchains.includes(chain);
-}
-
-export function usesGelatoBundler(chain: EVMBlockchainIncludingTestnet) {
-    return isPolygonCDK(chain);
+export function usesGelatoBundler(chain: SmartWalletChain) {
+    return false;
 }