@shapeshiftoss/swapper 17.6.11 → 17.7.0

package/dist/cjs/constants.js

@@ -20,23 +20,21 @@ const CowSwapper_1 = require("./swappers/CowSwapper/CowSwapper");
 const endpoints_8 = require("./swappers/CowSwapper/endpoints");
 const DebridgeSwapper_1 = require("./swappers/DebridgeSwapper");
 const endpoints_9 = require("./swappers/DebridgeSwapper/endpoints");
-const endpoints_10 = require("./swappers/JupiterSwapper/endpoints");
-const JupiterSwapper_1 = require("./swappers/JupiterSwapper/JupiterSwapper");
-const endpoints_11 = require("./swappers/MayachainSwapper/endpoints");
+const endpoints_10 = require("./swappers/MayachainSwapper/endpoints");
 const MayachainSwapper_1 = require("./swappers/MayachainSwapper/MayachainSwapper");
-const endpoints_12 = require("./swappers/NearIntentsSwapper/endpoints");
+const endpoints_11 = require("./swappers/NearIntentsSwapper/endpoints");
 const NearIntentsSwapper_1 = require("./swappers/NearIntentsSwapper/NearIntentsSwapper");
-const endpoints_13 = require("./swappers/PortalsSwapper/endpoints");
+const endpoints_12 = require("./swappers/PortalsSwapper/endpoints");
 const PortalsSwapper_1 = require("./swappers/PortalsSwapper/PortalsSwapper");
 const RelaySwapper_1 = require("./swappers/RelaySwapper");
-const endpoints_14 = require("./swappers/RelaySwapper/endpoints");
-const endpoints_15 = require("./swappers/StonfiSwapper/endpoints");
+const endpoints_13 = require("./swappers/RelaySwapper/endpoints");
+const endpoints_14 = require("./swappers/StonfiSwapper/endpoints");
 const StonfiSwapper_1 = require("./swappers/StonfiSwapper/StonfiSwapper");
-const endpoints_16 = require("./swappers/SunioSwapper/endpoints");
+const endpoints_15 = require("./swappers/SunioSwapper/endpoints");
 const SunioSwapper_1 = require("./swappers/SunioSwapper/SunioSwapper");
-const endpoints_17 = require("./swappers/ThorchainSwapper/endpoints");
+const endpoints_16 = require("./swappers/ThorchainSwapper/endpoints");
 const ThorchainSwapper_1 = require("./swappers/ThorchainSwapper/ThorchainSwapper");
-const endpoints_18 = require("./swappers/ZrxSwapper/endpoints");
+const endpoints_17 = require("./swappers/ZrxSwapper/endpoints");
 const ZrxSwapper_1 = require("./swappers/ZrxSwapper/ZrxSwapper");
 const types_1 = require("./types");
 const utils_2 = require("./utils");
