@coin-voyage/crypto 2.2.3 → 2.3.0

package/dist/utxo/create-default-utxo-config.d.ts

@@ -1,5 +1,5 @@
 import { type Config, CreateConnectorFn } from "@bigmi/client";
-import { HttpTransportConfig } from "@bigmi/core";
+import { type HttpTransportConfig } from "@bigmi/core";
 /**
  * UTXO Configuration for Wallets and Connectors
  * Includes options for Bigmi-specific configurations

package/dist/utxo/create-default-utxo-config.js

@@ -1,6 +1,6 @@
 import { createConfig, leather, magicEden, okx, onekey, phantom, unisat, xverse, } from "@bigmi/client";
-import { bitcoin, createClient, http } from "@bigmi/core";
-import { ALCHEMY_KEY } from "../evm/utils";
+import { bitcoin, createClient } from "@bigmi/core";
+import { createUTXOTransport } from "./create-utxo-transport";
 export function createDefaultBigmiConfig(props = {
     additionalConfigOptions: { multiInjectedProviderDiscovery: false },
 }) {
@@ -19,11 +19,10 @@ export function createDefaultBigmiConfig(props = {
         connectors,
         client({ chain }) {
             const chainRpcConfig = props?.rpcConfig;
-            let config = [http(), http(`https://bitcoin-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`)];
-            if (chainRpcConfig) {
-                config = [http(chainRpcConfig.url, chainRpcConfig.config), http()];
-            }
-            return createClient({ chain, transport: config[0] });
+            return createClient({
+                chain,
+                transport: createUTXOTransport(chainRpcConfig),
+            });
         },
         ...props?.additionalConfigOptions,
     });

package/dist/utxo/create-psbt-tx.js

@@ -40,7 +40,9 @@ export async function createPsbtTx(client, fromAddress, toAddress, amountSats) {
             txid: utxo.txId,
             index: utxo.vout,
             sequence: 0xfffffffd, // RBF
-            ...(addressType === AddressType.p2wpkh || addressType === AddressType.p2wsh
+            ...(addressType === AddressType.p2wpkh ||
+                addressType === AddressType.p2wsh ||
+                addressType === AddressType.p2tr
                 ? {
                     witnessUtxo: {
                         script: scripts.script,

package/dist/utxo/create-utxo-transport.d.ts

@@ -0,0 +1,6 @@
+import { type HttpTransportConfig } from "@bigmi/core";
+export interface UTXORpcConfig {
+    url?: string | undefined;
+    config?: HttpTransportConfig;
+}
+export declare function createUTXOTransport(rpcConfig?: UTXORpcConfig): import("@bigmi/core").FallbackTransport<readonly [import("@bigmi/core").HttpTransport<undefined, false>, import("@bigmi/core").HttpTransport<import("@bigmi/core").RpcSchema, false>, import("@bigmi/core").HttpTransport<undefined, false>, import("@bigmi/core").HttpTransport<undefined, false>, import("@bigmi/core").HttpTransport<undefined, false>, import("@bigmi/core").HttpTransport<undefined, false>]>;

package/dist/utxo/create-utxo-transport.js

@@ -0,0 +1,10 @@
+import { ankr, blockchair, blockcypher, fallback, http, mempool, } from "@bigmi/core";
+import { ALCHEMY_KEY } from "../evm/utils";
+export function createUTXOTransport(rpcConfig) {
+    const primaryRpc = rpcConfig
+        ? http(rpcConfig.url, rpcConfig.config)
+        : http(`https://bitcoin-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`);
+    return fallback([primaryRpc, http(), blockchair(), blockcypher(), mempool(), ankr({
+            apiKey: "2a2801137db177be9c80522e690ec8b59ffc5260d030b2671b5e3936b917daac"
+        })]);
+}

package/dist/utxo/send-btc.d.ts

@@ -1,4 +1,17 @@
+import { Account } from "@bigmi/core";
 import { UTXOConnectorId } from "../types/utxo-connector-id";
+type PhantomBitcoinProvider = {
+    isPhantom?: boolean;
+    requestAccounts(): Promise<Account[]>;
+    signPSBT(psbt: Uint8Array, options: {
+        inputsToSign: {
+            address: string;
+            signingIndexes: number[];
+            sigHash?: number;
+        }[];
+        finalize?: boolean;
+    }): Promise<Uint8Array>;
+};
 declare global {
     interface Window {
         LeatherProvider?: any;
@@ -8,7 +21,7 @@ declare global {
             bitcoin?: any;
         };
         phantom?: {
-            bitcoin?: any;
+            bitcoin?: PhantomBitcoinProvider;
         };
         xfi?: {
             bitcoin?: any;

package/dist/utxo/send-btc.js

@@ -1,5 +1,6 @@
 import { sendUTXOTransaction } from "@bigmi/core";
 import { ChainId } from "@coin-voyage/shared/types";
+import { hex } from "@scure/base";
 import { Psbt } from "bitcoinjs-lib";
 import { createUnsecuredToken } from "jsontokens";
 import { withTimeout } from "viem";
@@ -139,30 +140,22 @@ async function sendBtcPhantom(recipient) {
     }
     const publicClient = await getUTXOPublicClient(ChainId.BTC);
     const tx = await createPsbtTx(publicClient, paymentAccount, recipient.address, Number(recipient.amount));
-    const payAddress = paymentAccount.address;
-    const inputsToSign = new Map();
-    for (let i = 0; i < tx.inputsLength; i++) {
-        const input = tx.getInput(i);
-        if (inputsToSign.has(payAddress)) {
-            inputsToSign.get(payAddress).signingIndexes.push(input.index);
-        }
-        else {
-            inputsToSign.set(payAddress, {
-                address: payAddress,
-                sigHash: 0,
-                signingIndexes: [input.index],
-            });
-        }
-    }
+    const psbtBytes = tx.toPSBT();
+    const inputsToSign = [
+        {
+            address: paymentAccount.address,
+            signingIndexes: Array.from({ length: tx.inputsLength }, (_, index) => index),
+        },
+    ];
     try {
         // We give users 10 minutes to sign the transaction or it should be considered expired
-        const signedPsbtHex = await withTimeout(() => provider.signPSBT(tx.unsignedTx, {
-            inputsToSign: Array.from(inputsToSign.values()),
+        const signedPsbtBytes = await withTimeout(() => provider.signPSBT(psbtBytes, {
+            inputsToSign,
         }), {
             timeout: 600000,
             errorInstance: new Error("Transaction has expired."),
         });
-        const signedPsbt = Psbt.fromHex(signedPsbtHex).finalizeAllInputs();
+        const signedPsbt = Psbt.fromHex(hex.encode(signedPsbtBytes)).finalizeAllInputs();
         const txHex = signedPsbt.extractTransaction().toHex();
         // const signedTx = btc.Transaction.fromRaw(signedPSBTBytes)
         // signedTx.finalize()

package/dist/utxo/utxo-public-client.d.ts

@@ -1,7 +1,10 @@
-import { type UTXOSchema, Chain, Client, FallbackTransport, HttpTransport, PublicActions, WalletActions } from "@bigmi/core";
+import { type Client, type PublicActions, type UTXOSchema, type WalletActions, bitcoin } from "@bigmi/core";
+import { createUTXOTransport } from "./create-utxo-transport";
+type UTXOPublicClient = Client<ReturnType<typeof createUTXOTransport>, typeof bitcoin, undefined, UTXOSchema, PublicActions & WalletActions>;
 /**
  * Get an instance of a provider for a specific chain
  * @param chainId - Id of the chain the provider is for
  * @returns The public client for the given chain
  */
