@shapeshiftoss/swapper 20.1.1 → 20.3.0

package/dist/esm/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/esm/swappers/ChainflipSwapper/utils/getChainflipStepData.js

@@ -1,5 +1,5 @@
 import { CHAIN_NAMESPACE, fromAssetId, fromChainId } from '@shapeshiftoss/caip';
-import { evm } from '@shapeshiftoss/chain-adapters';
+import { evm, tron } from '@shapeshiftoss/chain-adapters';
 import { bn, contractAddressOrUndefined } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
@@ -150,23 +150,42 @@ export async function getChainflipStepData(args) {
                 return Err(makeNetworkFeeEstimationFailedErr('getChainflipStepData', error));
             }
         }
-        // Un-migrated - exec builds its tx from chainflipSpecific.depositAddress, so no transactionData is carried
         case CHAIN_NAMESPACE.Tron: {
-            const to = depositAddress ?? from;
-            if (!to || !from) {
-                const stepData = { networkFeeCryptoBaseUnit: undefined };
+            const adapter = deps.assertGetTronChainAdapter(sellAsset.chainId);
+            const contractAddress = 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: tron.generateFreshTronAddress(),
+                            value: sellAmountCryptoBaseUnit,
+                            chainSpecific: { from, contractAddress },
+                        });
+                        return fast.txFee;
+                    }
+                    catch { }
+                })();
+                const stepData = { networkFeeCryptoBaseUnit };
                 return 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: 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 Ok(stepData);
             }
             catch (error) {

package/dist/esm/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/esm/swappers/NearIntentsSwapper/constants.js

@@ -3,3 +3,5 @@ export const DEFAULT_SLIPPAGE_BPS = 50;
 // 1Click refunds a deposit it cannot settle by the requested deadline, and prices a quote the same at any length
 export const DEFAULT_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
 export const 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
+export const APP_FEE_SPLIT_MULTIPLIER = 2;

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

@@ -142,12 +142,17 @@ export async function getNearIntentsStepData(args) {
                 const { fast } = await deps.assertGetTronChainAdapter(sellAsset.chainId).getFeeData({
                     to: depositAddress,
                     value: sellAmountCryptoBaseUnit,
-                    chainSpecific: {
-                        from,
-                        contractAddress: 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 Ok(stepData);
+                }
+                const stepData = {
+                    transactionData: { type: 'tron', to: depositAddress, value: sellAmountCryptoBaseUnit },
+                    networkFeeCryptoBaseUnit,
+                };
                 return Ok(stepData);
             }
             case CHAIN_NAMESPACE.Sui: {

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

@@ -5,7 +5,7 @@ import { Err, Ok } from '@sniptt/monads';
 import { zeroAddress } from 'viem';
 import { TradeQuoteError } from '../../../types.js';
 import { createTradeAmountTooSmallErr, makeSwapErrorRight } from '../../../utils/index.js';
-import { DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, UTXO_QUOTE_DEADLINE_MS, } from '../constants.js';
+import { APP_FEE_SPLIT_MULTIPLIER, DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, UTXO_QUOTE_DEADLINE_MS, } from '../constants.js';
 import { chainIdToNearIntentsChain, QuoteRequest } from '../types.js';
 import { ApiError, OneClickService } from './oneClickService.js';
 const getTokensWithRetry = async () => {
@@ -149,7 +149,7 @@ export const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, am
         appFees: [
             {
                 recipient: DAO_TREASURY_NEAR,
-                fee: Number(affiliateBps),
+                fee: Number(affiliateBps) * APP_FEE_SPLIT_MULTIPLIER,
             },
         ],
     };

package/dist/esm/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/esm/swappers/RelaySwapper/constant.js

@@ -58,8 +58,9 @@ export const relayChainIdToChainId = invert(chainIdToRelayChainId);
 export const DEFAULT_RELAY_EVM_TOKEN_ADDRESS = zeroAddress;
 export const RELAY_BTC_TOKEN_ADDRESS = 'bc1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqmql8k8';
 export const RELAY_SOLANA_TOKEN_ADDRESS = '11111111111111111111111111111111';
-export const RELAY_TRON_TOKEN_ADDRESS = 'T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb';
 export const DEFAULT_RELAY_EVM_USER_ADDRESS = '0x000000000000000000000000000000000000dead';
+// depositor energy for a TRC20 deposit measured on mainnet, for token quotes without their allowance
+export const RELAY_TRON_FALLBACK_DEPOSIT_ENERGY = '100000';
 export const DEFAULT_RELAY_BTC_USER_ADDRESS = 'bc1q4vxn43l44h30nkluqfxd9eckf45vr2awz38lwa';
 export const DEFAULT_RELAY_SOLANA_USER_ADDRESS = 'CbKGgVKLJFb8bBrf58DnAkdryX6ubewVytn7X957YwNr';
 export const DEFAULT_RELAY_TRON_USER_ADDRESS = 'TLsV52sRDL79HXGGm9yzwKibb6BeruhUzy';

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

@@ -21,12 +21,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/esm/swappers/RelaySwapper/utils/getRelayAssetAddress.js

@@ -1,13 +1,14 @@
 import { btcAssetId, fromAssetId, isAssetReference, solAssetId, tronAssetId, } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { isNativeEvmAsset } from '../../../utils/helpers.js';
-import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, RELAY_TRON_TOKEN_ADDRESS, } from '../constant.js';
+import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, } from '../constant.js';
 export const getRelayAssetAddress = (asset) => {
     if (asset.assetId === btcAssetId)
         return RELAY_BTC_TOKEN_ADDRESS;
     if (asset.assetId === solAssetId)
         return RELAY_SOLANA_TOKEN_ADDRESS;
     if (asset.assetId === tronAssetId)
-        return RELAY_TRON_TOKEN_ADDRESS;
+        return tron.TRON_ZERO_ADDRESS;
     if (isNativeEvmAsset(asset.assetId))
         return DEFAULT_RELAY_EVM_TOKEN_ADDRESS;
     const { assetReference } = fromAssetId(asset.assetId);

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

@@ -1,7 +1,7 @@
 import type { Result } from '@sniptt/monads';
 import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types.js';
 import type { SolanaComputeBudgetOptions } from '../../../utils/solana/index.js';
-import type { RelayQuoteItem, RelayTransactionMetadata } from './types.js';
+import type { RelayQuoteItem } from './types.js';
 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/esm/swappers/RelaySwapper/utils/getRelayStepData.js

@@ -1,10 +1,13 @@
 import { fromChainId } from '@shapeshiftoss/caip';
+import { tron } from '@shapeshiftoss/chain-adapters';
 import { bnOrZero, contractAddressOrUndefined, isToken } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { makeNetworkFeeEstimationFailedErr, makeTradeStepBuildFailedErr } from '../../../utils/index.js';
 import { getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
 import { getSolanaNetworkFeeCryptoBaseUnit, omitComputeBudgetInstructions, withComputeUnitLimit, } from '../../../utils/solana/index.js';
+import { getTronContractCallFallbackFeeCryptoBaseUnit, getTronContractCallNetworkFeeCryptoBaseUnit, } from '../../../utils/tron/index.js';
 import { getUtxoNetworkFeeCryptoBaseUnit } from '../../../utils/utxo/index.js';
+import { RELAY_TRON_FALLBACK_DEPOSIT_ENERGY } from '../constant.js';
 import { getRelayPsbtRelayer } from './getRelayPsbtRelayer.js';
 import { convertRelaySolanaInstruction } from './helpers.js';
 import { isRelayQuoteEvmItemData, isRelayQuoteSolanaItemData, isRelayQuoteTronItemData, isRelayQuoteUtxoItemData, } from './types.js';
@@ -169,25 +172,55 @@ export async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUn
             return Err(makeNetworkFeeEstimationFailedErr('getRelayStepData', error));
         }
     }
+    // Native and token sells alike are a call into relay's depositor contract
     if (isRelayQuoteTronItemData(data)) {
-        const contractAddress = data.parameter?.contract_address;
-        const tronCallData = data.parameter?.data;
-        const isTronToken = isToken(sellAsset.assetId);
-        if (isTronToken && !contractAddress)
-            return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
-        if (isTronToken && !tronCallData)
-            return Err(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 getTronContractCallFallbackFeeCryptoBaseUnit({
+                        adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                        energy: RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                        bandwidthBytes: tron.getTronContractCallBandwidthBytes(callData),
+                        contractAddress,
+                    });
+                }
+                catch {
+                    return fallbackNetworkFeeCryptoBaseUnit;
+                }
+            })();
+            const stepData = { networkFeeCryptoBaseUnit };
+            return Ok(stepData);
+        }
+        if (!contractAddress || !callData)
+            return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
+        const isNativeSell = !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 getTronContractCallNetworkFeeCryptoBaseUnit({
+                    adapter: deps.assertGetTronChainAdapter(sellAsset.chainId),
+                    transactionData: call,
+                    from,
+                    sellAsset,
+                    sellAmountCryptoBaseUnit,
+                    spenderAddress: contractAddress,
+                    fallbackEnergy: RELAY_TRON_FALLBACK_DEPOSIT_ENERGY,
+                }),
             };
             return Ok(stepData);
         }
