@dynamic-labs/bitcoin 4.0.0-alpha.9 → 4.0.1

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -7,18 +7,23 @@ var _tslib = require('../../../_virtual/_tslib.cjs');
 var bitcoinjsLib = require('bitcoinjs-lib');
 var satsConnect = require('sats-connect');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var bitcoinNetworkTypeToNetworks = require('../../utils/psbt/bitcoinNetworkTypeToNetworks.cjs');
 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) {
+        var _a, _b, _c;
         super(opts);
         this.isLegacy = false;
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
+        if ((_b = (_a = opts.walletData) === null || _a === void 0 ? void 0 : _a.injectedConfig) === null || _b === void 0 ? void 0 : _b.length) {
+            this.providerId =
+                (_c = opts.walletData.injectedConfig[0].walletStandard) === null || _c === void 0 ? void 0 : _c.providerId;
+        }
     }
     getGenericUserCancelledError() {
         const error = new Error();
@@ -47,22 +52,29 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             return mainAddress;
         });
     }
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    handleInAppBrowserGetAddress() {
+        var _a;
+        const inAppBrowserUrl = (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl;
+        if (!utils.isMobile() ||
+            this.isInstalledOnBrowser() ||
+            !inAppBrowserUrl ||
+            this.mobileExperience !== 'in-app-browser')
+            return false;
+        const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
+        const deepLink = inAppBrowserTemplate({
+            encodedDappURI: encodeURIComponent(window.location.toString()),
+        });
+        window.location.href = deepLink;
+        return true;
+    }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (utils.isMobile() &&
-                !this.isInstalledOnBrowser() &&
-                inAppBrowserUrl &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
-                const deepLink = inAppBrowserTemplate({
-                    encodedDappURI: encodeURIComponent(window.location.toString()),
-                });
-                window.location.href = deepLink;
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
             try {
                 // requesting permissions on initial connect will avoid connection prompt for other requests
                 const permissionResponse = yield satsConnect.request('wallet_requestPermissions', undefined);
@@ -78,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;
@@ -238,15 +252,54 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
         });
     }
     validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             // TODO: this is a workaround to avoid extra connecting prompt for xverse
             // we should revisit it once xverse releases a new version with bug fixes
+            if (this.key !== 'xverse') {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+                return;
+            }
             walletConnectorCore.logger.debug('validateActiveWallet - skipping validation for xverse', {
                 expectedAddress,
             });
-            return;
         });
     }
+    handleXverseAccountChange() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const { handleAccountChange } = walletConnectorCore.eventListenerHandlers(this);
+            // xverse doesn't return the new account address, so we need to get it manually
+            const accounts = yield this.getAddresses();
+            if (!accounts) {
+                return;
+            }
+            const connectedAccounts = [accounts];
+            handleAccountChange(connectedAccounts);
+        });
+    }
+    setupEventListeners() {
+        // even if we pass a providerId, to addListener, it doesn't work
+        // the event fires multiple times, so we're using the default implementation for non xverse wallets
+        if (this.key !== 'xverse') {
+            super.setupEventListeners();
+            return;
+        }
+        try {
+            const removeListener = satsConnect.addListener('accountChange', this.handleXverseAccountChange.bind(this));
+            this.teardownEventListeners = () => {
+                walletConnectorCore.logger.debug('[BitcoinSatsConnectConnector] teardownEventListeners');
+                removeListener();
+            };
+        }
+        catch (error) {
+            walletConnectorCore.logger.debug('[BitcoinSatsConnectConnector] setupEventListeners', {
+                connector: this.key,
+                error,
+            });
+        }
+    }
 }
 
 exports.BitcoinSatsConnectConnector = BitcoinSatsConnectConnector;

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

@@ -1,18 +1,29 @@
 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;
     currentNetwork: BitcoinNetworkType;
+    providerId: string | undefined;
     constructor(opts: BitcoinWalletConnectorOpts);
     private getGenericUserCancelledError;
     private getAddresses;
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    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>;
     signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
     validateActiveWallet(expectedAddress: string): Promise<void>;
+    private handleXverseAccountChange;
+    setupEventListeners(): void;
 }

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -1,20 +1,25 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { Psbt } from 'bitcoinjs-lib';
-import { BitcoinNetworkType, request, AddressPurpose, signMultipleTransactions } from 'sats-connect';
+import { BitcoinNetworkType, request, AddressPurpose, signMultipleTransactions, addListener } from 'sats-connect';
 import { isMobile, template } from '@dynamic-labs/utils';
