@dynamic-labs/solana 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 
+## [1.4.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.3.1...v1.4.0) (2024-03-21)
+
+
+### Features
+
+* add sign-in with farcaster ([#5059](https://github.com/dynamic-labs/DynamicAuth/issues/5059)) ([83245aa](https://github.com/dynamic-labs/DynamicAuth/commit/83245aa9f973ca349abcbaccf5d150b4a31beb0e)), closes [#4947](https://github.com/dynamic-labs/DynamicAuth/issues/4947)
+* add prop to hide embedded wallet transaction UIs ([#4928](https://github.com/dynamic-labs/DynamicAuth/issues/4928)) ([b0ad954](https://github.com/dynamic-labs/DynamicAuth/commit/b0ad95494ebf991e61f09a23999c3526498f2db9)), closes [#4924](https://github.com/dynamic-labs/DynamicAuth/issues/4924)
+
+
+### Bug Fixes
+
+* multiple wallet improvements
+* multiple ui/ux improvements
+* miscellaneous copy and localization updates
+* add missing css variables for DynamicConnectButton
+
+### [1.3.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.3.0...v1.3.1) (2024-03-08)
+
+
+### Bug Fixes
+
+* pass account and chain to walletClient ([#4865](https://github.com/dynamic-labs/DynamicAuth/issues/4865)) ([#4905](https://github.com/dynamic-labs/DynamicAuth/issues/4905)) ([0f4e79f](https://github.com/dynamic-labs/DynamicAuth/commit/0f4e79ff36f8a3ef63c59bb9f80429cdefbe7307))
+* update btckit network conversion for signpsbt to use correct network ([#4882](https://github.com/dynamic-labs/DynamicAuth/issues/4882)) ([3c14f55](https://github.com/dynamic-labs/DynamicAuth/commit/3c14f55f6e37718a095752d0e04bfbac45fee75c))
+* better auth state handling when logged in with disabled wallets ([#4862](https://github.com/dynamic-labs/DynamicAuth/issues/4862)) ([8cc2a1c](https://github.com/dynamic-labs/DynamicAuth/commit/8cc2a1c4f31cf6acb61d814a3410c5e77da21c50))
+
 ## [1.3.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.2.0...v1.3.0) (2024-03-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,15 +27,15 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.70.1",
-    "@dynamic-labs/sdk-api": "0.0.363",
+    "@dynamic-labs/sdk-api": "0.0.387",
     "bs58": "^5.0.0",
     "tweetnacl": "^1.0.3",
-    "@dynamic-labs/rpc-providers": "1.3.0",
-    "@dynamic-labs/turnkey": "1.3.0",
-    "@dynamic-labs/types": "1.3.0",
-    "@dynamic-labs/utils": "1.3.0",
-    "@dynamic-labs/wallet-book": "1.3.0",
-    "@dynamic-labs/wallet-connector-core": "1.3.0",
+    "@dynamic-labs/rpc-providers": "1.4.0",
+    "@dynamic-labs/turnkey": "1.4.0",
+    "@dynamic-labs/types": "1.4.0",
+    "@dynamic-labs/utils": "1.4.0",
+    "@dynamic-labs/wallet-book": "1.4.0",
+    "@dynamic-labs/wallet-connector-core": "1.4.0",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -6,7 +6,6 @@ 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/sdk-api');
 require('./solWalletConnector.cjs');
 require('tweetnacl');
 require('bs58');

package/src/CoinbaseSolana.js

@@ -2,7 +2,6 @@ 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/sdk-api';
 import './solWalletConnector.js';
 import 'tweetnacl';
 import 'bs58';

package/src/Solflare.cjs

@@ -0,0 +1,73 @@
+'use strict';
+
+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('./injected/InjectedWalletBase.cjs');
+
+class Solflare extends InjectedWalletBase.InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
+        this.name = 'Solflare';
+        this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
+    }
+    fetchPublicAddress() {
+        var _a, _b, _c, _d, _e;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            /**
+             * It should redirect to in-app browser if on mobile and if not in the in-app browser,
+             * this checks if it is not in the in-app browser by checking if the provider is not available.
+             */
+            if (utils.isMobile() && !this.isInstalledOnBrowser()) {
+                utils.handleMobileWalletRedirect({
+                    nativeLink: ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.native) || 'solflare://ul/v1/browse',
+                    universalLink: ((_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.universal) || 'https://solflare.com/ul/v1/browse',
+                });
+                return;
+            }
+            return (_e = this.getSolProviderHelper()) === null || _e === void 0 ? void 0 : _e.fetchPublicAddress();
+        });
+    }
+    signMessage(messageToSign) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress) {
+                return undefined;
+            }
+            const provider = yield this.getSigner();
+            if (!provider) {
+                return undefined;
+            }
+            const encodedMessage = new TextEncoder().encode(messageToSign);
+            const isSignedMessage = (value) => value.signature !== undefined;
+            yield provider.connect();
+            /**
+             * TODO: Remove the sleep once problem is fixed on Solflare's extension.
+             * Tracked in DYN-442
+             */
+            yield new Promise((resolve) => {
+                setTimeout(resolve, 100);
+            });
+            const rawMessage = yield provider.signMessage(encodedMessage, 'utf8');
+            return isSignedMessage(rawMessage)
+                ? utils.bufferToBase64(rawMessage.signature)
+                : undefined;
+        });
+    }
+    getConnectedAccounts() {
+        var _a;
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = yield this.getSigner();
+            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

@@ -5,4 +5,5 @@ export declare class Solflare extends InjectedWalletBase {
     constructor(opts: SolWalletConnectorOpts);
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
+    getConnectedAccounts(): Promise<string[]>;
 }

package/src/Solflare.js

@@ -0,0 +1,69 @@
+import { __awaiter } from '../_virtual/_tslib.js';
+import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
+import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { InjectedWalletBase } from './injected/InjectedWalletBase.js';
+
+class Solflare extends InjectedWalletBase {
+    constructor(opts) {
+        super(opts);
+        this.name = 'Solflare';
+        this.wallet = findWalletBookWallet(this.walletBook, this.key);
+    }
+    fetchPublicAddress() {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            /**
+             * It should redirect to in-app browser if on mobile and if not in the in-app browser,
+             * this checks if it is not in the in-app browser by checking if the provider is not available.
+             */
+            if (isMobile() && !this.isInstalledOnBrowser()) {
+                handleMobileWalletRedirect({
+                    nativeLink: ((_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.mobile) === null || _b === void 0 ? void 0 : _b.native) || 'solflare://ul/v1/browse',
+                    universalLink: ((_d = (_c = this.wallet) === null || _c === void 0 ? void 0 : _c.mobile) === null || _d === void 0 ? void 0 : _d.universal) || 'https://solflare.com/ul/v1/browse',
+                });
+                return;
+            }
+            return (_e = this.getSolProviderHelper()) === null || _e === void 0 ? void 0 : _e.fetchPublicAddress();
+        });
+    }
+    signMessage(messageToSign) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletAddress = yield this.fetchPublicAddress();
+            if (!walletAddress) {
+                return undefined;
+            }
+            const provider = yield this.getSigner();
+            if (!provider) {
+                return undefined;
+            }
+            const encodedMessage = new TextEncoder().encode(messageToSign);
+            const isSignedMessage = (value) => value.signature !== undefined;
+            yield provider.connect();
+            /**
+             * TODO: Remove the sleep once problem is fixed on Solflare's extension.
+             * Tracked in DYN-442
+             */
+            yield new Promise((resolve) => {
+                setTimeout(resolve, 100);
+            });
+            const rawMessage = yield provider.signMessage(encodedMessage, 'utf8');
+            return isSignedMessage(rawMessage)
+                ? bufferToBase64(rawMessage.signature)
+                : undefined;
+        });
+    }
+    getConnectedAccounts() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = yield this.getSigner();
+            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

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var turnkey = require('@dynamic-labs/turnkey');
-var sdkApi = require('@dynamic-labs/sdk-api');
 var Phantom = require('./Phantom.cjs');
 var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
 var isSignedMessage = require('./utils/isSignedMessage.cjs');
