@dynamic-labs/bitcoin 4.0.0-alpha.47 → 4.0.0-alpha.49

package/CHANGELOG.md

@@ -1,4 +1,40 @@
 
+## [4.0.0-alpha.49](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.48...v4.0.0-alpha.49) (2024-12-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* change openFunding to openExternalFunding (#7684)
+
+### Features
+
+* aa blockaid simulations ([#7583](https://github.com/dynamic-labs/dynamic-auth/issues/7583)) ([6436220](https://github.com/dynamic-labs/dynamic-auth/commit/64362204d2c96291a37bf281d62531d6f2384fdf))
+* add ethereum createConnector function ([#7607](https://github.com/dynamic-labs/dynamic-auth/issues/7607)) ([f306537](https://github.com/dynamic-labs/dynamic-auth/commit/f3065372f3c5dfc8bf26173dc722576e614af5e1))
+* add fundWithExternalWallet method to useFunding ([#7688](https://github.com/dynamic-labs/dynamic-auth/issues/7688)) ([d48b1d2](https://github.com/dynamic-labs/dynamic-auth/commit/d48b1d2568ba928b322a4d81b6386e775ae4aa98))
+* change openFunding to openExternalFunding ([#7684](https://github.com/dynamic-labs/dynamic-auth/issues/7684)) ([8efb9cb](https://github.com/dynamic-labs/dynamic-auth/commit/8efb9cb9ca3d7e2273c14e18f7be5892e50b8e12))
+* connect global wallet in ethereum ([#7619](https://github.com/dynamic-labs/dynamic-auth/issues/7619)) ([fdb7f00](https://github.com/dynamic-labs/dynamic-auth/commit/fdb7f00c33f7da3ac95ae13ac674caa64b453cae))
+* create wallet groups dynamically based on wallet options ([#7662](https://github.com/dynamic-labs/dynamic-auth/issues/7662)) ([981affc](https://github.com/dynamic-labs/dynamic-auth/commit/981affce5518f6532d960fe4e879e9cf40a66ce7))
+
+
+### Bug Fixes
+
+* **ethereum:** normalize user reject error from injected wallets ([#7702](https://github.com/dynamic-labs/dynamic-auth/issues/7702)) ([ce456a8](https://github.com/dynamic-labs/dynamic-auth/commit/ce456a8592197b07857baf32bb1b38867ffb37fe))
+* fetch nonce when authenticating a user that connected in connect-only mode ([#7689](https://github.com/dynamic-labs/dynamic-auth/issues/7689)) ([f048bb9](https://github.com/dynamic-labs/dynamic-auth/commit/f048bb96b6cb5ae603966b2813f900a082cd158f))
+* filter out wallets for the current network when using external wallet funding ([#7694](https://github.com/dynamic-labs/dynamic-auth/issues/7694)) ([65db665](https://github.com/dynamic-labs/dynamic-auth/commit/65db6652a934561e7d07379a65d2baa8f7813d8e))
+* remove toaccount from signmessage and signtypeddata for zerodev ([#7650](https://github.com/dynamic-labs/dynamic-auth/issues/7650)) ([626e849](https://github.com/dynamic-labs/dynamic-auth/commit/626e849a4af3af51d60b42dd2787edb05126744b))
+* save nonce to storage ([#7698](https://github.com/dynamic-labs/dynamic-auth/issues/7698)) ([93dc65b](https://github.com/dynamic-labs/dynamic-auth/commit/93dc65b7f78040367b85420c1374f3cafbfb598b))
+* **sdk-react-core:** add timeout when getting connected accounts ([#7697](https://github.com/dynamic-labs/dynamic-auth/issues/7697)) ([9a4bd7c](https://github.com/dynamic-labs/dynamic-auth/commit/9a4bd7c02795205ec98d8d71aba75b51b9bbee7c))
+* update auth token from new source ([#7666](https://github.com/dynamic-labs/dynamic-auth/issues/7666)) ([61798de](https://github.com/dynamic-labs/dynamic-auth/commit/61798de26d759db9064f5f84118540346a44ab50))
+* update extension update_url endpoint ([#7655](https://github.com/dynamic-labs/dynamic-auth/issues/7655)) ([46cff3a](https://github.com/dynamic-labs/dynamic-auth/commit/46cff3a80c9efee659a764df47f927ed5a117079))
+* zerodev confirmation UI closes properly ([#7664](https://github.com/dynamic-labs/dynamic-auth/issues/7664)) ([a78aded](https://github.com/dynamic-labs/dynamic-auth/commit/a78adedc054d09134198d22812aa5cab7bbff548))
+
+## [4.0.0-alpha.48](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.47...v4.0.0-alpha.48) (2024-12-17)
+
+
+### Bug Fixes
+
+* Temp disable refreshing blockhash for solana transactions ([#7638](https://github.com/dynamic-labs/dynamic-auth/issues/7638)) ([fd457bf](https://github.com/dynamic-labs/dynamic-auth/commit/fd457bf0579ad35ba17fc2c7aa18a9feb49d8c7b))
+
 ## [4.0.0-alpha.47](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.46...v4.0.0-alpha.47) (2024-12-17)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.47";
+var version = "4.0.0-alpha.49";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.47";
+var version = "4.0.0-alpha.49";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "4.0.0-alpha.47",
+  "version": "4.0.0-alpha.49",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -19,17 +19,17 @@
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
     "@btckit/types": "0.0.19",
-    "@dynamic-labs/sdk-api-core": "0.0.576",
+    "@dynamic-labs/sdk-api-core": "0.0.578",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.8.0",
     "jsontokens": "4.0.1",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.47",
-    "@dynamic-labs/types": "4.0.0-alpha.47",
-    "@dynamic-labs/utils": "4.0.0-alpha.47",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.47",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.47",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.49",
+    "@dynamic-labs/types": "4.0.0-alpha.49",
+    "@dynamic-labs/utils": "4.0.0-alpha.49",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.49",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.49",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {}

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -12,6 +12,7 @@ var bitcoinNetworkTypeToNetworks = require('../../utils/psbt/bitcoinNetworkTypeT
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 var _const = require('../../const.cjs');
+var getSatsConnectSigningProtocol = require('../../utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.cjs');
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
@@ -89,12 +90,14 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             }
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             try {
                 const response = yield satsConnect.request('signMessage', {
-                    address: withAddress,
+                    address,
                     message: messageToSign,
+                    protocol: getSatsConnectSigningProtocol.getSatsConnectSigningProtocol(protocol),
                 });
                 if (response.status !== 'success') {
                     throw response.error;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.d.ts

@@ -1,5 +1,5 @@
 import { BitcoinNetworkType, SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
-import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
+import { BitcoinSignProtocol, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     isLegacy: boolean;
@@ -14,7 +14,10 @@ export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletC
      */
     protected handleInAppBrowserGetAddress(): boolean;
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options: {
+        address: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signTransaction(params: SatsConnectSignTransactionInput): Promise<SignTransactionResponse | undefined>;
     signTransactions(transactions: SignMultipleTransactionsPayload): Promise<SignTransactionResponse[] | undefined>;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -8,6 +8,7 @@ import { convertNetworkTypeForPsbt } from '../../utils/psbt/bitcoinNetworkTypeTo
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createSignPsbtOptionsForSatsConnect } from '../../utils/psbt/createSignPsbtOptions.js';
 import { SATSCONNECT_FEATURE } from '../../const.js';
+import { getSatsConnectSigningProtocol } from '../../utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.js';
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     constructor(opts) {
@@ -85,12 +86,14 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             }
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             try {
                 const response = yield request('signMessage', {
-                    address: withAddress,
+                    address,
                     message: messageToSign,
+                    protocol: getSatsConnectSigningProtocol(protocol),
                 });
                 if (response.status !== 'success') {
                     throw response.error;

package/src/connectors/BitcoinWalletConnector.cjs

@@ -289,9 +289,26 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
     isLedgerAddress(address) {
         return utils.isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
     }
+    // Each wallet has a different supported protocol
+    // So we should override this method in each connector
+    // and define how to handle the protocol
+    signMessage(messageToSign, options) {
+        const _super = Object.create(null, {
+            signMessage: { get: () => super.signMessage }
+        });
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (options) {
+                walletConnectorCore.logger.debug('[BitcoinWalletConnector] signMessage - Not possible to specify address and/or protocol to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return _super.signMessage.call(this, messageToSign);
+        });
+    }
     proveOwnership(address, messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return this.signMessage(messageToSign, address);
+            return this.signMessage(messageToSign, { address });
         });
     }
 }

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -4,7 +4,7 @@ import { Chain, IBitcoinWalletConnector, WalletConnectorBase, WalletMetadata } f
 import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential, WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
 import { IBitcoinSessionCache } from '../BitcoinLocalStorageCache';
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinWalletStandardMethods, ConnectedAccountWithAddressesProps } from '../types';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinWalletStandardMethods, ConnectedAccountWithAddressesProps, BitcoinSignProtocol } from '../types';
 import { BitcoinWallet } from '../wallet';
 export type BitcoinWalletConnectorOpts = {
     walletBook: WalletBookSchema;
@@ -47,5 +47,9 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     setupEventListeners(): void;
     setVerifiedCredentials(verifiedCredentials: JwtVerifiedCredential[]): void;
     isLedgerAddress(address: string): boolean;
+    signMessage(messageToSign: string, options?: {
+        address?: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     proveOwnership(address: string, messageToSign: string): Promise<string | undefined>;
 }

package/src/connectors/BitcoinWalletConnector.js

@@ -285,9 +285,26 @@ class BitcoinWalletConnector extends WalletConnectorBase {
     isLedgerAddress(address) {
         return isLedgerAddressViaVerifiedCredentials(address, this.verifiedCredentials);
     }
+    // Each wallet has a different supported protocol
+    // So we should override this method in each connector
+    // and define how to handle the protocol
+    signMessage(messageToSign, options) {
+        const _super = Object.create(null, {
+            signMessage: { get: () => super.signMessage }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options) {
+                logger.debug('[BitcoinWalletConnector] signMessage - Not possible to specify address and/or protocol to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return _super.signMessage.call(this, messageToSign);
+        });
+    }
     proveOwnership(address, messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.signMessage(messageToSign, address);
+            return this.signMessage(messageToSign, { address });
         });
     }
 }

package/src/connectors/MagicEdenConnector/MagicEdenConnector.cjs

@@ -9,6 +9,7 @@ var satsConnect = require('sats-connect');
 var utils = require('@dynamic-labs/utils');
 var _const = require('../../const.cjs');
 var BitcoinSatsConnectConnector = require('../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
+var getSatsConnectSigningProtocol = require('../../utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.cjs');
 
 class MagicEdenConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
     constructor(opts) {
@@ -57,8 +58,9 @@ class MagicEdenConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectC
             });
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             return new Promise((resolve, reject) => {
                 satsConnect.signMessage({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -81,11 +83,12 @@ class MagicEdenConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectC
                         resolve(response);
                     }),
                     payload: {
-                        address: withAddress,
+                        address,
                         message: messageToSign,
                         network: {
                             type: this.currentNetwork,
                         },
+                        protocol: getSatsConnectSigningProtocol.getSatsConnectSigningProtocol(protocol),
                     },
                 });
             });

package/src/connectors/MagicEdenConnector/MagicEdenConnector.d.ts

@@ -1,5 +1,5 @@
 import { SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
-import { BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
+import { BitcoinSignProtocol, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector';
 import { BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class MagicEdenConnector extends BitcoinSatsConnectConnector {
@@ -8,7 +8,10 @@ export declare class MagicEdenConnector extends BitcoinSatsConnectConnector {
     isLegacy: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options: {
+        address: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signTransaction(params: SatsConnectSignTransactionInput): Promise<SignTransactionResponse | undefined>;
     /**

package/src/connectors/MagicEdenConnector/MagicEdenConnector.js

@@ -5,6 +5,7 @@ import { getAddress, AddressPurpose, signMessage, sendBtcTransaction, signTransa
 import { DynamicError } from '@dynamic-labs/utils';
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';
+import { getSatsConnectSigningProtocol } from '../../utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.js';
 
 class MagicEdenConnector extends BitcoinSatsConnectConnector {
     constructor(opts) {
@@ -53,8 +54,9 @@ class MagicEdenConnector extends BitcoinSatsConnectConnector {
             });
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             return new Promise((resolve, reject) => {
                 signMessage({
                     getProvider: () => __awaiter(this, void 0, void 0, function* () {
@@ -77,11 +79,12 @@ class MagicEdenConnector extends BitcoinSatsConnectConnector {
                         resolve(response);
                     }),
                     payload: {
-                        address: withAddress,
+                        address,
                         message: messageToSign,
                         network: {
                             type: this.currentNetwork,
                         },
+                        protocol: getSatsConnectSigningProtocol(protocol),
                     },
                 });
             });

package/src/connectors/OkxConnector/OkxConnector.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 
@@ -45,13 +46,22 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            // default to bip322-simple
+            const protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'bip322-simple';
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                walletConnectorCore.logger.debug('[OkxConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/OkxConnector/OkxConnector.d.ts

@@ -1,10 +1,13 @@
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options?: {
+        address?: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;

package/src/connectors/OkxConnector/OkxConnector.js

@@ -2,6 +2,7 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
 import { isMobile, template } from '@dynamic-labs/utils';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
 
@@ -41,13 +42,22 @@ class OkxConnector extends BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            // default to bip322-simple
+            const protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'bip322-simple';
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                logger.debug('[OkxConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/OneKeyConnector/OneKeyConnector.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 
@@ -54,13 +55,21 @@ class OneKeyConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return provider.getAccounts();
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'ecdsa');
+            // default to ecdsa
+            const protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'ecdsa';
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                walletConnectorCore.logger.debug('[OneKeyConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                });
+            }
+            return provider.signMessage(messageToSign, protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/OneKeyConnector/OneKeyConnector.d.ts

@@ -1,11 +1,14 @@
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 export declare class OneKeyConnector extends BitcoinWalletConnector {
     name: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     getConnectedAccounts(): Promise<string[]>;
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options?: {
+        address?: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;

package/src/connectors/OneKeyConnector/OneKeyConnector.js

@@ -2,6 +2,7 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
 import { isMobile, template } from '@dynamic-labs/utils';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
 
@@ -50,13 +51,21 @@ class OneKeyConnector extends BitcoinWalletConnector {
             return provider.getAccounts();
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'ecdsa');
+            // default to ecdsa
+            const protocol = (_a = options === null || options === void 0 ? void 0 : options.protocol) !== null && _a !== void 0 ? _a : 'ecdsa';
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                logger.debug('[OneKeyConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                });
+            }
+            return provider.signMessage(messageToSign, protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/OylConnector/OylConnector.cjs

@@ -34,15 +34,18 @@ class OylConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return mainAddress;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
             const { signature } = yield provider.signMessage({
-                address: withAddress,
+                address,
                 message: messageToSign,
+                // Oyl Wallet calls it just bip322 instead of bip322-simple
+                protocol: protocol === 'bip322-simple' ? 'bip322' : protocol,
             });
             return signature;
         });

package/src/connectors/OylConnector/OylConnector.d.ts

@@ -1,10 +1,13 @@
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 export declare class OylConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options: {
+        address: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
 }

package/src/connectors/OylConnector/OylConnector.js

@@ -30,15 +30,18 @@ class OylConnector extends BitcoinWalletConnector {
             return mainAddress;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { address, protocol } = options;
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
             const { signature } = yield provider.signMessage({
-                address: withAddress,
+                address,
                 message: messageToSign,
+                // Oyl Wallet calls it just bip322 instead of bip322-simple
+                protocol: protocol === 'bip322-simple' ? 'bip322' : protocol,
             });
             return signature;
         });

package/src/connectors/PhantomConnector/PhantomConnector.cjs

@@ -67,13 +67,14 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { address } = options;
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: withAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -83,7 +84,7 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });

package/src/connectors/PhantomConnector/PhantomConnector.d.ts

@@ -1,10 +1,13 @@
-import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options: {
+        address: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
 }

package/src/connectors/PhantomConnector/PhantomConnector.js

@@ -63,13 +63,14 @@ class PhantomConnector extends BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { address } = options;
             if ((_a = this.walletMethods) === null || _a === void 0 ? void 0 : _a.signMessage) {
                 const [result] = yield this.walletMethods.signMessage({
                     // we need to sign with the ordinals account
-                    account: { address: withAddress },
+                    account: { address },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -79,7 +80,7 @@ class PhantomConnector extends BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(address, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });

package/src/connectors/UnisatConnector/UnisatConnector.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var BitcoinWalletConnector = require('../BitcoinWalletConnector.cjs');
 var createSignPsbtOptions = require('../../utils/psbt/createSignPsbtOptions.cjs');
 
@@ -34,13 +35,19 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                walletConnectorCore.logger.debug('[UnisatConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, options === null || options === void 0 ? void 0 : options.protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/connectors/UnisatConnector/UnisatConnector.d.ts

@@ -1,11 +1,14 @@
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
-import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
+import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinSignProtocol } from '../../types';
 export declare class UnisatConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, options?: {
+        address?: string;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;

package/src/connectors/UnisatConnector/UnisatConnector.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { BitcoinWalletConnector } from '../BitcoinWalletConnector.js';
 import { createPsbtOptions } from '../../utils/psbt/createSignPsbtOptions.js';
 
@@ -30,13 +31,19 @@ class UnisatConnector extends BitcoinWalletConnector {
             return address;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();
             if (!provider) {
                 return;
             }
-            return provider.signMessage(messageToSign, 'bip322-simple');
+            if (options === null || options === void 0 ? void 0 : options.address) {
+                logger.debug('[UnisatConnector] signMessage - Not possible to specify address to sign with', {
+                    address: options.address,
+                    protocol: options.protocol,
+                });
+            }
+            return provider.signMessage(messageToSign, options === null || options === void 0 ? void 0 : options.protocol);
         });
     }
     sendBitcoin(transaction) {

package/src/index.d.ts

@@ -1,6 +1,6 @@
-import { OkxConnector, OylConnector, PhantomConnector } from './connectors';
+import { OkxConnector } from './connectors';
 export { BitcoinWalletConnector } from './connectors';
-export type { BitcoinTransaction } from './types';
+export type { BitcoinTransaction, BitcoinSignProtocol } from './types';
 export * from './utils';
 export * from './wallet';
-export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof PhantomConnector | typeof OkxConnector | typeof OylConnector)[];
+export declare const BitcoinWalletConnectors: (props: any) => (import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor | typeof OkxConnector)[];

package/src/types.d.ts

@@ -128,3 +128,4 @@ export type BitcoinWalletStandardMethods = {
     signTransaction?: BitcoinSignTransactionMethod;
     signAndSendTransaction?: BitcoinSignAndSendTransactionMethod;
 };
+export type BitcoinSignProtocol = 'ecdsa' | 'bip322-simple';

package/src/utils/getAddressByType/getAddressByType.cjs

@@ -0,0 +1,11 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getAddressByType = (wallet, addressType) => {
+    var _a;
+    return ((_a = wallet.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || wallet.address;
+};
+
+exports.getAddressByType = getAddressByType;

package/src/utils/getAddressByType/getAddressByType.d.ts

@@ -0,0 +1,3 @@
+import { WalletAddressType } from '@dynamic-labs/types';
+import { BitcoinWallet } from '../../wallet/BitcoinWallet';
+export declare const getAddressByType: (wallet: BitcoinWallet, addressType: WalletAddressType) => string;

package/src/utils/getAddressByType/getAddressByType.js

@@ -0,0 +1,7 @@
+'use client'
+const getAddressByType = (wallet, addressType) => {
+    var _a;
+    return ((_a = wallet.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || wallet.address;
+};
+
+export { getAddressByType };

package/src/utils/getAddressByType/index.d.ts

@@ -0,0 +1 @@
+export { getAddressByType } from './getAddressByType';

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.cjs

@@ -0,0 +1,17 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var satsConnect = require('sats-connect');
+
+const getSatsConnectSigningProtocol = (protocol) => {
+    if (!protocol) {
+        return undefined;
+    }
+    return protocol === 'ecdsa'
+        ? satsConnect.MessageSigningProtocols.ECDSA
+        : satsConnect.MessageSigningProtocols.BIP322;
+};
+
+exports.getSatsConnectSigningProtocol = getSatsConnectSigningProtocol;

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.d.ts

@@ -0,0 +1,3 @@
+import { MessageSigningProtocols } from 'sats-connect';
+import { BitcoinSignProtocol } from '../../types';
+export declare const getSatsConnectSigningProtocol: (protocol: BitcoinSignProtocol | undefined) => MessageSigningProtocols | undefined;

package/src/utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.js

@@ -0,0 +1,13 @@
+'use client'
+import { MessageSigningProtocols } from 'sats-connect';
+
+const getSatsConnectSigningProtocol = (protocol) => {
+    if (!protocol) {
+        return undefined;
+    }
+    return protocol === 'ecdsa'
+        ? MessageSigningProtocols.ECDSA
+        : MessageSigningProtocols.BIP322;
+};
+
+export { getSatsConnectSigningProtocol };

package/src/utils/getSatsConnectSigningProtocol/index.d.ts

@@ -0,0 +1 @@
+export * from './getSatsConnectSigningProtocol';

package/src/wallet/BitcoinWallet.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 getAddressByType = require('../utils/getAddressByType/getAddressByType.cjs');
 
 class BitcoinWallet extends walletConnectorCore.Wallet {
     /**
@@ -44,16 +45,22 @@ class BitcoinWallet extends walletConnectorCore.Wallet {
     /**
      * Signs a message using a specific address type (payment or ordinals).
      * @param messageToSign - The message to sign.
-     * @param addressType - The type of address to sign the message with (payment or ordinals).
+     * @param options - Optional configuration for signing
+     * @param options.addressType - The type of address to sign with (e.g. 'payment' or 'ordinals')
+     * @param options.protocol - The signing protocol to use (e.g. 'ecdsa' or 'bip322-simple')
      * @returns A promise that resolves to the signature of the message as a string,
      * or undefined if the message cannot be signed.
      */
-    signMessageWithAddress(messageToSign, addressType) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
             yield this.sync();
-            const address = ((_a = this.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || this.address;
-            return this._connector.signMessage(messageToSign, address);
+            const address = (options === null || options === void 0 ? void 0 : options.addressType)
+                ? getAddressByType.getAddressByType(this, options.addressType)
+                : this.address;
+            return this._connector.signMessage(messageToSign, {
+                address,
+                protocol: options === null || options === void 0 ? void 0 : options.protocol,
+            });
         });
     }
     /**

package/src/wallet/BitcoinWallet.d.ts

@@ -1,7 +1,7 @@
 import { Wallet } from '@dynamic-labs/wallet-connector-core';
 import type { WalletAddressType } from '@dynamic-labs/types';
 import { BitcoinWalletConnector } from '../connectors';
-import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction } from '../types';
+import { BitcoinSignProtocol, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction } from '../types';
 export declare class BitcoinWallet extends Wallet<BitcoinWalletConnector> {
     /**
      * Sends the native balance of the wallet to the given address.
@@ -26,11 +26,16 @@ export declare class BitcoinWallet extends Wallet<BitcoinWalletConnector> {
     /**
      * Signs a message using a specific address type (payment or ordinals).
      * @param messageToSign - The message to sign.
-     * @param addressType - The type of address to sign the message with (payment or ordinals).
+     * @param options - Optional configuration for signing
+     * @param options.addressType - The type of address to sign with (e.g. 'payment' or 'ordinals')
+     * @param options.protocol - The signing protocol to use (e.g. 'ecdsa' or 'bip322-simple')
      * @returns A promise that resolves to the signature of the message as a string,
      * or undefined if the message cannot be signed.
      */
-    signMessageWithAddress(messageToSign: string, addressType: WalletAddressType): Promise<string | undefined>;
+    signMessage(messageToSign: string, options?: {
+        addressType?: WalletAddressType;
+        protocol?: BitcoinSignProtocol;
+    }): Promise<string | undefined>;
     /**
      * Sings a PSBT
      * @returns A promise that resolves to an object with the signed PSBT

package/src/wallet/BitcoinWallet.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { getAddressByType } from '../utils/getAddressByType/getAddressByType.js';
 
 class BitcoinWallet extends Wallet {
     /**
@@ -40,16 +41,22 @@ class BitcoinWallet extends Wallet {
     /**
      * Signs a message using a specific address type (payment or ordinals).
      * @param messageToSign - The message to sign.
-     * @param addressType - The type of address to sign the message with (payment or ordinals).
+     * @param options - Optional configuration for signing
+     * @param options.addressType - The type of address to sign with (e.g. 'payment' or 'ordinals')
+     * @param options.protocol - The signing protocol to use (e.g. 'ecdsa' or 'bip322-simple')
      * @returns A promise that resolves to the signature of the message as a string,
      * or undefined if the message cannot be signed.
      */
-    signMessageWithAddress(messageToSign, addressType) {
+    signMessage(messageToSign, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             yield this.sync();
-            const address = ((_a = this.additionalAddresses.find((addr) => addr.type === addressType)) === null || _a === void 0 ? void 0 : _a.address) || this.address;
-            return this._connector.signMessage(messageToSign, address);
+            const address = (options === null || options === void 0 ? void 0 : options.addressType)
+                ? getAddressByType(this, options.addressType)
+                : this.address;
+            return this._connector.signMessage(messageToSign, {
+                address,
+                protocol: options === null || options === void 0 ? void 0 : options.protocol,
+            });
         });
     }
     /**