@shapeshiftoss/swapper 17.7.2 → 17.8.0

package/dist/cjs/swappers/SunioSwapper/utils/estimateSunioNetworkFee.d.ts

@@ -0,0 +1,12 @@
+import type { SunioRoute } from '../types';
+type EstimateSunioNetworkFeeArgs = {
+    rpcUrl: string;
+    apiKey: string;
+    route: SunioRoute;
+    sellAmountCryptoBaseUnit: string;
+    isSellingNativeTrx: boolean;
+    address: string | undefined;
+    slippageTolerancePercentageDecimal: string | undefined;
+};
+export declare const estimateSunioNetworkFeeCryptoBaseUnit: ({ rpcUrl, apiKey, route, sellAmountCryptoBaseUnit, isSellingNativeTrx, address, slippageTolerancePercentageDecimal, }: EstimateSunioNetworkFeeArgs) => Promise<string>;
+export {};

package/dist/cjs/swappers/SunioSwapper/utils/estimateSunioNetworkFee.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateSunioNetworkFeeCryptoBaseUnit = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const tronweb_1 = require("tronweb");
+const buildSwapContractCall_1 = require("./buildSwapContractCall");
+const buildSwapRouteParameters_1 = require("./buildSwapRouteParameters");
+const constants_1 = require("./constants");
+// Estimates the network fee (in TRX base units) for a Sun.io swap. The router sponsors only ~1%
+// of energy (origin_energy_usage); the user pays the rest, so we simulate the real swapExactInput
+// call when we have an address to estimate from. The simulation reverts before approval for TRC20
+// sells (and when the account lacks the sell balance), so we fall back to a conservative per-sell-
+// type constant. Used both at quote time and re-run at confirm time, where a now-granted allowance
+// lets the simulation produce the true cost.
+const estimateSunioNetworkFeeCryptoBaseUnit = async ({ rpcUrl, apiKey, route, sellAmountCryptoBaseUnit, isSellingNativeTrx, address, slippageTolerancePercentageDecimal, }) => {
+    const tronGridHeaders = apiKey ? { 'TRON-PRO-API-KEY': apiKey } : {};
+    const tronWeb = new tronweb_1.TronWeb({ fullHost: rpcUrl, headers: tronGridHeaders });
+    // Live network prices, defaulting if the node is unavailable so we still produce a fee
+    const { bandwidthPrice, energyPrice } = await (async () => {
+        try {
+            const params = await tronWeb.trx.getChainParameters();
+            return {
+                bandwidthPrice: params.find(p => p.key === 'getTransactionFee')?.value ?? 1000,
+                energyPrice: params.find(p => p.key === 'getEnergyFee')?.value ?? 100,
+            };
+        }
+        catch {
+            return { bandwidthPrice: 1000, energyPrice: 100 };
+        }
+    })();
+    // Account activation (1 TRX) is only charged when the recipient receives native TRX, mirroring
+    // the chain adapter. A TRC20 buy doesn't incur the flat activation fee (its account-creation
+    // cost is folded into energy). Only checkable with an address.
+    const isBuyingNativeTrx = route.tokens[route.tokens.length - 1] === constants_1.SUNIO_TRON_NATIVE_ADDRESS;
+    const accountActivationFee = await (async () => {
+        if (!address || !isBuyingNativeTrx)
+            return 0;
+        try {
+            const recipientInfoResponse = await fetch(`${rpcUrl}/wallet/getaccount`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', ...tronGridHeaders },
+                body: JSON.stringify({ address, visible: true }),
+            });
+            const recipientInfo = await recipientInfoResponse.json();
+            const recipientExists = recipientInfo && Object.keys(recipientInfo).length > 1;
+            return recipientExists ? 0 : 1_000_000; // 1 TRX
+        }
+        catch {
+            return 0;
+        }
+    })();
+    const energyUsed = await (async () => {
+        // TRC20 sells cost far more energy than native sells (the extra transferFrom token pull)
+        const fallbackEnergy = isSellingNativeTrx
+            ? constants_1.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE
+            : constants_1.SUNIO_FALLBACK_SWAP_ENERGY_TRC20;
+        if (!address)
+            return fallbackEnergy;
+        try {
+            const routeParams = (0, buildSwapRouteParameters_1.buildSwapRouteParameters)(route, sellAmountCryptoBaseUnit, '0', address, slippageTolerancePercentageDecimal ?? constants_1.DEFAULT_SLIPPAGE_PERCENTAGE);
+            const callValue = isSellingNativeTrx ? Number(sellAmountCryptoBaseUnit) : 0;
+            const result = await tronWeb.transactionBuilder.triggerConstantContract(constants_1.SUNIO_SMART_ROUTER_CONTRACT, buildSwapContractCall_1.SUNIO_SWAP_EXACT_INPUT_SELECTOR, { callValue }, (0, buildSwapContractCall_1.buildSwapExactInputParameters)(routeParams), address);
+            // A reverted simulation (e.g. TRC20 sell pre-approval) can still return a small energy_used;
+            // only trust it when the call actually succeeded, otherwise use the conservative fallback.
+            if (result?.result?.result !== true || result.energy_used == null)
+                return fallbackEnergy;
+            return result.energy_used;
+        }
+        catch {
+            return fallbackEnergy;
+        }
+    })();
+    // 1.2x safety margin for energy price/usage variance between estimate and execution
+    const energyFee = Math.ceil(energyUsed * energyPrice * 1.2);
+    const bandwidthFee = 1100 * bandwidthPrice;
+    return (0, utils_1.bn)(energyFee).plus(bandwidthFee).plus(accountActivationFee).toFixed(0);
+};
+exports.estimateSunioNetworkFeeCryptoBaseUnit = estimateSunioNetworkFeeCryptoBaseUnit;

