@shapeshiftoss/swapper 17.7.1 → 17.7.3

package/dist/esm/index.d.ts

@@ -14,6 +14,7 @@ export * from './swappers/PortalsSwapper/index.js';
 export * from './swappers/ThorchainSwapper/index.js';
 export * from './swappers/MayachainSwapper/index.js';
 export * from './swappers/ButterSwap/index.js';
+export * from './swappers/RelaySwapper/index.js';
 export * from './swappers/utils/helpers/helpers.js';
 export * from './thorchain-utils/index.js';
 export * from './types.js';

package/dist/esm/index.js

@@ -14,6 +14,7 @@ export * from './swappers/PortalsSwapper/index.js';
 export * from './swappers/ThorchainSwapper/index.js';
 export * from './swappers/MayachainSwapper/index.js';
 export * from './swappers/ButterSwap/index.js';
+export * from './swappers/RelaySwapper/index.js';
 export * from './swappers/utils/helpers/helpers.js';
 export * from './thorchain-utils/index.js';
 export * from './types.js';

package/dist/esm/swappers/NearIntentsSwapper/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const ONE_CLICK_BASE_URL = "https://1click.chaindefuser.com";
 export declare const DEFAULT_SLIPPAGE_BPS = 50;
 export declare const DEFAULT_QUOTE_DEADLINE_MS: number;
+export declare const BTC_QUOTE_DEADLINE_MS: number;

package/dist/esm/swappers/NearIntentsSwapper/constants.js

@@ -1,3 +1,4 @@
 export const ONE_CLICK_BASE_URL = 'https://1click.chaindefuser.com';
 export const DEFAULT_SLIPPAGE_BPS = 50;
 export const DEFAULT_QUOTE_DEADLINE_MS = 30 * 60 * 1000;
+export const BTC_QUOTE_DEADLINE_MS = 60 * 60 * 1000;

package/dist/esm/swappers/NearIntentsSwapper/swapperApi/getTradeQuote.js

@@ -1,4 +1,4 @@
-import { CHAIN_NAMESPACE, fromAssetId, nearChainId } from '@shapeshiftoss/caip';
+import { btcChainId, CHAIN_NAMESPACE, fromAssetId, nearChainId } from '@shapeshiftoss/caip';
 import { evm } from '@shapeshiftoss/chain-adapters';
 import { bn, bnOrZero, chainIdToFeeAssetId, contractAddressOrUndefined, DAO_TREASURY_NEAR, isToken, } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
@@ -8,7 +8,7 @@ import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { createTradeAmountTooSmallErr, getInputOutputRate, makeSwapErrorRight, } from '../../../utils.js';
 import { buildAffiliateFee } from '../../utils/affiliateFee.js';
 import { isNativeEvmAsset } from '../../utils/helpers/helpers.js';
-import { DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS } from '../constants.js';
+import { BTC_QUOTE_DEADLINE_MS, DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, } from '../constants.js';
 import { QuoteRequest } from '../types.js';
 import { assetToNearIntentsAsset, calculateAccountCreationCosts } from '../utils/helpers/helpers.js';
 import { ApiError, initializeOneClickService, OneClickService } from '../utils/oneClickService.js';
@@ -49,6 +49,9 @@ export const getTradeQuote = async (input, deps) => {
                 message: `Asset ${buyAsset.symbol} on ${buyAsset.networkName || buyAsset.chainId} is not supported by NEAR Intents`,
             }));
         }
