@shapeshiftoss/swapper 19.0.0 → 20.1.0

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

@@ -1,37 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTradeQuote = void 0;
+exports.getExactOutputTradeQuote = exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const types_1 = require("../types");
 const getNearIntentsStepData_1 = require("../utils/getNearIntentsStepData");
 const getNearIntentsTradeContext_1 = require("../utils/getNearIntentsTradeContext");
-const helpers_1 = require("../utils/helpers");
+const helpers_2 = require("../utils/helpers");
 const oneClickService_1 = require("../utils/oneClickService");
-const getTradeQuote = async (input, deps) => {
-    const { sellAsset, buyAsset, accountNumber, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, } = input;
+const getQuote = async (input, deps) => {
+    const { sellAsset, buyAsset, accountNumber, affiliateBps } = input;
     const addresses = (0, utils_1.assertQuoteAddresses)(input);
     if (addresses.isErr())
         return (0, monads_1.Err)(addresses.unwrapErr());
     const { sendAddress, receiveAddress } = addresses.unwrap();
     (0, oneClickService_1.initializeOneClickService)(deps.config.VITE_NEAR_INTENTS_API_KEY);
-    const maybeAssets = await (0, helpers_1.resolveNearIntentsAssets)({ sellAsset, buyAsset });
+    const amount = (0, helpers_1.getTradeAmount)(input);
+    const maybeAssets = await (0, helpers_2.resolveNearIntentsAssets)({ sellAsset, buyAsset });
     if (maybeAssets.isErr())
         return (0, monads_1.Err)(maybeAssets.unwrapErr());
     const { originAsset, destinationAsset } = maybeAssets.unwrap();
-    const quoteRequest = (0, helpers_1.buildNearIntentsQuoteRequest)({
+    const quoteRequest = (0, helpers_2.buildNearIntentsQuoteRequest)({
         originAsset,
         destinationAsset,
-        sellAmountCryptoBaseUnit: sellAmount,
+        amount,
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
         affiliateBps,
         refundTo: sendAddress,
         recipient: receiveAddress,
         refundType: types_1.QuoteRequest.refundType.ORIGIN_CHAIN,
         recipientType: types_1.QuoteRequest.recipientType.DESTINATION_CHAIN,
-        deadline: (0, helpers_1.getNearIntentsQuoteDeadline)({ sellAsset, buyAsset }),
+        deadline: (0, helpers_2.getNearIntentsQuoteDeadline)({ sellAsset, buyAsset }),
     });
-    const maybeQuoteResponse = await (0, helpers_1.fetchNearIntentsQuote)({ quoteRequest, sellAsset });
+    const maybeQuoteResponse = await (0, helpers_2.fetchNearIntentsQuote)({ quoteRequest, sellAsset });
     if (maybeQuoteResponse.isErr())
         return (0, monads_1.Err)(maybeQuoteResponse.unwrapErr());
     const { quote } = maybeQuoteResponse.unwrap();
@@ -75,4 +77,7 @@ const getTradeQuote = async (input, deps) => {
     };
     return (0, monads_1.Ok)([tradeQuote]);
 };
+const getTradeQuote = (input, deps) => getQuote(input, deps);
 exports.getTradeQuote = getTradeQuote;
+const getExactOutputTradeQuote = (input, deps) => getQuote(input, deps);
+exports.getExactOutputTradeQuote = getExactOutputTradeQuote;

package/dist/cjs/swappers/NearIntentsSwapper/swapperApi/getTradeRate.d.ts

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

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

@@ -1,23 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTradeRate = void 0;
+exports.getExactOutputTradeRate = exports.getTradeRate = void 0;
 const monads_1 = require("@sniptt/monads");
+const helpers_1 = require("../../../utils/helpers");
 const types_1 = require("../types");
 const getNearIntentsStepData_1 = require("../utils/getNearIntentsStepData");
 const getNearIntentsTradeContext_1 = require("../utils/getNearIntentsTradeContext");
-const helpers_1 = require("../utils/helpers");
+const helpers_2 = require("../utils/helpers");
 const oneClickService_1 = require("../utils/oneClickService");
-const getTradeRate = async (input, deps) => {
-    const { accountNumber, sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, receiveAddress, sendAddress, } = input;
+const getRate = async (input, deps) => {
+    const { accountNumber, sellAsset, buyAsset, affiliateBps, receiveAddress, sendAddress } = input;
     (0, oneClickService_1.initializeOneClickService)(deps.config.VITE_NEAR_INTENTS_API_KEY);
-    const maybeAssets = await (0, helpers_1.resolveNearIntentsAssets)({ sellAsset, buyAsset });
+    const amount = (0, helpers_1.getTradeAmount)(input);
+    const maybeAssets = await (0, helpers_2.resolveNearIntentsAssets)({ sellAsset, buyAsset });
     if (maybeAssets.isErr())
         return (0, monads_1.Err)(maybeAssets.unwrapErr());
     const { originAsset, destinationAsset } = maybeAssets.unwrap();
-    const quoteRequest = (0, helpers_1.buildNearIntentsQuoteRequest)({
+    const quoteRequest = (0, helpers_2.buildNearIntentsQuoteRequest)({
         originAsset,
         destinationAsset,
-        sellAmountCryptoBaseUnit: sellAmount,
+        amount,
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
         affiliateBps,
         refundTo: sendAddress ?? 'check-price',
@@ -28,9 +30,9 @@ const getTradeRate = async (input, deps) => {
         recipientType: sendAddress
             ? types_1.QuoteRequest.recipientType.DESTINATION_CHAIN
             : types_1.QuoteRequest.recipientType.INTENTS,
-        deadline: (0, helpers_1.getNearIntentsQuoteDeadline)({ sellAsset, buyAsset }),
+        deadline: (0, helpers_2.getNearIntentsQuoteDeadline)({ sellAsset, buyAsset }),
     });
-    const maybeQuoteResponse = await (0, helpers_1.fetchNearIntentsQuote)({ quoteRequest, sellAsset });
+    const maybeQuoteResponse = await (0, helpers_2.fetchNearIntentsQuote)({ quoteRequest, sellAsset });
     if (maybeQuoteResponse.isErr())
         return (0, monads_1.Err)(maybeQuoteResponse.unwrapErr());
     const { quote } = maybeQuoteResponse.unwrap();
@@ -61,4 +63,7 @@ const getTradeRate = async (input, deps) => {
     };
     return (0, monads_1.Ok)([tradeRate]);
 };
+const getTradeRate = (input, deps) => getRate(input, deps);
 exports.getTradeRate = getTradeRate;
+const getExactOutputTradeRate = (input, deps) => getRate(input, deps);
+exports.getExactOutputTradeRate = getExactOutputTradeRate;

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

@@ -1,7 +1,9 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
-import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetNearTradeQuoteInput, GetNearTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetStarknetTradeQuoteInput, GetStarknetTradeRateInput, GetSuiTradeQuoteInput, GetSuiTradeRateInput, GetTonTradeQuoteInput, GetTonTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput } from '../../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;
+export type NearIntentsExactOutputTradeQuoteInput = WithExactBuyAmount<NearIntentsTradeQuoteInput>;
+export type NearIntentsExactOutputTradeRateInput = WithExactBuyAmount<NearIntentsTradeRateInput>;
 export type NearIntentsMetadata = {
     name: 'nearIntents';
     depositAddress: string;

package/dist/cjs/swappers/NearIntentsSwapper/utils/exactOutput.test.d.ts

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

package/dist/cjs/swappers/NearIntentsSwapper/utils/exactOutput.test.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const types_1 = require("../types");
+const helpers_1 = require("./helpers");
+const BASE_ARGS = {
+    originAsset: 'nep141:base-0x833589fcd6edb6e08f4c7c32d4f71b54bda02913.omft.near',
+    destinationAsset: 'nep141:btc.omft.near',
+    amount: { direction: 'exactIn', cryptoBaseUnit: '65000000' },
+    slippageTolerancePercentageDecimal: '0.01',
+    affiliateBps: '10',
+    refundTo: '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045',
+    recipient: 'bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4',
+    refundType: types_1.QuoteRequest.refundType.ORIGIN_CHAIN,
+    recipientType: types_1.QuoteRequest.recipientType.DESTINATION_CHAIN,
+    deadline: '2026-08-10T23:59:00.000Z',
+};
+const EXACT_OUTPUT_AMOUNT = {
+    direction: 'exactOut',
+    cryptoBaseUnit: '100000',
+};
+(0, vitest_1.describe)('buildNearIntentsQuoteRequest', () => {
+    (0, vitest_1.describe)('exact input', () => {
+        (0, vitest_1.it)('requests EXACT_INPUT with the sell amount', () => {
+            const request = (0, helpers_1.buildNearIntentsQuoteRequest)(BASE_ARGS);
+            (0, vitest_1.expect)(request.swapType).toEqual(types_1.QuoteRequest.swapType.EXACT_INPUT);
+            (0, vitest_1.expect)(request.amount).toEqual('65000000');
+        });
+        (0, vitest_1.it)('passes the requested slippage through untouched', () => {
+            const request = (0, helpers_1.buildNearIntentsQuoteRequest)({
+                ...BASE_ARGS,
+                slippageTolerancePercentageDecimal: '0',
+            });
+            (0, vitest_1.expect)(request.slippageTolerance).toEqual(0);
+        });
+    });
+    (0, vitest_1.describe)('exact output', () => {
+        (0, vitest_1.it)('requests EXACT_OUTPUT with the buy amount', () => {
+            const request = (0, helpers_1.buildNearIntentsQuoteRequest)({ ...BASE_ARGS, amount: EXACT_OUTPUT_AMOUNT });
+            (0, vitest_1.expect)(request.swapType).toEqual(types_1.QuoteRequest.swapType.EXACT_OUTPUT);
+            (0, vitest_1.expect)(request.amount).toEqual('100000');
+        });
+        // A tighter band is the user's call - the failure mode is a refund, not a loss
+        (0, vitest_1.it)('passes a requested zero slippage through untouched, as exact input does', () => {
+            const request = (0, helpers_1.buildNearIntentsQuoteRequest)({
+                ...BASE_ARGS,
+                amount: EXACT_OUTPUT_AMOUNT,
+                slippageTolerancePercentageDecimal: '0',
+            });
+            (0, vitest_1.expect)(request.slippageTolerance).toEqual(0);
+        });
+        (0, vitest_1.it)('honours a requested slippage', () => {
+            const request = (0, helpers_1.buildNearIntentsQuoteRequest)({
+                ...BASE_ARGS,
+                amount: EXACT_OUTPUT_AMOUNT,
+                slippageTolerancePercentageDecimal: '0.05',
+            });
+            (0, vitest_1.expect)(request.slippageTolerance).toEqual(500);
+        });
+    });
+});

package/dist/cjs/swappers/NearIntentsSwapper/utils/getNearIntentsTradeContext.d.ts

@@ -1,7 +1,7 @@
 import type { Asset } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
 import type { QuoteFeeData, SwapErrorRight, SwapperDeps, TradeCommon, TradeStepCommon } from '../../../types';
-import type { NearIntentsTradeQuoteInput, NearIntentsTradeRateInput, QuoteResponse } from '../types';
+import type { NearIntentsExactOutputTradeQuoteInput, NearIntentsExactOutputTradeRateInput, NearIntentsTradeQuoteInput, NearIntentsTradeRateInput, QuoteResponse } from '../types';
 type NearIntentsTradeContext = {
     tradeCommon: TradeCommon;
     stepCommon: Omit<TradeStepCommon, 'feeData'>;
@@ -14,7 +14,7 @@ type NearIntentsTradeContext = {
     };
 };
 export declare const getNearIntentsTradeContext: ({ input, deps, quote, }: {
-    input: NearIntentsTradeQuoteInput | NearIntentsTradeRateInput;
+    input: NearIntentsTradeQuoteInput | NearIntentsTradeRateInput | NearIntentsExactOutputTradeQuoteInput | NearIntentsExactOutputTradeRateInput;
     deps: SwapperDeps;
     quote: QuoteResponse['quote'];
 }) => Result<NearIntentsTradeContext, SwapErrorRight>;

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

@@ -10,7 +10,7 @@ const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
 const affiliateFee_1 = require("../../../utils/affiliateFee");
 const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
-    const { sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, slippageTolerancePercentageDecimal, } = input;
+    const { sellAsset, buyAsset, affiliateBps, slippageTolerancePercentageDecimal } = input;
     if (!quote.depositAddress)
         return (0, monads_1.Err)((0, utils_2.makeTradeStepBuildFailedErr)('getNearIntentsTradeContext'));
     const rate = (0, utils_2.getInputOutputRate)({
@@ -19,11 +19,13 @@ const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
         sellAsset,
         buyAsset,
     });
+    const isExactOutput = 'buyAmountCryptoBaseUnit' in input;
     return (0, monads_1.Ok)({
         tradeCommon: {
             id: (0, uuid_1.v4)(),
             rate,
             swapperName: types_1.SwapperName.NearIntents,
+            isExactOutput,
             affiliateBps,
             slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??
                 (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.NearIntents),
@@ -54,7 +56,7 @@ const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
         stepDataArgs: {
             deps,
             sellAsset,
-            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAmountCryptoBaseUnit: quote.amountIn,
             depositAddress: quote.depositAddress,
         },
     });

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

@@ -1,7 +1,7 @@
 import type { Asset } from '@shapeshiftoss/types';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import type { Result } from '@sniptt/monads';
-import type { SwapErrorRight } from '../../../types';
+import type { SwapErrorRight, TradeAmount } from '../../../types';
 import type { GetExecutionStatusResponse, QuoteResponse } from '../types';
 import { QuoteRequest } from '../types';
 export declare const getNearIntentsAsset: ({ nearNetwork, contractAddress, }: {
@@ -17,13 +17,13 @@ export declare const resolveNearIntentsAssets: ({ sellAsset, buyAsset, }: {
     destinationAsset: string;
 }, SwapErrorRight>>;
 export declare const getNearIntentsQuoteDeadline: ({ sellAsset, buyAsset, }: {
-    sellAsset: Asset;
-    buyAsset: Asset;
+    sellAsset: Pick<Asset, 'chainId'>;
+    buyAsset: Pick<Asset, 'chainId'>;
 }) => string;
-export declare const buildNearIntentsQuoteRequest: ({ originAsset, destinationAsset, sellAmountCryptoBaseUnit, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }: {
+export declare const buildNearIntentsQuoteRequest: ({ originAsset, destinationAsset, amount, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }: {
     originAsset: string;
     destinationAsset: string;
-    sellAmountCryptoBaseUnit: string;
+    amount: TradeAmount;
     slippageTolerancePercentageDecimal: string | undefined;
     affiliateBps: string;
     refundTo: string;

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

@@ -126,37 +126,41 @@ const resolveNearIntentsAssets = async ({ sellAsset, buyAsset, }) => {
     }
 };
 exports.resolveNearIntentsAssets = resolveNearIntentsAssets;
-// BTC deposits confirm slowly, so BTC pairs get a longer deadline
+const isUtxoChainId = (chainId) => (0, caip_1.fromChainId)(chainId).chainNamespace === caip_1.CHAIN_NAMESPACE.Utxo;
 const getNearIntentsQuoteDeadline = ({ sellAsset, buyAsset, }) => {
-    const deadlineMs = sellAsset.chainId === caip_1.btcChainId || buyAsset.chainId === caip_1.btcChainId
-        ? constants_1.BTC_QUOTE_DEADLINE_MS
+    const deadlineMs = isUtxoChainId(sellAsset.chainId) || isUtxoChainId(buyAsset.chainId)
+        ? constants_1.UTXO_QUOTE_DEADLINE_MS
         : constants_1.DEFAULT_QUOTE_DEADLINE_MS;
     return new Date(Date.now() + deadlineMs).toISOString();
 };
 exports.getNearIntentsQuoteDeadline = getNearIntentsQuoteDeadline;
-const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, sellAmountCryptoBaseUnit, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }) => ({
-    dry: false,
-    swapType: types_2.QuoteRequest.swapType.EXACT_INPUT,
-    slippageTolerance: slippageTolerancePercentageDecimal
-        ? (0, utils_1.bnOrZero)(slippageTolerancePercentageDecimal).times(10000).toNumber()
-        : constants_1.DEFAULT_SLIPPAGE_BPS,
-    originAsset,
-    destinationAsset,
-    amount: sellAmountCryptoBaseUnit,
-    depositType: types_2.QuoteRequest.depositType.ORIGIN_CHAIN,
-    refundTo,
-    refundType,
-    recipient,
-    recipientType,
-    deadline,
-    referral: 'shapeshift',
-    appFees: [
-        {
-            recipient: utils_1.DAO_TREASURY_NEAR,
-            fee: Number(affiliateBps),
-        },
-    ],
-});
+const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, amount, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }) => {
+    return {
+        dry: false,
+        swapType: amount.direction === 'exactOut'
+            ? types_2.QuoteRequest.swapType.EXACT_OUTPUT
+            : types_2.QuoteRequest.swapType.EXACT_INPUT,
+        slippageTolerance: slippageTolerancePercentageDecimal
+            ? (0, utils_1.bnOrZero)(slippageTolerancePercentageDecimal).times(10000).toNumber()
+            : constants_1.DEFAULT_SLIPPAGE_BPS,
+        originAsset,
+        destinationAsset,
+        amount: amount.cryptoBaseUnit,
+        depositType: types_2.QuoteRequest.depositType.ORIGIN_CHAIN,
+        refundTo,
+        refundType,
+        recipient,
+        recipientType,
+        deadline,
+        referral: 'shapeshift',
+        appFees: [
+            {
+                recipient: utils_1.DAO_TREASURY_NEAR,
+                fee: Number(affiliateBps),
+            },
+        ],
+    };
+};
 exports.buildNearIntentsQuoteRequest = buildNearIntentsQuoteRequest;
 // One retry loop for the SDK's flaky WebSocket transport; maps provider errors to swap errors
 const fetchNearIntentsQuote = async ({ quoteRequest, sellAsset, }) => {

package/dist/cjs/swappers/NearIntentsSwapper/utils/quoteDeadline.test.d.ts

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

package/dist/cjs/swappers/NearIntentsSwapper/utils/quoteDeadline.test.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const caip_1 = require("@shapeshiftoss/caip");
+const vitest_1 = require("vitest");
+const constants_1 = require("../constants");
+const helpers_1 = require("./helpers");
+const asset = (chainId) => ({ chainId });
+(0, vitest_1.describe)('getNearIntentsQuoteDeadline', () => {
+    (0, vitest_1.beforeEach)(() => {
+        vitest_1.vi.useFakeTimers();
+        vitest_1.vi.setSystemTime(new Date('2026-09-10T22:00:00.000Z'));
+    });
+    (0, vitest_1.afterEach)(() => {
+        vitest_1.vi.useRealTimers();
+    });
+    (0, vitest_1.it)('gives a utxo sell leg the long deadline', () => {
+        (0, vitest_1.expect)(Date.parse((0, helpers_1.getNearIntentsQuoteDeadline)({ sellAsset: asset(caip_1.btcChainId), buyAsset: asset(caip_1.ethChainId) }))).toBe(Date.now() + constants_1.UTXO_QUOTE_DEADLINE_MS);
+    });
+    (0, vitest_1.it)('gives a utxo buy leg the long deadline, on any utxo chain', () => {
+        (0, vitest_1.expect)(Date.parse((0, helpers_1.getNearIntentsQuoteDeadline)({ sellAsset: asset(caip_1.ethChainId), buyAsset: asset(caip_1.dogeChainId) }))).toBe(Date.now() + constants_1.UTXO_QUOTE_DEADLINE_MS);
+    });
+    (0, vitest_1.it)('gives everything else the default deadline', () => {
+        (0, vitest_1.expect)(Date.parse((0, helpers_1.getNearIntentsQuoteDeadline)({
+            sellAsset: asset(caip_1.ethChainId),
+            buyAsset: asset(caip_1.solanaChainId),
+        }))).toBe(Date.now() + constants_1.DEFAULT_QUOTE_DEADLINE_MS);
+    });
+});

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

@@ -4,17 +4,29 @@ exports.portalsApi = void 0;
 const unchained_client_1 = require("@shapeshiftoss/unchained-client");
 const utils_1 = require("../../utils");
 const evm_1 = require("../../utils/evm");
+const relayStatus_1 = require("../RelaySwapper/utils/relayStatus");
 const getPortalsTradeQuote_1 = require("./getPortalsTradeQuote/getPortalsTradeQuote");
 const getPortalsTradeRate_1 = require("./getPortalsTradeRate/getPortalsTradeRate");
 const fetchAxelarscanStatus_1 = require("./utils/fetchAxelarscanStatus");
 const fetchSquidStatus_1 = require("./utils/fetchSquidStatus");
+const bridgeStatusToTxStatus = (status) => {
+    switch (status) {
+        case 'confirmed':
+            return unchained_client_1.TxStatus.Confirmed;
+        case 'failed':
+            return unchained_client_1.TxStatus.Failed;
+        case 'pending':
+        default:
+            return unchained_client_1.TxStatus.Pending;
+    }
+};
 exports.portalsApi = {
     getTradeQuote: (input, deps) => (0, getPortalsTradeQuote_1.getPortalsTradeQuote)(input, deps),
     getTradeRate: (input, deps) => (0, getPortalsTradeRate_1.getPortalsTradeRate)(input, deps),
     getEvmTransactionFees: evm_1.getEvmTransactionFees,
     getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
     checkTradeStatus: async (input) => {
-        const { txHash, chainId, swap, assertGetEvmChainAdapter, address, fetchIsSmartContractAddressQuery, } = input;
+        const { txHash, chainId, swap, config, assertGetEvmChainAdapter, address, fetchIsSmartContractAddressQuery, } = input;
         const isCrossChain = Boolean(swap && swap.sellAsset.chainId !== swap.buyAsset?.chainId);
         if (!isCrossChain) {
             return (0, utils_1.checkEvmSwapStatus)({
@@ -42,64 +54,56 @@ exports.portalsApi = {
         if (sourceTxStatus.status === unchained_client_1.TxStatus.Failed) {
             return sourceTxStatus;
         }
+        const relayResult = await (0, relayStatus_1.fetchRelayRequestByTxHash)(txHash, config);
+        if (relayResult.isOk()) {
+            const relayRequest = relayResult.unwrap();
+            if (relayRequest) {
+                const relayTxStatus = (0, relayStatus_1.relayStatusToTxStatus)(relayRequest.status);
+                const txStatus = relayTxStatus === unchained_client_1.TxStatus.Unknown ? unchained_client_1.TxStatus.Pending : relayTxStatus;
+                return {
+                    status: txStatus,
+                    buyTxHash: relayRequest.data?.outTxs?.[0]?.hash,
+                    message: txStatus === unchained_client_1.TxStatus.Failed
+                        ? (0, relayStatus_1.getRelayRequestFailureMessage)(relayRequest)
+                        : txStatus === unchained_client_1.TxStatus.Confirmed
+                            ? undefined
+                            : 'Bridge in progress',
+                };
+            }
+        }
         const axelarscanResult = await (0, fetchAxelarscanStatus_1.fetchAxelarscanBridgeStatus)(txHash);
-        if ((axelarscanResult.isErr() || !axelarscanResult.unwrap()) && swap) {
+        if (axelarscanResult.isOk()) {
+            const bridgeStatus = axelarscanResult.unwrap();
+            if (bridgeStatus) {
+                const txStatus = bridgeStatusToTxStatus(bridgeStatus.status);
+                return {
+                    status: txStatus,
+                    buyTxHash: bridgeStatus.destinationTxHash,
+                    message: txStatus === unchained_client_1.TxStatus.Pending
+                        ? 'Bridge in progress'
+                        : txStatus === unchained_client_1.TxStatus.Failed
+                            ? bridgeStatus.errorMessage
+                            : undefined,
+                };
+            }
+        }
+        if (swap) {
             const squidResult = await (0, fetchSquidStatus_1.fetchSquidBridgeStatus)(txHash, swap.sellAsset.chainId, swap.buyAsset.chainId);
             if (squidResult.isOk()) {
                 const squidStatus = squidResult.unwrap();
-                const squidTxStatus = (() => {
-                    switch (squidStatus.status) {
-                        case 'confirmed':
-                            return unchained_client_1.TxStatus.Confirmed;
-                        case 'failed':
-                            return unchained_client_1.TxStatus.Failed;
-                        case 'pending':
-                        default:
-                            return unchained_client_1.TxStatus.Pending;
-                    }
-                })();
+                const squidTxStatus = bridgeStatusToTxStatus(squidStatus.status);
                 return {
                     status: squidTxStatus,
                     buyTxHash: squidStatus.destinationTxHash,
-                    swapperTxLink: (0, fetchSquidStatus_1.getSquidTrackingLink)(txHash, squidStatus, swap.sellAsset.explorerTxLink, swap.buyAsset.explorerTxLink),
                     message: squidTxStatus === unchained_client_1.TxStatus.Pending ? 'Cross-chain swap in progress' : undefined,
                 };
             }
-            return {
-                status: unchained_client_1.TxStatus.Pending,
-                buyTxHash: undefined,
-                swapperTxLink: (0, fetchAxelarscanStatus_1.getAxelarscanTrackingLink)(txHash),
-                message: 'Bridge status check failed - track manually',
-            };
         }
-        const bridgeStatus = axelarscanResult.unwrap();
-        if (!bridgeStatus) {
-            return {
-                status: unchained_client_1.TxStatus.Pending,
-                buyTxHash: undefined,
-                message: 'Cross-chain swap in progress',
-            };
-        }
-        const txStatus = (() => {
-            switch (bridgeStatus.status) {
-                case 'confirmed':
-                    return unchained_client_1.TxStatus.Confirmed;
-                case 'failed':
-                    return unchained_client_1.TxStatus.Failed;
-                case 'pending':
-                default:
-                    return unchained_client_1.TxStatus.Pending;
-            }
-        })();
+        // No indexer knows the tx yet - the bridge may not have picked it up, so keep polling
         return {
-            status: txStatus,
-            buyTxHash: bridgeStatus.destinationTxHash,
-            swapperTxLink: (0, fetchAxelarscanStatus_1.getAxelarscanTrackingLink)(txHash),
-            message: txStatus === unchained_client_1.TxStatus.Pending
-                ? 'Bridge in progress'
-                : txStatus === unchained_client_1.TxStatus.Failed
-                    ? bridgeStatus.errorMessage
-                    : undefined,
+            status: unchained_client_1.TxStatus.Pending,
+            buyTxHash: undefined,
+            message: 'Cross-chain swap in progress',
         };
     },
 };

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

@@ -112,8 +112,8 @@ const getPortalsTradeQuote = async (input, deps) => {
         input,
         deps,
         sellChainId,
-        inputToken,
         orderContext,
+        outputToken,
         tx,
     });
     if (maybeContext.isErr())

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

@@ -47,8 +47,8 @@ const getPortalsTradeRate = async (input, deps) => {
         input,
         deps,
         sellChainId,
-        inputToken,
         orderContext,
+        outputToken,
         tx,
     });
     if (maybeContext.isErr())

package/dist/cjs/swappers/PortalsSwapper/utils/fetchAxelarscanStatus.d.ts

@@ -6,4 +6,3 @@ export type AxelarscanBridgeStatus = {
     errorMessage?: string;
 };
 export declare const fetchAxelarscanBridgeStatus: (sourceTxHash: string) => Promise<Result<AxelarscanBridgeStatus | undefined, SwapErrorRight>>;
-export declare const getAxelarscanTrackingLink: (sourceTxHash: string) => string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxelarscanTrackingLink = exports.fetchAxelarscanBridgeStatus = void 0;
+exports.fetchAxelarscanBridgeStatus = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
 const fetchAxelarscanBridgeStatus = async (sourceTxHash) => {
@@ -16,9 +16,8 @@ const fetchAxelarscanBridgeStatus = async (sourceTxHash) => {
             return (0, monads_1.Ok)(undefined);
         }
         const bridgeData = data.data[0];
-        const destinationTxHash = bridgeData.call?.transaction_hash ||
-            bridgeData.executed?.transaction_hash ||
-            bridgeData.express_executed?.transactionHash;
+        // `call` is the origin call, so only the executed hashes identify the destination leg
+        const destinationTxHash = bridgeData.executed?.transaction_hash || bridgeData.express_executed?.transactionHash;
         const isCompleted = bridgeData.status === 'executed' ||
             bridgeData.status === 'destination_executed' ||
             bridgeData.status === 'express_executed' ||
@@ -48,5 +47,3 @@ const fetchAxelarscanBridgeStatus = async (sourceTxHash) => {
     }
 };
 exports.fetchAxelarscanBridgeStatus = fetchAxelarscanBridgeStatus;
-const getAxelarscanTrackingLink = (sourceTxHash) => `https://axelarscan.io/gmp/${sourceTxHash}`;
-exports.getAxelarscanTrackingLink = getAxelarscanTrackingLink;

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

@@ -23,9 +23,11 @@ const fetchPortalsTradeOrder = async ({ sender, inputToken, inputAmount, outputT
         validate: validate.toString(),
     });
     if (!autoSlippage) {
-        params.append('slippageTolerancePercentage', slippageTolerancePercentage.toFixed(2)); // Portals API expects a string with at most 2 decimal places
+        // Portals API expects a string with at most 2 decimal places
+        params.append('slippageTolerancePercentage', slippageTolerancePercentage.toFixed(2));
     }
-    if (feePercentage) {
+    // Portals defaults to their own partner fee when this is omitted - always send it, zero included
+    if (feePercentage !== undefined) {
         params.append('feePercentage', feePercentage.toString());
     }
     try {
@@ -52,7 +54,8 @@ const fetchPortalsTradeEstimate = async ({ inputToken, inputAmount, outputToken,
         outputToken,
     });
     if (slippageTolerancePercentage !== undefined) {
-        params.append('slippageTolerancePercentage', slippageTolerancePercentage.toFixed(2)); // Portals API expects a string with at most 2 decimal places
+        // Portals API expects a string with at most 2 decimal places
+        params.append('slippageTolerancePercentage', slippageTolerancePercentage.toFixed(2));
     }
     try {
         const response = await axios_1.default.get(url, { params });

package/dist/cjs/swappers/PortalsSwapper/utils/fetchSquidStatus.d.ts

@@ -6,4 +6,3 @@ export type SquidBridgeStatus = {
     destinationTxHash?: string;
 };
 export declare const fetchSquidBridgeStatus: (sourceTxHash: string, sourceChainId: ChainId, destinationChainId: ChainId) => Promise<Result<SquidBridgeStatus, SwapErrorRight>>;
-export declare const getSquidTrackingLink: (sourceTxHash: string, squidStatus: SquidBridgeStatus, sellAssetExplorerTxLink: string, buyAssetExplorerTxLink: string) => string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSquidTrackingLink = exports.fetchSquidBridgeStatus = void 0;
+exports.fetchSquidBridgeStatus = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
@@ -48,10 +48,3 @@ const fetchSquidBridgeStatus = async (sourceTxHash, sourceChainId, destinationCh
     }
 };
 exports.fetchSquidBridgeStatus = fetchSquidBridgeStatus;
-const getSquidTrackingLink = (sourceTxHash, squidStatus, sellAssetExplorerTxLink, buyAssetExplorerTxLink) => {
-    if (squidStatus.status === 'confirmed' && squidStatus.destinationTxHash) {
-        return `${buyAssetExplorerTxLink}${squidStatus.destinationTxHash}`;
-    }
-    return `${sellAssetExplorerTxLink}${sourceTxHash}`;
-};
-exports.getSquidTrackingLink = getSquidTrackingLink;

package/dist/cjs/swappers/PortalsSwapper/utils/getPortalsStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { PortalsTx } from './fetchPortalsTradeOrder';
 type BaseArgs = {
     tx: PortalsTx;
+    sellAmountCryptoBaseUnit: string;
     spenderAddress: string;
 };
 export type GetPortalsStepDataArgs = StepDataArgs<BaseArgs, {