@injectivelabs/wallet-turnkey 1.16.6-alpha.0 → 1.16.6

package/README.md

@@ -11,7 +11,7 @@ _Package to use Turnkey Wallet on Injective via the wallet strategy._
 ## 📚 Installation
 
 ```bash
-pnpm add @injectivelabs/wallet-turnkey
+yarn add @injectivelabs/wallet-turnkey
 ```
 
 ---
@@ -28,28 +28,30 @@ dependencies and implementations for their specific wallets.
 Here's a brief example of how to use this package to send 1 INJ.:
 
 ```typescript
-import { Wallet } from '@injectivelabs/wallet-base'
-import { BaseWalletStrategy, MsgBroadcaster } from '@injectivelabs/wallet-core'
-import { TurnkeyWallet } from '@injectivelabs/wallet-turnkey'
+import { Wallet } from '@injectivelabs/wallet-base';
+import { BaseWalletStrategy, MsgBroadcaster } from '@injectivelabs/wallet-core';
+import { TurnkeyWallet } from '@injectivelabs/wallet-turnkey';
+
 
 const strategyArgs: WalletStrategyArguments = {
   chainId: ChainId.Mainnet,
   wallet: Wallet.Turnkey,
   strategies: {
-    [Wallet.Turnkey]: new TurnkeyWallet({
-      onStatusChange(status) {
-        turnkeyStatus.value = status
-      },
-      chainId: injectiveClients.chainId,
-      ethereumOptions: {
-        ethereumChainId: injectiveClients.ethereumChainId!,
-      },
-      metadata: {
-        turnkeyAuthIframeContainerId,
-        defaultOrganizationId: import.meta.env.VITE_TURNKEY_DEFAULT_ORGANIZATION_ID,
-        apiBaseUrl: 'https://api.turnkey.com',
-      },
-    }),
+        [Wallet.Turnkey]: new TurnkeyWallet({
+        onStatusChange(status) {
+          turnkeyStatus.value = status
+        },
+        chainId: injectiveClients.chainId,
+        ethereumOptions: {
+          ethereumChainId: injectiveClients.ethereumChainId!,
+        },
+        metadata: {
+          turnkeyAuthIframeContainerId,
+          defaultOrganizationId: import.meta.env
+            .VITE_TURNKEY_DEFAULT_ORGANIZATION_ID,
+          apiBaseUrl: 'https://api.turnkey.com',
+        },
+      })
   },
 }
 const walletStrategy = new BaseWalletStrategy(strategyArgs)
@@ -63,21 +65,21 @@ const msgBroadcaster = new MsgBroadcaster({
 })
 
 const sendTX = async () => {
-  const injectiveAddress = 'someInjectiveAddress'
-
-  const message = MsgSend.fromJSON({
-    srcInjectiveAddress: injectiveAddress,
-    dstInjectiveAddress: injectiveAddress,
-    amount: {
-      amount: '1',
-      denom: 'inj',
-    },
-  })
-
-  return await msgBroadcaster.broadcast({ msgs: message })
-}
+    const injectiveAddress = 'someInjectiveAddress'
+
+    const message = MsgSend.fromJSON({
+      srcInjectiveAddress: injectiveAddress,
+      dstInjectiveAddress: injectiveAddress,
+      amount: {
+        amount: '1',
+        denom: 'inj',
+      },
+    })
+
+    return await msgBroadcaster.broadcast({ msgs: message })
+  }
 
-const result = await sendTX()
+  const result = await sendTX()
 ```
 
 Read more and find example usages on our [WalletStrategy Docs](https://docs.ts.injective.network/wallet/wallet-wallet-strategy)

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

@@ -1,14 +1,14 @@
 import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
-import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, WalletStrategyEvmOptions, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import { HttpRestClient } from '@injectivelabs/utils';
-import { TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
-import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
+import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
+import { TurnkeyIframeClient } from '@turnkey/sdk-browser';
+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;
-    evmOptions: WalletStrategyEvmOptions;
+    ethereumOptions: WalletStrategyEthereumOptions;
     client: HttpRestClient;
-    constructor(args: ConcreteEvmWalletStrategyArgs & {
+    constructor(args: ConcreteEthereumWalletStrategyArgs & {
         apiServerEndpoint?: string;
     });
     getWalletDeviceType(): Promise<WalletDeviceType>;
@@ -22,7 +22,7 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     getWalletClient<TurnkeyWallet>(): Promise<TurnkeyWallet>;
     sendEvmTransaction(transaction: unknown, args: {
         address: AccountAddress;
-        evmChainId: EvmChainId;
+        ethereumChainId: EthereumChainId;
     }): Promise<string>;
     sendTransaction(transaction: TxRaw, options: SendTransactionOptions): Promise<any>;
     signEip712TypedData(eip712json: string, address: AccountAddress): Promise<string>;
@@ -38,8 +38,9 @@ export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implemen
     }): Promise<AminoSignResponse>;
     signArbitrary(_signer: AccountAddress, _data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<Record<string, any>>;
+    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<Record<string, any>>;
     getPubKey(): Promise<string>;
-    getIndexedDbClient(): Promise<TurnkeyIndexedDbClient>;
+    getIframeClient(): Promise<TurnkeyIframeClient>;
     private getTurnkeyWallet;
+    private getOrganizationId;
 }

package/dist/cjs/strategy/strategy.js

@@ -5,14 +5,15 @@ exports.TurnkeyWalletStrategy = void 0;
 const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 const exceptions_1 = require("@injectivelabs/exceptions");
 const viem_1 = require("viem");
-const wallet_base_1 = require("@injectivelabs/wallet-base");
 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;
-    evmOptions;
+    ethereumOptions;
     client;
     constructor(args) {
         super(args);
@@ -21,7 +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.evmOptions = args.evmOptions;
+        this.ethereumOptions = args.ethereumOptions;
     }
     async getWalletDeviceType() {
         return Promise.resolve(wallet_base_1.WalletDeviceType.Browser);
@@ -49,7 +50,7 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
                 }
                 return true;
             }
-            return !!(await turnkeyWallet.getIndexedDbClient());
+            return !!(await turnkeyWallet.getIframeClient());
         }
         catch (e) {
             return false;
@@ -58,15 +59,15 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     async disconnect() {
         const turnkeyWallet = await this.getTurnkeyWallet();
         const turnkey = await turnkeyWallet.getTurnkey();
-        const indexedDbClient = await turnkeyWallet.getIndexedDbClient();
         const isUserLoggedIn = await turnkey.getSession();
         if (!isUserLoggedIn) {
             return;
         }
-        await Promise.allSettled([turnkey.logout(), indexedDbClient.clear()]);
+        await turnkey.logout();
     }
     async getAddresses() {
         const turnkeyWallet = await this.getTurnkeyWallet();
+        await turnkeyWallet.getSession();
         try {
             return await turnkeyWallet.getAccounts();
         }
@@ -91,18 +92,19 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     }
     async sendEvmTransaction(transaction, args) {
         try {
-            const options = this.evmOptions;
+            const options = this.ethereumOptions;
             const turnkeyWallet = await this.getTurnkeyWallet();
-            const chainId = args.evmChainId || options.evmChainId;
-            const url = options.rpcUrl || options.rpcUrls?.[args.evmChainId];
+            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 evmOptions'), {
+                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));
-            const accountClient = (0, viem_1.createWalletClient)({
+            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,
@@ -113,7 +115,7 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
                         },
                     },
                 },