package/dist/cjs/swappers/SunioSwapper/utils/getQuoteOrRate.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQuoteOrRate = getQuoteOrRate;
+exports.getQuoteOrRate = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const tronweb_1 = require("tronweb");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const affiliateFee_1 = require("../../utils/affiliateFee");
 const constants_1 = require("./constants");
+const estimateSunioNetworkFee_1 = require("./estimateSunioNetworkFee");
 const fetchFromSunio_1 = require("./fetchFromSunio");
 const helpers_1 = require("./helpers/helpers");
 const sunioService_1 = require("./sunioService");
@@ -60,83 +60,25 @@ async function getQuoteOrRate(input, deps) {
                 code: types_1.TradeQuoteError.InternalError,
             }));
         }
-        // Fetch network fees for both quotes and rates (when wallet connected)
-        let networkFeeCryptoBaseUnit = undefined;
-        // Estimate fees when we have an address to estimate from
-        if (receiveAddress) {
+        const networkFeeCryptoBaseUnit = await (async () => {
             try {
-                const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
-                const isSellingNativeTrx = !contractAddress;
-                const tronWeb = new tronweb_1.TronWeb({ fullHost: deps.config.VITE_TRON_NODE_URL });
-                // Get chain parameters for pricing
-                const params = await tronWeb.trx.getChainParameters();
-                const bandwidthPrice = params.find(p => p.key === 'getTransactionFee')?.value ?? 1000;
-                const energyPrice = params.find(p => p.key === 'getEnergyFee')?.value ?? 100;
-                // Check if recipient needs activation (applies to all swaps)
-                let accountActivationFee = 0;
-                try {
-                    const recipientInfoResponse = await fetch(`${deps.config.VITE_TRON_NODE_URL}/wallet/getaccount`, {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify({ address: receiveAddress, visible: true }),
-                    });
-                    const recipientInfo = await recipientInfoResponse.json();
-                    const recipientExists = recipientInfo && Object.keys(recipientInfo).length > 1;
-                    if (!recipientExists) {
-                        accountActivationFee = 1_000_000; // 1 TRX
-                    }
-                }
-                catch {
-                    // Ignore activation check errors
-                }
-                // For native TRX swaps, Sun.io uses a contract call with value
-                // We need to estimate energy for the swap contract, not just bandwidth
-                if (isSellingNativeTrx) {
-                    try {
-                        // Sun.io contract owner provides most energy (~117k), users only pay ~2k
-                        // Use fixed 2k energy estimate instead of querying (which returns total 120k)
-                        const energyUsed = 2000; // User pays ~2k energy, contract covers the rest
-                        const energyFee = energyUsed * energyPrice; // No multiplier - contract provides energy
-                        // Estimate bandwidth for contract call (much larger than simple transfer)
-                        const bandwidthFee = 1100 * bandwidthPrice; // ~1100 bytes for contract call (with safety buffer)
-                        networkFeeCryptoBaseUnit = (0, utils_1.bn)(energyFee)
-                            .plus(bandwidthFee)
-                            .plus(accountActivationFee)
-                            .toFixed(0);
-                    }
-                    catch (estimationError) {
-                        // Fallback estimate: ~2k energy + ~1100 bytes bandwidth + activation fee
-                        const fallbackEnergyFee = 2000 * energyPrice;
-                        const fallbackBandwidthFee = 1100 * bandwidthPrice;
-                        networkFeeCryptoBaseUnit = (0, utils_1.bn)(fallbackEnergyFee)
-                            .plus(fallbackBandwidthFee)
-                            .plus(accountActivationFee)
-                            .toFixed(0);
-                    }
-                }
-                else {
-                    // For TRC-20 swaps through Sun.io router
-                    // Same as TRX: contract owner provides most energy, user pays ~2k
-                    // Sun.io provides ~217k energy, user pays ~2k
-                    const energyFee = 2000 * energyPrice;
-                    const bandwidthFee = 1100 * bandwidthPrice;
-                    networkFeeCryptoBaseUnit = (0, utils_1.bn)(energyFee)
-                        .plus(bandwidthFee)
-                        .plus(accountActivationFee)
-                        .toFixed(0);
-                }
+                return await (0, estimateSunioNetworkFee_1.estimateSunioNetworkFeeCryptoBaseUnit)({
+                    rpcUrl: deps.config.VITE_TRON_NODE_URL,
+                    apiKey: deps.config.VITE_TRON_GRID_API_KEY,
+                    route: bestRoute,
+                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                    isSellingNativeTrx: !(0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+                    address: receiveAddress,
+                    slippageTolerancePercentageDecimal,
+                });
             }
             catch (error) {
-                // For rates, fall back to '0' on estimation failure
-                // For quotes, let it error (required for accurate swap)
-                if (!isQuote) {
-                    networkFeeCryptoBaseUnit = '0';
-                }
-                else {
-                    throw error;
-                }
+                // For rates, fall back to '0' on unexpected failure; quotes require an accurate fee
+                if (!isQuote)
+                    return '0';
+                throw error;
             }
-        }
+        })();
         const buyAmountCryptoBaseUnit = utils_1.BigAmount.fromPrecision({
             value: bestRoute.amountOut,
             precision: buyAsset.precision,
@@ -211,3 +153,4 @@ async function getQuoteOrRate(input, deps) {
         }));
     }
 }
