@shapeshiftoss/swapper 20.3.0 → 20.5.0

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

@@ -11,6 +11,7 @@ exports.nearIntentsSwapper = {
     executeSuiTransaction: utils_1.executeSuiTransaction,
     executeNearTransaction: utils_1.executeNearTransaction,
     executeTonTransaction: utils_1.executeTonTransaction,
+    executeAptosTransaction: utils_1.executeAptosTransaction,
     executeUtxoTransaction: (txToSign, { signAndBroadcastTransaction }) => {
         return signAndBroadcastTransaction(txToSign);
     },

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nearIntentsApi = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
 const utils_2 = require("../../utils");
+const aptos_1 = require("../../utils/aptos");
 const evm_1 = require("../../utils/evm");
 const solana_1 = require("../../utils/solana");
 const tron_1 = require("../../utils/tron");
@@ -87,7 +88,7 @@ exports.nearIntentsApi = {
         }
         return Promise.resolve(step.feeData.networkFeeCryptoBaseUnit);
     },
-    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, assertGetStarknetChainAdapter, }) => {
+    getUnsignedStarknetTransaction: async ({ stepIndex, tradeQuote, from, callsOnly, assertGetStarknetChainAdapter, }) => {
         if (!(0, utils_2.isExecutableTradeQuote)(tradeQuote))
             throw new Error('Unable to execute a trade rate quote');
         const step = (0, utils_2.getExecutableTradeStep)(tradeQuote, stepIndex);
@@ -97,24 +98,20 @@ exports.nearIntentsApi = {
         const to = depositAddress;
         const value = step.sellAmountIncludingProtocolFeesCryptoBaseUnit;
         const tokenContractAddress = (0, utils_1.contractAddressOrUndefined)(sellAsset.assetId);
-        const { fast } = await adapter.getFeeData({
-            to,
-            value,
-            chainSpecific: {
-                from,
-                tokenContractAddress,
-            },
-            sendMax: false,
-        });
+        const maxFee = callsOnly
+            ? undefined
+            : (await adapter.getFeeData({
+                to,
+                value,
+                chainSpecific: { from, tokenContractAddress },
+                sendMax: false,
+            })).fast.chainSpecific.maxFee;
         return adapter.buildSendApiTransaction({
             from,
             to,
             value,
             accountNumber,
-            chainSpecific: {
-                tokenContractAddress,
-                maxFee: fast.chainSpecific.maxFee,
-            },
+            chainSpecific: { tokenContractAddress, maxFee, callsOnly },
         });
     },
     getStarknetTransactionFees: ({ tradeQuote, stepIndex }) => {
@@ -156,6 +153,8 @@ exports.nearIntentsApi = {
         }
         return Promise.resolve(step.feeData.networkFeeCryptoBaseUnit);
     },
+    getUnsignedAptosTransaction: aptos_1.getUnsignedAptosTransaction,
+    getAptosTransactionFees: aptos_1.getAptosTransactionFees,
     checkTradeStatus: async ({ config, swap }) => {
         if (!swap)
             throw new Error('Missing swap');

package/dist/cjs/swappers/NearIntentsSwapper/swapperApi/getTradeRate.js

@@ -57,7 +57,7 @@ const getRate = async (input, deps) => {
             {
                 ...stepCommon,
                 accountNumber,
-                feeData: { protocolFees, networkFeeCryptoBaseUnit: networkFeeCryptoBaseUnit ?? '0' },
+                feeData: { protocolFees, networkFeeCryptoBaseUnit },
             },
         ],
     };

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

@@ -1,7 +1,7 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
-import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetNearTradeQuoteInput, GetNearTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetStarknetTradeQuoteInput, GetStarknetTradeRateInput, GetSuiTradeQuoteInput, GetSuiTradeRateInput, GetTonTradeQuoteInput, GetTonTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput, WithExactBuyAmount } from '../../types';
-export type NearIntentsTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput | GetSuiTradeQuoteInput | GetStarknetTradeQuoteInput | GetNearTradeQuoteInput | GetTonTradeQuoteInput;
-export type NearIntentsTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput | GetSuiTradeRateInput | GetStarknetTradeRateInput | GetNearTradeRateInput | GetTonTradeRateInput;
+import type { GetAptosTradeQuoteInput, GetAptosTradeRateInput, GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetNearTradeQuoteInput, GetNearTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetStarknetTradeQuoteInput, GetStarknetTradeRateInput, GetSuiTradeQuoteInput, GetSuiTradeRateInput, GetTonTradeQuoteInput, GetTonTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput, WithExactBuyAmount } from '../../types';
+export type NearIntentsTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput | GetSuiTradeQuoteInput | GetStarknetTradeQuoteInput | GetNearTradeQuoteInput | GetTonTradeQuoteInput | GetAptosTradeQuoteInput;
+export type NearIntentsTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput | GetSuiTradeRateInput | GetStarknetTradeRateInput | GetNearTradeRateInput | GetTonTradeRateInput | GetAptosTradeRateInput;
 export type NearIntentsExactOutputTradeQuoteInput = WithExactBuyAmount<NearIntentsTradeQuoteInput>;
 export type NearIntentsExactOutputTradeRateInput = WithExactBuyAmount<NearIntentsTradeRateInput>;
 export type NearIntentsMetadata = {
@@ -11,6 +11,6 @@ export type NearIntentsMetadata = {
 };
 export { QuoteRequest } from '@defuse-protocol/one-click-sdk-typescript';
 export type { GetExecutionStatusResponse, QuoteResponse, TokenResponse, } from '@defuse-protocol/one-click-sdk-typescript';
-export declare const nearIntentsSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.GnosisMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BitcoinMainnet, KnownChainIds.BitcoinCashMainnet, KnownChainIds.DogecoinMainnet, KnownChainIds.ZcashMainnet, KnownChainIds.SolanaMainnet, KnownChainIds.TronMainnet, KnownChainIds.SuiMainnet, KnownChainIds.StarknetMainnet, KnownChainIds.MonadMainnet, KnownChainIds.NearMainnet, KnownChainIds.PlasmaMainnet, KnownChainIds.TonMainnet];
+export declare const nearIntentsSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.GnosisMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BitcoinMainnet, KnownChainIds.BitcoinCashMainnet, KnownChainIds.DogecoinMainnet, KnownChainIds.ZcashMainnet, KnownChainIds.SolanaMainnet, KnownChainIds.TronMainnet, KnownChainIds.SuiMainnet, KnownChainIds.StarknetMainnet, KnownChainIds.MonadMainnet, KnownChainIds.NearMainnet, KnownChainIds.PlasmaMainnet, KnownChainIds.TonMainnet, KnownChainIds.AptosMainnet];
 export type NearIntentsSupportedChainId = (typeof nearIntentsSupportedChainIds)[number];
 export declare const chainIdToNearIntentsChain: Record<NearIntentsSupportedChainId, string>;

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

