@shapeshiftoss/swapper 17.7.2 → 17.7.3

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/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);

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

@@ -1,7 +1,7 @@
 import type { Asset } from '@shapeshiftoss/types';
 import type { SwapperConfig, SwapperName } from '../types';
 import type { ThorEvmTradeQuote } from './types';
-export declare const getCallDataFromQuote: ({ tradeType, data, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, memo: tcMemo, expiry, config, longtailData, slippageTolerancePercentageDecimal, vault, swapperName, }: Pick<ThorEvmTradeQuote, "vault" | "aggregator" | "data" | "memo" | "tradeType" | "expiry" | "longtailData" | "slippageTolerancePercentageDecimal"> & {
+export declare const getCallDataFromQuote: ({ tradeType, data, sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, memo: tcMemo, expiry, config, longtailData, slippageTolerancePercentageDecimal, vault, swapperName, }: Pick<ThorEvmTradeQuote, "data" | "slippageTolerancePercentageDecimal" | "memo" | "expiry" | "tradeType" | "aggregator" | "vault" | "longtailData"> & {
     sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
     config: SwapperConfig;
     sellAsset: Asset;

package/dist/cjs/thorchain-utils/getL1RateOrQuote.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.getL1RateOrQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
@@ -43,8 +33,10 @@ const tronweb_1 = require("tronweb");
 const uuid_1 = require("uuid");
 const index_1 = require("../index");
 const affiliateFee_1 = require("../swappers/utils/affiliateFee");
+const helpers_1 = require("../swappers/utils/helpers/helpers");
 const types_1 = require("../types");
 const utils_2 = require("../utils");
+const cosmossdk = __importStar(require("./cosmossdk"));
 const evm = __importStar(require("./evm"));
 const getLimitWithManualSlippage_1 = require("./getLimitWithManualSlippage/getLimitWithManualSlippage");
 const getQuote_1 = require("./getQuote");
@@ -164,7 +156,7 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             affilate: (0, index_2.getAffiliate)(swapperName),
         });
     };
-    const makeThorTradeRateOrQuote = ({ route, memo, allowanceContract, feeData, data, router, vault, }) => {
+    const makeThorTradeRateOrQuote = ({ route, memo, allowanceContract, feeData, data, router, vault, thorchainTransactionMetadata, }) => {
         const buyAmountAfterFeesCryptoBaseUnit = (0, utils_1.convertPrecision)({
             value: route.expectedAmountOutThorBaseUnit,
             inputExponent: buyAssetNativePrecision,
@@ -218,6 +210,7 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                     thorchainSpecific: {
                         maxStreamingQuantity: route.quote.max_streaming_quantity,
                     },
+                    thorchainTransactionMetadata,
                 },
             ],
         };
@@ -249,6 +242,11 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                     data,
                     router,
                     vault,
+                    thorchainTransactionMetadata: {
+                        to: router,
+                        data,
+                        value: (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? sellAmountCryptoBaseUnit : '0',
+                    },
                     feeData: {
                         protocolFees: getProtocolFees(route.quote),
                         networkFeeCryptoBaseUnit,
@@ -294,8 +292,13 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                 })();
                 return makeThorTradeRateOrQuote({
                     route,
-                    allowanceContract: '0x0', // not applicable to UTXOs
+                    allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData,
                 });
             }));
