@dynamic-labs/bitcoin 3.0.0-alpha.9 → 3.0.1

package/src/connectors/OkxConnector/OkxConnector.cjs

@@ -13,7 +13,6 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = false;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -23,7 +22,8 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 utils.isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = utils.template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -78,6 +78,23 @@ class OkxConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbt = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbt.toHex());
+                psbtOptions.push(createSignPsbtOptions.createPsbtOptions(psbt, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
 }
 
 exports.OkxConnector = OkxConnector;

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

@@ -2,11 +2,11 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../../types';
 export declare class OkxConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private get walletBookWallet();
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): 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

@@ -9,7 +9,6 @@ class OkxConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'okxwalletbtc' }));
         this.name = 'OKX Wallet';
-        this.canFetchConnectedAccounts = false;
     }
     get walletBookWallet() {
         return this.walletBook.wallets[this.key];
@@ -19,7 +18,8 @@ class OkxConnector extends BitcoinWalletConnector {
             if (!this.isInstalledOnBrowser() &&
                 isMobile() &&
                 this.walletBookWallet.mobile &&
-                this.walletBookWallet.mobile.inAppBrowser) {
+                this.walletBookWallet.mobile.inAppBrowser &&
+                this.mobileExperience === 'in-app-browser') {
                 const inAppBrowserCompiledTemplate = template(this.walletBookWallet.mobile.inAppBrowser);
                 const deepLink = inAppBrowserCompiledTemplate({
                     encodedDappURI: encodeURIComponent(window.location.toString()),
@@ -74,6 +74,23 @@ class OkxConnector extends BitcoinWalletConnector {
             return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbt = Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbt.toHex());
+                psbtOptions.push(createPsbtOptions(psbt, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
 }
 
 export { OkxConnector };

package/src/connectors/PhantomConnector/PhantomConnector.cjs

@@ -17,7 +17,6 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -27,7 +26,7 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals
@@ -68,17 +67,13 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
-            }
             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: walletAddress },
+                    account: { address: withAddress },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -88,7 +83,7 @@ class PhantomConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(walletAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });

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

@@ -2,11 +2,10 @@ import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } f
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare class PhantomConnector extends BitcoinWalletConnector {
     name: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     private connectWithInstalledExtension;
     getAddress(): Promise<string | undefined>;
-    signMessage(messageToSign: string): Promise<string | undefined>;
+    signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
 }

package/src/connectors/PhantomConnector/PhantomConnector.js

@@ -13,7 +13,6 @@ class PhantomConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'phantombtc' }));
         this.name = 'Phantom';
-        this.canFetchConnectedAccounts = true;
     }
     connectWithInstalledExtension() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23,7 +22,7 @@ class PhantomConnector extends BitcoinWalletConnector {
                 const { accounts } = yield this.walletMethods.connect();
                 const parsedAccounts = accounts.map((account) => ({
                     address: account.address,
-                    publicKey: Buffer.from(account.publicKey).toString('base64'),
+                    publicKey: Buffer.from(account.publicKey).toString('hex'),
                 }));
                 [paymentAccount, ordinalsAccount] = parsedAccounts;
                 // in case it only returns one account, we will use it as both payment and ordinals
@@ -64,17 +63,13 @@ class PhantomConnector extends BitcoinWalletConnector {
             return undefined;
         });
     }
-    signMessage(messageToSign) {
+    signMessage(messageToSign, withAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const [walletAddress] = yield this.getConnectedAccounts();
-            if (!walletAddress) {
-                return;
-            }
             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: walletAddress },
+                    account: { address: withAddress },
                     message: new TextEncoder().encode(messageToSign),
                 });
                 return Buffer.from(result.signature).toString('base64');
@@ -84,7 +79,7 @@ class PhantomConnector extends BitcoinWalletConnector {
                 if (!provider) {
                     return;
                 }
-                const result = yield provider.signMessage(walletAddress, new TextEncoder().encode(messageToSign));
+                const result = yield provider.signMessage(withAddress, new TextEncoder().encode(messageToSign));
                 return Buffer.from(result.signature).toString('base64');
             }
         });

