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

package/CHANGELOG.md

@@ -1,4 +1,27 @@
 
+## [3.0.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.8...v3.0.0-alpha.9) (2024-06-21)
+
+## [3.0.0-alpha.8](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.7...v3.0.0-alpha.8) (2024-06-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* break out turnkey package into 3 separate packages (#6015)
+
+### Features
+
+* add reinitialize hook ([#6098](https://github.com/dynamic-labs/DynamicAuth/issues/6098)) ([d978baa](https://github.com/dynamic-labs/DynamicAuth/commit/d978baa404d34064c36cc549229b1fcea1f20df0))
+
+
+### Bug Fixes
+
+* always reconnect the wallet provider when calling getAddress ([#6097](https://github.com/dynamic-labs/DynamicAuth/issues/6097)) ([0f3d497](https://github.com/dynamic-labs/DynamicAuth/commit/0f3d497cedb38239fa9ada2bb25c6b4eaa72d7b1))
+* break out turnkey package into 3 separate packages ([#6015](https://github.com/dynamic-labs/DynamicAuth/issues/6015)) ([a86fbef](https://github.com/dynamic-labs/DynamicAuth/commit/a86fbefe97558363b085e6f752af32d2943f91fa)), closes [#6017](https://github.com/dynamic-labs/DynamicAuth/issues/6017) [#6059](https://github.com/dynamic-labs/DynamicAuth/issues/6059)
+* set latest blockhash on solana transactions if tx confirmation ui is disabled ([#6102](https://github.com/dynamic-labs/DynamicAuth/issues/6102)) ([b8035a3](https://github.com/dynamic-labs/DynamicAuth/commit/b8035a328e47409bf0416d3a01b2f17914488748))
+* silently query unisat accounts ([#6101](https://github.com/dynamic-labs/DynamicAuth/issues/6101)) ([#6104](https://github.com/dynamic-labs/DynamicAuth/issues/6104)) ([643e704](https://github.com/dynamic-labs/DynamicAuth/commit/643e7048ff8610b31e6397e10b160ad456a45d11))
+* stop querying magiceden solana accounts ([#6103](https://github.com/dynamic-labs/DynamicAuth/issues/6103)) ([#6108](https://github.com/dynamic-labs/DynamicAuth/issues/6108)) ([3cfdbc3](https://github.com/dynamic-labs/DynamicAuth/commit/3cfdbc3bc82bfe9bf53bf4236f7892a5440fcb86))
+* trigger sign when linking an already linked unknown wallet ([#6105](https://github.com/dynamic-labs/DynamicAuth/issues/6105)) ([9e9c03b](https://github.com/dynamic-labs/DynamicAuth/commit/9e9c03bf615991c4f1183bf85c4d75c9a7773c85))
+
 ## [3.0.0-alpha.7](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.6...v3.0.0-alpha.7) (2024-06-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "3.0.0-alpha.7",
+  "version": "3.0.0-alpha.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -34,13 +34,13 @@
     "@wallet-standard/experimental-features": "0.1.1",
     "bs58": "5.0.0",
     "tweetnacl": "1.0.3",
-    "@dynamic-labs/rpc-provider-solana": "3.0.0-alpha.7",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.7",
-    "@dynamic-labs/turnkey": "3.0.0-alpha.7",
-    "@dynamic-labs/types": "3.0.0-alpha.7",
-    "@dynamic-labs/utils": "3.0.0-alpha.7",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.7",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.7",
+    "@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"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -6,7 +6,7 @@ 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');
-require('@dynamic-labs/turnkey');
+require('@dynamic-labs/embedded-wallet-solana');
 require('./solWalletConnector.cjs');
 require('tweetnacl');
 require('bs58');

package/src/CoinbaseSolana.js

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

package/src/MagicEdenSolana.cjs

@@ -0,0 +1,31 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../_virtual/_tslib.cjs');
+var InjectedWalletBase = require('./injected/InjectedWalletBase.cjs');
+
+class MagicEdenSolana extends InjectedWalletBase.InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
+        this.name = 'Magic Eden';
+        this.overrideKey = 'magicedensol';
+    }
+    // override to prevent ME SOL from popping up an unlock prompt
+    // the wallet currently does not support silent account querying
+    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.MagicEdenSolana = MagicEdenSolana;

package/src/MagicEdenSolana.d.ts

@@ -0,0 +1,8 @@
+import { SolWalletConnectorOpts } from './solWalletConnector';
+import { InjectedWalletBase } from './injected/InjectedWalletBase';
+export declare class MagicEdenSolana extends InjectedWalletBase {
+    name: string;
+    overrideKey: string;
+    constructor(opts: SolWalletConnectorOpts);
+    getConnectedAccounts(): Promise<string[]>;
+}

package/src/MagicEdenSolana.js

@@ -0,0 +1,27 @@
+'use client'
+import { __awaiter } from '../_virtual/_tslib.js';
+import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
+
+class MagicEdenSolana extends InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
+        this.name = 'Magic Eden';
+        this.overrideKey = 'magicedensol';
+    }
+    // override to prevent ME SOL from popping up an unlock prompt
+    // the wallet currently does not support silent account querying
+    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 { MagicEdenSolana };

package/src/index.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var turnkey = require('@dynamic-labs/turnkey');
+var embeddedWalletSolana = require('@dynamic-labs/embedded-wallet-solana');
 var Phantom = require('./Phantom.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 var UnknownInjected = require('./injected/UnknownInjected.cjs');
@@ -15,7 +15,7 @@ var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 const SolanaWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
-    ...turnkey.TurnkeySolanaWalletConnectors(props),
+    ...embeddedWalletSolana.TurnkeySolanaWalletConnectors(props),
     Phantom.Phantom,
     UnknownInjected.UnknownInjected,
     FallbackSolanaConnector.FallbackSolanaConnector,

package/src/index.js

@@ -1,5 +1,5 @@
 'use client'
-import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/turnkey';
+import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/embedded-wallet-solana';
 import { Phantom } from './Phantom.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
 import { UnknownInjected } from './injected/UnknownInjected.js';

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -6,6 +6,7 @@ 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');
 
@@ -13,6 +14,7 @@ const injectedWalletOverrides = [
     CoinbaseSolana.CoinbaseSolana,
     BackpackSol.BackpackSol,
     Solflare.Solflare,
+    MagicEdenSolana.MagicEdenSolana,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -20,6 +22,7 @@ const filteredInjectedWalletKeysOverrides = [
     'phantomledger',
     'backpacksol',
     'solflare',
+    'magicedensol',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -2,6 +2,7 @@
 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';
 
@@ -9,6 +10,7 @@ const injectedWalletOverrides = [
     CoinbaseSolana,
     BackpackSol,
     Solflare,
+    MagicEdenSolana,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -16,6 +18,7 @@ const filteredInjectedWalletKeysOverrides = [
     'phantomledger',
     'backpacksol',
     'solflare',
+    'magicedensol',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/solProviderHelper.cjs

@@ -80,9 +80,7 @@ class SolProviderHelper {
             if (!provider) {
                 return undefined;
             }
-            if (!provider.isConnected) {
-                yield provider.connect();
-            }
+            yield provider.connect();
             return (_a = provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString();
         });
     }
@@ -110,9 +108,6 @@ class SolProviderHelper {
             const provider = this.findProvider();
             if (!provider)
                 return undefined;
-            if (!provider.isConnected) {
-                yield provider.connect();
-            }
             const encodedMessage = new TextEncoder().encode(messageToSign);
             const signedMessage = yield provider.signMessage(encodedMessage, 'utf8');
             if (!signedMessage)

package/src/solProviderHelper.js

@@ -76,9 +76,7 @@ class SolProviderHelper {
             if (!provider) {
                 return undefined;
             }
-            if (!provider.isConnected) {
-                yield provider.connect();
-            }
+            yield provider.connect();
             return (_a = provider.publicKey) === null || _a === void 0 ? void 0 : _a.toString();
         });
     }
@@ -106,9 +104,6 @@ class SolProviderHelper {
             const provider = this.findProvider();
             if (!provider)
                 return undefined;
-            if (!provider.isConnected) {
-                yield provider.connect();
-            }
             const encodedMessage = new TextEncoder().encode(messageToSign);
             const signedMessage = yield provider.signMessage(encodedMessage, 'utf8');
             if (!signedMessage)