+exports.getQuoteOrRate = getQuoteOrRate;

package/dist/cjs/swappers/SunioSwapper/utils/getSunioTransactionFees.d.ts

@@ -0,0 +1,2 @@
+import type { GetUnsignedTronTransactionArgs } from '../../../types';
+export declare const getSunioTransactionFees: ({ tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, }: GetUnsignedTronTransactionArgs) => Promise<string>;

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSunioTransactionFees = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const utils_1 = require("../../../utils");
+const estimateSunioNetworkFee_1 = require("./estimateSunioNetworkFee");
+const getSunioTransactionFees = async ({ tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, }) => {
+    if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
+    const storedNetworkFeeCryptoBaseUnit = step.feeData.networkFeeCryptoBaseUnit;
+    const route = step.sunioTransactionMetadata?.route;
+    if (!route) {
+        if (!storedNetworkFeeCryptoBaseUnit)
+            throw new Error('Missing network fee in quote');
+        return storedNetworkFeeCryptoBaseUnit;
+    }
+    try {
+        const adapter = assertGetTronChainAdapter(caip_1.tronChainId);
+        return await (0, estimateSunioNetworkFee_1.estimateSunioNetworkFeeCryptoBaseUnit)({
+            rpcUrl: adapter.httpProvider.getRpcUrl(),
+            apiKey: config.VITE_TRON_GRID_API_KEY,
+            route,
+            sellAmountCryptoBaseUnit: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            isSellingNativeTrx: step.sellAsset.assetId === caip_1.tronAssetId,
+            address: from,
+            slippageTolerancePercentageDecimal,
+        });
+    }
+    catch {
+        if (!storedNetworkFeeCryptoBaseUnit)
+            throw new Error('Missing network fee in quote');
+        return storedNetworkFeeCryptoBaseUnit;
+    }
+};
+exports.getSunioTransactionFees = getSunioTransactionFees;

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

