@shapeshiftoss/swapper 20.1.1 → 20.3.0

package/dist/cjs/swappers/ButterSwap/utils/getButterSwapStepData.test.js

@@ -17,6 +17,11 @@ const route = routeQuote_1.ROUTE_QUOTE.data[0];
 const PROVIDER_GAS_FEE_BASE_UNIT = '1333043669759539'; // 0.001333043669759539 ETH
 const SOL = { ...assets_1.ETH, assetId: `${caip_1.solanaChainId}/slip44:501`, chainId: caip_1.solanaChainId };
 const TRX = { ...assets_1.ETH, assetId: `${caip_1.tronChainId}/slip44:195`, chainId: caip_1.tronChainId };
+const USDT_TRON = {
+    ...assets_1.ETH,
+    assetId: `${caip_1.tronChainId}/trc20:TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t`,
+    chainId: caip_1.tronChainId,
+};
 const evmBuildTx = {
     to: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
     data: '0xdeadbeef',
@@ -27,6 +32,7 @@ const makeDeps = (adapters) => ({
     assertGetEvmChainAdapter: () => adapters.evm,
     assertGetUtxoChainAdapter: () => adapters.utxo,
     assertGetSolanaChainAdapter: () => adapters.solana,
+    assertGetTronChainAdapter: () => adapters.tron,
 });
 const evmAdapter = ({ gasPrice = '1000000000', estimatedGasLimit = '500000', throwOnGasFeeData = false, throwOnFeeData = false, } = {}) => ({
     getGasFeeData: () => {
@@ -136,116 +142,152 @@ const evmQuoteInput = { supportsEIP1559: false };
             (0, vitest_1.expect)(actual.unwrapErr().code).toBe(types_1.TradeQuoteError.NetworkFeeEstimationFailed);
         });
     });
