@shapeshiftoss/swapper 19.0.0 → 20.1.0

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

@@ -1,12 +1,14 @@
 import { Err, Ok } from '@sniptt/monads';
+import { getTradeAmount } from '../../../utils/helpers.js';
 import { QuoteRequest } from '../types.js';
 import { getNearIntentsStepData } from '../utils/getNearIntentsStepData.js';
 import { getNearIntentsTradeContext } from '../utils/getNearIntentsTradeContext.js';
 import { buildNearIntentsQuoteRequest, fetchNearIntentsQuote, getNearIntentsQuoteDeadline, resolveNearIntentsAssets, } from '../utils/helpers.js';
 import { initializeOneClickService } from '../utils/oneClickService.js';
-export 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;
     initializeOneClickService(deps.config.VITE_NEAR_INTENTS_API_KEY);
+    const amount = getTradeAmount(input);
     const maybeAssets = await resolveNearIntentsAssets({ sellAsset, buyAsset });
     if (maybeAssets.isErr())
         return Err(maybeAssets.unwrapErr());
@@ -14,7 +16,7 @@ export const getTradeRate = async (input, deps) => {
     const quoteRequest = buildNearIntentsQuoteRequest({
         originAsset,
         destinationAsset,
-        sellAmountCryptoBaseUnit: sellAmount,
+        amount,
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,
         affiliateBps,
         refundTo: sendAddress ?? 'check-price',
@@ -58,3 +60,5 @@ export const getTradeRate = async (input, deps) => {
     };
     return Ok([tradeRate]);
 };
+export const getTradeRate = (input, deps) => getRate(input, deps);
+export const getExactOutputTradeRate = (input, deps) => getRate(input, deps);

package/dist/esm/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.js';
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetNearTradeQuoteInput, GetNearTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetStarknetTradeQuoteInput, GetStarknetTradeRateInput, GetSuiTradeQuoteInput, GetSuiTradeRateInput, GetTonTradeQuoteInput, GetTonTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput, WithExactBuyAmount } from '../../types.js';
 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/esm/swappers/NearIntentsSwapper/utils/exactOutput.test.d.ts

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

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

@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest';
+import { QuoteRequest } from '../types.js';
+import { buildNearIntentsQuoteRequest } from './helpers.js';
+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: QuoteRequest.refundType.ORIGIN_CHAIN,
+    recipientType: QuoteRequest.recipientType.DESTINATION_CHAIN,
+    deadline: '2026-08-10T23:59:00.000Z',
+};
+const EXACT_OUTPUT_AMOUNT = {
+    direction: 'exactOut',
+    cryptoBaseUnit: '100000',
+};
+describe('buildNearIntentsQuoteRequest', () => {
+    describe('exact input', () => {
+        it('requests EXACT_INPUT with the sell amount', () => {
+            const request = buildNearIntentsQuoteRequest(BASE_ARGS);
+            expect(request.swapType).toEqual(QuoteRequest.swapType.EXACT_INPUT);
+            expect(request.amount).toEqual('65000000');
+        });
+        it('passes the requested slippage through untouched', () => {
+            const request = buildNearIntentsQuoteRequest({
+                ...BASE_ARGS,
+                slippageTolerancePercentageDecimal: '0',
+            });
+            expect(request.slippageTolerance).toEqual(0);
+        });
+    });
+    describe('exact output', () => {
+        it('requests EXACT_OUTPUT with the buy amount', () => {
+            const request = buildNearIntentsQuoteRequest({ ...BASE_ARGS, amount: EXACT_OUTPUT_AMOUNT });
+            expect(request.swapType).toEqual(QuoteRequest.swapType.EXACT_OUTPUT);
+            expect(request.amount).toEqual('100000');
+        });
+        // A tighter band is the user's call - the failure mode is a refund, not a loss
+        it('passes a requested zero slippage through untouched, as exact input does', () => {
+            const request = buildNearIntentsQuoteRequest({
+                ...BASE_ARGS,
+                amount: EXACT_OUTPUT_AMOUNT,
+                slippageTolerancePercentageDecimal: '0',
+            });
+            expect(request.slippageTolerance).toEqual(0);
+        });
+        it('honours a requested slippage', () => {
+            const request = buildNearIntentsQuoteRequest({
+                ...BASE_ARGS,
+                amount: EXACT_OUTPUT_AMOUNT,
+                slippageTolerancePercentageDecimal: '0.05',
+            });
+            expect(request.slippageTolerance).toEqual(500);
+        });
+    });
+});