@@ -1,5 +1,4 @@
 import type { AssetId } from '@shapeshiftoss/caip';
-import { tronChainId } from '@shapeshiftoss/caip';
 export declare const isSupportedChainId: (chainId: string) => boolean;
 export declare const assetIdToTronToken: (assetId: AssetId) => string;
-export declare const isTronChainId: (chainId: string) => chainId is typeof tronChainId;
+export declare const isTronChainId: (chainId: string) => chainId is import("@shapeshiftoss/caip").ChainId;

package/dist/cjs/swappers/SunioSwapper/utils/sunioService.d.ts

@@ -1,6 +1,6 @@
 export declare const sunioServiceFactory: () => {
-    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../../..").SwapErrorRight>>;
-    post: <T = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../../..").SwapErrorRight>>;
-    delete: <T = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any>) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T>, import("../../..").SwapErrorRight>>;
+    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../..").SwapErrorRight>>;
+    post: <T_1 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../../..").SwapErrorRight>>;
+    delete: <T_2 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../../..").SwapErrorRight>>;
 };
 export type SunioService = ReturnType<typeof sunioServiceFactory>;

package/dist/cjs/swappers/ThorchainSwapper/getTradeQuote/getTradeQuote.test.js

@@ -78,6 +78,11 @@ const expectedQuoteResponse = [
                 thorchainSpecific: {
                     maxStreamingQuantity: undefined,
                 },
+                thorchainTransactionMetadata: {
+                    to: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
+                    data: '0x',
+                    value: '0',
+                },
             },
         ],
     },
@@ -121,6 +126,11 @@ const expectedQuoteResponse = [
                 thorchainSpecific: {
                     maxStreamingQuantity: undefined,
                 },
+                thorchainTransactionMetadata: {
+                    to: '0x3624525075b88B24ecc29CE226b0CEc1fFcB6976',
+                    data: '0x',
+                    value: '0',
+                },
             },
         ],
     },

package/dist/cjs/swappers/ThorchainSwapper/utils/getL1ToLongtailQuote.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
@@ -137,7 +127,7 @@ const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName)
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })), // assuming multi-hop quote steps here since we're mapping over quote steps,
+            })),
             isLongtail: true,
             longtailData: {
                 L1ToLongtailExpectedAmountOut: quotedAmountOut.toString(),

package/dist/cjs/swappers/ThorchainSwapper/utils/getL1ToLongtailRate.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailRate = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
@@ -125,7 +115,7 @@ const getL1ToLongtailRate = async (input, deps, streamingInterval, swapperName)
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })), // assuming multi-hop rate steps here since we're mapping over quote steps,
+            })),
             isLongtail: true,
             longtailData: {
                 L1ToLongtailExpectedAmountOut: quotedAmountOut.toString(),

package/dist/cjs/swappers/ThorchainSwapper/utils/getLongtailQuote.js

@@ -61,7 +61,7 @@ const getLongtailToL1Quote = async (input, deps, streamingInterval, swapperName)
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 sellAsset,
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })), // assuming multi-hop quote steps here since we're mapping over quote steps
+            })),
             isLongtail: true,
             longtailData: {
                 longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),

package/dist/cjs/swappers/ThorchainSwapper/utils/getLongtailRate.js

@@ -61,7 +61,7 @@ const getLongtailToL1Rate = async (input, deps, streamingInterval, swapperName)
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 sellAsset,
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })), // assuming multi-hop quote steps here since we're mapping over quote steps
+            })),
             isLongtail: true,
             longtailData: {
                 longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),

package/dist/cjs/swappers/ThorchainSwapper/utils/longTailHelpers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shortenedNativeAssetNameByNativeAssetName = exports.selectBestRate = exports.getQuotedAmountOutByPool = exports.getContractDataByPool = exports.generateV3PoolAddressesAcrossFeeRange = exports.feeAmountToContractMap = exports.contractToFeeAmountMap = exports.AggregatorContract = exports.getTokenFromAsset = exports.getWrappedToken = void 0;
-exports.getTradeType = getTradeType;
+exports.shortenedNativeAssetNameByNativeAssetName = exports.selectBestRate = exports.getQuotedAmountOutByPool = exports.getContractDataByPool = exports.generateV3PoolAddressesAcrossFeeRange = exports.feeAmountToContractMap = exports.contractToFeeAmountMap = exports.AggregatorContract = exports.getTradeType = exports.getTokenFromAsset = exports.getWrappedToken = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const sdk_core_1 = require("@uniswap/sdk-core");
@@ -47,6 +46,7 @@ function getTradeType(sellAssetPool, buyAssetPool, sellPoolId, buyPoolId) {
             return undefined;
     }
 }
