@shapeshiftoss/swap-widget 0.5.2 → 0.6.0

package/dist/index.js

@@ -2459,13 +2459,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 +2473,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 +2491,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 +2561,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.6.0",
   "description": "Embeddable swap widget using ShapeShift API",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "react-virtuoso": "^4.7.11",
     "xstate": "5.28.0",
     "@shapeshiftoss/caip": "^8.16.10",
-    "@shapeshiftoss/types": "^8.6.8",
+    "@shapeshiftoss/types": "^9.0.0",
     "@shapeshiftoss/utils": "^1.1.0"
   },
   "peerDependencies": {