@dynamic-labs/solana 3.0.0-alpha.9 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "3.0.0-alpha.9",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,21 +27,20 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.92.1",
-    "@dynamic-labs/sdk-api-core": "0.0.470",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "@wallet-standard/features": "1.0.3",
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/embedded-wallet-solana": "3.0.0-alpha.9",
-    "@dynamic-labs/rpc-provider-solana": "3.0.0-alpha.9",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.9",
-    "@dynamic-labs/types": "3.0.0-alpha.9",
-    "@dynamic-labs/utils": "3.0.0-alpha.9",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.9",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.9",
-    "eventemitter3": "5.0.1"
+    "@dynamic-labs/embedded-wallet-solana": "3.0.0",
+    "@dynamic-labs/rpc-providers": "3.0.0",
+    "@dynamic-labs/sdk-api-core": "0.0.529",
+    "@dynamic-labs/solana-core": "3.0.0",
+    "@dynamic-labs/types": "3.0.0",
+    "@dynamic-labs/utils": "3.0.0",
+    "@dynamic-labs/wallet-book": "3.0.0",
+    "@dynamic-labs/wallet-connector-core": "3.0.0"
   },
   "peerDependencies": {}
 }

package/src/CoinbaseSolana.cjs

@@ -7,7 +7,7 @@ var _tslib = require('../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletBook = require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/embedded-wallet-solana');
-require('./solWalletConnector.cjs');
+require('@dynamic-labs/solana-core');
 require('tweetnacl');
 require('bs58');
 require('@solana/web3.js');

package/src/CoinbaseSolana.d.ts

