@openocean.finance/widget 1.0.44 → 1.0.45

package/src/services/ExecuteRoute.ts

@@ -14,6 +14,7 @@ import { useSettingsStore } from '../stores/settings/useSettingsStore.js'
 import { sendAndConfirmSolanaTransaction } from './SendAndConfirmSolanaTransaction.js'
 import { adaptBitcoinWallet } from '@relayprotocol/relay-bitcoin-wallet-adapter'
 import * as bitcoin from 'bitcoinjs-lib';
+
 type DynamicSignPsbtParams = {
   allowedSighash: number[];
   unsignedPsbtBase64: string;
@@ -528,7 +529,7 @@ async function executeEvmSwap(
     ) {
       let allowance = 0n
       try {
-        allowance = (await publicClient.readContract({
+        allowance = (await (publicClient as any).readContract({
           address: step.action.fromToken.address as `0x${string}`,
           abi: [
             {
@@ -702,44 +703,6 @@ async function executeEvmSwap(
     throw error
   }
 }
-function detectBtcWallet() {
-  const anyWindow = typeof window !== 'undefined' ? (window as any) : undefined
-  if (anyWindow.okxwallet?.bitcoin && anyWindow.okxwallet?.bitcoin?.signPsbt) return 'okx';
-  if (anyWindow.unisat && anyWindow.unisat?.signPsbt) return 'unisat';
-  if (anyWindow.BitcoinProvider && anyWindow.BitcoinProvider.request) return 'xverse';
-  return null;
-}
-
-// Get wallet type from connected account
-function getConnectedBtcWallet(account: Account): string | null {
-  if (!account.connector) return null;
-
-  const connectorId = (account.connector as any).id?.toLowerCase() || '';
-  const connectorName = (account.connector as any).name?.toLowerCase() || '';
-
-  // Match by connector ID or name
-  if (connectorId.includes('okx') || connectorId.includes('com.okex.wallet')) {
-    return 'okx';
-  }
-  if (connectorId.includes('unisat')) {
-    return 'unisat';
-  }
-  if (connectorId.includes('xverse') || connectorId.includes('XverseProviders')) {
-    return 'xverse';
-  }
-  if (connectorId.includes('phantom') || connectorName.includes('phantom')) {
-    return 'phantom';
-  }
-  if (connectorId.includes('leather') || connectorName.includes('leather')) {
-    return 'leather';
-  }
-  if (connectorId.includes('onekey') || connectorName.includes('onekey')) {
-    return 'onekey';
-  }
-
-  // Fallback to detection if connector doesn't match
-  return detectBtcWallet();
-}
 
 const createPsbtOptions = (_: any, request: any) => {
   var _a;
@@ -785,6 +748,110 @@ function extractSignedPsbt(response: any): string | null {
   return response.signedPsbtHex || response.signedPsbtBase64 || response.signedPsbt || null;
 }
 
+
+// BTC 主网
+const network = bitcoin.networks.bitcoin;
+
+export async function sendBTCWithPhantom(sender: string, recipient: string, amount: number) {
+  const phantom = (window as any).phantom?.bitcoin;
+  if (!phantom) throw new Error("Phantom Bitcoin provider not found");
+  // 1. 获取 UTXO（这里使用 mempool.space API，你也可以换自己的）
+  const utxos = await fetch(
+    `https://mempool.space/api/address/${sender}/utxo`
+  ).then((r) => r.json());
+
+  if (!utxos.length) throw new Error("No UTXO available");
+
+  // ====== 费用参数 ======
+  // amount / fee 单位都按 satoshi 处理，调用方需要保证一致
+  const fee = 5000; // 手续费（可以根据当前网络费率动态调整）
+  const required = BigInt(amount + fee);
+
+  // 2. 简单的累加选币：从小到大选 UTXO，直到覆盖 amount + fee
+  const sortedUtxos = [...utxos].sort(
+    (a: any, b: any) => Number(a.value) - Number(b.value)
+  );
+
+  const selectedUtxos: any[] = [];
+  let totalInput = 0n;
+
+  for (const utxo of sortedUtxos) {
+    selectedUtxos.push(utxo);
+    totalInput += BigInt(utxo.value);
+    if (totalInput >= required) break;
+  }
+
+  if (totalInput < required) {
+    throw new Error("Insufficient balance: UTXOs do not cover amount + fee");
+  }
+
+  const changeValue = totalInput - required;
+
+  // 可选：避免输出过小（dust），这里简单判断 >0 即可，如需更严格可改成 > 546
+  if (changeValue <= 0n) {
+    throw new Error("UTXOs too small to cover amount and fee with change");
+  }
+
+  // 3. 构造 PSBT（多输入）
+  const psbt = new bitcoin.Psbt({ network });
+
+  selectedUtxos.forEach((utxo) => {
+    psbt.addInput({
+      hash: utxo.txid,
+      index: utxo.vout,
+      witnessUtxo: {
+        // bitcoinjs-lib 期望 bigint，这里将 mempool 返回的 number 转成 bigint
+        value: BigInt(utxo.value),
+        script: bitcoin.address.toOutputScript(sender, network),
+      },
+    });
+  });
+
+  // 目标地址 output
+  psbt.addOutput({
+    address: recipient,
+    value: BigInt(amount),
+  });
+
+  // 找零 output
+  psbt.addOutput({
+    address: sender,
+    value: changeValue,
+  });
+
+  // 4. 调用 Phantom.signPSBT
+  const psbtBase64 = psbt.toBase64();
+
+  const signOptions = {
+    autoFinalized: false,
+    toSignInputs: selectedUtxos.map((_, index) => ({
+      address: sender,
+      index,
+      // SIGHASH_ALL (0x01) 通常足够，如有需要可根据业务调整
+      sighashTypes: [0, 1], // 保持和原来一致
+    })),
+  };
+
+  const signed = await phantom.signPSBT(psbtBase64, signOptions);
+
+  // Phantom 返回 Base64
+  const signedPsbt = bitcoin.Psbt.fromBase64(signed);
+
+  // 5. Finalize + 提取原始交易
+  signedPsbt.finalizeAllInputs();
+  const rawTx = signedPsbt.extractTransaction().toHex();
+
+  // 6. 广播 Raw TX
+  const txid = await fetch("https://mempool.space/api/tx", {
+    method: "POST",
+    body: rawTx,
+  }).then((r) => r.text());
+
+  console.log("Broadcasted TXID:", txid);
+  return txid;
+}
+
+
 async function executeBitcoinSwap(
   step: ExtendedOpenOceanStep,
   options: ExecuteRouteOptions,
@@ -794,16 +861,15 @@ async function executeBitcoinSwap(
   try {
 
     const { quoteData } = step || {}
-
     const adaptedWallet: any = adaptBitcoinWallet(
       options.account.address?.toString() || '',
       async (_: any, __: any, dynamicParams: DynamicSignPsbtParams) => {
         const psbtFromBase64 = bitcoin.Psbt.fromBase64(dynamicParams.unsignedPsbtBase64);
         const psbtHex = psbtFromBase64.toHex();
-        const walletType = detectBtcWallet();
+        const connector = options.account.connector;
         const anyWindow = typeof window !== 'undefined' ? (window as any) : undefined
-        switch (walletType) {
-          case 'okx': {
+        switch (connector?.name) {
+          case 'OKX Wallet': {
             const response = await anyWindow.okxwallet?.bitcoin?.signPsbt(
               psbtHex,
               createPsbtOptions(psbtFromBase64, dynamicParams)
@@ -815,7 +881,7 @@ async function executeBitcoinSwap(
             return convertHexToBase64(signedPsbt);
           }
 
-          case 'unisat': {
+          case 'Unisat': {
             const response = await anyWindow.unisat?.signPsbt(
               psbtHex,
               createPsbtOptions(psbtFromBase64, dynamicParams)
@@ -827,7 +893,7 @@ async function executeBitcoinSwap(
             return convertHexToBase64(signedPsbt);
           }
 
-          case 'xverse': {
+          case 'Xverse': {
             const response = await anyWindow.BitcoinProvider?.request('signPsbt', {
               psbt: psbtHex,
               finalize: true,
@@ -839,19 +905,55 @@ async function executeBitcoinSwap(
             return convertHexToBase64(signedPsbt);
           }
 
+          case 'Phantom': {
+            const phantom = anyWindow.phantom?.bitcoin;
+            if (!phantom?.signPSBT) throw new Error('Phantom wallet does not support signPSBT');
+
+            const inputsToSign = [];
+            console.log("Phantom options = ", JSON.stringify(createPsbtOptions(psbtFromBase64, dynamicParams)));
+            console.log("psbtHex = ", psbtHex);
+            console.log("psbtBase64 = ", psbtFromBase64.toBase64());
+
+            debugger
+            for (const sig of dynamicParams.signature || []) {
+              for (const index of sig.signingIndexes || []) {
+                inputsToSign.push({
+                  index,
+                  address: sig.address,
+                  sighashTypes: dynamicParams.allowedSighash,
+                });
+              }
+            }
+            debugger
+
+            const response = await phantom.signPSBT(
+              psbtFromBase64.toBase64(),   // ✅ Phantom only accepts base64
+              {
+                autoFinalize: false,              // ✅ correct name
+                inputsToSign,                     // ✅ correct name
+              }
+            );
+
+            const signedPsbt = extractSignedPsbt(response);
+            if (!signedPsbt) throw new Error('Missing psbt response from Phantom wallet');
+
+            return signedPsbt; // already base64
+          }
+
+
           default:
-            throw new Error(`Unsupported wallet: ${walletType}`);
+            throw new Error(`Unsupported wallet: ${connector.name}`);
         }
       }
     );
     adaptedWallet.sendTransaction = async (params: { recipient: string; amount: string | number }) => {
-      const walletType = detectBtcWallet();
+      const connector = options.account.connector;
       const anyWindow = typeof window !== 'undefined' ? (window as any) : undefined
 
       // Convert amount to satoshis (BTC amount * 100000000)
       const amountInSatoshis = Number(params.amount)
-      switch (walletType) {
-        case 'okx': {
+      switch (connector?.name) {
+        case 'OKX Wallet': {
           // OKX wallet sendBitcoin method
           if (anyWindow.okxwallet?.bitcoin?.sendBitcoin) {
             const txid = await anyWindow.okxwallet.bitcoin.sendBitcoin(
@@ -863,7 +965,7 @@ async function executeBitcoinSwap(
           throw new Error('OKX wallet does not support sendBitcoin');
         }
 
-        case 'unisat': {
+        case 'Unisat': {
           // Unisat wallet sendBitcoin method
           if (anyWindow.unisat?.sendBitcoin) {
             const txid = await anyWindow.unisat.sendBitcoin(
@@ -875,7 +977,7 @@ async function executeBitcoinSwap(
           throw new Error('Unisat wallet does not support sendBitcoin');
         }
 
-        case 'xverse': {
+        case 'Xverse': {
           // Xverse wallet sendBitcoin method
           if (anyWindow.BitcoinProvider?.request) {
             const response = await anyWindow.BitcoinProvider.request('sendBitcoin', {
@@ -887,8 +989,18 @@ async function executeBitcoinSwap(
           throw new Error('Xverse wallet does not support sendBitcoin');
         }
 
+        case 'Phantom': {
+          // Phantom wallet sendBitcoin method
+          const txid = await sendBTCWithPhantom(
+            options.account.address?.toString() || '',
+            params.recipient,
+            amountInSatoshis
+          );
+          return txid;
+        }
+
         default:
-          throw new Error(`Unsupported wallet: ${walletType}`);
+          throw new Error(`Unsupported wallet: ${connector?.name}`);
       }
     }
 
@@ -916,6 +1028,7 @@ async function executeBitcoinSwap(
 
   } catch (error) {
     console.error('Bitcoin swap execution failed:', error)
+    debugger
     process.status = 'FAILED'
     process.error =
       error instanceof Error || (error && (error as any)?.message)
@@ -979,8 +1092,6 @@ async function executeSwap(
         await executeSolanaSwap(currentStep, options, process, updatedRoute)
       } else if (currentStep.action?.fromChainId === 20000000000001) {
         await executeBitcoinSwap(currentStep, options, process, updatedRoute)
-      } else if (currentStep.action?.fromChainId === 20000000000001) {
-        await executeBitcoinSwap(currentStep, options, process, updatedRoute)
       } else {
         await executeEvmSwap(currentStep, options, process, updatedRoute)
       }

package/src/types/widget.ts

@@ -37,6 +37,7 @@ import type { DefaultFieldValues } from '../stores/form/types.js'
 export type WidgetVariant = 'compact' | 'wide' | 'drawer'
 export type WidgetSubvariant =
   | 'default'
+  | 'swap'
   | 'bridge'
   | 'split'
   | 'custom'
@@ -276,7 +277,7 @@ export interface WidgetConfig {
   languages?: WidgetLanguages
   languageResources?: LanguageResources
   explorerUrls?: Record<number, string[]> &
-    Partial<Record<'internal', string[]>>
+  Partial<Record<'internal', string[]>>
   poweredBy?: PoweredByType
   isDefaultValueEnabled?: boolean
   /**