@@ -25,6 +25,7 @@ exports.nearIntentsSupportedChainIds = [
     types_1.KnownChainIds.NearMainnet,
     types_1.KnownChainIds.PlasmaMainnet,
     types_1.KnownChainIds.TonMainnet,
+    types_1.KnownChainIds.AptosMainnet,
 ];
 exports.chainIdToNearIntentsChain = {
     [types_1.KnownChainIds.EthereumMainnet]: 'eth',
@@ -47,4 +48,5 @@ exports.chainIdToNearIntentsChain = {
     [types_1.KnownChainIds.MonadMainnet]: 'monad',
     [types_1.KnownChainIds.NearMainnet]: 'near',
     [types_1.KnownChainIds.TonMainnet]: 'ton',
+    [types_1.KnownChainIds.AptosMainnet]: 'aptos',
 };

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

@@ -7,6 +7,7 @@ const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const aptos_1 = require("../../../utils/aptos");
 const evm_1 = require("../../../utils/evm");
 const helpers_1 = require("../../../utils/helpers");
 const solana_1 = require("../../../utils/solana");
@@ -221,6 +222,33 @@ async function getNearIntentsStepData(args) {
                 const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
                 return (0, monads_1.Ok)(stepData);
             }
+            case caip_1.CHAIN_NAMESPACE.Aptos: {
+                const adapter = deps.assertGetAptosChainAdapter(sellAsset.chainId);
+                if (type === 'rate') {
+                    const { fast } = await adapter.getFeeData({
+                        to: depositAddress,
+                        value: aptos_1.APTOS_RATE_SIMULATION_VALUE,
+                        chainSpecific: { from: from ?? aptos_1.APTOS_PLACEHOLDER_ADDRESS, contractAddress },
+                    });
+                    const stepData = { networkFeeCryptoBaseUnit: fast.txFee };
+                    return (0, monads_1.Ok)(stepData);
+                }
+                const { fast } = await adapter.getFeeData({
+                    to: depositAddress,
+                    value: sellAmountCryptoBaseUnit,
+                    chainSpecific: { from, contractAddress },
+                });
+                const stepData = {
+                    transactionData: {
+                        type: 'aptos',
+                        payload: chain_adapters_1.aptos.getSerializedTransferPayload(depositAddress, sellAmountCryptoBaseUnit, contractAddress),
+                        gasUnitPrice: fast.chainSpecific.gasUnitPrice,
+                        maxGasAmount: fast.chainSpecific.maxGasAmount,
+                    },
+                    networkFeeCryptoBaseUnit: fast.txFee,
+                };
+                return (0, monads_1.Ok)(stepData);
+            }
             default:
                 return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
                     message: `[getNearIntentsStepData] unsupported chain namespace: ${chainNamespace}`,

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

@@ -40,7 +40,7 @@ const getNearIntentsAsset = ({ nearNetwork, contractAddress, }) => {
 };
 exports.getNearIntentsAsset = getNearIntentsAsset;
 const NEP245_CHAINS = ['bsc', 'pol', 'avax', 'op', 'tron', 'monad', 'plasma'];
-const TOKEN_LOOKUP_CHAINS = ['sui', 'starknet', 'ton'];
+const TOKEN_LOOKUP_CHAINS = ['sui', 'starknet', 'ton', 'aptos'];
 const NEAR_CHAIN = 'near';
 const BTC_CHAIN = 'btc';
 const WNEAR_CONTRACT_ADDRESS = 'wrap.near';
@@ -72,7 +72,7 @@ const assetToNearIntentsAsset = async (asset) => {
         });
         return match?.assetId ?? null;
     }