-    (0, vitest_1.describe)('utxo', () => {
-        const utxoAdapter = {
-            getFeeData: () => Promise.resolve({ fast: { txFee: '4200' } }),
-            httpProvider: {
-                getNetworkFees: () => Promise.resolve({ fast: { satsPerKiloByte: 10000 } }),
-            },
-        };
-        (0, vitest_1.it)('estimates off the default vsize for a rate with no pubkey', async () => {
+    (0, vitest_1.describe)('solana', () => {
+        (0, vitest_1.it)('uses the provider fee for a rate, since swap instructions do not exist yet', async () => {
+            const assertGetSolanaChainAdapter = vitest_1.vi.fn();
             const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
                 type: 'rate',
                 input: {},
-                deps: makeDeps({ utxo: utxoAdapter }),
+                deps: { assertGetSolanaChainAdapter },
                 route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
+                sellAsset: SOL,
+                feeAsset: SOL,
+                sellAmountCryptoBaseUnit: '1000000000',
                 spenderAddress: '',
             });
-            // 10 sats/byte * 200 vbyte default
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '2000' });
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({
+                networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT,
+            });
+        });
+    });
+    (0, vitest_1.describe)('tron', () => {
+        const tronBuildTx = { ...evmBuildTx, to: 'TRouterAddress' };
+        const tronAdapter = ({ txFee = '9000000', allowance = '0' } = {}) => ({
+            getFeeData: vitest_1.vi.fn().mockResolvedValue({ fast: { txFee } }),
+            httpProvider: {
+                getChainPrices: () => Promise.resolve({ energyPrice: 100, bandwidthPrice: 1000 }),
+                getTrc20Allowance: vitest_1.vi.fn().mockResolvedValue(allowance),
+                getTrc20Balance: vitest_1.vi.fn().mockResolvedValue('100000000'),
+                getContractEnergyShare: vitest_1.vi.fn().mockResolvedValue({
+                    callerPercent: 100,
+                    originEnergyLimit: 0,
+                    originEnergyAvailable: 0,
+                }),
+            },
         });
-        (0, vitest_1.it)('builds transaction data with the memo as op return data for a quote', async () => {
+        (0, vitest_1.it)('carries the router call as transactionData and simulates it', async () => {
+            const adapter = tronAdapter();
             const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
                 type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: 'butter-memo' },
-                deps: makeDeps({ utxo: utxoAdapter }),
+                input: {},
+                from: 'TSenderAddress',
+                buildTx: tronBuildTx,
+                deps: makeDeps({ tron: adapter }),
                 route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
                 spenderAddress: '',
             });
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: '4200',
-                transactionData: {
-                    type: 'utxo',
-                    to: 'bc1qbridge',
-                    opReturnData: 'butter-memo',
-                    value: '100000',
-                },
+            // Butter's value is the native amount to send: the sell amount for a native sell, 0 for a token
+            const transactionData = {
+                type: 'tron',
+                to: 'TRouterAddress',
+                data: evmBuildTx.data,
+                value: '100000000000000000',
+            };
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({ transactionData, networkFeeCryptoBaseUnit: '9000000' });
+            (0, vitest_1.expect)(adapter.getFeeData).toHaveBeenCalledWith({
+                to: 'TRouterAddress',
+                value: '100000000000000000',
+                chainSpecific: { from: 'TSenderAddress', data: evmBuildTx.data, requireEnergyShare: true },
             });
         });
-        (0, vitest_1.it)('errors when the quote is missing the memo the bridge routes on', async () => {
+        (0, vitest_1.it)('uses the provider value for a token sell', async () => {
             const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
                 type: 'quote',
-                input: { xpub: 'zpub6qux' },
-                from: 'bc1qaddress',
-                buildTx: { ...evmBuildTx, to: 'bc1qbridge', memo: undefined },
-                deps: makeDeps({ utxo: utxoAdapter }),
+                input: {},
+                from: 'TSenderAddress',
+                buildTx: { ...tronBuildTx, value: '0x00' },
+                deps: makeDeps({ tron: tronAdapter() }),
                 route,
-                sellAsset: assets_1.BTC,
-                feeAsset: assets_1.BTC,
-                sellAmountCryptoBaseUnit: '100000',
+                sellAsset: USDT_TRON,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
                 spenderAddress: '',
             });
-            (0, vitest_1.expect)(actual.isErr()).toBe(true);
-            (0, vitest_1.expect)(actual.unwrapErr().code).toBe(types_1.TradeQuoteError.InvalidResponse);
+            (0, vitest_1.expect)(actual.unwrap().transactionData).toMatchObject({ value: '0' });
         });
-    });
-    (0, vitest_1.describe)('solana', () => {
-        (0, vitest_1.it)('uses the provider fee for a rate, since swap instructions do not exist yet', async () => {
-            const assertGetSolanaChainAdapter = vitest_1.vi.fn();
+        (0, vitest_1.it)('fails a native quote when the simulation fails', async () => {
+            const adapter = tronAdapter();
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
             const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
-                type: 'rate',
+                type: 'quote',
                 input: {},
-                deps: { assertGetSolanaChainAdapter },
+                from: 'TSenderAddress',
+                buildTx: tronBuildTx,
+                deps: makeDeps({ tron: adapter }),
                 route,
-                sellAsset: SOL,
-                feeAsset: SOL,
-                sellAmountCryptoBaseUnit: '1000000000',
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
                 spenderAddress: '',
             });
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT,
-            });
+            (0, vitest_1.expect)(actual.isErr()).toBe(true);
         });