-import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
-import { logger } from '@dynamic-labs/wallet-connector-core';
+import { logger, eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
 import { convertNetworkTypeForPsbt } from '../../utils/psbt/bitcoinNetworkTypeToNetworks.js';
 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) {
+        var _a, _b, _c;
         super(opts);
         this.isLegacy = false;
         this.currentNetwork = BitcoinNetworkType.Mainnet;
+        if ((_b = (_a = opts.walletData) === null || _a === void 0 ? void 0 : _a.injectedConfig) === null || _b === void 0 ? void 0 : _b.length) {
+            this.providerId =
+                (_c = opts.walletData.injectedConfig[0].walletStandard) === null || _c === void 0 ? void 0 : _c.providerId;
+        }
     }
     getGenericUserCancelledError() {
         const error = new Error();
@@ -43,22 +48,29 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             return mainAddress;
         });
     }
+    /**
+     * If is inAppBrowser experience, redirects to the inAppBrowser template.
+     * Returns true if redirection was triggered.
+     */
+    handleInAppBrowserGetAddress() {
+        var _a;
+        const inAppBrowserUrl = (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl;
+        if (!isMobile() ||
+            this.isInstalledOnBrowser() ||
+            !inAppBrowserUrl ||
+            this.mobileExperience !== 'in-app-browser')
+            return false;
+        const inAppBrowserTemplate = template(inAppBrowserUrl);
+        const deepLink = inAppBrowserTemplate({
+            encodedDappURI: encodeURIComponent(window.location.toString()),
+        });
+        window.location.href = deepLink;
+        return true;
+    }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const wallet = findWalletBookWallet(this.walletBook, this.key);
-            const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (isMobile() &&
-                !this.isInstalledOnBrowser() &&
-                inAppBrowserUrl &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserTemplate = template(inAppBrowserUrl);
-                const deepLink = inAppBrowserTemplate({
-                    encodedDappURI: encodeURIComponent(window.location.toString()),
-                });
-                window.location.href = deepLink;
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
             try {
                 // requesting permissions on initial connect will avoid connection prompt for other requests
                 const permissionResponse = yield request('wallet_requestPermissions', undefined);
@@ -74,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;
@@ -234,15 +248,54 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
         });
     }
     validateActiveWallet(expectedAddress) {
+        const _super = Object.create(null, {
+            validateActiveWallet: { get: () => super.validateActiveWallet }
+        });
         return __awaiter(this, void 0, void 0, function* () {
             // TODO: this is a workaround to avoid extra connecting prompt for xverse
             // we should revisit it once xverse releases a new version with bug fixes
+            if (this.key !== 'xverse') {
+                yield _super.validateActiveWallet.call(this, expectedAddress);
+                return;
+            }
             logger.debug('validateActiveWallet - skipping validation for xverse', {
                 expectedAddress,
             });
-            return;
         });
     }
+    handleXverseAccountChange() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { handleAccountChange } = eventListenerHandlers(this);
+            // xverse doesn't return the new account address, so we need to get it manually
+            const accounts = yield this.getAddresses();
+            if (!accounts) {
+                return;
+            }
+            const connectedAccounts = [accounts];
+            handleAccountChange(connectedAccounts);
+        });
+    }
+    setupEventListeners() {
+        // even if we pass a providerId, to addListener, it doesn't work
+        // the event fires multiple times, so we're using the default implementation for non xverse wallets
+        if (this.key !== 'xverse') {
+            super.setupEventListeners();
+            return;
+        }
+        try {
+            const removeListener = addListener('accountChange', this.handleXverseAccountChange.bind(this));
+            this.teardownEventListeners = () => {
+                logger.debug('[BitcoinSatsConnectConnector] teardownEventListeners');
+                removeListener();
+            };
+        }
+        catch (error) {
+            logger.debug('[BitcoinSatsConnectConnector] setupEventListeners', {
+                connector: this.key,
+                error,
+            });
+        }
+    }
 }
 
 export { BitcoinSatsConnectConnector };

package/src/connectors/BitcoinWalletConnector.cjs

@@ -36,7 +36,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
         }
         this.cache = new BitcoinLocalStorageCache.BitcoinLocalStorageCache(this.overrideKey);
-        this.canFetchConnectedAccounts = walletBook.isWalletMethodSupported(walletBookWallet, 'getConnectedAccounts', 'browserExtension');
+        this.canFetchConnectedAccounts = walletConnectorCore.isConnectorMethodSupported(this, 'getConnectedAccounts', 'desktop');
     }
     isSameAccountChangeRequest(to) {
         return this.lastAccountChange === to;
@@ -50,10 +50,8 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         });
     }
     canConnectWithHardwareWallet() {
-        const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet || !wallet.hardwareWallets)
-            return false;
-        return wallet.hardwareWallets.includes('ledger');
+        var _a;
+        return Boolean((_a = this.metadata.supportedHardwareWallets) === null || _a === void 0 ? void 0 : _a.includes('ledger'));
     }
     isInstalledOnBrowser() {
         var _a;
@@ -184,6 +182,14 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return response.text();
         });
     }