@@ -13,7 +12,7 @@ var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 const SolanaWalletConnectors = (props) => [
     ...fetchInjectedWalletConnectors.injectedWalletOverrides,
     ...fetchInjectedWalletConnectors.fetchInjectedWalletConnectors(props),
-    ...turnkey.TurnkeyWalletConnectors(props, sdkApi.ChainEnum.Sol),
+    ...turnkey.TurnkeySolanaWalletConnectors(props),
     Phantom.Phantom,
 ];
 

package/src/index.js

@@ -1,5 +1,4 @@
-import { TurnkeyWalletConnectors } from '@dynamic-labs/turnkey';
-import { ChainEnum } from '@dynamic-labs/sdk-api';
+import { TurnkeySolanaWalletConnectors } from '@dynamic-labs/turnkey';
 import { Phantom } from './Phantom.js';
 import { injectedWalletOverrides, fetchInjectedWalletConnectors } from './injected/fetchInjectedWalletConnectors.js';
 export { isSignedMessage } from './utils/isSignedMessage.js';
@@ -9,7 +8,7 @@ export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
 const SolanaWalletConnectors = (props) => [
     ...injectedWalletOverrides,
     ...fetchInjectedWalletConnectors(props),
-    ...TurnkeyWalletConnectors(props, ChainEnum.Sol),
+    ...TurnkeySolanaWalletConnectors(props),
     Phantom,
 ];
 

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var CoinbaseSolana = require('../CoinbaseSolana.cjs');
 var Slope = require('../Slope.cjs');
