@dynamic-labs/solana 3.0.0-alpha.52 → 3.0.0-alpha.53

package/CHANGELOG.md

@@ -1,4 +1,43 @@
 
+## [3.0.0-alpha.53](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.52...v3.0.0-alpha.53) (2024-08-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* simplify solana wallet signer types (#6748)
+* deprecate getEoaConnector (#6571)
+* limit methods and props returned by wallet.connector (#6540)
+* move generic solana code to solana-core package (#6701)
+* revamp ether v6 interface (#6548)
+* add ethereum wallet specific methods and intercept to sync when needed (#6662)
+* add solana wallet specific methods and intercept to sync when needed (#6608)
+* don't force primary wallet to be connected (#6128)
+
+### Features
+
+* add bitcoin wallet specific methods and intercept to sync when needed ([#6663](https://github.com/dynamic-labs/DynamicAuth/issues/6663)) ([ed699b1](https://github.com/dynamic-labs/DynamicAuth/commit/ed699b1f8c264755779ec4840d105f89ade5500e))
+* add ethereum wallet specific methods and intercept to sync when needed ([#6662](https://github.com/dynamic-labs/DynamicAuth/issues/6662)) ([372360e](https://github.com/dynamic-labs/DynamicAuth/commit/372360ed7ca395f88811fc62c94b2b494eb59971))
+* add solana wallet specific methods and intercept to sync when needed ([#6608](https://github.com/dynamic-labs/DynamicAuth/issues/6608)) ([565f610](https://github.com/dynamic-labs/DynamicAuth/commit/565f6100340296c267e9706fd263e9bd3f7d3732))
+* add useSmartWallets hook to manage aa wallets ([#6564](https://github.com/dynamic-labs/DynamicAuth/issues/6564)) ([a243d36](https://github.com/dynamic-labs/DynamicAuth/commit/a243d361ce7c368d0f1afda55f9c1fabefd75ba8))
+* don't force primary wallet to be connected ([#6128](https://github.com/dynamic-labs/DynamicAuth/issues/6128)) ([018a6f6](https://github.com/dynamic-labs/DynamicAuth/commit/018a6f66f8725914ab97ea3e2e1c80626266e503))
+* new prop to enable prompt for linking when account change is detected ([#6713](https://github.com/dynamic-labs/DynamicAuth/issues/6713)) ([b5a6321](https://github.com/dynamic-labs/DynamicAuth/commit/b5a63212ae33fae24401f141d5ca2356b446dcff))
+
+
+### Bug Fixes
+
+* always sync wagmi client with primary wallet ([#6577](https://github.com/dynamic-labs/DynamicAuth/issues/6577)) ([be22fde](https://github.com/dynamic-labs/DynamicAuth/commit/be22fdea3bb61db79b06ba56cb32da6cd8141b66))
+* cosmos wallet intercepts ([#6720](https://github.com/dynamic-labs/DynamicAuth/issues/6720)) ([cfc9df4](https://github.com/dynamic-labs/DynamicAuth/commit/cfc9df48a8032f7348fec14f77b9e378d2e26a22))
+* magiceden wallet events not working correctly on page refresh ([#6735](https://github.com/dynamic-labs/DynamicAuth/issues/6735)) ([6ed5964](https://github.com/dynamic-labs/DynamicAuth/commit/6ed5964134a2cafd392c19f18eb71e6ca2ce238d))
+* use proxy to intercept solana signer methods ([#6743](https://github.com/dynamic-labs/DynamicAuth/issues/6743)) ([ecbe5ea](https://github.com/dynamic-labs/DynamicAuth/commit/ecbe5ea772592d2c693d8222d85b7642acd151a8))
+* wallet.chain references ([525c1ca](https://github.com/dynamic-labs/DynamicAuth/commit/525c1ca9a8fe6402c06eabe6aebc30e310411d9b))
+
+
+* deprecate getEoaConnector ([#6571](https://github.com/dynamic-labs/DynamicAuth/issues/6571)) ([0226ee5](https://github.com/dynamic-labs/DynamicAuth/commit/0226ee5a13f2418607076ee6f2ec0a579b06dd5d))
+* limit methods and props returned by wallet.connector ([#6540](https://github.com/dynamic-labs/DynamicAuth/issues/6540)) ([9c86e35](https://github.com/dynamic-labs/DynamicAuth/commit/9c86e35c72cd40313bfd19254dd6171ee8f62213))
+* move generic solana code to solana-core package ([#6701](https://github.com/dynamic-labs/DynamicAuth/issues/6701)) ([30815f5](https://github.com/dynamic-labs/DynamicAuth/commit/30815f5d46feeefb2413c1b7d30b43d5370ee032))
+* revamp ether v6 interface ([#6548](https://github.com/dynamic-labs/DynamicAuth/issues/6548)) ([f3b2fb8](https://github.com/dynamic-labs/DynamicAuth/commit/f3b2fb8da7de21f9c58e67fa7f5580166195092a))
+* simplify solana wallet signer types ([#6748](https://github.com/dynamic-labs/DynamicAuth/issues/6748)) ([01d1a42](https://github.com/dynamic-labs/DynamicAuth/commit/01d1a42bc916ab329580b741ba60d706bf6c5491))
+
 ## [3.0.0-alpha.52](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.51...v3.0.0-alpha.52) (2024-08-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "3.0.0-alpha.52",
+  "version": "3.0.0-alpha.53",
   "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.519",
     "@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.52",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.52",
-    "@dynamic-labs/solana-core": "3.0.0-alpha.52",
-    "@dynamic-labs/types": "3.0.0-alpha.52",
-    "@dynamic-labs/utils": "3.0.0-alpha.52",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.52",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.52",
-    "eventemitter3": "5.0.1"
+    "@dynamic-labs/embedded-wallet-solana": "3.0.0-alpha.53",
+    "@dynamic-labs/rpc-providers": "3.0.0-alpha.53",
+    "@dynamic-labs/sdk-api-core": "0.0.519",
+    "@dynamic-labs/solana-core": "3.0.0-alpha.53",
+    "@dynamic-labs/types": "3.0.0-alpha.53",
+    "@dynamic-labs/utils": "3.0.0-alpha.53",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.53",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.53"
   },
   "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';

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

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.d.ts

@@ -1,5 +1,5 @@
+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;

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,5 +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

@@ -9,10 +9,9 @@ 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);
@@ -48,6 +47,7 @@ class InjectedWalletBase extends solWalletConnector.SolWalletConnector {
     }
     createUiTransaction(from) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
             const transaction = new solanaCore.SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from,

package/src/injected/InjectedWalletBase.d.ts

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

package/src/injected/InjectedWalletBase.js

@@ -3,9 +3,8 @@ 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 { SolanaUiTransaction } from '@dynamic-labs/solana-core';
+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 {
@@ -44,6 +43,7 @@ class InjectedWalletBase extends SolWalletConnector {
     }
     createUiTransaction(from) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateActiveWallet(from);
             const transaction = new SolanaUiTransaction({
                 connection: this.getWalletClient(),
                 from,

package/src/injected/PhantomInjected.d.ts

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

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/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);
@@ -22,7 +22,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;

package/src/contants.cjs

@@ -1,8 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const SOLANA_GENESIS_HASH = 'genesis-hash';
-
-exports.SOLANA_GENESIS_HASH = SOLANA_GENESIS_HASH;

package/src/contants.d.ts

@@ -1 +0,0 @@
-export declare const SOLANA_GENESIS_HASH = "genesis-hash";

package/src/contants.js

@@ -1,4 +0,0 @@
-'use client'
-const SOLANA_GENESIS_HASH = 'genesis-hash';
-
-export { SOLANA_GENESIS_HASH };

package/src/solWalletConnector.cjs

@@ -1,172 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../_virtual/_tslib.cjs');
-var web3_js = require('@solana/web3.js');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
-var extractNonce = require('./utils/extractNonce.cjs');
-var getGenesisHashLSKey = require('./utils/getGenesisHashLSKey.cjs');
-
-const MEMO_PROGRAM_ID = new web3_js.PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
-class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
-    constructor(opts) {
-        var _a;
-        super(opts);
-        this.isHardwareWalletEnabled = false;
-        this.verifiedCredentials = [];
-        this.supportedChains = ['SOL'];
-        this.connectedChain = 'SOL';
-        this.solNetworks = opts.solNetworks;
-        this.chainRpcProviders = opts.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
-    }
-    getNetwork() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const provider = this.getWalletClient();
-            let genesisHash = localStorage.getItem(getGenesisHashLSKey.getGenesisHashLSKey(provider.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield provider.getGenesisHash();
-                localStorage.setItem(getGenesisHashLSKey.getGenesisHashLSKey(provider.rpcEndpoint), genesisHash);
-            }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
-            let network;
-            if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                network = 'mainnet';
-            }
-            else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                network = 'devnet';
-            }
-            else {
-                network = 'testnet';
-            }
-            return network;
-        });
-    }
-    endSession() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(getGenesisHashLSKey.getGenesisHashLSKey(this.getWalletClient().rpcEndpoint));
-        });
-    }
-    getWalletClient() {
-        var _a;
-        const [network] = this.solNetworks;
-        if (!network) {
-            throw new utils.DynamicError('No enabled networks');
-        }
-        const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-        return new web3_js.Connection(rpcUrl, 'confirmed');
-    }
-    getPublicClient() {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.solNetworks.length === 0)
-                return;
-            const configurations = {
-                cosmos: [],
-                evm: undefined,
-                solana: this.solNetworks,
-                starknet: undefined,
-            };
-            if (!this.chainRpcProviders)
-                return undefined;
-            const providers = this.chainRpcProviders.getProviders(configurations);
-            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, '101')) === null || _a === void 0 ? void 0 : _a.provider;
-        });
-    }
-    getBalance(address) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const publicKey = new web3_js.PublicKey(address);
-            const balance = this.lamportsToSol(yield this.getWalletClient().getBalance(publicKey));
-            return balance.toString();
-        });
-    }
-    // Solana uses lamports as the smallest unit of currency. This converts lamports to SOL.
-    lamportsToSol(lamports) {
-        return lamports / 1000000000;
-    }
-    canConnectWithHardwareWallet() {
-        const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet || !wallet.hardwareWallets)
-            return false;
-        return wallet.hardwareWallets.includes('ledger');
-    }
-    signMessage(messageToSign) {
-        const _super = Object.create(null, {
-            signMessage: { get: () => super.signMessage }
-        });
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isHardwareWalletEnabled) {
-                throw new utils.NotSupportedError(`Message signing is currently not supported on ${this.name} hardware wallet.
-          You can use signMessageViaTransaction instead to achieve similar functionality
-          by signing a transaction with a memo instruction.
-          You can read more about it here https://github.com/solana-labs/solana/issues/21366`);
-            }
-            return _super.signMessage.call(this, messageToSign);
-        });
-    }
-    proveOwnership(messageToSign) {
-        const _super = Object.create(null, {
-            proveOwnership: { get: () => super.proveOwnership }
-        });
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (this.isHardwareWalletEnabled) {
-                const nonce = extractNonce.extractNonce(messageToSign);
-                if (!nonce) {
-                    throw new utils.DynamicError('Nonce missing');
-                }
-                return this.signMessageViaTransaction(nonce);
-            }
-            return _super.proveOwnership.call(this, messageToSign);
-        });
-    }
-    signMessageViaTransaction(messageToSign) {
-        return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const address = yield this.getAddress();
-            if (!address) {
-                throw new utils.DynamicError('Address missing');
-            }
-            const transaction = this.buildAuthTx(messageToSign);
-            transaction.feePayer = new web3_js.PublicKey(address);
-            transaction.recentBlockhash = (yield this.getWalletClient().getLatestBlockhash()).blockhash;
-            const signer = yield this.getSigner();
-            if (!signer) {
-                throw new utils.DynamicError('Signer not found');
-            }
-            const signedTransaction = yield signer.signTransaction(transaction);
-            const serializedSignedTransaction = signedTransaction.serialize();
-            /**
-             * Serializing the transaction and adding the type 'Buffer' is required
-             * when connecting with backpack + Ledger, because the returned object is not correctly
-             * serialized
-             */
-            return JSON.stringify({
-                signedTransaction: {
-                    data: Array.from(serializedSignedTransaction),
-                    type: 'Buffer',
-                },
-            });
-        });
-    }
-    buildAuthTx(message) {
-        const transaction = new web3_js.Transaction();
-        transaction.add(new web3_js.TransactionInstruction({
-            data: Buffer.from(message, 'utf8'),
-            keys: [],
-            programId: MEMO_PROGRAM_ID,
-        }));
-        return transaction;
-    }
-    setVerifiedCredentials(verifiedCredentials) {
-        this.verifiedCredentials = verifiedCredentials;
-    }
-    isLedgerAddress(address) {
-        return utils.isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
-    }
-}
-
-exports.SolWalletConnector = SolWalletConnector;

package/src/solWalletConnector.d.ts

@@ -1,35 +0,0 @@
-import { Connection } from '@solana/web3.js';
-import { IChainRpcProviders } from '@dynamic-labs/solana-core';
-import { Chain, IHardwareWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { GenericNetwork } from '@dynamic-labs/types';
-import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
-import { ISolana } from './types';
-export type SolWalletConnectorOpts = {
-    chainRpcProviders: IChainRpcProviders;
-    solNetworks: GenericNetwork[];
-    walletBook: WalletBookSchema;
-};
-export declare abstract class SolWalletConnector extends WalletConnectorBase implements IHardwareWalletConnector {
-    isHardwareWalletEnabled: boolean;
-    verifiedCredentials: JwtVerifiedCredential[];
-    solNetworks: GenericNetwork[];
-    supportedChains: Chain[];
-    connectedChain: Chain;
-    constructor(opts: SolWalletConnectorOpts);
-    getNetwork(): Promise<string>;
-    endSession(): Promise<void>;
-    getWalletClient(): Connection;
-    getPublicClient(): Promise<Connection | undefined>;
-    abstract getSigner(): Promise<ISolana | undefined>;
-    abstract connect(): Promise<void>;
-    getBalance(address: string): Promise<string | undefined>;
-    lamportsToSol(lamports: number): number;
-    canConnectWithHardwareWallet(): boolean;
-    signMessage(messageToSign: string): Promise<string | undefined>;
-    proveOwnership(messageToSign: string): Promise<string | undefined>;
-    signMessageViaTransaction(messageToSign: string): Promise<string>;
-    private buildAuthTx;
-    setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;
-    isLedgerAddress(address: string): boolean;
-}

package/src/solWalletConnector.js

@@ -1,168 +0,0 @@
-'use client'
-import { __awaiter } from '../_virtual/_tslib.js';
-import { PublicKey, Connection, Transaction, TransactionInstruction } from '@solana/web3.js';
-import { WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError, NotSupportedError, isLedgerAddressViaVerifiedCredentials } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { extractNonce } from './utils/extractNonce.js';
-import { getGenesisHashLSKey } from './utils/getGenesisHashLSKey.js';
-
-const MEMO_PROGRAM_ID = new PublicKey('MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr');
-class SolWalletConnector extends WalletConnectorBase {
-    constructor(opts) {
-        var _a;
-        super(opts);
-        this.isHardwareWalletEnabled = false;
-        this.verifiedCredentials = [];
-        this.supportedChains = ['SOL'];
-        this.connectedChain = 'SOL';
-        this.solNetworks = opts.solNetworks;
-        this.chainRpcProviders = opts.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerSolanaProviders();
-    }
-    getNetwork() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const provider = this.getWalletClient();
-            let genesisHash = localStorage.getItem(getGenesisHashLSKey(provider.rpcEndpoint));
-            if (!genesisHash) {
-                genesisHash = yield provider.getGenesisHash();
-                localStorage.setItem(getGenesisHashLSKey(provider.rpcEndpoint), genesisHash);
-            }
-            genesisHash = genesisHash.substring(0, 32);
-            // see: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
-            let network;
-            if (genesisHash === '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp') {
-                network = 'mainnet';
-            }
-            else if (genesisHash === 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1') {
-                network = 'devnet';
-            }
-            else {
-                network = 'testnet';
-            }
-            return network;
-        });
-    }
-    endSession() {
-        return __awaiter(this, void 0, void 0, function* () {
-            localStorage.removeItem(getGenesisHashLSKey(this.getWalletClient().rpcEndpoint));
-        });
-    }
-    getWalletClient() {
-        var _a;
-        const [network] = this.solNetworks;
-        if (!network) {
-            throw new DynamicError('No enabled networks');
-        }
-        const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
-        return new Connection(rpcUrl, 'confirmed');
-    }
-    getPublicClient() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (this.solNetworks.length === 0)
-                return;
-            const configurations = {
-                cosmos: [],
-                evm: undefined,
-                solana: this.solNetworks,
-                starknet: undefined,
-            };
-            if (!this.chainRpcProviders)
-                return undefined;
-            const providers = this.chainRpcProviders.getProviders(configurations);
-            return (_a = this.chainRpcProviders.getSolanaProviderByChainId(providers, '101')) === null || _a === void 0 ? void 0 : _a.provider;
-        });
-    }
-    getBalance(address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const publicKey = new PublicKey(address);
-            const balance = this.lamportsToSol(yield this.getWalletClient().getBalance(publicKey));
-            return balance.toString();
-        });
-    }
-    // Solana uses lamports as the smallest unit of currency. This converts lamports to SOL.
-    lamportsToSol(lamports) {
-        return lamports / 1000000000;
-    }
-    canConnectWithHardwareWallet() {
-        const wallet = findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet || !wallet.hardwareWallets)
-            return false;
-        return wallet.hardwareWallets.includes('ledger');
-    }
-    signMessage(messageToSign) {
-        const _super = Object.create(null, {
-            signMessage: { get: () => super.signMessage }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isHardwareWalletEnabled) {
-                throw new NotSupportedError(`Message signing is currently not supported on ${this.name} hardware wallet.
-          You can use signMessageViaTransaction instead to achieve similar functionality
-          by signing a transaction with a memo instruction.
-          You can read more about it here https://github.com/solana-labs/solana/issues/21366`);
-            }
-            return _super.signMessage.call(this, messageToSign);
-        });
-    }
-    proveOwnership(messageToSign) {
-        const _super = Object.create(null, {
-            proveOwnership: { get: () => super.proveOwnership }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isHardwareWalletEnabled) {
-                const nonce = extractNonce(messageToSign);
-                if (!nonce) {
-                    throw new DynamicError('Nonce missing');
-                }
-                return this.signMessageViaTransaction(nonce);
-            }
-            return _super.proveOwnership.call(this, messageToSign);
-        });
-    }
-    signMessageViaTransaction(messageToSign) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const address = yield this.getAddress();
-            if (!address) {
-                throw new DynamicError('Address missing');
-            }
-            const transaction = this.buildAuthTx(messageToSign);
-            transaction.feePayer = new PublicKey(address);
-            transaction.recentBlockhash = (yield this.getWalletClient().getLatestBlockhash()).blockhash;
-            const signer = yield this.getSigner();
-            if (!signer) {
-                throw new DynamicError('Signer not found');
-            }
-            const signedTransaction = yield signer.signTransaction(transaction);
-            const serializedSignedTransaction = signedTransaction.serialize();
-            /**
-             * Serializing the transaction and adding the type 'Buffer' is required
-             * when connecting with backpack + Ledger, because the returned object is not correctly
-             * serialized
-             */
-            return JSON.stringify({
-                signedTransaction: {
-                    data: Array.from(serializedSignedTransaction),
-                    type: 'Buffer',
-                },
-            });
-        });
-    }
-    buildAuthTx(message) {
-        const transaction = new Transaction();
-        transaction.add(new TransactionInstruction({
-            data: Buffer.from(message, 'utf8'),
-            keys: [],
-            programId: MEMO_PROGRAM_ID,
-        }));
-        return transaction;
-    }
-    setVerifiedCredentials(verifiedCredentials) {
-        this.verifiedCredentials = verifiedCredentials;
-    }
-    isLedgerAddress(address) {
-        return isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
-    }
-}
-
-export { SolWalletConnector };