+exports.getTradeType = getTradeType;
 // TODO: we need to fetch these contracts dynamically, as the whitelist can change
 var AggregatorContract;
 (function (AggregatorContract) {

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getZrxTradeQuote = getZrxTradeQuote;
+exports.getZrxTradeQuote = void 0;
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const utils_1 = require("@shapeshiftoss/utils");
@@ -122,3 +122,4 @@ async function getZrxTradeQuote(input, assertGetEvmChainAdapter, assetsById, zrx
         }));
     }
 }
+exports.getZrxTradeQuote = getZrxTradeQuote;

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.test.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeRate/getZrxTradeRate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getZrxTradeRate = getZrxTradeRate;
+exports.getZrxTradeRate = void 0;
 const contracts_1 = require("@shapeshiftoss/contracts");
 const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");
@@ -78,3 +78,4 @@ async function getZrxTradeRate(input, assetsById, zrxBaseUrl) {
         ],
     });
 }
+exports.getZrxTradeRate = getZrxTradeRate;

package/dist/cjs/swappers/ZrxSwapper/utils/fetchFromZrx.js

@@ -27,9 +27,9 @@ const fetchFromZrx = async ({ quoteOrRate, buyAsset, sellAsset, sellAmountInclud
             sellAmount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             taker: sellAddress,
             swapFeeBps: (0, utils_1.bn)(affiliateBps).toNumber(),
-            swapFeeToken: (0, helpers_2.assetIdToZrxToken)(buyAsset.assetId), // must be set to the buy asset to simplify fee calcs
+            swapFeeToken: (0, helpers_2.assetIdToZrxToken)(buyAsset.assetId),
             slippageBps: (0, utils_1.convertDecimalPercentageToBasisPoints)(slippageTolerancePercentageDecimal).toNumber(),
-            swapFeeRecipient: maybeTreasuryAddress, // Where affiliate fees are sent
+            swapFeeRecipient: maybeTreasuryAddress,
             feeRecipientTradeSurplus: maybeTreasuryAddress, // Where trade surplus is sent
         },
     });

package/dist/cjs/swappers/ZrxSwapper/utils/helpers/helpers.d.ts

@@ -1,9 +1,10 @@
 import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset, AssetsByIdPartial } from '@shapeshiftoss/types';
-import type { ZrxFees, ZrxSupportedChainId } from '../../types';
+import { KnownChainIds } from '@shapeshiftoss/types';
+import type { ZrxFees } from '../../types';
 export declare const assetIdToZrxToken: (assetId: AssetId) => string;
 export declare const zrxTokenToAssetId: (token: string, chainId: ChainId) => AssetId;
-export declare const isSupportedChainId: (chainId: ChainId) => chainId is ZrxSupportedChainId;
+export declare const isSupportedChainId: (chainId: ChainId) => chainId is KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet | KnownChainIds.BnbSmartChainMainnet | KnownChainIds.PolygonMainnet | KnownChainIds.ArbitrumMainnet | KnownChainIds.BaseMainnet;
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;

package/dist/cjs/swappers/ZrxSwapper/utils/zrxService.d.ts

@@ -4,6 +4,6 @@ import type { MonadicSwapperAxiosService } from '../../../types';
 type AxiosInstanceHoF = (instance: AxiosInstance, options?: Omit<RetryConfig, 'instance'>) => AxiosInstance;
 export declare const zrxServiceFactory: ({ baseUrl, wrapper, }: {
     baseUrl: string;
-    wrapper?: AxiosInstanceHoF;
+    wrapper?: AxiosInstanceHoF | undefined;
 }) => MonadicSwapperAxiosService;
 export {};

package/dist/cjs/swappers/utils/helpers/helpers.js

