@dynamic-labs/bitcoin 2.1.0-alpha.27 → 2.1.0-alpha.28

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+## [2.1.0-alpha.28](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.27...v2.1.0-alpha.28) (2024-05-29)
+
+
+### Features
+
+* adds solana standard wallet connector ([#5752](https://github.com/dynamic-labs/DynamicAuth/issues/5752)) ([0040940](https://github.com/dynamic-labs/DynamicAuth/commit/0040940fd1adb37ab3106bb0e4dfe79403bc41f2))
+
+
+### Bug Fixes
+
+* farcaster fetch url fix ([#5767](https://github.com/dynamic-labs/DynamicAuth/issues/5767)) ([1408ba9](https://github.com/dynamic-labs/DynamicAuth/commit/1408ba92680363b9db7820a63d5e3d15dc26ad22))
+
 ## [2.1.0-alpha.27](https://github.com/dynamic-labs/DynamicAuth/compare/v2.1.0-alpha.26...v2.1.0-alpha.27) (2024-05-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/bitcoin",
-  "version": "2.1.0-alpha.27",
+  "version": "2.1.0-alpha.28",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -32,9 +32,9 @@
     "@wallet-standard/base": "1.0.1",
     "bitcoinjs-lib": "6.1.5",
     "sats-connect": "2.0.0",
-    "@dynamic-labs/utils": "2.1.0-alpha.27",
-    "@dynamic-labs/wallet-book": "2.1.0-alpha.27",
-    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.27",
+    "@dynamic-labs/utils": "2.1.0-alpha.28",
+    "@dynamic-labs/wallet-book": "2.1.0-alpha.28",
+    "@dynamic-labs/wallet-connector-core": "2.1.0-alpha.28",
     "stream": "0.0.2"
   },
   "peerDependencies": {}

package/src/bitcoinProviderHelper.cjs

@@ -51,6 +51,15 @@ class BitcoinProviderHelper {
     findWallet() {
         return this.bitcoinWalletStandardLookup();
     }
+    getWalletMethods(wallet) {
+        var _a, _b, _c, _d;
+        return {
+            connect: (_a = wallet.features['bitcoin:connect']) === null || _a === void 0 ? void 0 : _a.connect,
+            signAndSendTransaction: (_b = wallet.features['bitcoin:signAndSendTransaction']) === null || _b === void 0 ? void 0 : _b.signAndSendTransaction,
+            signMessage: (_c = wallet.features['bitcoin:signMessage']) === null || _c === void 0 ? void 0 : _c.signMessage,
+            signTransaction: (_d = wallet.features['bitcoin:signTransaction']) === null || _d === void 0 ? void 0 : _d.signTransaction,
+        };
+    }
 }
 
 exports.BitcoinProviderHelper = BitcoinProviderHelper;

package/src/bitcoinProviderHelper.d.ts

@@ -1,5 +1,6 @@
 import type { Wallet } from '@wallet-standard/base';
 import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { BitcoinWalletStandardMethods } from './types';
 export declare class BitcoinProviderHelper {
     private walletData;
     constructor(walletData: WalletSchema);
@@ -20,4 +21,5 @@ export declare class BitcoinProviderHelper {
     hasAllRequiredFeatures(wallet: Wallet): boolean;
     bitcoinWalletStandardLookup(): Wallet | undefined;
     findWallet(): Wallet | undefined;
+    getWalletMethods(wallet: Wallet): BitcoinWalletStandardMethods;
 }

package/src/bitcoinProviderHelper.js

@@ -47,6 +47,15 @@ class BitcoinProviderHelper {
     findWallet() {
         return this.bitcoinWalletStandardLookup();
     }
+    getWalletMethods(wallet) {
+        var _a, _b, _c, _d;
+        return {
+            connect: (_a = wallet.features['bitcoin:connect']) === null || _a === void 0 ? void 0 : _a.connect,
+            signAndSendTransaction: (_b = wallet.features['bitcoin:signAndSendTransaction']) === null || _b === void 0 ? void 0 : _b.signAndSendTransaction,
+            signMessage: (_c = wallet.features['bitcoin:signMessage']) === null || _c === void 0 ? void 0 : _c.signMessage,
+            signTransaction: (_d = wallet.features['bitcoin:signTransaction']) === null || _d === void 0 ? void 0 : _d.signTransaction,
+        };
+    }
 }
 
 export { BitcoinProviderHelper };

package/src/connectors/BitcoinWalletConnector.cjs

@@ -28,6 +28,9 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
         this.bitcoinProviderHelper = new bitcoinProviderHelper.BitcoinProviderHelper(opts.walletData || walletBook.getWalletBookWallet(this.walletBook, this.key));
         this.wallet = this.bitcoinProviderHelper.findWallet();
+        if (this.wallet) {
+            this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
+        }
         this.cache = new BitcoinLocalStorageCache.BitcoinLocalStorageCache(this.overrideKey);
     }
     canConnectWithHardwareWallet() {
@@ -206,7 +209,23 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             return;
         }
         const { handleAccountChange, handleChainChange, handleDisconnect } = walletConnectorCore.eventListenerHandlers(this);
-        provider.on('accountsChanged', handleAccountChange);
+        const handleBitcoinAccountChange = (accounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
+            let connectedAccounts = accounts;
+            // if accounts is an array of objects, we need to parse them to return only addresses
+            // since ordinals is the main address we use, we should return it as the first address
+            if (typeof accounts[0] === 'object') {
+                connectedAccounts = accounts
+                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .map((account) => account.address);
+            }
+            const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
+            // don't do anything if the connected accounts haven't changed
+            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+                return;
+            }
+            handleAccountChange(connectedAccounts);
+        });
+        provider.on('accountsChanged', handleBitcoinAccountChange);
         provider.on('networkChanged', handleChainChange);
         provider.on('disconnect', handleDisconnect);
         const tearDownEventListeners = () => {
@@ -214,7 +233,7 @@ class BitcoinWalletConnector extends walletConnectorCore.WalletConnectorBase {
             if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
                 return;
             }
-            provider.removeListener('accountsChanged', handleAccountChange);
+            provider.removeListener('accountsChanged', handleBitcoinAccountChange);
             provider.removeListener('networkChanged', handleChainChange);
             provider.removeListener('disconnect', handleDisconnect);
         };

package/src/connectors/BitcoinWalletConnector.d.ts

@@ -6,7 +6,7 @@ import { Chain, IBitcoinWalletConnector, WalletConnectorBase } from '@dynamic-la
 import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
 import { JwtVerifiedCredential, WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
 import { IBitcoinSessionCache } from '../BitcoinLocalStorageCache';
-import { BitcoinAddress, BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse } from '../types';
+import { BitcoinAddress, BitcoinTransaction, BitcoinSignPsbtRequest, BitcoinSignPsbtResponse, BitcoinWalletStandardMethods } from '../types';
 export type BitcoinWalletConnectorOpts = {
     walletBook: WalletBookSchema;
     walletData: WalletSchema;
@@ -19,6 +19,7 @@ export declare abstract class BitcoinWalletConnector extends WalletConnectorBase
     private getAddressPromise;
     private bitcoinProviderHelper;
     wallet: Wallet | undefined;
+    walletMethods: BitcoinWalletStandardMethods | undefined;
     canFetchConnectedAccounts: boolean;
     isHardwareWalletEnabled: boolean;
     verifiedCredentials: JwtVerifiedCredential[];

package/src/connectors/BitcoinWalletConnector.js

@@ -24,6 +24,9 @@ class BitcoinWalletConnector extends WalletConnectorBase {
         this.overrideKey = (_a = opts.overrideKey) !== null && _a !== void 0 ? _a : this.key;
         this.bitcoinProviderHelper = new BitcoinProviderHelper(opts.walletData || getWalletBookWallet(this.walletBook, this.key));
         this.wallet = this.bitcoinProviderHelper.findWallet();
+        if (this.wallet) {
+            this.walletMethods = this.bitcoinProviderHelper.getWalletMethods(this.wallet);
+        }
         this.cache = new BitcoinLocalStorageCache(this.overrideKey);
     }
     canConnectWithHardwareWallet() {
@@ -202,7 +205,23 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             return;
         }
         const { handleAccountChange, handleChainChange, handleDisconnect } = eventListenerHandlers(this);
-        provider.on('accountsChanged', handleAccountChange);
+        const handleBitcoinAccountChange = (accounts) => __awaiter(this, void 0, void 0, function* () {
+            let connectedAccounts = accounts;
+            // if accounts is an array of objects, we need to parse them to return only addresses
+            // since ordinals is the main address we use, we should return it as the first address
+            if (typeof accounts[0] === 'object') {
+                connectedAccounts = accounts
+                    .sort((account) => (account.purpose === 'ordinals' ? -1 : 1))
+                    .map((account) => account.address);
+            }
+            const currentConnectedAccounts = yield this.getConnectedAccountsFromCache();
+            // don't do anything if the connected accounts haven't changed
+            if (currentConnectedAccounts[0] === connectedAccounts[0]) {
+                return;
+            }
+            handleAccountChange(connectedAccounts);
+        });
+        provider.on('accountsChanged', handleBitcoinAccountChange);
         provider.on('networkChanged', handleChainChange);
         provider.on('disconnect', handleDisconnect);
         const tearDownEventListeners = () => {
@@ -210,7 +229,7 @@ class BitcoinWalletConnector extends WalletConnectorBase {
             if (!(provider === null || provider === void 0 ? void 0 : provider.removeListener)) {
                 return;
             }
-            provider.removeListener('accountsChanged', handleAccountChange);
+            provider.removeListener('accountsChanged', handleBitcoinAccountChange);
             provider.removeListener('networkChanged', handleChainChange);
             provider.removeListener('disconnect', handleDisconnect);
         };

package/src/types.d.ts

@@ -1,5 +1,6 @@
-import { BitcoinProvider, InputToSign } from 'sats-connect';
+import { BitcoinProvider, InputToSign as SatsConnectInputToSign } from 'sats-connect';
 import { SignPsbtResponse as BtcKitSignPsbtResponse } from '@btckit/types';
+import { IdentifierString, WalletAccount } from '@wallet-standard/base';
 import type { WalletAdditionalAddress } from '@dynamic-labs/sdk-api-core';
 import { SATSCONNECT_FEATURE } from './const';
 export type ErrorWithCode = Error & {
@@ -44,7 +45,7 @@ export type BitcoinSignPsbtRequestSignature = {
 export type SatsConnectSignTransactionInput = {
     message?: string;
     psbtBase64: string;
-    inputsToSign: InputToSign[];
+    inputsToSign: SatsConnectInputToSign[];
     broadcast?: boolean;
 };
 export type BtcKitSignPsbtResponseExtended = BtcKitSignPsbtResponse & {
@@ -55,3 +56,68 @@ export type BtcKitSignPsbtResponseExtended = BtcKitSignPsbtResponse & {
 export type BitcoinSignPsbtResponse = {
     signedPsbt: string;
 };
+export type BitcoinAddressPurpose = 'ordinals' | 'payment';
+export interface BitcoinConnectInput {
+    purposes: BitcoinAddressPurpose[];
+}
+export interface BitcoinConnectOutput {
+    /**
+     * The accounts will have addresses that correspond with the `purposes` in the {@link BitcoinConnectInput}, and will
+     * be returned in the same order.
+     */
+    accounts: WalletAccount[];
+}
+export type BitcoinConnectMethod = (input?: BitcoinConnectInput) => Promise<BitcoinConnectOutput>;
+export type BitcoinSignMessageMethod = (...inputs: BitcoinSignMessageInput[]) => Promise<BitcoinSignMessageOutput[]>;
+export interface BitcoinSignMessageInput {
+    /** Account to use. */
+    account: WalletAccount;
+    /** Message to sign, as raw bytes. */
+    message: Uint8Array;
+}
+export interface BitcoinSignMessageOutput {
+    /**
+     * Message bytes that were signed.
+     * The wallet may prefix or otherwise modify the message before signing it.
+     */
+    signedMessage: Uint8Array;
+    /** Message signature produced. */
+    signature: Uint8Array;
+}
+export type BitcoinSignTransactionMethod = (...inputs: BitcoinSignTransactionInput[]) => Promise<BitcoinSignTransactionOutput[]>;
+export interface BitcoinSignTransactionInput {
+    /** Partially Signed Bitcoin Transaction (PSBT), as raw bytes. */
+    psbt: Uint8Array;
+    /** Transaction inputs to sign. */
+    inputsToSign: InputToSign[];
+    /** Chain to use. */
+    chain?: IdentifierString;
+}
+export interface InputToSign {
+    /** Account to use. */
+    account: WalletAccount;
+    /** List of input indexes that should be signed by the account. */
+    signingIndexes: number[];
+    /** A SIGHASH flag. */
+    sigHash?: BitcoinSigHashFlag;
+}
+export interface BitcoinSignTransactionOutput {
+    /** Signed Partially Signed Bitcoin Transaction (PSBT), as raw bytes. */
+    signedPsbt: Uint8Array;
+}
+/** SIGHASH flag. */
+export type BitcoinSigHashFlag = 'ALL' | 'NONE' | 'SINGLE' | 'ALL|ANYONECANPAY' | 'NONE|ANYONECANPAY' | 'SINGLE|ANYONECANPAY';
+export type BitcoinSignAndSendTransactionMethod = (...inputs: BitcoinSignAndSendTransactionInput[]) => Promise<BitcoinSignAndSendTransactionOutput[]>;
+export interface BitcoinSignAndSendTransactionInput extends BitcoinSignTransactionInput {
+    chain: IdentifierString;
+}
+export interface BitcoinSignAndSendTransactionOutput {
+    /** Transaction ID (transaction hash). */
+    txId: string;
+}
+export type BitcoinWalletStandardMethods = {
+    connect?: BitcoinConnectMethod;
+    signMessage?: BitcoinSignMessageMethod;
+    signTransaction?: BitcoinSignTransactionMethod;
+    signAndSendTransaction?: BitcoinSignAndSendTransactionMethod;
+};