+    // not all wallets support sendBitcoin method
+    // so we have a default implementation that returns undefined
+    sendBitcoin(transaction) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            walletConnectorCore.logger.debug('sendBitcoin - function not implemented', transaction);
+            return undefined;
+        });
+    }
     getProvider() {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
@@ -283,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

@@ -1,15 +1,16 @@
 import { type EventEmitter } from 'eventemitter3';
 import type { Wallet } from '@wallet-standard/base';
-import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { Chain, IBitcoinWalletConnector, WalletConnectorBase, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
 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;
     walletData: WalletSchema;
     overrideKey?: string;
+    metadata?: WalletMetadata;
 };
 export declare abstract class BitcoinWalletConnector extends WalletConnectorBase<typeof BitcoinWallet> implements IBitcoinWalletConnector {
     cache: IBitcoinSessionCache;
@@ -38,7 +39,7 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     getAdditionalAddresses(mainAddress?: string): Promise<WalletAdditionalAddress[]>;
     setAdditionalAddresses(mainAddress: string, additionalAddresses: WalletAdditionalAddress[]): Promise<void>;
     sendRawTransaction(rawTransaction: string): Promise<string>;
-    abstract sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
+    sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;
     getProvider<T>(): T & EventEmitter<string | symbol, any>;
     abstract signPsbt(request: BitcoinSignPsbtRequest): Promise<BitcoinSignPsbtResponse | undefined>;
     signPsbts(requests: BitcoinSignPsbtRequest[]): Promise<string[] | undefined>;
@@ -46,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

@@ -1,8 +1,8 @@
 'use client'
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { AddressPurpose } from 'sats-connect';
-import { WalletConnectorBase, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
-import { getWalletBookWallet, isWalletMethodSupported, findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { WalletConnectorBase, isConnectorMethodSupported, eventListenerHandlers, logger } from '@dynamic-labs/wallet-connector-core';
+import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isLedgerAddressViaVerifiedCredentials, DynamicError } from '@dynamic-labs/utils';
 import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
 import { BitcoinLocalStorageCache } from '../BitcoinLocalStorageCache.js';
@@ -32,7 +32,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
         }
         this.cache = new BitcoinLocalStorageCache(this.overrideKey);
-        this.canFetchConnectedAccounts = isWalletMethodSupported(walletBookWallet, 'getConnectedAccounts', 'browserExtension');
+        this.canFetchConnectedAccounts = isConnectorMethodSupported(this, 'getConnectedAccounts', 'desktop');
     }
     isSameAccountChangeRequest(to) {
         return this.lastAccountChange === to;
@@ -46,10 +46,8 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         });
     }
     canConnectWithHardwareWallet() {
-        const wallet = findWalletBookWallet(this.walletBook, this.key);
-        if (!wallet || !wallet.hardwareWallets)
-            return false;
-        return wallet.hardwareWallets.includes('ledger');
+        var _a;
+        return Boolean((_a = this.metadata.supportedHardwareWallets) === null || _a === void 0 ? void 0 : _a.includes('ledger'));
     }
     isInstalledOnBrowser() {
         var _a;
@@ -180,6 +178,14 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             return response.text();
         });
     }
