@dynamic-labs/solana 4.0.0-alpha.3 → 4.0.0-alpha.31

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs

@@ -9,7 +9,7 @@ var solanaCore = require('@dynamic-labs/solana-core');
 var createSolanaSignerFromWalletStandard = require('./utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
 
 const encoder = new TextEncoder();
-class SolanaWalletStandardConnector extends solanaCore.SolWalletConnector {
+class SolanaWalletStandardConnector extends solanaCore.SolanaWalletConnector {
     constructor(props) {
         super(props);
         this.connectedChain = 'SOL';
@@ -58,7 +58,7 @@ class SolanaWalletStandardConnector extends solanaCore.SolWalletConnector {
                 throw new Error('Signer not found');
             }
             const message = encoder.encode(messageToSign);
-            const signature = yield signer.signMessage(message);
+            const { signature } = yield signer.signMessage(message);
             if (!(signature instanceof Uint8Array)) {
                 throw new Error('Signature not found');
             }

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.d.ts

@@ -2,11 +2,11 @@ import { Wallet } from '@wallet-standard/base';
 import { StandardConnectFeature, StandardDisconnectFeature } from '@wallet-standard/features';
 import { Chain } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-import { SolWalletConnector, SolWalletConnectorOpts, type ISolana } from '@dynamic-labs/solana-core';
-export declare abstract class SolanaWalletStandardConnector extends SolWalletConnector {
+import { SolanaWalletConnector, SolanaWalletConnectorOpts, type ISolana } from '@dynamic-labs/solana-core';
+export declare abstract class SolanaWalletStandardConnector extends SolanaWalletConnector {
     connectedChain: Chain;
     supportedChains: Chain[];
-    constructor(props: SolWalletConnectorOpts);
+    constructor(props: SolanaWalletConnectorOpts);
     get wallet(): Wallet;
     get walletFeatures(): StandardConnectFeature & StandardDisconnectFeature;
     connect(): Promise<void>;

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.js

@@ -1,11 +1,11 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { getWallets } from '@wallet-standard/app';
-import { SolWalletConnector } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnector } from '@dynamic-labs/solana-core';
 import { createSolanaSignerFromWalletStandard } from './utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
 
 const encoder = new TextEncoder();
-class SolanaWalletStandardConnector extends SolWalletConnector {
+class SolanaWalletStandardConnector extends SolanaWalletConnector {
     constructor(props) {
         super(props);
         this.connectedChain = 'SOL';
@@ -54,7 +54,7 @@ class SolanaWalletStandardConnector extends SolWalletConnector {
                 throw new Error('Signer not found');
             }
             const message = encoder.encode(messageToSign);
-            const signature = yield signer.signMessage(message);
+            const { signature } = yield signer.signMessage(message);
             if (!(signature instanceof Uint8Array)) {
                 throw new Error('Signature not found');
             }

package/src/SolanaWalletStandardConnector/utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
-var utils = require('../../../phantomRedirect/utils.cjs');
+var fetchCluster = require('../../../phantomRedirect/fetchCluster/fetchCluster.cjs');
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
 const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
@@ -21,7 +21,7 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
     const getChain = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         const rpc = (_b = (_a = walletConnector.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : walletConnector.solNetworks[0].rpcUrls[0];
-        const cluster = yield utils.fetchCluster(rpc);
+        const cluster = yield fetchCluster.fetchCluster(rpc);
         return `solana:${cluster}`;
     });
     const signTransaction = (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {

package/src/SolanaWalletStandardConnector/utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.d.ts

@@ -1,3 +1,3 @@
 import { Wallet } from '@wallet-standard/base';
-import { SolWalletConnector, ISolana } from '@dynamic-labs/solana-core';
-export declare const createSolanaSignerFromWalletStandard: (wallet: Wallet, walletConnector: SolWalletConnector) => ISolana;
+import { ISolana, SolanaWalletConnector } from '@dynamic-labs/solana-core';
+export declare const createSolanaSignerFromWalletStandard: (wallet: Wallet, walletConnector: SolanaWalletConnector) => ISolana;

package/src/SolanaWalletStandardConnector/utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { PublicKey, VersionedTransaction, Transaction } from '@solana/web3.js';
-import { fetchCluster } from '../../../phantomRedirect/utils.js';
+import { fetchCluster } from '../../../phantomRedirect/fetchCluster/fetchCluster.js';
 
 const isVersionedTransaction = (transaction) => !('instructions' in transaction);
 const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {

package/src/{Solflare.cjs → Solflare/Solflare.cjs}

@@ -3,10 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../_virtual/_tslib.cjs');
+var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
-var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
+var InjectedWalletBase = require('../injected/InjectedWalletBase.cjs');
 
 class Solflare extends InjectedWalletBase.InjectedWalletBase {
     constructor(opts) {

package/src/{Solflare.d.ts → Solflare/Solflare.d.ts}

@@ -1,9 +1,9 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
-import { InjectedWalletBase } from './injected/InjectedWalletBase';
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase';
 export declare class Solflare extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(opts: SolWalletConnectorOpts);
+    constructor(opts: SolanaWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
 }

package/src/{Solflare.js → Solflare/Solflare.js}

@@ -1,8 +1,8 @@
 'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
+import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
+import { InjectedWalletBase } from '../injected/InjectedWalletBase.js';
 
 class Solflare extends InjectedWalletBase {
     constructor(opts) {

package/src/Solflare/index.d.ts

@@ -0,0 +1 @@
+export * from './Solflare';

package/src/index.cjs

@@ -3,29 +3,30 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var embeddedWalletSolana = require('@dynamic-labs/embedded-wallet-solana');
-var Phantom = require('./Phantom.cjs');
-var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
-var UnknownInjected = require('./injected/UnknownInjected.cjs');
-var FallbackSolanaConnector = require('./injected/FallbackSolanaConnector.cjs');
-var isSignedMessage = require('./utils/isSignedMessage.cjs');
-var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
 var solanaCore = require('@dynamic-labs/solana-core');
+var BackpackSol = require('./injected/BackpackSol.cjs');
+var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
+var SolanaWalletConnectors = require('./SolanaWalletConnectors.cjs');
+var SolanaWalletConnectorsWithConfig = require('./SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.cjs');
+var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
+var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const SolanaWalletConnectors = (props) => [
-    ...fetchInjectedWalletConnectors.injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
-    ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
-    Phantom.Phantom,
-    UnknownInjected.UnknownInjected,
-    FallbackSolanaConnector.FallbackSolanaConnector,
-];
+assertPackageVersion.assertPackageVersion('@dynamic-labs/solana', _package.version);
 
-exports.isSignedMessage = isSignedMessage.isSignedMessage;
-exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
+Object.defineProperty(exports, 'SolanaWalletConnector', {
+  enumerable: true,
+  get: function () { return solanaCore.SolanaWalletConnector; }
+});
 Object.defineProperty(exports, 'isSolanaWallet', {
   enumerable: true,
   get: function () { return solanaCore.isSolanaWallet; }
 });
-exports.SolanaWalletConnectors = SolanaWalletConnectors;
+exports.BackpackConnector = BackpackSol.BackpackSol;
+exports.SolanaInjectedConnector = InjectedWalletBase.InjectedWalletBase;
+exports.SolanaWalletConnectors = SolanaWalletConnectors.SolanaWalletConnectors;
+exports.SolanaWalletConnectorsWithConfig = SolanaWalletConnectorsWithConfig.SolanaWalletConnectorsWithConfig;
+exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
+exports.isSignedMessage = isSignedMessage.isSignedMessage;

package/src/index.d.ts

@@ -1,6 +1,8 @@
-import { Phantom } from './Phantom';
-export declare const SolanaWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof Phantom)[];
-export { isSignedMessage } from './utils/isSignedMessage';
-export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
 export type { IEmbeddedWalletSolanaSigner } from '@dynamic-labs/embedded-wallet-solana';
-export { isSolanaWallet } from '@dynamic-labs/solana-core';
+export { isSolanaWallet, SolanaWalletConnector, } from '@dynamic-labs/solana-core';
+export { BackpackSol as BackpackConnector } from './injected/BackpackSol';
+export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase';
+export { SolanaWalletConnectors } from './SolanaWalletConnectors';
+export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig';
+export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
+export { isSignedMessage } from './utils/isSignedMessage';

package/src/index.js

@@ -1,21 +1,13 @@
 'use client'
-import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/embedded-wallet-solana';
-import { Phantom } from './Phantom.js';
-import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
-import { UnknownInjected } from './injected/UnknownInjected.js';
-import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector.js';
-export { isSignedMessage } from './utils/isSignedMessage.js';
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
+export { SolanaWalletConnector, isSolanaWallet } from '@dynamic-labs/solana-core';
+export { BackpackSol as BackpackConnector } from './injected/BackpackSol.js';
+export { InjectedWalletBase as SolanaInjectedConnector } from './injected/InjectedWalletBase.js';
+export { SolanaWalletConnectors } from './SolanaWalletConnectors.js';
+export { SolanaWalletConnectorsWithConfig } from './SolanaWalletConnectorsWithConfig/SolanaWalletConnectorsWithConfig.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
-export { isSolanaWallet } from '@dynamic-labs/solana-core';
+export { isSignedMessage } from './utils/isSignedMessage.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const SolanaWalletConnectors = (props) => [
-    ...injectedWalletOverrides,
-    ...fetchInjectedWalletConnectors(props),
-    ...TurnkeySolanaWalletConnectors(props),
-    Phantom,
-    UnknownInjected,
-    FallbackSolanaConnector,
-];
-
-export { SolanaWalletConnectors };
+assertPackageVersion('@dynamic-labs/solana', version);

package/src/injected/BackpackSol.d.ts

@@ -1,9 +1,9 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(opts: SolWalletConnectorOpts);
+    constructor(opts: SolanaWalletConnectorOpts);
     getSigner<IBackpackSolanaSigner>(): Promise<IBackpackSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
 }

package/src/injected/FallbackSolanaConnector.d.ts

@@ -1,9 +1,9 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class FallbackSolanaConnector extends InjectedWalletBase {
     name: string;
     overrideKey: string;
     isAvailable: boolean;
-    constructor(opts: SolWalletConnectorOpts);
+    constructor(opts: SolanaWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
 }

package/src/injected/InjectedWalletBase.cjs

@@ -8,16 +8,16 @@ var web3_js = require('@solana/web3.js');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 var solanaCore = require('@dynamic-labs/solana-core');
-var solProviderHelper = require('../solProviderHelper.cjs');
+var SolProviderHelper = require('../SolProviderHelper/SolProviderHelper.cjs');
 var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedError.cjs');
 
-class InjectedWalletBase extends solanaCore.SolWalletConnector {
+class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
     getSolProviderHelper() {
         if (!this.wallet) {
             this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
         }
         if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new solProviderHelper.SolProviderHelper(this.wallet);
+            this.solProviderHelper = new SolProviderHelper.SolProviderHelper(this.wallet);
         }
         return this.solProviderHelper;
     }
@@ -53,6 +53,8 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                 from,
                 onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
                     var _a;
+                    if (!transaction)
+                        return;
                     const signer = yield this.getSigner();
                     if (!signer)
                         throw new Error('Signer not found');
@@ -72,7 +74,6 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
@@ -85,10 +86,9 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
             var _a, _b;
             if (!this.isInstalledOnBrowser()) {
                 if (utils.isMobile() &&
-                    ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser &&
+                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
                     this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = utils.template(this.wallet.mobile.inAppBrowser);
+                    const inAppBrowserCompiledTemplate = utils.template(this.metadata.inAppBrowserUrl);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });

package/src/injected/InjectedWalletBase.d.ts

@@ -1,9 +1,9 @@
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { SolWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { IUITransaction } from '@dynamic-labs/types';
 import { ISendBalanceWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { SolProviderHelper } from '../solProviderHelper';
-export declare abstract class InjectedWalletBase extends SolWalletConnector implements ISendBalanceWalletConnector {
+import { SolProviderHelper } from '../SolProviderHelper';
+export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
     solProviderHelper: SolProviderHelper | undefined;
     wallet: WalletSchema | undefined;
     getSolProviderHelper(): SolProviderHelper | undefined;

package/src/injected/InjectedWalletBase.js

@@ -3,11 +3,11 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { PublicKey } from '@solana/web3.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile, template } from '@dynamic-labs/utils';
-import { SolWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
-import { SolProviderHelper } from '../solProviderHelper.js';
+import { SolanaWalletConnector, SolanaUiTransaction } from '@dynamic-labs/solana-core';
+import { SolProviderHelper } from '../SolProviderHelper/SolProviderHelper.js';
 import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
 
-class InjectedWalletBase extends SolWalletConnector {
+class InjectedWalletBase extends SolanaWalletConnector {
     getSolProviderHelper() {
         if (!this.wallet) {
             this.wallet = findWalletBookWallet(this.walletBook, this.key);
@@ -49,6 +49,8 @@ class InjectedWalletBase extends SolWalletConnector {
                 from,
                 onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
+                    if (!transaction)
+                        return;
                     const signer = yield this.getSigner();
                     if (!signer)
                         throw new Error('Signer not found');
@@ -68,7 +70,6 @@ class InjectedWalletBase extends SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
@@ -81,10 +82,9 @@ class InjectedWalletBase extends SolWalletConnector {
             var _a, _b;
             if (!this.isInstalledOnBrowser()) {
                 if (isMobile() &&
-                    ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser &&
+                    ((_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl) &&
                     this.mobileExperience === 'in-app-browser') {
-                    const inAppBrowserCompiledTemplate = template(this.wallet.mobile.inAppBrowser);
+                    const inAppBrowserCompiledTemplate = template(this.metadata.inAppBrowserUrl);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),
                     });

package/src/injected/PhantomInjected.d.ts

@@ -1,9 +1,9 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class PhantomInjected extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(opts: SolWalletConnectorOpts);
+    constructor(opts: SolanaWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     canGetChainAddress(): boolean;
 }

package/src/injected/UnknownInjected.d.ts

@@ -1,8 +1,8 @@
-import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
+import { SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class UnknownInjected extends InjectedWalletBase {
     name: string;
     overrideKey: string;
-    constructor(opts: SolWalletConnectorOpts);
+    constructor(opts: SolanaWalletConnectorOpts);
     isInstalledOnBrowser(): boolean;
 }

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -3,8 +3,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var CoinbaseSolana = require('../CoinbaseSolana.cjs');
-var Solflare = require('../Solflare.cjs');
+var CoinbaseSolana = require('../CoinbaseSolana/CoinbaseSolana.cjs');
+var Solflare = require('../Solflare/Solflare.cjs');
 var SolanaWalletStandardConnector = require('../SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var BackpackSol = require('./BackpackSol.cjs');

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,6 +1,6 @@
 'use client'
-import { CoinbaseSolana } from '../CoinbaseSolana.js';
-import { Solflare } from '../Solflare.js';
+import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
+import { Solflare } from '../Solflare/Solflare.js';
 import { SolanaWalletStandardConnector } from '../SolanaWalletStandardConnector/SolanaWalletStandardConnector.js';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 import { BackpackSol } from './BackpackSol.js';

package/src/phantomRedirect/{PhantomRedirect.cjs → PhantomRedirect/PhantomRedirect.cjs}

@@ -3,20 +3,23 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../_virtual/_tslib.cjs');
-var nacl = require('tweetnacl');
-var bs58 = require('bs58');
+var _tslib = require('../../../_virtual/_tslib.cjs');
 var web3_js = require('@solana/web3.js');
+var bs58 = require('bs58');
+var nacl = require('tweetnacl');
 var solanaCore = require('@dynamic-labs/solana-core');
-var utils = require('./utils.cjs');
-var storage = require('./storage.cjs');
+var buildUrl = require('../buildUrl/buildUrl.cjs');
+var decryptPayload = require('../decryptPayload/decryptPayload.cjs');
+var encryptPayload = require('../encryptPayload/encryptPayload.cjs');
+var fetchCluster = require('../fetchCluster/fetchCluster.cjs');
+var storage = require('../storage/storage.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
+var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
 
-class PhantomRedirect extends solanaCore.SolWalletConnector {
+class PhantomRedirect extends solanaCore.SolanaWalletConnector {
     constructor(props) {
         super(Object.assign({}, props));
         this.name = 'Phantom';
@@ -48,11 +51,11 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
             const rpc = (_b = (_a = this.solNetworks[0].privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : this.solNetworks[0].rpcUrls[0];
             const params = new URLSearchParams({
                 app_url: isLocalHost ? 'https://demo.dynamic.xyz' : window.location.href,
-                cluster: yield utils.fetchCluster(rpc),
+                cluster: yield fetchCluster.fetchCluster(rpc),
                 dapp_encryption_public_key: bs58__default["default"].encode(keyPair.publicKey),
                 redirect_link: window.location.href,
             });
-            const url = utils.buildUrl('connect', params);
+            const url = buildUrl.buildUrl('connect', params);
             window.location.href = url;
         });
     }
@@ -62,7 +65,7 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
             const { data, nonce, phantom_encryption_public_key: phantomEncryptionPublicKey, encryptionSecretKey, } = this.getInputsOrThrow('getSession', ['data', 'nonce', 'phantom_encryption_public_key'], ['encryptionSecretKey']);
             const sharedSecret = nacl__default["default"].box.before(bs58__default["default"].decode(phantomEncryptionPublicKey), encryptionSecretKey);
             storage.storage.sharedSecret.set(sharedSecret);
-            const connectData = utils.decryptPayload(data, nonce, sharedSecret);
+            const connectData = decryptPayload.decryptPayload(data, nonce, sharedSecret);
             storage.storage.session.set(connectData.session);
             storage.storage.address.set(new web3_js.PublicKey(connectData.public_key));
             params.delete('phantom_encryption_public_key');
@@ -80,14 +83,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
                 message: bs58__default["default"].encode(Buffer.from(messageToSign)),
                 session,
             };
-            const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+            const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
             const params = new URLSearchParams({
                 dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                 nonce: bs58__default["default"].encode(nonce),
                 payload: bs58__default["default"].encode(encryptedPayload),
                 redirect_link: window.location.href,
             });
-            const url = utils.buildUrl('signMessage', params);
+            const url = buildUrl.buildUrl('signMessage', params);
             storage.storage.method.set('signMessage');
             window.location.href = url;
             // throwing this to prevent local storage from being cleared.
@@ -104,7 +107,7 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
     extractSignature() {
         const params = new URLSearchParams(window.location.search);
         const { data, nonce, sharedSecret, message } = this.getInputsOrThrow('extractSignature', ['data', 'nonce'], ['sharedSecret', 'message']);
-        const signMessageData = utils.decryptPayload(data, nonce, sharedSecret);
+        const signMessageData = decryptPayload.decryptPayload(data, nonce, sharedSecret);
         params.delete('data');
         params.delete('nonce');
         history.replaceState(null, '', `${window.location.origin}${window.location.pathname}?${params.toString()}`);
@@ -116,7 +119,7 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
     extractTransactions() {
         const params = new URLSearchParams(window.location.search);
         const { data, nonce, sharedSecret } = this.getInputsOrThrow('extractTransactions', ['data', 'nonce'], ['sharedSecret']);
-        const signAllTransactionsData = utils.decryptPayload(data, nonce, sharedSecret);
+        const signAllTransactionsData = decryptPayload.decryptPayload(data, nonce, sharedSecret);
         const decodedTransactions = signAllTransactionsData.transactions.map((t) => web3_js.Transaction.from(bs58__default["default"].decode(t)));
         params.delete('data');
         params.delete('nonce');
@@ -126,7 +129,7 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
     extractTransaction() {
         const params = new URLSearchParams(window.location.search);
         const { data, nonce, sharedSecret } = this.getInputsOrThrow('extractTransaction', ['data', 'nonce'], ['sharedSecret']);
-        const signTransactionData = utils.decryptPayload(data, nonce, sharedSecret);
+        const signTransactionData = decryptPayload.decryptPayload(data, nonce, sharedSecret);
         const decodedTransaction = web3_js.Transaction.from(bs58__default["default"].decode(signTransactionData.transaction));
         params.delete('data');
         params.delete('nonce');
@@ -200,14 +203,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
                         session,
                         transactions: serializedTransactions,
                     };
-                    const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+                    const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
                     const params = new URLSearchParams({
                         dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                         nonce: bs58__default["default"].encode(nonce),
                         payload: bs58__default["default"].encode(encryptedPayload),
                         redirect_link: window.location.href,
                     });
-                    const url = utils.buildUrl('signAllTransactions', params);
+                    const url = buildUrl.buildUrl('signAllTransactions', params);
                     window.location.href = url;
                     // actual signatures will be retrieved upon redirect back to dapp
                     return [];
@@ -219,14 +222,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
                         session,
                         transaction: bs58__default["default"].encode(transaction.serialize({ requireAllSignatures: false })),
                     };
-                    const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+                    const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
                     const params = new URLSearchParams({
                         dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                         nonce: bs58__default["default"].encode(nonce),
                         payload: bs58__default["default"].encode(encryptedPayload),
                         redirect_link: window.location.href,
                     });
-                    const url = utils.buildUrl('signAndSendTransaction', params);
+                    const url = buildUrl.buildUrl('signAndSendTransaction', params);
                     storage.storage.method.set('signAndSendTransaction');
                     window.location.href = url;
                     // actual signature will be retrived upon redirect back to dapp
@@ -238,14 +241,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
                         message: bs58__default["default"].encode(Buffer.from(message)),
                         session,
                     };
-                    const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+                    const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
                     const params = new URLSearchParams({
                         dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                         nonce: bs58__default["default"].encode(nonce),
                         payload: bs58__default["default"].encode(encryptedPayload),
                         redirect_link: window.location.href,
                     });
-                    const url = utils.buildUrl('signMessage', params);
+                    const url = buildUrl.buildUrl('signMessage', params);
                     window.location.href = url;
                     // actual signature will be retrived upon redirect back to dapp
                     return { signature: Buffer.from('') };
@@ -259,14 +262,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
                         session,
                         transaction: serializedTransaction,
                     };
-                    const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+                    const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
                     const params = new URLSearchParams({
                         dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                         nonce: bs58__default["default"].encode(nonce),
                         payload: bs58__default["default"].encode(encryptedPayload),
                         redirect_link: window.location.href,
                     });
-                    const url = utils.buildUrl('signTransaction', params);
+                    const url = buildUrl.buildUrl('signTransaction', params);
                     window.location.href = url;
                     return transaction;
                 }),
@@ -291,14 +294,14 @@ class PhantomRedirect extends solanaCore.SolWalletConnector {
             if (!address || !session || !encryptionPublicKey || !sharedSecret)
                 return;
             const payload = { session };
-            const [nonce, encryptedPayload] = utils.encryptPayload(payload, sharedSecret);
+            const [nonce, encryptedPayload] = encryptPayload.encryptPayload(payload, sharedSecret);
             const params = new URLSearchParams({
                 dapp_encryption_public_key: bs58__default["default"].encode(encryptionPublicKey),
                 nonce: bs58__default["default"].encode(nonce),
                 payload: bs58__default["default"].encode(encryptedPayload),
                 redirect_link: window.location.href,
             });
-            const url = utils.buildUrl('disconnect', params);
+            const url = buildUrl.buildUrl('disconnect', params);
             window.location.href = url;
         });
     }

package/src/phantomRedirect/{PhantomRedirect.d.ts → PhantomRedirect/PhantomRedirect.d.ts}

@@ -1,8 +1,8 @@
 import { Transaction } from '@solana/web3.js';
+import { SolanaWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { IPhantomRedirectConnector } from '@dynamic-labs/wallet-connector-core';
-import { SolWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
-import { Method } from './types';
-export declare class PhantomRedirect extends SolWalletConnector implements IPhantomRedirectConnector {
+import { Method } from '../types';
+export declare class PhantomRedirect extends SolanaWalletConnector implements IPhantomRedirectConnector {
     name: string;
     overrideKey: string;
     constructor(props: any);