@injectivelabs/wallet-turnkey 1.15.31 → 1.15.33

package/dist/cjs/strategy/consts.d.ts

@@ -3,3 +3,11 @@ export declare const TURNKEY_OTP_PATH = "turnkey/otp";
 export declare const TURNKEY_OTP_INIT_PATH = "turnkey/otp/init";
 export declare const TURNKEY_OTP_VERIFY_PATH = "turnkey/otp/verify";
 export declare const DEFAULT_TURNKEY_REFRESH_SECONDS = "86400";
+export declare const DEFAULT_EVM_CHAIN_CONFIG: {
+    name: string;
+    nativeCurrency: {
+        name: string;
+        symbol: string;
+        decimals: number;
+    };
+};

package/dist/cjs/strategy/consts.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_TURNKEY_REFRESH_SECONDS = exports.TURNKEY_OTP_VERIFY_PATH = exports.TURNKEY_OTP_INIT_PATH = exports.TURNKEY_OTP_PATH = exports.TURNKEY_OAUTH_PATH = void 0;
+exports.DEFAULT_EVM_CHAIN_CONFIG = exports.DEFAULT_TURNKEY_REFRESH_SECONDS = exports.TURNKEY_OTP_VERIFY_PATH = exports.TURNKEY_OTP_INIT_PATH = exports.TURNKEY_OTP_PATH = exports.TURNKEY_OAUTH_PATH = void 0;
 exports.TURNKEY_OAUTH_PATH = 'turnkey/oauth';
 exports.TURNKEY_OTP_PATH = 'turnkey/otp';
 exports.TURNKEY_OTP_INIT_PATH = `${exports.TURNKEY_OTP_PATH}/init`;
 exports.TURNKEY_OTP_VERIFY_PATH = `${exports.TURNKEY_OTP_PATH}/verify`;
 exports.DEFAULT_TURNKEY_REFRESH_SECONDS = '86400';
+exports.DEFAULT_EVM_CHAIN_CONFIG = {
+    name: 'Injective',
+    nativeCurrency: {
+        name: 'Injective',
+        symbol: 'INJ',
+        decimals: 18,
+    },
+};

package/dist/cjs/strategy/strategy.d.ts

@@ -2,10 +2,11 @@ import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk
 import { HttpRestClient } from '@injectivelabs/utils';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 import { TurnkeyIframeClient } from '@turnkey/sdk-browser';
-import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEthereumOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import { TurnkeyWallet } from './turnkey/turnkey.js';
 export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