@@ -311,11 +314,18 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
         case caip_1.CHAIN_NAMESPACE.CosmosSdk: {
             const cosmosChainAdapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
             const { fast } = await cosmosChainAdapter.getFeeData({});
+            const { vault } = await cosmossdk.getThorTxData({ sellAsset, config, swapperName });
             return (0, monads_1.Ok)(perRouteValues.map((route) => {
+                const memo = getMemo(route);
                 return makeThorTradeRateOrQuote({
                     route,
-                    memo: getMemo(route),
-                    allowanceContract: '0x0', // not applicable to cosmossdk
+                    memo,
+                    allowanceContract: '0x0',
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData: {
                         networkFeeCryptoBaseUnit: fast.txFee,
                         protocolFees: getProtocolFees(route.quote),
@@ -329,13 +339,13 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
         case caip_1.CHAIN_NAMESPACE.Solana: {
             const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
             const sendAddress = input.sendAddress;
+            const { vault } = await solana.getThorTxData({ sellAsset, config, swapperName });
             const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {
                 const memo = getMemo(route);
                 const protocolFees = getProtocolFees(route.quote);
                 const feeData = await (async () => {
                     if (!sendAddress)
                         return { networkFeeCryptoBaseUnit: undefined, protocolFees };
-                    const { vault } = await solana.getThorTxData({ sellAsset, config, swapperName });
                     const memoInstruction = new web3_js_1.TransactionInstruction({
                         keys: [],
                         programId: new web3_js_1.PublicKey(SOLANA_MEMO_PROGRAM_ID),
@@ -361,6 +371,11 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                     route,
                     allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData,
                 });
             }));
@@ -374,20 +389,15 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             return (0, monads_1.Ok)(routes);
         }
         case caip_1.CHAIN_NAMESPACE.Tron: {
+            const { vault } = await tron.getThorTxData({ sellAsset, config, swapperName });
             const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {
                 const memo = getMemo(route);
                 let networkFeeCryptoBaseUnit = undefined;
                 // Calculate fees for rates when we have a receive address (wallet connected)
-                if (input.quoteOrRate === 'rate' && input.receiveAddress) {
+                if (input.quoteOrRate === 'rate' && input.receiveAddress && vault) {
                     try {
                         const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
                         const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
-                        // Get vault address
-                        const { vault } = await tron.getThorTxData({
-                            sellAsset,
-                            config,
-                            swapperName,
-                        });
                         // Estimate fees using the receive address for accurate energy calculation
                         const tronWeb = new tronweb_1.TronWeb({
                             fullHost: deps.config.VITE_TRON_NODE_URL,
@@ -400,7 +410,7 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                             // TRC20: Estimate energy with actual recipient
                             try {
                                 const result = await tronWeb.transactionBuilder.triggerConstantContract(contractAddress, 'transfer(address,uint256)', {}, [
-                                    { type: 'address', value: vault }, // Use vault as recipient
+                                    { type: 'address', value: vault },
                                     {
                                         type: 'uint256',
                                         value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
@@ -434,8 +444,13 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                 // For quotes, fees will be calculated in getTronTransactionFees when executing
                 return Promise.resolve(makeThorTradeRateOrQuote({
                     route,
-                    allowanceContract: '0x0', // not applicable to TRON
+                    allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData: {
                         networkFeeCryptoBaseUnit,
                         protocolFees: getProtocolFees(route.quote),

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

@@ -1,7 +1,8 @@
+import type { AssetId } from '@shapeshiftoss/caip';
 import type { Asset } from '@shapeshiftoss/types';
 import type { SwapperConfig, SwapperName } from '../../types';
-export declare const getOutboundFeeInSellAssetThorBaseUnit: (runePerAsset: string, swapperName: SwapperName) => BigNumber;
-export declare const getExpectedAffiliateFeeSellAssetThorUnit: (sellAmountCryptoBaseUnit: string, sellAsset: Asset, affiliateBps: string, swapperName: SwapperName) => BigNumber;
+export declare const getOutboundFeeSellAssetThorBaseUnit: (runePerAsset: string, sellAssetId: AssetId, swapperName: SwapperName) => BigNumber;
+export declare const getExpectedAffiliateFeeSellAssetThorBaseUnit: (sellAmountCryptoBaseUnit: string, sellAsset: Asset, affiliateBps: string, swapperName: SwapperName) => BigNumber;
 export declare const getThresholdedAffiliateBps: ({ sellAsset, affiliateBps, sellAmountCryptoBaseUnit, config, swapperName, }: {
     sellAsset: Asset;
     affiliateBps: string;

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

@@ -1,26 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getThresholdedAffiliateBps = exports.getExpectedAffiliateFeeSellAssetThorUnit = exports.getOutboundFeeInSellAssetThorBaseUnit = void 0;
+exports.getThresholdedAffiliateBps = exports.getExpectedAffiliateFeeSellAssetThorBaseUnit = exports.getOutboundFeeSellAssetThorBaseUnit = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
 const index_1 = require("../index");
-const getOutboundFeeInSellAssetThorBaseUnit = (runePerAsset, swapperName) => {
-    return (0, utils_1.bn)((0, index_1.getNativeFee)(swapperName)).dividedBy(runePerAsset);
+// Convert native fee to sell asset's native precision before dividing by `assetPrice`.
+// MAYA's CACAO is 10-dec but pool assets are 8-dec — skip this and the result is 100x off.
+const getOutboundFeeSellAssetThorBaseUnit = (runePerAsset, sellAssetId, swapperName) => {
+    const nativeFeeSellAssetThorBaseUnit = (0, utils_1.convertPrecision)({
+        value: (0, index_1.getNativeFee)(swapperName),
+        inputExponent: (0, index_1.getNativePrecision)((0, index_1.getSwapperNativeAssetId)(swapperName), swapperName),
+        outputExponent: (0, index_1.getNativePrecision)(sellAssetId, swapperName),
+    });
+    return nativeFeeSellAssetThorBaseUnit.dividedBy(runePerAsset);
 };
-exports.getOutboundFeeInSellAssetThorBaseUnit = getOutboundFeeInSellAssetThorBaseUnit;
-const getExpectedAffiliateFeeSellAssetThorUnit = (sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName) => {
-    const sellAmountThorUnit = (0, utils_1.convertPrecision)({
+exports.getOutboundFeeSellAssetThorBaseUnit = getOutboundFeeSellAssetThorBaseUnit;
+const getExpectedAffiliateFeeSellAssetThorBaseUnit = (sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName) => {
+    const sellAmountThorBaseUnit = (0, utils_1.convertPrecision)({
         value: sellAmountCryptoBaseUnit,
         inputExponent: sellAsset.precision,
         outputExponent: (0, index_1.getNativePrecision)(sellAsset.assetId, swapperName),
     });
     const affiliatePercent = (0, utils_1.convertBasisPointsToDecimalPercentage)(affiliateBps);
-    return sellAmountThorUnit.times(affiliatePercent);
+    return sellAmountThorBaseUnit.times(affiliatePercent);
 };
-exports.getExpectedAffiliateFeeSellAssetThorUnit = getExpectedAffiliateFeeSellAssetThorUnit;
+exports.getExpectedAffiliateFeeSellAssetThorBaseUnit = getExpectedAffiliateFeeSellAssetThorBaseUnit;
 // don't apply an affiliate fee if it's below the outbound fee for the inbound pool
 const getThresholdedAffiliateBps = async ({ sellAsset, affiliateBps, sellAmountCryptoBaseUnit, config, swapperName, }) => {
     const midgardUrl = (0, index_1.getMidgardUrl)(config, swapperName);
-    const outboundFeeSellAssetThorUnit = await (async () => {
+    const outboundFeeSellAssetThorBaseUnit = await (async () => {
         if ((0, index_1.isNativeAsset)(sellAsset.assetId, swapperName))
             return (0, index_1.getNativeFee)(swapperName);
         const sellPoolId = (0, index_1.getPoolAssetId)({ assetId: sellAsset.assetId, swapperName });
@@ -29,12 +36,12 @@ const getThresholdedAffiliateBps = async ({ sellAsset, affiliateBps, sellAmountC
         if (res.isErr())
             throw res.unwrapErr();
         const pool = res.unwrap().data;
-        // calculate the rune outbound fee denominated in the sell asset, in native units
-        return (0, exports.getOutboundFeeInSellAssetThorBaseUnit)(pool.assetPrice, swapperName);
+        // calculate the rune outbound fee denominated in the sell asset, in thor base units
+        return (0, exports.getOutboundFeeSellAssetThorBaseUnit)(pool.assetPrice, sellAsset.assetId, swapperName);
     })();
-    // calculate the expected affiliate fee, in native units
-    const expectedAffiliateFeeSellAssetThorUnit = (0, exports.getExpectedAffiliateFeeSellAssetThorUnit)(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName);
-    const isAffiliateFeeBelowOutboundFee = expectedAffiliateFeeSellAssetThorUnit.lte(outboundFeeSellAssetThorUnit);
+    // calculate the expected affiliate fee, in thor base units
+    const expectedAffiliateFeeSellAssetThorBaseUnit = (0, exports.getExpectedAffiliateFeeSellAssetThorBaseUnit)(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName);
+    const isAffiliateFeeBelowOutboundFee = expectedAffiliateFeeSellAssetThorBaseUnit.lte(outboundFeeSellAssetThorBaseUnit);
     return isAffiliateFeeBelowOutboundFee ? '0' : affiliateBps;
 };
 exports.getThresholdedAffiliateBps = getThresholdedAffiliateBps;