-        const stepData = {
-            relayTransactionMetadata: { to: contractAddress, data: tronCallData },
-            networkFeeCryptoBaseUnit: fallbackNetworkFeeCryptoBaseUnit,
-        };
-        return Ok(stepData);
+        catch (error) {
+            return Err(makeNetworkFeeEstimationFailedErr('getRelayStepData', error));
+        }
     }
     return Err(makeTradeStepBuildFailedErr('getRelayStepData'));
 }

package/dist/esm/swappers/RelaySwapper/utils/getRelayStepData.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/swappers/RelaySwapper/utils/getRelayStepData.test.js

@@ -0,0 +1,137 @@
+import { tronChainId } from '@shapeshiftoss/caip';
+import { describe, expect, it, vi } from 'vitest';
+import { ETH } from '../../../utils/test-data/assets.js';
+import { getRelayStepData } from './getRelayStepData.js';
+import { getRelayAllowanceContract } from './helpers.js';
+const USDT = 'TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t';
+const TRX = { ...ETH, assetId: `${tronChainId}/slip44:195`, chainId: tronChainId };
+const USDT_TRON = { ...ETH, assetId: `${tronChainId}/trc20:${USDT}`, chainId: tronChainId };
+const FROM = 'TT2T17KZhoDu47i2E4FWxfG79zdkEWkU9N';
+const DEPOSITOR_HEX = '41f0623e1012177482912fb057e44e1a9769b1f588';
+const DEPOSITOR = 'TXtEs6t2oUWQsNos7m68gbHdE9Q5n6x2oN';
+const tronItem = {
+    type: 'TriggerSmartContract',
+    parameter: { contract_address: DEPOSITOR_HEX, data: '49290c1c', call_value: 50000000 },
+};
+const tronAdapter = ({ txFee = '9000000', allowance = '0' } = {}) => ({
+    getFeeData: vi.fn().mockResolvedValue({ fast: { txFee } }),
+    httpProvider: {
+        getChainPrices: () => Promise.resolve({ energyPrice: 100, bandwidthPrice: 1000 }),
+        getTrc20Allowance: vi.fn().mockResolvedValue(allowance),
+        getTrc20Balance: vi.fn().mockResolvedValue('100000000'),
+        getContractEnergyShare: vi.fn().mockResolvedValue({
+            callerPercent: 100,
+            originEnergyLimit: 0,
+            originEnergyAvailable: 0,
+        }),
+    },
+});
+const makeDeps = (tron) => ({ assertGetTronChainAdapter: () => tron });
+const baseArgs = {
+    data: tronItem,
+    sellAsset: TRX,
+    sellAmountCryptoBaseUnit: '50000000',
+    spenderAddress: '',
+    orderId: undefined,
+    xpub: undefined,
+    fallbackNetworkFeeCryptoBaseUnit: '6100715',
+};
+describe('getRelayAllowanceContract', () => {
+    it('returns the tron depositor as relay gives it', () => {
+        expect(getRelayAllowanceContract(tronItem)).toBe(DEPOSITOR_HEX);
+    });
+});
+describe('getRelayStepData', () => {
+    describe('tron', () => {
+        it('carries the depositor call as transactionData and simulates it', async () => {
+            const adapter = tronAdapter();
+            const actual = await getRelayStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: {},
+                from: FROM,
+                deps: makeDeps(adapter),
+            });
+            const transactionData = {
+                type: 'tron',
+                to: DEPOSITOR_HEX,
+                data: '49290c1c',
+                value: '50000000',
+            };
+            expect(actual.unwrap()).toEqual({ transactionData, networkFeeCryptoBaseUnit: '9000000' });
+            expect(adapter.getFeeData).toHaveBeenCalledWith({
+                to: DEPOSITOR_HEX,
+                value: '50000000',
+                chainSpecific: { from: FROM, data: '49290c1c', requireEnergyShare: true },
+            });
+        });
+        it('fails a native quote when the simulation fails', async () => {
+            const adapter = tronAdapter();
+            adapter.getFeeData.mockRejectedValue(new Error('REVERT opcode executed'));
+            const actual = await getRelayStepData({
+                ...baseArgs,
+                type: 'quote',
+                input: {},
+                from: FROM,
+                deps: makeDeps(adapter),
+            });
+            expect(actual.isErr()).toBe(true);
+        });
+        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 getRelayStepData({
+                ...baseArgs,
+                data: { type: 'TriggerSmartContract', parameter: { ...tronItem.parameter, call_value: 0 } },
+                sellAsset: USDT_TRON,
+                type: 'quote',
+                input: {},
+                from: FROM,
+                deps: makeDeps(adapter),
+            });
+            // 100000 energy * 1.2 margin * 100 sun + (4 calldata + 279 envelope) bytes * 1000 sun
+            expect(actual.unwrap().networkFeeCryptoBaseUnit).toBe('12283000');
+            expect(adapter.httpProvider.getTrc20Allowance).toHaveBeenCalledWith({
+                contractAddress: USDT,
+                owner: FROM,
+                spender: DEPOSITOR,
+            });
+        });
+        it('prices a rate from the measured deposit', async () => {
+            const adapter = tronAdapter();
+            const actual = await getRelayStepData({
+                ...baseArgs,
+                type: 'rate',
+                input: {},
+                from: FROM,
+                deps: makeDeps(adapter),
+            });
+            // 100000 energy * 1.2 margin * 100 sun + (4 calldata + 279 envelope) bytes * 1000 sun
+            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '12283000' });
+            expect(adapter.httpProvider.getContractEnergyShare).toHaveBeenCalledWith(DEPOSITOR);
+        });
+        it('falls back to the relay fee when the measured deposit cannot be priced', async () => {
+            const adapter = tronAdapter();
+            adapter.httpProvider.getChainPrices = () => Promise.reject(new Error('429'));
+            const actual = await getRelayStepData({
+                ...baseArgs,
+                type: 'rate',
+                input: {},
+                from: FROM,
+                deps: makeDeps(adapter),
+            });
+            expect(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '6100715' });
+        });
+        it('fails to build without the depositor call', async () => {
+            const actual = await getRelayStepData({
+                ...baseArgs,
+                data: { type: 'TriggerSmartContract', parameter: {} },
+                type: 'quote',
+                input: {},
+                from: FROM,
+                deps: makeDeps(tronAdapter()),
+            });
+            expect(actual.isErr()).toBe(true);
+        });
+    });
+});

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

