@dynamic-labs-sdk/solana 0.15.0 → 0.16.1

package/dist/index.esm.js

@@ -1,10 +1,10 @@
-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-C1cnaJBQ.esm.js";
-import { n as SponsorTransactionError, t as addWaasSolanaExtension } from "./addWaasSolanaExtension-BYxLx6fj.esm.js";
-import { t as addSolanaWalletStandardExtension } from "./addSolanaWalletStandardExtension-BngOUdym.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";
@@ -459,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
@@ -510,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({
@@ -723,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) => {
@@ -777,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
@@ -799,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",
@@ -835,12 +811,8 @@ const createPhantomRedirectWalletProvider = ({ baseRedirectUrl, dynamicClient })
 			method: "connect",
 			redirectUrl
 		});
-		core.logger.debug("[PHANTOM] connect: opening deeplink", {
-			deepLinkUrl: deepLinkUrl.toString(),
-			redirectUrl
-		});
+		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 () => {
@@ -850,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,
@@ -900,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,
@@ -954,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,
@@ -1009,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,
@@ -1090,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") || url.searchParams.has("nonce") && url.searchParams.has("data"))) 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
@@ -1175,10 +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
 	});
+	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