-    turnkeyWallet: TurnkeyWallet | undefined;
+    turnkeyWallet?: TurnkeyWallet;
+    ethereumOptions: WalletStrategyEthereumOptions;
     client: HttpRestClient;
     constructor(args: ConcreteEthereumWalletStrategyArgs & {
         apiServerEndpoint?: string;
@@ -19,7 +20,7 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(_address?: string): Promise<string>;
     getWalletClient<TurnkeyWallet>(): Promise<TurnkeyWallet>;
-    sendEthereumTransaction(_transaction: unknown, _options: {
+    sendEvmTransaction(transaction: unknown, args: {
         address: AccountAddress;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -37,7 +38,7 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     }): Promise<AminoSignResponse>;
     signArbitrary(_signer: AccountAddress, _data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(_txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<Record<string, any>>;
     getPubKey(): Promise<string>;
     getIframeClient(): Promise<TurnkeyIframeClient>;
     private getTurnkeyWallet;

package/dist/cjs/strategy/strategy.js

@@ -6,11 +6,14 @@ const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 const exceptions_1 = require("@injectivelabs/exceptions");
 const viem_1 = require("viem");
 const utils_1 = require("@injectivelabs/utils");
+const viem_2 = require("viem");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
 const types_js_1 = require("./types.js");
 const turnkey_js_1 = require("./turnkey/turnkey.js");
+const consts_js_1 = require("./consts.js");
 class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     turnkeyWallet;
+    ethereumOptions;
     client;
     constructor(args) {
         super(args);
@@ -19,6 +22,7 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
             throw new exceptions_1.WalletException(new Error('apiServerEndpoint is required'));
         }
         this.client = new utils_1.HttpRestClient(endpoint);
+        this.ethereumOptions = args.ethereumOptions;
     }
     async getWalletDeviceType() {
         return Promise.resolve(wallet_base_1.WalletDeviceType.Browser);
@@ -86,11 +90,47 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     async getWalletClient() {
         return (await this.getTurnkeyWallet());
     }
-    async sendEthereumTransaction(_transaction, _options) {
-        throw new exceptions_1.WalletException(new Error('sendEthereumTransaction is not supported. Turnkey only supports sending cosmos transactions'), {
-            code: exceptions_1.UnspecifiedErrorCode,
-            context: wallet_base_1.WalletAction.SendEthereumTransaction,
-        });
+    async sendEvmTransaction(transaction, args) {
+        try {
+            const options = this.ethereumOptions;
+            const turnkeyWallet = await this.getTurnkeyWallet();
+            const organizationId = await this.getOrganizationId();
+            const chainId = args.ethereumChainId || options.ethereumChainId;
+            const url = options.rpcUrl || options.rpcUrls?.[args.ethereumChainId];
+            if (!url) {
+                throw new exceptions_1.WalletException(new Error('Please pass rpcUrl within the ethereumOptions'), {
+                    code: exceptions_1.UnspecifiedErrorCode,
+                    context: wallet_base_1.WalletAction.SendEvmTransaction,
+                });
+            }
+            const account = await turnkeyWallet.getOrCreateAndGetAccount((0, viem_1.getAddress)(args.address), organizationId);
+            const accountClient = (0, viem_2.createWalletClient)({
+                account: account,
+                chain: {
+                    ...consts_js_1.DEFAULT_EVM_CHAIN_CONFIG,
+                    id: chainId,
+                    rpcUrls: {
+                        default: {
+                            http: [url],
+                        },
+                    },
+                },
+                transport: (0, viem_2.http)(url),
+            });
+            const preparedTransaction = await accountClient.prepareTransactionRequest(transaction);
+            delete preparedTransaction.account;
+            const signedTransaction = await accountClient.signTransaction(preparedTransaction);
+            const tx = await accountClient.sendRawTransaction({
+                serializedTransaction: signedTransaction,
+            });
+            return tx;
+        }
+        catch (e) {
+            throw new exceptions_1.WalletException(e, {
+                code: exceptions_1.UnspecifiedErrorCode,
+                context: wallet_base_1.WalletAction.SendEvmTransaction,
+            });
+        }
     }
     async sendTransaction(transaction, options) {
         const { endpoints, txTimeout } = options;
@@ -159,12 +199,45 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
             context: wallet_base_1.WalletAction.GetChainId,
         });
     }
-    async getEthereumTransactionReceipt(_txHash) {
-        throw new exceptions_1.CosmosWalletException(new Error('getEthereumTransactionReceipt is not supported on Turnkey'), {
-            code: exceptions_1.UnspecifiedErrorCode,
-            type: exceptions_1.ErrorType.WalletError,
-            context: wallet_base_1.WalletAction.GetEthereumTransactionReceipt,
+    async getEvmTransactionReceipt(txHash, ethereumChainId) {
+        const options = this.ethereumOptions;
+        const maxAttempts = 5;
+        const interval = 1000;
+        const chainId = ethereumChainId || options.ethereumChainId;
+        const url = options.rpcUrl || options.rpcUrls?.[chainId];
+        if (!url) {
+            throw new exceptions_1.WalletException(new Error('Please pass rpcUrl within the ethereumOptions'), {
+                code: exceptions_1.UnspecifiedErrorCode,
+                context: wallet_base_1.WalletAction.GetEvmTransactionReceipt,
+            });
+        }
+        const publicClient = (0, viem_2.createPublicClient)({
+            chain: {
+                ...consts_js_1.DEFAULT_EVM_CHAIN_CONFIG,
+                id: chainId,
+                rpcUrls: {
+                    default: {
+                        http: [url],
+                    },
+                },
+            },
+            transport: (0, viem_2.http)(url),
         });
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            attempts++;
+            await (0, utils_1.sleep)(interval);
+            try {
+                const receipt = await publicClient.getTransactionReceipt({
+                    hash: txHash,
+                });
+                if (receipt) {
+                    return receipt;
+                }
+            }
+            catch { }
+        }
+        throw new Error(`Failed to retrieve transaction receipt for txHash: ${txHash}`);
     }
     // eslint-disable-next-line class-methods-use-this
     async getPubKey() {

package/dist/cjs/strategy/turnkey/turnkey.d.ts

@@ -1,13 +1,14 @@
 import { TurnkeyMetadata, TurnkeyProvider } from '@injectivelabs/wallet-base';
+import { createAccount } from '@turnkey/viem';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
 export declare class TurnkeyWallet {
+    private otpId?;
+    protected turnkey?: Turnkey;
+    organizationId: string;
     protected client: HttpRestClient;
     private metadata;
-    protected turnkey: Turnkey | undefined;
-    protected iframeClient: TurnkeyIframeClient | undefined;
-    organizationId: string;
-    private otpId;
+    protected iframeClient?: TurnkeyIframeClient;
     private accountMap;
     setMetadata(metadata: Partial<TurnkeyMetadata>): void;
     constructor(metadata: TurnkeyMetadata);
@@ -18,28 +19,11 @@ export declare class TurnkeyWallet {
     getTurnkey(): Promise<Turnkey>;
     getIframeClient(): Promise<TurnkeyIframeClient>;
     getSession(existingCredentialBundle?: string): Promise<{
-        session: import("@turnkey/sdk-browser").Session | undefined;
+        session: import("@turnkey/sdk-types").Session | undefined;
         organizationId: string;
     }>;
     getAccounts(): Promise<string[]>;
-    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<{
-        address: import("abitype").Address;
-        nonceManager?: import("viem").NonceManager | undefined;
-        sign?: ((parameters: {
-            hash: import("viem").Hash;
-        }) => Promise<import("viem").Hex>) | undefined | undefined;
-        signAuthorization?: ((parameters: import("viem/_types/types/authorization.js").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>) | undefined | undefined;
-        signMessage: ({ message }: {
-            message: import("viem").SignableMessage;
-        }) => Promise<import("viem").Hex>;
-        signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
-            serializer?: serializer | undefined;
-        } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, import("viem").Hex> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : import("viem").Hex>;
-        signTypedData: <const typedData extends import("abitype").TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<import("viem").Hex>;
-        publicKey: import("viem").Hex;
-        source: string;
-        type: "local";
-    }>;
+    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<ReturnType<typeof createAccount>>;
     injectAndRefresh(credentialBundle: string, options: {
         expirationSeconds?: string;
         organizationId?: string;

package/dist/cjs/strategy/turnkey/turnkey.js

@@ -13,12 +13,12 @@ const types_js_1 = require("../types.js");
 const oauth_js_1 = require("./oauth.js");
 const utils_js_1 = require("../../utils.js");
 class TurnkeyWallet {
+    otpId;
+    turnkey;
+    organizationId;
     client;
     metadata;
-    turnkey;
     iframeClient;
-    organizationId;
-    otpId;
     accountMap = {};
     setMetadata(metadata) {
         this.metadata = { ...this.metadata, ...metadata };
@@ -72,7 +72,7 @@ class TurnkeyWallet {
             await iframeClient.refreshSession({
                 sessionType: sdk_browser_1.SessionType.READ_WRITE,
                 targetPublicKey: iframeClient.iframePublicKey,
-                expirationSeconds: '900',
+                expirationSeconds: this.metadata.expirationSeconds,
             });
             const [session, user] = await Promise.all([
                 turnkey.getSession(),
@@ -160,6 +160,10 @@ class TurnkeyWallet {
         const expirationSeconds = options.expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS;
         const iframeClient = await this.getIframeClient();
         await iframeClient.injectCredentialBundle(credentialBundle);
+        await iframeClient.loginWithBundle({
+            bundle: credentialBundle,
+            expirationSeconds,
+        });
         await iframeClient.refreshSession({
             sessionType: sdk_browser_1.SessionType.READ_WRITE,
             targetPublicKey: iframeClient.iframePublicKey,

package/dist/esm/strategy/consts.d.ts

@@ -3,3 +3,11 @@ export declare const TURNKEY_OTP_PATH = "turnkey/otp";
 export declare const TURNKEY_OTP_INIT_PATH = "turnkey/otp/init";
 export declare const TURNKEY_OTP_VERIFY_PATH = "turnkey/otp/verify";
 export declare const DEFAULT_TURNKEY_REFRESH_SECONDS = "86400";
+export declare const DEFAULT_EVM_CHAIN_CONFIG: {
+    name: string;
+    nativeCurrency: {
+        name: string;
+        symbol: string;
+        decimals: number;
+    };
+};

package/dist/esm/strategy/consts.js

@@ -3,3 +3,11 @@ export const TURNKEY_OTP_PATH = 'turnkey/otp';
 export const TURNKEY_OTP_INIT_PATH = `${TURNKEY_OTP_PATH}/init`;
 export const TURNKEY_OTP_VERIFY_PATH = `${TURNKEY_OTP_PATH}/verify`;
 export const DEFAULT_TURNKEY_REFRESH_SECONDS = '86400';
+export const DEFAULT_EVM_CHAIN_CONFIG = {
+    name: 'Injective',
+    nativeCurrency: {
+        name: 'Injective',
+        symbol: 'INJ',
+        decimals: 18,
+    },
+};

package/dist/esm/strategy/strategy.d.ts

@@ -2,10 +2,11 @@ import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk
 import { HttpRestClient } from '@injectivelabs/utils';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 import { TurnkeyIframeClient } from '@turnkey/sdk-browser';
-import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEthereumOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import { TurnkeyWallet } from './turnkey/turnkey.js';
 export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
-    turnkeyWallet: TurnkeyWallet | undefined;
+    turnkeyWallet?: TurnkeyWallet;
+    ethereumOptions: WalletStrategyEthereumOptions;
     client: HttpRestClient;
     constructor(args: ConcreteEthereumWalletStrategyArgs & {
         apiServerEndpoint?: string;
@@ -19,7 +20,7 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     getAddresses(): Promise<string[]>;
     getSessionOrConfirm(_address?: string): Promise<string>;
     getWalletClient<TurnkeyWallet>(): Promise<TurnkeyWallet>;
-    sendEthereumTransaction(_transaction: unknown, _options: {
+    sendEvmTransaction(transaction: unknown, args: {
         address: AccountAddress;
         ethereumChainId: EthereumChainId;
     }): Promise<string>;
@@ -37,7 +38,7 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     }): Promise<AminoSignResponse>;
     signArbitrary(_signer: AccountAddress, _data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEthereumTransactionReceipt(_txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<Record<string, any>>;
     getPubKey(): Promise<string>;
     getIframeClient(): Promise<TurnkeyIframeClient>;
     private getTurnkeyWallet;

package/dist/esm/strategy/strategy.js

@@ -2,12 +2,15 @@
 import { TxGrpcApi, } from '@injectivelabs/sdk-ts';
 import { ErrorType, WalletException, UnspecifiedErrorCode, TransactionException, CosmosWalletException, } from '@injectivelabs/exceptions';
 import { getAddress } from 'viem';
-import { HttpRestClient } from '@injectivelabs/utils';
+import { sleep, HttpRestClient } from '@injectivelabs/utils';
+import { http, createPublicClient, createWalletClient, } from 'viem';
 import { WalletAction, WalletDeviceType, BaseConcreteStrategy, } from '@injectivelabs/wallet-base';
 import { TurnkeyErrorCodes } from './types.js';
 import { TurnkeyWallet } from './turnkey/turnkey.js';
+import { DEFAULT_EVM_CHAIN_CONFIG } from './consts.js';
 export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
     turnkeyWallet;
+    ethereumOptions;
     client;
     constructor(args) {
         super(args);
@@ -16,6 +19,7 @@ export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
             throw new WalletException(new Error('apiServerEndpoint is required'));
         }
         this.client = new HttpRestClient(endpoint);
+        this.ethereumOptions = args.ethereumOptions;
     }
     async getWalletDeviceType() {
         return Promise.resolve(WalletDeviceType.Browser);
@@ -83,11 +87,47 @@ export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
     async getWalletClient() {
         return (await this.getTurnkeyWallet());
     }
-    async sendEthereumTransaction(_transaction, _options) {
-        throw new WalletException(new Error('sendEthereumTransaction is not supported. Turnkey only supports sending cosmos transactions'), {
-            code: UnspecifiedErrorCode,
-            context: WalletAction.SendEthereumTransaction,
-        });
+    async sendEvmTransaction(transaction, args) {
+        try {
+            const options = this.ethereumOptions;
+            const turnkeyWallet = await this.getTurnkeyWallet();
+            const organizationId = await this.getOrganizationId();
+            const chainId = args.ethereumChainId || options.ethereumChainId;
+            const url = options.rpcUrl || options.rpcUrls?.[args.ethereumChainId];
+            if (!url) {
+                throw new WalletException(new Error('Please pass rpcUrl within the ethereumOptions'), {
+                    code: UnspecifiedErrorCode,
+                    context: WalletAction.SendEvmTransaction,
+                });
+            }
+            const account = await turnkeyWallet.getOrCreateAndGetAccount(getAddress(args.address), organizationId);
+            const accountClient = createWalletClient({
+                account: account,
+                chain: {
+                    ...DEFAULT_EVM_CHAIN_CONFIG,
+                    id: chainId,
+                    rpcUrls: {
+                        default: {
+                            http: [url],
+                        },
+                    },
+                },
+                transport: http(url),
+            });
+            const preparedTransaction = await accountClient.prepareTransactionRequest(transaction);
+            delete preparedTransaction.account;
+            const signedTransaction = await accountClient.signTransaction(preparedTransaction);
+            const tx = await accountClient.sendRawTransaction({
+                serializedTransaction: signedTransaction,
+            });
+            return tx;
+        }
+        catch (e) {
+            throw new WalletException(e, {
+                code: UnspecifiedErrorCode,
+                context: WalletAction.SendEvmTransaction,
+            });
+        }
     }
     async sendTransaction(transaction, options) {
         const { endpoints, txTimeout } = options;
@@ -156,12 +196,45 @@ export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
             context: WalletAction.GetChainId,
         });
     }
-    async getEthereumTransactionReceipt(_txHash) {
-        throw new CosmosWalletException(new Error('getEthereumTransactionReceipt is not supported on Turnkey'), {
-            code: UnspecifiedErrorCode,
-            type: ErrorType.WalletError,
-            context: WalletAction.GetEthereumTransactionReceipt,
+    async getEvmTransactionReceipt(txHash, ethereumChainId) {
+        const options = this.ethereumOptions;
+        const maxAttempts = 5;
+        const interval = 1000;
+        const chainId = ethereumChainId || options.ethereumChainId;
+        const url = options.rpcUrl || options.rpcUrls?.[chainId];
+        if (!url) {
+            throw new WalletException(new Error('Please pass rpcUrl within the ethereumOptions'), {
+                code: UnspecifiedErrorCode,
+                context: WalletAction.GetEvmTransactionReceipt,
+            });
+        }
+        const publicClient = createPublicClient({
+            chain: {
+                ...DEFAULT_EVM_CHAIN_CONFIG,
+                id: chainId,
+                rpcUrls: {
+                    default: {
+                        http: [url],
+                    },
+                },
+            },
+            transport: http(url),
         });
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            attempts++;
+            await sleep(interval);
+            try {
+                const receipt = await publicClient.getTransactionReceipt({
+                    hash: txHash,
+                });
+                if (receipt) {
+                    return receipt;
+                }
+            }
+            catch { }
+        }
+        throw new Error(`Failed to retrieve transaction receipt for txHash: ${txHash}`);
     }
     // eslint-disable-next-line class-methods-use-this
     async getPubKey() {

package/dist/esm/strategy/turnkey/turnkey.d.ts

@@ -1,13 +1,14 @@
 import { TurnkeyMetadata, TurnkeyProvider } from '@injectivelabs/wallet-base';
+import { createAccount } from '@turnkey/viem';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
 export declare class TurnkeyWallet {
+    private otpId?;
+    protected turnkey?: Turnkey;
+    organizationId: string;
     protected client: HttpRestClient;
     private metadata;
-    protected turnkey: Turnkey | undefined;
-    protected iframeClient: TurnkeyIframeClient | undefined;
-    organizationId: string;
-    private otpId;
+    protected iframeClient?: TurnkeyIframeClient;
     private accountMap;
     setMetadata(metadata: Partial<TurnkeyMetadata>): void;
     constructor(metadata: TurnkeyMetadata);
@@ -18,28 +19,11 @@ export declare class TurnkeyWallet {
     getTurnkey(): Promise<Turnkey>;
     getIframeClient(): Promise<TurnkeyIframeClient>;
     getSession(existingCredentialBundle?: string): Promise<{
-        session: import("@turnkey/sdk-browser").Session | undefined;
+        session: import("@turnkey/sdk-types").Session | undefined;
         organizationId: string;
     }>;
     getAccounts(): Promise<string[]>;
-    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<{
-        address: import("abitype").Address;
-        nonceManager?: import("viem").NonceManager | undefined;
-        sign?: ((parameters: {
-            hash: import("viem").Hash;
-        }) => Promise<import("viem").Hex>) | undefined | undefined;
-        signAuthorization?: ((parameters: import("node_modules/viem/_types/types/authorization.js").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>) | undefined | undefined;
-        signMessage: ({ message }: {
-            message: import("viem").SignableMessage;
-        }) => Promise<import("viem").Hex>;
-        signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
-            serializer?: serializer | undefined;
-        } | undefined) => Promise<import("viem").IsNarrowable<import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>>, import("viem").Hex> extends true ? import("viem").TransactionSerialized<import("viem").GetTransactionType<transaction>> : import("viem").Hex>;
-        signTypedData: <const typedData extends import("abitype").TypedData | Record<string, unknown>, primaryType extends keyof typedData | "EIP712Domain" = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<import("viem").Hex>;
-        publicKey: import("viem").Hex;
-        source: string;
-        type: "local";
-    }>;
+    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<ReturnType<typeof createAccount>>;
     injectAndRefresh(credentialBundle: string, options: {
         expirationSeconds?: string;
         organizationId?: string;

package/dist/esm/strategy/turnkey/turnkey.js

@@ -3,19 +3,19 @@ import { WalletAction, TurnkeyProvider, } from '@injectivelabs/wallet-base';
 import { createAccount } from '@turnkey/viem';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { getInjectiveAddress } from '@injectivelabs/sdk-ts';
-import { Turnkey, SessionType } from '@turnkey/sdk-browser';
+import { SessionType, Turnkey } from '@turnkey/sdk-browser';
 import { TURNKEY_OAUTH_PATH, TURNKEY_OTP_INIT_PATH, TURNKEY_OTP_VERIFY_PATH, DEFAULT_TURNKEY_REFRESH_SECONDS, } from '../consts.js';
 import { TurnkeyOtpWallet } from './otp.js';
 import { TurnkeyErrorCodes } from '../types.js';
 import { TurnkeyOauthWallet } from './oauth.js';
 import { generateGoogleUrl } from '../../utils.js';
 export class TurnkeyWallet {
+    otpId;
+    turnkey;
+    organizationId;
     client;
     metadata;
-    turnkey;
     iframeClient;
-    organizationId;
-    otpId;
     accountMap = {};
     setMetadata(metadata) {
         this.metadata = { ...this.metadata, ...metadata };
@@ -69,7 +69,7 @@ export class TurnkeyWallet {
             await iframeClient.refreshSession({
                 sessionType: SessionType.READ_WRITE,
                 targetPublicKey: iframeClient.iframePublicKey,
-                expirationSeconds: '900',
+                expirationSeconds: this.metadata.expirationSeconds,
             });
             const [session, user] = await Promise.all([
                 turnkey.getSession(),
@@ -157,6 +157,10 @@ export class TurnkeyWallet {
         const expirationSeconds = options.expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS;
         const iframeClient = await this.getIframeClient();
         await iframeClient.injectCredentialBundle(credentialBundle);
+        await iframeClient.loginWithBundle({
+            bundle: credentialBundle,
+            expirationSeconds,
+        });
         await iframeClient.refreshSession({
             sessionType: SessionType.READ_WRITE,
             targetPublicKey: iframeClient.iframePublicKey,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-turnkey",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.15.31",
+  "version": "1.15.33",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -59,14 +59,14 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.28",
-    "@injectivelabs/sdk-ts": "^1.15.31",
-    "@injectivelabs/ts-types": "^1.15.29",
-    "@injectivelabs/utils": "^1.15.29",
-    "@injectivelabs/wallet-base": "^1.15.31",
-    "@turnkey/sdk-browser": "4.3.0",
-    "@turnkey/viem": "0.9.3",
-    "viem": "2.29.4"
+    "@injectivelabs/exceptions": "^1.15.30",
+    "@injectivelabs/sdk-ts": "^1.15.33",
+    "@injectivelabs/ts-types": "^1.15.31",
+    "@injectivelabs/utils": "^1.15.31",
+    "@injectivelabs/wallet-base": "^1.15.33",
+    "@turnkey/sdk-browser": "5.2.3",
+    "@turnkey/viem": "^0.9.9",
+    "viem": "^2.31.3"
   },
   "devDependencies": {
     "jest": "^29.0.0",
@@ -77,5 +77,5 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.0.0"
   },
-  "gitHead": "5b5ea65de8584a70d9bc9f75a17d1d43e2b3bbad"
+  "gitHead": "a214c118cc513d4f635e040efdc64d108913ff96"
 }