+    // not all wallets support sendBitcoin method
+    // so we have a default implementation that returns undefined
+    sendBitcoin(transaction) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.debug('sendBitcoin - function not implemented', transaction);
+            return undefined;
+        });
+    }
     getProvider() {
         var _a;
         return (_a = this.bitcoinProviderHelper) === null || _a === void 0 ? void 0 : _a.getProvider();
@@ -279,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/{BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs → MagicEdenConnector/MagicEdenConnector.cjs}

@@ -4,46 +4,24 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
+var jsontokens = require('jsontokens');
 var satsConnect = require('sats-connect');
 var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var _const = require('../../const.cjs');
-require('bitcoinjs-lib');
-require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/sdk-api-core');
-require('@wallet-standard/app');
 var BitcoinSatsConnectConnector = require('../BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs');
-var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
+var getSatsConnectSigningProtocol = require('../../utils/getSatsConnectSigningProtocol/getSatsConnectSigningProtocol.cjs');
 
-class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
-    constructor() {
-        super(...arguments);
+class MagicEdenConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+    constructor(opts) {
+        super(Object.assign(Object.assign({}, opts), { overrideKey: 'magicedenbtc' }));
+        this.name = 'Magic Eden';
+        this.overrideKey = 'magicedenbtc';
         this.isLegacy = true;
     }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // xverse doesn't support wallet standard, so we won't have a wallet object,
-            // but it's already the default provider for sats-connect, so it's ok
-            // for getProvider in getAddress to return undefined
-            // if we're not using xverse, we need to check if there is a wallet and
-            // that it has the satsconnect feature to return the correct provider to use
-            if (!supportsSatsConnect.supportsSatsConnect(this)) {
-                return;
-            }
-            const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
-            const inAppBrowserUrl = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.mobile) === null || _a === void 0 ? void 0 : _a.inAppBrowser;
-            if (utils.isMobile() &&
-                !this.isInstalledOnBrowser() &&
-                inAppBrowserUrl &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserTemplate = utils.template(inAppBrowserUrl);
-                const deepLink = inAppBrowserTemplate({
-                    encodedDappURI: encodeURIComponent(window.location.toString()),
-                });
-                window.location.href = deepLink;
+            if (this.handleInAppBrowserGetAddress())
                 return;
-            }
             return new Promise((resolve, reject) => {
                 satsConnect.getAddress({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -80,11 +58,9 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
             });
         });
     }
-    signMessage(messageToSign, withAddress) {
+    signMessage(messageToSign, options) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!supportsSatsConnect.supportsSatsConnect(this)) {
-                return;
-            }
+            const { address, protocol } = options;
             return new Promise((resolve, reject) => {
                 satsConnect.signMessage({
                     getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -107,11 +83,12 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
                         resolve(response);
                     }),
                     payload: {
-                        address: withAddress,
+                        address,
                         message: messageToSign,
                         network: {
                             type: this.currentNetwork,
                         },
+                        protocol: getSatsConnectSigningProtocol.getSatsConnectSigningProtocol(protocol),
                     },
                 });
             });
@@ -122,7 +99,7 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
             var _a;
             const mainAddress = yield this.getAddress();
             const senderAddress = (_a = (yield this.getAdditionalAddresses(mainAddress)).find((address) => address.type === 'payment')) === null || _a === void 0 ? void 0 : _a.address;
-            if (!senderAddress || !supportsSatsConnect.supportsSatsConnect(this)) {
+            if (!senderAddress) {
                 return;
             }
             return new Promise((resolve, reject) => {
@@ -185,32 +162,22 @@ class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.Bitc
             });
         });
     }
+    /**
+     * Uses the custom Magic Eden signTransactions feature to sign multiple transactions
+     */
     signTransactions(transactions) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const { message, psbts, network } = transactions;
-            return new Promise((resolve, reject) => {
-                satsConnect.signMultipleTransactions({
-                    getProvider: () => _tslib.__awaiter(this, void 0, void 0, function* () {
-                        var _a, _b;
-                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[_const.SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
-                    }),
-                    onCancel: () => {
-                        const error = new Error();
-                        error.code = '-32000'; // error code for user cancelled
-                        reject(error);
-                    },
-                    onFinish: (response) => {
-                        resolve(response);
-                    },
-                    payload: {
-                        message: message || 'Sign Transaction',
-                        network,
-                        psbts,
-                    },
-                });
-            });
+            var _a;
+            (_a = transactions.message) !== null && _a !== void 0 ? _a : (transactions.message = 'Sign Transaction');
+            const request = jsontokens.createUnsecuredToken(transactions);
+            // Magic Eden has implemented their own signTransactions feature, and have requested us
+            // to ensure we use it rather than the general Sats Connect API for this method
+            const provider = this.getProvider();
+            if (!provider)
+                throw new utils.DynamicError('signTransactions failed: Magic Eden provider not found');
+            return provider.signMultipleTransactions(request);
         });
     }
 }
 
-exports.BitcoinSatsConnectLegacyConnector = BitcoinSatsConnectLegacyConnector;
+exports.MagicEdenConnector = MagicEdenConnector;

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

@@ -0,0 +1,21 @@
+import { SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-connect';
+import { BitcoinSignProtocol, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
+import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector';
+import { BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
+export declare class MagicEdenConnector extends BitcoinSatsConnectConnector {
+    name: string;
+    overrideKey: string;
+    isLegacy: boolean;
+    constructor(opts: BitcoinWalletConnectorOpts);
+    getAddress(): 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>;
+    /**
+     * Uses the custom Magic Eden signTransactions feature to sign multiple transactions
+     */
+    signTransactions(transactions: SignMultipleTransactionsPayload): Promise<SignTransactionResponse[] | undefined>;
+}