@@ -50,15 +48,15 @@ exports.QUOTE_TIMEOUT_ERROR = (0, utils_2.makeSwapErrorRight)({
 exports.swappers = {
     [types_1.SwapperName.Thorchain]: {
         ...ThorchainSwapper_1.thorchainSwapper,
-        ...endpoints_17.thorchainApi,
+        ...endpoints_16.thorchainApi,
     },
     [types_1.SwapperName.Mayachain]: {
         ...MayachainSwapper_1.mayachainSwapper,
-        ...endpoints_11.mayachainApi,
+        ...endpoints_10.mayachainApi,
     },
     [types_1.SwapperName.Zrx]: {
         ...ZrxSwapper_1.zrxSwapper,
-        ...endpoints_18.zrxApi,
+        ...endpoints_17.zrxApi,
     },
     [types_1.SwapperName.CowSwap]: {
         ...CowSwapper_1.cowSwapper,
@@ -70,19 +68,15 @@ exports.swappers = {
     },
     [types_1.SwapperName.Portals]: {
         ...PortalsSwapper_1.portalsSwapper,
-        ...endpoints_13.portalsApi,
+        ...endpoints_12.portalsApi,
     },
     [types_1.SwapperName.Chainflip]: {
         ...ChainflipSwapper_1.chainflipSwapper,
         ...endpoints_7.chainflipApi,
     },
-    [types_1.SwapperName.Jupiter]: {
-        ...JupiterSwapper_1.jupiterSwapper,
-        ...endpoints_10.jupiterApi,
-    },
     [types_1.SwapperName.Relay]: {
         ...RelaySwapper_1.relaySwapper,
-        ...endpoints_14.relayApi,
+        ...endpoints_13.relayApi,
     },
     [types_1.SwapperName.ButterSwap]: {
         ...ButterSwap_1.butterSwap,
@@ -94,7 +88,7 @@ exports.swappers = {
     },
     [types_1.SwapperName.NearIntents]: {
         ...NearIntentsSwapper_1.nearIntentsSwapper,
-        ...endpoints_12.nearIntentsApi,
+        ...endpoints_11.nearIntentsApi,
     },
     [types_1.SwapperName.Cetus]: {
         ...CetusSwapper_1.cetusSwapper,
@@ -102,7 +96,7 @@ exports.swappers = {
     },
     [types_1.SwapperName.Sunio]: {
         ...SunioSwapper_1.sunioSwapper,
-        ...endpoints_16.sunioApi,
+        ...endpoints_15.sunioApi,
     },
     [types_1.SwapperName.Avnu]: {
         ...AvnuSwapper_1.avnuSwapper,
@@ -110,7 +104,7 @@ exports.swappers = {
     },
     [types_1.SwapperName.Stonfi]: {
         ...StonfiSwapper_1.stonfiSwapper,
-        ...endpoints_15.stonfiApi,
+        ...endpoints_14.stonfiApi,
     },
     [types_1.SwapperName.Across]: {
         ...AcrossSwapper_1.acrossSwapper,
@@ -158,8 +152,6 @@ const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
             return DEFAULT_ARBITRUM_BRIDGE_SLIPPAGE_DECIMAL_PERCENTAGE;
         case types_1.SwapperName.Chainflip:
             return DEFAULT_CHAINFLIP_SLIPPAGE_DECIMAL_PERCENTAGE;
-        case types_1.SwapperName.Jupiter:
-            throw new Error('Default slippage not supported by Jupiter');
         case types_1.SwapperName.Relay:
             throw new Error('Default slippage not supported by Relay');
         case types_1.SwapperName.Across:
@@ -185,8 +177,6 @@ const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
 exports.getDefaultSlippageDecimalPercentageForSwapper = getDefaultSlippageDecimalPercentageForSwapper;
 const isAutoSlippageSupportedBySwapper = (swapperName) => {
     switch (swapperName) {
-        case types_1.SwapperName.Jupiter:
-            return true;
         case types_1.SwapperName.Relay:
         case types_1.SwapperName.Across:
         case types_1.SwapperName.Debridge:

package/dist/cjs/index.d.ts

@@ -10,7 +10,6 @@ export * from './swappers/ChainflipSwapper';
 export * from './swappers/SunioSwapper';
 export * from './swappers/CowSwapper';
 export * from './swappers/DebridgeSwapper';
-export * from './swappers/JupiterSwapper';
 export * from './swappers/PortalsSwapper';
 export * from './swappers/ThorchainSwapper';
 export * from './swappers/MayachainSwapper';

package/dist/cjs/index.js

@@ -39,7 +39,6 @@ __exportStar(require("./swappers/ChainflipSwapper"), exports);
 __exportStar(require("./swappers/SunioSwapper"), exports);
 __exportStar(require("./swappers/CowSwapper"), exports);
 __exportStar(require("./swappers/DebridgeSwapper"), exports);
-__exportStar(require("./swappers/JupiterSwapper"), exports);
 __exportStar(require("./swappers/PortalsSwapper"), exports);
 __exportStar(require("./swappers/ThorchainSwapper"), exports);
 __exportStar(require("./swappers/MayachainSwapper"), exports);

package/dist/cjs/solana-utils/getUnsignedSolanaTransaction.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnsignedSolanaTransaction = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
-const JupiterSwapper_1 = require("../swappers/JupiterSwapper");
 const utils_2 = require("../utils");
+// Jupiter (and Relay which uses Jupiter under the hood) use 40% as a compute unit margin while
+// calculating them, some TX reverts without this. For stability purposes we add 60% margin.
+const COMPUTE_UNIT_MARGIN_MULTIPLIER = 1.6;
 const getUnsignedSolanaTransaction = async ({ stepIndex, tradeQuote, from, assertGetSolanaChainAdapter, }) => {
     if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
         throw new Error('Unable to execute a trade rate quote');
@@ -30,7 +32,7 @@ const getUnsignedSolanaTransaction = async ({ stepIndex, tradeQuote, from, asser
             instructions: solanaInstructions,
             // As always, as relay uses jupiter under the hood, we need to add the compute unit safety margin
             computeUnitLimit: (0, utils_1.bnOrZero)(fast.chainSpecific.computeUnits)
-                .times(JupiterSwapper_1.COMPUTE_UNIT_MARGIN_MULTIPLIER)
+                .times(COMPUTE_UNIT_MARGIN_MULTIPLIER)
                 .toFixed(0),
             computeUnitPrice: fast.chainSpecific.priorityFee,
         },

package/dist/cjs/swappers/AvnuSwapper/swapperApi/getTradeQuote.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const avnu_sdk_1 = require("@avnu/avnu-sdk");
+const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const starknet_1 = require("starknet");
@@ -59,7 +60,8 @@ const getTradeQuote = async (input, deps) => {
             takerAddress: normalizedSendAddress,
             size: 1,
             integratorFees: affiliateBps ? BigInt(affiliateBps) : undefined,
-            integratorFeeRecipient: (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId),
+            integratorFeeRecipient: (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.starknetChainId),
+            integratorName: 'shapeshift',
         });
         if (!quotes || quotes.length === 0) {
             return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({

package/dist/cjs/swappers/ChainflipSwapper/endpoints.js

@@ -126,6 +126,9 @@ exports.chainflipApi = {
             value,
             chainSpecific: { from, tokenId },
         });
+        // Chainflip deposit addresses are program-owned accounts that require more compute
+        // than a regular SOL transfer. Apply a safety margin to avoid "Computational budget exceeded".
+        const computeUnits = Math.ceil(Math.max(Number(fast.chainSpecific.computeUnits), 50_000) * 1.6);
         return adapter.buildSendApiTransaction({
             to,
             from,
@@ -133,7 +136,7 @@ exports.chainflipApi = {
             accountNumber,
             chainSpecific: {
                 tokenId,
-                computeUnitLimit: fast.chainSpecific.computeUnits,
+                computeUnitLimit: String(computeUnits),
                 computeUnitPrice: fast.chainSpecific.priorityFee,
             },
         });
@@ -156,11 +159,16 @@ exports.chainflipApi = {
                 tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
             },
         });
-        return fast.txFee;
+        // Mirror the same compute budget boost as getUnsignedSolanaTransaction
+        // to avoid underquoting fees for Chainflip deposit addresses
+        const simulatedUnits = Number(fast.chainSpecific.computeUnits);
+        const boostedUnits = Math.ceil(Math.max(simulatedUnits, 50_000) * 1.6);
+        const ratio = simulatedUnits > 0 ? boostedUnits / simulatedUnits : 1;
+        return String(Math.ceil(Number(fast.txFee) * ratio));
     },
     checkTradeStatus: async ({ config, swap }) => {
         const chainflipSwapId = swap?.metadata.chainflipSwapId;
-        if (!chainflipSwapId)
+        if (chainflipSwapId == null)
             throw Error(`chainflipSwapId is required`);
         const brokerUrl = config.VITE_CHAINFLIP_API_URL;
         const apiKey = config.VITE_CHAINFLIP_API_KEY;
@@ -174,13 +182,14 @@ exports.chainflipApi = {
             };
         }
         const { data: statusResponse } = maybeStatusResponse.unwrap();
-        const { status: { swapEgress }, } = statusResponse;
+        const { status: { swapEgress, swapId }, } = statusResponse;
         // Assume no outbound Tx is a pending Tx
         if (!swapEgress?.transactionReference) {
             return {
                 buyTxHash: undefined,
                 status: unchained_client_1.TxStatus.Pending,
                 message: (0, getLatestChainflipStatusMessage_1.getLatestChainflipStatusMessage)(statusResponse),
+                chainflipSwapId: swapId ?? undefined,
             };
         }
         // Assume as soon as we have an outbound Tx, the swap is complete.
@@ -189,6 +198,7 @@ exports.chainflipApi = {
             buyTxHash: swapEgress.transactionReference,
             status: unchained_client_1.TxStatus.Confirmed,
             message: undefined,
+            chainflipSwapId: swapId ?? undefined,
         };
     },
 };

package/dist/cjs/swappers/ChainflipSwapper/types.d.ts

@@ -3,6 +3,7 @@ import type { ChainflipBaasStatusSwap } from './models/ChainflipBaasStatusSwap';
 export type ChainFlipStatus = {
     status: {
         state: 'waiting' | 'receiving' | 'swapping' | 'sending' | 'sent' | 'completed' | 'failed';
+        swapId?: string;
         swap?: ChainflipBaasStatusSwap;
         swapEgress?: ChainflipBaasStatusEgress;
     };

package/dist/cjs/swappers/DebridgeSwapper/utils/fetchDebridgeTrade.d.ts

@@ -13,7 +13,7 @@ export type DebridgeFetchQuoteParams = {
     srcChainOrderAuthorityAddress?: string;
     dstChainOrderAuthorityAddress?: string;
     senderAddress?: string;
-    prependOperatingExpenses: 'true';
+    prependOperatingExpenses: 'true' | 'false';
     affiliateFeePercent?: string;
     affiliateFeeRecipient?: string;
 };

package/dist/cjs/swappers/DebridgeSwapper/utils/getTrade.js

@@ -60,7 +60,7 @@ async function getTrade({ input, deps, }) {
         return input.receiveAddress;
     })();
     const affiliateFeePercent = (() => {
-        if (!(0, utils_1.isTreasuryChainId)(buyAsset.chainId))
+        if (!(0, utils_1.isTreasuryChainId)(sellAsset.chainId))
             return undefined;
         const bps = (0, utils_1.bnOrZero)(affiliateBps);
         if (!bps.isFinite() || bps.lte(0))
@@ -71,10 +71,10 @@ async function getTrade({ input, deps, }) {
         if (affiliateFeePercent === undefined)
             return undefined;
         try {
-            return (0, helpers_1.getTreasuryAddressFromChainId)(buyAsset.chainId).toLowerCase();
+            return (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId).toLowerCase();
         }
         catch (e) {
-            console.error(`[getTrade] Failed to get treasury address for chainId ${buyAsset.chainId}, affiliate fee will not be applied`, e);
+            console.error(`[getTrade] Failed to get treasury address for chainId ${sellAsset.chainId}, affiliate fee will not be applied`, e);
             return undefined;
         }
     })();
@@ -107,7 +107,7 @@ async function getTrade({ input, deps, }) {
         srcChainOrderAuthorityAddress: senderAddress,
         dstChainOrderAuthorityAddress: recipientAddress,
         senderAddress,
-        prependOperatingExpenses: 'true',
+        prependOperatingExpenses: 'false',
         affiliateFeePercent,
         affiliateFeeRecipient,
     }, deps.config);
@@ -122,9 +122,7 @@ async function getTrade({ input, deps, }) {
         sellAsset,
         buyAsset,
     });
-    const nativePreFee = (0, utils_1.bnOrZero)(quote.fixFee)
-        .plus((0, utils_1.bnOrZero)(quote.prependedOperatingExpenseCost))
-        .toFixed();
+    const fixFee = (0, utils_1.bnOrZero)(quote.fixFee).toFixed();
     const buyAmountBeforeFeesCryptoBaseUnit = buyAmountAfterFeesCryptoBaseUnit;
     const allowanceContract = (0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) ? quote.tx.to : '';
     const debridgeTransactionMetadata = {
@@ -158,10 +156,10 @@ async function getTrade({ input, deps, }) {
         accountNumber,
         feeData: {
             networkFeeCryptoBaseUnit,
-            protocolFees: protocolFeeAssetIdForFees && (0, utils_1.bnOrZero)(nativePreFee).gt(0)
+            protocolFees: protocolFeeAssetIdForFees && (0, utils_1.bnOrZero)(fixFee).gt(0)
                 ? {
                     [protocolFeeAssetIdForFees]: {
-                        amountCryptoBaseUnit: nativePreFee,
+                        amountCryptoBaseUnit: fixFee,
                         asset: (0, utils_1.getBaseAsset)(sellAsset.chainId),
                         requiresBalance: true,
                     },

package/dist/cjs/swappers/RelaySwapper/constant.js

@@ -10,24 +10,19 @@ const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
 const types_1 = require("../../types");
 const types_2 = require("./utils/types");
+// https://docs.relay.link/resources/supported-chains
 exports.chainIdToRelayChainId = {
-    // https://docs.relay.link/resources/supported-chains
     [caip_1.btcChainId]: 8253038,
     [caip_1.ethChainId]: chains_1.mainnet.id,
     [caip_1.arbitrumChainId]: chains_1.arbitrum.id,
     [caip_1.baseChainId]: chains_1.base.id,
     [caip_1.optimismChainId]: chains_1.optimism.id,
     [caip_1.polygonChainId]: chains_1.polygon.id,
-    // https://docs.relay.link/resources/supported-chains
     [caip_1.solanaChainId]: 792703809,
     [caip_1.gnosisChainId]: chains_1.gnosis.id,
     [caip_1.avalancheChainId]: chains_1.avalanche.id,
     [caip_1.bscChainId]: chains_1.bsc.id,
-    // DISABLED: Tron deposits are built as simple TRC20 transfers instead of depositErc20() vault calls,
-    // and the Relay indexer notification is never sent for non-EVM chains. This causes deposits to be
-    // untracked by Relay, resulting in stuck/lost funds. Re-enable once the Tron transaction building
-    // is verified to use the Relay quote calldata (depositErc20) correctly.
-    // [tronChainId]: 728126428,
+    [caip_1.tronChainId]: 728126428,
     [caip_1.monadChainId]: chains_1.monad.id,
     [caip_1.hyperEvmChainId]: chains_1.hyperEvm.id,
     [caip_1.mantleChainId]: chains_1.mantle.id,
@@ -54,6 +49,7 @@ exports.chainIdToRelayChainId = {
     [caip_1.modeChainId]: chains_1.mode.id,
     [caip_1.soneiumChainId]: chains_1.soneium.id,
     [caip_1.seiChainId]: chains_1.sei.id,
+    [caip_1.abstractChainId]: 2741,
 };
 var RelayStatusMessage;
 (function (RelayStatusMessage) {

package/dist/cjs/swappers/RelaySwapper/endpoints.js

@@ -149,7 +149,7 @@ exports.relayApi = {
         }
         if (swap.metadata.relayTransactionMetadata &&
             !txIndexingMap.has(swap.id) &&
-            (0, chain_adapters_1.isEvmChainId)(chainId)) {
+            constant_1.chainIdToRelayChainId[chainId] !== undefined) {
             const relayTxParam = {
                 ...swap.metadata.relayTransactionMetadata,
                 txHash,

package/dist/cjs/swappers/RelaySwapper/utils/getTrade.js

@@ -486,13 +486,23 @@ async function getTrade({ input, deps, relayChainMap, }) {
                 };
             }
             if ((0, types_2.isRelayQuoteTronItemData)(selectedItem.data)) {
+                const contractAddress = selectedItem.data.parameter?.contract_address;
+                const callData = selectedItem.data.parameter?.data;
+                const isTronToken = (0, utils_1.isToken)(sellAsset.assetId);
+                if (isTronToken && !contractAddress) {
+                    throw new Error('Missing Relay Tron contract address');
+                }
+                if (isTronToken && !callData) {
+                    throw new Error('Missing Relay Tron transaction data');
+                }
                 return {
-                    allowanceContract: '',
+                    allowanceContract: contractAddress ?? '',
                     solanaTransactionMetadata: undefined,
                     relayTransactionMetadata: {
                         relayId: quote.steps[0].requestId,
                         orderId,
-                        to: selectedItem.data?.parameter?.contract_address,
+                        to: contractAddress,
+                        data: callData,
                     },
                 };
             }

package/dist/cjs/swappers/RelaySwapper/utils/relayTokenToAssetId.js

@@ -227,6 +227,11 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Sei,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
+            case caip_1.CHAIN_REFERENCE.AbstractMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Abstract,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
             default:
                 throw Error(`chainId '${relayToken.chainId}' not supported`);
         }

package/dist/cjs/swappers/StonfiSwapper/swapperApi/getTradeQuote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
 const types_1 = require("../../../types");
@@ -40,7 +41,7 @@ const getTradeQuote = async (input) => {
     try {
         const slippageBps = (0, helpers_2.slippageDecimalToBps)(slippageTolerancePercentageDecimal, constants_1.STONFI_DEFAULT_SLIPPAGE_BPS);
         const referrerFeeBps = (0, helpers_2.affiliateBpsToNumber)(affiliateBps);
-        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId);
+        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.tonChainId);
         const referrerAddress = (0, helpers_2.tonAddressToOmnistonAddress)(tonTreasuryAddress);
         const quoteResult = await (0, helpers_2.waitForQuote)(omniston, {
             settlementMethods: [omniston_sdk_1.SettlementMethod.SETTLEMENT_METHOD_SWAP],

package/dist/cjs/tron-utils/getUnsignedTronTransaction.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnsignedTronTransaction = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
+const tronweb_1 = require("tronweb");
 const utils_2 = require("../utils");
 const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }) => {
     if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
@@ -30,6 +31,21 @@ const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assertGetTron
             args,
         });
     }
+    if (relayTransactionMetadata?.data) {
+        if (!relayTransactionMetadata.to) {
+            throw new Error('Missing Relay transaction destination address');
+        }
+        const to = tronweb_1.TronWeb.address.fromHex(relayTransactionMetadata.to);
+        const isNativeTron = sellAsset.assetId === caip_1.tronAssetId;
+        const value = isNativeTron ? step.sellAmountIncludingProtocolFeesCryptoBaseUnit : '0';
+        return adapter.buildCustomApiTx({
+            from,
+            to,
+            accountNumber,
+            data: relayTransactionMetadata.data,
+            value,
+        });
+    }
     const to = relayTransactionMetadata?.to ?? nearIntentsSpecific?.depositAddress;
     if (!to)
         throw new Error('Missing transaction destination address');

package/dist/cjs/types.d.ts

@@ -1,4 +1,3 @@
-import type { QuoteResponse } from '@jup-ag/api';
 import type { AccountId, AssetId, ChainId, Nominal } from '@shapeshiftoss/caip';
 import type { ChainAdapter, CosmosSdkChainAdapter, EvmChainAdapter, near, SignTx, solana, starknet, sui, ton, tron, UtxoChainAdapter } from '@shapeshiftoss/chain-adapters';
 import type { HDWallet, SolanaSignTx, StarknetSignTx, SuiSignTx } from '@shapeshiftoss/hdwallet-core';
@@ -41,7 +40,6 @@ export type SwapperConfig = {
     VITE_CHAINFLIP_API_KEY: string;
     VITE_CHAINFLIP_API_URL: string;
     VITE_FEATURE_CHAINFLIP_SWAP_DCA: boolean;
-    VITE_JUPITER_API_URL: string;
     VITE_RELAY_API_URL: string;
     VITE_BEBOP_API_KEY: string;
     VITE_NEAR_INTENTS_API_KEY: string;
@@ -62,7 +60,6 @@ export declare enum SwapperName {
     ArbitrumBridge = "Arbitrum Bridge",
     Portals = "Portals",
     Chainflip = "Chainflip",
-    Jupiter = "Jupiter",
     Relay = "Relay",
     ButterSwap = "ButterSwap",
     Bebop = "Bebop",
@@ -307,7 +304,6 @@ export type TradeQuoteStep = {
     };
     bebopSolanaSerializedTx?: string;
     bebopQuoteId?: string;
-    jupiterQuoteResponse?: QuoteResponse;
     solanaTransactionMetadata?: {
         addressLookupTableAddresses: string[];
         instructions?: TransactionInstruction[];
@@ -316,7 +312,7 @@ export type TradeQuoteStep = {
     };
     cowswapQuoteResponse?: OrderQuoteResponse;
     chainflipSpecific?: {
-        chainflipSwapId?: number;
+        chainflipSwapId?: number | string;
         chainflipDepositAddress?: string;
         chainflipNumberOfChunks?: number;
         chainflipChunkIntervalBlocks?: number;
@@ -446,7 +442,7 @@ export type SwapExecutionMetadata = {
     inboundAddress?: string;
 };
 export type SwapperSpecificMetadata = {
-    chainflipSwapId: number | undefined;
+    chainflipSwapId: number | string | undefined;
     nearIntentsSpecific?: {
         depositAddress: string;
         depositMemo?: string;
@@ -646,6 +642,7 @@ export type TradeStatus = {
     relayerExplorerTxLink?: string | undefined;
     message: string | [string, InterpolationOptions] | undefined;
     actualBuyAmountCryptoBaseUnit?: string;
+    chainflipSwapId?: number | string;
 };
 export type TradeQuoteResult = Result<TradeQuote[], SwapErrorRight>;
 export type TradeRateResult = Result<TradeRate[], SwapErrorRight>;

package/dist/cjs/types.js

@@ -11,7 +11,6 @@ var SwapperName;
     SwapperName["ArbitrumBridge"] = "Arbitrum Bridge";
     SwapperName["Portals"] = "Portals";
     SwapperName["Chainflip"] = "Chainflip";
-    SwapperName["Jupiter"] = "Jupiter";
     SwapperName["Relay"] = "Relay";
     SwapperName["ButterSwap"] = "ButterSwap";
     SwapperName["Bebop"] = "Bebop";

package/dist/cjs/utils.d.ts

@@ -75,3 +75,6 @@ export declare const checkStarknetSwapStatus: ({ txHash, assertGetStarknetChainA
     txHash: string;
     assertGetStarknetChainAdapter: (chainId: ChainId) => starknet.ChainAdapter;
 }) => Promise<TradeStatus>;
+export declare class SolanaLogsError extends Error {
+    constructor(name: string);
+}

package/dist/cjs/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkStarknetSwapStatus = exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeTonTransaction = exports.executeStarknetTransaction = exports.executeNearTransaction = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.AsyncResultOf = exports.createCache = exports.createTradeAmountTooSmallErr = exports.makeSwapErrorRight = void 0;
+exports.SolanaLogsError = exports.checkStarknetSwapStatus = exports.checkSuiSwapStatus = exports.checkSolanaSwapStatus = exports.getExecutableTradeStep = exports.isExecutableTradeStep = exports.isExecutableTradeQuote = exports.getInputOutputRate = exports.checkEvmSwapStatus = exports.checkSafeTransactionStatus = exports.createDefaultStatusResponse = exports.executeTonTransaction = exports.executeStarknetTransaction = exports.executeNearTransaction = exports.executeSuiTransaction = exports.executeTronTransaction = exports.executeSolanaTransaction = exports.executeEvmTransaction = exports.getHopByIndex = exports.makeSwapperAxiosServiceMonadic = exports.AsyncResultOf = exports.createCache = exports.createTradeAmountTooSmallErr = exports.makeSwapErrorRight = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
@@ -190,8 +190,7 @@ const checkEvmSwapStatus = async ({ txHash, chainId, address, assertGetEvmChainA
             message: undefined,
         };
     }
-    catch (e) {
-        console.error(e);
+    catch {
         return (0, exports.createDefaultStatusResponse)(txHash);
     }
 };
@@ -316,3 +315,10 @@ const checkStarknetSwapStatus = async ({ txHash, assertGetStarknetChainAdapter,
     }
 };
 exports.checkStarknetSwapStatus = checkStarknetSwapStatus;
+class SolanaLogsError extends Error {
+    constructor(name) {
+        super(name);
+        this.name = name;
+    }
+}
+exports.SolanaLogsError = SolanaLogsError;