-    // NEP-245 chains (BSC, Polygon, Avalanche, Optimism, TRON, Monad), Token lookup chains (Sui, Starknet), and Solana require token lookup
+    // NEP-245 chains (BSC, Polygon, Avalanche, Optimism, TRON, Monad), Token lookup chains (Sui, Starknet, TON, Aptos), and Solana require token lookup
     // Asset IDs use hashed format that can't be generated from contract addresses
     const requiresLookup = isNep245Chain(nearNetwork) || isTokenLookupChain(nearNetwork) || asset.chainId === caip_1.solanaChainId;
     if (requiresLookup) {

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

@@ -62,7 +62,7 @@ exports.portalsApi = {
                 const txStatus = relayTxStatus === unchained_client_1.TxStatus.Unknown ? unchained_client_1.TxStatus.Pending : relayTxStatus;
                 return {
                     status: txStatus,
-                    buyTxHash: relayRequest.data?.outTxs?.[0]?.hash,
+                    buyTxHash: relayRequest.data?.outTxs?.[0]?.txHash,
                     message: txStatus === unchained_client_1.TxStatus.Failed
                         ? (0, relayStatus_1.getRelayRequestFailureMessage)(relayRequest)
                         : txStatus === unchained_client_1.TxStatus.Confirmed
@@ -71,6 +71,9 @@ exports.portalsApi = {
                 };
             }
         }
+        else {
+            console.error('Failed to fetch relay request:', relayResult.unwrapErr());
+        }
         const axelarscanResult = await (0, fetchAxelarscanStatus_1.fetchAxelarscanBridgeStatus)(txHash);
         if (axelarscanResult.isOk()) {
             const bridgeStatus = axelarscanResult.unwrap();

package/dist/cjs/swappers/PortalsSwapper/getPortalsTradeQuote/getPortalsTradeQuote.js

@@ -141,7 +141,7 @@ const getPortalsTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: expiryMs ?? Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
+        deadline: expiryMs,
         receiveAddress,
         steps: [
             {

package/dist/cjs/swappers/PortalsSwapper/utils/getPortalsStepData.js

@@ -2,89 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortalsStepData = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const utils_2 = require("../../../utils");
+const utils_1 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 const fetchPortalsTradeOrder_1 = require("./fetchPortalsTradeOrder");
 async function getPortalsStepData(args) {
     const { tx, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, input, deps } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
+    const transactionData = {
+        type: 'evm',
+        chainId: Number((0, caip_1.fromChainId)(sellAsset.chainId).chainReference),
+        to: tx.to,
+        data: tx.data,
+        value: tx.value,
+    };
+    const stateOverride = {
+        sellAsset,
+        sellAmountCryptoBaseUnit,
+        spenderAddress,
+    };
     if (args.type === 'rate') {
+        const getEstimateEndpointGasLimit = async () => {
+            const quoteEstimateResponse = await (0, fetchPortalsTradeOrder_1.fetchPortalsTradeEstimate)({
+                inputToken: args.inputToken,
+                outputToken: args.outputToken,
+                inputAmount: args.inputAmount,
+                slippageTolerancePercentage: args.slippageTolerancePercentage,
+                swapperConfig: deps.config,
+            });
+            return quoteEstimateResponse.context.gasLimit.toString();
+        };
         try {
-            // No placeholder estimation for provider built routes - overridden estimation (approval
-            // state need not exist yet) with the Portals order and estimate endpoint as fallbacks
-            const gasLimit = await (async () => {
-                try {
-                    const gasLimit = await (0, evm_1.estimateGasWithStateOverride)({
-                        sellAsset,
-                        sellAmountCryptoBaseUnit,
-                        from: tx.from,
-                        spenderAddress,
-                        to: tx.to,
-                        data: tx.data,
-                        value: tx.value,
-                    });
-                    return gasLimit;
-                }
-                catch {
-                    // Portals only carry a tx gas limit on the bridge routes their estimate endpoint zeroes
-                    const { gasLimit: txGasLimit } = tx;
-                    if (txGasLimit && (0, utils_1.bnOrZero)(txGasLimit).gt(0))
-                        return txGasLimit;
-                    const quoteEstimateResponse = await (0, fetchPortalsTradeOrder_1.fetchPortalsTradeEstimate)({
-                        inputToken: args.inputToken,
-                        outputToken: args.outputToken,
-                        inputAmount: args.inputAmount,
-                        slippageTolerancePercentage: args.slippageTolerancePercentage,
-                        swapperConfig: deps.config,
-                    });
-                    const estimatedGasLimit = quoteEstimateResponse.context.gasLimit.toString();
-                    if ((0, utils_1.bnOrZero)(estimatedGasLimit).lte(0))
-                        throw new Error('no Portals gas limit');
-                    return estimatedGasLimit;
-                }
-            })();
-            const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
+            // Portals only set a tx gas limit on bridge routes, where their estimate endpoint is zero
+            const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
                 adapter,
                 supportsEIP1559,
-                gasLimit,
-            });
+                providerGasLimit: tx.gasLimit,
+                simulation: { transactionData, from: tx.from, stateOverride },
+            }).catch(async () => (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
+                adapter,
+                supportsEIP1559,
+                providerGasLimit: await getEstimateEndpointGasLimit(),
+            }));
             const stepData = { networkFeeCryptoBaseUnit };
             return (0, monads_1.Ok)(stepData);
         }
         catch (error) {
-            return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getPortalsStepData', error));
+            return (0, monads_1.Err)((0, utils_1.makeNetworkFeeEstimationFailedErr)('getPortalsStepData', error));
         }
     }
