@shapeshiftoss/swap-widget 0.5.2 → 0.7.0

package/dist/index.js

@@ -3,7 +3,7 @@ import { useAppKitAccount as useAppKitAccount3 } from "@reown/appkit/react";
 import { useCallback as useCallback11, useEffect as useEffect10, useMemo as useMemo12, useRef as useRef7, useState as useState8 } from "react";
 
 // src/api/client.ts
-var DEFAULT_API_BASE_URL = import.meta.env.VITE_SWAP_WIDGET_API_URL ?? "https://api.shapeshift.com";
+var DEFAULT_API_BASE_URL = "https://api.shapeshift.com";
 var createApiClient = (config = {}) => {
   const baseUrl = config.baseUrl ?? DEFAULT_API_BASE_URL;
   const fetchWithConfig = async (endpoint, params, method = "GET", timeoutMs = 3e4) => {
@@ -1330,7 +1330,7 @@ var useStatusPolling = ({
 
 // src/hooks/useSwapApproval.ts
 import { useEffect as useEffect3, useRef as useRef2 } from "react";
-import { createPublicClient as createPublicClient2, encodeFunctionData, erc20Abi as erc20Abi2, http as http2 } from "viem";
+import { createPublicClient as createPublicClient2, http as http2 } from "viem";
 
 // src/constants/chains.ts
 import {
@@ -1443,6 +1443,15 @@ var useSwapApproval = () => {
           });
           return;
         }
+        if (!sellAmountBaseUnit || sellAmountBaseUnit === "0") {
+          actorRef.send({ type: "APPROVAL_ERROR", error: "No sell amount specified" });
+          return;
+        }
+        const approvalTxs = quote.approval.approvalTxs;
+        if (!approvalTxs?.length) {
+          actorRef.send({ type: "APPROVAL_ERROR", error: "No approval transactions in quote" });
+          return;
+        }
         const requiredChainId = getEvmNetworkId(sellAsset.chainId);
         const client = walletClient;
         const currentChainId = await client.getChainId();
@@ -1458,28 +1467,24 @@ var useSwapApproval = () => {
           nativeCurrency,
           rpcUrls: { default: { http: [] } }
         };
-        if (!sellAmountBaseUnit || sellAmountBaseUnit === "0") {
-          actorRef.send({ type: "APPROVAL_ERROR", error: "No sell amount specified" });
-          return;
-        }
-        const approvalData = encodeFunctionData({
-          abi: erc20Abi2,
-          functionName: "approve",
-          args: [quote.approval.spender, BigInt(sellAmountBaseUnit)]
-        });
-        const approvalHash = await client.sendTransaction({
-          to: sellAssetAddress,
-          data: approvalData,
-          value: BigInt(0),
-          chain,
-          account: walletAddress
-        });
         const rpcUrl = chain.rpcUrls?.default?.http?.[0];
         const publicClient = createPublicClient2({
           chain,
           transport: rpcUrl ? http2(rpcUrl) : http2()
         });
-        await publicClient.waitForTransactionReceipt({ hash: approvalHash });
+        let approvalHash;
+        for (const approvalTx of approvalTxs) {
+          approvalHash = await client.sendTransaction({
+            to: approvalTx.to,
+            data: approvalTx.data,
+            value: BigInt(approvalTx.value),
+            chain,
+            account: walletAddress
+          });
+          const receipt = await publicClient.waitForTransactionReceipt({ hash: approvalHash });
+          if (receipt.status !== "success") throw new Error("Approval transaction reverted");
+        }
+        if (!approvalHash) throw new Error("Expected at least one approval transaction");
         actorRef.send({ type: "APPROVAL_SUCCESS", txHash: approvalHash });
       } catch (error) {
         actorRef.send({
@@ -1623,7 +1628,7 @@ import { useQueries, useQueryClient } from "@tanstack/react-query";
 import { getBalance, readContract } from "@wagmi/core";
 import PQueue from "p-queue";
 import { useCallback as useCallback3, useMemo as useMemo4 } from "react";
-import { erc20Abi as erc20Abi3 } from "viem";
+import { erc20Abi as erc20Abi2 } from "viem";
 import { useConfig } from "wagmi";
 var CONCURRENCY_LIMIT = 5;
 var DELAY_BETWEEN_BATCHES_MS = 50;
@@ -1823,7 +1828,7 @@ var useMultiChainBalance = (evmAddress, utxoAddress, solanaAddress, assetId, pre
             if (isErc20 && evmParsed.tokenAddress) {
               const result2 = await readContract(config, {
                 address: evmParsed.tokenAddress,
-                abi: erc20Abi3,
+                abi: erc20Abi2,
                 functionName: "balanceOf",
                 args: [evmAddress],
                 chainId: evmParsed.evmChainId
@@ -1936,7 +1941,7 @@ var useMultiChainBalances = (evmAddress, utxoAddress, solanaAddress, assetIds, a
           if (asset.tokenAddress) {
             const result2 = await readContract(config, {
               address: asset.tokenAddress,
-              abi: erc20Abi3,
+              abi: erc20Abi2,
               functionName: "balanceOf",
               args: [evmAddress],
               // @ts-ignore - swap-widget supports more chains than main app's wagmi type registration
@@ -2459,13 +2464,13 @@ var executeEvm = async (txData, walletClient, walletAddress) => {
     account: getAddress2(walletAddress)
   });
 };
-var executeUtxoDeposit = (txData, bitcoin3) => {
+var executeUtxo = (txData, bitcoin3) => {
   if (!bitcoin3.isConnected || !bitcoin3.address) throw new Error("Bitcoin wallet not connected");
   bitcoin3.reset();
   return bitcoin3.sendTransfer({
-    recipientAddress: txData.depositAddress,
+    recipientAddress: txData.to,
     amount: txData.value,
-    memo: txData.memo
+    memo: txData.opReturnData
   });
 };
 var executeSolana = async (txData, solana3) => {
@@ -2473,7 +2478,13 @@ var executeSolana = async (txData, solana3) => {
     throw new Error("Solana wallet not connected");
   }
   solana3.reset();
-  const { Transaction, PublicKey: PublicKey3, TransactionInstruction } = await import("@solana/web3.js");
+  const {
+    ComputeBudgetProgram,
+    PublicKey: PublicKey3,
+    TransactionInstruction,
+    TransactionMessage,
+    VersionedTransaction
+  } = await import("@solana/web3.js");
   const instructions = txData.instructions.map((ix) => {
     return new TransactionInstruction({
       keys: ix.keys.map((key) => ({
@@ -2485,11 +2496,41 @@ var executeSolana = async (txData, solana3) => {
       data: Buffer.from(ix.data, "base64")
     });
   });
-  const transaction = new Transaction().add(...instructions);
   const conn = solana3.connection;
+  const includeComputeBudget = instructions.some(
+    (ix) => ix.programId.equals(ComputeBudgetProgram.programId)
+  );
+  if (includeComputeBudget) {
+    const recentFees = await conn.getRecentPrioritizationFees();
+    const fees = recentFees.map((fee) => fee.prioritizationFee).filter((fee) => fee > 0).sort((a, b) => a - b);
+    const priorityFee = fees[Math.floor(fees.length * 0.75)] ?? 0;
+    if (priorityFee > 0) {
+      instructions.push(ComputeBudgetProgram.setComputeUnitPrice({ microLamports: priorityFee }));
+    }
+  }
+  const lookupTableAccounts = (await Promise.all(
+    txData.addressLookupTableAddresses.map(async (address) => {
+      const { value } = await conn.getAddressLookupTable(new PublicKey3(address));
+      return value;
+    })
+  )).filter((account) => account !== null);
   const { blockhash } = await conn.getLatestBlockhash("confirmed");
-  transaction.recentBlockhash = blockhash;
-  transaction.feePayer = new PublicKey3(solana3.address);
+  const message = new TransactionMessage({
+    payerKey: new PublicKey3(solana3.address),
+    recentBlockhash: blockhash,
+    instructions
+  }).compileToV0Message(lookupTableAccounts);
+  return solana3.sendTransaction({ transaction: new VersionedTransaction(message) });
+};
+var executeSolanaSerializedTx = async (txData, solana3) => {
+  if (!solana3.isConnected || !solana3.address || !solana3.connection) {
+    throw new Error("Solana wallet not connected");
+  }
+  solana3.reset();
+  const { VersionedTransaction } = await import("@solana/web3.js");
+  const transaction = VersionedTransaction.deserialize(
+    new Uint8Array(Buffer.from(txData.serializedTx, "base64"))
+  );
   return solana3.sendTransaction({ transaction });
 };
 var useSwapExecution = () => {
@@ -2525,12 +2566,14 @@ var useSwapExecution = () => {
           switch (txData.type) {
             case "evm":
               return executeEvm(txData, walletClient, walletAddress);
-            case "utxo_deposit":
-              return executeUtxoDeposit(txData, bitcoin3);
-            case "solana":
+            case "utxo":
+              return executeUtxo(txData, bitcoin3);
+            case "solana_instructions":
               return executeSolana(txData, solana3);
-            case "utxo_psbt":
-            case "cosmos":
+            case "solana_serialized_tx":
+              return executeSolanaSerializedTx(txData, solana3);
+            case "cosmossdk_msg_send":
+            case "cosmossdk_msg_deposit":
               throw new Error("This swap is not yet supported \u2014 please try a different route");
             default: {
               const _exhaustive = txData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swap-widget",
-  "version": "0.5.2",
+  "version": "0.7.0",
   "description": "Embeddable swap widget using ShapeShift API",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
@@ -30,9 +30,9 @@
     "p-queue": "^8.0.1",
     "react-virtuoso": "^4.7.11",
     "xstate": "5.28.0",
+    "@shapeshiftoss/utils": "^1.1.0",
     "@shapeshiftoss/caip": "^8.16.10",
-    "@shapeshiftoss/types": "^8.6.8",
-    "@shapeshiftoss/utils": "^1.1.0"
+    "@shapeshiftoss/types": "^9.0.0"
   },
   "peerDependencies": {
     "@wagmi/core": "^2.0.0",