package/dist/esm/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.js';
-import type { NearIntentsTradeQuoteInput, NearIntentsTradeRateInput, QuoteResponse } from '../types.js';
+import type { NearIntentsExactOutputTradeQuoteInput, NearIntentsExactOutputTradeRateInput, NearIntentsTradeQuoteInput, NearIntentsTradeRateInput, QuoteResponse } from '../types.js';
 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/esm/swappers/NearIntentsSwapper/utils/getNearIntentsTradeContext.js

@@ -7,7 +7,7 @@ import { SwapperName } from '../../../types.js';
 import { getInputOutputRate, makeTradeStepBuildFailedErr } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
 export const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
-    const { sellAsset, buyAsset, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, slippageTolerancePercentageDecimal, } = input;
+    const { sellAsset, buyAsset, affiliateBps, slippageTolerancePercentageDecimal } = input;
     if (!quote.depositAddress)
         return Err(makeTradeStepBuildFailedErr('getNearIntentsTradeContext'));
     const rate = getInputOutputRate({
@@ -16,11 +16,13 @@ export const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
         sellAsset,
         buyAsset,
     });
+    const isExactOutput = 'buyAmountCryptoBaseUnit' in input;
     return Ok({
         tradeCommon: {
             id: uuid(),
             rate,
             swapperName: SwapperName.NearIntents,
+            isExactOutput,
             affiliateBps,
             slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ??
                 getDefaultSlippageDecimalPercentageForSwapper(SwapperName.NearIntents),
@@ -51,7 +53,7 @@ export const getNearIntentsTradeContext = ({ input, deps, quote, }) => {
         stepDataArgs: {
             deps,
             sellAsset,
-            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAmountCryptoBaseUnit: quote.amountIn,
             depositAddress: quote.depositAddress,
         },
     });

package/dist/esm/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.js';
+import type { SwapErrorRight, TradeAmount } from '../../../types.js';
 import type { GetExecutionStatusResponse, QuoteResponse } from '../types.js';
 import { QuoteRequest } from '../types.js';
 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/esm/swappers/NearIntentsSwapper/utils/helpers.js

@@ -1,11 +1,11 @@
-import { btcChainId, fromAssetId, solanaChainId } from '@shapeshiftoss/caip';
+import { CHAIN_NAMESPACE, fromAssetId, fromChainId, solanaChainId } from '@shapeshiftoss/caip';
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { bnOrZero, DAO_TREASURY_NEAR, isToken } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { zeroAddress } from 'viem';
 import { TradeQuoteError } from '../../../types.js';
 import { createTradeAmountTooSmallErr, makeSwapErrorRight } from '../../../utils/index.js';
-import { BTC_QUOTE_DEADLINE_MS, DEFAULT_QUOTE_DEADLINE_MS, DEFAULT_SLIPPAGE_BPS, } from '../constants.js';
+import { 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 () => {
@@ -120,36 +120,40 @@ export const resolveNearIntentsAssets = async ({ sellAsset, buyAsset, }) => {
         }));
     }
 };
-// BTC deposits confirm slowly, so BTC pairs get a longer deadline
+const isUtxoChainId = (chainId) => fromChainId(chainId).chainNamespace === CHAIN_NAMESPACE.Utxo;
 export const getNearIntentsQuoteDeadline = ({ sellAsset, buyAsset, }) => {
-    const deadlineMs = sellAsset.chainId === btcChainId || buyAsset.chainId === btcChainId
-        ? BTC_QUOTE_DEADLINE_MS
+    const deadlineMs = isUtxoChainId(sellAsset.chainId) || isUtxoChainId(buyAsset.chainId)
+        ? UTXO_QUOTE_DEADLINE_MS
         : DEFAULT_QUOTE_DEADLINE_MS;
     return new Date(Date.now() + deadlineMs).toISOString();
 };