+var Solflare = require('../Solflare.cjs');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var BackpackSol = require('./BackpackSol.cjs');
 
@@ -11,6 +12,7 @@ const injectedWalletOverrides = [
     CoinbaseSolana.CoinbaseSolana,
     Slope.Slope,
     BackpackSol.BackpackSol,
+    Solflare.Solflare,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -18,6 +20,7 @@ const filteredInjectedWalletKeysOverrides = [
     'phantom',
     'phantomledger',
     'backpacksol',
+    'solflare',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,5 +1,6 @@
 import { CoinbaseSolana } from '../CoinbaseSolana.js';
 import { Slope } from '../Slope.js';
+import { Solflare } from '../Solflare.js';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 import { BackpackSol } from './BackpackSol.js';
 
@@ -7,6 +8,7 @@ const injectedWalletOverrides = [
     CoinbaseSolana,
     Slope,
     BackpackSol,
+    Solflare,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'coinbasesolana',
@@ -14,6 +16,7 @@ const filteredInjectedWalletKeysOverrides = [
     'phantom',
     'phantomledger',
     'backpacksol',
+    'solflare',
 ];
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;

package/src/phantomRedirect/PhantomRedirect.cjs

@@ -116,13 +116,25 @@ class PhantomRedirect extends solWalletConnector.SolWalletConnector {
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            // for establishing the shared secret. NOT the wallet address
-            storage.storage.address.remove();
-            storage.storage.encryptionPublicKey.remove();
-            storage.storage.encryptionSecretKey.remove();
-            storage.storage.message.remove();
-            storage.storage.session.remove();
-            storage.storage.sharedSecret.remove();
+            const address = storage.storage.address.get();
+            const session = storage.storage.session.get();
+            const sharedSecret = storage.storage.sharedSecret.get();
+            const encryptionPublicKey = storage.storage.encryptionPublicKey.get();
+            // Clear all local storage in case of any stale state
+            storage.clearStorage();
+            // if there is no session/encrytion keys, then we don't need to disconnect
+            if (!address || !session || !encryptionPublicKey || !sharedSecret)
+                return;
+            const payload = { session };
+            const [nonce, encryptedPayload] = utils.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);
+            window.location.href = url;
         });
     }
     /**

package/src/phantomRedirect/PhantomRedirect.js

@@ -4,7 +4,7 @@ import bs58 from 'bs58';
 import { PublicKey } from '@solana/web3.js';
 import { SolWalletConnector } from '../solWalletConnector.js';
 import { buildUrl, decryptPayload, encryptPayload } from './utils.js';
-import { storage } from './storage.js';
+import { storage, clearStorage } from './storage.js';
 
 class PhantomRedirect extends SolWalletConnector {
     constructor(props) {
@@ -107,13 +107,25 @@ class PhantomRedirect extends SolWalletConnector {
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
-            // for establishing the shared secret. NOT the wallet address
-            storage.address.remove();
-            storage.encryptionPublicKey.remove();
-            storage.encryptionSecretKey.remove();
-            storage.message.remove();
-            storage.session.remove();
-            storage.sharedSecret.remove();
+            const address = storage.address.get();
+            const session = storage.session.get();
+            const sharedSecret = storage.sharedSecret.get();
+            const encryptionPublicKey = storage.encryptionPublicKey.get();
+            // Clear all local storage in case of any stale state
+            clearStorage();
+            // if there is no session/encrytion keys, then we don't need to disconnect
+            if (!address || !session || !encryptionPublicKey || !sharedSecret)
+                return;
+            const payload = { session };
+            const [nonce, encryptedPayload] = encryptPayload(payload, sharedSecret);
+            const params = new URLSearchParams({
+                dapp_encryption_public_key: bs58.encode(encryptionPublicKey),
+                nonce: bs58.encode(nonce),
+                payload: bs58.encode(encryptedPayload),
+                redirect_link: window.location.href,
+            });
+            const url = buildUrl('disconnect', params);
+            window.location.href = url;
         });
     }
     /**

package/src/phantomRedirect/storage.cjs

@@ -76,5 +76,11 @@ const storage = {
         },
     },
 };
+const clearStorage = () => {
+    for (const key in storage) {
+        storage[key].remove();
+    }
+};
 
+exports.clearStorage = clearStorage;
 exports.storage = storage;

package/src/phantomRedirect/storage.d.ts

@@ -31,3 +31,4 @@ export declare const storage: {
         set: (sharedSecret: Uint8Array) => void;
     };
 };
+export declare const clearStorage: () => void;

package/src/phantomRedirect/storage.js

@@ -72,5 +72,10 @@ const storage = {
         },
     },
 };
+const clearStorage = () => {
+    for (const key in storage) {
+        storage[key].remove();
+    }
+};
 
-export { storage };
+export { clearStorage, storage };