@@ -51,8 +51,7 @@ export const resolveRelayAddresses = ({ input, sellChainId, buyChainId, }) => {
     const refundTo = input.sendAddress ?? getRelayDefaultUserAddress(sellChainId);
     return { sendAddress, recipient, refundTo };
 };
-// The spender to approve: EVM routes approve the router (data.to); Tron approves the token contract;
-// UTXO/Solana need no allowance. Derived from the provider route, not the built transactionData.
+// The spender to approve is the call target: EVM data.to, tron the depositor; UTXO/Solana need none
 export const getRelayAllowanceContract = (data) => {
     if (!data)
         return '';

package/dist/esm/swappers/RelaySwapper/utils/relayTokenToAssetId.js

@@ -1,6 +1,6 @@
 import { ASSET_NAMESPACE, ASSET_REFERENCE, btcChainId, CHAIN_REFERENCE, fromChainId, solanaChainId, toAssetId, tronChainId, } from '@shapeshiftoss/caip';
-import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
-import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, RELAY_TRON_TOKEN_ADDRESS, relayChainIdToChainId, } from '../constant.js';
+import { isEvmChainId, tron } from '@shapeshiftoss/chain-adapters';
+import { DEFAULT_RELAY_EVM_TOKEN_ADDRESS, RELAY_BTC_TOKEN_ADDRESS, RELAY_SOLANA_TOKEN_ADDRESS, relayChainIdToChainId, } from '../constant.js';
 export const relayTokenToAssetId = (relayToken) => {
     const chainId = relayChainIdToChainId[relayToken.chainId];
     const { chainReference } = fromChainId(chainId);
@@ -15,7 +15,7 @@ export const relayTokenToAssetId = (relayToken) => {
             return relayToken.address === RELAY_SOLANA_TOKEN_ADDRESS;
         }
         if (chainId === tronChainId) {
-            return relayToken.address === RELAY_TRON_TOKEN_ADDRESS;
+            return relayToken.address === tron.TRON_ZERO_ADDRESS;
         }
         return false;
     })();

