@shapeshiftoss/swapper 17.8.0 → 18.1.0

package/dist/esm/swappers/StonfiSwapper/utils/helpers.js

@@ -1,10 +1,11 @@
 import { fromAssetId } from '@shapeshiftoss/caip';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { bn, convertPrecision } from '@shapeshiftoss/utils';
-import { Err } from '@sniptt/monads';
+import { Err, Ok } from '@sniptt/monads';
 import { Blockchain } from '@ston-fi/omniston-sdk';
 import { TradeQuoteError } from '../../../types.js';
-import { makeSwapErrorRight } from '../../../utils.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
+import { omnistonManager } from './omnistonManager.js';
 export const isTonAsset = (asset) => {
     return asset.chainId === KnownChainIds.TonMainnet;
 };
@@ -23,41 +24,28 @@ export const assetToOmnistonAddress = (asset) => {
     }
     return null;
 };
-export const validateTonAssets = (sellAsset, buyAsset) => {
+export const assertValidTrade = ({ sellAsset, buyAsset, }) => {
     if (sellAsset.chainId !== KnownChainIds.TonMainnet) {
-        return {
-            isValid: false,
-            error: Err(makeSwapErrorRight({
-                message: `[Stonfi] Unsupported sell asset chain: ${sellAsset.chainId}`,
-                code: TradeQuoteError.UnsupportedChain,
-            })),
-        };
+        return Err(makeSwapErrorRight({
+            message: `[Stonfi] Unsupported sell asset chain: ${sellAsset.chainId}`,
+            code: TradeQuoteError.UnsupportedChain,
+        }));
     }
     if (buyAsset.chainId !== KnownChainIds.TonMainnet) {
-        return {
-            isValid: false,
-            error: Err(makeSwapErrorRight({
-                message: `[Stonfi] Cross-chain swaps not supported`,
-                code: TradeQuoteError.CrossChainNotSupported,
-            })),
-        };
+        return Err(makeSwapErrorRight({
+            message: `[Stonfi] Cross-chain swaps not supported`,
+            code: TradeQuoteError.CrossChainNotSupported,
+        }));
     }
     const bidAssetAddress = assetToOmnistonAddress(sellAsset);
     const askAssetAddress = assetToOmnistonAddress(buyAsset);
     if (!bidAssetAddress || !askAssetAddress) {
-        return {
-            isValid: false,
-            error: Err(makeSwapErrorRight({
-                message: `[Stonfi] Unable to convert assets to Omniston addresses`,
-                code: TradeQuoteError.UnsupportedTradePair,
-            })),
-        };
+        return Err(makeSwapErrorRight({
+            message: `[Stonfi] Unable to convert assets to Omniston addresses`,
+            code: TradeQuoteError.UnsupportedTradePair,
+        }));
     }
-    return {
-        isValid: true,
-        bidAssetAddress,
-        askAssetAddress,
-    };
+    return Ok({ bidAssetAddress, askAssetAddress });
 };
 export const calculateRate = (buyAmountCryptoBaseUnit, sellAmountCryptoBaseUnit, buyAssetPrecision, sellAssetPrecision) => {
     if (bn(buyAmountCryptoBaseUnit).gt(0) && bn(sellAmountCryptoBaseUnit).gt(0)) {
@@ -95,6 +83,25 @@ export const affiliateBpsToNumber = (affiliateBps) => {
         return 0;
     return parsed;
 };
+export const buildStonfiSpecific = (quote, bidAssetAddress, askAssetAddress) => ({
+    quoteId: quote.quoteId,
+    resolverId: quote.resolverId,
+    resolverName: quote.resolverName,
+    tradeStartDeadline: quote.tradeStartDeadline,
+    gasBudget: quote.gasBudget,
+    bidAssetAddress: quote.bidAssetAddress ?? bidAssetAddress,
+    askAssetAddress: quote.askAssetAddress ?? askAssetAddress,
+    bidUnits: quote.bidUnits,
+    askUnits: quote.askUnits,
+    referrerAddress: quote.referrerAddress,
+    referrerFeeAsset: quote.referrerFeeAsset,
+    referrerFeeUnits: quote.referrerFeeUnits,
+    protocolFeeAsset: quote.protocolFeeAsset,
+    protocolFeeUnits: quote.protocolFeeUnits,
+    quoteTimestamp: quote.quoteTimestamp,
+    estimatedGasConsumption: quote.estimatedGasConsumption,
+    params: quote.params,
+});
 export const waitForQuote = (omniston, request, timeoutMs) => {
     return new Promise(resolve => {
         const timer = setTimeout(() => {
@@ -122,3 +129,24 @@ export const waitForQuote = (omniston, request, timeoutMs) => {
         });
     });
 };
+export const waitForFirstTradeStatus = (request, timeoutMs) => {
+    const omniston = omnistonManager.getInstance();
+    return new Promise(resolve => {
+        const timer = setTimeout(() => {
+            subscription.unsubscribe();
+            resolve(null);
+        }, timeoutMs);
+        const subscription = omniston.trackTrade(request).subscribe({
+            next: (status) => {
+                clearTimeout(timer);
+                subscription.unsubscribe();
+                resolve(status);
+            },
+            error: err => {
+                console.error('[Stonfi] trackTrade error:', err);
+                clearTimeout(timer);
+                resolve(null);
+            },
+        });
+    });
+};

package/dist/esm/swappers/SunioSwapper/SunioSwapper.js

@@ -1,4 +1,4 @@
-import { executeTronTransaction } from '../../utils.js';
+import { executeTronTransaction } from '../../utils/index.js';
 export const sunioSwapper = {
     executeTronTransaction,
 };

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

@@ -2,7 +2,7 @@ import { tronAssetId, tronChainId } from '@shapeshiftoss/caip';
 import { toAddressNList } from '@shapeshiftoss/chain-adapters';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { TronWeb } from 'tronweb';
-import { createDefaultStatusResponse, getExecutableTradeStep, isExecutableTradeQuote, } from '../../utils.js';
+import { createDefaultStatusResponse, getExecutableTradeStep, isExecutableTradeQuote, } from '../../utils/index.js';
 import { getSunioTradeQuote } from './getSunioTradeQuote/getSunioTradeQuote.js';
 import { getSunioTradeRate } from './getSunioTradeRate/getSunioTradeRate.js';
 import { buildSwapExactInputParameters, SUNIO_SWAP_EXACT_INPUT_SELECTOR, } from './utils/buildSwapContractCall.js';
@@ -11,14 +11,8 @@ import { SUNIO_SMART_ROUTER_CONTRACT } from './utils/constants.js';
 import { getSunioTransactionFees } from './utils/getSunioTransactionFees.js';
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 export const sunioApi = {
-    getTradeQuote: async (input, deps) => {
-        const maybeTradeQuote = await getSunioTradeQuote(input, deps);
-        return maybeTradeQuote.map(quote => [quote]);
-    },
-    getTradeRate: async (input, deps) => {
-        const maybeTradeRate = await getSunioTradeRate(input, deps);
-        return maybeTradeRate.map(rate => [rate]);
-    },
+    getTradeQuote: (input, deps) => getSunioTradeQuote(input, deps),
+    getTradeRate: (input, deps) => getSunioTradeRate(input, deps),
     getUnsignedTronTransaction: async (args) => {
         const { tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, } = args;
         if (!isExecutableTradeQuote(tradeQuote)) {
@@ -26,10 +20,9 @@ export const sunioApi = {
         }
         const step = getExecutableTradeStep(tradeQuote, stepIndex);
         const adapter = assertGetTronChainAdapter(tronChainId);
-        const sunioMetadata = step.sunioTransactionMetadata;
-        if (!sunioMetadata) {
-            throw new Error('[Sun.io] Missing transaction metadata in quote');
-        }
+        const sunioTransactionData = step.sunioTransactionData;
+        if (!sunioTransactionData)
+            throw new Error('[Sun.io] Missing transaction data in quote');
         const rpcUrl = adapter.httpProvider.getRpcUrl();
         const tronWeb = new TronWeb({
             fullHost: rpcUrl,
@@ -37,7 +30,7 @@ export const sunioApi = {
                 ? { 'TRON-PRO-API-KEY': config.VITE_TRON_GRID_API_KEY }
                 : {},
         });
-        const routeParams = buildSwapRouteParameters(sunioMetadata.route, step.sellAmountIncludingProtocolFeesCryptoBaseUnit, step.buyAmountAfterFeesCryptoBaseUnit, tradeQuote.receiveAddress, slippageTolerancePercentageDecimal);
+        const routeParams = buildSwapRouteParameters(sunioTransactionData.route, step.sellAmountIncludingProtocolFeesCryptoBaseUnit, step.buyAmountAfterFeesCryptoBaseUnit, tradeQuote.receiveAddress, slippageTolerancePercentageDecimal);
         const parameters = buildSwapExactInputParameters(routeParams);
         const isSellingNativeTrx = step.sellAsset.assetId === tronAssetId;
         const callValue = isSellingNativeTrx

package/dist/esm/swappers/SunioSwapper/getSunioTradeQuote/getSunioTradeQuote.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { CommonTradeQuoteInput, GetTronTradeQuoteInput, SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types.js';
-export declare const getSunioTradeQuote: (input: GetTronTradeQuoteInput | CommonTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types.js';
+import type { SunioTradeQuoteInput } from '../types.js';
+export declare const getSunioTradeQuote: (input: SunioTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

package/dist/esm/swappers/SunioSwapper/getSunioTradeQuote/getSunioTradeQuote.js

@@ -1,4 +1,38 @@
-import { getQuoteOrRate } from '../utils/getQuoteOrRate.js';
-export const getSunioTradeQuote = (input, deps) => {
-    return getQuoteOrRate(input, deps);
+import { Err, Ok } from '@sniptt/monads';
+import { assertQuoteAddresses } from '../../../utils/index.js';
+import { getSunioStepData } from '../utils/getSunioStepData.js';
+import { getSunioTradeContext } from '../utils/getSunioTradeContext.js';
+export const getSunioTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const addresses = assertQuoteAddresses(input);
+    if (addresses.isErr())
+        return Err(addresses.unwrapErr());
+    const { sendAddress, receiveAddress } = addresses.unwrap();
+    const maybeContext = await getSunioTradeContext({ input, deps });
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await getSunioStepData({
+        ...stepDataArgs,
+        type: 'quote',
+        input,
+        from: sendAddress,
+    });
+    if (maybeStepData.isErr())
+        return Err(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit, sunioTransactionData } = maybeStepData.unwrap();
+    const tradeQuote = {
+        ...tradeCommon,
+        quoteOrRate: 'quote',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                sunioTransactionData,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
+    };
+    return Ok([tradeQuote]);
 };

package/dist/esm/swappers/SunioSwapper/getSunioTradeRate/getSunioTradeRate.d.ts

@@ -1,3 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { GetTradeRateInput, SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
-export declare const getSunioTradeRate: (input: GetTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate, SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types.js';
+import type { SunioTradeRateInput } from '../types.js';
+export declare const getSunioTradeRate: (input: SunioTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;

package/dist/esm/swappers/SunioSwapper/getSunioTradeRate/getSunioTradeRate.js

@@ -1,4 +1,27 @@
-import { getQuoteOrRate } from '../utils/getQuoteOrRate.js';
-export const getSunioTradeRate = (input, deps) => {
-    return getQuoteOrRate(input, deps);
+import { Err, Ok } from '@sniptt/monads';
+import { getSunioStepData } from '../utils/getSunioStepData.js';
+import { getSunioTradeContext } from '../utils/getSunioTradeContext.js';
+export const getSunioTradeRate = async (input, deps) => {
+    const { accountNumber, receiveAddress } = input;
+    const maybeContext = await getSunioTradeContext({ input, deps });
+    if (maybeContext.isErr())
+        return Err(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await getSunioStepData({ ...stepDataArgs, type: 'rate', input });
+    if (maybeStepData.isErr())
+        return Err(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeRate = {
+        ...tradeCommon,
+        quoteOrRate: 'rate',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
+    };
+    return Ok([tradeRate]);
 };

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

@@ -1,5 +1,8 @@
 import type { tronChainId } from '@shapeshiftoss/caip';
+import type { GetTronTradeQuoteInput, GetTronTradeRateInput } from '../../types.js';
 export type SunioSupportedChainId = typeof tronChainId;
+export type SunioTradeQuoteInput = GetTronTradeQuoteInput;
+export type SunioTradeRateInput = GetTronTradeRateInput;
 export type SunioRoute = {
     amountIn: string;
     amountOut: string;
@@ -13,6 +16,9 @@ export type SunioRoute = {
     poolVersions: string[];
     stepAmountsOut: string[];
 };
+export type SunioTransactionData = {
+    route: SunioRoute;
+};
 export type SunioQuoteResponse = {
     code: number;
     message: string;

package/dist/esm/swappers/SunioSwapper/utils/fetchFromSunio.js

@@ -1,8 +1,8 @@
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
-import { makeSwapErrorRight } from '../../../utils.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
 import { SUNIO_API_BASE_URL, SUNIO_DEX_TYPES } from './constants.js';
-import { assetIdToTronToken } from './helpers/helpers.js';
+import { assetIdToTronToken } from './helpers.js';
 export const fetchSunioQuote = async (params, service) => {
     try {
         const { sellAssetId, buyAssetId, sellAmountCryptoBaseUnit } = params;

package/dist/esm/swappers/SunioSwapper/utils/getSunioStepData.d.ts

@@ -0,0 +1,21 @@
+import type { Result } from '@sniptt/monads';
+import type { StepDataArgs, SwapErrorRight } from '../../../types.js';
+import type { SunioRoute, SunioTransactionData } from '../types.js';
+type BaseArgs = {
+    route: SunioRoute;
+};
+export type GetSunioStepDataArgs = StepDataArgs<BaseArgs>;
+type SunioRateStepData = {
+    networkFeeCryptoBaseUnit: string | undefined;
+};
+type SunioQuoteStepData = {
+    networkFeeCryptoBaseUnit: string;
+    sunioTransactionData: SunioTransactionData;
+};
+export declare function getSunioStepData(args: Extract<GetSunioStepDataArgs, {
+    type: 'rate';
+}>): Promise<Result<SunioRateStepData, SwapErrorRight>>;
+export declare function getSunioStepData(args: Extract<GetSunioStepDataArgs, {
+    type: 'quote';
+}>): Promise<Result<SunioQuoteStepData, SwapErrorRight>>;
+export {};

package/dist/esm/swappers/SunioSwapper/utils/getSunioStepData.js

@@ -0,0 +1,39 @@
+import { contractAddressOrUndefined } from '@shapeshiftoss/utils';
+import { Err, Ok } from '@sniptt/monads';
+import { makeNetworkFeeEstimationFailedErr } from '../../../utils/index.js';
+import { estimateSunioNetworkFeeCryptoBaseUnit } from './estimateSunioNetworkFee.js';
+export async function getSunioStepData(args) {
+    const { type, route, sellAsset, from, input, deps } = args;
+    const estimateArgs = {
+        rpcUrl: deps.config.VITE_TRON_NODE_URL,
+        apiKey: deps.config.VITE_TRON_GRID_API_KEY,
+        route,
+        sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        isSellingNativeTrx: !contractAddressOrUndefined(sellAsset.assetId),
+        address: from,
+        slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
+    };
+    if (type === 'rate') {
+        const networkFeeCryptoBaseUnit = await (async () => {
+            try {
+                return await estimateSunioNetworkFeeCryptoBaseUnit(estimateArgs);
+            }
+            catch {
+                return undefined;
+            }
+        })();
+        const stepData = { networkFeeCryptoBaseUnit };
+        return Ok(stepData);
+    }
+    try {
+        const networkFeeCryptoBaseUnit = await estimateSunioNetworkFeeCryptoBaseUnit(estimateArgs);
+        const stepData = {
+            networkFeeCryptoBaseUnit,
+            sunioTransactionData: { route },
+        };
+        return Ok(stepData);
+    }
+    catch (error) {
+        return Err(makeNetworkFeeEstimationFailedErr('getSunioStepData', error));
+    }
+}

package/dist/esm/swappers/SunioSwapper/utils/getSunioTradeContext.d.ts

@@ -0,0 +1,15 @@
+import type { Result } from '@sniptt/monads';
+import type { QuoteFeeData, SwapErrorRight, SwapperDeps, TradeCommon, TradeStepCommon } from '../../../types.js';
+import type { SunioTradeQuoteInput, SunioTradeRateInput } from '../types.js';
+import type { GetSunioStepDataArgs } from './getSunioStepData.js';
+type SunioTradeContext = {
+    tradeCommon: TradeCommon;
+    stepCommon: Omit<TradeStepCommon, 'feeData'>;
+    protocolFees: QuoteFeeData['protocolFees'];
+    stepDataArgs: Omit<GetSunioStepDataArgs, 'type' | 'input' | 'from'>;
+};
+export declare const getSunioTradeContext: ({ input, deps, }: {
+    input: SunioTradeQuoteInput | SunioTradeRateInput;
+    deps: SwapperDeps;
+}) => Promise<Result<SunioTradeContext, SwapErrorRight>>;
+export {};

package/dist/esm/swappers/SunioSwapper/utils/getSunioTradeContext.js

@@ -0,0 +1,93 @@
+import { BigAmount, bn } from '@shapeshiftoss/utils';
+import { Err, Ok } from '@sniptt/monads';
+import { SwapperName, TradeQuoteError } from '../../../types.js';
+import { getInputOutputRate, makeSwapErrorRight } from '../../../utils/index.js';
+import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
+import { DEFAULT_SLIPPAGE_PERCENTAGE, SUNIO_SMART_ROUTER_CONTRACT } from './constants.js';
+import { fetchSunioQuote } from './fetchFromSunio.js';
+import { assertValidTrade } from './helpers.js';
+import { sunioServiceFactory } from './sunioService.js';
+export const getSunioTradeContext = async ({ input, deps, }) => {
+    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps, slippageTolerancePercentageDecimal, } = input;
+    const assertion = assertValidTrade({ sellAsset, buyAsset });
+    if (assertion.isErr())
+        return Err(assertion.unwrapErr());
+    try {
+        const maybeQuoteResponse = await fetchSunioQuote({
+            sellAssetId: sellAsset.assetId,
+            buyAssetId: buyAsset.assetId,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        }, sunioServiceFactory());
+        if (maybeQuoteResponse.isErr())
+            return Err(maybeQuoteResponse.unwrapErr());
+        const bestRoute = maybeQuoteResponse.unwrap().data[0];
+        if (!bestRoute) {
+            return Err(makeSwapErrorRight({
+                message: '[Sun.io] No routes available',
+                code: TradeQuoteError.NoRouteFound,
+            }));
+        }
+        const buyAmountCryptoBaseUnit = BigAmount.fromPrecision({
+            value: bestRoute.amountOut,
+            precision: buyAsset.precision,
+        }).toBaseUnit();
+        const rate = getInputOutputRate({
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            buyAmountCryptoBaseUnit,
+            sellAsset,
+            buyAsset,
+        });
+        const protocolFeeCryptoBaseUnit = bn(bestRoute.fee)
+            .times(sellAmountIncludingProtocolFeesCryptoBaseUnit)
+            .toFixed(0);
+        const protocolFees = (() => {
+            if (bn(protocolFeeCryptoBaseUnit).lte(0))
+                return;
+            return {
+                [sellAsset.assetId]: {
+                    amountCryptoBaseUnit: protocolFeeCryptoBaseUnit,
+                    requiresBalance: false,
+                    asset: sellAsset,
+                },
+            };
+        })();
+        return Ok({
+            tradeCommon: {
+                id: crypto.randomUUID(),
+                rate,
+                affiliateBps,
+                slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ?? DEFAULT_SLIPPAGE_PERCENTAGE,
+                swapperName: SwapperName.Sunio,
+            },
+            stepCommon: {
+                buyAmountBeforeFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
+                buyAmountAfterFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
+                sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                rate,
+                source: SwapperName.Sunio,
+                buyAsset,
+                sellAsset,
+                allowanceContract: SUNIO_SMART_ROUTER_CONTRACT,
+                estimatedExecutionTimeMs: undefined,
+                affiliateFee: buildAffiliateFee({
+                    strategy: 'buy_asset',
+                    affiliateBps,
+                    sellAsset,
+                    buyAsset,
+                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                    buyAmountCryptoBaseUnit,
+                    isEstimate: true,
+                }),
+            },
+            protocolFees,
+            stepDataArgs: { deps, sellAsset, route: bestRoute },
+        });
+    }
+    catch (error) {
+        return Err(makeSwapErrorRight({
+            message: '[Sun.io] Failed to get trade',
+            code: TradeQuoteError.UnknownError,
+            cause: error,
+        }));
+    }
+};

package/dist/esm/swappers/SunioSwapper/utils/getSunioTransactionFees.js

@@ -1,12 +1,12 @@
 import { tronAssetId, tronChainId } from '@shapeshiftoss/caip';
-import { getExecutableTradeStep, isExecutableTradeQuote } from '../../../utils.js';
+import { getExecutableTradeStep, isExecutableTradeQuote } from '../../../utils/index.js';
 import { estimateSunioNetworkFeeCryptoBaseUnit } from './estimateSunioNetworkFee.js';
 export const getSunioTransactionFees = async ({ tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, }) => {
     if (!isExecutableTradeQuote(tradeQuote))
         throw new Error('Unable to execute a trade rate quote');
     const step = getExecutableTradeStep(tradeQuote, stepIndex);
     const storedNetworkFeeCryptoBaseUnit = step.feeData.networkFeeCryptoBaseUnit;
-    const route = step.sunioTransactionMetadata?.route;
+    const route = step.sunioTransactionData?.route;
     if (!route) {
         if (!storedNetworkFeeCryptoBaseUnit)
             throw new Error('Missing network fee in quote');

package/dist/esm/swappers/SunioSwapper/utils/helpers.d.ts

@@ -0,0 +1,10 @@
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight } from '../../../types.js';
+export declare const isSupportedChainId: (chainId: string) => boolean;
+export declare const assetIdToTronToken: (assetId: AssetId) => string;
+export declare const assertValidTrade: ({ sellAsset, buyAsset, }: {
+    sellAsset: Asset;
+    buyAsset: Asset;
+}) => Result<void, SwapErrorRight>;

package/dist/esm/swappers/SunioSwapper/utils/helpers.js

@@ -0,0 +1,38 @@
+import { fromAssetId, tronChainId } from '@shapeshiftoss/caip';
+import { isToken } from '@shapeshiftoss/utils';
+import { Err, Ok } from '@sniptt/monads';
+import { SwapperName, TradeQuoteError } from '../../../types.js';
+import { makeSwapErrorRight } from '../../../utils/index.js';
+import { SUNIO_SUPPORTED_CHAIN_IDS, SUNIO_TRON_NATIVE_ADDRESS } from './constants.js';
+export const isSupportedChainId = (chainId) => {
+    return SUNIO_SUPPORTED_CHAIN_IDS.includes(chainId);
+};
+export const assetIdToTronToken = (assetId) => {
+    if (isToken(assetId)) {
+        const { assetReference } = fromAssetId(assetId);
+        return assetReference;
+    }
+    return SUNIO_TRON_NATIVE_ADDRESS;
+};
+export const assertValidTrade = ({ sellAsset, buyAsset, }) => {
+    if (!isSupportedChainId(sellAsset.chainId)) {
+        return Err(makeSwapErrorRight({
+            message: `[${SwapperName.Sunio}] Unsupported chainId: ${sellAsset.chainId}`,
+            code: TradeQuoteError.UnsupportedChain,
+            details: { chainId: sellAsset.chainId },
+        }));
+    }
+    if (sellAsset.chainId !== buyAsset.chainId) {
+        return Err(makeSwapErrorRight({
+            message: `[${SwapperName.Sunio}] Cross-chain not supported`,
+            code: TradeQuoteError.CrossChainNotSupported,
+        }));
+    }
+    if (sellAsset.chainId !== tronChainId) {
+        return Err(makeSwapErrorRight({
+            message: `[${SwapperName.Sunio}] Only TRON chain supported`,
+            code: TradeQuoteError.UnsupportedChain,
+        }));
+    }
+    return Ok(undefined);
+};

package/dist/esm/swappers/SunioSwapper/utils/sunioService.js

@@ -1,4 +1,4 @@
-import { createCache, makeSwapperAxiosServiceMonadic } from '../../../utils.js';
+import { createCache, makeSwapperAxiosServiceMonadic } from '../../../utils/index.js';
 const maxAge = 5 * 1000;
 const cachedUrls = ['/swap/router'];
 export const sunioServiceFactory = () => {

package/dist/esm/swappers/ThorchainSwapper/ThorchainSwapper.js

@@ -1,4 +1,4 @@
-import { executeEvmTransaction } from '../../utils.js';
+import { executeEvmTransaction } from '../../utils/index.js';
 export const thorchainSwapper = {
     executeEvmTransaction,
     executeCosmosSdkTransaction: (txToSign, { signAndBroadcastTransaction }) => {

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

@@ -1,78 +1,25 @@
-import { cosmosAssetId, rujiAssetId, tcyAssetId, thorchainAssetId } from '@shapeshiftoss/caip';
-import { checkTradeStatus, cosmossdk, evm, getInboundAddressDataForChain, solana, tron, utxo, } from '../../thorchain-utils/index.js';
 import { SwapperName } from '../../types.js';
-import { getExecutableTradeStep, isExecutableTradeQuote } from '../../utils.js';
+import { getCosmosSdkTransactionFees, getUnsignedCosmosSdkTransaction } from '../../utils/cosmossdk/index.js';
+import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
+import { getSolanaTransactionFees, getUnsignedSolanaTransaction } from '../../utils/solana/index.js';
+import { checkTradeStatus, tron } from '../../utils/thorchain/index.js';
+import { getUnsignedUtxoTransaction, getUtxoTransactionFees } from '../../utils/utxo/index.js';
 import { getTradeQuote } from './getTradeQuote/getTradeQuote.js';
 import { getTradeRate } from './getTradeRate/getTradeRate.js';
 const swapperName = SwapperName.Thorchain;
 export const thorchainApi = {
-    getTradeRate,
-    getTradeQuote,
-    getUnsignedEvmTransaction: input => evm.getUnsignedEvmTransaction(input, swapperName),
-    getEvmTransactionFees: input => evm.getEvmTransactionFees(input, swapperName),
-    getUnsignedUtxoTransaction: input => utxo.getUnsignedUtxoTransaction(input, swapperName),
-    getUtxoTransactionFees: input => utxo.getUtxoTransactionFees(input, swapperName),
-    getUnsignedSolanaTransaction: input => solana.getUnsignedSolanaTransaction(input, swapperName),
-    getSolanaTransactionFees: input => solana.getSolanaTransactionFees(input, swapperName),
+    getTradeRate: (input, deps) => getTradeRate(input, deps),
+    getTradeQuote: (input, deps) => getTradeQuote(input, deps),
+    getUnsignedEvmTransaction,
+    getEvmTransactionFees,
+    getUnsignedUtxoTransaction,
+    getUtxoTransactionFees,
+    getUnsignedCosmosSdkTransaction,
+    getCosmosSdkTransactionFees,
+    getUnsignedSolanaTransaction,
+    getSolanaTransactionFees,
     getUnsignedTronTransaction: input => tron.getUnsignedTronTransaction(input, swapperName),
     getTronTransactionFees: input => tron.getTronTransactionFees(input, swapperName),
-    getUnsignedCosmosSdkTransaction: async ({ tradeQuote, stepIndex, from, config, assertGetCosmosSdkChainAdapter, }) => {
-        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, feeData } = step;
-        const gas = feeData.chainSpecific.estimatedGasCryptoBaseUnit;
-        const fee = feeData.networkFeeCryptoBaseUnit ?? '0';
-        switch (sellAsset.assetId) {
-            case thorchainAssetId:
-            case rujiAssetId:
-            case tcyAssetId: {
-                const coin = (() => {
-                    if (sellAsset.assetId === tcyAssetId)
-                        return 'THOR.TCY';
-                    if (sellAsset.assetId === rujiAssetId)
-                        return 'THOR.RUJI';
-                    return 'THOR.RUNE';
-                })();
-                const adapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
-                const { txToSign } = await adapter.buildDepositTransaction({
-                    accountNumber,
-                    from,
-                    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    memo,
-                    chainSpecific: {
-                        gas,
-                        fee,
-                        coin,
-                    },
-                });
-                return txToSign;
-            }
-            case cosmosAssetId: {
-                const adapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
-                const url = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;
-                const data = await getInboundAddressDataForChain(url, cosmosAssetId, true, swapperName);
-                if (data.isErr())
-                    throw data.unwrapErr();
-                const { address: vault } = data.unwrap();
-                const { txToSign } = await adapter.buildSendApiTransaction({
-                    accountNumber,
-                    from,
-                    to: vault,
-                    value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    memo,
-                    chainSpecific: { gas, fee },
-                });
-                return txToSign;
-            }
-            default:
-                throw Error(`Unsupported sellAsset: ${sellAsset.assetId}`);
-        }
-    },
-    getCosmosSdkTransactionFees: input => cosmossdk.getCosmosSdkTransactionFees(input),
     checkTradeStatus: input => {
         const { config } = input;
         const nodeUrl = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;