@dynamic-labs/solana 4.0.0-alpha.4 → 4.0.0-alpha.41

package/src/injected/FallbackSolanaConnector.cjs

@@ -3,16 +3,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 class FallbackSolanaConnector extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/FallbackSolanaConnector.d.ts

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

package/src/injected/FallbackSolanaConnector.js

@@ -1,14 +1,12 @@
 'use client'
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class FallbackSolanaConnector extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Fallback Connector';
         this.overrideKey = 'fallbackconnector';
         this.isAvailable = false;
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     isInstalledOnBrowser() {
         return false;

package/src/injected/InjectedWalletBase.cjs

@@ -5,44 +5,40 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 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 {
-    getSolProviderHelper() {
-        if (!this.wallet) {
-            this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+class InjectedWalletBase extends solanaCore.SolanaWalletConnector {
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper.SolProviderHelper(this);
         }
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new solProviderHelper.SolProviderHelper(this.wallet);
-        }
-        return this.solProviderHelper;
+        return this._solProviderHelper;
     }
-    getProvider() {
+    findProvider() {
         var _a;
-        return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+        return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
     }
     setupEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._setupEventListeners();
     }
     teardownEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
+            yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     getSigner() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
+            return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     createUiTransaction(from) {
@@ -53,6 +49,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,23 +70,21 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
     isInstalledOnBrowser() {
         var _a;
-        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
+        return Boolean((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             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()),
                     });
@@ -96,23 +92,23 @@ class InjectedWalletBase extends solanaCore.SolWalletConnector {
                 }
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress());
+            const walletAddress = yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError.SignMessageNotSupportedError(this.name);
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
+            return (_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/injected/InjectedWalletBase.d.ts

@@ -1,13 +1,11 @@
-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 {
-    solProviderHelper: SolProviderHelper | undefined;
-    wallet: WalletSchema | undefined;
-    getSolProviderHelper(): SolProviderHelper | undefined;
-    getProvider(): ISolana | undefined;
+import { SolProviderHelper } from '../SolProviderHelper';
+export declare abstract class InjectedWalletBase extends SolanaWalletConnector implements ISendBalanceWalletConnector {
+    _solProviderHelper: SolProviderHelper | undefined;
+    get solProviderHelper(): SolProviderHelper | undefined;
+    findProvider(): ISolana | undefined;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;

package/src/injected/InjectedWalletBase.js

@@ -1,44 +1,40 @@
 'use client'
 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 {
-    getSolProviderHelper() {
-        if (!this.wallet) {
-            this.wallet = findWalletBookWallet(this.walletBook, this.key);
+class InjectedWalletBase extends SolanaWalletConnector {
+    get solProviderHelper() {
+        if (!this._solProviderHelper) {
+            this._solProviderHelper = new SolProviderHelper(this);
         }
-        if (this.wallet && !this.solProviderHelper) {
-            this.solProviderHelper = new SolProviderHelper(this.wallet);
-        }
-        return this.solProviderHelper;
+        return this._solProviderHelper;
     }
-    getProvider() {
+    findProvider() {
         var _a;
-        return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
+        return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getInstalledProvider();
     }
     setupEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._setupEventListeners(this);
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._setupEventListeners();
     }
     teardownEventListeners() {
         var _a;
-        (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
+        (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a._teardownEventListeners();
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect());
+            yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect());
         });
     }
     getSigner() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
+            return (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
     createUiTransaction(from) {
@@ -49,6 +45,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,23 +66,21 @@ class InjectedWalletBase extends SolWalletConnector {
                     return (yield signer.signAndSendTransaction(transaction)).signature;
                 }),
             });
-            transaction.feeDeducted = true;
             return transaction;
         });
     }
     isInstalledOnBrowser() {
         var _a;
-        return Boolean((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
+        return Boolean((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.isInstalledHelper());
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             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()),
                     });
@@ -92,23 +88,23 @@ class InjectedWalletBase extends SolWalletConnector {
                 }
                 return;
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.getAddress();
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.getAddress();
         });
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const walletAddress = yield ((_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getAddress());
+            const walletAddress = yield ((_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
             if (walletAddress && this.isLedgerAddress(walletAddress)) {
                 throw new SignMessageNotSupportedError(this.name);
             }
-            return (_b = this.getSolProviderHelper()) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
+            return (_b = this.solProviderHelper) === null || _b === void 0 ? void 0 : _b.signMessage(messageToSign);
         });
     }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            return (_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
+            return (_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()) !== null && _b !== void 0 ? _b : [];
         });
     }
 }

package/src/injected/PhantomInjected.cjs

@@ -5,15 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 class PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -34,7 +32,7 @@ class PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return ((_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
+        return ((_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
     }
 }
 

package/src/injected/PhantomInjected.d.ts

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

package/src/injected/PhantomInjected.js

@@ -1,15 +1,13 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class PhantomInjected extends InjectedWalletBase {
-    constructor(opts) {
-        super(opts);
+    constructor() {
+        super(...arguments);
         this.name = 'Phantom';
         this.overrideKey = 'phantom';
-        this.wallet = findWalletBookWallet(this.walletBook, this.key);
     }
     getAddress() {
         const _super = Object.create(null, {
@@ -30,7 +28,7 @@ class PhantomInjected extends InjectedWalletBase {
     }
     canGetChainAddress() {
         var _a, _b;
-        return ((_b = (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
+        return ((_b = (_a = this.solProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) === null || _b === void 0 ? void 0 : _b.publicKey) !== null;
     }
 }
 

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');
@@ -48,10 +48,9 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
             }
         }
         return class extends InjectedWalletBase.InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
+            constructor() {
+                super(...arguments);
                 this.name = name;
-                this.wallet = wallet;
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }

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';
@@ -44,10 +44,9 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
             }
         }
         return class extends InjectedWalletBase {
-            constructor(props) {
-                super(Object.assign({}, props));
+            constructor() {
+                super(...arguments);
                 this.name = name;
-                this.wallet = wallet;
                 // this is the key from the wallet book entry so that we don't purely rely on the normalized name
                 this.overrideKey = key;
             }

package/src/injected/index.d.ts

@@ -1,3 +1,2 @@
 export * from './fetchInjectedWalletConnectors';
-export * from './UnknownInjected';
 export * from './FallbackSolanaConnector';

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);