@@ -49,6 +49,7 @@ const DAO_TREASURY_BY_CHAIN_ID = {
     [types_1.KnownChainIds.TonMainnet]: utils_1.DAO_TREASURY_TON,
     [types_1.KnownChainIds.MonadMainnet]: utils_1.DAO_TREASURY_MONAD,
     [types_1.KnownChainIds.HyperEvmMainnet]: utils_1.DAO_TREASURY_HYPEREVM,
+    [types_1.KnownChainIds.BobMainnet]: utils_1.DAO_TREASURY_BOB,
 };
 const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = (0, utils_1.isTreasuryChainId)(chainId) ? chainId : undefined;

package/dist/cjs/swappers/utils/test-data/cryptoMarketDataById.d.ts

@@ -1,39 +1,5 @@
-import { AVAX, BSC, BTC, ETH, FOX_GNOSIS, FOX_MAINNET, OPTIMISM, RUNE, USDC_GNOSIS, USDC_MAINNET, WBTC, WETH } from './assets';
 export declare const marketDataByAssetIdUsd: {
-    [FOX_MAINNET.assetId]: {
-        price: string;
-    };
-    [FOX_GNOSIS.assetId]: {
-        price: string;
-    };
-    [ETH.assetId]: {
-        price: string;
-    };
-    [AVAX.assetId]: {
-        price: string;
-    };
-    [BSC.assetId]: {
-        price: string;
-    };
-    [BTC.assetId]: {
-        price: string;
-    };
-    [RUNE.assetId]: {
-        price: string;
-    };
-    [OPTIMISM.assetId]: {
-        price: string;
-    };
-    [USDC_MAINNET.assetId]: {
-        price: string;
-    };
-    [USDC_GNOSIS.assetId]: {
-        price: string;
-    };
-    [WBTC.assetId]: {
-        price: string;
-    };
-    [WETH.assetId]: {
+    [x: string]: {
         price: string;
     };
 };

package/dist/cjs/thorchain-utils/checkTradeStatus.js

@@ -68,7 +68,14 @@ const checkTradeStatus = async ({ txHash, chainId, address, fetchIsSmartContract
         return { buyTxHash, status: unchained_client_1.TxStatus.Pending, message };
     }
     catch (e) {
-        console.error(e);
+        const message = (() => {
+            if (axios_1.default.isAxiosError(e))
+                return e.response?.data?.message ?? e.message;
+            if (e instanceof Error)
+                return e.message;
+            return String(e);
+        })();
+        console.error(`checkTradeStatus(${nativeChain}, ${txHash}): ${message}`);
         return { buyTxHash: undefined, status: unchained_client_1.TxStatus.Unknown, message: undefined };
     }
 };

package/dist/cjs/thorchain-utils/cosmossdk/getThorTxData.d.ts

@@ -0,0 +1,12 @@
+import type { Asset } from '@shapeshiftoss/types';
+import type { SwapperConfig, SwapperName } from '../../types';
+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/cjs/thorchain-utils/cosmossdk/getThorTxData.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThorTxData = void 0;
+const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChain");
+const index_1 = require("../index");
+const getThorTxData = async ({ sellAsset, config, swapperName, }) => {
+    // Native assets on the swapper's own chain (RUNE on THORChain, CACAO on MAYAChain)
+    // deposit via MsgDeposit and have no recipient address.
+    if (sellAsset.chainId === (0, index_1.getChainIdBySwapper)(swapperName))
+        return { vault: '' };
+    // Everything else (e.g. ATOM via THORChain, RUNE via MAYAChain) sends via MsgSend
+    // to the swapper's inbound vault on that chain.
+    const daemonUrl = (0, index_1.getDaemonUrl)(config, swapperName);
+    const res = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(daemonUrl, sellAsset.assetId, true, swapperName);
+    if (res.isErr())
+        throw res.unwrapErr();
+    return { vault: res.unwrap().address };
+};
+exports.getThorTxData = getThorTxData;

package/dist/cjs/thorchain-utils/cosmossdk/index.d.ts

@@ -1 +1,2 @@
 export * from './getCosmosSdkTransactionFees';
+export * from './getThorTxData';

package/dist/cjs/thorchain-utils/cosmossdk/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getCosmosSdkTransactionFees"), exports);
+__exportStar(require("./getThorTxData"), exports);