@shapeshiftoss/swapper 17.6.9 → 17.6.11

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

@@ -6,6 +6,7 @@ const monads_1 = require("@sniptt/monads");
 const uuid_1 = require("uuid");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
+const affiliateFee_1 = require("../../utils/affiliateFee");
 const helpers_1 = require("../../utils/helpers/helpers");
 const fetchFromZrx_1 = require("../utils/fetchFromZrx");
 const helpers_2 = require("../utils/helpers/helpers");
@@ -65,6 +66,14 @@ async function getZrxTradeRate(input, assetsById, zrxBaseUrl) {
                 buyAmountAfterFeesCryptoBaseUnit: buyAmount,
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 source: types_1.SwapperName.Zrx,
+                affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                    strategy: 'buy_asset',
+                    affiliateBps,
+                    sellAsset,
+                    buyAsset,
+                    sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                    buyAmountCryptoBaseUnit: buyAmount,
+                }),
             },
         ],
     });

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

@@ -8,7 +8,7 @@ export declare const isSupportedChainId: (chainId: ChainId) => chainId is KnownC
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;
-}) => import("@sniptt/monads/build/result/result").ResOk<boolean, never> | import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types").SwapErrorRight>;
+}) => import("@sniptt/monads/build/result/result").ResErr<unknown, import("../../../../types").SwapErrorRight> | import("@sniptt/monads/build/result/result").ResOk<boolean, never>;
 export declare const calculateRate: ({ buyAmount, sellAmount, buyAsset, sellAsset, }: {
     buyAmount: string;
     sellAmount: string;

package/dist/cjs/swappers/utils/affiliateFee.d.ts

@@ -0,0 +1,17 @@
+import type { AssetId } from '@shapeshiftoss/caip';
+import type { Asset } from '@shapeshiftoss/types';
+import type { AffiliateFee } from '../../types';
+export type AffiliateFeeStrategy = 'buy_asset' | 'sell_asset' | 'fixed_asset';
+type BuildAffiliateFeeParams = {
+    strategy: AffiliateFeeStrategy;
+    affiliateBps: string;
+    sellAsset: Asset;
+    buyAsset: Asset;
+    sellAmountCryptoBaseUnit: string;
+    buyAmountCryptoBaseUnit: string;
+    fixedAsset?: Asset;
+    fixedAssetId?: AssetId;
+    isEstimate?: boolean;
+};
+export declare const buildAffiliateFee: (params: BuildAffiliateFeeParams) => AffiliateFee | undefined;
+export {};

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAffiliateFee = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const buildAffiliateFee = (params) => {
+    const { strategy, affiliateBps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, buyAmountCryptoBaseUnit, fixedAsset, fixedAssetId, isEstimate, } = params;
+    if ((0, utils_1.bnOrZero)(affiliateBps).lte(0))
+        return undefined;
+    const bpsDecimal = (0, utils_1.bn)(affiliateBps).div(10000);
+    switch (strategy) {
+        case 'buy_asset': {
+            const feeAmount = (0, utils_1.bnOrZero)(buyAmountCryptoBaseUnit).times(bpsDecimal).toFixed(0);
+            return {
+                assetId: buyAsset.assetId,
+                amountCryptoBaseUnit: feeAmount,
+                asset: buyAsset,
+                isEstimate,
+            };
+        }
+        case 'sell_asset': {
+            const feeAmount = (0, utils_1.bnOrZero)(sellAmountCryptoBaseUnit).times(bpsDecimal).toFixed(0);
+            return {
+                assetId: sellAsset.assetId,
+                amountCryptoBaseUnit: feeAmount,
+                asset: sellAsset,
+                isEstimate,
+            };
+        }
+        case 'fixed_asset': {
+            if (!fixedAsset || !fixedAssetId)
+                return undefined;
+            return {
+                assetId: fixedAssetId,
+                amountCryptoBaseUnit: '0',
+                asset: fixedAsset,
+                isEstimate: true,
+            };
+        }
+        default:
+            return undefined;
+    }
+};
+exports.buildAffiliateFee = buildAffiliateFee;

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

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterCrossChainEvmBuyAssetsBySellAssetId = exports.filterSameChainEvmBuyAssetsBySellAssetId = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const _filterEvmBuyAssetsBySellAssetId = ({ assets, sellAsset }, chainIdPredicate) => {
     // evm only
     if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId))
         return [];
     return assets.filter(buyAsset => {
-        // evm only AND chain id predicate with no arbitrum nova support for any swappers
-        return ((0, chain_adapters_1.isEvmChainId)(buyAsset.chainId) &&
-            chainIdPredicate(buyAsset.chainId, sellAsset.chainId) &&
-            buyAsset.chainId !== caip_1.arbitrumNovaChainId);
+        // evm only AND chain id predicate
+        return (0, chain_adapters_1.isEvmChainId)(buyAsset.chainId) && chainIdPredicate(buyAsset.chainId, sellAsset.chainId);
     });
 };
 const filterSameChainEvmBuyAssetsBySellAssetId = (input) => {

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

@@ -46,6 +46,9 @@ const DAO_TREASURY_BY_CHAIN_ID = {
     [types_1.KnownChainIds.SolanaMainnet]: utils_1.DAO_TREASURY_SOLANA,
     [types_1.KnownChainIds.BitcoinMainnet]: utils_1.DAO_TREASURY_BITCOIN,
     [types_1.KnownChainIds.StarknetMainnet]: utils_1.DAO_TREASURY_STARKNET,
+    [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,
 };
 const getTreasuryAddressFromChainId = (chainId) => {
     const maybeTreasuryChainId = (0, utils_1.isTreasuryChainId)(chainId) ? chainId : undefined;

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, "data" | "slippageTolerancePercentageDecimal" | "memo" | "aggregator" | "vault" | "expiry" | "tradeType" | "longtailData"> & {
+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

@@ -28,21 +28,25 @@ const caip_1 = require("@shapeshiftoss/caip");
 const adapters = __importStar(require("@shapeshiftoss/chain-adapters"));
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
+const web3_js_1 = require("@solana/web3.js");
 const tronweb_1 = require("tronweb");
 const uuid_1 = require("uuid");
 const index_1 = require("../index");
+const affiliateFee_1 = require("../swappers/utils/affiliateFee");
 const types_1 = require("../types");
 const utils_2 = require("../utils");
 const evm = __importStar(require("./evm"));
 const getLimitWithManualSlippage_1 = require("./getLimitWithManualSlippage/getLimitWithManualSlippage");
 const getQuote_1 = require("./getQuote");
 const index_2 = require("./index");
+const solana = __importStar(require("./solana"));
 const tron = __importStar(require("./tron"));
 const utxo = __importStar(require("./utxo"));
 const SAFE_GAS_LIMIT = '100000'; // depositWithExpiry()
+const SOLANA_MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
 const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapperName) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, receiveAddress, affiliateBps: requestedAffiliateBps, } = input;
-    const { config, assertGetEvmChainAdapter, assertGetUtxoChainAdapter, assertGetCosmosSdkChainAdapter, } = deps;
+    const { config, assertGetEvmChainAdapter, assertGetUtxoChainAdapter, assertGetCosmosSdkChainAdapter, assertGetSolanaChainAdapter, } = deps;
     // "NativePrecision" is intended to indicate the base unit precision of the asset
     // for the corresponding swapper network (THORChain or MAYAChain)
     // (CACAO = 10, everything else = 8)
@@ -101,7 +105,13 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
         : '0';
     const getRouteBuyAmountBeforeFeesCryptoBaseUnit = (quote) => {
         const buyAmountBeforeFeesCryptoThorPrecision = (0, utils_1.bn)(quote.expected_amount_out).plus(quote.fees.total);
-        return (0, utils_1.toBaseUnit)((0, utils_1.fromBaseUnit)(buyAmountBeforeFeesCryptoThorPrecision, buyAssetNativePrecision), buyAsset.precision);
+        return utils_1.BigAmount.fromPrecision({
+            value: utils_1.BigAmount.fromBaseUnit({
+                value: buyAmountBeforeFeesCryptoThorPrecision,
+                precision: buyAssetNativePrecision,
+            }).toPrecision(),
+            precision: buyAsset.precision,
+        }).toBaseUnit();
     };
     const getProtocolFees = (quote) => {
         // Fees consist of liquidity, outbound, and affiliate fees
@@ -187,6 +197,14 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                     accountNumber,
                     allowanceContract,
                     feeData,
+                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
+                        strategy: 'buy_asset',
+                        affiliateBps: route.affiliateBps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmountCryptoBaseUnit,
+                        buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
+                    }),
                     thorchainSpecific: {
                         maxStreamingQuantity: route.quote.max_streaming_quantity,
                     },
@@ -241,7 +259,11 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             const sellAdapter = assertGetUtxoChainAdapter(sellAsset.chainId);
             const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {
                 const memo = getMemo(route);
-                const { vault } = await utxo.getThorTxData({ sellAsset, config, swapperName });
+                const { vault } = await utxo.getThorTxData({
+                    sellAsset,
+                    config,
+                    swapperName,
+                });
                 const feeData = await (async () => {
                     const protocolFees = getProtocolFees(route.quote);
                     // This is a rate without a wallet connected, so we can't get fees
@@ -295,10 +317,51 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
             }));
         }
         case caip_1.CHAIN_NAMESPACE.Solana: {
-            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-                message: 'Solana is not supported',
-                code: types_1.TradeQuoteError.UnsupportedTradePair,
+            const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+            const sendAddress = input.sendAddress;
+            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),
+                        data: Buffer.from(memo, 'utf8'),
+                    });
+                    const transferInstruction = web3_js_1.SystemProgram.transfer({
+                        fromPubkey: new web3_js_1.PublicKey(sendAddress),
+                        toPubkey: new web3_js_1.PublicKey(vault),
+                        lamports: BigInt(sellAmountCryptoBaseUnit),
+                    });
+                    const { fast } = await adapter.getFeeData({
+                        to: vault,
+                        value: '0',
+                        chainSpecific: {
+                            from: sendAddress,
+                            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+                            instructions: [memoInstruction, transferInstruction],
+                        },
+                    });
+                    return { networkFeeCryptoBaseUnit: fast.txFee, protocolFees };
+                })();
+                return makeThorTradeRateOrQuote({
+                    route,
+                    allowanceContract: '0x0',
+                    memo,
+                    feeData,
+                });
             }));