package/dist/esm/swappers/RelaySwapper/utils/types.d.ts

@@ -3,10 +3,6 @@ export type RelayTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInpu
 export type RelayTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
 export type RelayExactOutputTradeQuoteInput = WithExactBuyAmount<RelayTradeQuoteInput>;
 export type RelayExactOutputTradeRateInput = WithExactBuyAmount<RelayTradeRateInput>;
-export type RelayTransactionMetadata = {
-    to?: string;
-    data?: string;
-};
 export type RelayMetadata = {
     name: 'relay';
     relayId: string;
@@ -114,6 +110,7 @@ export type RelayQuoteTronItemData = {
         owner_address?: string;
         contract_address?: string;
         data?: string;
+        call_value?: number;
     };
 };
 export type RelayQuoteItem = {

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

@@ -1,75 +1,15 @@
-import { tronAssetId, tronChainId } from '@shapeshiftoss/caip';
-import { toAddressNList } from '@shapeshiftoss/chain-adapters';
+import { tronChainId } from '@shapeshiftoss/caip';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
-import { TronWeb } from 'tronweb';
-import { createDefaultStatusResponse, getExecutableTradeStep, isExecutableTradeQuote, } from '../../utils/index.js';
+import { createDefaultStatusResponse } from '../../utils/index.js';
+import { getTronTransactionFees, getUnsignedTronTransaction } from '../../utils/tron/index.js';
 import { getSunioTradeQuote } from './getSunioTradeQuote/getSunioTradeQuote.js';
 import { getSunioTradeRate } from './getSunioTradeRate/getSunioTradeRate.js';
-import { buildSwapExactInputParameters, SUNIO_SWAP_EXACT_INPUT_SELECTOR, } from './utils/buildSwapContractCall.js';
-import { buildSwapRouteParameters } from './utils/buildSwapRouteParameters.js';
-import { SUNIO_SMART_ROUTER_CONTRACT } from './utils/constants.js';
-import { getSunioTransactionFees } from './utils/getSunioTransactionFees.js';
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 export const sunioApi = {
     getTradeQuote: (input, deps) => getSunioTradeQuote(input, deps),
     getTradeRate: (input, deps) => getSunioTradeRate(input, deps),
-    getUnsignedTronTransaction: async (args) => {
-        const { tradeQuote, stepIndex, from, slippageTolerancePercentageDecimal, assertGetTronChainAdapter, config, } = args;
-        if (!isExecutableTradeQuote(tradeQuote)) {
-            throw new Error('Unable to execute a trade rate quote');
-        }
-        const step = getExecutableTradeStep(tradeQuote, stepIndex);
-        const adapter = assertGetTronChainAdapter(tronChainId);
-        const sunioTransactionData = step.sunioTransactionData;
-        if (!sunioTransactionData)
-            throw new Error('[Sun.io] Missing transaction data in quote');
-        const rpcUrl = adapter.httpProvider.getRpcUrl();
-        const tronWeb = new TronWeb({
-            fullHost: rpcUrl,
-            headers: config.VITE_TRON_GRID_API_KEY
-                ? { 'TRON-PRO-API-KEY': config.VITE_TRON_GRID_API_KEY }
-                : {},
-        });
-        const routeParams = buildSwapRouteParameters(sunioTransactionData.route, step.sellAmountIncludingProtocolFeesCryptoBaseUnit, step.buyAmountAfterFeesCryptoBaseUnit, tradeQuote.receiveAddress, slippageTolerancePercentageDecimal);
-        const parameters = buildSwapExactInputParameters(routeParams);
-        const isSellingNativeTrx = step.sellAsset.assetId === tronAssetId;
-        const callValue = isSellingNativeTrx
-            ? Number(step.sellAmountIncludingProtocolFeesCryptoBaseUnit)
-            : 0;
-        const options = {
-            feeLimit: 100_000_000,
-            callValue,
-        };
-        const txData = await tronWeb.transactionBuilder.triggerSmartContract(SUNIO_SMART_ROUTER_CONTRACT, SUNIO_SWAP_EXACT_INPUT_SELECTOR, options, parameters, from);
-        if (!txData.result || !txData.result.result) {
-            throw new Error('[Sun.io] Failed to build swap transaction');
-        }
-        const transaction = txData.transaction;
-        const rawDataHex = typeof transaction.raw_data_hex === 'string'
-            ? transaction.raw_data_hex
-            : Buffer.isBuffer(transaction.raw_data_hex)
-                ? transaction.raw_data_hex.toString('hex')
-                : Array.isArray(transaction.raw_data_hex)
-                    ? Buffer.from(transaction.raw_data_hex).toString('hex')
-                    : (() => {
-                        throw new Error(`Unexpected raw_data_hex type: ${typeof transaction.raw_data_hex}`);
-                    })();
-        if (!/^[0-9a-fA-F]+$/.test(rawDataHex)) {
-            throw new Error(`Invalid raw_data_hex format: ${rawDataHex.slice(0, 100)}`);
-        }
-        const accountNumber = step.accountNumber;
-        if (accountNumber === undefined) {
-            throw new Error('[Sun.io] accountNumber is required for execution');
-        }
-        const bip44Params = adapter.getBip44Params({ accountNumber });
-        const addressNList = toAddressNList(bip44Params);
-        return {
-            addressNList,
-            rawDataHex,
-            transaction,
-        };
-    },
-    getTronTransactionFees: getSunioTransactionFees,
+    getUnsignedTronTransaction,
+    getTronTransactionFees,
     checkTradeStatus: async ({ txHash, assertGetTronChainAdapter }) => {
         try {
             // Wait for TronGrid indexing to avoid false "REVERT"

package/dist/esm/swappers/SunioSwapper/getSunioTradeQuote/getSunioTradeQuote.js

@@ -1,6 +1,5 @@
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
-import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getSunioStepData } from '../utils/getSunioStepData.js';
 import { getSunioTradeContext } from '../utils/getSunioTradeContext.js';
 export const getSunioTradeQuote = async (input, deps) => {
@@ -21,17 +20,17 @@ export const getSunioTradeQuote = async (input, deps) => {
     });
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
-    const { networkFeeCryptoBaseUnit, sunioTransactionData } = maybeStepData.unwrap();
+    const { networkFeeCryptoBaseUnit, transactionData, deadline } = maybeStepData.unwrap();
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
+        deadline,
         receiveAddress,
         steps: [
             {
                 ...stepCommon,
                 accountNumber,
-                sunioTransactionData,
+                transactionData,
                 feeData: { networkFeeCryptoBaseUnit, protocolFees },
             },
         ],

package/dist/esm/swappers/SunioSwapper/getSunioTradeRate/getSunioTradeRate.js

@@ -7,7 +7,13 @@ export const getSunioTradeRate = async (input, deps) => {
     if (maybeContext.isErr())
         return Err(maybeContext.unwrapErr());
     const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
-    const maybeStepData = await getSunioStepData({ ...stepDataArgs, type: 'rate', input });
+    // Sun.io is tron-only, so the receive address is also the seller's account to simulate from
+    const maybeStepData = await getSunioStepData({
+        ...stepDataArgs,
+        type: 'rate',
+        input,
+        from: input.sendAddress ?? receiveAddress,
+    });
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
     const { networkFeeCryptoBaseUnit } = maybeStepData.unwrap();

package/dist/esm/swappers/SunioSwapper/types.d.ts

@@ -16,9 +16,6 @@ export type SunioRoute = {
     poolVersions: string[];
     stepAmountsOut: string[];
 };
-export type SunioTransactionData = {
-    route: SunioRoute;
-};
 export type SunioQuoteResponse = {
     code: number;
     message: string;

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

@@ -1,6 +1,11 @@
-import type { SwapRouteParameters } from './buildSwapRouteParameters.js';
-export declare const SUNIO_SWAP_EXACT_INPUT_SELECTOR = "swapExactInput(address[],string[],uint256[],uint24[],(uint256,uint256,address,uint256))";
-export declare const buildSwapExactInputParameters: (routeParams: SwapRouteParameters) => {
-    type: string;
-    value: unknown;
-}[];
+import type { SunioRoute } from '../types.js';
+type BuildSunioSwapCalldataArgs = {
+    route: SunioRoute;
+    sellAmountCryptoBaseUnit: string;
+    minBuyAmountCryptoBaseUnit: string;
+    recipient: string;
+    slippageTolerancePercentageDecimal: string;
+    deadline: number;
+};
+export declare const buildSunioSwapCalldata: ({ route, sellAmountCryptoBaseUnit, minBuyAmountCryptoBaseUnit, recipient, slippageTolerancePercentageDecimal, deadline, }: BuildSunioSwapCalldataArgs) => string;
+export {};