@@ -1,4 +1,4 @@
-import { SolWalletConnectorOpts } from './solWalletConnector';
+import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './injected/InjectedWalletBase';
 export declare class CoinbaseSolana extends InjectedWalletBase {
     name: string;

package/src/CoinbaseSolana.js

@@ -3,7 +3,7 @@ import { __awaiter } from '../_virtual/_tslib.js';
 import { bufferToBase64 } from '@dynamic-labs/utils';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import '@dynamic-labs/embedded-wallet-solana';
-import './solWalletConnector.js';
+import '@dynamic-labs/solana-core';
 import 'tweetnacl';
 import 'bs58';
 import '@solana/web3.js';

package/src/Phantom.cjs

@@ -6,11 +6,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
-var solWalletConnector = require('./solWalletConnector.cjs');
+var solanaCore = require('@dynamic-labs/solana-core');
 var PhantomRedirect = require('./phantomRedirect/PhantomRedirect.cjs');
 var PhantomInjected = require('./injected/PhantomInjected.cjs');
 
-class Phantom extends solWalletConnector.SolWalletConnector {
+class Phantom extends solanaCore.SolWalletConnector {
     constructor(opts) {
         super(opts);
         this.name = 'Phantom';
@@ -32,7 +32,7 @@ class Phantom extends solWalletConnector.SolWalletConnector {
         if (!utils.isMobile() || phantomInjected.isInstalledOnBrowser()) {
             return phantomInjected;
         }
-        if (this.constructorProps.mobileExperience === 'redirect') {
+        if (this.mobileExperience === 'redirect') {
             return new PhantomRedirect.PhantomRedirect(this.constructorProps);
         }
         else {

package/src/Phantom.d.ts

@@ -1,7 +1,6 @@
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
-import { ISolana } from '..';
-import { SolWalletConnector, SolWalletConnectorOpts } from './solWalletConnector';
+import { SolWalletConnector, SolWalletConnectorOpts, type ISolana } from '@dynamic-labs/solana-core';
 export declare class Phantom extends SolWalletConnector {
     name: string;
     overrideKey: string;

package/src/Phantom.js

@@ -2,7 +2,7 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile } from '@dynamic-labs/utils';
-import { SolWalletConnector } from './solWalletConnector.js';
+import { SolWalletConnector } from '@dynamic-labs/solana-core';
 import { PhantomRedirect } from './phantomRedirect/PhantomRedirect.js';
 import { PhantomInjected } from './injected/PhantomInjected.js';
 
@@ -28,7 +28,7 @@ class Phantom extends SolWalletConnector {
         if (!isMobile() || phantomInjected.isInstalledOnBrowser()) {
             return phantomInjected;
         }
-        if (this.constructorProps.mobileExperience === 'redirect') {
+        if (this.mobileExperience === 'redirect') {
             return new PhantomRedirect(this.constructorProps);
         }
         else {

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
 var app = require('@wallet-standard/app');
-var solWalletConnector = require('../solWalletConnector.cjs');
+var solanaCore = require('@dynamic-labs/solana-core');
 var createSolanaSignerFromWalletStandard = require('./utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
 
 const encoder = new TextEncoder();
-class SolanaWalletStandardConnector extends solWalletConnector.SolWalletConnector {
+class SolanaWalletStandardConnector extends solanaCore.SolWalletConnector {
     constructor(props) {
         super(props);
         this.connectedChain = 'SOL';

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.d.ts

@@ -2,8 +2,7 @@ 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 } from './../solWalletConnector';
-import { ISolana } from './../types';
+import { SolWalletConnector, SolWalletConnectorOpts, type ISolana } from '@dynamic-labs/solana-core';
 export declare abstract class SolanaWalletStandardConnector extends SolWalletConnector {
     connectedChain: Chain;
     supportedChains: Chain[];

package/src/SolanaWalletStandardConnector/SolanaWalletStandardConnector.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { getWallets } from '@wallet-standard/app';
-import { SolWalletConnector } from '../solWalletConnector.js';
+import { SolWalletConnector } from '@dynamic-labs/solana-core';
 import { createSolanaSignerFromWalletStandard } from './utils/createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
 
 const encoder = new TextEncoder();

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

@@ -55,7 +55,7 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
             account,
             message,
         });
-        return messages[0].signature;
+        return { signature: messages[0].signature };
     });
     return {
         addListener: () => {

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

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

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

@@ -51,7 +51,7 @@ const createSolanaSignerFromWalletStandard = (wallet, walletConnector) => {
             account,
             message,
         });
-        return messages[0].signature;
+        return { signature: messages[0].signature };
     });
     return {
         addListener: () => {

package/src/Solflare.cjs

@@ -58,18 +58,6 @@ class Solflare extends InjectedWalletBase.InjectedWalletBase {
                 : undefined;
         });
     }
-    getConnectedAccounts() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const provider = this.getProvider();
-            if (!provider)
-                return [];
-            const publicKey = (_a = provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString();
-            if (publicKey)
-                return [publicKey];
-            return [];
-        });
-    }
 }
 
 exports.Solflare = Solflare;

package/src/Solflare.d.ts

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

package/src/Solflare.js

@@ -54,18 +54,6 @@ class Solflare extends InjectedWalletBase {
                 : undefined;
         });
     }
-    getConnectedAccounts() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const provider = this.getProvider();
-            if (!provider)
-                return [];
-            const publicKey = (_a = provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString();
-            if (publicKey)
-                return [publicKey];
-            return [];
-        });
-    }
 }
 
 export { Solflare };

package/src/index.cjs

@@ -10,6 +10,7 @@ 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 solanaCore = require('@dynamic-labs/solana-core');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [
@@ -23,4 +24,8 @@ const SolanaWalletConnectors = (props) => [
 
 exports.isSignedMessage = isSignedMessage.isSignedMessage;
 exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
+Object.defineProperty(exports, 'isSolanaWallet', {
+  enumerable: true,
+  get: function () { return solanaCore.isSolanaWallet; }
+});
 exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/index.d.ts

@@ -2,4 +2,5 @@ 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 { ISolana, IBackpackSolanaSigner, ICoinbaseSolanaSigner, SignedMessage, ISolanaSigner, } from './types';
+export type { IEmbeddedWalletSolanaSigner } from '@dynamic-labs/embedded-wallet-solana';
+export { isSolanaWallet } from '@dynamic-labs/solana-core';

package/src/index.js

@@ -6,6 +6,7 @@ import { UnknownInjected } from './injected/UnknownInjected.js';
 import { FallbackSolanaConnector } from './injected/FallbackSolanaConnector.js';
 export { isSignedMessage } from './utils/isSignedMessage.js';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
+export { isSolanaWallet } from '@dynamic-labs/solana-core';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [

package/src/injected/BackpackSol.d.ts

@@ -1,4 +1,4 @@
-import { SolWalletConnectorOpts } from '../solWalletConnector';
+import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;

package/src/injected/FallbackSolanaConnector.d.ts

@@ -1,4 +1,4 @@
-import { SolWalletConnectorOpts } from '../solWalletConnector';
+import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class FallbackSolanaConnector extends InjectedWalletBase {
     name: string;

package/src/injected/InjectedWalletBase.cjs

@@ -4,13 +4,14 @@
 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 solWalletConnector = require('../solWalletConnector.cjs');
 var SignMessageNotSupportedError = require('../errors/SignMessageNotSupportedError.cjs');
 
-class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
+class InjectedWalletBase extends solanaCore.SolWalletConnector {
     getSolProviderHelper() {
         if (!this.wallet) {
             this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
@@ -44,6 +45,37 @@ class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
             return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
+    createUiTransaction(from) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            const transaction = new solanaCore.SolanaUiTransaction({
+                connection: this.getWalletClient(),
+                from,
+                onSubmit: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const signer = yield this.getSigner();
+                    if (!signer)
+                        throw new Error('Signer not found');
+                    const blockhash = yield this.getWalletClient().getLatestBlockhash();
+                    if ('version' in transaction) {
+                        transaction.message.recentBlockhash =
+                            blockhash.blockhash;
+                    }
+                    else {
+                        const userAddress = yield this.getAddress();
+                        if (!userAddress)
+                            throw new Error('User address not found');
+                        transaction.recentBlockhash = blockhash.blockhash;
+                        transaction.feePayer =
+                            (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new web3_js.PublicKey(userAddress);
+                    }
+                    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());
@@ -54,7 +86,8 @@ class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
             if (!this.isInstalledOnBrowser()) {
                 if (utils.isMobile() &&
                     ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser) {
+                    this.wallet.mobile.inAppBrowser &&
+                    this.mobileExperience === 'in-app-browser') {
                     const inAppBrowserCompiledTemplate = utils.template(this.wallet.mobile.inAppBrowser);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),

package/src/injected/InjectedWalletBase.d.ts

@@ -1,8 +1,9 @@
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { ISolana } from '../types';
+import { SolWalletConnector, 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';
-import { SolWalletConnector } from '../solWalletConnector';
-export declare abstract class InjectedWalletBase extends SolWalletConnector {
+export declare abstract class InjectedWalletBase extends SolWalletConnector implements ISendBalanceWalletConnector {
     solProviderHelper: SolProviderHelper | undefined;
     wallet: WalletSchema | undefined;
     getSolProviderHelper(): SolProviderHelper | undefined;
@@ -11,6 +12,7 @@ export declare abstract class InjectedWalletBase extends SolWalletConnector {
     teardownEventListeners(): void;
     connect(): Promise<void>;
     getSigner<T = ISolana>(): Promise<T | undefined>;
+    createUiTransaction(from: string): Promise<IUITransaction>;
     isInstalledOnBrowser(): boolean;
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/injected/InjectedWalletBase.js

@@ -1,9 +1,10 @@
 '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 { SolWalletConnector } from '../solWalletConnector.js';
 import { SignMessageNotSupportedError } from '../errors/SignMessageNotSupportedError.js';
 
 class InjectedWalletBase extends SolWalletConnector {
@@ -40,6 +41,37 @@ class InjectedWalletBase extends SolWalletConnector {
             return (_a = this.getSolProviderHelper()) === null || _a === void 0 ? void 0 : _a.connect();
         });
     }
+    createUiTransaction(from) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
+            const transaction = new SolanaUiTransaction({
+                connection: this.getWalletClient(),
+                from,
+                onSubmit: (transaction) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    const signer = yield this.getSigner();
+                    if (!signer)
+                        throw new Error('Signer not found');
+                    const blockhash = yield this.getWalletClient().getLatestBlockhash();
+                    if ('version' in transaction) {
+                        transaction.message.recentBlockhash =
+                            blockhash.blockhash;
+                    }
+                    else {
+                        const userAddress = yield this.getAddress();
+                        if (!userAddress)
+                            throw new Error('User address not found');
+                        transaction.recentBlockhash = blockhash.blockhash;
+                        transaction.feePayer =
+                            (_a = transaction.feePayer) !== null && _a !== void 0 ? _a : new PublicKey(userAddress);
+                    }
+                    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());
@@ -50,7 +82,8 @@ class InjectedWalletBase extends SolWalletConnector {
             if (!this.isInstalledOnBrowser()) {
                 if (isMobile() &&
                     ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) &&
-                    this.wallet.mobile.inAppBrowser) {
+                    this.wallet.mobile.inAppBrowser &&
+                    this.mobileExperience === 'in-app-browser') {
                     const inAppBrowserCompiledTemplate = template(this.wallet.mobile.inAppBrowser);
                     const deepLink = inAppBrowserCompiledTemplate({
                         encodedDappURI: encodeURIComponent(window.location.toString()),

package/src/injected/PhantomInjected.cjs

@@ -32,6 +32,10 @@ class PhantomInjected extends InjectedWalletBase.InjectedWalletBase {
             return undefined;
         });
     }
+    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;
+    }
 }
 
 exports.PhantomInjected = PhantomInjected;

package/src/injected/PhantomInjected.d.ts

@@ -1,8 +1,9 @@
-import { SolWalletConnectorOpts } from '../solWalletConnector';
+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

@@ -28,6 +28,10 @@ class PhantomInjected extends InjectedWalletBase {
             return undefined;
         });
     }
+    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;
+    }
 }
 
 export { PhantomInjected };

package/src/injected/UnknownInjected.d.ts

@@ -1,4 +1,4 @@
-import { SolWalletConnectorOpts } from '../solWalletConnector';
+import { SolWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class UnknownInjected extends InjectedWalletBase {
     name: string;

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var CoinbaseSolana = require('../CoinbaseSolana.cjs');
 var Solflare = require('../Solflare.cjs');
 var SolanaWalletStandardConnector = require('../SolanaWalletStandardConnector/SolanaWalletStandardConnector.cjs');
-var MagicEdenSolana = require('../MagicEdenSolana.cjs');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var BackpackSol = require('./BackpackSol.cjs');
 
@@ -14,7 +13,6 @@ const injectedWalletOverrides = [
     CoinbaseSolana.CoinbaseSolana,
     BackpackSol.BackpackSol,
     Solflare.Solflare,
-    MagicEdenSolana.MagicEdenSolana,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -22,7 +20,6 @@ const filteredInjectedWalletKeysOverrides = [
     'phantomledger',
     'backpacksol',
     'solflare',
-    'magicedensol',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -2,7 +2,6 @@
 import { CoinbaseSolana } from '../CoinbaseSolana.js';
 import { Solflare } from '../Solflare.js';
 import { SolanaWalletStandardConnector } from '../SolanaWalletStandardConnector/SolanaWalletStandardConnector.js';
-import { MagicEdenSolana } from '../MagicEdenSolana.js';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 import { BackpackSol } from './BackpackSol.js';
 
@@ -10,7 +9,6 @@ const injectedWalletOverrides = [
     CoinbaseSolana,
     BackpackSol,
     Solflare,
-    MagicEdenSolana,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -18,7 +16,6 @@ const filteredInjectedWalletKeysOverrides = [
     'phantomledger',
     'backpacksol',
     'solflare',
-    'magicedensol',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/phantomRedirect/PhantomRedirect.cjs

@@ -7,7 +7,7 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var nacl = require('tweetnacl');
 var bs58 = require('bs58');
 var web3_js = require('@solana/web3.js');
-var solWalletConnector = require('../solWalletConnector.cjs');
+var solanaCore = require('@dynamic-labs/solana-core');
 var utils = require('./utils.cjs');
 var storage = require('./storage.cjs');
 
@@ -16,7 +16,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
 var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
 
-class PhantomRedirect extends solWalletConnector.SolWalletConnector {
+class PhantomRedirect extends solanaCore.SolWalletConnector {
     constructor(props) {
         super(Object.assign({}, props));
         this.name = 'Phantom';
@@ -248,7 +248,7 @@ class PhantomRedirect extends solWalletConnector.SolWalletConnector {
                     const url = utils.buildUrl('signMessage', params);
                     window.location.href = url;
                     // actual signature will be retrived upon redirect back to dapp
-                    return Buffer.from('');
+                    return { signature: Buffer.from('') };
                 }),
                 signTransaction: (transaction) => _tslib.__awaiter(this, void 0, void 0, function* () {
                     const serializedTransaction = bs58__default["default"].encode(transaction.serialize({

package/src/phantomRedirect/PhantomRedirect.d.ts

@@ -1,7 +1,6 @@
 import { Transaction } from '@solana/web3.js';
 import { IPhantomRedirectConnector } from '@dynamic-labs/wallet-connector-core';
-import { SolWalletConnector } from '../solWalletConnector';
-import { ISolana } from '..';
+import { SolWalletConnector, type ISolana } from '@dynamic-labs/solana-core';
 import { Method } from './types';
 export declare class PhantomRedirect extends SolWalletConnector implements IPhantomRedirectConnector {
     name: string;

package/src/phantomRedirect/PhantomRedirect.js

@@ -3,7 +3,7 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import nacl from 'tweetnacl';
 import bs58 from 'bs58';
 import { PublicKey, Transaction } from '@solana/web3.js';
-import { SolWalletConnector } from '../solWalletConnector.js';
+import { SolWalletConnector } from '@dynamic-labs/solana-core';
 import { fetchCluster, buildUrl, decryptPayload, encryptPayload } from './utils.js';
 import { storage, clearStorage } from './storage.js';
 
@@ -239,7 +239,7 @@ class PhantomRedirect extends SolWalletConnector {
                     const url = buildUrl('signMessage', params);
                     window.location.href = url;
                     // actual signature will be retrived upon redirect back to dapp
-                    return Buffer.from('');
+                    return { signature: Buffer.from('') };
                 }),
                 signTransaction: (transaction) => __awaiter(this, void 0, void 0, function* () {
                     const serializedTransaction = bs58.encode(transaction.serialize({

package/src/solProviderHelper.d.ts

@@ -1,6 +1,6 @@
 import { WalletSchema } from '@dynamic-labs/wallet-book';
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { ISolana, ExtensionLocator as ExtensionLocator } from './types';
+import { ISolana, ExtensionLocator as ExtensionLocator } from '@dynamic-labs/solana-core';
 export declare class SolProviderHelper {
     private wallet;
     constructor(wallet: WalletSchema);
@@ -14,6 +14,7 @@ export declare class SolProviderHelper {
         walletStandard?: {
             features: string[];
             name: string;
+            providerId?: string | undefined;
         } | undefined;
         walletStandardLocators?: {
             name: string;
@@ -22,7 +23,7 @@ export declare class SolProviderHelper {
         windowLocations?: string[] | undefined;
     } | undefined;
     getInstalledProvider(): ISolana | undefined;
-    installedProviders(): (import("./types").ISolanaSigner | import("./types").IBackpackSolanaSigner | import("./types").ICoinbaseSolanaSigner)[];
+    installedProviders(): import("@dynamic-labs/solana-core").ISolanaSigner[];
     installedProviderLookup(extensionLocators: Array<ProviderCondition<ExtensionLocator>>): ISolana | undefined;
     findProvider(): ISolana | undefined;
     isInstalledHelper(): boolean;

package/src/utils/findWalletProviderFromWalletStandard/findWalletProviderFromWalletStandard.d.ts

@@ -1,3 +1,3 @@
 import { WalletSchema } from '@dynamic-labs/wallet-book';
-import { ISolana } from '../../types';
+import { ISolana } from '@dynamic-labs/solana-core';
 export declare const findWalletProviderFromWalletStandard: (injectConfig: NonNullable<WalletSchema['injectedConfig']>[number]) => ISolana | undefined;

package/src/utils/isBackpackSolanaSigner.d.ts

@@ -1,2 +1,2 @@
-import { IBackpackSolanaSigner, ISolana } from '../types';
+import { IBackpackSolanaSigner, ISolana } from '@dynamic-labs/solana-core';
 export declare const isBackpackSolanaSigner: (signer: ISolana) => signer is IBackpackSolanaSigner;

package/src/utils/isSignedMessage.d.ts

@@ -1,2 +1,2 @@
-import { SignedMessage } from '../types';
+import { SignedMessage } from '@dynamic-labs/solana-core';
 export declare const isSignedMessage: (message: SignedMessage | Uint8Array) => message is SignedMessage;