+            const routes = maybeRoutes.filter(utils_1.isFulfilled).map(r => r.value);
+            if (!routes.length)
+                return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                    message: 'Unable to create any routes',
+                    code: types_1.TradeQuoteError.UnsupportedTradePair,
+                    cause: maybeRoutes.filter(utils_1.isRejected).map(r => r.reason),
+                }));
+            return (0, monads_1.Ok)(routes);
         }
         case caip_1.CHAIN_NAMESPACE.Tron: {
             const maybeRoutes = await Promise.allSettled(perRouteValues.map(async (route) => {
@@ -310,9 +373,15 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                         const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
                         const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
                         // Get vault address
-                        const { vault } = await tron.getThorTxData({ sellAsset, config, swapperName });
+                        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 });
+                        const tronWeb = new tronweb_1.TronWeb({
+                            fullHost: deps.config.VITE_TRON_NODE_URL,
+                        });
                         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;
@@ -322,7 +391,10 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                             try {
                                 const result = await tronWeb.transactionBuilder.triggerConstantContract(contractAddress, 'transfer(address,uint256)', {}, [
                                     { type: 'address', value: vault },
-                                    { type: 'uint256', value: sellAmountIncludingProtocolFeesCryptoBaseUnit },
+                                    {
+                                        type: 'uint256',
+                                        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                                    },
                                 ], input.receiveAddress);
                                 const energyUsed = result.energy_used ?? 65000;
                                 const energyFee = energyUsed * energyPrice * 1.5; // 1.5x safety margin
@@ -387,6 +459,12 @@ const getL1RateOrQuote = async (input, deps, streamingInterval, tradeType, swapp
                 code: types_1.TradeQuoteError.UnsupportedTradePair,
             }));
         }