package/src/types.d.ts

@@ -1,68 +0,0 @@
-import { Connection, SendOptions, Signer, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
-import EventEmitter from 'eventemitter3';
-import { ProviderCondition } from '@dynamic-labs/wallet-connector-core';
-declare global {
-    interface IWindowPhantom {
-        solana: ISolana;
-    }
-    interface Window {
-        coinbaseSolana?: ICoinbaseSolanaSigner;
-        glowSolana?: ISolana;
-        phantom?: IWindowPhantom;
-        solana?: ISolana;
-        solflare?: ISolana;
-        backpack?: IBackpackSolanaSigner;
-        magicEden?: {
-            solana: ISolana;
-        };
-    }
-}
-type PublicKey = {
-    toString: () => string;
-};
-export type ConnectionResult = {
-    address?: string;
-    publicKey?: PublicKey;
-} | undefined;
-interface ISolanaEvents {
-    connect(...args: unknown[]): unknown;
-    disconnect(...args: unknown[]): unknown;
-    accountChanged(publicKey: string): unknown;
-    activeWalletDidChange(publicKey: string): unknown;
-}
-export type SignedMessage = {
-    signature: Uint8Array;
-};
-export type ISolanaSigner = {
-    [key in ExtensionLocator]: boolean;
-} & EventEmitter<ISolanaEvents> & {
-    publicKey?: {
-        toBytes(): Uint8Array;
-    };
-    isConnected: boolean;
-    providers: ISolanaSigner[];
-    signTransaction<T extends Transaction | VersionedTransaction>(transaction: T): Promise<T>;
-    signAllTransactions<T extends Transaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
-    signAndSendTransaction<T extends Transaction | VersionedTransaction>(transaction: T, options?: SendOptions): Promise<{
-        signature: TransactionSignature;
-    }>;
-    signMessage(message: Uint8Array, encoding?: string): Promise<SignedMessage>;
-    connect: (args?: {
-        onlyIfTrusted: boolean;
-    }) => Promise<ConnectionResult>;
-    disconnect(): Promise<void>;
-};
-type BackpackSolanaSignerResponse = {
-    signature: Uint8Array;
-};
-export type IBackpackSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {
-    signMessage: (message: Uint8Array, encoding?: string) => Promise<void | BackpackSolanaSignerResponse | Uint8Array>;
-    send: (transaction: Transaction, signers?: Signer[], options?: SendOptions, connection?: Connection, publicKey?: PublicKey) => Promise<TransactionSignature>;
-};
-export type ICoinbaseSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {
-    signMessage: (message: Uint8Array, publicKey?: string) => Promise<void | Uint8Array>;
-};
-export type ISolana = ISolanaSigner | IBackpackSolanaSigner | ICoinbaseSolanaSigner;
-export type ExtensionLocator = 'isBraveWallet' | 'isGlow' | 'isPhantom' | 'isSolflare' | 'isExodus' | 'isBackpack' | 'isMagicEden';
-export type EthProviderCondition = ProviderCondition<ExtensionLocator>;
-export {};

package/src/utils/extractNonce.cjs

@@ -1,14 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const extractNonce = (messageToSign) => {
-    const regex = messageToSign.match(/Nonce: (.*)/);
-    if (regex && regex.length === 2) {
-        return regex[1];
-    }
-    return undefined;
-};
-
-exports.extractNonce = extractNonce;

package/src/utils/extractNonce.d.ts

@@ -1 +0,0 @@
-export declare const extractNonce: (messageToSign: string) => string | undefined;

package/src/utils/extractNonce.js

@@ -1,10 +0,0 @@
-'use client'
-const extractNonce = (messageToSign) => {
-    const regex = messageToSign.match(/Nonce: (.*)/);
-    if (regex && regex.length === 2) {
-        return regex[1];
-    }
-    return undefined;
-};
-
-export { extractNonce };

package/src/utils/getGenesisHashLSKey.cjs

@@ -1,10 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var contants = require('../contants.cjs');
-
-const getGenesisHashLSKey = (rpcEndpoint) => `${rpcEndpoint}_${contants.SOLANA_GENESIS_HASH}`;
-
-exports.getGenesisHashLSKey = getGenesisHashLSKey;

package/src/utils/getGenesisHashLSKey.d.ts

@@ -1 +0,0 @@
-export declare const getGenesisHashLSKey: (rpcEndpoint: string) => string;

package/src/utils/getGenesisHashLSKey.js

@@ -1,6 +0,0 @@
-'use client'
-import { SOLANA_GENESIS_HASH } from '../contants.js';
-
-const getGenesisHashLSKey = (rpcEndpoint) => `${rpcEndpoint}_${SOLANA_GENESIS_HASH}`;
-
-export { getGenesisHashLSKey };