-export const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, sellAmountCryptoBaseUnit, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }) => ({
-    dry: false,
-    swapType: QuoteRequest.swapType.EXACT_INPUT,
-    slippageTolerance: slippageTolerancePercentageDecimal
-        ? bnOrZero(slippageTolerancePercentageDecimal).times(10000).toNumber()
-        : DEFAULT_SLIPPAGE_BPS,
-    originAsset,
-    destinationAsset,
-    amount: sellAmountCryptoBaseUnit,
-    depositType: QuoteRequest.depositType.ORIGIN_CHAIN,
-    refundTo,
-    refundType,
-    recipient,
-    recipientType,
-    deadline,
-    referral: 'shapeshift',
-    appFees: [
-        {
-            recipient: DAO_TREASURY_NEAR,
-            fee: Number(affiliateBps),
-        },
-    ],
-});
+export const buildNearIntentsQuoteRequest = ({ originAsset, destinationAsset, amount, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }) => {
+    return {
+        dry: false,
+        swapType: amount.direction === 'exactOut'
+            ? QuoteRequest.swapType.EXACT_OUTPUT
+            : QuoteRequest.swapType.EXACT_INPUT,
+        slippageTolerance: slippageTolerancePercentageDecimal
+            ? bnOrZero(slippageTolerancePercentageDecimal).times(10000).toNumber()
+            : DEFAULT_SLIPPAGE_BPS,
+        originAsset,
+        destinationAsset,
+        amount: amount.cryptoBaseUnit,
+        depositType: QuoteRequest.depositType.ORIGIN_CHAIN,
+        refundTo,
+        refundType,
+        recipient,
+        recipientType,
+        deadline,
+        referral: 'shapeshift',
+        appFees: [
+            {
+                recipient: DAO_TREASURY_NEAR,
+                fee: Number(affiliateBps),
+            },
+        ],
+    };
+};
 // One retry loop for the SDK's flaky WebSocket transport; maps provider errors to swap errors
 export const fetchNearIntentsQuote = async ({ quoteRequest, sellAsset, }) => {
     const maxRetries = 3;

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

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

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

@@ -0,0 +1,26 @@
+import { btcChainId, dogeChainId, ethChainId, solanaChainId } from '@shapeshiftoss/caip';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { DEFAULT_QUOTE_DEADLINE_MS, UTXO_QUOTE_DEADLINE_MS } from '../constants.js';
+import { getNearIntentsQuoteDeadline } from './helpers.js';
+const asset = (chainId) => ({ chainId });
+describe('getNearIntentsQuoteDeadline', () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date('2026-09-10T22:00:00.000Z'));
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+    it('gives a utxo sell leg the long deadline', () => {
+        expect(Date.parse(getNearIntentsQuoteDeadline({ sellAsset: asset(btcChainId), buyAsset: asset(ethChainId) }))).toBe(Date.now() + UTXO_QUOTE_DEADLINE_MS);
+    });
+    it('gives a utxo buy leg the long deadline, on any utxo chain', () => {
+        expect(Date.parse(getNearIntentsQuoteDeadline({ sellAsset: asset(ethChainId), buyAsset: asset(dogeChainId) }))).toBe(Date.now() + UTXO_QUOTE_DEADLINE_MS);
+    });
+    it('gives everything else the default deadline', () => {
+        expect(Date.parse(getNearIntentsQuoteDeadline({
+            sellAsset: asset(ethChainId),
+            buyAsset: asset(solanaChainId),
+        }))).toBe(Date.now() + DEFAULT_QUOTE_DEADLINE_MS);
+    });
+});

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

@@ -1,17 +1,29 @@
 import { TxStatus } from '@shapeshiftoss/unchained-client';
 import { checkEvmSwapStatus } from '../../utils/index.js';
 import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
+import { fetchRelayRequestByTxHash, getRelayRequestFailureMessage, relayStatusToTxStatus, } from '../RelaySwapper/utils/relayStatus.js';
 import { getPortalsTradeQuote } from './getPortalsTradeQuote/getPortalsTradeQuote.js';
 import { getPortalsTradeRate } from './getPortalsTradeRate/getPortalsTradeRate.js';
