@dynamic-labs/embedded-wallet 3.0.0-alpha.9 → 3.0.0

package/src/lib/ExportHandler/ExportHandler.js

@@ -3,9 +3,10 @@ import { __awaiter } from '../../../_virtual/_tslib.js';
 import { IframeStamper, KeyFormat } from '@turnkey/iframe-stamper';
 import { TurnkeyClient } from '@turnkey/http';
 import { getTLD, PlatformService, DynamicError } from '@dynamic-labs/utils';
-import { logger } from '@dynamic-labs/wallet-connector-core';
 import { turnkeyAuthenticatorRecoveryHandler } from '../AuthenticatorHandler/TurnkeyAuthenticatorRecoveryHandler.js';
 import { PasskeyService } from '../utils/PasskeyService/PasskeyService.js';
+import '../utils/convertAttestationTransports/convertAttestationTransports.js';
+import { logger } from '../utils/logger/logger.js';
 
 const turnkeyBaseUrl = 'https://api.turnkey.com';
 const turnkeyExportUrl = 'https://export.turnkey.com';
@@ -79,6 +80,12 @@ class ExportHandler {
     }
     exportPrivateKey(_a) {
         return __awaiter(this, arguments, void 0, function* ({ privateKeyId, organizationId, }) {
+            const apiKeyStamper = ExportHandler === null || ExportHandler === void 0 ? void 0 : ExportHandler.apiKeyStamper;
+            if (apiKeyStamper) {
+                this.__turnkeyClient = new TurnkeyClient({
+                    baseUrl: turnkeyBaseUrl,
+                }, apiKeyStamper);
+            }
             if (!this.__iframeStamper ||
                 !this.__publicKey ||
                 !this.__turnkeyClient ||
@@ -95,13 +102,19 @@ class ExportHandler {
                 return newActivity.activity;
             }
             catch (err) {
-                logger.error('Error while completing export private key process', err);
+                logger.error('[TK] Error while completing export private key process', err);
                 throw err;
             }
         });
     }
     exportWallet(_a) {
         return __awaiter(this, arguments, void 0, function* ({ walletId, organizationId, address, }) {
+            const apiKeyStamper = ExportHandler === null || ExportHandler === void 0 ? void 0 : ExportHandler.apiKeyStamper;
+            if (apiKeyStamper) {
+                this.__turnkeyClient = new TurnkeyClient({
+                    baseUrl: turnkeyBaseUrl,
+                }, apiKeyStamper);
+            }
             if (!this.__iframeStamper ||
                 !this.__publicKey ||
                 !this.__turnkeyClient ||
@@ -127,7 +140,7 @@ class ExportHandler {
                 return newActivity.activity;
             }
             catch (err) {
-                logger.error('Error while completing export wallet process', err);
+                logger.error('[TK] Error while completing export wallet process', err);
                 throw err;
             }
         });

package/src/lib/TurnkeyWalletConnectorBase/TurnkeyWalletConnectorBase.cjs

@@ -10,6 +10,7 @@ var utils = require('@dynamic-labs/utils');
 var base64UrlEncode = require('../utils/base64UrlEncode/base64UrlEncode.cjs');
 var generateRandomBuffer = require('../utils/generateRandomBuffer/generateRandomBuffer.cjs');
 var convertAttestationTransports = require('../utils/convertAttestationTransports/convertAttestationTransports.cjs');
+var logger = require('../utils/logger/logger.cjs');
 var TurnkeyAuthenticatorRecoveryHandler = require('../AuthenticatorHandler/TurnkeyAuthenticatorRecoveryHandler.cjs');
 var ExportHandler = require('../ExportHandler/ExportHandler.cjs');
 var PasskeyService = require('../utils/PasskeyService/PasskeyService.cjs');
@@ -77,7 +78,7 @@ class TurnkeyWalletConnectorBase extends walletConnectorCore.WalletConnectorBase
                 attestation = yield PasskeyService.PasskeyService.getWebAuthnAttestation(webAuthnCreateParams);
             }
             catch (error) {
-                walletConnectorCore.logger.warn(`Unable to register webauthn credential on the current page's TLD ${utils.getTLD()}. Falling back to using hostname. ${utils.PlatformService.getHostname()}`, error);
+                logger.logger.warn(`Unable to register webauthn credential on the current page's TLD ${utils.getTLD()}. Falling back to using hostname. ${utils.PlatformService.getHostname()}`, error);
                 // Create the passkey on the hostname instead.
                 webAuthnCreateParams.publicKey.rp.id = utils.PlatformService.getHostname();
                 attestation = yield PasskeyService.PasskeyService.getWebAuthnAttestation(webAuthnCreateParams);
@@ -130,17 +131,13 @@ class TurnkeyWalletConnectorBase extends walletConnectorCore.WalletConnectorBase
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const address = (_a = this.verifiedCredential) === null || _a === void 0 ? void 0 : _a.address;
-            if (!address) {
-                return [];
-            }
-            return [address];
+            const verifiedCredentials = this.verifiedCredentials || [];
+            const addresses = verifiedCredentials
+                .map((vc) => vc === null || vc === void 0 ? void 0 : vc.address)
+                .filter((a) => typeof a === 'string');
+            return addresses;
         });
     }