-export declare const getUTXOPublicClient: (chainId: number) => Promise<Client<FallbackTransport<readonly HttpTransport[]>, Chain, undefined, UTXOSchema, PublicActions & WalletActions>>;
+export declare const getUTXOPublicClient: (chainId: number) => Promise<UTXOPublicClient>;
+export {};

package/dist/utxo/utxo-public-client.js

@@ -1,5 +1,15 @@
-import { ankr, bitcoin, blockchair, blockcypher, createClient, fallback, mempool, publicActions, rpcSchema, walletActions, } from "@bigmi/core";
-// cached providers
+import { bitcoin, createClient, publicActions, rpcSchema, walletActions, } from "@bigmi/core";
+import { createUTXOTransport } from "./create-utxo-transport";
+function createUTXOPublicClient() {
+    return createClient({
+        chain: bitcoin,
+        rpcSchema: rpcSchema(),
+        transport: createUTXOTransport(),
+        pollingInterval: 10000,
+    })
+        .extend(publicActions)
+        .extend(walletActions);
+}
 const publicClients = {};
 /**
  * Get an instance of a provider for a specific chain
@@ -8,15 +18,7 @@ const publicClients = {};
  */
 export const getUTXOPublicClient = async (chainId) => {
     if (!publicClients[chainId]) {
-        const client = createClient({
-            chain: bitcoin,
-            rpcSchema: rpcSchema(),
-            transport: fallback([blockchair(), blockcypher(), mempool(), ankr()]),
-            pollingInterval: 10000,
-        })
-            .extend(publicActions)
-            .extend(walletActions);
-        publicClients[chainId] = client;
+        publicClients[chainId] = createUTXOPublicClient();
     }
     if (!publicClients[chainId]) {
         throw new Error(`Unable to configure provider for chain ${chainId}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -50,7 +50,7 @@
     "@solana/wallet-adapter-walletconnect": "0.1.21",
     "@solana/wallet-adapter-base": "0.9.27",
     "@solana/wallet-adapter-coinbase": "0.1.23",
-    "@coin-voyage/shared": "2.2.5"
+    "@coin-voyage/shared": "2.3.1"
   },
   "devDependencies": {
     "@types/elliptic": "6.4.18"