-import { fetchAxelarscanBridgeStatus, getAxelarscanTrackingLink, } from './utils/fetchAxelarscanStatus.js';
-import { fetchSquidBridgeStatus, getSquidTrackingLink } from './utils/fetchSquidStatus.js';
+import { fetchAxelarscanBridgeStatus } from './utils/fetchAxelarscanStatus.js';
+import { fetchSquidBridgeStatus } from './utils/fetchSquidStatus.js';
+const bridgeStatusToTxStatus = (status) => {
+    switch (status) {
+        case 'confirmed':
+            return TxStatus.Confirmed;
+        case 'failed':
+            return TxStatus.Failed;
+        case 'pending':
+        default:
+            return TxStatus.Pending;
+    }
+};
 export const portalsApi = {
     getTradeQuote: (input, deps) => getPortalsTradeQuote(input, deps),
     getTradeRate: (input, deps) => getPortalsTradeRate(input, deps),
     getEvmTransactionFees,
     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 checkEvmSwapStatus({
@@ -39,64 +51,56 @@ export const portalsApi = {
         if (sourceTxStatus.status === TxStatus.Failed) {
             return sourceTxStatus;
         }
+        const relayResult = await fetchRelayRequestByTxHash(txHash, config);
+        if (relayResult.isOk()) {
+            const relayRequest = relayResult.unwrap();
+            if (relayRequest) {
+                const relayTxStatus = relayStatusToTxStatus(relayRequest.status);
+                const txStatus = relayTxStatus === TxStatus.Unknown ? TxStatus.Pending : relayTxStatus;
+                return {
+                    status: txStatus,
+                    buyTxHash: relayRequest.data?.outTxs?.[0]?.hash,
+                    message: txStatus === TxStatus.Failed
+                        ? getRelayRequestFailureMessage(relayRequest)
+                        : txStatus === TxStatus.Confirmed
+                            ? undefined
+                            : 'Bridge in progress',
+                };
+            }
+        }
         const axelarscanResult = await 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 === TxStatus.Pending
+                        ? 'Bridge in progress'
+                        : txStatus === TxStatus.Failed
+                            ? bridgeStatus.errorMessage
+                            : undefined,
+                };
+            }
+        }
+        if (swap) {
             const squidResult = await fetchSquidBridgeStatus(txHash, swap.sellAsset.chainId, swap.buyAsset.chainId);
             if (squidResult.isOk()) {
                 const squidStatus = squidResult.unwrap();
-                const squidTxStatus = (() => {
-                    switch (squidStatus.status) {
-                        case 'confirmed':
-                            return TxStatus.Confirmed;
-                        case 'failed':
-                            return TxStatus.Failed;
-                        case 'pending':
-                        default:
-                            return TxStatus.Pending;
-                    }
-                })();
+                const squidTxStatus = bridgeStatusToTxStatus(squidStatus.status);
                 return {
                     status: squidTxStatus,
                     buyTxHash: squidStatus.destinationTxHash,
-                    swapperTxLink: getSquidTrackingLink(txHash, squidStatus, swap.sellAsset.explorerTxLink, swap.buyAsset.explorerTxLink),
                     message: squidTxStatus === TxStatus.Pending ? 'Cross-chain swap in progress' : undefined,
                 };
             }
-            return {
-                status: TxStatus.Pending,
-                buyTxHash: undefined,
-                swapperTxLink: getAxelarscanTrackingLink(txHash),
-                message: 'Bridge status check failed - track manually',
-            };
         }
-        const bridgeStatus = axelarscanResult.unwrap();
-        if (!bridgeStatus) {
-            return {
-                status: TxStatus.Pending,
-                buyTxHash: undefined,
-                message: 'Cross-chain swap in progress',
-            };
-        }
-        const txStatus = (() => {
-            switch (bridgeStatus.status) {
-                case 'confirmed':
-                    return TxStatus.Confirmed;
-                case 'failed':
-                    return TxStatus.Failed;
-                case 'pending':
-                default:
-                    return 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: getAxelarscanTrackingLink(txHash),
-            message: txStatus === TxStatus.Pending
-                ? 'Bridge in progress'
-                : txStatus === TxStatus.Failed
-                    ? bridgeStatus.errorMessage
-                    : undefined,
+            status: TxStatus.Pending,
+            buyTxHash: undefined,
+            message: 'Cross-chain swap in progress',
         };
     },
 };

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

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

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

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

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

@@ -13,9 +13,8 @@ export const fetchAxelarscanBridgeStatus = async (sourceTxHash) => {
             return 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' ||
@@ -44,4 +43,3 @@ export const fetchAxelarscanBridgeStatus = async (sourceTxHash) => {
         }));
     }
 };