-    getMobileOrInstalledWallet() {
-        return this;
-    }
     get turnkeyAddress() {
         var _a;
         const { address } = (_a = this.verifiedCredential) !== null && _a !== void 0 ? _a : {};
@@ -151,6 +148,12 @@ class TurnkeyWalletConnectorBase extends walletConnectorCore.WalletConnectorBase
         return walletProperties;
     }
     // Private methods
+    set verifiedCredentials(verifiedCredentials) {
+        this._verifiedCredentials = verifiedCredentials;
+    }
+    get verifiedCredentials() {
+        return this._verifiedCredentials;
+    }
     set verifiedCredential(verifiedCredential) {
         this._verifiedCredential = verifiedCredential;
     }
@@ -164,26 +167,32 @@ class TurnkeyWalletConnectorBase extends walletConnectorCore.WalletConnectorBase
         this.removeSessionKeysFunction = func;
     }
     createOrRestoreSession() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
+        return _tslib.__awaiter(this, arguments, void 0, function* ({ ignoreRestore, } = {}) {
+            if (!this.isSessionKeyCompatible() ||
+                TurnkeyWalletConnectorBase.isLoadingSession) {
+                return;
+            }
             if (!this.createOrRestoreSessionFetcherFunction) {
                 throw new utils.DynamicError('Cannot register session key to init provider');
             }
-            if (TurnkeyWalletConnectorBase.isLoadingSession) {
-                return;
-            }
-            if ((_a = TurnkeyWalletConnectorBase.sessionKeys) === null || _a === void 0 ? void 0 : _a.publicKey) {
-                return TurnkeyWalletConnectorBase.sessionKeys.publicKey;
+            const { sessionKeys } = TurnkeyWalletConnectorBase;
+            if (sessionKeys === null || sessionKeys === void 0 ? void 0 : sessionKeys.publicKey) {
+                const isExpired = new Date() >= new Date(sessionKeys.expirationDate);
+                if (!isExpired)
+                    return sessionKeys.publicKey;
             }
             try {
                 TurnkeyWalletConnectorBase.isLoadingSession = true;
-                const sessionKeys = yield this.createOrRestoreSessionFetcherFunction();
+                const sessionKeys = yield this.createOrRestoreSessionFetcherFunction({
+                    ignoreRestore,
+                });
                 TurnkeyWalletConnectorBase.sessionKeys = sessionKeys;
                 TurnkeyWalletConnectorBase.apiKeyStamper = new apiKeyStamper.ApiKeyStamper({
                     apiPrivateKey: sessionKeys.privateKey,
                     apiPublicKey: sessionKeys.publicKey,
                 });
                 ExportHandler.ExportHandler.apiKeyStamper = TurnkeyWalletConnectorBase.apiKeyStamper;
+                logger.logger.setMetaData('sessionApiPublicKey', sessionKeys.publicKey);
                 return sessionKeys.publicKey;
             }
             catch (error) {
@@ -211,6 +220,22 @@ class TurnkeyWalletConnectorBase extends walletConnectorCore.WalletConnectorBase
     get sessionKeys() {
         return TurnkeyWalletConnectorBase.sessionKeys;
     }
+    setLoggerMetadata() {
+        var _a, _b, _c;
+        logger.logger.setMetaData('turnkeySubOrganizationId', (_b = (_a = this._verifiedCredential) === null || _a === void 0 ? void 0 : _a.walletProperties) === null || _b === void 0 ? void 0 : _b.turnkeySubOrganizationId);
+        logger.logger.setMetaData('walletId', (_c = this._verifiedCredential) === null || _c === void 0 ? void 0 : _c.id);
+        let authMethod = 'Unknown';
+        if (this.isSessionKeyCompatible()) {
+            authMethod = 'SessionKeys';
+        }
+        else if (this.__authenticatorMethodHandler.recoveryType === 'passkey') {
+            authMethod = 'Passkey';
+        }
+        else if (this.__authenticatorMethodHandler.recoveryType === 'email') {
+            authMethod = 'EmailAuth';
+        }
+        logger.logger.setMetaData('authMethod', authMethod);
+    }
 }
 TurnkeyWalletConnectorBase.isLoadingSession = false;
 

package/src/lib/TurnkeyWalletConnectorBase/TurnkeyWalletConnectorBase.d.ts

@@ -1,8 +1,9 @@
 import { ApiKeyStamper } from '@turnkey/api-key-stamper';
-import { JwtVerifiedCredential, TurnkeyWalletProperties } from '@dynamic-labs/sdk-api-core';
+import { TurnkeyWalletProperties } from '@dynamic-labs/sdk-api-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import type { AuthenticatorRecoveryHandler, IEmailWalletConnector, IPasskeyWalletConnector, ISMSWalletConnector, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import type { AuthenticatorRecoveryHandler, IEmailWalletConnector, IPasskeyWalletConnector, ISMSWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { JwtVerifiedCredentialWithSmartWalletRef } from '../utils';
 import { TurnkeyWalletConnectorNameAndKey } from '../../types';
 import { ExportHandler } from '../ExportHandler';
 export type TurnkeyConnectorBaseProps = {
@@ -12,6 +13,7 @@ export type TurnkeyConnectorBaseProps = {
 export type SessionKeys = {
     publicKey: string;
     privateKey: string;
+    expirationDate: string;
 };
 type ITurnkeyWalletConnector = IEmailWalletConnector & IPasskeyWalletConnector & ISMSWalletConnector;
 export declare abstract class TurnkeyWalletConnectorBase extends WalletConnectorBase implements ITurnkeyWalletConnector {
@@ -24,11 +26,14 @@ export declare abstract class TurnkeyWalletConnectorBase extends WalletConnector
     private _phone;
     private _passkeyIdentifier;
     private _verifiedCredential;
+    private _verifiedCredentials;
     private __authenticatorMethodHandler;
     private __exportHandler;
     static sessionKeys: SessionKeys | undefined;
     static apiKeyStamper: ApiKeyStamper | undefined;
-    createOrRestoreSessionFetcherFunction: (() => Promise<SessionKeys>) | undefined;
+    createOrRestoreSessionFetcherFunction: (({ ignoreRestore }: {
+        ignoreRestore?: boolean;
+    }) => Promise<SessionKeys>) | undefined;
     removeSessionKeysFunction: (() => Promise<void>) | undefined;
     constructor(nameAndKey: TurnkeyWalletConnectorNameAndKey, props: TurnkeyConnectorBaseProps);
     getWebAuthnAttestation(): Promise<{
@@ -52,17 +57,21 @@ export declare abstract class TurnkeyWalletConnectorBase extends WalletConnector
     clearEmail(): void;
     getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
-    getMobileOrInstalledWallet(): WalletConnector;
     get turnkeyAddress(): string | undefined;
     get walletProperties(): TurnkeyWalletProperties | undefined;
-    set verifiedCredential(verifiedCredential: JwtVerifiedCredential | undefined);
-    get verifiedCredential(): JwtVerifiedCredential | undefined;
+    set verifiedCredentials(verifiedCredentials: JwtVerifiedCredentialWithSmartWalletRef[] | undefined);
+    get verifiedCredentials(): JwtVerifiedCredentialWithSmartWalletRef[] | undefined;
+    set verifiedCredential(verifiedCredential: JwtVerifiedCredentialWithSmartWalletRef | undefined);
+    get verifiedCredential(): JwtVerifiedCredentialWithSmartWalletRef | undefined;
     setSessionKeyFetcher(func: () => Promise<SessionKeys>): void;
     setSessionKeyRemoveFunction(func: () => Promise<void>): void;
     removeSessionKeys: () => Promise<void>;
-    createOrRestoreSession(): Promise<string | undefined>;
+    createOrRestoreSession({ ignoreRestore, }?: {
+        ignoreRestore?: boolean;
+    }): Promise<string | undefined>;
     isSessionKeyCompatible(): boolean;
     isSessionActive(): Promise<boolean>;
     get sessionKeys(): SessionKeys | undefined;
+    protected setLoggerMetadata(): void;
 }
 export {};

package/src/lib/TurnkeyWalletConnectorBase/TurnkeyWalletConnectorBase.js

@@ -1,11 +1,12 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { ApiKeyStamper } from '@turnkey/api-key-stamper';
-import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
+import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
 import { getTLD, PlatformService, DynamicError } from '@dynamic-labs/utils';
 import { base64UrlEncode } from '../utils/base64UrlEncode/base64UrlEncode.js';
 import { generateRandomBuffer } from '../utils/generateRandomBuffer/generateRandomBuffer.js';
 import { convertAttestationTransports } from '../utils/convertAttestationTransports/convertAttestationTransports.js';
+import { logger } from '../utils/logger/logger.js';
 import { turnkeyAuthenticatorRecoveryHandler } from '../AuthenticatorHandler/TurnkeyAuthenticatorRecoveryHandler.js';
 import { ExportHandler } from '../ExportHandler/ExportHandler.js';
 import { PasskeyService } from '../utils/PasskeyService/PasskeyService.js';
@@ -126,17 +127,13 @@ class TurnkeyWalletConnectorBase extends WalletConnectorBase {
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const address = (_a = this.verifiedCredential) === null || _a === void 0 ? void 0 : _a.address;
-            if (!address) {
-                return [];
-            }
-            return [address];
+            const verifiedCredentials = this.verifiedCredentials || [];
+            const addresses = verifiedCredentials
+                .map((vc) => vc === null || vc === void 0 ? void 0 : vc.address)
+                .filter((a) => typeof a === 'string');
+            return addresses;
         });
     }
-    getMobileOrInstalledWallet() {
-        return this;
-    }
     get turnkeyAddress() {
         var _a;
         const { address } = (_a = this.verifiedCredential) !== null && _a !== void 0 ? _a : {};
@@ -147,6 +144,12 @@ class TurnkeyWalletConnectorBase extends WalletConnectorBase {
         return walletProperties;
     }
     // Private methods
+    set verifiedCredentials(verifiedCredentials) {
+        this._verifiedCredentials = verifiedCredentials;
+    }
+    get verifiedCredentials() {
+        return this._verifiedCredentials;
+    }
     set verifiedCredential(verifiedCredential) {
         this._verifiedCredential = verifiedCredential;
     }
@@ -160,26 +163,32 @@ class TurnkeyWalletConnectorBase extends WalletConnectorBase {
         this.removeSessionKeysFunction = func;
     }
     createOrRestoreSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+        return __awaiter(this, arguments, void 0, function* ({ ignoreRestore, } = {}) {
+            if (!this.isSessionKeyCompatible() ||
+                TurnkeyWalletConnectorBase.isLoadingSession) {
+                return;
+            }
             if (!this.createOrRestoreSessionFetcherFunction) {
                 throw new DynamicError('Cannot register session key to init provider');
             }
-            if (TurnkeyWalletConnectorBase.isLoadingSession) {
-                return;
-            }
-            if ((_a = TurnkeyWalletConnectorBase.sessionKeys) === null || _a === void 0 ? void 0 : _a.publicKey) {
-                return TurnkeyWalletConnectorBase.sessionKeys.publicKey;
+            const { sessionKeys } = TurnkeyWalletConnectorBase;
+            if (sessionKeys === null || sessionKeys === void 0 ? void 0 : sessionKeys.publicKey) {
+                const isExpired = new Date() >= new Date(sessionKeys.expirationDate);
+                if (!isExpired)
+                    return sessionKeys.publicKey;
             }
             try {
                 TurnkeyWalletConnectorBase.isLoadingSession = true;
-                const sessionKeys = yield this.createOrRestoreSessionFetcherFunction();
+                const sessionKeys = yield this.createOrRestoreSessionFetcherFunction({
+                    ignoreRestore,
+                });
                 TurnkeyWalletConnectorBase.sessionKeys = sessionKeys;
                 TurnkeyWalletConnectorBase.apiKeyStamper = new ApiKeyStamper({
                     apiPrivateKey: sessionKeys.privateKey,
                     apiPublicKey: sessionKeys.publicKey,
                 });
                 ExportHandler.apiKeyStamper = TurnkeyWalletConnectorBase.apiKeyStamper;
+                logger.setMetaData('sessionApiPublicKey', sessionKeys.publicKey);
                 return sessionKeys.publicKey;
             }
             catch (error) {
@@ -207,6 +216,22 @@ class TurnkeyWalletConnectorBase extends WalletConnectorBase {
     get sessionKeys() {
         return TurnkeyWalletConnectorBase.sessionKeys;
     }
+    setLoggerMetadata() {
+        var _a, _b, _c;
+        logger.setMetaData('turnkeySubOrganizationId', (_b = (_a = this._verifiedCredential) === null || _a === void 0 ? void 0 : _a.walletProperties) === null || _b === void 0 ? void 0 : _b.turnkeySubOrganizationId);
+        logger.setMetaData('walletId', (_c = this._verifiedCredential) === null || _c === void 0 ? void 0 : _c.id);
+        let authMethod = 'Unknown';
+        if (this.isSessionKeyCompatible()) {
+            authMethod = 'SessionKeys';
+        }
+        else if (this.__authenticatorMethodHandler.recoveryType === 'passkey') {
+            authMethod = 'Passkey';
+        }
+        else if (this.__authenticatorMethodHandler.recoveryType === 'email') {
+            authMethod = 'EmailAuth';
+        }
+        logger.setMetaData('authMethod', authMethod);
+    }
 }
 TurnkeyWalletConnectorBase.isLoadingSession = false;
 

package/src/lib/constants.cjs

@@ -4,5 +4,26 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const TURNKEY_API_BASE_URL = 'https://api.turnkey.com';
+const TURNKEY_API_KEY_EXPIRY_MESSAGE = 'Turnkey error 16: expired api key';
+const TURNKEY_API_KEY_NOT_FOUND_MESSAGE = 'Turnkey error 16: could not find public key';
+const WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE = 'The operation either timed out or was not allowed';
+const WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE = 'The request is not allowed by the user agent or the platform in the current context, possibly because the user denied permission.';
+const INVALID_PASSKEY_SELECTED = 'Turnkey error 5: webauthn authenticator not found in organization or parent organization';
+const TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS = [
+    TURNKEY_API_KEY_EXPIRY_MESSAGE,
+    TURNKEY_API_KEY_NOT_FOUND_MESSAGE,
+];
+const TURNKEY_SDK_BENIGN_ERRORS = [
+    WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE,
+    WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE,
+    INVALID_PASSKEY_SELECTED,
+];
 
+exports.INVALID_PASSKEY_SELECTED = INVALID_PASSKEY_SELECTED;
 exports.TURNKEY_API_BASE_URL = TURNKEY_API_BASE_URL;
+exports.TURNKEY_API_KEY_EXPIRY_MESSAGE = TURNKEY_API_KEY_EXPIRY_MESSAGE;
+exports.TURNKEY_API_KEY_NOT_FOUND_MESSAGE = TURNKEY_API_KEY_NOT_FOUND_MESSAGE;
+exports.TURNKEY_SDK_BENIGN_ERRORS = TURNKEY_SDK_BENIGN_ERRORS;
+exports.TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS = TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS;
+exports.WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE = WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE;
+exports.WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE = WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE;

package/src/lib/constants.d.ts

@@ -1 +1,8 @@
 export declare const TURNKEY_API_BASE_URL = "https://api.turnkey.com";
+export declare const TURNKEY_API_KEY_EXPIRY_MESSAGE = "Turnkey error 16: expired api key";
+export declare const TURNKEY_API_KEY_NOT_FOUND_MESSAGE = "Turnkey error 16: could not find public key";
+export declare const WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE = "The operation either timed out or was not allowed";
+export declare const WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE = "The request is not allowed by the user agent or the platform in the current context, possibly because the user denied permission.";
+export declare const INVALID_PASSKEY_SELECTED = "Turnkey error 5: webauthn authenticator not found in organization or parent organization";
+export declare const TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS: string[];
+export declare const TURNKEY_SDK_BENIGN_ERRORS: string[];

package/src/lib/constants.js

@@ -1,4 +1,18 @@
 'use client'
 const TURNKEY_API_BASE_URL = 'https://api.turnkey.com';
+const TURNKEY_API_KEY_EXPIRY_MESSAGE = 'Turnkey error 16: expired api key';
+const TURNKEY_API_KEY_NOT_FOUND_MESSAGE = 'Turnkey error 16: could not find public key';
+const WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE = 'The operation either timed out or was not allowed';
+const WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE = 'The request is not allowed by the user agent or the platform in the current context, possibly because the user denied permission.';
+const INVALID_PASSKEY_SELECTED = 'Turnkey error 5: webauthn authenticator not found in organization or parent organization';
+const TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS = [
+    TURNKEY_API_KEY_EXPIRY_MESSAGE,
+    TURNKEY_API_KEY_NOT_FOUND_MESSAGE,
+];
+const TURNKEY_SDK_BENIGN_ERRORS = [
+    WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE,
+    WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE,
+    INVALID_PASSKEY_SELECTED,
+];
 
-export { TURNKEY_API_BASE_URL };
+export { INVALID_PASSKEY_SELECTED, TURNKEY_API_BASE_URL, TURNKEY_API_KEY_EXPIRY_MESSAGE, TURNKEY_API_KEY_NOT_FOUND_MESSAGE, TURNKEY_SDK_BENIGN_ERRORS, TURNKEY_SDK_SESSION_KEY_RETRYABLE_ERRORS, WEBAUTHN_NOT_SUPPORTED_OR_CANCELLED_ERROR_MESSAGE, WEBAUTHN_NOT_SUPPORTED_OR_DISABLED_ERROR_MESSAGE };

package/src/lib/utils/PasskeyService/PasskeyService.cjs

@@ -3,8 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../_virtual/_tslib.cjs');
 var createTurnkeyPasskeyService = require('./utils/createTurnkeyPasskeyService/createTurnkeyPasskeyService.cjs');
 
+var _a, _PasskeyService_implementation;
 class PasskeyService {
     /**
      * Gets the current passkey service implementation.
@@ -12,30 +14,32 @@ class PasskeyService {
      * @returns {IPasskeyService} The passkey service implementation.
      */
     static get implementation() {
-        if (!PasskeyService._implementation) {
+        if (!_tslib.__classPrivateFieldGet(_a, _a, "f", _PasskeyService_implementation)) {
             return createTurnkeyPasskeyService.createTurnkeyPasskeyService();
         }
-        return PasskeyService._implementation;
+        return _tslib.__classPrivateFieldGet(_a, _a, "f", _PasskeyService_implementation);
     }
     /**
      * Sets the passkey service implementation.
      * @param {IPasskeyService} implementation The passkey service implementation to set.
      */
-    static setImplementation(implementation) {
-        PasskeyService._implementation = implementation;
+    static set implementation(implementation) {
+        _tslib.__classPrivateFieldSet(_a, _a, implementation, "f", _PasskeyService_implementation);
     }
     /**
      * Gets the WebAuthn attestation method from the current implementation.
      */
     static get getWebAuthnAttestation() {
-        return PasskeyService.implementation.getWebAuthnAttestation;
+        return _a.implementation.getWebAuthnAttestation;
     }
     /**
      * Gets the createWebauthnStamper method from the current implementation.
      */
     static get createWebauthnStamper() {
-        return PasskeyService.implementation.createWebauthnStamper;
+        return _a.implementation.createWebauthnStamper;
     }
 }
+_a = PasskeyService;
+_PasskeyService_implementation = { value: void 0 };
 
 exports.PasskeyService = PasskeyService;

package/src/lib/utils/PasskeyService/PasskeyService.d.ts

@@ -1,6 +1,6 @@
 import { IPasskeyService } from './types';
 export declare class PasskeyService {
-    static _implementation: IPasskeyService;
+    #private;
     /**
      * Gets the current passkey service implementation.
      * If no implementation is set, it will create a new turnkey passkey service.
@@ -11,7 +11,7 @@ export declare class PasskeyService {
      * Sets the passkey service implementation.
      * @param {IPasskeyService} implementation The passkey service implementation to set.
      */
-    static setImplementation(implementation: IPasskeyService): void;
+    static set implementation(implementation: IPasskeyService);
     /**
      * Gets the WebAuthn attestation method from the current implementation.
      */

package/src/lib/utils/PasskeyService/PasskeyService.js

@@ -1,6 +1,8 @@
 'use client'
+import { __classPrivateFieldGet, __classPrivateFieldSet } from '../../../../_virtual/_tslib.js';
 import { createTurnkeyPasskeyService } from './utils/createTurnkeyPasskeyService/createTurnkeyPasskeyService.js';
 
+var _a, _PasskeyService_implementation;
 class PasskeyService {
     /**
      * Gets the current passkey service implementation.
@@ -8,30 +10,32 @@ class PasskeyService {
      * @returns {IPasskeyService} The passkey service implementation.
      */
     static get implementation() {
-        if (!PasskeyService._implementation) {
+        if (!__classPrivateFieldGet(_a, _a, "f", _PasskeyService_implementation)) {
             return createTurnkeyPasskeyService();
         }
-        return PasskeyService._implementation;
+        return __classPrivateFieldGet(_a, _a, "f", _PasskeyService_implementation);
     }
     /**
      * Sets the passkey service implementation.
      * @param {IPasskeyService} implementation The passkey service implementation to set.
      */
-    static setImplementation(implementation) {
-        PasskeyService._implementation = implementation;
+    static set implementation(implementation) {
+        __classPrivateFieldSet(_a, _a, implementation, "f", _PasskeyService_implementation);
     }
     /**
      * Gets the WebAuthn attestation method from the current implementation.
      */
     static get getWebAuthnAttestation() {
-        return PasskeyService.implementation.getWebAuthnAttestation;
+        return _a.implementation.getWebAuthnAttestation;
     }
     /**
      * Gets the createWebauthnStamper method from the current implementation.
      */
     static get createWebauthnStamper() {
-        return PasskeyService.implementation.createWebauthnStamper;
+        return _a.implementation.createWebauthnStamper;
     }
 }
+_a = PasskeyService;
+_PasskeyService_implementation = { value: void 0 };
 
 export { PasskeyService };

package/src/lib/utils/PasskeyService/utils/createTurnkeyPasskeyService/createTurnkeyPasskeyService.cjs

@@ -3,12 +3,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var http = require('@turnkey/http');
 var webauthnStamper = require('@turnkey/webauthn-stamper');
+var webauthn = require('@dynamic-labs/webauthn');
 
 const createTurnkeyPasskeyService = () => ({
     createWebauthnStamper: (config) => new webauthnStamper.WebauthnStamper(config),
-    getWebAuthnAttestation: http.getWebAuthnAttestation,
+    getWebAuthnAttestation: webauthn.getWebAuthnAttestationTurnkeyAdapter,
 });
 
 exports.createTurnkeyPasskeyService = createTurnkeyPasskeyService;

package/src/lib/utils/PasskeyService/utils/createTurnkeyPasskeyService/createTurnkeyPasskeyService.js

@@ -1,10 +1,10 @@
 'use client'
-import { getWebAuthnAttestation } from '@turnkey/http';
 import { WebauthnStamper } from '@turnkey/webauthn-stamper';
+import { getWebAuthnAttestationTurnkeyAdapter } from '@dynamic-labs/webauthn';
 
 const createTurnkeyPasskeyService = () => ({
     createWebauthnStamper: (config) => new WebauthnStamper(config),
-    getWebAuthnAttestation,
+    getWebAuthnAttestation: getWebAuthnAttestationTurnkeyAdapter,
 });
 
 export { createTurnkeyPasskeyService };

package/src/lib/utils/findTurnkeyVerifiedCredentials/findTurnkeyVerifiedCredentials.cjs

@@ -0,0 +1,19 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const findTurnkeyVerifiedCredentials = (verifiedCredentials, chain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.filter(({ walletName, chain: vcChain }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && chain === vcChain);
+const findTurnkeyVerifiedCredentialsWithSmartWalletRef = (verifiedCredentials, chain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.reduce((acc, vc) => {
+    var _a;
+    if (((_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('turnkey')) && chain === vc.chain) {
+        const smartWallet = verifiedCredentials.find((v) => v.signerRefId === vc.id);
+        const smartWalletRefId = smartWallet === null || smartWallet === void 0 ? void 0 : smartWallet.id;
+        const smartWalletRefAddress = smartWallet === null || smartWallet === void 0 ? void 0 : smartWallet.address;
+        acc.push(Object.assign(Object.assign({}, vc), { smartWalletRefAddress, smartWalletRefId }));
+    }
+    return acc;
+}, []);
+
+exports.findTurnkeyVerifiedCredentials = findTurnkeyVerifiedCredentials;
+exports.findTurnkeyVerifiedCredentialsWithSmartWalletRef = findTurnkeyVerifiedCredentialsWithSmartWalletRef;

package/src/lib/utils/findTurnkeyVerifiedCredentials/findTurnkeyVerifiedCredentials.d.ts

@@ -0,0 +1,7 @@
+import type { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+export declare const findTurnkeyVerifiedCredentials: (verifiedCredentials: JwtVerifiedCredential[], chain: string) => JwtVerifiedCredential[];
+export interface JwtVerifiedCredentialWithSmartWalletRef extends JwtVerifiedCredential {
+    smartWalletRefId?: string;
+    smartWalletRefAddress?: string;
+}
+export declare const findTurnkeyVerifiedCredentialsWithSmartWalletRef: (verifiedCredentials: JwtVerifiedCredential[], chain: string) => JwtVerifiedCredentialWithSmartWalletRef[];

package/src/lib/utils/findTurnkeyVerifiedCredentials/findTurnkeyVerifiedCredentials.js

@@ -0,0 +1,14 @@
+'use client'
+const findTurnkeyVerifiedCredentials = (verifiedCredentials, chain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.filter(({ walletName, chain: vcChain }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && chain === vcChain);
+const findTurnkeyVerifiedCredentialsWithSmartWalletRef = (verifiedCredentials, chain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.reduce((acc, vc) => {
+    var _a;
+    if (((_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('turnkey')) && chain === vc.chain) {
+        const smartWallet = verifiedCredentials.find((v) => v.signerRefId === vc.id);
+        const smartWalletRefId = smartWallet === null || smartWallet === void 0 ? void 0 : smartWallet.id;
+        const smartWalletRefAddress = smartWallet === null || smartWallet === void 0 ? void 0 : smartWallet.address;
+        acc.push(Object.assign(Object.assign({}, vc), { smartWalletRefAddress, smartWalletRefId }));
+    }
+    return acc;
+}, []);
+
+export { findTurnkeyVerifiedCredentials, findTurnkeyVerifiedCredentialsWithSmartWalletRef };

package/src/lib/utils/findTurnkeyVerifiedCredentials/index.d.ts

@@ -0,0 +1,2 @@
+export { findTurnkeyVerifiedCredentials, findTurnkeyVerifiedCredentialsWithSmartWalletRef, } from './findTurnkeyVerifiedCredentials';
+export type { JwtVerifiedCredentialWithSmartWalletRef } from './findTurnkeyVerifiedCredentials';

package/src/lib/utils/index.d.ts

@@ -1,4 +1,5 @@
-export * from './findTurnkeyVerifiedCredential';
+export * from './findTurnkeyVerifiedCredentials';
 export * from './base64UrlEncode';
 export * from './generateRandomBuffer';
 export * from './convertAttestationTransports';
+export * from './logger';

package/src/lib/utils/logger/index.d.ts

@@ -0,0 +1 @@
+export * from './logger';

package/src/lib/utils/logger/logger.cjs

@@ -0,0 +1,29 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var logger$1 = require('@dynamic-labs/logger');
+var constants = require('../../constants.cjs');
+
+class DynamicEmbeddedWalletsLogger extends logger$1.Logger {
+    constructor(name, level) {
+        super(name, level);
+    }
+    error(message, ...args) {
+        const [err] = args;
+        if (!(err === null || err === void 0 ? void 0 : err.message) ||
+            !constants.TURNKEY_SDK_BENIGN_ERRORS.some((errorMsg) => err.message.includes(errorMsg))) {
+            logger$1.Logger.events.emit('error', message);
+            this.log(logger$1.LogLevel.ERROR, message, ...args);
+        }
+        else {
+            // log benign turnkey sdk errors as WARN
+            this.warn(message, ...args);
+        }
+    }
+}
+const logger = new DynamicEmbeddedWalletsLogger('Dynamic embedded wallets', logger$1.LogLevel.INFO);
+
+exports.DynamicEmbeddedWalletsLogger = DynamicEmbeddedWalletsLogger;
+exports.logger = logger;