-    });
-    (0, vitest_1.describe)('tron', () => {
-        (0, vitest_1.it)('returns legacy metadata rather than transaction data, since exec still builds from it', async () => {
-            const buildTx = {
-                ...evmBuildTx,
-                to: 'TRouterAddress',
-                method: 'swapAndCall',
-                args: [{ type: 'address', value: 'TSpender' }],
-            };
+        (0, vitest_1.it)('prices the measured worst case when a token allowance is not granted yet', async () => {
+            const adapter = tronAdapter({ allowance: '0' });
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
             const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
                 type: 'quote',
                 input: {},
                 from: 'TSenderAddress',
-                buildTx,
-                deps: {},
+                buildTx: { ...tronBuildTx, value: '0x00' },
+                deps: makeDeps({ tron: adapter }),
                 route,
+                sellAsset: USDT_TRON,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
+            });
+            // 1000000 energy * 1.2 margin * 100 sun + (4 calldata + 279 envelope) bytes * 1000 sun
+            (0, vitest_1.expect)(actual.unwrap().networkFeeCryptoBaseUnit).toBe('120283000');
+        });
+        (0, vitest_1.it)('rates price the measured swap at the router share', async () => {
+            const adapter = tronAdapter();
+            adapter.httpProvider.getContractEnergyShare.mockResolvedValue({
+                callerPercent: 5,
+                originEnergyLimit: 10_000_000,
+                originEnergyAvailable: 5_000_000,
+            });
+            const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
+                type: 'rate',
+                input: {},
+                deps: makeDeps({ tron: adapter }),
+                route: { ...route, contract: 'TRouterAddress' },
                 sellAsset: TRX,
                 feeAsset: TRX,
                 sellAmountCryptoBaseUnit: '1000000',
                 spenderAddress: '',
             });
-            (0, vitest_1.expect)(actual.unwrap()).toEqual({
-                networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT,
-                butterSwapTransactionMetadata: {
-                    to: 'TRouterAddress',
-                    data: evmBuildTx.data,
-                    value: evmBuildTx.value,
-                    method: 'swapAndCall',
-                    args: [{ type: 'address', value: 'TSpender' }],
-                    memo: undefined,
-                },
+            // 1000000 * 5% caller energy * 1.2 margin * 100 sun + 2400 bytes * 1000 sun
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '8400000' });
+            (0, vitest_1.expect)(adapter.httpProvider.getContractEnergyShare).toHaveBeenCalledWith('TRouterAddress');
+        });
+        (0, vitest_1.it)('rates fall back to the provider fee when the worst case cannot be priced', async () => {
+            const adapter = tronAdapter();
+            adapter.httpProvider.getContractEnergyShare.mockRejectedValue(new Error('429'));
+            const actual = await (0, getButterSwapStepData_1.getButterSwapStepData)({
+                type: 'rate',
+                input: {},
+                deps: makeDeps({ tron: adapter }),
+                route: { ...route, contract: 'TRouterAddress' },
+                sellAsset: TRX,
+                feeAsset: TRX,
+                sellAmountCryptoBaseUnit: '1000000',
+                spenderAddress: '',
             });
+            (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: PROVIDER_GAS_FEE_BASE_UNIT });
         });
     });
     (0, vitest_1.it)('errors on an unsupported chain namespace', async () => {

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

@@ -20,7 +20,6 @@ const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
     [chains_1.avalanche.id]: types_1.KnownChainIds.AvalancheMainnet,
     [chains_1.robinhood.id]: types_1.KnownChainIds.RobinhoodMainnet,
     1360108768460801: types_1.KnownChainIds.SolanaMainnet,
-    1360095883558913: types_1.KnownChainIds.BitcoinMainnet,
     [chains_1.tron.id]: types_1.KnownChainIds.TronMainnet,
 };
 const CHAIN_ID_TO_BUTTERSWAP_CHAIN_ID = Object.entries(BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID).reduce((acc, [butterSwapChainId, chainId]) => {
@@ -37,7 +36,6 @@ const chainIdToButterSwapChainId = (chainId) => {
 exports.chainIdToButterSwapChainId = chainIdToButterSwapChainId;
 const assertValidTrade = ({ sellAsset, }) => {
     if (!(0, chain_adapters_1.isEvmChainId)(sellAsset.chainId) &&
-        sellAsset.chainId !== caip_1.btcChainId &&
         sellAsset.chainId !== caip_1.solanaChainId &&
         sellAsset.chainId !== caip_1.tronChainId) {
         return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
@@ -48,8 +46,7 @@ const assertValidTrade = ({ sellAsset, }) => {
     return (0, monads_1.Ok)(undefined);
 };
 exports.assertValidTrade = assertValidTrade;
-// Provider reported network fee - the rate fallback when estimation fails, and the fee for the
-// un-migrated tron quote path (exec computes the real fee at execution)
+// Provider reported network fee - the fallback when estimation fails
 const getProviderNetworkFeeCryptoBaseUnit = ({ route, feeAsset, }) => {
     if ((0, utils_1.bnOrZero)(route.gasFee?.amount).lte(0))
         return '0';

package/dist/cjs/swappers/ButterSwap/xhr.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.butterSwapErrorToTradeQuoteError = exports.getBridgeInfoBySourceHash = exports.isBuildTxSuccess = exports.isRouteSuccess = exports.fetchTxData = exports.getButterRoute = exports.ButterSwapErrorCode = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const viem_1 = require("viem");
@@ -23,7 +24,6 @@ var ButterSwapErrorCode;
     ButterSwapErrorCode[ButterSwapErrorCode["InvalidAddress"] = 2007] = "InvalidAddress";
 })(ButterSwapErrorCode || (exports.ButterSwapErrorCode = ButterSwapErrorCode = {}));
 const SOLANA_NATIVE_ADDRESS = 'So11111111111111111111111111111111111111112';
-const TRON_NATIVE_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
 const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, affiliate, }) => {
     const butterFromChainId = (0, helpers_2.chainIdToButterSwapChainId)(sellAsset.chainId);
     const butterToChainId = (0, helpers_2.chainIdToButterSwapChainId)(buyAsset.chainId);
@@ -42,7 +42,7 @@ const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision,
         if (sellAsset.chainId === caip_1.solanaChainId && sellAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
         if (sellAsset.chainId === caip_1.tronChainId && sellAssetIsNative)
-            return TRON_NATIVE_ADDRESS;
+            return chain_adapters_1.tron.TRON_ZERO_ADDRESS;
         if (sellAssetIsNative)
             return viem_1.zeroAddress;
         return sellAssetAddressRaw;
@@ -51,7 +51,7 @@ const getButterRoute = async ({ sellAsset, buyAsset, sellAmountCryptoPrecision,
         if (buyAsset.chainId === caip_1.solanaChainId && buyAssetIsNative)
             return SOLANA_NATIVE_ADDRESS;
         if (buyAsset.chainId === caip_1.tronChainId && buyAssetIsNative)
-            return TRON_NATIVE_ADDRESS;
+            return chain_adapters_1.tron.TRON_ZERO_ADDRESS;
         if (buyAssetIsNative)
             return viem_1.zeroAddress;
         return buyAssetAddressRaw;

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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chainflipApi = void 0;
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
-const utils_1 = require("@shapeshiftoss/utils");
-const utils_2 = require("../../utils");
+const utils_1 = require("../../utils");
 const evm_1 = require("../../utils/evm");
 const solana_1 = require("../../utils/solana");
 const tron_1 = require("../../utils/tron");
@@ -22,27 +21,12 @@ exports.chainflipApi = {
     getUtxoTransactionFees: utxo_1.getUtxoTransactionFees,
     getUnsignedSolanaTransaction: solana_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: solana_1.getSolanaTransactionFees,
-    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, chainflipSpecific, sellAsset } = step;
-        if (!chainflipSpecific?.depositAddress)
-            throw Error('Missing deposit address');
-        const adapter = assertGetTronChainAdapter(sellAsset.chainId);
-        return adapter.buildSendApiTransaction({
-            to: chainflipSpecific.depositAddress,
-            from,
-            value: step.sellAmountIncludingProtocolFeesCryptoBaseUnit,
-            accountNumber,
-            chainSpecific: { contractAddress: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId) },
-        });
-    },
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
     getTronTransactionFees: tron_1.getTronTransactionFees,
     checkTradeStatus: async ({ config, swap }) => {
         if (!swap)
             throw new Error('Missing swap');
-        const { swapId } = (0, utils_2.getSwapMetadata)(swap.metadata.swapperMetadata, 'chainflip');
+        const { swapId } = (0, utils_1.getSwapMetadata)(swap.metadata.swapperMetadata, 'chainflip');
         const brokerUrl = config.VITE_CHAINFLIP_API_URL;
         const apiKey = config.VITE_CHAINFLIP_API_KEY;
         const maybeStatusResponse = await chainflipService_1.chainflipService.get(`${brokerUrl}/status-by-id?apiKey=${apiKey}&swapId=${swapId}`);

package/dist/cjs/swappers/ChainflipSwapper/utils/getChainflipStepData.d.ts

@@ -14,7 +14,7 @@ type ChainflipRateStepData = {
     networkFeeCryptoBaseUnit: string | undefined;
 };
 type ChainflipQuoteStepData = {
-    transactionData?: TxBuildData;
+    transactionData: TxBuildData;
     networkFeeCryptoBaseUnit: string | undefined;
 };
 export declare function getChainflipStepData(args: Extract<GetChainflipStepDataArgs, {

package/dist/cjs/swappers/ChainflipSwapper/utils/getChainflipStepData.js

@@ -153,23 +153,42 @@ async function getChainflipStepData(args) {
                 return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getChainflipStepData', error));
             }
         }
-        // Un-migrated - exec builds its tx from chainflipSpecific.depositAddress, so no transactionData is carried
         case caip_1.CHAIN_NAMESPACE.Tron: {
-            const to = depositAddress ?? from;
-            if (!to || !from) {
-                const stepData = { networkFeeCryptoBaseUnit: undefined };
+            const adapter = deps.assertGetTronChainAdapter(sellAsset.chainId);
+            const contractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
+            if (args.type === 'rate') {
+                // No deposit channel yet, but every channel is a fresh address, so a fresh recipient prices the transfer
+                const networkFeeCryptoBaseUnit = await (async () => {
+                    if (!from)
+                        return;
+                    try {
+                        const { fast } = await adapter.getFeeData({
+                            to: chain_adapters_1.tron.generateFreshTronAddress(),
+                            value: sellAmountCryptoBaseUnit,
+                            chainSpecific: { from, contractAddress },
+                        });
+                        return fast.txFee;
+                    }
+                    catch { }
+                })();
+                const stepData = { networkFeeCryptoBaseUnit };
                 return (0, monads_1.Ok)(stepData);
             }
+            const transactionData = {
+                type: 'tron',
+                to: args.depositAddress,
+                value: sellAmountCryptoBaseUnit,
+            };
             try {
-                const { fast } = await deps.assertGetTronChainAdapter(sellAsset.chainId).getFeeData({
-                    to,
-                    value: sellAmountCryptoBaseUnit,
-                    chainSpecific: {
-                        from,
-                        contractAddress: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
-                    },
+                const { fast } = await adapter.getFeeData({
+                    to: transactionData.to,
+                    value: transactionData.value,
+                    chainSpecific: { from, contractAddress, requireEnergyShare: true },
                 });
-                const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
+                const stepData = {
+                    transactionData,
+                    networkFeeCryptoBaseUnit: fast.txFee,
+                };
                 return (0, monads_1.Ok)(stepData);
             }
             catch (error) {

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

@@ -2,3 +2,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 UTXO_QUOTE_DEADLINE_MS: number;
+export declare const APP_FEE_SPLIT_MULTIPLIER = 2;

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UTXO_QUOTE_DEADLINE_MS = exports.DEFAULT_QUOTE_DEADLINE_MS = exports.DEFAULT_SLIPPAGE_BPS = exports.ONE_CLICK_BASE_URL = void 0;
+exports.APP_FEE_SPLIT_MULTIPLIER = exports.UTXO_QUOTE_DEADLINE_MS = exports.DEFAULT_QUOTE_DEADLINE_MS = exports.DEFAULT_SLIPPAGE_BPS = exports.ONE_CLICK_BASE_URL = void 0;
 exports.ONE_CLICK_BASE_URL = 'https://1click.chaindefuser.com';
 exports.DEFAULT_SLIPPAGE_BPS = 50;
 // 1Click refunds a deposit it cannot settle by the requested deadline, and prices a quote the same at any length
 exports.DEFAULT_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
 exports.UTXO_QUOTE_DEADLINE_MS = 4 * 60 * 60 * 1000;
+// 1Click pays half of the requested appFee to its own account, so request double to receive affiliateBps
+exports.APP_FEE_SPLIT_MULTIPLIER = 2;

package/dist/cjs/swappers/NearIntentsSwapper/utils/getNearIntentsStepData.js

@@ -145,12 +145,17 @@ async function getNearIntentsStepData(args) {
                 const { fast } = await deps.assertGetTronChainAdapter(sellAsset.chainId).getFeeData({
                     to: depositAddress,
                     value: sellAmountCryptoBaseUnit,
-                    chainSpecific: {
-                        from,
-                        contractAddress: (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
-                    },
+                    chainSpecific: { from, contractAddress, requireEnergyShare: type === 'quote' },
                 });
-                const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
+                const networkFeeCryptoBaseUnit = fast.txFee;
+                if (type === 'rate') {
+                    const stepData = { networkFeeCryptoBaseUnit };
+                    return (0, monads_1.Ok)(stepData);
+                }
+                const stepData = {
+                    transactionData: { type: 'tron', to: depositAddress, value: sellAmountCryptoBaseUnit },
+                    networkFeeCryptoBaseUnit,
+                };
                 return (0, monads_1.Ok)(stepData);
             }
             case caip_1.CHAIN_NAMESPACE.Sui: {

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

@@ -156,7 +156,7 @@ const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, amount, s
         appFees: [
             {
                 recipient: utils_1.DAO_TREASURY_NEAR,
-                fee: Number(affiliateBps),
+                fee: Number(affiliateBps) * constants_1.APP_FEE_SPLIT_MULTIPLIER,
             },
         ],
     };

package/dist/cjs/swappers/RelaySwapper/constant.d.ts

@@ -14,8 +14,8 @@ export declare const relayChainIdToChainId: import("lodash").Dictionary<string>;
 export declare const DEFAULT_RELAY_EVM_TOKEN_ADDRESS: "0x0000000000000000000000000000000000000000";
 export declare const RELAY_BTC_TOKEN_ADDRESS = "bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8";
 export declare const RELAY_SOLANA_TOKEN_ADDRESS = "11111111111111111111111111111111";
-export declare const RELAY_TRON_TOKEN_ADDRESS = "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb";
 export declare const DEFAULT_RELAY_EVM_USER_ADDRESS = "0x000000000000000000000000000000000000dead";
+export declare const RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = "100000";
 export declare const DEFAULT_RELAY_BTC_USER_ADDRESS = "bc1q4vxn43l44h30nkluqfxd9eckf45vr2awz38lwa";
 export declare const DEFAULT_RELAY_SOLANA_USER_ADDRESS = "CbKGgVKLJFb8bBrf58DnAkdryX6ubewVytn7X957YwNr";
 export declare const DEFAULT_RELAY_TRON_USER_ADDRESS = "TLsV52sRDL79HXGGm9yzwKibb6BeruhUzy";

package/dist/cjs/swappers/RelaySwapper/constant.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.relayErrorCodeToTradeQuoteError = exports.MAXIMUM_SUPPORTED_RELAY_STEPS = exports.DEFAULT_RELAY_TRON_USER_ADDRESS = exports.DEFAULT_RELAY_SOLANA_USER_ADDRESS = exports.DEFAULT_RELAY_BTC_USER_ADDRESS = exports.DEFAULT_RELAY_EVM_USER_ADDRESS = exports.RELAY_TRON_TOKEN_ADDRESS = exports.RELAY_SOLANA_TOKEN_ADDRESS = exports.RELAY_BTC_TOKEN_ADDRESS = exports.DEFAULT_RELAY_EVM_TOKEN_ADDRESS = exports.relayChainIdToChainId = exports.RelayStatusMessage = exports.chainIdToRelayChainId = void 0;
+exports.relayErrorCodeToTradeQuoteError = exports.MAXIMUM_SUPPORTED_RELAY_STEPS = exports.DEFAULT_RELAY_TRON_USER_ADDRESS = exports.DEFAULT_RELAY_SOLANA_USER_ADDRESS = exports.DEFAULT_RELAY_BTC_USER_ADDRESS = exports.RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = exports.DEFAULT_RELAY_EVM_USER_ADDRESS = exports.RELAY_SOLANA_TOKEN_ADDRESS = exports.RELAY_BTC_TOKEN_ADDRESS = exports.DEFAULT_RELAY_EVM_TOKEN_ADDRESS = exports.relayChainIdToChainId = exports.RelayStatusMessage = exports.chainIdToRelayChainId = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const invert_1 = __importDefault(require("lodash/invert"));
 const viem_1 = require("viem");
@@ -64,8 +64,9 @@ exports.relayChainIdToChainId = (0, invert_1.default)(exports.chainIdToRelayChai
 exports.DEFAULT_RELAY_EVM_TOKEN_ADDRESS = viem_1.zeroAddress;
 exports.RELAY_BTC_TOKEN_ADDRESS = 'bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8';
 exports.RELAY_SOLANA_TOKEN_ADDRESS = '11111111111111111111111111111111';
-exports.RELAY_TRON_TOKEN_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
 exports.DEFAULT_RELAY_EVM_USER_ADDRESS = '0x000000000000000000000000000000000000dead';
+// depositor energy for a TRC20 deposit measured on mainnet, for token quotes without their allowance
+exports.RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = '100000';
 exports.DEFAULT_RELAY_BTC_USER_ADDRESS = 'bc1q4vxn43l44h30nkluqfxd9eckf45vr2awz38lwa';
 exports.DEFAULT_RELAY_SOLANA_USER_ADDRESS = 'CbKGgVKLJFb8bBrf58DnAkdryX6ubewVytn7X957YwNr';
 exports.DEFAULT_RELAY_TRON_USER_ADDRESS = 'TLsV52sRDL79HXGGm9yzwKibb6BeruhUzy';

package/dist/cjs/swappers/RelaySwapper/getTradeQuote/getTradeQuote.js

@@ -24,12 +24,11 @@ const getQuote = async (input, deps, relayChainMap) => {
             type: 'quote',
             input,
         });
-        return maybeStepData.map(({ transactionData, relayTransactionMetadata, networkFeeCryptoBaseUnit, }) => ({
+        return maybeStepData.map(({ transactionData, networkFeeCryptoBaseUnit }) => ({
             ...stepCommon,
             accountNumber,
             allowanceContract,
             transactionData,
-            relayTransactionMetadata,
             swapperMetadata: {
                 name: 'relay',
                 relayId,

package/dist/cjs/swappers/RelaySwapper/utils/getRelayAssetAddress.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelayAssetAddress = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const helpers_1 = require("../../../utils/helpers");
 const constant_1 = require("../constant");
 const getRelayAssetAddress = (asset) => {
@@ -10,7 +11,7 @@ const getRelayAssetAddress = (asset) => {
     if (asset.assetId === caip_1.solAssetId)
         return constant_1.RELAY_SOLANA_TOKEN_ADDRESS;
     if (asset.assetId === caip_1.tronAssetId)
-        return constant_1.RELAY_TRON_TOKEN_ADDRESS;
+        return chain_adapters_1.tron.TRON_ZERO_ADDRESS;
     if ((0, helpers_1.isNativeEvmAsset)(asset.assetId))
         return constant_1.DEFAULT_RELAY_EVM_TOKEN_ADDRESS;
     const { assetReference } = (0, caip_1.fromAssetId)(asset.assetId);

package/dist/cjs/swappers/RelaySwapper/utils/getRelayStepData.d.ts

@@ -1,7 +1,7 @@
 import type { Result } from '@sniptt/monads';
 import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { SolanaComputeBudgetOptions } from '../../../utils/solana';
-import type { RelayQuoteItem, RelayTransactionMetadata } from './types';
+import type { RelayQuoteItem } from './types';
 export declare const RELAY_SOLANA_COMPUTE_BUDGET: SolanaComputeBudgetOptions;
 type BaseArgs = {
     data: RelayQuoteItem['data'];
@@ -15,8 +15,7 @@ type RelayRateStepData = {
     networkFeeCryptoBaseUnit: string;
 };
 type RelayQuoteStepData = {
-    transactionData?: TxBuildData;
-    relayTransactionMetadata?: RelayTransactionMetadata;
+    transactionData: TxBuildData;
     networkFeeCryptoBaseUnit: string;
 };
 export type GetRelayStepDataArgs = StepDataArgs<BaseArgs, {

package/dist/cjs/swappers/RelaySwapper/utils/getRelayStepData.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelayStepData = exports.RELAY_SOLANA_COMPUTE_BUDGET = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 const solana_1 = require("../../../utils/solana");
+const tron_1 = require("../../../utils/tron");
 const utxo_1 = require("../../../utils/utxo");
+const constant_1 = require("../constant");
 const getRelayPsbtRelayer_1 = require("./getRelayPsbtRelayer");
 const helpers_1 = require("./helpers");
 const types_1 = require("./types");
@@ -172,25 +175,55 @@ async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUnit, spe
             return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getRelayStepData', error));
         }
     }
+    // Native and token sells alike are a call into relay's depositor contract
     if ((0, types_1.isRelayQuoteTronItemData)(data)) {
-        const contractAddress = data.parameter?.contract_address;
-        const tronCallData = data.parameter?.data;
-        const isTronToken = (0, utils_1.isToken)(sellAsset.assetId);
-        if (isTronToken && !contractAddress)
-            return (0, monads_1.Err)((0, utils_2.makeTradeStepBuildFailedErr)('getRelayStepData'));
-        if (isTronToken && !tronCallData)
-            return (0, monads_1.Err)((0, utils_2.makeTradeStepBuildFailedErr)('getRelayStepData'));
+        const { contract_address: contractAddress, data: callData, call_value: callValue, } = data.parameter ?? {};
         if (type === 'rate') {
+            // Relay's gas figure runs ~35% under the deposit's measured energy, so rates price the measured call
+            const networkFeeCryptoBaseUnit = await (async () => {
+                if (!contractAddress || !callData)
+                    return fallbackNetworkFeeCryptoBaseUnit;
+                try {
+                    return await (0, tron_1.getTronContractCallFallbackFeeCryptoBaseUnit)({
+                        adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                        energy: constant_1.RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                        bandwidthBytes: chain_adapters_1.tron.getTronContractCallBandwidthBytes(callData),
+                        contractAddress,
+                    });
+                }
+                catch {
+                    return fallbackNetworkFeeCryptoBaseUnit;
+                }
+            })();
+            const stepData = { networkFeeCryptoBaseUnit };
+            return (0, monads_1.Ok)(stepData);
+        }
+        if (!contractAddress || !callData)
+            return (0, monads_1.Err)((0, utils_2.makeTradeStepBuildFailedErr)('getRelayStepData'));
+        const isNativeSell = !(0, utils_1.isToken)(sellAsset.assetId);
+        const call = {
+            to: contractAddress,
+            data: callData,
+            value: String(callValue ?? (isNativeSell ? sellAmountCryptoBaseUnit : 0)),
+        };
+        try {
             const stepData = {
-                networkFeeCryptoBaseUnit: fallbackNetworkFeeCryptoBaseUnit,
+                transactionData: { type: 'tron', ...call },
+                networkFeeCryptoBaseUnit: await (0, tron_1.getTronContractCallNetworkFeeCryptoBaseUnit)({
+                    adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                    transactionData: call,
+                    from,
+                    sellAsset,
+                    sellAmountCryptoBaseUnit,
+                    spenderAddress: contractAddress,
+                    fallbackEnergy: constant_1.RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                }),
             };
             return (0, monads_1.Ok)(stepData);
         }
-        const stepData = {
-            relayTransactionMetadata: { to: contractAddress, data: tronCallData },
-            networkFeeCryptoBaseUnit: fallbackNetworkFeeCryptoBaseUnit,
-        };
-        return (0, monads_1.Ok)(stepData);
+        catch (error) {
+            return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getRelayStepData', error));
+        }
     }
     return (0, monads_1.Err)((0, utils_2.makeTradeStepBuildFailedErr)('getRelayStepData'));
 }