package/src/connectors/UnisatConnector/UnisatConnector.cjs

@@ -13,7 +13,6 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -65,6 +64,23 @@ class UnisatConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
             return { signedPsbt: bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbtFromBase64.toHex());
+                psbtOptions.push(createSignPsbtOptions.createPsbtOptions(psbtFromBase64, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => bitcoinjsLib.Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
     getConnectedAccounts() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();

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

@@ -3,11 +3,11 @@ import { BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } f
 export declare class UnisatConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
     getConnectedAccounts(): Promise<string[]>;
 }

package/src/connectors/UnisatConnector/UnisatConnector.js

@@ -9,7 +9,6 @@ class UnisatConnector extends BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unisat' }));
         this.name = 'UniSat';
         this.overrideKey = 'unisat';
-        this.canFetchConnectedAccounts = true;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -61,6 +60,23 @@ class UnisatConnector extends BitcoinWalletConnector {
             return { signedPsbt: Psbt.fromHex(signedPsbtHex).toBase64() };
         });
     }
+    signPsbts(requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            if (!provider) {
+                return;
+            }
+            const psbtHexs = [];
+            const psbtOptions = [];
+            for (const request of requests) {
+                const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64);
+                psbtHexs.push(psbtFromBase64.toHex());
+                psbtOptions.push(createPsbtOptions(psbtFromBase64, request));
+            }
+            const signedPsbtHexs = yield provider.signPsbts(psbtHexs, psbtOptions);
+            return signedPsbtHexs.map((signedPsbtHex) => Psbt.fromHex(signedPsbtHex).toBase64());
+        });
+    }
     getConnectedAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getProvider();

package/src/connectors/UnknownInjected/UnknownInjected.cjs

@@ -11,7 +11,6 @@ class UnknownInjectedConnector extends BitcoinWalletConnector.BitcoinWalletConne
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unknown' }));
         this.name = 'Unknown';
         this.overrideKey = 'unknown';
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -25,6 +24,13 @@ class UnknownInjectedConnector extends BitcoinWalletConnector.BitcoinWalletConne
             return;
         });
     }