-                transport: (0, viem_1.http)(url),
+                transport: (0, viem_2.http)(url),
             });
             const preparedTransaction = await accountClient.prepareTransactionRequest(transaction);
             delete preparedTransaction.account;
@@ -148,9 +150,10 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     }
     async signEip712TypedData(eip712json, address) {
         const turnkeyWallet = await this.getTurnkeyWallet();
+        const organizationId = await this.getOrganizationId();
         //? Turnkey expects the case sensitive address and the current impl of getChecksumAddress from sdk-ts doesn't play nice with browser envs
         const checksumAddress = (0, viem_1.getAddress)(address);
-        const account = await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress);
+        const account = await turnkeyWallet.getOrCreateAndGetAccount(checksumAddress, organizationId);
         if (!account) {
             throw new exceptions_1.WalletException(new Error('Turnkey account not found'));
         }
@@ -196,19 +199,19 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
             context: wallet_base_1.WalletAction.GetChainId,
         });
     }
-    async getEvmTransactionReceipt(txHash, evmChainId) {
-        const options = this.evmOptions;
+    async getEvmTransactionReceipt(txHash, ethereumChainId) {
+        const options = this.ethereumOptions;
         const maxAttempts = 10;
         const interval = 3000;
-        const chainId = evmChainId || options.evmChainId;
+        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 evmOptions'), {
+            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_1.createPublicClient)({
+        const publicClient = (0, viem_2.createPublicClient)({
             chain: {
                 ...consts_js_1.DEFAULT_EVM_CHAIN_CONFIG,
                 id: chainId,
@@ -218,7 +221,7 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
                     },
                 },
             },
-            transport: (0, viem_1.http)(url),
+            transport: (0, viem_2.http)(url),
         });
         let attempts = 0;
         while (attempts < maxAttempts) {
@@ -240,10 +243,9 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     async getPubKey() {
         throw new exceptions_1.WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
     }
-    async getIndexedDbClient() {
+    async getIframeClient() {
         const turnkeyWallet = await this.getTurnkeyWallet();
-        const indexedDbClient = await turnkeyWallet.getIndexedDbClient();
-        return indexedDbClient;
+        return turnkeyWallet.getIframeClient();
     }
     async getTurnkeyWallet() {
         const { metadata } = this;
@@ -257,9 +259,21 @@ class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
             if (!metadata.turnkey.apiServerEndpoint) {
                 throw new exceptions_1.WalletException(new Error('Turnkey apiServerEndpoint is required'));
             }
+            if (!metadata.turnkey.defaultOrganizationId) {
+                throw new exceptions_1.WalletException(new Error('Turnkey defaultOrganizationId is required'));
+            }
             this.turnkeyWallet = new turnkey_js_1.TurnkeyWallet(metadata.turnkey);
         }
         return this.turnkeyWallet;
     }
+    async getOrganizationId() {
+        const { metadata } = this;
+        const organizationId = metadata?.turnkey?.organizationId ||
+            metadata?.turnkey?.defaultOrganizationId;
+        if (!organizationId) {
+            throw new exceptions_1.WalletException(new Error('Organization ID is required'));
+        }
+        return organizationId;
+    }
 }
 exports.TurnkeyWalletStrategy = TurnkeyWalletStrategy;

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

@@ -1,13 +1,13 @@
-import type { TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
+import type { TurnkeyIframeClient } from '@turnkey/sdk-browser';
 import { type HttpRestClient } from '@injectivelabs/utils';
 export declare class TurnkeyOauthWallet {
-    static generateOAuthNonce(indexedDbClient: TurnkeyIndexedDbClient): Promise<string>;
+    static generateOAuthNonce(iframeClient: TurnkeyIframeClient): Promise<string>;
     static oauthLogin(args: {
         oidcToken: string;
         client: HttpRestClient;
         oauthLoginPath?: string;
         providerName: 'google' | 'apple';
-        indexedDbClient: TurnkeyIndexedDbClient;
+        iframeClient: TurnkeyIframeClient;
         expirationSeconds?: number;
     }): Promise<{
         organizationId: string;

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

@@ -5,10 +5,9 @@ const exceptions_1 = require("@injectivelabs/exceptions");
 const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 const consts_js_1 = require("../consts.js");
 class TurnkeyOauthWallet {
-    static async generateOAuthNonce(indexedDbClient) {
+    static async generateOAuthNonce(iframeClient) {
         try {
-            await indexedDbClient.resetKeyPair();
-            const targetPublicKey = await indexedDbClient.getPublicKey();
+            const targetPublicKey = iframeClient.iframePublicKey;
             if (!targetPublicKey) {
                 throw new exceptions_1.WalletException(new Error('Target public key not found'));
             }
@@ -25,10 +24,10 @@ class TurnkeyOauthWallet {
         }
     }
     static async oauthLogin(args) {
-        const { client, indexedDbClient, expirationSeconds } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         const path = args.oauthLoginPath || consts_js_1.TURNKEY_OAUTH_PATH;
         try {
-            const targetPublicKey = await indexedDbClient.getPublicKey();
+            const targetPublicKey = iframeClient.iframePublicKey;
             if (!targetPublicKey) {
                 throw new exceptions_1.WalletException(new Error('Target public key not found'));
             }

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

@@ -1,4 +1,4 @@
-import { TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
+import { type TurnkeyIframeClient } from '@turnkey/sdk-browser';
 import { type TurnkeyConfirmEmailOTPResponse, type TurnkeyOTPCredentialsResponse } from './../types.js';
 import { type HttpRestClient } from '@injectivelabs/utils';
 export declare class TurnkeyOtpWallet {
@@ -7,16 +7,15 @@ export declare class TurnkeyOtpWallet {
         subOrgId?: string;
         otpInitPath?: string;
         client: HttpRestClient;
-        indexedDbClient: TurnkeyIndexedDbClient;
+        iframeClient: TurnkeyIframeClient;
         invalidateExistingSessions?: boolean;
-        expirationSeconds?: number;
     }): Promise<TurnkeyOTPCredentialsResponse | undefined>;
     static confirmEmailOTP(args: {
         otpCode: string;
         emailOTPId: string;
         client: HttpRestClient;
-        targetPublicKey: string;
         organizationId: string;
+        iframeClient: TurnkeyIframeClient;
         otpVerifyPath?: string;
         expirationSeconds?: number;
     }): Promise<TurnkeyConfirmEmailOTPResponse | undefined>;

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

@@ -5,21 +5,18 @@ const exceptions_1 = require("@injectivelabs/exceptions");
 const consts_js_1 = require("../consts.js");
 class TurnkeyOtpWallet {
     static async initEmailOTP(args) {
-        const { client, indexedDbClient, expirationSeconds } = args;
+        const { client, iframeClient } = args;
         try {
-            await indexedDbClient.resetKeyPair();
-            let publicKey = await indexedDbClient.getPublicKey();
-            if (!publicKey) {
-                throw new exceptions_1.WalletException(new Error('Public key not found'));
+            const targetPublicKey = iframeClient.iframePublicKey;
+            if (!targetPublicKey) {
+                throw new exceptions_1.WalletException(new Error('Target public key not found'));
             }
             // client.$post is undefined, resorting to this for now
             const response = await client.post(args.otpInitPath || consts_js_1.TURNKEY_OTP_INIT_PATH, {
-                targetPublicKey: publicKey,
+                targetPublicKey,
                 email: args.email,
                 suborgId: args.subOrgId,
                 invalidateExistingSessions: args.invalidateExistingSessions,
-                isUsingIndexedDB: true,
-                expirationSeconds: expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS,
             });
             return response?.data;
         }
@@ -32,11 +29,15 @@ class TurnkeyOtpWallet {
         }
     }
     static async confirmEmailOTP(args) {
-        const { client, expirationSeconds, targetPublicKey } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         try {
             const organizationId = args.organizationId;
             const emailOTPId = args.emailOTPId;
+            const targetPublicKey = iframeClient.iframePublicKey;
             const otpVerifyPath = args.otpVerifyPath || consts_js_1.TURNKEY_OTP_VERIFY_PATH;
+            if (!targetPublicKey) {
+                throw new exceptions_1.WalletException(new Error('Target public key not found'));
+            }
             if (!emailOTPId) {
                 throw new exceptions_1.WalletException(new Error('Email OTP ID is required'));
             }
@@ -44,7 +45,6 @@ class TurnkeyOtpWallet {
                 throw new exceptions_1.WalletException(new Error('Organization ID is required'));
             }
             const response = await client.post(otpVerifyPath, {
-                isUsingIndexedDB: true,
                 targetPublicKey,
                 otpId: emailOTPId,
                 otpCode: args.otpCode,

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

@@ -1,33 +1,37 @@
 import { TurnkeyMetadata, TurnkeyProvider } from '@injectivelabs/wallet-base';
 import { createAccount } from '@turnkey/viem';
 import { HttpRestClient } from '@injectivelabs/utils';
-import { Turnkey, TurnkeyIndexedDbClient } from '@turnkey/sdk-browser';
+import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
 export declare class TurnkeyWallet {
     private otpId?;
     protected turnkey?: Turnkey;
-    userOrganizationId?: string;
+    organizationId: string;
     protected client: HttpRestClient;
     private metadata;
-    protected indexedDbClient?: TurnkeyIndexedDbClient;
+    protected iframeClient?: TurnkeyIframeClient;
     private accountMap;
     setMetadata(metadata: Partial<TurnkeyMetadata>): void;
     constructor(metadata: TurnkeyMetadata);
     static getTurnkeyInstance(metadata: TurnkeyMetadata): Promise<{
         turnkey: Turnkey;
-        indexedDbClient: TurnkeyIndexedDbClient;
+        iframeClient: TurnkeyIframeClient;
     }>;
     getTurnkey(): Promise<Turnkey>;
-    getIndexedDbClient(): Promise<TurnkeyIndexedDbClient>;
+    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): Promise<ReturnType<typeof createAccount>>;
+    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<ReturnType<typeof createAccount>>;
+    injectAndRefresh(credentialBundle: string, options: {
+        expirationSeconds?: string;
+        organizationId?: string;
+    }): Promise<void>;
     initOTP(email: string): Promise<import("../types.js").TurnkeyOTPCredentialsResponse>;
     confirmOTP(otpCode: string): Promise<import("../types.js").TurnkeyConfirmEmailOTPResponse>;
     initOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple): Promise<string>;
     confirmOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple, oidcToken: string): Promise<string>;
     refreshSession(): Promise<string>;
-    private initClient;
+    private initFrame;
 }