@dynamic-labs/solana 0.19.0-alpha.25 → 0.19.0-alpha.26

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+## [0.19.0-alpha.26](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.25...v0.19.0-alpha.26) (2023-10-25)
+
+
+### Features
+
+* allow filtering social providers for Dynamic Social with socialProvidersFilter ([#3707](https://github.com/dynamic-labs/DynamicAuth/issues/3707)) ([e4c16f3](https://github.com/dynamic-labs/DynamicAuth/commit/e4c16f359946e278a372cb8153242946d4887dcc))
+
+
+### Bug Fixes
+
+* only create embedded wallet if user have no wallet ([#3715](https://github.com/dynamic-labs/DynamicAuth/issues/3715)) ([728e01a](https://github.com/dynamic-labs/DynamicAuth/commit/728e01ab8b5931eaa6fb7877c23847ac85947f52))
+* Revert "fix(use-wallet-event-listener): handle switching wallet … ([#3699](https://github.com/dynamic-labs/DynamicAuth/issues/3699)) ([9b94737](https://github.com/dynamic-labs/DynamicAuth/commit/9b94737ecfa72cd047964254d806403b342433a1)), closes [#3626](https://github.com/dynamic-labs/DynamicAuth/issues/3626)
+* undefined network edge case ([#3667](https://github.com/dynamic-labs/DynamicAuth/issues/3667)) ([12d4236](https://github.com/dynamic-labs/DynamicAuth/commit/12d42363f69b1dfd5babe05142bd03c501f62e5f))
+* **useOnClickOutside:** prevent opening element on click while already open ([#3714](https://github.com/dynamic-labs/DynamicAuth/issues/3714)) ([1999dc5](https://github.com/dynamic-labs/DynamicAuth/commit/1999dc50b6e82eb5ee8d0919118e9dfbc39c2b67))
+
 ## [0.19.0-alpha.25](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.24...v0.19.0-alpha.25) (2023-10-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/solana",
-  "version": "0.19.0-alpha.25",
+  "version": "0.19.0-alpha.26",
   "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": "0.19.0-alpha.25",
-    "@dynamic-labs/types": "0.19.0-alpha.25",
-    "@dynamic-labs/utils": "0.19.0-alpha.25",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.25",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.25",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.26",
+    "@dynamic-labs/types": "0.19.0-alpha.26",
+    "@dynamic-labs/utils": "0.19.0-alpha.26",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.26",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.26",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/index.cjs

@@ -9,6 +9,8 @@ var Solflare = require('./Solflare.cjs');
 var index = require('./injected/index.cjs');
 var solWalletConnector = require('./solWalletConnector.cjs');
 var solProviderHelper = require('./solProviderHelper.cjs');
+var isSignedMessage = require('./utils/isSignedMessage.cjs');
+var isBackpackSolanaSigner = require('./utils/isBackpackSolanaSigner.cjs');
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [
@@ -21,4 +23,6 @@ const SolanaWalletConnectors = (props) => [
 
 exports.SolWalletConnector = solWalletConnector.SolWalletConnector;
 exports.SolProviderHelper = solProviderHelper.SolProviderHelper;
+exports.isSignedMessage = isSignedMessage.isSignedMessage;
+exports.isBackpackSolanaSigner = isBackpackSolanaSigner.isBackpackSolanaSigner;
 exports.SolanaWalletConnectors = SolanaWalletConnectors;

package/src/index.d.ts

@@ -1,3 +1,6 @@
 export * from './solWalletConnector';
 export * from './solProviderHelper';
 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';

package/src/index.js

@@ -5,6 +5,8 @@ import { Solflare } from './Solflare.js';
 import { injectedWallets } from './injected/index.js';
 export { SolWalletConnector } from './solWalletConnector.js';
 export { SolProviderHelper } from './solProviderHelper.js';
+export { isSignedMessage } from './utils/isSignedMessage.js';
+export { isBackpackSolanaSigner } from './utils/isBackpackSolanaSigner.js';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const SolanaWalletConnectors = (props) => [

package/src/injected/BackpackSol.cjs

@@ -39,7 +39,10 @@ class BackpackSol extends InjectedWalletBase.InjectedWalletBase {
             if (!provider) {
                 return undefined;
             }
-            const signedMessage = (yield provider.signMessage(Buffer.from(messageToSign, 'utf8')));
+            const signedMessage = yield provider.signMessage(Buffer.from(messageToSign, 'utf8'));
+            if (!signedMessage) {
+                return undefined;
+            }
             return utils.bufferToBase64(signedMessage);
         });
     }

package/src/injected/BackpackSol.d.ts

@@ -1,10 +1,10 @@
-import { ISolana } from '../types';
+import { IBackpackSolanaSigner } from '../types';
 import { InjectedWalletBase } from './InjectedWalletBase';
 export declare class BackpackSol extends InjectedWalletBase {
     name: string;
     setupEventListeners(): void;
     fetchPublicAddress(): Promise<string | undefined>;
-    getSigner(): Promise<ISolana | undefined>;
+    getSigner(): Promise<IBackpackSolanaSigner | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
 }

package/src/injected/BackpackSol.js

@@ -35,7 +35,10 @@ class BackpackSol extends InjectedWalletBase {
             if (!provider) {
                 return undefined;
             }
-            const signedMessage = (yield provider.signMessage(Buffer.from(messageToSign, 'utf8')));
+            const signedMessage = yield provider.signMessage(Buffer.from(messageToSign, 'utf8'));
+            if (!signedMessage) {
+                return undefined;
+            }
             return bufferToBase64(signedMessage);
         });
     }

package/src/injected/InjectedWalletBase.d.ts

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

package/src/solProviderHelper.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var isSignedMessage = require('./utils/isSignedMessage.cjs');
 
 var _a;
 class SolProviderHelper {
@@ -77,8 +78,11 @@ class SolProviderHelper {
                 yield provider.connect();
             }
             const encodedMessage = new TextEncoder().encode(messageToSign);
-            return utils.bufferToBase64((yield provider.signMessage(encodedMessage, 'utf8'))
-                .signature);
+            const signedMessage = yield provider.signMessage(encodedMessage, 'utf8');
+            if (!signedMessage) {
+                return Promise.resolve(undefined);
+            }
+            return utils.bufferToBase64(isSignedMessage.isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
     static _setupEventListeners(walletConnector, web3Provider) {

package/src/solProviderHelper.d.ts

@@ -1,8 +1,5 @@
 import { ProviderCondition, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ISolana, ProviderFlag } from './types';
-export interface SignedMessage {
-    signature: Uint8Array;
-}
 type Provider = () => ISolana | undefined;
 export type AccountChangeEventHandler = (address: {
     toString(): string;

package/src/solProviderHelper.js

@@ -1,6 +1,7 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { ProviderLookup, normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { bufferToBase64 } from '@dynamic-labs/utils';
+import { isSignedMessage } from './utils/isSignedMessage.js';
 
 var _a;
 class SolProviderHelper {
@@ -73,8 +74,11 @@ class SolProviderHelper {
                 yield provider.connect();
             }
             const encodedMessage = new TextEncoder().encode(messageToSign);
-            return bufferToBase64((yield provider.signMessage(encodedMessage, 'utf8'))
-                .signature);
+            const signedMessage = yield provider.signMessage(encodedMessage, 'utf8');
+            if (!signedMessage) {
+                return Promise.resolve(undefined);
+            }
+            return bufferToBase64(isSignedMessage(signedMessage) ? signedMessage.signature : signedMessage);
         });
     }
     static _setupEventListeners(walletConnector, web3Provider) {

package/src/solWalletConnector.cjs

@@ -76,7 +76,7 @@ class SolWalletConnector extends walletConnectorCore.WalletConnectorBase {
     getBalance() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const signer = yield this.getSigner();
-            if (!signer)
+            if (!signer || !signer.publicKey)
                 return;
             const publicKey = new web3_js.PublicKey(signer.publicKey.toString());
             const balance = this.lamportsToSol(yield this.getWalletClient().getBalance(publicKey));

package/src/solWalletConnector.js

@@ -72,7 +72,7 @@ class SolWalletConnector extends WalletConnectorBase {
     getBalance() {
         return __awaiter(this, void 0, void 0, function* () {
             const signer = yield this.getSigner();
-            if (!signer)
+            if (!signer || !signer.publicKey)
                 return;
             const publicKey = new PublicKey(signer.publicKey.toString());
             const balance = this.lamportsToSol(yield this.getWalletClient().getBalance(publicKey));

package/src/types.d.ts

@@ -1,4 +1,5 @@
-import { Connection, SendOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
+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 {
@@ -13,7 +14,7 @@ declare global {
         phantom?: IWindowPhantom;
         solana?: ISolana;
         solflare?: ISolana;
-        backpack?: IBackpackSolana;
+        backpack?: IBackpackSolanaSigner;
     }
 }
 type PublicKey = {
@@ -23,26 +24,39 @@ export type ConnectionResult = {
     address?: string;
     publicKey?: PublicKey;
 } | undefined;
-export type ISolana = {
+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 ProviderFlag]: 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 | object>;
-    on: (eventMessage: string, callback?: (publickey: string) => void) => Promise<void | object>;
-    providers: object[];
-    publicKey: PublicKey;
-    removeAllListeners: () => void;
-    removeListener: (eventMessage: string, callback?: (publickey: string) => void) => Promise<void | object>;
-    signMessage: (message: Uint8Array, encoding?: string) => Promise<void | object>;
-    signTransaction: (transaction: Transaction) => Promise<Transaction>;
-    isConnected?: boolean;
+    disconnect(): Promise<void>;
 };
-export type IBackpackSolana = ISolana & {
-    signMessage: (message: Uint8Array, publicKey: string) => Promise<void | object>;
+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 ProviderFlag = 'isBraveWallet' | 'isGlow' | 'isPhantom' | 'isSolflare' | 'isExodus' | 'isBackpack';
 export type EthProviderCondition = ProviderCondition<ProviderFlag>;
 export {};

package/src/utils/isBackpackSolanaSigner.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isBackpackSolanaSigner = (signer) => Boolean(signer) && signer.send !== undefined;
+
+exports.isBackpackSolanaSigner = isBackpackSolanaSigner;

package/src/utils/isBackpackSolanaSigner.d.ts

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

package/src/utils/isBackpackSolanaSigner.js

@@ -0,0 +1,3 @@
+const isBackpackSolanaSigner = (signer) => Boolean(signer) && signer.send !== undefined;
+
+export { isBackpackSolanaSigner };

package/src/utils/isSignedMessage.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isSignedMessage = (message) => Boolean(message) && message.signature !== undefined;
+
+exports.isSignedMessage = isSignedMessage;

package/src/utils/isSignedMessage.d.ts

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

package/src/utils/isSignedMessage.js

@@ -0,0 +1,3 @@
+const isSignedMessage = (message) => Boolean(message) && message.signature !== undefined;
+
+export { isSignedMessage };