+        const quoteDeadline = sellAsset.chainId === btcChainId || buyAsset.chainId === btcChainId
+            ? BTC_QUOTE_DEADLINE_MS
+            : DEFAULT_QUOTE_DEADLINE_MS;
         const quoteRequest = {
             dry: false,
             swapType: QuoteRequest.swapType.EXACT_INPUT,
@@ -63,7 +66,7 @@ export const getTradeQuote = async (input, deps) => {
             refundType: QuoteRequest.refundType.ORIGIN_CHAIN,
             recipient: receiveAddress,
             recipientType: QuoteRequest.recipientType.DESTINATION_CHAIN,
-            deadline: new Date(Date.now() + DEFAULT_QUOTE_DEADLINE_MS).toISOString(),
+            deadline: new Date(Date.now() + quoteDeadline).toISOString(),
             referral: 'shapeshift',
             appFees: [
                 {
@@ -256,7 +259,7 @@ export const getTradeQuote = async (input, deps) => {
             steps: [
                 {
                     accountNumber,
-                    allowanceContract: quote.depositAddress,
+                    allowanceContract: '',
                     buyAmountBeforeFeesCryptoBaseUnit: quote.amountOut,
                     buyAmountAfterFeesCryptoBaseUnit: quote.amountOut,
                     buyAsset,

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

@@ -45,6 +45,7 @@ export const getNearIntentsAsset = ({ nearNetwork, contractAddress, }) => {
 const NEP245_CHAINS = ['bsc', 'pol', 'avax', 'op', 'tron', 'monad', 'plasma'];
 const TOKEN_LOOKUP_CHAINS = ['sui', 'starknet', 'ton'];
 const NEAR_CHAIN = 'near';
+const BTC_CHAIN = 'btc';
 const WNEAR_CONTRACT_ADDRESS = 'wrap.near';
 const isNep245Chain = (chain) => {
     return NEP245_CHAINS.includes(chain);
@@ -56,6 +57,9 @@ export const assetToNearIntentsAsset = async (asset) => {
     const nearNetwork = chainIdToNearIntentsChain[asset.chainId];
     if (!nearNetwork)
         return null;
+    // https://partners.near-intents.org/omni-migration#partners
+    if (nearNetwork === BTC_CHAIN)
+        return `1cs_v1:btc:native:coin`;
     // NEAR chain requires special handling
     // Native NEAR maps to wNEAR (wrap.near)
     if (nearNetwork === NEAR_CHAIN) {
@@ -91,7 +95,7 @@ export const assetToNearIntentsAsset = async (asset) => {
         }
         return match.assetId;
     }
-    // NEP-141 chains (ETH, ARB, BASE, GNOSIS, BTC, DOGE): use predictable format
+    // NEP-141 chains (ETH, ARB, BASE, GNOSIS, DOGE): use predictable format
     const contractAddress = isToken(asset.assetId)
         ? fromAssetId(asset.assetId).assetReference
         : zeroAddress;

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

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

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

@@ -62,7 +62,14 @@ export const checkTradeStatus = async ({ txHash, chainId, address, fetchIsSmartC
         return { buyTxHash, status: TxStatus.Pending, message };
     }
     catch (e) {
-        console.error(e);
+        const message = (() => {
+            if (axios.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: TxStatus.Unknown, message: undefined };
     }
 };

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

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

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

@@ -0,0 +1,15 @@
+import { getInboundAddressDataForChain } from '../getInboundAddressDataForChain.js';
+import { getChainIdBySwapper, getDaemonUrl } from '../index.js';
+export 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 === 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 = getDaemonUrl(config, swapperName);
+    const res = await getInboundAddressDataForChain(daemonUrl, sellAsset.assetId, true, swapperName);
+    if (res.isErr())
+        throw res.unwrapErr();
+    return { vault: res.unwrap().address };
+};

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

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

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

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

package/dist/esm/thorchain-utils/getL1RateOrQuote.js

@@ -7,8 +7,10 @@ import { TronWeb } from 'tronweb';
 import { v4 as uuid } from 'uuid';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../index.js';
 import { buildAffiliateFee } from '../swappers/utils/affiliateFee.js';
+import { isNativeEvmAsset } from '../swappers/utils/helpers/helpers.js';
 import { TradeQuoteError } from '../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../utils.js';
+import * as cosmossdk from './cosmossdk/index.js';
 import * as evm from './evm/index.js';
 import { getLimitWithManualSlippage } from './getLimitWithManualSlippage/getLimitWithManualSlippage.js';
 import { getQuote } from './getQuote.js';
@@ -128,7 +130,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
             affilate: getAffiliate(swapperName),
         });
     };
-    const makeThorTradeRateOrQuote = ({ route, memo, allowanceContract, feeData, data, router, vault, }) => {
+    const makeThorTradeRateOrQuote = ({ route, memo, allowanceContract, feeData, data, router, vault, thorchainTransactionMetadata, }) => {
         const buyAmountAfterFeesCryptoBaseUnit = convertPrecision({
             value: route.expectedAmountOutThorBaseUnit,
             inputExponent: buyAssetNativePrecision,
@@ -182,6 +184,7 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                     thorchainSpecific: {
                         maxStreamingQuantity: route.quote.max_streaming_quantity,
                     },
+                    thorchainTransactionMetadata,
                 },
             ],
         };
@@ -213,6 +216,11 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                     data,
                     router,
                     vault,
+                    thorchainTransactionMetadata: {
+                        to: router,
+                        data,
+                        value: isNativeEvmAsset(sellAsset.assetId) ? sellAmountCryptoBaseUnit : '0',
+                    },
                     feeData: {
                         protocolFees: getProtocolFees(route.quote),
                         networkFeeCryptoBaseUnit,
@@ -260,6 +268,11 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                     route,
                     allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData,
                 });
             }));
@@ -275,11 +288,18 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
         case CHAIN_NAMESPACE.CosmosSdk: {
             const cosmosChainAdapter = assertGetCosmosSdkChainAdapter(sellAsset.chainId);
             const { fast } = await cosmosChainAdapter.getFeeData({});
+            const { vault } = await cosmossdk.getThorTxData({ sellAsset, config, swapperName });
             return Ok(perRouteValues.map((route) => {
+                const memo = getMemo(route);
                 return makeThorTradeRateOrQuote({
                     route,
-                    memo: getMemo(route),
+                    memo,
                     allowanceContract: '0x0',
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData: {
                         networkFeeCryptoBaseUnit: fast.txFee,
                         protocolFees: getProtocolFees(route.quote),
@@ -293,13 +313,13 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
         case 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 TransactionInstruction({
                         keys: [],
                         programId: new PublicKey(SOLANA_MEMO_PROGRAM_ID),
@@ -325,6 +345,11 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                     route,
                     allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData,
                 });
             }));
@@ -338,20 +363,15 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
             return Ok(routes);
         }
         case 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 = 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({
                             fullHost: deps.config.VITE_TRON_NODE_URL,
@@ -400,6 +420,11 @@ export const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType
                     route,
                     allowanceContract: '0x0',
                     memo,
+                    thorchainTransactionMetadata: {
+                        to: vault,
+                        memo,
+                        value: sellAmountCryptoBaseUnit,
+                    },
                     feeData: {
                         networkFeeCryptoBaseUnit,
                         protocolFees: getProtocolFees(route.quote),

package/dist/esm/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.js';
-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/esm/thorchain-utils/getThresholdedAffiliateBps/getThresholdedAffiliateBps.js

@@ -1,21 +1,28 @@
-import { bn, convertBasisPointsToDecimalPercentage, convertPrecision } from '@shapeshiftoss/utils';
-import { getMidgardUrl, getNativeFee, getNativePrecision, getPoolAssetId, isNativeAsset, thorService, } from '../index.js';
-export const getOutboundFeeInSellAssetThorBaseUnit = (runePerAsset, swapperName) => {
-    return bn(getNativeFee(swapperName)).dividedBy(runePerAsset);
+import { convertBasisPointsToDecimalPercentage, convertPrecision } from '@shapeshiftoss/utils';
+import { getMidgardUrl, getNativeFee, getNativePrecision, getPoolAssetId, getSwapperNativeAssetId, isNativeAsset, thorService, } from '../index.js';
+// 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.
+export const getOutboundFeeSellAssetThorBaseUnit = (runePerAsset, sellAssetId, swapperName) => {
+    const nativeFeeSellAssetThorBaseUnit = convertPrecision({
+        value: getNativeFee(swapperName),
+        inputExponent: getNativePrecision(getSwapperNativeAssetId(swapperName), swapperName),
+        outputExponent: getNativePrecision(sellAssetId, swapperName),
+    });
+    return nativeFeeSellAssetThorBaseUnit.dividedBy(runePerAsset);
 };
-export const getExpectedAffiliateFeeSellAssetThorUnit = (sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName) => {
-    const sellAmountThorUnit = convertPrecision({
+export const getExpectedAffiliateFeeSellAssetThorBaseUnit = (sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName) => {
+    const sellAmountThorBaseUnit = convertPrecision({
         value: sellAmountCryptoBaseUnit,
         inputExponent: sellAsset.precision,
         outputExponent: getNativePrecision(sellAsset.assetId, swapperName),
     });
     const affiliatePercent = convertBasisPointsToDecimalPercentage(affiliateBps);
-    return sellAmountThorUnit.times(affiliatePercent);
+    return sellAmountThorBaseUnit.times(affiliatePercent);
 };
 // don't apply an affiliate fee if it's below the outbound fee for the inbound pool
 export const getThresholdedAffiliateBps = async ({ sellAsset, affiliateBps, sellAmountCryptoBaseUnit, config, swapperName, }) => {
     const midgardUrl = getMidgardUrl(config, swapperName);
-    const outboundFeeSellAssetThorUnit = await (async () => {
+    const outboundFeeSellAssetThorBaseUnit = await (async () => {
         if (isNativeAsset(sellAsset.assetId, swapperName))
             return getNativeFee(swapperName);
         const sellPoolId = getPoolAssetId({ assetId: sellAsset.assetId, swapperName });
@@ -24,11 +31,11 @@ export const getThresholdedAffiliateBps = async ({ sellAsset, affiliateBps, sell
         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 getOutboundFeeInSellAssetThorBaseUnit(pool.assetPrice, swapperName);
+        // calculate the rune outbound fee denominated in the sell asset, in thor base units
+        return getOutboundFeeSellAssetThorBaseUnit(pool.assetPrice, sellAsset.assetId, swapperName);
     })();
-    // calculate the expected affiliate fee, in native units
-    const expectedAffiliateFeeSellAssetThorUnit = getExpectedAffiliateFeeSellAssetThorUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName);
-    const isAffiliateFeeBelowOutboundFee = expectedAffiliateFeeSellAssetThorUnit.lte(outboundFeeSellAssetThorUnit);
+    // calculate the expected affiliate fee, in thor base units
+    const expectedAffiliateFeeSellAssetThorBaseUnit = getExpectedAffiliateFeeSellAssetThorBaseUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, swapperName);
+    const isAffiliateFeeBelowOutboundFee = expectedAffiliateFeeSellAssetThorBaseUnit.lte(outboundFeeSellAssetThorBaseUnit);
     return isAffiliateFeeBelowOutboundFee ? '0' : affiliateBps;
 };

package/dist/esm/thorchain-utils/getThresholdedAffiliateBps/getThresholdedAffiliateBps.test.js

@@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { ETH } from '../../swappers/utils/test-data/index.js';
 import { SwapperName } from '../../types.js';
 import { thorService } from '../service.js';
-import { getExpectedAffiliateFeeSellAssetThorUnit, getOutboundFeeInSellAssetThorBaseUnit, getThresholdedAffiliateBps, } from './getThresholdedAffiliateBps.js';
+import { getExpectedAffiliateFeeSellAssetThorBaseUnit, getOutboundFeeSellAssetThorBaseUnit, getThresholdedAffiliateBps, } from './getThresholdedAffiliateBps.js';
 const mockedThorService = vi.mocked(thorService);
 const mocks = vi.hoisted(() => ({
     get: vi.fn(),
@@ -24,18 +24,24 @@ vi.mock('../service', () => {
         thorService: mockAxios.default.create(),
     };
 });
-describe('getOutboundFeeInSellAssetThorBaseUnit', () => {
+describe('getOutboundFeeSellAssetThorBaseUnit', () => {
     it('should return 0.02 rune denominated in the target asset, in thor units', () => {
         const assetPricePrecision = '4.00000'; // 1 token is 4x as valuable as 1 rune
-        expect(getOutboundFeeInSellAssetThorBaseUnit(assetPricePrecision, SwapperName.Thorchain).toNumber()).toEqual(Number(thorchain.NATIVE_FEE) / 4);
+        expect(getOutboundFeeSellAssetThorBaseUnit(assetPricePrecision, ETH.assetId, SwapperName.Thorchain).toNumber()).toEqual(Number(thorchain.NATIVE_FEE) / 4);
+    });
+    it('should scale CACAO 10-dec native fee down to non-CACAO 8-dec sell asset precision on MAYA', () => {
+        // 1 eth = 100 cacao, NATIVE_FEE = 2e9 (10-dec CACAO = 0.2 CACAO)
+        // 0.2 CACAO / 100 (CACAO/ETH) = 0.002 ETH = 200_000 at 8-dec ETH
+        const assetPrice = '100';
+        expect(getOutboundFeeSellAssetThorBaseUnit(assetPrice, ETH.assetId, SwapperName.Mayachain).toNumber()).toEqual(200_000);
     });
 });
-describe('getExpectedAffiliateFeeSellAssetThorUnit', () => {
+describe('getExpectedAffiliateFeeSellAssetThorBaseUnit', () => {
     it('should return the correct affiliate fee in thor base units', () => {
         const sellAmountCryptoBaseUnit = '1000000000000000000'; // 1 eth
         const affiliateBps = '35';
         const sellAsset = ETH;
-        const result = getExpectedAffiliateFeeSellAssetThorUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, SwapperName.Thorchain);
+        const result = getExpectedAffiliateFeeSellAssetThorBaseUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, SwapperName.Thorchain);
         const expectation = bn('100000000').times('0.0035').toFixed(0);
         expect(result.toFixed(0)).toEqual(expectation);
     });
@@ -43,7 +49,7 @@ describe('getExpectedAffiliateFeeSellAssetThorUnit', () => {
         const sellAmountCryptoBaseUnit = '1000000000000000000'; // 1 eth
         const affiliateBps = '0';
         const sellAsset = ETH;
-        const result = getExpectedAffiliateFeeSellAssetThorUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, SwapperName.Thorchain);
+        const result = getExpectedAffiliateFeeSellAssetThorBaseUnit(sellAmountCryptoBaseUnit, sellAsset, affiliateBps, SwapperName.Thorchain);
         const expectation = '0';
         expect(result.toFixed(0)).toEqual(expectation);
     });

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

@@ -23,6 +23,7 @@ export declare const getDaemonUrl: (config: SwapperConfig, swapperName: SwapperN
 export declare const getMidgardUrl: (config: SwapperConfig, swapperName: SwapperName) => string;
 export declare const isNativeAsset: (assetId: AssetId, swapperName: SwapperName) => boolean;
 export declare const getNativePrecision: (assetId: AssetId, swapperName: SwapperName) => 8 | 10;
+export declare const getSwapperNativeAssetId: (swapperName: SwapperName) => AssetId;
 export declare const getNativeFee: (swapperName: SwapperName) => "2000000" | "2000000000";
 export declare const getAffiliate: (swapperName: SwapperName) => "ss" | "ssmaya";
 export declare const getPoolAssetId: ({ assetId, swapperName, }: {

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

@@ -1,4 +1,4 @@
-import { mayachainAssetId, mayachainChainId, thorchainChainId } from '@shapeshiftoss/caip';
+import { mayachainAssetId, mayachainChainId, thorchainAssetId, thorchainChainId, } from '@shapeshiftoss/caip';
 import * as adapters from '@shapeshiftoss/chain-adapters';
 import { assetIdToMayaPoolAssetId, CACAO_PRECISION, isCacao, MAYACHAIN_AFFILIATE_NAME, MAYACHAIN_PRECISION, MAYACHAIN_STREAM_SWAP_SOURCE, } from '../swappers/MayachainSwapper/index.js';
 import { assetIdToThorPoolAssetId, isRune, THORCHAIN_AFFILIATE_NAME, THORCHAIN_LONGTAIL_STREAMING_SWAP_SOURCE, THORCHAIN_LONGTAIL_SWAP_SOURCE, THORCHAIN_PRECISION, THORCHAIN_STREAM_SWAP_SOURCE, } from '../swappers/ThorchainSwapper/index.js';
@@ -69,6 +69,16 @@ export const getNativePrecision = (assetId, swapperName) => {
             throw new Error(`Invalid swapper: ${swapperName}`);
     }
 };
+export const getSwapperNativeAssetId = (swapperName) => {
+    switch (swapperName) {
+        case SwapperName.Thorchain:
+            return thorchainAssetId;
+        case SwapperName.Mayachain:
+            return mayachainAssetId;
+        default:
+            throw new Error(`Invalid swapper: ${swapperName}`);
+    }
+};
 export const getNativeFee = (swapperName) => {
     switch (swapperName) {
         case SwapperName.Thorchain:

package/dist/esm/types.d.ts

@@ -327,6 +327,12 @@ export type TradeQuoteStep = {
     thorchainSpecific?: {
         maxStreamingQuantity?: number;
     };
+    thorchainTransactionMetadata?: {
+        to: string;
+        data?: string;
+        value?: string;
+        memo?: string;
+    };
     relayTransactionMetadata?: RelayTransactionMetadata;
     butterSwapTransactionMetadata?: {
         to: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.7.1",
+  "version": "17.7.3",
   "repository": "https://github.com/shapeshift/web",
   "license": "MIT",
   "type": "module",
@@ -52,8 +52,8 @@
     "@shapeshiftoss/caip": "^8.16.7",
     "@shapeshiftoss/chain-adapters": "^11.3.9",
     "@shapeshiftoss/contracts": "^1.0.5-coderabbit-fix.2",
-    "@shapeshiftoss/hdwallet-core": "^1.62.41",
     "@shapeshiftoss/types": "^8.6.7",
+    "@shapeshiftoss/hdwallet-core": "^1.62.41",
     "@shapeshiftoss/unchained-client": "^10.14.10",
     "@shapeshiftoss/utils": "^1.0.5"
   },