@dynamic-labs/bitcoin 3.0.0-alpha.66 → 3.0.0-alpha.68

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 
+## [3.0.0-alpha.68](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.67...v3.0.0-alpha.68) (2024-09-12)
+
+
+### Bug Fixes
+
+* combine signing inputs for new signTransaction method in bitcoin sats connector by address ([#6882](https://github.com/dynamic-labs/DynamicAuth/issues/6882)) ([dd78923](https://github.com/dynamic-labs/DynamicAuth/commit/dd78923e84042dbd23977c595467a6d587b729fb))
+* log message during v1 embedded wallet email recovery ([#6877](https://github.com/dynamic-labs/DynamicAuth/issues/6877)) ([92fd70e](https://github.com/dynamic-labs/DynamicAuth/commit/92fd70e8d685edf334cb60c61b6411441fbfe54d))
+* return correct chain format for smart wallets ([#6878](https://github.com/dynamic-labs/DynamicAuth/issues/6878)) ([e26544a](https://github.com/dynamic-labs/DynamicAuth/commit/e26544ad39277fcd5e94cf70cd871f7111f7a3c2))
+
+## [3.0.0-alpha.67](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.66...v3.0.0-alpha.67) (2024-09-12)
+
+
+### Features
+
+* add blockaid url scanning to sdk api ([#6869](https://github.com/dynamic-labs/DynamicAuth/issues/6869)) ([0a20eef](https://github.com/dynamic-labs/DynamicAuth/commit/0a20eef2eec8793a714f67948ddba2bc1bab06cd))
+* allow selecting which MetaMask account to connect with on sign-in ([#6838](https://github.com/dynamic-labs/DynamicAuth/issues/6838)) ([8a30614](https://github.com/dynamic-labs/DynamicAuth/commit/8a306140563390602a417fd191bc789d6e07c220))
+
+
+### Bug Fixes
+
+* cach get server snashot to avoid next js rerender loop ([#6867](https://github.com/dynamic-labs/DynamicAuth/issues/6867)) ([6f77c01](https://github.com/dynamic-labs/DynamicAuth/commit/6f77c01663641ab870a8b96fb2d3b5611bc38c2c))
+* clean up console errors on log out ([#6834](https://github.com/dynamic-labs/DynamicAuth/issues/6834)) ([a18a4ce](https://github.com/dynamic-labs/DynamicAuth/commit/a18a4ce57766dec0cc351794ff7a71b3c632d9a3))
+* ensure open url method will be available in the webview controller ([#6852](https://github.com/dynamic-labs/DynamicAuth/issues/6852)) ([bdaf12f](https://github.com/dynamic-labs/DynamicAuth/commit/bdaf12f7a77b801c3dec67163e1fef2fdffc7d2a))
+* solana transaction decoder fallback ([#6868](https://github.com/dynamic-labs/DynamicAuth/issues/6868)) ([38c9242](https://github.com/dynamic-labs/DynamicAuth/commit/38c924253c29e8e3569d9da9bc452a8cdc3af0d2))
+
 ## [3.0.0-alpha.66](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.65...v3.0.0-alpha.66) (2024-09-11)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "3.0.0-alpha.66",
+  "version": "3.0.0-alpha.68",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -27,15 +27,15 @@
   },
   "dependencies": {
     "@btckit/types": "0.0.19",
-    "@dynamic-labs/sdk-api-core": "0.0.526",
+    "@dynamic-labs/sdk-api-core": "0.0.529",
     "@wallet-standard/app": "1.0.1",
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.8.0",
-    "@dynamic-labs/types": "3.0.0-alpha.66",
-    "@dynamic-labs/utils": "3.0.0-alpha.66",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.66",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.66",
+    "@dynamic-labs/types": "3.0.0-alpha.68",
+    "@dynamic-labs/utils": "3.0.0-alpha.68",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.68",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.68",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.cjs

@@ -12,10 +12,12 @@ 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');
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
+        this.isLegacy = false;
         this.currentNetwork = satsConnect.BitcoinNetworkType.Mainnet;
     }
     getGenericUserCancelledError() {
@@ -126,13 +128,24 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
     signTransaction(params) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const { allowedSignHash, psbtBase64, broadcast, inputsToSign } = params;
+            const signPbstPayload = {
+                allowedSignHash,
+                broadcast,
+                psbt: psbtBase64,
+                // we have to combine signing indexes for like addresses
+                signInputs: inputsToSign.reduce((accum, curr) => {
+                    if (!accum[curr.address]) {
+                        accum[curr.address] = [];
+                    }
+                    accum[curr.address].push(...curr.signingIndexes);
+                    return accum;
+                }, {}),
+            };
+            walletConnectorCore.logger.logVerboseTroubleshootingMessage('[BitcoinSatsConnectConnector] signTransaction', {
+                signPbstPayload,
+            });
             try {
-                const response = yield satsConnect.request('signPsbt', {
-                    allowedSignHash,
-                    broadcast,
-                    psbt: psbtBase64,
-                    signInputs: Object.fromEntries(inputsToSign.map((input) => [input.address, input.signingIndexes])),
-                });
+                const response = yield satsConnect.request('signPsbt', signPbstPayload);
                 if (response.status !== 'success') {
                     throw response.error;
                 }
@@ -147,8 +160,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
     signTransactions(transactions) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             const { message, psbts, network } = transactions;
+            walletConnectorCore.logger.logVerboseTroubleshootingMessage('[BitcoinSatsConnectConnector] signTransactions', {
+                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 = this.getGenericUserCancelledError();
                         reject(error);
@@ -174,9 +194,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
             const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64, {
                 network,
             });
+            walletConnectorCore.logger.logVerboseTroubleshootingMessage('signPsbt', {
+                isLegacy: this.isLegacy,
+                psbtFromBase64,
+                request,
+            });
             const signedPsbt = yield this.signTransaction({
+                allowedSignHash: request.allowedSighash[0],
                 broadcast: false,
-                inputsToSign: createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request),
+                inputsToSign: createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request, this.isLegacy),
                 psbtBase64: request.unsignedPsbtBase64,
             });
             if (!signedPsbt) {
@@ -200,12 +226,13 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector.BitcoinWalletCo
                 const psbtFromBase64 = bitcoinjsLib.Psbt.fromBase64(request.unsignedPsbtBase64, {
                     network,
                 });
-                const inputsToSign = createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request);
+                const inputsToSign = createSignPsbtOptions.createSignPsbtOptionsForSatsConnect(psbtFromBase64, request, this.isLegacy);
                 signMultipleTransactionPayload.psbts.push({
                     inputsToSign,
                     psbtBase64: request.unsignedPsbtBase64,
                 });
             }
+            walletConnectorCore.logger.logVerboseTroubleshootingMessage('signPsbts', signMultipleTransactionPayload);
             const signedPsbts = yield this.signTransactions(signMultipleTransactionPayload);
             return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
         });

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

@@ -2,6 +2,7 @@ import { BitcoinNetworkType, SignMultipleTransactionsPayload, SignTransactionRes
 import { BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinWalletConnector, BitcoinWalletConnectorOpts } from '../BitcoinWalletConnector';
 export declare abstract class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
+    isLegacy: boolean;
     currentNetwork: BitcoinNetworkType;
     constructor(opts: BitcoinWalletConnectorOpts);
     private getGenericUserCancelledError;

package/src/connectors/BitcoinSatsConnectConnector/BitcoinSatsConnectConnector.js

@@ -8,10 +8,12 @@ import { logger } 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';
 
 class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     constructor(opts) {
         super(opts);
+        this.isLegacy = false;
         this.currentNetwork = BitcoinNetworkType.Mainnet;
     }
     getGenericUserCancelledError() {
@@ -122,13 +124,24 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     signTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { allowedSignHash, psbtBase64, broadcast, inputsToSign } = params;
+            const signPbstPayload = {
+                allowedSignHash,
+                broadcast,
+                psbt: psbtBase64,
+                // we have to combine signing indexes for like addresses
+                signInputs: inputsToSign.reduce((accum, curr) => {
+                    if (!accum[curr.address]) {
+                        accum[curr.address] = [];
+                    }
+                    accum[curr.address].push(...curr.signingIndexes);
+                    return accum;
+                }, {}),
+            };
+            logger.logVerboseTroubleshootingMessage('[BitcoinSatsConnectConnector] signTransaction', {
+                signPbstPayload,
+            });
             try {
-                const response = yield request('signPsbt', {
-                    allowedSignHash,
-                    broadcast,
-                    psbt: psbtBase64,
-                    signInputs: Object.fromEntries(inputsToSign.map((input) => [input.address, input.signingIndexes])),
-                });
+                const response = yield request('signPsbt', signPbstPayload);
                 if (response.status !== 'success') {
                     throw response.error;
                 }
@@ -143,8 +156,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
     signTransactions(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
             const { message, psbts, network } = transactions;
+            logger.logVerboseTroubleshootingMessage('[BitcoinSatsConnectConnector] signTransactions', {
+                transactions,
+            });
             return new Promise((resolve, reject) => {
                 signMultipleTransactions({
+                    getProvider: () => __awaiter(this, void 0, void 0, function* () {
+                        var _a, _b;
+                        return (_b = (_a = this.wallet) === null || _a === void 0 ? void 0 : _a.features[SATSCONNECT_FEATURE]) === null || _b === void 0 ? void 0 : _b.provider;
+                    }),
                     onCancel: () => {
                         const error = this.getGenericUserCancelledError();
                         reject(error);
@@ -170,9 +190,15 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
             const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64, {
                 network,
             });
+            logger.logVerboseTroubleshootingMessage('signPsbt', {
+                isLegacy: this.isLegacy,
+                psbtFromBase64,
+                request,
+            });
             const signedPsbt = yield this.signTransaction({
+                allowedSignHash: request.allowedSighash[0],
                 broadcast: false,
-                inputsToSign: createSignPsbtOptionsForSatsConnect(psbtFromBase64, request),
+                inputsToSign: createSignPsbtOptionsForSatsConnect(psbtFromBase64, request, this.isLegacy),
                 psbtBase64: request.unsignedPsbtBase64,
             });
             if (!signedPsbt) {
@@ -196,12 +222,13 @@ class BitcoinSatsConnectConnector extends BitcoinWalletConnector {
                 const psbtFromBase64 = Psbt.fromBase64(request.unsignedPsbtBase64, {
                     network,
                 });
-                const inputsToSign = createSignPsbtOptionsForSatsConnect(psbtFromBase64, request);
+                const inputsToSign = createSignPsbtOptionsForSatsConnect(psbtFromBase64, request, this.isLegacy);
                 signMultipleTransactionPayload.psbts.push({
                     inputsToSign,
                     psbtBase64: request.unsignedPsbtBase64,
                 });
             }
+            logger.logVerboseTroubleshootingMessage('signPsbts', signMultipleTransactionPayload);
             const signedPsbts = yield this.signTransactions(signMultipleTransactionPayload);
             return (_a = signedPsbts === null || signedPsbts === void 0 ? void 0 : signedPsbts.map((signedPsbts) => signedPsbts.psbtBase64)) !== null && _a !== void 0 ? _a : [];
         });

package/src/connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.cjs

@@ -16,6 +16,10 @@ var BitcoinSatsConnectConnector = require('../BitcoinSatsConnectConnector/Bitcoi
 var supportsSatsConnect = require('../../utils/supportsSatsConnect.cjs');
 
 class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector.BitcoinSatsConnectConnector {
+    constructor() {
+        super(...arguments);
+        this.isLegacy = true;
+    }
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;

package/src/connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.d.ts

@@ -2,6 +2,7 @@ import { SignMultipleTransactionsPayload, SignTransactionResponse } from 'sats-c
 import { BitcoinTransaction, SatsConnectSignTransactionInput } from '../../types';
 import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector';
 export declare abstract class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
+    isLegacy: boolean;
     getAddress(): Promise<string | undefined>;
     signMessage(messageToSign: string, withAddress: string): Promise<string | undefined>;
     sendBitcoin(transaction: BitcoinTransaction): Promise<string | undefined>;

package/src/connectors/BitcoinSatsConnectLegacyConnector/BitcoinSatsConnectLegacyConnector.js

@@ -12,6 +12,10 @@ import { BitcoinSatsConnectConnector } from '../BitcoinSatsConnectConnector/Bitc
 import { supportsSatsConnect } from '../../utils/supportsSatsConnect.js';
 
 class BitcoinSatsConnectLegacyConnector extends BitcoinSatsConnectConnector {
+    constructor() {
+        super(...arguments);
+        this.isLegacy = true;
+    }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/src/connectors/BitcoinWalletConnector.cjs

@@ -129,7 +129,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 connectedAccount = yield this.getAddressPromise;
             }
             catch (error) {
-                walletConnectorCore.logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
+                walletConnectorCore.logger.error(`${this.key} getConnectedAccounts - error fetching connected account`, error);
                 //don't throw error just return empty array after clearing the promise
             }
             this.getAddressPromise = undefined;

package/src/connectors/BitcoinWalletConnector.js

@@ -125,7 +125,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
                 connectedAccount = yield this.getAddressPromise;
             }
             catch (error) {
-                logger.error(`${this.key} getConnectedAccounts - error fetching connected account`);
+                logger.error(`${this.key} getConnectedAccounts - error fetching connected account`, error);
                 //don't throw error just return empty array after clearing the promise
             }
             this.getAddressPromise = undefined;

package/src/utils/psbt/createSignPsbtOptions.cjs

@@ -3,6 +3,7 @@
 
 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');
@@ -32,19 +33,23 @@ const createPsbtOptions = (psbt, request) => {
     }
     return psbtSignOptions;
 };
-const createSignPsbtOptionsForSatsConnect = (psbtFromBase64, request) => {
+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: getSigHashType.getSigHashType(psbtFromBase64.data.inputs[inputIndex]),
+            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;
 };
 

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

@@ -2,4 +2,4 @@ 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) => InputToSign[];
+export declare const createSignPsbtOptionsForSatsConnect: (psbtFromBase64: Psbt, request: BitcoinSignPsbtRequest, isLegacyConnector?: boolean) => InputToSign[];

package/src/utils/psbt/createSignPsbtOptions.js

@@ -1,4 +1,5 @@
 'use client'
+import { logger } from '@dynamic-labs/wallet-connector-core';
 import { validatePsbt } from './validator/validatePsbt.js';
 import { getSigHashType } from './getSigHashType.js';
 import 'bitcoinjs-lib';
@@ -28,19 +29,23 @@ const createPsbtOptions = (psbt, request) => {
     }
     return psbtSignOptions;
 };
-const createSignPsbtOptionsForSatsConnect = (psbtFromBase64, request) => {
+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: getSigHashType(psbtFromBase64.data.inputs[inputIndex]),
+            sigHash: isLegacyConnector
+                ? getSigHashType(psbtFromBase64.data.inputs[inputIndex])
+                : request.allowedSighash[0],
             signingIndexes: [inputIndex],
         }));
     })) !== null && _c !== void 0 ? _c : []).flat();
+    logger.logVerboseTroubleshootingMessage('createSignPsbtOptionsForSatsConnect', { inputsToSign });
     return inputsToSign;
 };