@shapeshiftoss/swapper 17.7.3 → 17.8.0

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

@@ -5,23 +5,14 @@ const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
 const tronweb_1 = require("tronweb");
-const getTronTransactionFees_1 = require("../../tron-utils/getTronTransactionFees");
 const utils_1 = require("../../utils");
 const getSunioTradeQuote_1 = require("./getSunioTradeQuote/getSunioTradeQuote");
 const getSunioTradeRate_1 = require("./getSunioTradeRate/getSunioTradeRate");
+const buildSwapContractCall_1 = require("./utils/buildSwapContractCall");
 const buildSwapRouteParameters_1 = require("./utils/buildSwapRouteParameters");
 const constants_1 = require("./utils/constants");
+const getSunioTransactionFees_1 = require("./utils/getSunioTransactionFees");
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-const convertAddressesToEvmFormat = (value) => {
-    if (Array.isArray(value)) {
-        return value.map(v => convertAddressesToEvmFormat(v));
-    }
-    if (typeof value === 'string' && value.startsWith('T') && tronweb_1.TronWeb.isAddress(value)) {
-        const hex = tronweb_1.TronWeb.address.toHex(value);
-        return hex.replace(/^41/, '0x');
-    }
-    return value;
-};
 exports.sunioApi = {
     getTradeQuote: async (input, deps) => {
         const maybeTradeQuote = await (0, getSunioTradeQuote_1.getSunioTradeQuote)(input, deps);
@@ -32,7 +23,7 @@ exports.sunioApi = {
         return maybeTradeRate.map(rate => [rate]);
     },
     getUnsignedTronTransaction: async (args) => {
-        const { tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, } = args;
+        const { tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, } = args;
         if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote)) {
             throw new Error('Unable to execute a trade rate quote');
         }
@@ -45,24 +36,12 @@ exports.sunioApi = {
         const rpcUrl = adapter.httpProvider.getRpcUrl();
         const tronWeb = new tronweb_1.TronWeb({
             fullHost: rpcUrl,
+            headers: config.VITE_TRON_GRID_API_KEY
+                ? { 'TRON-PRO-API-KEY': config.VITE_TRON_GRID_API_KEY }
+                : {},
         });
         const routeParams = (0, buildSwapRouteParameters_1.buildSwapRouteParameters)(sunioMetadata.route, step.sellAmountIncludingProtocolFeesCryptoBaseUnit, step.buyAmountAfterFeesCryptoBaseUnit, tradeQuote.receiveAddress, slippageTolerancePercentageDecimal);
-        const parameters = [
-            { type: 'address[]', value: routeParams.path },
-            { type: 'string[]', value: routeParams.poolVersion },
-            { type: 'uint256[]', value: routeParams.versionLen },
-            { type: 'uint24[]', value: routeParams.fees },
-            {
-                type: 'tuple(uint256,uint256,address,uint256)',
-                value: convertAddressesToEvmFormat([
-                    routeParams.swapData.amountIn,
-                    routeParams.swapData.amountOutMin,
-                    routeParams.swapData.recipient,
-                    routeParams.swapData.deadline,
-                ]),
-            },
-        ];
-        const functionSelector = 'swapExactInput(address[],string[],uint256[],uint24[],(uint256,uint256,address,uint256))';
+        const parameters = (0, buildSwapContractCall_1.buildSwapExactInputParameters)(routeParams);
         const isSellingNativeTrx = step.sellAsset.assetId === caip_1.tronAssetId;
         const callValue = isSellingNativeTrx
             ? Number(step.sellAmountIncludingProtocolFeesCryptoBaseUnit)
@@ -71,7 +50,7 @@ exports.sunioApi = {
             feeLimit: 100_000_000,
             callValue,
         };
-        const txData = await tronWeb.transactionBuilder.triggerSmartContract(constants_1.SUNIO_SMART_ROUTER_CONTRACT, functionSelector, options, parameters, from);
+        const txData = await tronWeb.transactionBuilder.triggerSmartContract(constants_1.SUNIO_SMART_ROUTER_CONTRACT, buildSwapContractCall_1.SUNIO_SWAP_EXACT_INPUT_SELECTOR, options, parameters, from);
         if (!txData.result || !txData.result.result) {
             throw new Error('[Sun.io] Failed to build swap transaction');
         }
@@ -100,7 +79,7 @@ exports.sunioApi = {
             transaction,
         };
     },
-    getTronTransactionFees: getTronTransactionFees_1.getTronTransactionFees,
+    getTronTransactionFees: getSunioTransactionFees_1.getSunioTransactionFees,
     checkTradeStatus: async ({ txHash, assertGetTronChainAdapter }) => {
         try {
             // Wait for TronGrid indexing to avoid false "REVERT"
@@ -111,12 +90,16 @@ exports.sunioApi = {
                 return (0, utils_1.createDefaultStatusResponse)(txHash);
             }
             const contractRet = tx.ret?.[0]?.contractRet;
-            // Only mark as confirmed if SUCCESS AND has confirmations (in a block)
-            const status = contractRet === 'SUCCESS' && tx.confirmations > 0
-                ? unchained_client_1.TxStatus.Confirmed
-                : contractRet === 'REVERT'
-                    ? unchained_client_1.TxStatus.Failed
-                    : unchained_client_1.TxStatus.Pending;
+            // Tron reports many failure codes (REVERT, OUT_OF_ENERGY, OUT_OF_TIME, ...). A missing
+            // contractRet means it isn't mined yet; any non-SUCCESS value is a terminal failure.
+            const status = (() => {
+                if (!contractRet)
+                    return unchained_client_1.TxStatus.Pending;
+                if (contractRet === 'SUCCESS') {
+                    return tx.confirmations > 0 ? unchained_client_1.TxStatus.Confirmed : unchained_client_1.TxStatus.Pending;
+                }
+                return unchained_client_1.TxStatus.Failed;
+            })();
             return {
                 status,
                 buyTxHash: txHash,

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

@@ -0,0 +1,6 @@
+import type { SwapRouteParameters } from './buildSwapRouteParameters';
+export declare const SUNIO_SWAP_EXACT_INPUT_SELECTOR = "swapExactInput(address[],string[],uint256[],uint24[],(uint256,uint256,address,uint256))";
+export declare const buildSwapExactInputParameters: (routeParams: SwapRouteParameters) => {
+    type: string;
+    value: unknown;
+}[];

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

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildSwapExactInputParameters = exports.SUNIO_SWAP_EXACT_INPUT_SELECTOR = void 0;
+const tronweb_1 = require("tronweb");
+exports.SUNIO_SWAP_EXACT_INPUT_SELECTOR = 'swapExactInput(address[],string[],uint256[],uint24[],(uint256,uint256,address,uint256))';
+const convertAddressesToEvmFormat = (value) => {
+    if (Array.isArray(value)) {
+        return value.map(v => convertAddressesToEvmFormat(v));
+    }
+    if (typeof value === 'string' && value.startsWith('T') && tronweb_1.TronWeb.isAddress(value)) {
+        const hex = tronweb_1.TronWeb.address.toHex(value);
+        return hex.replace(/^41/, '0x');
+    }
+    return value;
+};
+// Parameter list for the SmartExchangeRouter swapExactInput call, shared between fee
+// estimation and execution so both encode the call identically.
+const buildSwapExactInputParameters = (routeParams) => [
+    { type: 'address[]', value: routeParams.path },
+    { type: 'string[]', value: routeParams.poolVersion },
+    { type: 'uint256[]', value: routeParams.versionLen },
+    { type: 'uint24[]', value: routeParams.fees },
+    {
+        type: 'tuple(uint256,uint256,address,uint256)',
+        value: convertAddressesToEvmFormat([
+            routeParams.swapData.amountIn,
+            routeParams.swapData.amountOutMin,
+            routeParams.swapData.recipient,
+            routeParams.swapData.deadline,
+        ]),
+    },
+];
+exports.buildSwapExactInputParameters = buildSwapExactInputParameters;

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

@@ -5,12 +5,12 @@ const utils_1 = require("@shapeshiftoss/utils");
 const buildSwapRouteParameters = (route, sellAmountCryptoBaseUnit, minBuyAmountCryptoBaseUnit, recipient, slippageTolerancePercentageDecimal) => {
     const path = route.tokens;
     const poolVersion = route.poolVersions;
-    const versionLen = poolVersion.map((_, index) => {
-        if (index === poolVersion.length - 1) {
-            return path.length - index;
-        }
-        return 2;
-    });
+    // The SmartExchangeRouter expects sum(versionLen) === path.length: the first
+    // pool segment consumes 2 tokens (input + output) and each subsequent pool
+    // reuses the previous output, consuming 1 new token. This relies on the Sun.io
+    // API returning poolVersions per-hop (poolVersions.length === tokens.length - 1),
+    // which it does — the router also accepts this un-collapsed form for same-version hops.
+    const versionLen = poolVersion.map((_, index) => (index === 0 ? 2 : 1));
     const fees = route.poolFees.map(fee => Number(fee));
     const amountOutWithSlippage = (0, utils_1.bn)(minBuyAmountCryptoBaseUnit)
         .times((0, utils_1.bn)(1).minus(slippageTolerancePercentageDecimal))

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

@@ -2,5 +2,7 @@ export declare const SUNIO_SUPPORTED_CHAIN_IDS: readonly [import("@shapeshiftoss
 export declare const SUNIO_API_BASE_URL = "https://rot.endjgfsv.link";
 export declare const SUNIO_SMART_ROUTER_CONTRACT: "TCFNp179Lg46D16zKoumd4Poa2WFFdtqYj";
 export declare const DEFAULT_SLIPPAGE_PERCENTAGE = "0.005";
+export declare const SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = 215000;
+export declare const SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = 375000;
 export declare const SUNIO_DEX_TYPES: "PSM,CURVE,CURVE_COMBINATION,WTRX,SUNSWAP_V1,SUNSWAP_V2,SUNSWAP_V3";
 export declare const SUNIO_TRON_NATIVE_ADDRESS: "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUNIO_TRON_NATIVE_ADDRESS = exports.SUNIO_DEX_TYPES = exports.DEFAULT_SLIPPAGE_PERCENTAGE = exports.SUNIO_SMART_ROUTER_CONTRACT = exports.SUNIO_API_BASE_URL = exports.SUNIO_SUPPORTED_CHAIN_IDS = void 0;
+exports.SUNIO_TRON_NATIVE_ADDRESS = exports.SUNIO_DEX_TYPES = exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = exports.DEFAULT_SLIPPAGE_PERCENTAGE = exports.SUNIO_SMART_ROUTER_CONTRACT = exports.SUNIO_API_BASE_URL = exports.SUNIO_SUPPORTED_CHAIN_IDS = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 exports.SUNIO_SUPPORTED_CHAIN_IDS = [caip_1.tronChainId];
 // NOTE: This domain looks suspicious, but it's the official Sun.io backend API
@@ -11,6 +11,12 @@ exports.SUNIO_API_BASE_URL = 'https://rot.endjgfsv.link';
 // This is the current mainnet router that sun.io's frontend uses
 exports.SUNIO_SMART_ROUTER_CONTRACT = 'TCFNp179Lg46D16zKoumd4Poa2WFFdtqYj';
 exports.DEFAULT_SLIPPAGE_PERCENTAGE = '0.005';
+// Energy fallbacks for when we can't simulate a swap (no address, or the simulation reverts
+// pre-approval for TRC20 sells). Set to observed average energy so the 1.2x margin applied at
+// estimate time lifts them to cover the worst case (native ~245k, TRC20 ~415k due to the extra
+// transferFrom token pull) without double-counting safety.
+exports.SUNIO_FALLBACK_SWAP_ENERGY_NATIVE = 215_000;
+exports.SUNIO_FALLBACK_SWAP_ENERGY_TRC20 = 375_000;
 exports.SUNIO_DEX_TYPES = 'PSM,CURVE,CURVE_COMBINATION,WTRX,SUNSWAP_V1,SUNSWAP_V2,SUNSWAP_V3';
 // Native TRX token address (used when assetId is not a TRC-20 token)
 exports.SUNIO_TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';

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

@@ -4,11 +4,11 @@ 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,

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/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/thorchain-utils/getL1RateOrQuote.js

@@ -130,7 +130,7 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
         const protocolFees = {};
         if (!buyAssetTradeFeeBuyAssetCryptoBaseUnit.isZero()) {
             protocolFees[buyAsset.assetId] = {
-                amountCryptoBaseUnit: buyAssetTradeFeeBuyAssetCryptoBaseUnit.toString(),
+                amountCryptoBaseUnit: buyAssetTradeFeeBuyAssetCryptoBaseUnit.toFixed(0),
                 requiresBalance: false,
                 asset: buyAsset,
             };
@@ -161,7 +161,7 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             value: route.expectedAmountOutThorBaseUnit,
             inputExponent: buyAssetNativePrecision,
             outputExponent: buyAsset.precision,
-        }).toFixed();
+        }).toFixed(0);
         const rate = (0, utils_2.getInputOutputRate)({
             sellAmountCryptoBaseUnit,
             buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
@@ -401,6 +401,9 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                         // Estimate fees using the receive address for accurate energy calculation
                         const tronWeb = new tronweb_1.TronWeb({
                             fullHost: deps.config.VITE_TRON_NODE_URL,
+                            headers: deps.config.VITE_TRON_GRID_API_KEY
+                                ? { 'TRON-PRO-API-KEY': deps.config.VITE_TRON_GRID_API_KEY }
+                                : {},
                         });
                         const params = await tronWeb.trx.getChainParameters();
                         const bandwidthPrice = params.find(p => p.key === 'getTransactionFee')?.value ?? 1000;

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

@@ -10,19 +10,10 @@ const monads_1 = require("@sniptt/monads");
 const qs_1 = __importDefault(require("qs"));
 const types_1 = require("../types");
 const utils_2 = require("../utils");
-const getThresholdedAffiliateBps_1 = require("./getThresholdedAffiliateBps/getThresholdedAffiliateBps");
 const index_1 = require("./index");
 const service_1 = require("./service");
 const getQuote = async (input, deps) => {
     const { buyAssetId, receiveAddress, sellAsset, sellAmountCryptoBaseUnit, streaming, streamingInterval, affiliateBps, swapperName, } = input;
-    // don't apply an affiliate fee if it's below the outbound fee for the inbound pool
-    const thresholdedAffiliateBps = await (0, getThresholdedAffiliateBps_1.getThresholdedAffiliateBps)({
-        sellAsset,
-        sellAmountCryptoBaseUnit,
-        affiliateBps,
-        config: deps.config,
-        swapperName,
-    });
     const buyPoolId = (0, index_1.getPoolAssetId)({ assetId: buyAssetId, swapperName });
     const sellPoolId = (0, index_1.getPoolAssetId)({ assetId: sellAsset.assetId, swapperName });
     const sellAmountCryptoPrecision = utils_1.BigAmount.fromBaseUnit({
@@ -43,34 +34,41 @@ const getQuote = async (input, deps) => {
         from_asset: sellPoolId,
         to_asset: buyPoolId,
         destination: parsedReceiveAddress,
-        affiliate_bps: thresholdedAffiliateBps,
+        affiliate_bps: affiliateBps,
         affiliate: (0, index_1.getAffiliate)(swapperName),
         ...(streaming && { streaming_interval: streamingInterval }),
     });
     const daemonUrl = (0, index_1.getDaemonUrl)(deps.config, swapperName);
     const res = await service_1.thorService.get(`${daemonUrl}/quote/swap?${queryString}`);
-    if (res.isErr())
-        return (0, monads_1.Err)(res.unwrapErr());
-    const { data } = res.unwrap();
-    const isError = 'error' in data;
-    const notEnoughFeeError = isError && /not enough fee/i.test(data.error);
-    const notEnoughToPayTxFeeError = isError && /not enough to pay transaction fee/i.test(data.error);
-    const tradingIsHaltedError = isError && /trading is halted/.test(data.error);
-    if (notEnoughFeeError || notEnoughToPayTxFeeError)
-        return (0, monads_1.Err)((0, utils_2.createTradeAmountTooSmallErr)());
-    if (tradingIsHaltedError) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: `[getQuote]: Trading is halted, cannot process swap`,
-            code: types_1.TradeQuoteError.TradingHalted,
-            details: { sellAssetId: sellAsset.assetId, buyAssetId },
-        }));
-    }
-    if (isError) {
+    // Thornode returns errors as `{ error: string }` in both the 2xx body and the 4xx body.
+    // On 4xx axios rejects, so the body lands on `cause.response.data` instead of in the success data.
+    const errorMessage = (() => {
+        if (res.isErr()) {
+            const cause = res.unwrapErr().cause;
+            return cause?.response?.data?.error;
+        }
+        const { data } = res.unwrap();
+        return 'error' in data ? data.error : undefined;
+    })();
+    if (errorMessage) {
+        if (/not enough fee/i.test(errorMessage) ||
+            /not enough to pay transaction fee/i.test(errorMessage)) {
+            return (0, monads_1.Err)((0, utils_2.createTradeAmountTooSmallErr)());
+        }
+        if (/trading is halted/i.test(errorMessage)) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: `[getQuote]: Trading is halted, cannot process swap`,
+                code: types_1.TradeQuoteError.TradingHalted,
+                details: { sellAssetId: sellAsset.assetId, buyAssetId },
+            }));
+        }
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: data.error,
+            message: errorMessage,
             code: types_1.TradeQuoteError.UnknownError,
         }));
     }