-    const transactionData = {
-        type: 'evm',
-        chainId: Number((0, caip_1.fromChainId)(sellAsset.chainId).chainReference),
-        to: tx.to,
-        data: tx.data,
-        value: tx.value,
-        // Portals simulate and pad their gas limit when the order was validated, so no additional
-        // buffer - an unvalidated order carries no gas limit and estimates below instead
-        gasLimit: tx.gasLimit,
-    };
     try {
         const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
             adapter,
             transactionData,
             from: args.from,
             supportsEIP1559,
-            stateOverride: {
-                sellAsset,
-                sellAmountCryptoBaseUnit,
-                spenderAddress,
-            },
+            stateOverride,
+            providerGasLimit: tx.gasLimit,
         });
         const stepData = { transactionData, networkFeeCryptoBaseUnit };
         return (0, monads_1.Ok)(stepData);
     }
     catch (error) {
-        return (0, monads_1.Err)((0, utils_2.makeNetworkFeeEstimationFailedErr)('getPortalsStepData', error));
+        return (0, monads_1.Err)((0, utils_1.makeNetworkFeeEstimationFailedErr)('getPortalsStepData', error));
     }
 }
 exports.getPortalsStepData = getPortalsStepData;

package/dist/cjs/swappers/PortalsSwapper/utils/getPortalsStepData.test.js

