@dynamic-labs/solana 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 
+### [1.0.4](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.3...v1.0.4) (2024-01-04)
+
+
+### Bug Fixes
+
+* edge case with unlinking wallet ([#4285](https://github.com/dynamic-labs/DynamicAuth/issues/4285)) ([#4293](https://github.com/dynamic-labs/DynamicAuth/issues/4293)) ([85eb4ea](https://github.com/dynamic-labs/DynamicAuth/commit/85eb4ea0fa4521d37ee3901dbb1fa6d88a8cf8f7))
+* phantom solana not connecting on mobile ([#4287](https://github.com/dynamic-labs/DynamicAuth/issues/4287)) ([0d85e24](https://github.com/dynamic-labs/DynamicAuth/commit/0d85e2429f2dc0a92c293cf57dc0e241c4b948be))
+* prevent error message when mobile wallet app is open ([#4301](https://github.com/dynamic-labs/DynamicAuth/issues/4301)) ([#4303](https://github.com/dynamic-labs/DynamicAuth/issues/4303)) ([0ba145e](https://github.com/dynamic-labs/DynamicAuth/commit/0ba145e6d1145fecc3e7bc2e60d127106be9aa54))
+* **useFetchBalance:** ensure the latest wallet balance is fetched ([#4288](https://github.com/dynamic-labs/DynamicAuth/issues/4288)) ([#4294](https://github.com/dynamic-labs/DynamicAuth/issues/4294)) ([3fa0d60](https://github.com/dynamic-labs/DynamicAuth/commit/3fa0d60552082dffd032317368d20b87cdab9c6d))
+
+### [1.0.3](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.2...v1.0.3) (2023-12-28)
+
+
+### Features
+
+* add default footer to wallet list when tos and pp not enabled ([#4229](https://github.com/dynamic-labs/DynamicAuth/issues/4229)) ([a6d90a7](https://github.com/dynamic-labs/DynamicAuth/commit/a6d90a7276cafeaffcb21c5362837d020fc10215)), closes [#4224](https://github.com/dynamic-labs/DynamicAuth/issues/4224)
+* add starknet support for sopelia ([#4268](https://github.com/dynamic-labs/DynamicAuth/issues/4268)) ([53d4ce4](https://github.com/dynamic-labs/DynamicAuth/commit/53d4ce400070adfb32021b01b9c748b9a7d90577))
+* delay setting user to after pregenerated wallet flow ([#4244](https://github.com/dynamic-labs/DynamicAuth/issues/4244)) ([503d34d](https://github.com/dynamic-labs/DynamicAuth/commit/503d34d9d6f5edd55b009f1f63c049ac6dfb1fb7))
+
+
+### Bug Fixes
+
+* coinbase solana signMessage ([#4261](https://github.com/dynamic-labs/DynamicAuth/issues/4261)) ([7e0e69c](https://github.com/dynamic-labs/DynamicAuth/commit/7e0e69c0ad9f9c9778ff9255909dd2314e16fa06))
+* solflare connect ([#4215](https://github.com/dynamic-labs/DynamicAuth/issues/4215)) ([#4219](https://github.com/dynamic-labs/DynamicAuth/issues/4219)) ([df39306](https://github.com/dynamic-labs/DynamicAuth/commit/df393069b9a9859052b2d55db8dfc3399d85f2a9))
+
 ### [1.0.2](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.1...v1.0.2) (2023-12-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,11 +27,11 @@
   },
   "dependencies": {
     "@solana/web3.js": "1.70.1",
-    "@dynamic-labs/rpc-providers": "1.0.2",
-    "@dynamic-labs/types": "1.0.2",
-    "@dynamic-labs/utils": "1.0.2",
-    "@dynamic-labs/wallet-book": "1.0.2",
-    "@dynamic-labs/wallet-connector-core": "1.0.2",
+    "@dynamic-labs/rpc-providers": "1.0.4",
+    "@dynamic-labs/types": "1.0.4",
+    "@dynamic-labs/utils": "1.0.4",
+    "@dynamic-labs/wallet-book": "1.0.4",
+    "@dynamic-labs/wallet-connector-core": "1.0.4",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/CoinbaseSolana.cjs

@@ -3,8 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
 var solWalletConnector = require('./solWalletConnector.cjs');
 var solProviderHelper = require('./solProviderHelper.cjs');
+require('@solana/web3.js');
+require('@dynamic-labs/wallet-connector-core');
+require('./injected/PhantomLedger.cjs');
+var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
 class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
     constructor() {
@@ -40,7 +45,20 @@ class CoinbaseSolana extends solWalletConnector.SolWalletConnector {
     }
     signMessage(messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return solProviderHelper.SolProviderHelper.signMessageWithName(messageToSign, this.name);
+            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 signedMessage = yield provider.signMessage(encodedMessage, walletAddress);
+            if (!signedMessage) {
+                return undefined;
+            }
+            return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
     getConnectedAccounts() {

package/src/CoinbaseSolana.d.ts

@@ -1,11 +1,11 @@
 import { SolWalletConnector } from './solWalletConnector';
-import { ISolana } from './types';
+import { ICoinbaseSolanaSigner } from './types';
 export declare class CoinbaseSolana extends SolWalletConnector {
     name: string;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     connect(): Promise<void>;
-    getSigner(): Promise<ISolana | undefined>;
+    getSigner(): Promise<ICoinbaseSolanaSigner | undefined>;
     isInstalledOnBrowser(): boolean;
     fetchPublicAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;

package/src/CoinbaseSolana.js

@@ -1,6 +1,11 @@
 import { __awaiter } from '../_virtual/_tslib.js';
+import { bufferToBase64 } from '@dynamic-labs/utils';
 import { SolWalletConnector } from './solWalletConnector.js';
 import { SolProviderHelper } from './solProviderHelper.js';
+import '@solana/web3.js';
+import '@dynamic-labs/wallet-connector-core';
+import './injected/PhantomLedger.js';
+import { isSignedMessage } from './utils/isSignedMessage.js';
 
 class CoinbaseSolana extends SolWalletConnector {
     constructor() {
@@ -36,7 +41,20 @@ class CoinbaseSolana extends SolWalletConnector {
     }
     signMessage(messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return SolProviderHelper.signMessageWithName(messageToSign, this.name);
+            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 signedMessage = yield provider.signMessage(encodedMessage, walletAddress);
+            if (!signedMessage) {
+                return undefined;
+            }
+            return bufferToBase64(isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
     getConnectedAccounts() {

package/src/Solflare.cjs

@@ -17,15 +17,15 @@ class Solflare extends solWalletConnector.SolWalletConnector {
     }
     fetchPublicAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (utils.isMobile()) {
-                const url = encodeURIComponent(window.location.toString());
-                const ref = encodeURIComponent(window.location.origin);
-                if (utils.isSamsungBrowser()) {
-                    window.location.assign(`solflare://ul/v1/browse/${url}?ref=${ref}`);
-                }
-                else {
-                    window.location.assign(`https://solflare.com/ul/v1/browse/${url}?ref=${ref}`);
-                }
+            /**
+             * 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: 'solflare://ul/v1/browse',
+                    universalLink: 'https://solflare.com/ul/v1/browse',
+                });
                 return;
             }
             return solProviderHelper.SolProviderHelper.fetchPublicAddressWithName(this.name);

package/src/Solflare.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { isMobile, isSamsungBrowser, bufferToBase64 } from '@dynamic-labs/utils';
+import { isMobile, handleMobileWalletRedirect, bufferToBase64 } from '@dynamic-labs/utils';
 import { SolWalletConnector } from './solWalletConnector.js';
 import { SolProviderHelper } from './solProviderHelper.js';
 
@@ -13,15 +13,15 @@ class Solflare extends SolWalletConnector {
     }
     fetchPublicAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (isMobile()) {
-                const url = encodeURIComponent(window.location.toString());
-                const ref = encodeURIComponent(window.location.origin);
-                if (isSamsungBrowser()) {
-                    window.location.assign(`solflare://ul/v1/browse/${url}?ref=${ref}`);
-                }
-                else {
-                    window.location.assign(`https://solflare.com/ul/v1/browse/${url}?ref=${ref}`);
-                }
+            /**
+             * 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: 'solflare://ul/v1/browse',
+                    universalLink: 'https://solflare.com/ul/v1/browse',
+                });
                 return;
             }
             return SolProviderHelper.fetchPublicAddressWithName(this.name);

package/src/index.d.ts

@@ -4,4 +4,4 @@ export * from './Solflare';
 export declare const SolanaWalletConnectors: (props: any) => typeof import("./injected/BraveSol").BraveSol[];
 export { isSignedMessage } from './utils/isSignedMessage';
 export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner';
-export type { ISolana, IBackpackSolanaSigner, SignedMessage, ISolanaSigner, } from './types';
+export type { ISolana, IBackpackSolanaSigner, ICoinbaseSolanaSigner, SignedMessage, ISolanaSigner, } from './types';

package/src/injected/Phantom.cjs

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 
 class Phantom extends InjectedWalletBase.InjectedWalletBase {
@@ -9,6 +11,23 @@ class Phantom extends InjectedWalletBase.InjectedWalletBase {
         super(...arguments);
         this.name = 'Phantom';
     }
+    fetchPublicAddress() {
+        const _super = Object.create(null, {
+            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (this.isInstalledOnBrowser()) {
+                return _super.fetchPublicAddress.call(this);
+            }
+            if (utils.isMobile()) {
+                utils.handleMobileWalletRedirect({
+                    nativeLink: 'phantom://browse',
+                    universalLink: 'https://phantom.app/ul/browse',
+                });
+            }
+            return undefined;
+        });
+    }
 }
 
 exports.Phantom = Phantom;

package/src/injected/Phantom.d.ts

@@ -1,4 +1,5 @@
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class Phantom extends InjectedWalletBase {
     name: string;
+    fetchPublicAddress(): Promise<string | undefined>;
 }

package/src/injected/Phantom.js

@@ -1,3 +1,5 @@
+import { __awaiter } from '../../_virtual/_tslib.js';
+import { isMobile, handleMobileWalletRedirect } from '@dynamic-labs/utils';
 import { InjectedWalletBase } from './InjectedWalletBase.js';
 
 class Phantom extends InjectedWalletBase {
@@ -5,6 +7,23 @@ class Phantom extends InjectedWalletBase {
         super(...arguments);
         this.name = 'Phantom';
     }
+    fetchPublicAddress() {
+        const _super = Object.create(null, {
+            fetchPublicAddress: { get: () => super.fetchPublicAddress }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isInstalledOnBrowser()) {
+                return _super.fetchPublicAddress.call(this);
+            }
+            if (isMobile()) {
+                handleMobileWalletRedirect({
+                    nativeLink: 'phantom://browse',
+                    universalLink: 'https://phantom.app/ul/browse',
+                });
+            }
+            return undefined;
+        });
+    }
 }
 
 export { Phantom };

package/src/types.d.ts

@@ -9,7 +9,7 @@ declare global {
         Slope?: {
             new (): ISolana;
         };
-        coinbaseSolana?: ISolana;
+        coinbaseSolana?: ICoinbaseSolanaSigner;
         glowSolana?: ISolana;
         phantom?: IWindowPhantom;
         solana?: ISolana;
@@ -59,7 +59,10 @@ export type IBackpackSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {
     signMessage: (message: Uint8Array, encoding?: string) => Promise<void | Uint8Array>;
     send: (transaction: Transaction, signers?: Signer[], options?: SendOptions, connection?: Connection, publicKey?: PublicKey) => Promise<TransactionSignature>;
 };
-export type ISolana = ISolanaSigner | IBackpackSolanaSigner;
+export type ICoinbaseSolanaSigner = Omit<ISolanaSigner, 'signMessage'> & {
+    signMessage: (message: Uint8Array, publicKey?: string) => Promise<void | Uint8Array>;
+};
+export type ISolana = ISolanaSigner | IBackpackSolanaSigner | ICoinbaseSolanaSigner;
 export type ProviderFlag = 'isBraveWallet' | 'isGlow' | 'isPhantom' | 'isSolflare' | 'isExodus' | 'isBackpack' | 'isMagicEden';
 export type EthProviderCondition = ProviderCondition<ProviderFlag>;
 export {};