@dynamic-labs-sdk/solana 0.14.0 → 0.16.1

package/dist/index.esm.js

@@ -1,10 +1,10 @@
-import { i as version, n as registerSolanaNetworkProviderBuilder, r as name, t as isVersionedTransaction } from "./isVersionedTransaction-CecentWi.esm.js";
-import { n as SponsorTransactionError, r as getSolanaConnection, t as addWaasSolanaExtension } from "./addWaasSolanaExtension-ofYQDYyc.esm.js";
-import { t as addSolanaWalletStandardExtension } from "./addSolanaWalletStandardExtension-B7GpGFx3.esm.js";
+import { a as isSolanaWalletProvider, c as getSolanaConnection, d as version, i as solanaExecuteCheckoutTransaction, l as registerSolanaNetworkProviderBuilder, n as isSolanaGasSponsorshipEnabled, o as isSolanaWalletAccount, r as NotSolanaProviderError, s as isVersionedTransaction, t as solanaTransferAmount, u as name } from "./solanaTransferAmount-Bd39IUO-.esm.js";
+import { n as SponsorTransactionError, t as addWaasSolanaExtension } from "./addWaasSolanaExtension-CLhieXpF.esm.js";
+import { t as addSolanaWalletStandardExtension } from "./addSolanaWalletStandardExtension-CPT-KI29.esm.js";
 import { assertPackageVersion } from "@dynamic-labs-sdk/assert-package-version";
-import { MethodNotImplementedError, WalletProviderPriority, assertDefined, createApiClient, createDeferredPromise, createRuntimeServiceAccessKey, createStorageKeySchema, emitEvent, formatWalletProviderGroupKey, formatWalletProviderKey, getActiveNetworkIdFromLastKnownRegistry, getBuffer, getCore, getDefaultClient, getNetworkProviders, getWalletProviderFromWalletAccount, getWalletProviderRegistry, hasExtension, registerExtension } from "@dynamic-labs-sdk/client/core";
+import { MethodNotImplementedError, WalletProviderPriority, assertDefined, createApiClient, createDeferredPromise, createRuntimeServiceAccessKey, createStorageKeySchema, emitEvent, formatWalletProviderGroupKey, formatWalletProviderKey, getActiveNetworkIdFromLastKnownRegistry, getBuffer, getCore, getDefaultClient, getNetworkProviders, getWalletProviderFromWalletAccount, getWalletProviderRegistry, hasExtension, randomString, registerExtension } from "@dynamic-labs-sdk/client/core";
 import { Connection, LAMPORTS_PER_SOL, PublicKey, Transaction, VersionedTransaction } from "@solana/web3.js";
-import { BaseError, FeeEstimationFailedError, InvalidParamError, SimulationFailedError, getActiveNetworkData, getDefaultClient as getDefaultClient$1, onceEvent } from "@dynamic-labs-sdk/client";
+import { BaseError, FeeEstimationFailedError, InvalidParamError, SimulationFailedError, getActiveNetworkData, getDefaultClient as getDefaultClient$1, onEvent, onceEvent } from "@dynamic-labs-sdk/client";
 import { WalletProviderEnum } from "@dynamic-labs/sdk-api-core";
 import bs58 from "bs58";
 import * as z from "zod/mini";
@@ -25,22 +25,6 @@ const addSolanaExtension = (client = getDefaultClient()) => {
 	addWaasSolanaExtension(client);
 };
 
-//#endregion
-//#region src/errors/NotSolanaProviderError/NotSolanaProviderError.ts
-var NotSolanaProviderError = class extends BaseError {
-	providerKey;
-	constructor(params) {
-		super({
-			cause: null,
-			code: "not_solana_provider_error",
-			docsUrl: null,
-			name: "NotSolanaProviderError",
-			shortMessage: "Provider is not a Solana wallet provider"
-		});
-		this.providerKey = params.providerKey;
-	}
-};
-
 //#endregion
 //#region src/isSolanaNetworkProvider/isSolanaNetworkProvider.ts
 /**
@@ -51,16 +35,6 @@ var NotSolanaProviderError = class extends BaseError {
 */
 const isSolanaNetworkProvider = (networkProvider) => networkProvider.chain === "SOL";
 