+        case caip_1.CHAIN_NAMESPACE.Ton: {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: 'TON is not supported',
+                code: types_1.TradeQuoteError.UnsupportedTradePair,
+            }));
+        }
         default:
             return (0, utils_1.assertUnreachable)(chainNamespace);
     }

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

@@ -25,9 +25,15 @@ const getQuote = async (input, deps) => {
     });
     const buyPoolId = (0, index_1.getPoolAssetId)({ assetId: buyAssetId, swapperName });
     const sellPoolId = (0, index_1.getPoolAssetId)({ assetId: sellAsset.assetId, swapperName });
-    const sellAmountCryptoPrecision = (0, utils_1.fromBaseUnit)(sellAmountCryptoBaseUnit, sellAsset.precision);
+    const sellAmountCryptoPrecision = utils_1.BigAmount.fromBaseUnit({
+        value: sellAmountCryptoBaseUnit,
+        precision: sellAsset.precision,
+    }).toPrecision();
     // All pool amounts are native precision regardless of token precision
-    const sellAmountCryptoThorBaseUnit = (0, utils_1.bn)((0, utils_1.toBaseUnit)(sellAmountCryptoPrecision, (0, index_1.getNativePrecision)(sellAsset.assetId, swapperName)));
+    const sellAmountCryptoThorBaseUnit = (0, utils_1.bn)(utils_1.BigAmount.fromPrecision({
+        value: sellAmountCryptoPrecision,
+        precision: (0, index_1.getNativePrecision)(sellAsset.assetId, swapperName),
+    }).toBaseUnit());
     // The swap endpoint expects BCH receiveAddress's to be stripped of the "bitcoincash:" prefix
     const parsedReceiveAddress = receiveAddress && buyAssetId === caip_1.bchAssetId
         ? receiveAddress.replace('bitcoincash:', '')

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