@@ -47,11 +47,11 @@ const estimateEndpointGasLimit = (gasLimit) => vitest_1.vi.mocked(fetchPortalsTr
 });
 (0, vitest_1.describe)('getPortalsStepData rate gas limit', () => {
     (0, vitest_1.beforeEach)(() => vitest_1.vi.clearAllMocks());
-    (0, vitest_1.it)('falls back to the order gas limit on bridge routes the estimate endpoint zeroes', async () => {
-        vitest_1.vi.mocked(evm_1.estimateGasWithStateOverride).mockRejectedValue(new Error('execution reverted'));
+    (0, vitest_1.it)('prices the order gas limit on bridge routes without simulating', async () => {
         estimateEndpointGasLimit(0);
         const actual = await rate(tx('76384'));
         (0, vitest_1.expect)(actual.unwrap()).toEqual({ networkFeeCryptoBaseUnit: '76384000000000' });
+        (0, vitest_1.expect)(evm_1.estimateGasWithStateOverride).not.toHaveBeenCalled();
         (0, vitest_1.expect)(fetchPortalsTradeOrder_1.fetchPortalsTradeEstimate).not.toHaveBeenCalled();
     });
     (0, vitest_1.it)('falls back to the estimate endpoint when the order carries no gas limit', async () => {

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExactOutputTradeQuote = exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
-const helpers_1 = require("../../../utils/helpers");
 const getRelayStepData_1 = require("../utils/getRelayStepData");
 const getRelayTradeContext_1 = require("../utils/getRelayTradeContext");
 const getQuote = async (input, deps, relayChainMap) => {
@@ -15,7 +14,7 @@ const getQuote = async (input, deps, relayChainMap) => {
     const maybeContext = await (0, getRelayTradeContext_1.getRelayTradeContext)({ input, deps, relayChainMap });
     if (maybeContext.isErr())
         return (0, monads_1.Err)(maybeContext.unwrapErr());
-    const { tradeCommon, stepCommon, protocolFees, relayStepInputs, stepDataArgs, relayId } = maybeContext.unwrap();
+    const { tradeCommon, stepCommon, protocolFees, relayStepInputs, stepDataArgs, relayId, deadline, } = maybeContext.unwrap();
     const stepResults = await Promise.all(relayStepInputs.map(async ({ data, allowanceContract }) => {
         const maybeStepData = await (0, getRelayStepData_1.getRelayStepData)({
             ...stepDataArgs,
@@ -45,7 +44,7 @@ const getQuote = async (input, deps, relayChainMap) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
+        deadline,
         receiveAddress,
         steps,
     };

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

@@ -37,7 +37,6 @@ async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUnit, spe
             to,
             value,
             data: callData,
-            gasLimit: (0, utils_1.bnOrZero)(relayGasLimit).gt(0) ? relayGasLimit : undefined,
         };
         const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
         const stateOverride = {
@@ -46,20 +45,12 @@ async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUnit, spe
             spenderAddress,
         };
         if (type === 'rate') {
-            const networkFeeCryptoBaseUnit = await (async () => {
-                try {
-                    return await (0, evm_1.getEvmNetworkFeeCryptoBaseUnit)({
-                        adapter,
-                        transactionData,
-                        from,
-                        supportsEIP1559,
-                        stateOverride,
-                    });
-                }
-                catch {
-                    return fallbackNetworkFeeCryptoBaseUnit;
-                }
-            })();
+            const networkFeeCryptoBaseUnit = await (0, evm_1.getEvmRateNetworkFeeCryptoBaseUnit)({
+                adapter,
+                supportsEIP1559,
+                providerGasLimit: relayGasLimit,
+                simulation: { transactionData, from, stateOverride },
+            }).catch(() => fallbackNetworkFeeCryptoBaseUnit);
             const stepData = { networkFeeCryptoBaseUnit };
             return (0, monads_1.Ok)(stepData);
         }
@@ -71,6 +62,7 @@ async function getRelayStepData({ data, sellAsset, sellAmountCryptoBaseUnit, spe
                 from,
                 supportsEIP1559,
                 stateOverride,
+                providerGasLimit: relayGasLimit,
             });
             const stepData = { transactionData, networkFeeCryptoBaseUnit };
             return (0, monads_1.Ok)(stepData);

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

@@ -13,6 +13,7 @@ type RelayTradeContext = {
     }[];
     stepDataArgs: Omit<GetRelayStepDataArgs, 'type' | 'input' | 'data' | 'spenderAddress'>;
     relayId: string;
+    deadline: number | undefined;
 };
 export declare const getRelayTradeContext: ({ input, deps, relayChainMap, }: {
     input: RelayTradeQuoteInput | RelayTradeRateInput | RelayExactOutputTradeQuoteInput | RelayExactOutputTradeRateInput;

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

@@ -264,6 +264,9 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
         .plus(appFeesBaseUnit)
         .toFixed();
     const relayId = quote.steps[0].requestId;
+    // Only cross-chain (protocol v2) orders carry an expiry; past it the solver submits a no-fill refund
+    const orderDeadline = quote.protocol?.v2?.orderData?.output?.deadline;
+    const deadline = orderDeadline === undefined ? undefined : (0, helpers_1.normalizeEpochToMs)(orderDeadline);
     const relayStepInputs = swapSteps.map(step => {
         const data = step.items?.[0]?.data;
         return { data, allowanceContract: (0, helpers_2.getRelayAllowanceContract)(data) };
@@ -307,6 +310,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
             ...appFeesAsProtocolFee,
         },
         relayStepInputs,
+        deadline,
         stepDataArgs: {
             sellAsset,
             sellAmountCryptoBaseUnit,

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

@@ -25,14 +25,14 @@ const relayStatusToTxStatus = (status) => {
 exports.relayStatusToTxStatus = relayStatusToTxStatus;
 // Relay index requests by origin tx hash, resolving a swap we hold no relayId for
 const fetchRelayRequestByTxHash = async (txHash, config) => {
-    const maybeResponse = await relayService_1.relayService.get(`${config.VITE_RELAY_API_URL}/requests/v2?hash=${txHash}`, (0, relayService_1.getRelayRequestConfig)(config));
+    const maybeResponse = await relayService_1.relayService.get(`${config.VITE_RELAY_API_URL}/requests/v3?depositTxHash=${txHash}`, (0, relayService_1.getRelayRequestConfig)(config));
     // Match the origin tx ourselves rather than trusting the listing to have filtered on it
-    return maybeResponse.map(({ data }) => data.requests?.find(({ data: request }) => request?.inTxs?.some(({ hash }) => hash?.toLowerCase() === txHash.toLowerCase())));
+    return maybeResponse.map(({ data }) => data.requests?.find(({ data: request }) => request?.inTxs?.some(({ txHash: hash }) => hash?.toLowerCase() === txHash.toLowerCase())));
 };
 exports.fetchRelayRequestByTxHash = fetchRelayRequestByTxHash;
 const getRelayRequestFailureMessage = (request) => {
     const { failReason, refundFailReason } = request.data ?? {};
-    // Relay report 'N/A' rather than omitting the reason when there isn't one
+    // Relay can report 'N/A' rather than null when there isn't one
     const reason = [failReason, refundFailReason].find(value => value && value !== 'N/A');
     return reason ?? 'Bridge failed';
 };

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

@@ -9,12 +9,12 @@ export type RelayMetadata = {
     data?: string;
 };
 export type RelayRequestTransaction = {
-    hash?: string;
+    txHash?: string;
     chainId?: number;
 };
 export type RelayRequestData = {
-    failReason?: string;
-    refundFailReason?: string;
+    failReason?: string | null;
+    refundFailReason?: string | null;
     inTxs?: RelayRequestTransaction[];
     outTxs?: RelayRequestTransaction[];
 };
@@ -121,9 +121,14 @@ export type RelayQuoteStep = {
     requestId: string;
     items?: RelayQuoteItem[];
 };
+export type RelayOrderData = {
+    output?: {
+        deadline?: number;
+    };
+};
 export type RelayProtocolV2 = {
     orderId: string | undefined;
-    orderData?: unknown;
+    orderData?: RelayOrderData;
     paymentDetails?: {
         chainId: string;
         depository: string;

package/dist/cjs/swappers/SymbiosisSwapper/SymbiosisSwapper.d.ts

@@ -0,0 +1,2 @@
+import type { Swapper } from '../../types';
+export declare const symbiosisSwapper: Swapper;

package/dist/cjs/swappers/SymbiosisSwapper/SymbiosisSwapper.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.symbiosisSwapper = void 0;
+const utils_1 = require("../../utils");
+exports.symbiosisSwapper = {
+    executeEvmTransaction: utils_1.executeEvmTransaction,
+    executeTronTransaction: utils_1.executeTronTransaction,
+};

package/dist/cjs/swappers/SymbiosisSwapper/endpoints.d.ts

@@ -0,0 +1,2 @@
+import type { SwapperApi } from '../../types';
+export declare const symbiosisApi: SwapperApi;

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.symbiosisApi = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const unchained_client_1 = require("@shapeshiftoss/unchained-client");
+const utils_1 = require("../../utils");
+const evm_1 = require("../../utils/evm");
+const tron_1 = require("../../utils/tron");
+const getTradeQuote_1 = require("./getTradeQuote/getTradeQuote");
+const getTradeRate_1 = require("./getTradeRate/getTradeRate");
+const constants_1 = require("./utils/constants");
+const helpers_1 = require("./utils/helpers");
+const symbiosisService_1 = require("./utils/symbiosisService");
+exports.symbiosisApi = {
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getTronTransactionFees: tron_1.getTronTransactionFees,
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
+    checkTradeStatus: async ({ txHash, chainId, address, config, swap, fetchIsSmartContractAddressQuery, assertGetEvmChainAdapter, assertGetTronChainAdapter, }) => {
+        if (!swap)
+            throw new Error('Missing swap');
+        const evmSourceTxStatus = (0, chain_adapters_1.isEvmChainId)(chainId)
+            ? await (0, utils_1.checkEvmSwapStatus)({
+                txHash,
+                chainId,
+                address,
+                assertGetEvmChainAdapter,
+                fetchIsSmartContractAddressQuery,
+            })
+            : undefined;
+        if (evmSourceTxStatus && evmSourceTxStatus.status !== unchained_client_1.TxStatus.Confirmed) {
+            return evmSourceTxStatus;
+        }
+        const sourceTxHash = evmSourceTxStatus?.buyTxHash ?? txHash;
+        if (chainId === caip_1.tronChainId) {
+            const sourceTx = await assertGetTronChainAdapter(chainId)
+                .httpProvider.getTransaction({ txid: sourceTxHash })
+                .catch(() => null);
+            if (!sourceTx?.confirmations) {
+                return { buyTxHash: undefined, status: unchained_client_1.TxStatus.Pending, message: undefined };
+            }
+            if ((0, helpers_1.isTronSourceTxFailed)(sourceTx)) {
+                return { buyTxHash: undefined, status: unchained_client_1.TxStatus.Failed, message: undefined };
+            }
+        }
+        const sellSymbiosisChainId = constants_1.chainIdToSymbiosisChainId[chainId];
+        const buySymbiosisChainId = constants_1.chainIdToSymbiosisChainId[swap.buyAsset.chainId];
+        const maybeStatusResponse = await symbiosisService_1.symbiosisService.get(`${config.VITE_SYMBIOSIS_API_URL}/v2/tx/${sellSymbiosisChainId}/${sourceTxHash}`);
+        if (maybeStatusResponse.isErr()) {
+            return {
+                buyTxHash: undefined,
+                status: unchained_client_1.TxStatus.Unknown,
+                message: undefined,
+            };
+        }
+        const { data: response } = maybeStatusResponse.unwrap();
+        return {
+            ...(0, helpers_1.getSymbiosisTradeStatus)({ response, buySymbiosisChainId }),
+            swapperTxId: sourceTxHash,
+            swapperTxLink: `${constants_1.SYMBIOSIS_EXPLORER_URL}/transactions/${sellSymbiosisChainId}/${sourceTxHash}`,
+        };
+    },
+};

package/dist/cjs/swappers/SymbiosisSwapper/getTradeQuote/getTradeQuote.d.ts

@@ -0,0 +1,4 @@
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { SymbiosisTradeQuoteInput } from '../utils/types';
+export declare const getTradeQuote: (input: SymbiosisTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTradeQuote = void 0;
+const monads_1 = require("@sniptt/monads");
+const utils_1 = require("../../../utils");
+const getSymbiosisStepData_1 = require("../utils/getSymbiosisStepData");
+const getSymbiosisTradeContext_1 = require("../utils/getSymbiosisTradeContext");
+const getTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
+    if (maybeAddresses.isErr())
+        return (0, monads_1.Err)(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const maybeContext = await (0, getSymbiosisTradeContext_1.getSymbiosisTradeContext)({
+        input,
+        deps,
+        from: sendAddress,
+        to: receiveAddress,
+    });
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await (0, getSymbiosisStepData_1.getSymbiosisStepData)({ ...stepDataArgs, type: 'quote', input });
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeQuote = {
+        ...tradeCommon,
+        quoteOrRate: 'quote',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                transactionData,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
+    };
+    return (0, monads_1.Ok)([tradeQuote]);
+};
+exports.getTradeQuote = getTradeQuote;

package/dist/cjs/swappers/SymbiosisSwapper/getTradeRate/getTradeRate.d.ts

@@ -0,0 +1,4 @@
+import type { Result } from '@sniptt/monads';
+import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
+import type { SymbiosisTradeRateInput } from '../utils/types';
+export declare const getTradeRate: (input: SymbiosisTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;