-//#endregion
-//#region src/isSolanaWalletAccount/isSolanaWalletAccount.ts
-/**
-* Type guard function to check if a wallet account is a Solana wallet account.
-*
-* @param walletAccount - The wallet account to check.
-* @returns True if the wallet account is a Solana wallet account, false otherwise.
-*/
-const isSolanaWalletAccount = (walletAccount) => walletAccount.chain === "SOL";
-
 //#endregion
 //#region src/utils/calculateSolanaTransactionFee/calculateSolanaTransactionFee.ts
 const MAX_RETRIES = 5;
@@ -485,12 +459,7 @@ const isCloneTab = (client) => !getPhantomOriginTab(client).isOriginTab;
 const completeAndEmitPhantomRedirectEvent = async ({ args, event }, client) => {
 	const core = getCore(client);
 	const cloneTab = isCloneTab(client);
-	core.logger.debug("[PHANTOM] completeAndEmitPhantomRedirectEvent: start", {
-		event,
-		isCloneTab: cloneTab
-	});
 	await core.storage.removeItem(pendingRequestStorageKeySchema);
-	core.logger.debug("[PHANTOM] completeAndEmitPhantomRedirectEvent: emitting event locally", { event });
 	emitEvent({
 		args,
 		event
@@ -536,13 +505,8 @@ const completeAndEmitPhantomRedirectEvent = async ({ args, event }, client) => {
 */
 const completePhantomRedirect = async ({ url }, client = getDefaultClient()) => {
 	const core = getCore(client);
-	core.logger.debug("[PHANTOM] completePhantomRedirect: start", { search: url.search });
 	const params = parsePhantomRedirectParams({ url });
 	const pendingRequest = await core.storage.getItem(pendingRequestStorageKeySchema);
-	core.logger.debug("[PHANTOM] completePhantomRedirect: pendingRequest", {
-		found: !!pendingRequest,
-		method: pendingRequest?.method
-	});
 	if (!pendingRequest) throw new NoPendingPhantomRequestError();
 	if (params.errorCode) {
 		const error = new PhantomRedirectRejectedError({
@@ -687,6 +651,14 @@ const generateNaClKeyPair = () => {
 //#endregion
 //#region src/phantomRedirect/utils/getPhantomCluster/getPhantomCluster.ts
 /**
+* Normalizes a cluster string to the value expected by Phantom's deep link protocol.
+* Our API returns "mainnet" but Phantom expects "mainnet-beta".
+*/
+const normalizeCluster = (cluster) => {
+	if (cluster === "mainnet") return "mainnet-beta";
+	return cluster;
+};
+/**
 * Returns the Solana cluster name expected by Phantom's deep link protocol
 * (e.g. "mainnet-beta", "devnet", "testnet").
 *
@@ -701,9 +673,9 @@ const generateNaClKeyPair = () => {
 const getPhantomCluster = async ({ dynamicClient, walletAccount }) => {
 	if (walletAccount) {
 		const { networkData } = await getActiveNetworkData({ walletAccount }, dynamicClient);
-		return networkData?.cluster ?? void 0;
+		return normalizeCluster(networkData?.cluster);
 	}
-	return getNetworkProviders(dynamicClient).find((p) => p.chain === "SOL")?.cluster ?? void 0;
+	return normalizeCluster(getNetworkProviders(dynamicClient).find((p) => p.chain === "SOL")?.cluster);
 };
 
 //#endregion
@@ -741,14 +713,6 @@ const listenForPhantomBroadcast = (listeners, client) => {
 //#endregion
 //#region src/phantomRedirect/createPhantomRedirectWalletProvider/createPhantomRedirectWalletProvider.ts
 /**
-* Generates a random alphanumeric string of specified length.
-*/
-const randomString = (length) => {
-	const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-	const bytes = crypto.getRandomValues(new Uint8Array(length));
-	return Array.from(bytes, (byte) => chars[byte % 62]).join("");
-};
-/**
 * Extracts the dApp URL from a redirect URL.
 */
 const extractDappUrl = (redirectUrl) => {
@@ -775,7 +739,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 	const groupKey = formatWalletProviderGroupKey("Phantom");
 	const metadata = {
 		displayName: "Phantom",
-		icon: "https://phantom.app/img/phantom-logo.svg"
+		icon: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDgiIGhlaWdodD0iMTA4IiB2aWV3Qm94PSIwIDAgMTA4IDEwOCIgZmlsbD0ibm9uZSI+CjxyZWN0IHdpZHRoPSIxMDgiIGhlaWdodD0iMTA4IiByeD0iMjYiIGZpbGw9IiNBQjlGRjIiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik00Ni41MjY3IDY5LjkyMjlDNDIuMDA1NCA3Ni44NTA5IDM0LjQyOTIgODUuNjE4MiAyNC4zNDggODUuNjE4MkMxOS41ODI0IDg1LjYxODIgMTUgODMuNjU2MyAxNSA3NS4xMzQyQzE1IDUzLjQzMDUgNDQuNjMyNiAxOS44MzI3IDcyLjEyNjggMTkuODMyN0M4Ny43NjggMTkuODMyNyA5NCAzMC42ODQ2IDk0IDQzLjAwNzlDOTQgNTguODI1OCA4My43MzU1IDc2LjkxMjIgNzMuNTMyMSA3Ni45MTIyQzcwLjI5MzkgNzYuOTEyMiA2OC43MDUzIDc1LjEzNDIgNjguNzA1MyA3Mi4zMTRDNjguNzA1MyA3MS41NzgzIDY4LjgyNzUgNzAuNzgxMiA2OS4wNzE5IDY5LjkyMjlDNjUuNTg5MyA3NS44Njk5IDU4Ljg2ODUgODEuMzg3OCA1Mi41NzU0IDgxLjM4NzhDNDcuOTkzIDgxLjM4NzggNDUuNjcxMyA3OC41MDYzIDQ1LjY3MTMgNzQuNDU5OEM0NS42NzEzIDcyLjk4ODQgNDUuOTc2OCA3MS40NTU2IDQ2LjUyNjcgNjkuOTIyOVpNODMuNjc2MSA0Mi41Nzk0QzgzLjY3NjEgNDYuMTcwNCA4MS41NTc1IDQ3Ljk2NTggNzkuMTg3NSA0Ny45NjU4Qzc2Ljc4MTYgNDcuOTY1OCA3NC42OTg5IDQ2LjE3MDQgNzQuNjk4OSA0Mi41Nzk0Qzc0LjY5ODkgMzguOTg4NSA3Ni43ODE2IDM3LjE5MzEgNzkuMTg3NSAzNy4xOTMxQzgxLjU1NzUgMzcuMTkzMSA4My42NzYxIDM4Ljk4ODUgODMuNjc2MSA0Mi41Nzk0Wk03MC4yMTAzIDQyLjU3OTVDNzAuMjEwMyA0Ni4xNzA0IDY4LjA5MTYgNDcuOTY1OCA2NS43MjE2IDQ3Ljk2NThDNjMuMzE1NyA0Ny45NjU4IDYxLjIzMyA0Ni4xNzA0IDYxLjIzMyA0Mi41Nzk1QzYxLjIzMyAzOC45ODg1IDYzLjMxNTcgMzcuMTkzMSA2NS43MjE2IDM3LjE5MzFDNjguMDkxNiAzNy4xOTMxIDcwLjIxMDMgMzguOTg4NSA3MC4yMTAzIDQyLjU3OTVaIiBmaWxsPSIjRkZGREY4Ii8+Cjwvc3ZnPg=="
 	};
 	const getSession = async () => {
 		const session = await core.storage.getItem(phantomSessionStorageKeySchema);
@@ -795,10 +759,6 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 	*/
 	const setupPhantomListeners = ({ completeEvent, deferredPromise, errorEvent, onComplete, onError }) => {
 		getPhantomOriginTab(dynamicClient).isOriginTab = true;
-		core.logger.debug("[PHANTOM] setupPhantomListeners: isOriginTab=true, registering listeners", {
-			completeEvent,
-			errorEvent
-		});
 		onceEvent({
 			event: completeEvent,
 			listener: onComplete
@@ -817,17 +777,15 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 		}).catch(() => {});
 	};
 	const connect = async () => {
-		core.logger.debug("[PHANTOM] connect: start");
 		const redirectUrl = baseRedirectUrl;
 		const { publicKey: dappPublicKey, secretKey: dappSecretKey } = generateNaClKeyPair();
 		await setPendingRequest({
 			dappPublicKey,
 			dappSecretKey,
 			method: "connect",
-			requestId: randomString(32),
+			requestId: randomString({ length: 32 }),
 			timestamp: Date.now()
 		});
-		core.logger.debug("[PHANTOM] connect: pending request stored, setting up listeners");
 		const deferredPromise = createDeferredPromise();
 		setupPhantomListeners({
 			completeEvent: "phantomRedirectConnectionComplete",
@@ -855,7 +813,6 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 		});
 		core.logger.debug("[PHANTOM] connect: opening deeplink", { redirectUrl });
 		await core.openDeeplink(deepLinkUrl.toString());
-		core.logger.debug("[PHANTOM] connect: deeplink opened, awaiting deferred promise");
 		return deferredPromise.promise;
 	};
 	const disconnect = async () => {
@@ -865,7 +822,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 			payload: { session: session.sessionToken },
 			sharedSecret: session.sharedSecret
 		});
-		const requestId = randomString(32);
+		const requestId = randomString({ length: 32 });
 		await setPendingRequest({
 			dappPublicKey: session.dappPublicKey,
 			dappSecretKey: session.dappSecretKey,
@@ -915,7 +872,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 			},
 			sharedSecret: session.sharedSecret
 		});
-		const requestId = randomString(32);
+		const requestId = randomString({ length: 32 });
 		await setPendingRequest({
 			dappPublicKey: session.dappPublicKey,
 			dappSecretKey: session.dappSecretKey,
@@ -969,7 +926,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 			},
 			sharedSecret: session.sharedSecret
 		});
-		const requestId = randomString(32);
+		const requestId = randomString({ length: 32 });
 		await setPendingRequest({
 			dappPublicKey: session.dappPublicKey,
 			dappSecretKey: session.dappSecretKey,
@@ -1024,7 +981,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 			},
 			sharedSecret: session.sharedSecret
 		});
-		const requestId = randomString(32);
+		const requestId = randomString({ length: 32 });
 		await setPendingRequest({
 			dappPublicKey: session.dappPublicKey,
 			dappSecretKey: session.dappSecretKey,
@@ -1081,6 +1038,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 		chain: "SOL",
 		connect,
 		disconnect,
+		executeCheckoutTransaction: (args) => solanaExecuteCheckoutTransaction(args, dynamicClient),
 		getActiveNetworkId,
 		getConnectedAddresses,
 		groupKey,
@@ -1090,6 +1048,7 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 		signAndSendTransaction: signAndSendTransaction$1,
 		signMessage,
 		signTransaction: signTransaction$1,
+		transferAmount: (args) => solanaTransferAmount(args, dynamicClient),
 		walletProviderType
 	};
 };
@@ -1103,16 +1062,28 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 * redirect data from a Phantom wallet deep link operation, and validates
 * that there is a corresponding pending request in storage.
 *
+* Most Phantom callbacks include recognizable query parameters:
+* - **Connect**: `phantom_encryption_public_key`
+* - **Sign** (signMessage, signTransaction, etc.): `nonce` + `data`
+* - **Error** (any method): `errorCode`
+*
+* **Disconnect is the exception**: on success, Phantom redirects back to the
+* bare `redirect_link` with NO query parameters at all. To detect this case,
+* we fall back to checking whether a pending disconnect request exists in
+* storage.
+*
 * @param params.url - The URL to check for Phantom redirect parameters
 * @param client - The Dynamic client instance
 * @returns A promise that resolves to true if the URL is a valid Phantom redirect, false otherwise
 */
 const detectPhantomRedirect = async ({ url }, client = getDefaultClient()) => {
 	const core = getCore(client);
-	if (!(url.searchParams.has("phantom_encryption_public_key") || url.searchParams.has("errorCode"))) return false;
+	const hasPhantomParams = url.searchParams.has("phantom_encryption_public_key") || url.searchParams.has("errorCode") || url.searchParams.has("nonce") && url.searchParams.has("data");
 	await core.initTrack.waitForAll();
 	const pendingRequest = await core.storage.getItem(pendingRequestStorageKeySchema);
-	return Boolean(pendingRequest);
+	if (!pendingRequest) return false;
+	if (hasPhantomParams) return true;
+	return pendingRequest.method === "disconnect";
 };
 
 //#endregion
@@ -1162,15 +1133,15 @@ const PHANTOM_REDIRECT_SOLANA_EXTENSION_KEY = "phantomRedirectSolana";
 * @param [client] - The Dynamic client. Only required for multiple clients.
 */
 const addPhantomRedirectSolanaExtension = async ({ disableAutoRedirectCompletion, onCloseTab, url }, client = getDefaultClient()) => {
-	if (hasExtension({ extensionKey: PHANTOM_REDIRECT_SOLANA_EXTENSION_KEY }, client)) return;
+	if (hasExtension({ extensionKey: PHANTOM_REDIRECT_SOLANA_EXTENSION_KEY }, client)) {
+		getCore(client).logger.debug("[PHANTOM] addPhantomRedirectSolanaExtension: already registered, skipping");
+		return;
+	}
 	registerExtension({ extensionKey: PHANTOM_REDIRECT_SOLANA_EXTENSION_KEY }, client);
 	registerSolanaNetworkProviderBuilder(client);
 	const core = getCore(client);
 	if (!disableAutoRedirectCompletion) {
-		core.logger.debug("[PHANTOM] addPhantomRedirectSolanaExtension: detecting redirect", { search: url.search });
-		const isRedirect = await detectPhantomRedirect({ url }, client);
-		core.logger.debug("[PHANTOM] addPhantomRedirectSolanaExtension: isRedirect", { isRedirect });
-		if (isRedirect) {
+		if (await detectPhantomRedirect({ url }, client)) {
 			onceEvent({
 				event: "phantomRedirectCloseTab",
 				listener: onCloseTab
@@ -1188,16 +1159,27 @@ const addPhantomRedirectSolanaExtension = async ({ disableAutoRedirectCompletion
 		baseRedirectUrl: `${url.protocol}//${url.host}${url.pathname}`,
 		dynamicClient: client
 	});
-	getWalletProviderRegistry(client).register({
+	const walletProviderRegistry = getWalletProviderRegistry(client);
+	const isConflictingProvider = (provider) => provider.chain === walletProvider.chain && provider.groupKey === walletProvider.groupKey && provider.key !== walletProvider.key;
+	const existingConflict = walletProviderRegistry.listProviders().find(isConflictingProvider);
+	if (existingConflict) {
+		core.logger.debug("[PHANTOM] addPhantomRedirectSolanaExtension: skipping registration, conflicting provider exists", { conflictingKey: existingConflict.key });
+		return;
+	}
+	walletProviderRegistry.register({
 		priority: WalletProviderPriority.WINDOW_INJECT,
 		walletProvider
 	});
-};
-
-//#endregion
-//#region src/isSolanaWalletProvider/isSolanaWalletProvider.ts
-const isSolanaWalletProvider = (provider) => {
-	return provider.chain === "SOL";
+	const removeListener = onEvent({
+		event: "walletProviderRegistered",
+		listener: ({ walletProvider: newProvider }) => {
+			if (isConflictingProvider(newProvider)) {
+				core.logger.debug("[PHANTOM] addPhantomRedirectSolanaExtension: unregistering, conflicting provider registered", { conflictingKey: newProvider.key });
+				walletProviderRegistry.unregister(walletProvider.key);
+				removeListener();
+			}
+		}
+	}, client);
 };
 
 //#endregion
@@ -1284,5 +1266,5 @@ const signTransaction = async ({ walletAccount, transaction }, client = getDefau
 assertPackageVersion(name, version);
 
 //#endregion
-export { NotSolanaProviderError, SponsorTransactionError, addPhantomRedirectSolanaExtension, addSolanaExtension, calculateSolanaTransactionFee, completePhantomRedirect, detectPhantomRedirect, getSolanaConnection, isSolanaNetworkProvider, isSolanaWalletAccount, signAllTransactions, signAndSendSponsoredTransaction, signAndSendTransaction, signTransaction, simulateSolanaTransaction };
+export { NotSolanaProviderError, SponsorTransactionError, addPhantomRedirectSolanaExtension, addSolanaExtension, calculateSolanaTransactionFee, completePhantomRedirect, detectPhantomRedirect, getSolanaConnection, isSolanaGasSponsorshipEnabled, isSolanaNetworkProvider, isSolanaWalletAccount, signAllTransactions, signAndSendSponsoredTransaction, signAndSendTransaction, signTransaction, simulateSolanaTransaction };
 //# sourceMappingURL=index.esm.js.map