+    signPsbts(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
     sendBitcoin(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _transaction) {

package/src/connectors/UnknownInjected/UnknownInjected.d.ts

@@ -3,9 +3,9 @@ import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWa
 export declare class UnknownInjectedConnector extends BitcoinWalletConnector {
     name: string;
     overrideKey: string;
-    canFetchConnectedAccounts: boolean;
     constructor(opts: BitcoinWalletConnectorOpts);
     getAddress(): Promise<string | undefined>;
     signPsbt(_request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
+    signPsbts(_requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
     sendBitcoin(_transaction: BitcoinTransaction): Promise<string | undefined>;
 }

package/src/connectors/UnknownInjected/UnknownInjected.js

@@ -7,7 +7,6 @@ class UnknownInjectedConnector extends BitcoinWalletConnector {
         super(Object.assign(Object.assign({}, opts), { overrideKey: 'unknown' }));
         this.name = 'Unknown';
         this.overrideKey = 'unknown';
-        this.canFetchConnectedAccounts = false;
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -21,6 +20,13 @@ class UnknownInjectedConnector extends BitcoinWalletConnector {
             return;
         });
     }
+    signPsbts(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _requests) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return;
+        });
+    }
     sendBitcoin(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _transaction) {

package/src/connectors/index.d.ts

@@ -1,6 +1,7 @@
 export * from './BitcoinWalletConnector';
 export * from './BitcoinBtcKitConnector';
 export * from './BitcoinSatsConnectConnector';
+export * from './BitcoinSatsConnectLegacyConnector';
 export * from './PhantomConnector';
 export * from './OkxConnector';
 export * from './UnisatConnector';

package/src/index.cjs

@@ -20,6 +20,8 @@ var OkxConnector = require('./connectors/OkxConnector/OkxConnector.cjs');
 var UnisatConnector = require('./connectors/UnisatConnector/UnisatConnector.cjs');
 var UnknownInjected = require('./connectors/UnknownInjected/UnknownInjected.cjs');
 var FallbackBitcoinConnector = require('./connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.cjs');
+var BitcoinWallet = require('./wallet/BitcoinWallet.cjs');
+var isBitcoinWallet = require('./wallet/isBitcoinWallet/isBitcoinWallet.cjs');
 
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors.fetchSatsConnectConnectors(props),
@@ -37,4 +39,6 @@ exports.fetchSatsConnectConnectors = fetchSatsConnectConnectors.fetchSatsConnect
 exports.hasSatsConnectFeature = hasSatsConnectFeature.hasSatsConnectFeature;
 exports.supportsSatsConnect = supportsSatsConnect.supportsSatsConnect;
 exports.getMempoolApiUrl = getMempoolApiUrl.getMempoolApiUrl;
+exports.BitcoinWallet = BitcoinWallet.BitcoinWallet;
+exports.isBitcoinWallet = isBitcoinWallet.isBitcoinWallet;
 exports.BitcoinWalletConnectors = BitcoinWalletConnectors;

package/src/index.d.ts

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

package/src/index.js

@@ -18,6 +18,8 @@ import { OkxConnector } from './connectors/OkxConnector/OkxConnector.js';
 import { UnisatConnector } from './connectors/UnisatConnector/UnisatConnector.js';
 import { UnknownInjectedConnector } from './connectors/UnknownInjected/UnknownInjected.js';
 import { FallbackBitcoinConnector } from './connectors/FallbackBitcoinConnector/FallbackBitcoinConnector.js';
+export { BitcoinWallet } from './wallet/BitcoinWallet.js';
+export { isBitcoinWallet } from './wallet/isBitcoinWallet/isBitcoinWallet.js';
 
 const BitcoinWalletConnectors = (props) => [
     ...fetchSatsConnectConnectors(props),

package/src/types.d.ts

@@ -53,6 +53,7 @@ export type SatsConnectSignTransactionInput = {
     psbtBase64: string;
     inputsToSign: SatsConnectInputToSign[];
     broadcast?: boolean;
+    allowedSignHash?: number;
 };
 export type BtcKitSignPsbtResponseExtended = BtcKitSignPsbtResponse & {
     result: {

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.cjs

@@ -5,14 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _const = require('../../const.cjs');
 require('../../../_virtual/_tslib.cjs');
+require('sats-connect');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 require('@wallet-standard/app');
-require('sats-connect');
 require('bitcoinjs-lib');
 var BitcoinSatsConnectConnector = require('../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
+var BitcoinSatsConnectLegacyConnector = require('../../connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs');
 
 const fetchSatsConnectConnectors = ({ walletBook, }) => {
     var _a;
@@ -27,9 +28,20 @@ const fetchSatsConnectConnectors = ({ walletBook, }) => {
         });
     })
         .map(([key, wallet]) => {
-        const { shortName } = wallet;
+        var _a;
+        const { shortName, injectedConfig } = wallet;
         const name = shortName || wallet.name;
-        return class extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+        // if has providerId, use the new connector (xverse)
+        if ((_a = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig[0].walletStandard) === null || _a === void 0 ? void 0 : _a.providerId) {
+            return class extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+                constructor(props) {
+                    super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
+                    this.name = name;
+                }
+            };
+        }
+        // id doesn't have providerId, use the legacy connector (magiceden)
+        return class extends BitcoinSatsConnectLegacyConnector.BitcoinSatsConnectLegacyConnector {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
                 this.name = name;

package/src/utils/fetchSatsConnectConnectors/fetchSatsConnectConnectors.js

@@ -1,14 +1,15 @@
 'use client'
 import { SATSCONNECT_FEATURE } from '../../const.js';
 import '../../../_virtual/_tslib.js';
+import 'sats-connect';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '@wallet-standard/app';
-import 'sats-connect';
 import 'bitcoinjs-lib';
 import { BitcoinSatsConnectConnector } from '../../connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js';
+import { BitcoinSatsConnectLegacyConnector } from '../../connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.js';
 
 const fetchSatsConnectConnectors = ({ walletBook, }) => {
     var _a;
@@ -23,9 +24,20 @@ const fetchSatsConnectConnectors = ({ walletBook, }) => {
         });
     })
         .map(([key, wallet]) => {
-        const { shortName } = wallet;
+        var _a;
+        const { shortName, injectedConfig } = wallet;
         const name = shortName || wallet.name;
-        return class extends BitcoinSatsConnectConnector {
+        // if has providerId, use the new connector (xverse)
+        if ((_a = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig[0].walletStandard) === null || _a === void 0 ? void 0 : _a.providerId) {
+            return class extends BitcoinSatsConnectConnector {
+                constructor(props) {
+                    super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
+                    this.name = name;
+                }
+            };
+        }
+        // id doesn't have providerId, use the legacy connector (magiceden)
+        return class extends BitcoinSatsConnectLegacyConnector {
             constructor(props) {
                 super(Object.assign(Object.assign({}, props), { overrideKey: key, walletData: wallet }));
                 this.name = name;

package/src/utils/psbt/bitcoinNetworkTypeToNetworks.cjs

@@ -9,6 +9,7 @@ var bitcoinjsLib = require('bitcoinjs-lib');
 const convertNetworkTypeForPsbt = (network) => ({
     [satsConnect.BitcoinNetworkType.Mainnet]: bitcoinjsLib.networks.bitcoin,
     [satsConnect.BitcoinNetworkType.Testnet]: bitcoinjsLib.networks.testnet,
+    [satsConnect.BitcoinNetworkType.Signet]: undefined,
 }[network]);
 
 exports.convertNetworkTypeForPsbt = convertNetworkTypeForPsbt;

package/src/utils/psbt/bitcoinNetworkTypeToNetworks.d.ts

@@ -1,3 +1,3 @@
 import { BitcoinNetworkType } from 'sats-connect';
 import { networks } from 'bitcoinjs-lib';
-export declare const convertNetworkTypeForPsbt: (network: BitcoinNetworkType) => networks.Network;
+export declare const convertNetworkTypeForPsbt: (network: BitcoinNetworkType) => networks.Network | undefined;

package/src/utils/psbt/bitcoinNetworkTypeToNetworks.js

@@ -5,6 +5,7 @@ import { networks } from 'bitcoinjs-lib';
 const convertNetworkTypeForPsbt = (network) => ({
     [BitcoinNetworkType.Mainnet]: networks.bitcoin,
     [BitcoinNetworkType.Testnet]: networks.testnet,
+    [BitcoinNetworkType.Signet]: undefined,
 }[network]);
 
 export { convertNetworkTypeForPsbt };

package/src/utils/psbt/createSignPsbtOptions.cjs

@@ -3,9 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var validatePsbt = require('./validator/validatePsbt.cjs');
+var getSigHashType = require('./getSigHashType.cjs');
 require('bitcoinjs-lib');
-require('@dynamic-labs/wallet-connector-core');
 require('sats-connect');
 
 const createPsbtOptions = (psbt, request) => {
@@ -32,5 +33,25 @@ const createPsbtOptions = (psbt, request) => {
     }
     return psbtSignOptions;
 };
+const createSignPsbtOptionsForSatsConnect = (psbtFromBase64, request, isLegacyConnector = false) => {
+    var _a, _b, _c;
+    if ((_a = request.signature) === null || _a === void 0 ? void 0 : _a.length) {
+        validatePsbt.validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
+    }
+    walletConnectorCore.logger.logVerboseTroubleshootingMessage('createSignPsbtOptionsForSatsConnect', { isLegacyConnector, psbtFromBase64, request });
+    const inputsToSign = ((_c = (_b = request.signature) === null || _b === void 0 ? void 0 : _b.map((sig) => {
+        var _a;
+        return ((_a = sig.signingIndexes) !== null && _a !== void 0 ? _a : []).map((inputIndex) => ({
+            address: sig.address,
+            sigHash: isLegacyConnector
+                ? getSigHashType.getSigHashType(psbtFromBase64.data.inputs[inputIndex])
+                : request.allowedSighash[0],
+            signingIndexes: [inputIndex],
+        }));
+    })) !== null && _c !== void 0 ? _c : []).flat();
+    walletConnectorCore.logger.logVerboseTroubleshootingMessage('createSignPsbtOptionsForSatsConnect', { inputsToSign });
+    return inputsToSign;
+};
 
 exports.createPsbtOptions = createPsbtOptions;
+exports.createSignPsbtOptionsForSatsConnect = createSignPsbtOptionsForSatsConnect;

package/src/utils/psbt/createSignPsbtOptions.d.ts

@@ -1,3 +1,5 @@
 import { Psbt } from 'bitcoinjs-lib';
+import { InputToSign } from 'sats-connect';
 import { BitcoinSignPsbtRequest, SignPsbtOptions } from '../../types';
 export declare const createPsbtOptions: (psbt: Psbt, request: BitcoinSignPsbtRequest) => SignPsbtOptions;
+export declare const createSignPsbtOptionsForSatsConnect: (psbtFromBase64: Psbt, request: BitcoinSignPsbtRequest, isLegacyConnector?: boolean) => InputToSign[];

package/src/utils/psbt/createSignPsbtOptions.js

@@ -1,7 +1,8 @@
 'use client'
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { validatePsbt } from './validator/validatePsbt.js';
+import { getSigHashType } from './getSigHashType.js';
 import 'bitcoinjs-lib';
-import '@dynamic-labs/wallet-connector-core';
 import 'sats-connect';
 
 const createPsbtOptions = (psbt, request) => {
@@ -28,5 +29,24 @@ const createPsbtOptions = (psbt, request) => {
     }
     return psbtSignOptions;
 };
+const createSignPsbtOptionsForSatsConnect = (psbtFromBase64, request, isLegacyConnector = false) => {
+    var _a, _b, _c;
+    if ((_a = request.signature) === null || _a === void 0 ? void 0 : _a.length) {
+        validatePsbt(psbtFromBase64, request.allowedSighash, request.signature);
+    }
+    logger.logVerboseTroubleshootingMessage('createSignPsbtOptionsForSatsConnect', { isLegacyConnector, psbtFromBase64, request });
+    const inputsToSign = ((_c = (_b = request.signature) === null || _b === void 0 ? void 0 : _b.map((sig) => {
+        var _a;
+        return ((_a = sig.signingIndexes) !== null && _a !== void 0 ? _a : []).map((inputIndex) => ({
+            address: sig.address,
+            sigHash: isLegacyConnector
+                ? getSigHashType(psbtFromBase64.data.inputs[inputIndex])
+                : request.allowedSighash[0],
+            signingIndexes: [inputIndex],
+        }));
+    })) !== null && _c !== void 0 ? _c : []).flat();
+    logger.logVerboseTroubleshootingMessage('createSignPsbtOptionsForSatsConnect', { inputsToSign });
+    return inputsToSign;
+};
 
-export { createPsbtOptions };
+export { createPsbtOptions, createSignPsbtOptionsForSatsConnect };

package/src/wallet/BitcoinWallet.cjs

@@ -0,0 +1,69 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+
+class BitcoinWallet extends walletConnectorCore.Wallet {
+    /**
+     * Sends a raw transaction
+     * @returns A promise that resolves to the transaction id
+     */
+    sendRawTransaction(rawTransaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.sync();
+            return this._connector.sendRawTransaction(rawTransaction);
+        });
+    }
+    /**
+     * Sends satoshis to a bitcoin address
+     * @returns A promise that resolves to the transaction id
+     */
+    sendBitcoin(transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.sync();
+            return this._connector.sendBitcoin(transaction);
+        });
+    }
+    /**
+     * 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).
+     * @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) {
+        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);
+        });
+    }
+    /**
+     * Sings a PSBT
+     * @returns A promise that resolves to an object with the signed PSBT
+     * or undefined if no provider is available
+     */
+    signPsbt(request) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.sync();
+            return this._connector.signPsbt(request);
+        });
+    }
+    /**
+     * Sings multiple PSBTs
+     * @returns A promise that resolves to an array of signed PSBTs in base64
+     * or undefined if no provider is available
+     */
+    signPsbts(requests) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.sync();
+            return this._connector.signPsbts(requests);
+        });
+    }
+}
+
+exports.BitcoinWallet = BitcoinWallet;