@turnkey/core 1.0.0-beta.2 → 1.0.0-beta.5

package/dist/__wallet__/web/native/solana.js

@@ -6,43 +6,26 @@ var encoding = require('@turnkey/encoding');
 var base = require('../../../__types__/base.js');
 
 /**
- * Casts a WalletRpcProvider to a Wallet Standard Solana provider.
+ * Abstract base class for Solana wallet implementations using Wallet Standard.
  *
- * @param p - The wallet provider to cast.
- * @returns The casted Wallet Standard wallet.
- * @throws If the provider is not a Wallet Standard Solana wallet.
- */
-const asSolana = (p) => {
-    if (p.provider &&
-        "features" in p.provider &&
-        "solana:signMessage" in p.provider.features) {
-        return p.provider;
-    }
-    throw new Error("Expected a Wallet-Standard provider (Solana wallet)");
-};
-/**
- * Connects the given Solana wallet account.
- *
- * @param w - The wallet to connect.
- * @returns A promise that resolves once the wallet is connected.
- * @throws If the wallet does not support standard:connect.
- */
-const connectAccount = async (w) => {
-    if (w.accounts.length)
-        return;
-    const stdConnect = w.features["standard:connect"];
-    if (stdConnect) {
-        await stdConnect.connect();
-        return;
-    }
-    throw new Error("Wallet is not connected and does not implement standard:connect");
-};
-/**
- * Abstract class representing a base Solana wallet.
+ * Provides shared logic for:
+ * - Provider discovery via `@wallet-standard/app` (`getWallets()`).
+ * - Connecting via `standard:connect` and disconnecting via `standard:disconnect`.
+ * - Public key retrieval from the wallet's account address (base58 → hex).
  */
 class BaseSolanaWallet {
     constructor() {
         this.interfaceType = base.WalletInterfaceType.Solana;
+        /**
+         * Retrieves the ed25519 public key for the active account as hex (no 0x prefix).
+         *
+         * - Ensures the wallet is connected (calls `standard:connect` if needed).
+         * - Decodes the Wallet Standard account address (base58) to raw bytes.
+         *
+         * @param provider - The wallet provider to use.
+         * @returns Hex-encoded ed25519 public key (no 0x prefix).
+         * @throws {Error} If no account is available.
+         */
         this.getPublicKey = async (provider) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
@@ -53,6 +36,15 @@ class BaseSolanaWallet {
             const rawBytes = bs58.decode(account.address);
             return encoding.uint8ArrayToHexString(rawBytes);
         };
+        /**
+         * Discovers Solana-capable Wallet Standard providers.
+         *
+         * - Uses `getWallets().get()` and filters wallets with at least one `chains` entry
+         *   starting with `"solana:"`.
+         * - For each wallet, collects branding info and any currently connected addresses.
+         *
+         * @returns A list of discovered Solana `WalletProvider`s (may be empty).
+         */
         this.getProviders = async () => {
             const discovered = [];
             const walletsApi = app.getWallets();
@@ -80,10 +72,29 @@ class BaseSolanaWallet {
             }));
             return discovered;
         };
+        /**
+         * Connects the wallet account, prompting the user if necessary.
+         *
+         * - Calls `standard:connect` only if no accounts are present. This will prompt the user to connect their wallet.
+         *
+         * @param provider - The wallet provider to connect.
+         * @returns A promise that resolves once the wallet has ≥ 1 account.
+         * @throws {Error} If the wallet does not implement `standard:connect`.
+         */
         this.connectWalletAccount = async (provider) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
         };