-export const getAxelarscanTrackingLink = (sourceTxHash) => `https://axelarscan.io/gmp/${sourceTxHash}`;

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

@@ -16,9 +16,11 @@ export const fetchPortalsTradeOrder = async ({ sender, inputToken, inputAmount,
         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 {
@@ -44,7 +46,8 @@ export const fetchPortalsTradeEstimate = async ({ inputToken, inputAmount, outpu
         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.get(url, { params });

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

@@ -44,9 +44,3 @@ export const fetchSquidBridgeStatus = async (sourceTxHash, sourceChainId, destin
         }));
     }
 };
-export const getSquidTrackingLink = (sourceTxHash, squidStatus, sellAssetExplorerTxLink, buyAssetExplorerTxLink) => {
-    if (squidStatus.status === 'confirmed' && squidStatus.destinationTxHash) {
-        return `${buyAssetExplorerTxLink}${squidStatus.destinationTxHash}`;
-    }
-    return `${sellAssetExplorerTxLink}${sourceTxHash}`;
-};

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

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

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

@@ -1,21 +1,22 @@
 import { fromChainId } from '@shapeshiftoss/caip';
+import { bnOrZero } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { makeNetworkFeeEstimationFailedErr } from '../../../utils/index.js';
 import { estimateGasWithStateOverride, getEvmNetworkFeeCryptoBaseUnit } from '../../../utils/evm/index.js';
 import { fetchPortalsTradeEstimate } from './fetchPortalsTradeOrder.js';
 export async function getPortalsStepData(args) {
-    const { tx, sellAsset, spenderAddress, input, deps } = args;
+    const { tx, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, input, deps } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     if (args.type === 'rate') {
         try {
             // No placeholder estimation for provider built routes - overridden estimation (approval
-            // state need not exist yet) with the Portals estimate endpoint as fallback
+            // state need not exist yet) with the Portals order and estimate endpoint as fallbacks
             const gasLimit = await (async () => {
                 try {
                     const gasLimit = await estimateGasWithStateOverride({
                         sellAsset,
-                        sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                        sellAmountCryptoBaseUnit,
                         from: tx.from,
                         spenderAddress,
                         to: tx.to,
@@ -25,6 +26,10 @@ export async function getPortalsStepData(args) {
                     return gasLimit;
                 }
                 catch {
+                    // Portals only carry a tx gas limit on the bridge routes their estimate endpoint zeroes
+                    const { gasLimit: txGasLimit } = tx;
+                    if (txGasLimit && bnOrZero(txGasLimit).gt(0))
+                        return txGasLimit;
                     const quoteEstimateResponse = await fetchPortalsTradeEstimate({
                         inputToken: args.inputToken,
                         outputToken: args.outputToken,
@@ -32,7 +37,10 @@ export async function getPortalsStepData(args) {
                         slippageTolerancePercentage: args.slippageTolerancePercentage,
                         swapperConfig: deps.config,
                     });
-                    return quoteEstimateResponse.context.gasLimit.toString();
+                    const estimatedGasLimit = quoteEstimateResponse.context.gasLimit.toString();
+                    if (bnOrZero(estimatedGasLimit).lte(0))
+                        throw new Error('no Portals gas limit');
+                    return estimatedGasLimit;
                 }
             })();
             const networkFeeCryptoBaseUnit = await getEvmNetworkFeeCryptoBaseUnit({
@@ -65,7 +73,7 @@ export async function getPortalsStepData(args) {
             supportsEIP1559,
             stateOverride: {
                 sellAsset,
-                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 spenderAddress,
             },
         });

package/dist/esm/swappers/PortalsSwapper/utils/getPortalsStepData.test.d.ts

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