@shapeshiftoss/swapper 17.6.11 → 17.7.1

package/dist/esm/constants.js

@@ -17,8 +17,6 @@ import { cowSwapper } from './swappers/CowSwapper/CowSwapper.js';
 import { cowApi } from './swappers/CowSwapper/endpoints.js';
 import { debridgeSwapper } from './swappers/DebridgeSwapper/index.js';
 import { debridgeApi } from './swappers/DebridgeSwapper/endpoints.js';
-import { jupiterApi } from './swappers/JupiterSwapper/endpoints.js';
-import { jupiterSwapper } from './swappers/JupiterSwapper/JupiterSwapper.js';
 import { mayachainApi } from './swappers/MayachainSwapper/endpoints.js';
 import { mayachainSwapper } from './swappers/MayachainSwapper/MayachainSwapper.js';
 import { nearIntentsApi } from './swappers/NearIntentsSwapper/endpoints.js';
@@ -73,10 +71,6 @@ export const swappers = {
         ...chainflipSwapper,
         ...chainflipApi,
     },
-    [SwapperName.Jupiter]: {
-        ...jupiterSwapper,
-        ...jupiterApi,
-    },
     [SwapperName.Relay]: {
         ...relaySwapper,
         ...relayApi,
@@ -155,8 +149,6 @@ export const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
             return DEFAULT_ARBITRUM_BRIDGE_SLIPPAGE_DECIMAL_PERCENTAGE;
         case SwapperName.Chainflip:
             return DEFAULT_CHAINFLIP_SLIPPAGE_DECIMAL_PERCENTAGE;
-        case SwapperName.Jupiter:
-            throw new Error('Default slippage not supported by Jupiter');
         case SwapperName.Relay:
             throw new Error('Default slippage not supported by Relay');
         case SwapperName.Across:
@@ -181,8 +173,6 @@ export const getDefaultSlippageDecimalPercentageForSwapper = (swapperName) => {
 };
 export const isAutoSlippageSupportedBySwapper = (swapperName) => {
     switch (swapperName) {
-        case SwapperName.Jupiter:
-            return true;
         case SwapperName.Relay:
         case SwapperName.Across:
         case SwapperName.Debridge:

package/dist/esm/index.d.ts

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

package/dist/esm/index.js

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

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

@@ -1,6 +1,8 @@
 import { bnOrZero } from '@shapeshiftoss/utils';
-import { COMPUTE_UNIT_MARGIN_MULTIPLIER } from '../swappers/JupiterSwapper/index.js';
 import { getExecutableTradeStep, isExecutableTradeQuote } from '../utils.js';
+// 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;
 export const getUnsignedSolanaTransaction = async ({ stepIndex, tradeQuote, from, assertGetSolanaChainAdapter, }) => {
     if (!isExecutableTradeQuote(tradeQuote))
         throw new Error('Unable to execute a trade rate quote');

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

@@ -1,4 +1,5 @@
 import { getQuotes } from '@avnu/avnu-sdk';
+import { starknetChainId } from '@shapeshiftoss/caip';
 import { bn } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { validateAndParseAddress } from 'starknet';
@@ -56,7 +57,8 @@ export const getTradeQuote = async (input, deps) => {
             takerAddress: normalizedSendAddress,
             size: 1,
             integratorFees: affiliateBps ? BigInt(affiliateBps) : undefined,
-            integratorFeeRecipient: getTreasuryAddressFromChainId(sellAsset.chainId),
+            integratorFeeRecipient: getTreasuryAddressFromChainId(starknetChainId),
+            integratorName: 'shapeshift',
         });
         if (!quotes || quotes.length === 0) {
             return Err(makeSwapErrorRight({

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

@@ -123,6 +123,9 @@ export const 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,
@@ -130,7 +133,7 @@ export const chainflipApi = {
             accountNumber,
             chainSpecific: {
                 tokenId,
-                computeUnitLimit: fast.chainSpecific.computeUnits,
+                computeUnitLimit: String(computeUnits),
                 computeUnitPrice: fast.chainSpecific.priorityFee,
             },
         });
@@ -153,11 +156,16 @@ export const chainflipApi = {
                 tokenId: 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;
@@ -171,13 +179,14 @@ export const 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: TxStatus.Pending,
                 message: getLatestChainflipStatusMessage(statusResponse),
+                chainflipSwapId: swapId ?? undefined,
             };
         }
         // Assume as soon as we have an outbound Tx, the swap is complete.
@@ -186,6 +195,7 @@ export const chainflipApi = {
             buyTxHash: swapEgress.transactionReference,
             status: TxStatus.Confirmed,
             message: undefined,
+            chainflipSwapId: swapId ?? undefined,
         };
     },
 };

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

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

package/dist/esm/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/esm/swappers/DebridgeSwapper/utils/getTrade.js

@@ -54,7 +54,7 @@ export async function getTrade({ input, deps, }) {
         return input.receiveAddress;
     })();
     const affiliateFeePercent = (() => {
-        if (!isTreasuryChainId(buyAsset.chainId))
+        if (!isTreasuryChainId(sellAsset.chainId))
             return undefined;
         const bps = bnOrZero(affiliateBps);
         if (!bps.isFinite() || bps.lte(0))
@@ -65,10 +65,10 @@ export async function getTrade({ input, deps, }) {
         if (affiliateFeePercent === undefined)
             return undefined;
         try {
-            return getTreasuryAddressFromChainId(buyAsset.chainId).toLowerCase();
+            return 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;
         }
     })();
@@ -101,7 +101,7 @@ export async function getTrade({ input, deps, }) {
         srcChainOrderAuthorityAddress: senderAddress,
         dstChainOrderAuthorityAddress: recipientAddress,
         senderAddress,
-        prependOperatingExpenses: 'true',
+        prependOperatingExpenses: 'false',
         affiliateFeePercent,
         affiliateFeeRecipient,
     }, deps.config);
@@ -116,9 +116,7 @@ export async function getTrade({ input, deps, }) {
         sellAsset,
         buyAsset,
     });
-    const nativePreFee = bnOrZero(quote.fixFee)
-        .plus(bnOrZero(quote.prependedOperatingExpenseCost))
-        .toFixed();
+    const fixFee = bnOrZero(quote.fixFee).toFixed();
     const buyAmountBeforeFeesCryptoBaseUnit = buyAmountAfterFeesCryptoBaseUnit;
     const allowanceContract = isEvmChainId(sellAsset.chainId) ? quote.tx.to : '';
     const debridgeTransactionMetadata = {
@@ -152,10 +150,10 @@ export async function getTrade({ input, deps, }) {
         accountNumber,
         feeData: {
             networkFeeCryptoBaseUnit,
-            protocolFees: protocolFeeAssetIdForFees && bnOrZero(nativePreFee).gt(0)
+            protocolFees: protocolFeeAssetIdForFees && bnOrZero(fixFee).gt(0)
                 ? {
                     [protocolFeeAssetIdForFees]: {
-                        amountCryptoBaseUnit: nativePreFee,
+                        amountCryptoBaseUnit: fixFee,
                         asset: getBaseAsset(sellAsset.chainId),
                         requiresBalance: true,
                     },

package/dist/esm/swappers/RelaySwapper/RelaySwapper.d.ts

@@ -1,2 +1,3 @@
 import type { Swapper } from '../../types.js';
+export * from './utils/relayTokenToAssetId.js';
 export declare const relaySwapper: Swapper;

package/dist/esm/swappers/RelaySwapper/RelaySwapper.js

@@ -1,4 +1,5 @@
 import { executeEvmTransaction, executeSolanaTransaction, executeTronTransaction, } from '../../utils.js';
+export * from './utils/relayTokenToAssetId.js';
 export const relaySwapper = {
     executeEvmTransaction,
     executeSolanaTransaction,

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

@@ -1,27 +1,22 @@
-import { arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, blastChainId, bobChainId, bscChainId, btcChainId, celoChainId, cronosChainId, ethChainId, etherealChainId, flowEvmChainId, gnosisChainId, hemiChainId, hyperEvmChainId, inkChainId, katanaChainId, lineaChainId, mantleChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, plumeChainId, polygonChainId, scrollChainId, seiChainId, solanaChainId, soneiumChainId, sonicChainId, storyChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
+import { abstractChainId, arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, blastChainId, bobChainId, bscChainId, btcChainId, celoChainId, cronosChainId, ethChainId, etherealChainId, flowEvmChainId, gnosisChainId, hemiChainId, hyperEvmChainId, inkChainId, katanaChainId, lineaChainId, mantleChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, plumeChainId, polygonChainId, scrollChainId, seiChainId, solanaChainId, soneiumChainId, sonicChainId, storyChainId, tronChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
 import invert from 'lodash/invert';
 import { zeroAddress } from 'viem';
 import { arbitrum, avalanche, base, berachain, blast, bob, bsc, celo, cronos, flowMainnet, gnosis, hemi, hyperEvm, ink, katana, linea, mainnet as ethereum, mantle, mode, monad, optimism, plasma, plumeMainnet, polygon, scroll, sei, soneium, sonic, story, unichain, worldchain, zksync, } from 'viem/chains';
 import { TradeQuoteError } from '../../types.js';
 import { RelayErrorCode } from './utils/types.js';
+// https://docs.relay.link/resources/supported-chains
 export const chainIdToRelayChainId = {
-    // https://docs.relay.link/resources/supported-chains
     [btcChainId]: 8253038,
     [ethChainId]: ethereum.id,
     [arbitrumChainId]: arbitrum.id,
     [baseChainId]: base.id,
     [optimismChainId]: optimism.id,
     [polygonChainId]: polygon.id,
-    // https://docs.relay.link/resources/supported-chains
     [solanaChainId]: 792703809,
     [gnosisChainId]: gnosis.id,
     [avalancheChainId]: avalanche.id,
     [bscChainId]: 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,
+    [tronChainId]: 728126428,
     [monadChainId]: monad.id,
     [hyperEvmChainId]: hyperEvm.id,
     [mantleChainId]: mantle.id,
@@ -48,6 +43,7 @@ export const chainIdToRelayChainId = {
     [modeChainId]: mode.id,
     [soneiumChainId]: soneium.id,
     [seiChainId]: sei.id,
+    [abstractChainId]: 2741,
 };
 export var RelayStatusMessage;
 (function (RelayStatusMessage) {

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

@@ -1,4 +1,4 @@
-import { evm, isEvmChainId } from '@shapeshiftoss/chain-adapters';
+import { evm } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import BigNumber from 'bignumber.js';
 import { getSolanaTransactionFees } from '../../solana-utils/getSolanaTransactionFees.js';
@@ -143,7 +143,7 @@ export const relayApi = {
         }
         if (swap.metadata.relayTransactionMetadata &&
             !txIndexingMap.has(swap.id) &&
-            isEvmChainId(chainId)) {
+            chainIdToRelayChainId[chainId] !== undefined) {
             const relayTxParam = {
                 ...swap.metadata.relayTransactionMetadata,
                 txHash,

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

@@ -1,6 +1,6 @@
 import { baseChainId, btcChainId, fromChainId, monadChainId, solanaChainId, tronChainId, } from '@shapeshiftoss/caip';
 import { evm, isEvmChainId } from '@shapeshiftoss/chain-adapters';
-import { bnOrZero, chainIdToFeeAssetId, convertBasisPointsToPercentage, convertDecimalPercentageToBasisPoints, convertPrecision, DAO_TREASURY_BASE, } from '@shapeshiftoss/utils';
+import { bnOrZero, chainIdToFeeAssetId, convertBasisPointsToPercentage, convertDecimalPercentageToBasisPoints, convertPrecision, DAO_TREASURY_BASE, isToken, } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { AddressLookupTableAccount, MessageV0, PublicKey, VersionedTransaction, } from '@solana/web3.js';
 import axios from 'axios';
@@ -480,13 +480,23 @@ export async function getTrade({ input, deps, relayChainMap, }) {
                 };
             }
             if (isRelayQuoteTronItemData(selectedItem.data)) {
+                const contractAddress = selectedItem.data.parameter?.contract_address;
+                const callData = selectedItem.data.parameter?.data;
+                const isTronToken = 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/esm/swappers/RelaySwapper/utils/relayTokenToAssetId.js

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

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

@@ -1,3 +1,4 @@
+import { tonChainId } from '@shapeshiftoss/caip';
 import { Err, Ok } from '@sniptt/monads';
 import { SettlementMethod } from '@ston-fi/omniston-sdk';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
@@ -37,7 +38,7 @@ export const getTradeQuote = async (input) => {
     try {
         const slippageBps = slippageDecimalToBps(slippageTolerancePercentageDecimal, STONFI_DEFAULT_SLIPPAGE_BPS);
         const referrerFeeBps = affiliateBpsToNumber(affiliateBps);
-        const tonTreasuryAddress = getTreasuryAddressFromChainId(sellAsset.chainId);
+        const tonTreasuryAddress = getTreasuryAddressFromChainId(tonChainId);
         const referrerAddress = tonAddressToOmnistonAddress(tonTreasuryAddress);
         const quoteResult = await waitForQuote(omniston, {
             settlementMethods: [SettlementMethod.SETTLEMENT_METHOD_SWAP],

package/dist/esm/swappers/ThorchainSwapper/generated/generatedTradableAssetMap.json

@@ -3,7 +3,6 @@
     "AVAX.SOL-0XFE6B19286885A4F7F55ADAD09C3CD1F906D2478F": "eip155:43114/erc20:0xfe6b19286885a4f7f55adad09c3cd1f906d2478f",
     "AVAX.USDC-0XB97EF9EF8734C71904D8002F8B6BC66DD9C48A6E": "eip155:43114/erc20:0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
     "AVAX.USDT-0X9702230A8EA53601F5CD2DC00FDBC13D4DF4A8C7": "eip155:43114/erc20:0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7",
-    "BASE.CBBTC-0XCBB7C0000AB88B473B1F5AFD9EF808440EED33BF": "eip155:8453/erc20:0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf",
     "BASE.ETH": "eip155:8453/slip44:60",
     "BASE.USDC-0X833589FCD6EDB6E08F4C7C32D4F71B54BDA02913": "eip155:8453/erc20:0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
     "BASE.VVV-0XACFE6019ED1A7DC6F7B508C02D1B04EC88CC21BF": "eip155:8453/erc20:0xacfe6019ed1a7dc6f7b508c02d1b04ec88cc21bf",

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

@@ -1,5 +1,6 @@
 import { tronAssetId } from '@shapeshiftoss/caip';
 import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
+import { TronWeb } from 'tronweb';
 import { getExecutableTradeStep, isExecutableTradeQuote } from '../utils.js';
 export const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }) => {
     if (!isExecutableTradeQuote(tradeQuote))
@@ -27,6 +28,21 @@ export const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assert
             args,
         });
     }
+    if (relayTransactionMetadata?.data) {
+        if (!relayTransactionMetadata.to) {
+            throw new Error('Missing Relay transaction destination address');
+        }
+        const to = TronWeb.address.fromHex(relayTransactionMetadata.to);
+        const isNativeTron = sellAsset.assetId === 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/esm/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/esm/types.js

@@ -8,7 +8,6 @@ export 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/esm/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/esm/utils.js

@@ -169,8 +169,7 @@ export const checkEvmSwapStatus = async ({ txHash, chainId, address, assertGetEv
             message: undefined,
         };
     }
-    catch (e) {
-        console.error(e);
+    catch {
         return createDefaultStatusResponse(txHash);
     }
 };
@@ -287,3 +286,9 @@ export const checkStarknetSwapStatus = async ({ txHash, assertGetStarknetChainAd
         return createDefaultStatusResponse(txHash);
     }
 };
+export class SolanaLogsError extends Error {
+    constructor(name) {
+        super(name);
+        this.name = name;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.6.11",
+  "version": "17.7.1",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -28,7 +28,6 @@
     "@coral-xyz/anchor": "0.29.0",
     "@cowprotocol/app-data": "^2.3.0",
     "@defuse-protocol/one-click-sdk-typescript": "^0.1.1-0.2",
-    "@jup-ag/api": "^6.0.30",
     "@mysten/sui": "^1.45.2",
     "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
     "@sniptt/monads": "^0.5.10",
@@ -51,10 +50,10 @@
     "uuid": "^9.0.0",
     "viem": "2.43.5",
     "@shapeshiftoss/caip": "^8.16.7",
+    "@shapeshiftoss/chain-adapters": "^11.3.9",
     "@shapeshiftoss/contracts": "^1.0.5-coderabbit-fix.2",
     "@shapeshiftoss/hdwallet-core": "^1.62.41",
     "@shapeshiftoss/types": "^8.6.7",
-    "@shapeshiftoss/chain-adapters": "^11.3.9",
     "@shapeshiftoss/unchained-client": "^10.14.10",
     "@shapeshiftoss/utils": "^1.0.5"
   },

package/dist/cjs/swappers/JupiterSwapper/JupiterSwapper.d.ts

@@ -1,2 +0,0 @@
-import type { Swapper } from '../../types';
-export declare const jupiterSwapper: Swapper;

package/dist/cjs/swappers/JupiterSwapper/JupiterSwapper.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jupiterSwapper = void 0;
-const __1 = require("../..");
-const errorPatterns_1 = require("./errorPatterns");
-exports.jupiterSwapper = {
-    executeSolanaTransaction: async (txToSign, callbacks) => {
-        try {
-            const txid = await (0, __1.executeSolanaTransaction)(txToSign, callbacks);
-            return txid;
-        }
-        catch (e) {
-            if (e instanceof Error) {
-                const errorMessage = e.message;
-                const swapperErrorType = Object.keys(errorPatterns_1.JUPITER_ERRORS).reduce((acc, errorPattern) => {
-                    if (errorMessage.includes(errorPattern)) {
-                        acc = errorPatterns_1.JUPITER_ERRORS[errorPattern];
-                    }
-                    return acc;
-                }, undefined);
-                if (swapperErrorType)
-                    throw new errorPatterns_1.SolanaLogsError(swapperErrorType);
-            }
-            throw e;
-        }
-    },
-};

package/dist/cjs/swappers/JupiterSwapper/endpoints.d.ts

@@ -1,2 +0,0 @@
-import type { SwapperApi } from '../../types';
-export declare const jupiterApi: SwapperApi;

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

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jupiterApi = void 0;
-const getSolanaTransactionFees_1 = require("../../solana-utils/getSolanaTransactionFees");
-const getUnsignedSolanaTransaction_1 = require("../../solana-utils/getUnsignedSolanaTransaction");
-const utils_1 = require("../../utils");
-const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
-const getTradeRate_1 = require("./swapperApi/getTradeRate");
-exports.jupiterApi = {
-    getTradeRate: getTradeRate_1.getTradeRate,
-    getTradeQuote: getTradeQuote_1.getTradeQuote,
-    getUnsignedSolanaTransaction: getUnsignedSolanaTransaction_1.getUnsignedSolanaTransaction,
-    getSolanaTransactionFees: getSolanaTransactionFees_1.getSolanaTransactionFees,
-    checkTradeStatus: utils_1.checkSolanaSwapStatus,
-};

package/dist/cjs/swappers/JupiterSwapper/errorPatterns.d.ts

@@ -1,15 +0,0 @@
-export declare class SolanaLogsError extends Error {
-    constructor(name: string);
-}
-export declare enum JUPITER_ERROR_PATTERNS {
-    SLIPPAGE_TOLERANCE_EXCEEDED = "SlippageToleranceExceeded",
-    JUPITER_SLIPPAGE_ERROR_CODE = "0x1771",
-    UNDER_MINIMUM_AMOUNT = "RequireGteViolated",
-    CONSUMED_MORE_FEES = "exceeded CUs meter"
-}
-export declare enum JUPITER_ERROR_NAME {
-    SLIPPAGE_TOLERANCE_EXCEEDED = "SlippageToleranceExceeded",
-    UNDER_MINIMUM_AMOUNT = "UnderMinimumAmount",
-    CONSUMED_MORE_FEES = "ConsumedMoreFees"
-}
-export declare const JUPITER_ERRORS: Record<JUPITER_ERROR_PATTERNS | string, string>;

package/dist/cjs/swappers/JupiterSwapper/errorPatterns.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JUPITER_ERRORS = exports.JUPITER_ERROR_NAME = exports.JUPITER_ERROR_PATTERNS = exports.SolanaLogsError = void 0;
-class SolanaLogsError extends Error {
-    constructor(name) {
-        super(name);
-        this.name = name;
-    }
-}
-exports.SolanaLogsError = SolanaLogsError;
-var JUPITER_ERROR_PATTERNS;
-(function (JUPITER_ERROR_PATTERNS) {
-    JUPITER_ERROR_PATTERNS["SLIPPAGE_TOLERANCE_EXCEEDED"] = "SlippageToleranceExceeded";
-    JUPITER_ERROR_PATTERNS["JUPITER_SLIPPAGE_ERROR_CODE"] = "0x1771";
-    JUPITER_ERROR_PATTERNS["UNDER_MINIMUM_AMOUNT"] = "RequireGteViolated";
-    JUPITER_ERROR_PATTERNS["CONSUMED_MORE_FEES"] = "exceeded CUs meter";
-})(JUPITER_ERROR_PATTERNS || (exports.JUPITER_ERROR_PATTERNS = JUPITER_ERROR_PATTERNS = {}));
-var JUPITER_ERROR_NAME;
-(function (JUPITER_ERROR_NAME) {
-    JUPITER_ERROR_NAME["SLIPPAGE_TOLERANCE_EXCEEDED"] = "SlippageToleranceExceeded";
-    JUPITER_ERROR_NAME["UNDER_MINIMUM_AMOUNT"] = "UnderMinimumAmount";
-    JUPITER_ERROR_NAME["CONSUMED_MORE_FEES"] = "ConsumedMoreFees";
-})(JUPITER_ERROR_NAME || (exports.JUPITER_ERROR_NAME = JUPITER_ERROR_NAME = {}));
-exports.JUPITER_ERRORS = {
-    [JUPITER_ERROR_PATTERNS.SLIPPAGE_TOLERANCE_EXCEEDED]: JUPITER_ERROR_NAME.SLIPPAGE_TOLERANCE_EXCEEDED,
-    [JUPITER_ERROR_PATTERNS.JUPITER_SLIPPAGE_ERROR_CODE]: JUPITER_ERROR_NAME.SLIPPAGE_TOLERANCE_EXCEEDED,
-    [JUPITER_ERROR_PATTERNS.UNDER_MINIMUM_AMOUNT]: JUPITER_ERROR_NAME.UNDER_MINIMUM_AMOUNT,
-    [JUPITER_ERROR_PATTERNS.CONSUMED_MORE_FEES]: JUPITER_ERROR_NAME.CONSUMED_MORE_FEES,
-};