@@ -13,6 +13,7 @@ export * from './getL1RateOrQuote';
 export * from './getPoolDetails';
 export * as cosmossdk from './cosmossdk';
 export * as evm from './evm';
+export * as solana from './solana';
 export * as tron from './tron';
 export * as utxo from './utxo';
 export declare const getChainIdBySwapper: (swapperName: SwapperName) => import("@shapeshiftoss/caip").ChainId;
@@ -21,7 +22,7 @@ export declare const isThorTradeQuote: (quote: TradeQuote | undefined) => quote
 export declare const getDaemonUrl: (config: SwapperConfig, swapperName: SwapperName) => string;
 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) => 10 | 8;
+export declare const getNativePrecision: (assetId: AssetId, swapperName: SwapperName) => 8 | 10;
 export declare const getNativeFee: (swapperName: SwapperName) => "2000000" | "2000000000";
 export declare const getAffiliate: (swapperName: SwapperName) => "ss" | "ssmaya";
 export declare const getPoolAssetId: ({ assetId, swapperName, }: {

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

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSwapSource = exports.getPoolAssetId = exports.getAffiliate = exports.getNativeFee = exports.getNativePrecision = exports.isNativeAsset = exports.getMidgardUrl = exports.getDaemonUrl = exports.isThorTradeQuote = exports.isThorTradeRate = exports.getChainIdBySwapper = exports.utxo = exports.tron = exports.evm = exports.cosmossdk = void 0;
+exports.getSwapSource = exports.getPoolAssetId = exports.getAffiliate = exports.getNativeFee = exports.getNativePrecision = exports.isNativeAsset = exports.getMidgardUrl = exports.getDaemonUrl = exports.isThorTradeQuote = exports.isThorTradeRate = exports.getChainIdBySwapper = exports.utxo = exports.tron = exports.solana = exports.evm = exports.cosmossdk = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const adapters = __importStar(require("@shapeshiftoss/chain-adapters"));
 const MayachainSwapper_1 = require("../swappers/MayachainSwapper");
@@ -43,6 +43,7 @@ __exportStar(require("./getL1RateOrQuote"), exports);
 __exportStar(require("./getPoolDetails"), exports);
 exports.cosmossdk = __importStar(require("./cosmossdk"));
 exports.evm = __importStar(require("./evm"));
+exports.solana = __importStar(require("./solana"));
 exports.tron = __importStar(require("./tron"));
 exports.utxo = __importStar(require("./utxo"));
 const getChainIdBySwapper = (swapperName) => {

package/dist/cjs/thorchain-utils/solana/constants.d.ts

@@ -0,0 +1 @@
+export declare const MEMO_PROGRAM_ID = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr";

package/dist/cjs/thorchain-utils/solana/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MEMO_PROGRAM_ID = void 0;
+// Solana Memo Program v2
+// https://spl.solana.com/memo
+exports.MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';

package/dist/cjs/thorchain-utils/solana/getSolanaTransactionFees.d.ts

@@ -0,0 +1,2 @@
+import type { GetUnsignedSolanaTransactionArgs, SwapperName } from '../../types';
+export declare const getSolanaTransactionFees: (args: GetUnsignedSolanaTransactionArgs, swapperName: SwapperName) => Promise<string>;

package/dist/cjs/thorchain-utils/solana/getSolanaTransactionFees.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSolanaTransactionFees = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const web3_js_1 = require("@solana/web3.js");
+const utils_2 = require("../../utils");
+const getThorTxData_1 = require("./getThorTxData");
+const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+const getSolanaTransactionFees = async (args, swapperName) => {
+    const { tradeQuote, stepIndex, from, assertGetSolanaChainAdapter, config } = args;
+    if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const { memo } = tradeQuote;
+    if (!memo)
+        throw new Error('Memo is required');
+    const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
+    const { sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset } = step;
+    const { vault } = await (0, getThorTxData_1.getThorTxData)({ sellAsset, config, swapperName });
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    const memoInstruction = new web3_js_1.TransactionInstruction({
+        keys: [],
+        programId: new web3_js_1.PublicKey(MEMO_PROGRAM_ID),
+        data: Buffer.from(memo, 'utf8'),
+    });
+    const transferInstruction = web3_js_1.SystemProgram.transfer({
+        fromPubkey: new web3_js_1.PublicKey(from),
+        toPubkey: new web3_js_1.PublicKey(vault),
+        lamports: BigInt(sellAmountIncludingProtocolFeesCryptoBaseUnit),
+    });
+    const { fast } = await adapter.getFeeData({
+        to: vault,
+        value: '0',
+        chainSpecific: {
+            from,
+            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+            instructions: [memoInstruction, transferInstruction],
+        },
+    });
+    return fast.txFee;
+};
+exports.getSolanaTransactionFees = getSolanaTransactionFees;

package/dist/cjs/thorchain-utils/solana/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/solana/getThorTxData.js

@@ -0,0 +1,14 @@
+"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, }) => {
+    const daemonUrl = (0, index_1.getDaemonUrl)(config, swapperName);
+    const res = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(daemonUrl, sellAsset.assetId, false, swapperName);
+    if (res.isErr())
+        throw res.unwrapErr();
+    const { address: vault } = res.unwrap();
+    return { vault };
+};
+exports.getThorTxData = getThorTxData;

package/dist/cjs/thorchain-utils/solana/getUnsignedSolanaTransaction.d.ts

@@ -0,0 +1,3 @@
+import type { SolanaSignTx } from '@shapeshiftoss/hdwallet-core';
+import type { GetUnsignedSolanaTransactionArgs, SwapperName } from '../../types';
+export declare const getUnsignedSolanaTransaction: (args: GetUnsignedSolanaTransactionArgs, swapperName: SwapperName) => Promise<SolanaSignTx>;

package/dist/cjs/thorchain-utils/solana/getUnsignedSolanaTransaction.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUnsignedSolanaTransaction = void 0;
+const utils_1 = require("@shapeshiftoss/utils");
+const web3_js_1 = require("@solana/web3.js");
+const utils_2 = require("../../utils");
+const getThorTxData_1 = require("./getThorTxData");
+const MEMO_PROGRAM_ID = 'MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr';
+// Each ComputeBudgetProgram instruction (setComputeUnitLimit, setComputeUnitPrice) costs 150 CU.
+// Fee estimation doesn't include these, so we add a fixed buffer to cover them.
+const COMPUTE_BUDGET_INSTRUCTION_OVERHEAD_CU = 300;
+const getUnsignedSolanaTransaction = async (args, swapperName) => {
+    const { tradeQuote, stepIndex, from, assertGetSolanaChainAdapter, config } = args;
+    if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
+        throw new Error('Unable to execute a trade rate quote');
+    const { memo } = tradeQuote;
+    if (!memo)
+        throw new Error('Memo is required');
+    const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
+    const { accountNumber, sellAmountIncludingProtocolFeesCryptoBaseUnit, sellAsset } = step;
+    const { vault } = await (0, getThorTxData_1.getThorTxData)({
+        sellAsset,
+        config,
+        swapperName,
+    });
+    const adapter = assertGetSolanaChainAdapter(sellAsset.chainId);
+    const memoInstruction = new web3_js_1.TransactionInstruction({
+        keys: [],
+        programId: new web3_js_1.PublicKey(MEMO_PROGRAM_ID),
+        data: Buffer.from(memo, 'utf8'),
+    });
+    const transferInstruction = web3_js_1.SystemProgram.transfer({
+        fromPubkey: new web3_js_1.PublicKey(from),
+        toPubkey: new web3_js_1.PublicKey(vault),
+        lamports: BigInt(sellAmountIncludingProtocolFeesCryptoBaseUnit),
+    });
+    const { fast } = await adapter.getFeeData({
+        to: vault,
+        value: '0',
+        chainSpecific: {
+            from,
+            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+            instructions: [memoInstruction, transferInstruction],
+        },
+    });
+    const memoHdwalletInstruction = {
+        keys: [],
+        programId: MEMO_PROGRAM_ID,
+        data: Buffer.from(memo, 'utf8'),
+    };
+    return adapter.buildSendApiTransaction({
+        from,
+        to: vault,
+        value: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        accountNumber,
+        chainSpecific: {
+            instructions: [memoHdwalletInstruction],
+            computeUnitLimit: String(Number(fast.chainSpecific.computeUnits) + COMPUTE_BUDGET_INSTRUCTION_OVERHEAD_CU),
+            computeUnitPrice: fast.chainSpecific.priorityFee,
+            tokenId: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
+        },
+    });
+};
+exports.getUnsignedSolanaTransaction = getUnsignedSolanaTransaction;

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

@@ -0,0 +1,3 @@
+export * from './getThorTxData';
+export * from './getUnsignedSolanaTransaction';
+export * from './getSolanaTransactionFees';

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

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./getThorTxData"), exports);
+__exportStar(require("./getUnsignedSolanaTransaction"), exports);
+__exportStar(require("./getSolanaTransactionFees"), exports);

package/dist/cjs/tron-utils/getUnsignedTronTransaction.js

@@ -1,19 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnsignedTronTransaction = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const utils_1 = require("@shapeshiftoss/utils");
 const utils_2 = require("../utils");
 const getUnsignedTronTransaction = ({ stepIndex, tradeQuote, from, assertGetTronChainAdapter, }) => {
     if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
         throw new Error('Unable to execute a trade rate quote');
     const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
-    const { accountNumber, sellAsset, relayTransactionMetadata, nearIntentsSpecific } = step;
+    const { accountNumber, sellAsset, relayTransactionMetadata, nearIntentsSpecific, butterSwapTransactionMetadata, } = step;
     const adapter = assertGetTronChainAdapter(sellAsset.chainId);
+    if (butterSwapTransactionMetadata) {
+        const { to, data, method, args, value: butterValue } = butterSwapTransactionMetadata;
+        if (!to)
+            throw new Error('Missing Butter swap contract address');
+        if (!data)
+            throw new Error('Missing Butter swap transaction data');
+        // Use Butter's value field which includes swap fees for same-chain swaps
+        // For native TRX sells, also include the sell amount
+        const isNativeTron = sellAsset.assetId === caip_1.tronAssetId;
+        const value = isNativeTron ? step.sellAmountIncludingProtocolFeesCryptoBaseUnit : butterValue;
+        return adapter.buildCustomApiTx({
+            from,
+            to,
+            accountNumber,
+            data,
+            value,
+            method,
+            args,
+        });
+    }
     const to = relayTransactionMetadata?.to ?? nearIntentsSpecific?.depositAddress;
     if (!to)
         throw new Error('Missing transaction destination address');
     const value = step.sellAmountIncludingProtocolFeesCryptoBaseUnit;
-    // Extract contract address for TRC20 tokens
     const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
     return adapter.buildSendApiTransaction({
         to,