+        /**
+         * Disconnects the wallet account using Wallet Standard.
+         *
+         * - Calls `standard:disconnect` if implemented.
+         * - Throws if the wallet does not implement `standard:disconnect`.
+         *
+         * @param provider - The wallet provider to disconnect.
+         * @returns A promise that resolves once the wallet disconnects.
+         * @throws {Error} If `standard:disconnect` is not supported by the wallet.
+         */
         this.disconnectWalletAccount = async (provider) => {
             const wallet = asSolana(provider);
             const disconnectFeature = wallet.features["standard:disconnect"];
@@ -97,12 +108,22 @@ class BaseSolanaWallet {
     }
 }
 /**
- * SolanaWallet class implementing signing logic for Solana wallets.
+ * Signs a message or transaction with the connected Solana wallet.
+ *
+ * - Ensures the wallet is connected (may prompt via `standard:connect` if its not).
+ * - `SignMessage` → `solana:signMessage` (returns hex signature).
+ * - `SignTransaction` → `solana:signTransaction` (returns hex signature).
+ *
+ * @param payload - UTF-8 string (for message) or hex string (for transaction bytes).
+ * @param provider - The wallet provider to use.
+ * @param intent - The signing intent.
+ * @returns Hex-encoded signature (no 0x prefix).
+ * @throws {Error} If the provider lacks required features or intent is unsupported.
  */
 class SolanaWallet extends BaseSolanaWallet {
     constructor() {
         super(...arguments);
-        this.sign = async (message, provider, intent) => {
+        this.sign = async (payload, provider, intent) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
             const account = wallet.accounts[0];
@@ -113,7 +134,7 @@ class SolanaWallet extends BaseSolanaWallet {
                     const signFeature = wallet.features["solana:signMessage"];
                     if (!signFeature)
                         throw new Error("Provider does not support solana:signMessage");
-                    const data = new TextEncoder().encode(message);
+                    const data = new TextEncoder().encode(payload);
                     const results = await signFeature.signMessage({
                         account,
                         message: data,
@@ -127,7 +148,7 @@ class SolanaWallet extends BaseSolanaWallet {
                     const signFeature = wallet.features["solana:signTransaction"];
                     if (!signFeature)
                         throw new Error("Provider does not support solana:signTransaction");
-                    const data = encoding.uint8ArrayFromHexString(message);
+                    const data = encoding.uint8ArrayFromHexString(payload);
                     const results = await signFeature.signTransaction({
                         account,
                         transaction: data,
@@ -143,6 +164,44 @@ class SolanaWallet extends BaseSolanaWallet {
         };
     }
 }
+/**
+ * Casts a WalletRpcProvider to a Wallet Standard Solana wallet.
+ *
+ * - Validates presence of the Wallet Standard `features` map and `solana:signMessage`.
+ * - Use this before calling Solana-specific features (signMessage, signTransaction, etc.).
+ *
+ * @param provider - The wallet provider to cast.
+ * @returns The Wallet Standard wallet object.
+ * @throws {Error} If the provider is not a Wallet Standard Solana wallet.
+ */
+const asSolana = (provider) => {
+    if (provider.provider &&
+        "features" in provider.provider &&
+        "solana:signMessage" in provider.provider.features) {
+        return provider.provider;
+    }
+    throw new Error("Expected a Wallet-Standard provider (Solana wallet)");
+};
+/**
+ * Ensures the given Wallet Standard wallet has at least one connected account.
+ *
+ * - If accounts already exist, resolves immediately.
+ * - If not, attempts `standard:connect`, which may prompt the user.
+ *
+ * @param wallet - The Wallet Standard wallet to connect.
+ * @returns A promise that resolves once the wallet has ≥ 1 account.
+ * @throws {Error} If the wallet does not implement `standard:connect`.
+ */
+const connectAccount = async (wallet) => {
+    if (wallet.accounts.length)
+        return;
+    const stdConnect = wallet.features["standard:connect"];
+    if (stdConnect) {
+        await stdConnect.connect();
+        return;
+    }
+    throw new Error("Wallet is not connected and does not implement standard:connect");
+};
 
 exports.BaseSolanaWallet = BaseSolanaWallet;
 exports.SolanaWallet = SolanaWallet;

package/dist/__wallet__/web/native/solana.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana.js","sources":["../../../../src/__wallet__/web/native/solana.ts"],"sourcesContent":[null],"names":["WalletInterfaceType","uint8ArrayToHexString","getWallets","Chain","SignIntent","uint8ArrayFromHexString"],"mappings":"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"}
+{"version":3,"file":"solana.js","sources":["../../../../src/__wallet__/web/native/solana.ts"],"sourcesContent":[null],"names":["WalletInterfaceType","uint8ArrayToHexString","getWallets","Chain","SignIntent","uint8ArrayFromHexString"],"mappings":"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"}

package/dist/__wallet__/web/native/solana.mjs

@@ -4,43 +4,26 @@ import { uint8ArrayFromHexString, uint8ArrayToHexString } from '@turnkey/encodin
 import { SignIntent, WalletInterfaceType, Chain } from '../../../__types__/base.mjs';
 
 /**
- * Casts a WalletRpcProvider to a Wallet Standard Solana provider.
+ * Abstract base class for Solana wallet implementations using Wallet Standard.
  *
- * @param p - The wallet provider to cast.
- * @returns The casted Wallet Standard wallet.
- * @throws If the provider is not a Wallet Standard Solana wallet.
- */
-const asSolana = (p) => {
-    if (p.provider &&
-        "features" in p.provider &&
-        "solana:signMessage" in p.provider.features) {
-        return p.provider;
-    }
-    throw new Error("Expected a Wallet-Standard provider (Solana wallet)");
-};
-/**
- * Connects the given Solana wallet account.
- *
- * @param w - The wallet to connect.
- * @returns A promise that resolves once the wallet is connected.
- * @throws If the wallet does not support standard:connect.
- */
-const connectAccount = async (w) => {
-    if (w.accounts.length)
-        return;
-    const stdConnect = w.features["standard:connect"];
-    if (stdConnect) {
-        await stdConnect.connect();
-        return;
-    }
-    throw new Error("Wallet is not connected and does not implement standard:connect");
-};
-/**
- * Abstract class representing a base Solana wallet.
+ * Provides shared logic for:
+ * - Provider discovery via `@wallet-standard/app` (`getWallets()`).
+ * - Connecting via `standard:connect` and disconnecting via `standard:disconnect`.
+ * - Public key retrieval from the wallet's account address (base58 → hex).
  */
 class BaseSolanaWallet {
     constructor() {
         this.interfaceType = WalletInterfaceType.Solana;
+        /**
+         * Retrieves the ed25519 public key for the active account as hex (no 0x prefix).
+         *
+         * - Ensures the wallet is connected (calls `standard:connect` if needed).
+         * - Decodes the Wallet Standard account address (base58) to raw bytes.
+         *
+         * @param provider - The wallet provider to use.
+         * @returns Hex-encoded ed25519 public key (no 0x prefix).
+         * @throws {Error} If no account is available.
+         */
         this.getPublicKey = async (provider) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
@@ -51,6 +34,15 @@ class BaseSolanaWallet {
             const rawBytes = bs58.decode(account.address);
             return uint8ArrayToHexString(rawBytes);
         };
+        /**
+         * Discovers Solana-capable Wallet Standard providers.
+         *
+         * - Uses `getWallets().get()` and filters wallets with at least one `chains` entry
+         *   starting with `"solana:"`.
+         * - For each wallet, collects branding info and any currently connected addresses.
+         *
+         * @returns A list of discovered Solana `WalletProvider`s (may be empty).
+         */
         this.getProviders = async () => {
             const discovered = [];
             const walletsApi = getWallets();
@@ -78,10 +70,29 @@ class BaseSolanaWallet {
             }));
             return discovered;
         };
+        /**
+         * Connects the wallet account, prompting the user if necessary.
+         *
+         * - Calls `standard:connect` only if no accounts are present. This will prompt the user to connect their wallet.
+         *
+         * @param provider - The wallet provider to connect.
+         * @returns A promise that resolves once the wallet has ≥ 1 account.
+         * @throws {Error} If the wallet does not implement `standard:connect`.
+         */
         this.connectWalletAccount = async (provider) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
         };
+        /**
+         * Disconnects the wallet account using Wallet Standard.
+         *
+         * - Calls `standard:disconnect` if implemented.
+         * - Throws if the wallet does not implement `standard:disconnect`.
+         *
+         * @param provider - The wallet provider to disconnect.
+         * @returns A promise that resolves once the wallet disconnects.
+         * @throws {Error} If `standard:disconnect` is not supported by the wallet.
+         */
         this.disconnectWalletAccount = async (provider) => {
             const wallet = asSolana(provider);
             const disconnectFeature = wallet.features["standard:disconnect"];
@@ -95,12 +106,22 @@ class BaseSolanaWallet {
     }
 }
 /**
- * SolanaWallet class implementing signing logic for Solana wallets.
+ * Signs a message or transaction with the connected Solana wallet.
+ *
+ * - Ensures the wallet is connected (may prompt via `standard:connect` if its not).
+ * - `SignMessage` → `solana:signMessage` (returns hex signature).
+ * - `SignTransaction` → `solana:signTransaction` (returns hex signature).
+ *
+ * @param payload - UTF-8 string (for message) or hex string (for transaction bytes).
+ * @param provider - The wallet provider to use.
+ * @param intent - The signing intent.
+ * @returns Hex-encoded signature (no 0x prefix).
+ * @throws {Error} If the provider lacks required features or intent is unsupported.
  */
 class SolanaWallet extends BaseSolanaWallet {
     constructor() {
         super(...arguments);
-        this.sign = async (message, provider, intent) => {
+        this.sign = async (payload, provider, intent) => {
             const wallet = asSolana(provider);
             await connectAccount(wallet);
             const account = wallet.accounts[0];
@@ -111,7 +132,7 @@ class SolanaWallet extends BaseSolanaWallet {
                     const signFeature = wallet.features["solana:signMessage"];
                     if (!signFeature)
                         throw new Error("Provider does not support solana:signMessage");
-                    const data = new TextEncoder().encode(message);
+                    const data = new TextEncoder().encode(payload);
                     const results = await signFeature.signMessage({
                         account,
                         message: data,
@@ -125,7 +146,7 @@ class SolanaWallet extends BaseSolanaWallet {
                     const signFeature = wallet.features["solana:signTransaction"];
                     if (!signFeature)
                         throw new Error("Provider does not support solana:signTransaction");
-                    const data = uint8ArrayFromHexString(message);
+                    const data = uint8ArrayFromHexString(payload);
                     const results = await signFeature.signTransaction({
                         account,
                         transaction: data,
@@ -141,6 +162,44 @@ class SolanaWallet extends BaseSolanaWallet {
         };
     }
 }
+/**
+ * Casts a WalletRpcProvider to a Wallet Standard Solana wallet.
+ *
+ * - Validates presence of the Wallet Standard `features` map and `solana:signMessage`.
+ * - Use this before calling Solana-specific features (signMessage, signTransaction, etc.).
+ *
+ * @param provider - The wallet provider to cast.
+ * @returns The Wallet Standard wallet object.
+ * @throws {Error} If the provider is not a Wallet Standard Solana wallet.
+ */
+const asSolana = (provider) => {
+    if (provider.provider &&
+        "features" in provider.provider &&
+        "solana:signMessage" in provider.provider.features) {
+        return provider.provider;
+    }
+    throw new Error("Expected a Wallet-Standard provider (Solana wallet)");
+};
+/**
+ * Ensures the given Wallet Standard wallet has at least one connected account.
+ *
+ * - If accounts already exist, resolves immediately.
+ * - If not, attempts `standard:connect`, which may prompt the user.
+ *
+ * @param wallet - The Wallet Standard wallet to connect.
+ * @returns A promise that resolves once the wallet has ≥ 1 account.
+ * @throws {Error} If the wallet does not implement `standard:connect`.
+ */
+const connectAccount = async (wallet) => {
+    if (wallet.accounts.length)
+        return;
+    const stdConnect = wallet.features["standard:connect"];
+    if (stdConnect) {
+        await stdConnect.connect();
+        return;
+    }
+    throw new Error("Wallet is not connected and does not implement standard:connect");
+};
 
 export { BaseSolanaWallet, SolanaWallet };
 //# sourceMappingURL=solana.mjs.map

package/dist/__wallet__/web/native/solana.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"solana.mjs","sources":["../../../../src/__wallet__/web/native/solana.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"solana.mjs","sources":["../../../../src/__wallet__/web/native/solana.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -5,5 +5,6 @@ export { type TWebauthnStamperConfig, WebauthnStamper, } from "@turnkey/webauthn
 export { TurnkeyClient, type TurnkeyClientMethods } from "./__clients__/core";
 export { type TurnkeySDKClientBase } from "./__generated__/sdk-client-base";
 export * from "./__types__/base";
-export { generateWalletAccountsFromAddressFormat, isEthereumWallet, isSolanaWallet, getAuthProxyConfig, addressFormatConfig, } from "./utils";
+/**@internal */
+export { generateWalletAccountsFromAddressFormat, isEthereumProvider, isSolanaProvider, getAuthProxyConfig, addressFormatConfig, } from "./utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,gBAAgB;AAChB,OAAO,EACL,aAAa,EACb,cAAc,EACd,KAAK,oBAAoB,GAC1B,MAAM,0BAA0B,CAAC;AAGlC,gBAAgB;AAChB,OAAO,EACL,KAAK,sBAAsB,EAC3B,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,cAAc,kBAAkB,CAAC;AAEjC,OAAO,EACL,uCAAuC,EACvC,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,gBAAgB;AAChB,OAAO,EACL,aAAa,EACb,cAAc,EACd,KAAK,oBAAoB,GAC1B,MAAM,0BAA0B,CAAC;AAGlC,gBAAgB;AAChB,OAAO,EACL,KAAK,sBAAsB,EAC3B,eAAe,GAChB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,cAAc,kBAAkB,CAAC;AAEjC,eAAe;AACf,OAAO,EACL,uCAAuC,EACvC,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,SAAS,CAAC"}

package/dist/index.js

@@ -23,10 +23,6 @@ Object.defineProperty(exports, "WebauthnStamper", {
 	get: function () { return webauthnStamper.WebauthnStamper; }
 });
 exports.TurnkeyClient = core.TurnkeyClient;
-Object.defineProperty(exports, "AuthClient", {
-	enumerable: true,
-	get: function () { return base.AuthClient; }
-});
 Object.defineProperty(exports, "Chain", {
 	enumerable: true,
 	get: function () { return base.Chain; }
@@ -40,10 +36,6 @@ Object.defineProperty(exports, "FilterType", {
 	enumerable: true,
 	get: function () { return base.FilterType; }
 });
-Object.defineProperty(exports, "MethodType", {
-	enumerable: true,
-	get: function () { return base.MethodType; }
-});
 Object.defineProperty(exports, "OtpType", {
 	enumerable: true,
 	get: function () { return base.OtpType; }
@@ -73,6 +65,6 @@ Object.defineProperty(exports, "WalletSource", {
 exports.addressFormatConfig = utils.addressFormatConfig;
 exports.generateWalletAccountsFromAddressFormat = utils.generateWalletAccountsFromAddressFormat;
 exports.getAuthProxyConfig = utils.getAuthProxyConfig;
-exports.isEthereumWallet = utils.isEthereumWallet;
-exports.isSolanaWallet = utils.isSolanaWallet;
+exports.isEthereumProvider = utils.isEthereumProvider;
+exports.isSolanaProvider = utils.isSolanaProvider;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/index.mjs

@@ -2,7 +2,7 @@ export { ApiKeyStamper, signWithApiKey } from '@turnkey/api-key-stamper';
 export { WebauthnStamper } from '@turnkey/webauthn-stamper';
 export { TurnkeyClient } from './__clients__/core.mjs';
 import '@turnkey/http';
-export { AuthClient, Chain, Curve, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, FilterType, MethodType, OtpType, OtpTypeToFilterTypeMap, SessionKey, SignIntent, StamperType, TurnkeyRequestError, WalletInterfaceType, WalletSource } from './__types__/base.mjs';
+export { Chain, Curve, DEFAULT_SESSION_EXPIRATION_IN_SECONDS, FilterType, OtpType, OtpTypeToFilterTypeMap, SessionKey, SignIntent, StamperType, TurnkeyRequestError, WalletInterfaceType, WalletSource } from './__types__/base.mjs';
 import '@turnkey/sdk-types';
-export { addressFormatConfig, generateWalletAccountsFromAddressFormat, getAuthProxyConfig, isEthereumWallet, isSolanaWallet } from './utils.mjs';
+export { addressFormatConfig, generateWalletAccountsFromAddressFormat, getAuthProxyConfig, isEthereumProvider, isSolanaProvider } from './utils.mjs';
 //# sourceMappingURL=index.mjs.map

package/dist/utils.d.ts

@@ -1,11 +1,27 @@
-import { type v1AddressFormat, type v1HashFunction, type v1PayloadEncoding, type Session, type externaldatav1Timestamp, type ProxyTSignupBody, type v1WalletAccountParams, type v1WalletAccount, v1SignRawPayloadResult, v1TransactionType, ProxyTGetWalletKitConfigResponse } from "@turnkey/sdk-types";
-import { type CreateSubOrgParams, SignIntent, type WalletProvider } from "@types";
+import { type v1AddressFormat, type v1HashFunction, type v1PayloadEncoding, type Session, type externaldatav1Timestamp, type ProxyTSignupBody, type v1WalletAccountParams, type v1WalletAccount, TurnkeyErrorCodes, v1SignRawPayloadResult, v1TransactionType, ProxyTGetWalletKitConfigResponse } from "@turnkey/sdk-types";
+import { type CreateSubOrgParams, type WalletProvider, EvmChainInfo, SolanaChainInfo } from "@types";
 type AddressFormatConfig = {
     encoding: v1PayloadEncoding;
     hashFunction: v1HashFunction;
     defaultAccounts: v1WalletAccountParams[] | null;
     displayName: string;
 };
+/**
+ * Configuration for all supported address formats.
+ *
+ * Includes:
+ * - encoding type
+ * - hash function
+ * - default accounts for the address format
+ * - display name for the address format
+ *
+ * ```ts
+ * // Example usage:
+ * import { addressFormatConfig } from "@turnkey/sdk-core";
+ *
+ * const config = addressFormatConfig["ADDRESS_FORMAT_ETHEREUM"];
+ * ```
+ */
 export declare const addressFormatConfig: Record<v1AddressFormat, AddressFormatConfig>;
 export declare const googleISS = "https://accounts.google.com";
 export declare const isReactNative: () => boolean;
@@ -22,18 +38,10 @@ export declare const broadcastTransaction: (params: {
     rpcUrl: string;
     transactionType: v1TransactionType;
 }) => Promise<string>;
-export declare const getWalletAccountMethods: (sign: (message: string, provider: WalletProvider, intent: SignIntent) => Promise<string>, provider: WalletProvider) => {
-    signMessage: (input: string) => Promise<string>;
-    signAndSendTransaction: (input: string) => Promise<string>;
-    signTransaction?: never;
-} | {
-    signMessage: (input: string) => Promise<string>;
-    signTransaction: (input: string) => Promise<string>;
-    signAndSendTransaction?: never;
-};
 export declare function splitSignature(signature: string, addressFormat: v1AddressFormat): v1SignRawPayloadResult;
 export declare function isWalletAccountArray(arr: any[]): arr is v1WalletAccountParams[];
 export declare function createWalletAccountFromAddressFormat(addressFormat: v1AddressFormat): v1WalletAccountParams;
+/**@internal */
 export declare function generateWalletAccountsFromAddressFormat(params: {
     addresses: v1AddressFormat[];
     existingWalletAccounts?: v1WalletAccount[];
@@ -47,8 +55,46 @@ export declare function buildSignUpBody(params: {
  * @returns The public key as a hex string
  */
 export declare function getPublicKeyFromStampHeader(stampHeaderValue: string): string;
-export declare function isEthereumWallet(wallet: WalletProvider): boolean;
-export declare function isSolanaWallet(wallet: WalletProvider): boolean;
+/**@internal */
+export declare function isEthereumProvider(provider: WalletProvider): provider is WalletProvider & {
+    chainInfo: EvmChainInfo;
+};
+/**@internal */
+export declare function isSolanaProvider(provider: WalletProvider): provider is WalletProvider & {
+    chainInfo: SolanaChainInfo;
+};
+/** @internal */
+export declare function findWalletProviderFromAddress(address: string, providers: WalletProvider[]): WalletProvider | undefined;
+/**@internal */
 export declare function getAuthProxyConfig(authProxyConfigId: string, authProxyUrl?: string | undefined): Promise<ProxyTGetWalletKitConfigResponse>;
+/**
+ * @internal
+ * Executes an async function with error handling.
+ *
+ * @param fn The async function to execute with error handling
+ * @param errorOptions Options for customizing error handling
+ * @param errorOptions.catchFn Optional function to execute in the catch block
+ * @param errorOptions.errorMessage The default error message to use if no custom message is found
+ * @param errorOptions.errorCode The default error code to use if no custom message is found
+ * @param errorOptions.customMessageByCodes Optional mapping of error codes to custom messages, if you're trying to target a specific error code and surface a custom message, use this
+ * @param errorOptions.customMessageByMessages Optional mapping of error messages to custom messages, if you're trying to target a specific error message and surface a custom message, use this
+ * @param finallyFn Optional function to execute in the finally block
+ * @returns The result of the async function or throws an error
+ */
+export declare function withTurnkeyErrorHandling<T>(fn: () => Promise<T>, catchOptions: {
+    catchFn?: () => Promise<void>;
+    errorMessage: string;
+    errorCode: TurnkeyErrorCodes;
+    customMessageByCodes?: Partial<Record<TurnkeyErrorCodes, {
+        message: string;
+        code: TurnkeyErrorCodes;
+    }>>;
+    customMessageByMessages?: Record<string, {
+        message: string;
+        code: TurnkeyErrorCodes;
+    }>;
+}, finallyOptions?: {
+    finallyFn: () => Promise<void>;
+}): Promise<T>;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,uBAAuB,EAC5B,KAAK,gBAAgB,EAIrB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EAGpB,sBAAsB,EACtB,iBAAiB,EACjB,gCAAgC,EACjC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,KAAK,kBAAkB,EACvB,UAAU,EACV,KAAK,cAAc,EAIpB,MAAM,QAAQ,CAAC;AA2ChB,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,YAAY,EAAE,cAAc,CAAC;IAC7B,eAAe,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC;IAChD,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,eAAe,EAAE,mBAAmB,CA0N1E,CAAC;AAEJ,eAAO,MAAM,SAAS,gCAAgC,CAAC;AAEvD,eAAO,MAAM,aAAa,QAAO,OAIhC,CAAC;AAEF,eAAO,MAAM,KAAK,QAAO,OAExB,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAO,WAIvC,CAAC;AAMF,eAAO,MAAM,UAAU,UAAW,UAAU,KAAG,MAO9C,CAAC;AAEF,eAAO,MAAM,mBAAmB,UACxB,IAAI,KACT,uBASF,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAiC7D;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,eAAe,kBAS7D;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,eAAe,qBAS7D;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,eAAe,EAC9B,UAAU,EAAE,MAAM,GACjB,MAAM,CAeR;AAED,eAAO,MAAM,oBAAoB,WAAkB;IACjD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,iBAAiB,CAAC;CACpC,KAAG,QAAQ,MAAM,CA6EjB,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAEvB,MAAM,YACL,cAAc,UAChB,UAAU,KACf,QAAQ,MAAM,CAAC,YACV,cAAc;yBAGD,MAAM;oCAAN,MAAM;;;yBAAN,MAAM;6BAAN,MAAM;;CAyB9B,CAAC;AAEF,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,eAAe,GAC7B,sBAAsB,CA0CxB;AAGD,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,GAAG,EAAE,GACT,GAAG,IAAI,qBAAqB,EAAE,CAShC;AAED,wBAAgB,oCAAoC,CAClD,aAAa,EAAE,eAAe,GAC7B,qBAAqB,CAavB;AAED,wBAAgB,uCAAuC,CAAC,MAAM,EAAE;IAC9D,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,sBAAsB,CAAC,EAAE,eAAe,EAAE,CAAC;CAC5C,GAAG,qBAAqB,EAAE,CA0C1B;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE;IACtC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACpD,GAAG,gBAAgB,CAqEnB;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAoB5E;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAGhE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAG9D;AAED,wBAAsB,kBAAkB,CACtC,iBAAiB,EAAE,MAAM,EACzB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,GAChC,OAAO,CAAC,gCAAgC,CAAC,CA2B3C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}