-    return (0, monads_1.Ok)(data);
+    if (res.isErr())
+        return (0, monads_1.Err)(res.unwrapErr());
+    return (0, monads_1.Ok)(res.unwrap().data);
 };
 exports.getQuote = getQuote;

package/dist/cjs/thorchain-utils/tron/getTronTransactionFees.js

@@ -5,9 +5,9 @@ const utils_1 = require("@shapeshiftoss/utils");
 const tronweb_1 = require("tronweb");
 const utils_2 = require("../../utils");
 const getThorTxData_1 = require("./getThorTxData");
-const getChainPrices = async (rpcUrl) => {
+const getChainPrices = async (rpcUrl, headers) => {
     try {
-        const tronWeb = new tronweb_1.TronWeb({ fullHost: rpcUrl });
+        const tronWeb = new tronweb_1.TronWeb({ fullHost: rpcUrl, headers });
         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 ?? 420;
@@ -29,11 +29,14 @@ const getTronTransactionFees = async (args, swapperName) => {
     const { vault } = await (0, getThorTxData_1.getThorTxData)({ sellAsset, config, swapperName });
     const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
     const rpcUrl = config.VITE_TRON_NODE_URL;
+    const tronGridHeaders = config.VITE_TRON_GRID_API_KEY
+        ? { 'TRON-PRO-API-KEY': config.VITE_TRON_GRID_API_KEY }
+        : {};
     try {
-        const tronWeb = new tronweb_1.TronWeb({ fullHost: rpcUrl });
+        const tronWeb = new tronweb_1.TronWeb({ fullHost: rpcUrl, headers: tronGridHeaders });
         if (contractAddress) {
             // TRC20 transfer - estimate energy cost
-            const { energyPrice } = await getChainPrices(rpcUrl);
+            const { energyPrice } = await getChainPrices(rpcUrl, tronGridHeaders);
             const result = await tronWeb.transactionBuilder.triggerConstantContract(contractAddress, 'transfer(address,uint256)', {}, [
                 { type: 'address', value: vault },
                 { type: 'uint256', value: sellAmountIncludingProtocolFeesCryptoBaseUnit },
@@ -44,7 +47,7 @@ const getTronTransactionFees = async (args, swapperName) => {
         }
         else {
             // TRX transfer with memo - build transaction to get accurate size
-            const { bandwidthPrice } = await getChainPrices(rpcUrl);
+            const { bandwidthPrice } = await getChainPrices(rpcUrl, tronGridHeaders);
             let tx = await tronWeb.transactionBuilder.sendTrx(vault, (0, utils_1.bnOrZero)(sellAmountIncludingProtocolFeesCryptoBaseUnit).toNumber(), from);
             // Add memo to get accurate size with memo overhead
             const txWithMemo = await tronWeb.transactionBuilder.addUpdateData(tx, memo, 'utf8');

package/dist/cjs/thorchain-utils/types.d.ts

@@ -71,7 +71,7 @@ export type ThornodeQuoteResponseSuccess = {
     total_swap_seconds?: number;
     warning: string;
 };
-type ThornodeResponseError = {
+export type ThornodeResponseError = {
     error: string;
 };
 export type ThornodeQuoteResponse = ThornodeQuoteResponseSuccess | ThornodeResponseError;