@shapeshiftoss/swapper 17.6.10 → 17.7.0

package/dist/esm/thorchain-utils/solana/getSolanaTransactionFees.js

@@ -0,0 +1,37 @@
+import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
+import { PublicKey, SystemProgram, TransactionInstruction } from '@solana/web3.js';
+import { getExecutableTradeStep, isExecutableTradeQuote } from '../../utils.js';
+import { getThorTxData } from './getThorTxData.js';
+const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+export const getSolanaTransactionFees = async (args, swapperName) => {
+    const { tradeQuote, stepIndex, from, assertGetSolanaChainAdapter, config } = args;
+    if (!isExecutableTradeQuote(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const { memo } = tradeQuote;
+    if (!memo)
+        throw new Error('Memo is required');
+    const step = getExecutableTradeStep(tradeQuote, stepIndex);
+    const { sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset } = step;
+    const { vault } = await getThorTxData({ sellAsset, config, swapperName });
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    const memoInstruction = new TransactionInstruction({
+        keys: [],
+        programId: new PublicKey(MEMO_PROGRAM_ID),
+        data: Buffer.from(memo, 'utf8'),
+    });
+    const transferInstruction = SystemProgram.transfer({
+        fromPubkey: new PublicKey(from),
+        toPubkey: new PublicKey(vault),
+        lamports: BigInt(sellAmountIncludingProtocolFeesCryptoBaseUnit),
+    });
+    const { fast } = await adapter.getFeeData({
+        to: vault,
+        value: '0',
+        chainSpecific: {
+            from,
+            tokenId: contractAddressOrUndefined(sellAsset.assetId),
+            instructions: [memoInstruction, transferInstruction],
+        },
+    });
+    return fast.txFee;
+};

package/dist/esm/thorchain-utils/solana/getThorTxData.d.ts

@@ -0,0 +1,12 @@
+import type { Asset } from '@shapeshiftoss/types';
+import type { SwapperConfig, SwapperName } from '../../types.js';
+type GetThorTxDataArgs = {
+    sellAsset: Asset;
+    config: SwapperConfig;
+    swapperName: SwapperName;
+};
+type GetThorTxDataReturn = {
+    vault: string;
+};
+export declare const getThorTxData: ({ sellAsset, config, swapperName, }: GetThorTxDataArgs) => Promise<GetThorTxDataReturn>;
+export {};

package/dist/esm/thorchain-utils/solana/getThorTxData.js

@@ -0,0 +1,10 @@
+import { getInboundAddressDataForChain } from '../getInboundAddressDataForChain.js';
+import { getDaemonUrl } from '../index.js';
+export const getThorTxData = async ({ sellAsset, config, swapperName, }) => {
+    const daemonUrl = getDaemonUrl(config, swapperName);
+    const res = await getInboundAddressDataForChain(daemonUrl, sellAsset.assetId, false, swapperName);
+    if (res.isErr())
+        throw res.unwrapErr();
+    const { address: vault } = res.unwrap();
+    return { vault };
+};

package/dist/esm/thorchain-utils/solana/getUnsignedSolanaTransaction.d.ts

@@ -0,0 +1,3 @@
+import type { SolanaSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { GetUnsignedSolanaTransactionArgs, SwapperName } from '../../types.js';
+export declare const getUnsignedSolanaTransaction: (args: GetUnsignedSolanaTransactionArgs, swapperName: SwapperName) => Promise<SolanaSignTx>;

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

@@ -0,0 +1,60 @@
+import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
+import { PublicKey, SystemProgram, TransactionInstruction } from '@solana/web3.js';
+import { getExecutableTradeStep, isExecutableTradeQuote } from '../../utils.js';
+import { getThorTxData } from './getThorTxData.js';
+const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+// Each ComputeBudgetProgram instruction (setComputeUnitLimit, setComputeUnitPrice) costs 150 CU.
+// Fee estimation doesn't include these, so we add a fixed buffer to cover them.
+const COMPUTE_BUDGET_INSTRUCTION_OVERHEAD_CU = 300;
+export const getUnsignedSolanaTransaction = async (args, swapperName) => {
+    const { tradeQuote, stepIndex, from, assertGetSolanaChainAdapter, config } = args;
+    if (!isExecutableTradeQuote(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const { memo } = tradeQuote;
+    if (!memo)
+        throw new Error('Memo is required');
+    const step = getExecutableTradeStep(tradeQuote, stepIndex);
+    const { accountNumber, sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset } = step;
+    const { vault } = await getThorTxData({
+        sellAsset,
+        config,
+        swapperName,
+    });
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    const memoInstruction = new TransactionInstruction({
+        keys: [],
+        programId: new PublicKey(MEMO_PROGRAM_ID),
+        data: Buffer.from(memo, 'utf8'),
+    });
+    const transferInstruction = SystemProgram.transfer({
+        fromPubkey: new PublicKey(from),
+        toPubkey: new PublicKey(vault),
+        lamports: BigInt(sellAmountIncludingProtocolFeesCryptoBaseUnit),
+    });
+    const { fast } = await adapter.getFeeData({
+        to: vault,
+        value: '0',
+        chainSpecific: {
+            from,
+            tokenId: contractAddressOrUndefined(sellAsset.assetId),
+            instructions: [memoInstruction, transferInstruction],
+        },
+    });
+    const memoHdwalletInstruction = {
+        keys: [],
+        programId: MEMO_PROGRAM_ID,
+        data: Buffer.from(memo, 'utf8'),
+    };
+    return adapter.buildSendApiTransaction({
+        from,
+        to: vault,
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        accountNumber,
+        chainSpecific: {
+            instructions: [memoHdwalletInstruction],
+            computeUnitLimit: String(Number(fast.chainSpecific.computeUnits) + COMPUTE_BUDGET_INSTRUCTION_OVERHEAD_CU),
+            computeUnitPrice: fast.chainSpecific.priorityFee,
+            tokenId: contractAddressOrUndefined(sellAsset.assetId),
+        },
+    });
+};

package/dist/esm/thorchain-utils/solana/index.d.ts

@@ -0,0 +1,3 @@
+export * from './getThorTxData.js';
+export * from './getUnsignedSolanaTransaction.js';
+export * from './getSolanaTransactionFees.js';

package/dist/esm/thorchain-utils/solana/index.js

@@ -0,0 +1,3 @@
+export * from './getThorTxData.js';
+export * from './getUnsignedSolanaTransaction.js';
+export * from './getSolanaTransactionFees.js';

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,8 +1,7 @@
-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';
-import type { AccountMetadata, Asset, AssetsByIdPartial, CosmosSdkChainId, EvmChainId, KnownChainIds, NearChainId, OrderQuoteResponse, PartialRecord, TonChainId, TronChainId, UtxoAccountType, UtxoChainId } from '@shapeshiftoss/types';
+import type { AccountMetadata, Asset, AssetsByIdPartial, CosmosSdkChainId, EvmChainId, KnownChainIds, NearChainId, OrderQuoteResponse, PartialRecord, SolanaChainId, TonChainId, TronChainId, UtxoAccountType, UtxoChainId } from '@shapeshiftoss/types';
 import type { TxStatus } from '@shapeshiftoss/unchained-client';
 import type { Result } from '@sniptt/monads';
 import type { TransactionInstruction } from '@solana/web3.js';
@@ -13,6 +12,7 @@ import type { InterpolationOptions } from 'node-polyglot';
 import type { Address, Hex } from 'viem';
 import type { AcrossTransactionMetadata } from './swappers/AcrossSwapper/utils/types.js';
 import type { CowMessageToSign } from './swappers/CowSwapper/types.js';
+import type { DebridgeTransactionMetadata } from './swappers/DebridgeSwapper/utils/types.js';
 import type { RelayTransactionMetadata } from './swappers/RelaySwapper/utils/types.js';
 import type { makeSwapperAxiosServiceMonadic } from './utils.js';
 export type SwapperConfig = {
@@ -40,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;
@@ -50,6 +49,7 @@ export type SwapperConfig = {
     VITE_SUI_NODE_URL: string;
     VITE_ACROSS_API_URL: string;
     VITE_ACROSS_INTEGRATOR_ID: string;
+    VITE_DEBRIDGE_API_URL: string;
 };
 export declare enum SwapperName {
     Thorchain = "THORChain",
@@ -60,7 +60,6 @@ export declare enum SwapperName {
     ArbitrumBridge = "Arbitrum Bridge",
     Portals = "Portals",
     Chainflip = "Chainflip",
-    Jupiter = "Jupiter",
     Relay = "Relay",
     ButterSwap = "ButterSwap",
     Bebop = "Bebop",
@@ -69,7 +68,8 @@ export declare enum SwapperName {
     Sunio = "Sun.io",
     Avnu = "AVNU",
     Stonfi = "STON.fi",
-    Across = "Across"
+    Across = "Across",
+    Debridge = "deBridge"
 }
 export type SwapSource = SwapperName | `${SwapperName} • ${string}`;
 export type SwapErrorRight = {
@@ -133,6 +133,7 @@ type CommonTradeInputBase = {
     buyAsset: Asset;
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
     affiliateBps: string;
+    affiliateAddress?: string;
     allowMultiHop: boolean;
     slippageTolerancePercentageDecimal?: string;
 };
@@ -197,6 +198,15 @@ export type GetTonTradeQuoteInput = CommonTradeInput & {
 export type GetTonTradeRateInput = CommonTradeRateInput & {
     chainId: TonChainId;
 };
+export type GetSolanaTradeQuoteInputBase = CommonTradeInput & {
+    chainId: SolanaChainId;
+};
+export type GetSolanaTradeQuoteInput = CommonTradeInput & {
+    chainId: SolanaChainId;
+};
+export type GetSolanaTradeRateInput = CommonTradeRateInput & {
+    chainId: SolanaChainId;
+};
 type GetUtxoTradeQuoteWithWallet = CommonTradeQuoteInput & {
     chainId: UtxoChainId;
     accountType: UtxoAccountType;
@@ -210,9 +220,9 @@ export type GetUtxoTradeRateInput = CommonTradeRateInput & {
     xpub: string | undefined;
 };
 export type GetUtxoTradeQuoteInput = GetUtxoTradeQuoteWithWallet;
-export type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput | GetTronTradeQuoteInput | GetNearTradeQuoteInput | GetTonTradeQuoteInput;
-export type GetTradeRateInput = GetEvmTradeRateInput | GetCosmosSdkTradeRateInput | GetUtxoTradeRateInput | GetTronTradeRateInput | GetNearTradeRateInput | GetTonTradeRateInput;
-export type GetTradeQuoteInputWithWallet = GetUtxoTradeQuoteWithWallet | GetEvmTradeQuoteInputBase | GetCosmosSdkTradeQuoteInputBase | GetTronTradeQuoteInputBase | GetNearTradeQuoteInputBase | GetTonTradeQuoteInputBase;
+export type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput | GetTronTradeQuoteInput | GetNearTradeQuoteInput | GetTonTradeQuoteInput | GetSolanaTradeQuoteInput;
+export type GetTradeRateInput = GetEvmTradeRateInput | GetCosmosSdkTradeRateInput | GetUtxoTradeRateInput | GetTronTradeRateInput | GetNearTradeRateInput | GetTonTradeRateInput | GetSolanaTradeRateInput;
+export type GetTradeQuoteInputWithWallet = GetUtxoTradeQuoteWithWallet | GetEvmTradeQuoteInputBase | GetCosmosSdkTradeQuoteInputBase | GetTronTradeQuoteInputBase | GetNearTradeQuoteInputBase | GetTonTradeQuoteInputBase | GetSolanaTradeQuoteInputBase;
 export type EvmSwapperDeps = {
     assertGetEvmChainAdapter: (chainId: ChainId) => EvmChainAdapter;
     fetchIsSmartContractAddressQuery: (userAddress: string, chainId: ChainId) => Promise<boolean>;
@@ -247,6 +257,12 @@ export type SwapperDeps = {
     mixPanel: Mixpanel | undefined;
     assertGetChainAdapter: (chainId: ChainId) => ChainAdapter<KnownChainIds>;
 } & EvmSwapperDeps & UtxoSwapperDeps & CosmosSdkSwapperDeps & SolanaSwapperDeps & TronSwapperDeps & SuiSwapperDeps & NearSwapperDeps & StarknetSwapperDeps & TonSwapperDeps;
+export type AffiliateFee = {
+    assetId: AssetId;
+    amountCryptoBaseUnit: string;
+    asset: Asset;
+    isEstimate?: boolean;
+};
 export type TradeQuoteStep = {
     buyAmountBeforeFeesCryptoBaseUnit: string;
     buyAmountAfterFeesCryptoBaseUnit: string;
@@ -286,14 +302,17 @@ export type TradeQuoteStep = {
         value: Hex;
         gas?: string;
     };
-    jupiterQuoteResponse?: QuoteResponse;
+    bebopSolanaSerializedTx?: string;
+    bebopQuoteId?: string;
     solanaTransactionMetadata?: {
         addressLookupTableAddresses: string[];
         instructions?: TransactionInstruction[];
+        /** True when the serialized tx exceeds the 1232-byte Solana limit and needs Jito bundle splitting */
+        isOversized?: boolean;
     };
     cowswapQuoteResponse?: OrderQuoteResponse;
     chainflipSpecific?: {
-        chainflipSwapId?: number;
+        chainflipSwapId?: number | string;
         chainflipDepositAddress?: string;
         chainflipNumberOfChunks?: number;
         chainflipChunkIntervalBlocks?: number;
@@ -376,6 +395,8 @@ export type TradeQuoteStep = {
         params?: unknown;
     };
     acrossTransactionMetadata?: AcrossTransactionMetadata;
+    debridgeTransactionMetadata?: DebridgeTransactionMetadata;
+    affiliateFee?: AffiliateFee;
 };
 export type TradeRateStep = Omit<TradeQuoteStep, 'accountNumber'> & {
     accountNumber: undefined;
@@ -421,7 +442,7 @@ export type SwapExecutionMetadata = {
     inboundAddress?: string;
 };
 export type SwapperSpecificMetadata = {
-    chainflipSwapId: number | undefined;
+    chainflipSwapId: number | string | undefined;
     nearIntentsSpecific?: {
         depositAddress: string;
         depositMemo?: string;
@@ -430,6 +451,7 @@ export type SwapperSpecificMetadata = {
     };
     relayTransactionMetadata: RelayTransactionMetadata | undefined;
     acrossTransactionMetadata: AcrossTransactionMetadata | undefined;
+    debridgeTransactionMetadata: DebridgeTransactionMetadata | undefined;
     relayerExplorerTxLink: string | undefined;
     relayerTxHash: string | undefined;
     stepIndex: SupportedTradeQuoteStepIndex;
@@ -522,6 +544,15 @@ export type CosmosSdkTransactionExecutionProps = {
 };
 export type SolanaTransactionExecutionProps = {
     signAndBroadcastTransaction: (txToSign: SolanaSignTx) => Promise<string>;
+    /** Sign-only callback for Jito bundle flow (sign without broadcasting) */
+    signTransaction?: (txToSign: SolanaSignTx) => Promise<string>;
+};
+export type SolanaMessageToSign = {
+    serializedTx: string;
+    quoteId: string;
+};
+export type SolanaMessageExecutionProps = {
+    signSerializedTransaction: (serializedTx: string) => Promise<string[]>;
 };
 export type TronTransactionExecutionProps = {
     signAndBroadcastTransaction: (txToSign: tron.TronSignTx) => Promise<string>;
@@ -585,6 +616,7 @@ type TonAccountMetadata = {
 };
 export type GetUnsignedTonTransactionArgs = CommonGetUnsignedTransactionArgs & TonAccountMetadata & TonSwapperDeps;
 export type GetUnsignedEvmMessageArgs = CommonGetUnsignedTransactionArgs & EvmAccountMetadata & Omit<EvmSwapperDeps, 'fetchIsSmartContractAddressQuery'>;
+export type GetUnsignedSolanaMessageArgs = CommonGetUnsignedTransactionArgs;
 export type GetUnsignedUtxoTransactionArgs = CommonGetUnsignedTransactionArgs & UtxoAccountMetadata & UtxoSwapperDeps;
 export type GetUnsignedCosmosSdkTransactionArgs = CommonGetUnsignedTransactionArgs & CosmosSdkAccountMetadata & CosmosSdkSwapperDeps;
 export type UnsignedTx = Nominal<Record<string, any>, 'UnsignedTx'>;
@@ -610,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>;
@@ -621,6 +654,7 @@ export type Swapper = {
     executeUtxoTransaction?: (txToSign: SignTx<UtxoChainId>, callbacks: UtxoTransactionExecutionProps) => Promise<string>;
     executeCosmosSdkTransaction?: (txToSign: SignTx<CosmosSdkChainId>, callbacks: CosmosSdkTransactionExecutionProps) => Promise<string>;
     executeSolanaTransaction?: (txToSign: SolanaSignTx, callbacks: SolanaTransactionExecutionProps) => Promise<string>;
+    executeSolanaMessage?: (messageData: SolanaMessageToSign, callbacks: SolanaMessageExecutionProps, config: SwapperConfig) => Promise<string>;
     executeTronTransaction?: (txToSign: tron.TronSignTx, callbacks: TronTransactionExecutionProps) => Promise<string>;
     executeSuiTransaction?: (txToSign: SuiSignTx, callbacks: SuiTransactionExecutionProps) => Promise<string>;
     executeNearTransaction?: (txToSign: near.NearSignTx, callbacks: NearTransactionExecutionProps) => Promise<string>;
@@ -637,6 +671,7 @@ export type SwapperApi = {
     getUnsignedUtxoTransaction?: (input: GetUnsignedUtxoTransactionArgs) => Promise<SignTx<UtxoChainId>>;
     getUnsignedCosmosSdkTransaction?: (input: GetUnsignedCosmosSdkTransactionArgs) => Promise<SignTx<CosmosSdkChainId>>;
     getUnsignedSolanaTransaction?: (input: GetUnsignedSolanaTransactionArgs) => Promise<SolanaSignTx>;
+    getUnsignedSolanaMessage?: (input: GetUnsignedSolanaMessageArgs) => Promise<SolanaMessageToSign>;
     getUnsignedTronTransaction?: (input: GetUnsignedTronTransactionArgs) => Promise<tron.TronSignTx>;
     getUnsignedSuiTransaction?: (input: GetUnsignedSuiTransactionArgs) => Promise<SuiSignTx>;
     getUnsignedNearTransaction?: (input: GetUnsignedNearTransactionArgs) => Promise<near.NearSignTx>;
@@ -673,6 +708,7 @@ export type EvmMessageExecutionInput = CommonTradeExecutionInput & EvmMessageExe
 export type UtxoTransactionExecutionInput = CommonTradeExecutionInput & UtxoTransactionExecutionProps & UtxoAccountMetadata;
 export type CosmosSdkTransactionExecutionInput = CommonTradeExecutionInput & CosmosSdkTransactionExecutionProps & CosmosSdkAccountMetadata;
 export type SolanaTransactionExecutionInput = CommonTradeExecutionInput & SolanaTransactionExecutionProps & SolanaAccountMetadata;
+export type SolanaMessageExecutionInput = CommonTradeExecutionInput & SolanaMessageExecutionProps;
 export type TronTransactionExecutionInput = CommonTradeExecutionInput & TronTransactionExecutionProps & TronAccountMetadata;
 export type SuiTransactionExecutionInput = CommonTradeExecutionInput & SuiTransactionExecutionProps & SuiAccountMetadata;
 export type NearTransactionExecutionInput = CommonTradeExecutionInput & NearTransactionExecutionProps & NearAccountMetadata;

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";
@@ -18,6 +17,7 @@ export var SwapperName;
     SwapperName["Avnu"] = "AVNU";
     SwapperName["Stonfi"] = "STON.fi";
     SwapperName["Across"] = "Across";
+    SwapperName["Debridge"] = "deBridge";
 })(SwapperName || (SwapperName = {}));
 export var TradeQuoteError;
 (function (TradeQuoteError) {

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,7 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.6.10",
-  "packageManager": "yarn@3.5.0",
+  "version": "17.7.0",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -21,30 +20,16 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "yarn clean && yarn run -T tsc --build && yarn postbuild",
-    "clean": "rm -rf dist",
-    "dev": "yarn run -T tsc --build --watch",
-    "postbuild": "yarn postbuild:esm && yarn postbuild:cjs",
-    "postbuild:esm": "yarn run -T tsc-esm-fix --target=dist/esm --ext=.js",
-    "postbuild:cjs": "echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json"
-  },
   "dependencies": {
     "@arbitrum/sdk": "^4.0.1",
     "@avnu/avnu-sdk": "^4.0.1",
+    "@cetusprotocol/aggregator-sdk": "^1.4.2",
+    "@cetusprotocol/cetus-sui-clmm-sdk": "5.4.0",
     "@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",
-    "@shapeshiftoss/caip": "^8.16.7",
-    "@shapeshiftoss/chain-adapters": "^11.3.9",
-    "@shapeshiftoss/contracts": "^1.0.6",
-    "@shapeshiftoss/hdwallet-core": "^1.62.41",
-    "@shapeshiftoss/types": "^8.6.7",
-    "@shapeshiftoss/unchained-client": "^10.14.10",
-    "@shapeshiftoss/utils": "^1.0.6",
     "@sniptt/monads": "^0.5.10",
     "@solana/web3.js": "1.98.0",
     "@ston-fi/omniston-sdk": "^0.7.8",
@@ -63,7 +48,14 @@
     "qs": "^6.14.2",
     "retry-axios": "^2.6.0",
     "uuid": "^9.0.0",
-    "viem": "2.43.5"
+    "viem": "2.43.5",
+    "@shapeshiftoss/types": "^8.6.7",
+    "@shapeshiftoss/caip": "^8.16.7",
+    "@shapeshiftoss/utils": "^1.0.5",
+    "@shapeshiftoss/unchained-client": "^10.14.10",
+    "@shapeshiftoss/chain-adapters": "^11.3.9",
+    "@shapeshiftoss/hdwallet-core": "^1.62.41",
+    "@shapeshiftoss/contracts": "^1.0.5-coderabbit-fix.2"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",
@@ -71,5 +63,13 @@
     "@types/node-polyglot": "^2.4.2",
     "@types/qs": "^6.9.18",
     "@types/uuid": "^9.0.5"
+  },
+  "scripts": {
+    "build": "rm -rf dist && pnpm exec tsc --build && pnpm run postbuild",
+    "clean": "rm -rf dist node_modules",
+    "dev": "pnpm exec tsc --build --watch",
+    "postbuild": "pnpm run postbuild:esm && pnpm run postbuild:cjs",
+    "postbuild:esm": "pnpm exec tsc-esm-fix --target=dist/esm --ext=.js",
+    "postbuild:cjs": "echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json"
   }
 }

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.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,
-};