@shapeshiftoss/swapper 20.0.0 → 20.1.0

package/dist/esm/swappers/BobGatewaySwapper/swapperApi/getTradeQuote.js

@@ -10,14 +10,18 @@ export const getBobGatewayTradeQuote = async (input, deps) => {
     if (maybeAddresses.isErr())
         return Err(maybeAddresses.unwrapErr());
     const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const isEvmSell = isEvmChainId(sellAsset.chainId);
     // omit the sender for utxo sells so order creation does not enforce a per-address confirmed
     // funds check (deposits are matched via op_return, not the sending address)
-    const sender = isEvmChainId(sellAsset.chainId) ? sendAddress : undefined;
+    const sender = isEvmSell ? sendAddress : undefined;
+    // utxo deposits are refunded on the sell chain, so refunds go to the sending address
+    const refundAddress = isEvmSell ? undefined : sendAddress;
     const maybeContext = await getBobGatewayTradeContext({
         input,
         deps,
         sender,
         recipient: receiveAddress,
+        refundAddress,
     });
     if (maybeContext.isErr())
         return Err(maybeContext.unwrapErr());

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

@@ -5,9 +5,18 @@ import { getBobGatewayTradeContext } from '../utils/getBobGatewayTradeContext.js
 import { dummyAddressForChainId } from '../utils/helpers.js';
 export const getBobGatewayTradeRate = async (input, deps) => {
     const { accountNumber, sellAsset, buyAsset, receiveAddress } = input;
+    const isBtcSell = sellAsset.chainId === btcChainId;
     const recipient = receiveAddress ?? dummyAddressForChainId(buyAsset.chainId);
-    const sender = sellAsset.chainId === btcChainId ? undefined : dummyAddressForChainId(sellAsset.chainId);
-    const maybeContext = await getBobGatewayTradeContext({ input, deps, sender, recipient });
+    const sender = isBtcSell ? undefined : dummyAddressForChainId(sellAsset.chainId);
+    // utxo deposits are refunded on the sell chain, so the refund address must be a btc address
+    const refundAddress = isBtcSell ? dummyAddressForChainId(sellAsset.chainId) : undefined;
+    const maybeContext = await getBobGatewayTradeContext({
+        input,
+        deps,
+        sender,
+        recipient,
+        refundAddress,
+    });
     if (maybeContext.isErr())
         return Err(maybeContext.unwrapErr());
     const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();

package/dist/esm/swappers/BobGatewaySwapper/utils/getBobGatewayTradeContext.d.ts

@@ -8,10 +8,11 @@ type BobGatewayTradeContext = {
     protocolFees: QuoteFeeData['protocolFees'];
     stepDataArgs: Omit<GetBobGatewayStepDataArgs, 'type' | 'input' | 'from'>;
 };
-export declare const getBobGatewayTradeContext: ({ input, deps, sender, recipient, }: {
+export declare const getBobGatewayTradeContext: ({ input, deps, sender, recipient, refundAddress, }: {
     input: BobGatewayTradeQuoteInput | BobGatewayTradeRateInput;
     deps: SwapperDeps;
     sender: string | undefined;
     recipient: string;
+    refundAddress: string | undefined;
 }) => Promise<Result<BobGatewayTradeContext, SwapErrorRight>>;
 export {};

package/dist/esm/swappers/BobGatewaySwapper/utils/getBobGatewayTradeContext.js

@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
 import { SwapperName } from '../../../types.js';
 import { getInputOutputRate } from '../../../utils/index.js';
 import { assertValidTrade, getBobGatewayAllowanceContract, getBobGatewayQuote, parseBobGatewayQuote, } from './helpers.js';
-export const getBobGatewayTradeContext = async ({ input, deps, sender, recipient, }) => {
+export const getBobGatewayTradeContext = async ({ input, deps, sender, recipient, refundAddress, }) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps, slippageTolerancePercentageDecimal, } = input;
     const assertion = assertValidTrade({ sellAsset, buyAsset });
     if (assertion.isErr())
@@ -18,6 +18,7 @@ export const getBobGatewayTradeContext = async ({ input, deps, sender, recipient
         buyChainName,
         sender,
         recipient,
+        refundAddress,
         amount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         affiliateBps,
         slippageTolerancePercentageDecimal,

package/dist/esm/swappers/BobGatewaySwapper/utils/helpers.d.ts

@@ -11,7 +11,7 @@ export declare const getBobGatewayClient: (config: SwapperConfig) => GatewaySDK;
 export declare const toTronBase58: (address: string) => string;
 export declare const assetIdToBobGatewayToken: (assetId: string) => string;
 export declare const getBobGatewayAffiliates: (affiliateBps: string) => GetQuoteParams['affiliates'];
-export declare const getBobGatewayQuote: ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, amount, affiliateBps, slippageTolerancePercentageDecimal, }: {
+export declare const getBobGatewayQuote: ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, refundAddress, amount, affiliateBps, slippageTolerancePercentageDecimal, }: {
     config: SwapperConfig;
     sellAsset: Asset;
     buyAsset: Asset;
@@ -19,6 +19,7 @@ export declare const getBobGatewayQuote: ({ config, sellAsset, buyAsset, sellCha
     buyChainName: BobGatewayChainName;
     sender: string | undefined;
     recipient: string;
+    refundAddress: string | undefined;
     amount: string;
     affiliateBps: string;
     slippageTolerancePercentageDecimal: string | undefined;

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

@@ -41,7 +41,7 @@ export const getBobGatewayAffiliates = (affiliateBps) => {
     const affiliateAddress = getTreasuryAddressFromChainId(ethChainId);
     return [{ address: getAddress(affiliateAddress), bps: bps.toNumber() }];
 };
-export const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, amount, affiliateBps, slippageTolerancePercentageDecimal, }) => {
+export const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, refundAddress, amount, affiliateBps, slippageTolerancePercentageDecimal, }) => {
     const slippage = decimalSlippageToBobBps(slippageTolerancePercentageDecimal ??
         getDefaultSlippageDecimalPercentageForSwapper(SwapperName.BobGateway));
     try {
@@ -55,6 +55,7 @@ export const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChai
             amount,
             maxSlippage: Number(slippage),
             ownerAddress: sellChainName === 'bitcoin' ? recipient : sender,
+            refundAddress,
             affiliates: getBobGatewayAffiliates(affiliateBps),
         });
         return Ok(quote);

package/dist/esm/swappers/ChainflipSwapper/ChainflipSwapper.js

@@ -1,5 +1,6 @@
 import { executeEvmTransaction, executeSolanaTransaction, executeTronTransaction, } from '../../utils/index.js';
 export const chainflipSwapper = {
+    supportsExternalPayment: true,
     executeEvmTransaction,
     executeSolanaTransaction,
     executeTronTransaction,

package/dist/esm/swappers/ChainflipSwapper/checkTradeStatus.test.d.ts

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

package/dist/esm/swappers/ChainflipSwapper/checkTradeStatus.test.js

@@ -0,0 +1,46 @@
+import { Ok } from '@sniptt/monads';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { chainflipApi } from './endpoints.js';
+import { chainflipService } from './utils/chainflipService.js';
+vi.mock('./utils/chainflipService', () => ({
+    chainflipService: { get: vi.fn() },
+}));
+const makeInput = () => ({
+    config: { VITE_CHAINFLIP_API_URL: 'https://broker', VITE_CHAINFLIP_API_KEY: 'key' },
+    swap: { metadata: { swapperMetadata: { name: 'chainflip', swapId: 1234 } } },
+});
+const mockStatus = (status) => vi.mocked(chainflipService.get).mockResolvedValue(Ok({ data: { status } }));
+describe('chainflip checkTradeStatus', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('reports the deposit tx hash while the swap is still pending', async () => {
+        mockStatus({
+            state: 'swapping',
+            swapId: '1234',
+            deposit: { transactionReference: '0xdeposit' },
+        });
+        const result = await chainflipApi.checkTradeStatus(makeInput());
+        expect(result.sellTxHash).toBe('0xdeposit');
+        expect(result.buyTxHash).toBeUndefined();
+    });
+    it('reports the deposit tx hash alongside a completed egress', async () => {
+        mockStatus({
+            state: 'completed',
+            swapId: '1234',
+            deposit: { transactionReference: '0xdeposit' },
+            swapEgress: { transactionReference: '0xegress' },
+        });
+        const result = await chainflipApi.checkTradeStatus(makeInput());
+        expect(result.sellTxHash).toBe('0xdeposit');
+        expect(result.buyTxHash).toBe('0xegress');
+    });
+    it('has no deposit tx hash before the deposit is witnessed', async () => {
+        mockStatus({ state: 'waiting', swapId: '1234' });
+        expect((await chainflipApi.checkTradeStatus(makeInput())).sellTxHash).toBeUndefined();
+    });
+    it('treats a null transaction reference as no deposit yet', async () => {
+        mockStatus({ state: 'receiving', swapId: '1234', deposit: { transactionReference: null } });
+        expect((await chainflipApi.checkTradeStatus(makeInput())).sellTxHash).toBeUndefined();
+    });
+});

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

@@ -52,13 +52,15 @@ export const chainflipApi = {
             };
         }
         const { data: statusResponse } = maybeStatusResponse.unwrap();
-        const buyTxHash = statusResponse.status.swapEgress?.transactionReference;
+        const buyTxHash = statusResponse.status.swapEgress?.transactionReference ?? undefined;
+        const sellTxHash = statusResponse.status.deposit?.transactionReference ?? undefined;
         const swapperTxId = statusResponse.status.swapId;
         const swapperTxLink = swapperTxId ? `https://scan.chainflip.io/swaps/${swapperTxId}` : undefined;
         // Assume no outbound Tx is a pending Tx
         if (!buyTxHash) {
             return {
-                buyTxHash: undefined,
+                buyTxHash,
+                sellTxHash,
                 status: TxStatus.Pending,
                 swapperTxId,
                 swapperTxLink,
@@ -69,6 +71,7 @@ export const chainflipApi = {
         // Chainflip waits for 3 confirmations to assume complete (vs. 1 for us), which is turbo long.
         return {
             buyTxHash,
+            sellTxHash,
             status: TxStatus.Confirmed,
             swapperTxId,
             swapperTxLink,

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

@@ -11,6 +11,9 @@ export type ChainFlipStatus = {
     status: {
         state: 'waiting' | 'receiving' | 'swapping' | 'sending' | 'sent' | 'completed' | 'failed';
         swapId?: string;
+        deposit?: {
+            transactionReference?: string | null;
+        };
         swap?: ChainflipBaasStatusSwap;
         swapEgress?: ChainflipBaasStatusEgress;
     };

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

@@ -1,5 +1,6 @@
 import { executeEvmTransaction, executeNearTransaction, executeSolanaTransaction, executeStarknetTransaction, executeSuiTransaction, executeTonTransaction, executeTronTransaction, } from '../../utils/index.js';
 export const nearIntentsSwapper = {
+    supportsExternalPayment: true,
     executeEvmTransaction,
     executeSolanaTransaction,
     executeStarknetTransaction,

package/dist/esm/swappers/NearIntentsSwapper/checkTradeStatus.test.d.ts

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

package/dist/esm/swappers/NearIntentsSwapper/checkTradeStatus.test.js

@@ -0,0 +1,50 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { nearIntentsApi } from './endpoints.js';
+import { OneClickService } from './utils/oneClickService.js';
+vi.mock('./utils/oneClickService', () => ({
+    initializeOneClickService: vi.fn(),
+    OneClickService: { getExecutionStatus: vi.fn() },
+}));
+const makeInput = () => ({
+    config: { VITE_NEAR_INTENTS_API_KEY: 'key' },
+    swap: {
+        metadata: { swapperMetadata: { name: 'nearIntents', depositAddress: '0xdepositaddress' } },
+    },
+});
+const mockExecutionStatus = (response) => vi.mocked(OneClickService.getExecutionStatus).mockResolvedValue(response);
+describe('near intents checkTradeStatus', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('reports the origin chain deposit tx hash', async () => {
+        mockExecutionStatus({
+            status: 'PROCESSING',
+            swapDetails: {
+                originChainTxHashes: [{ hash: '0xdeposit', explorerUrl: '' }],
+                destinationChainTxHashes: [],
+            },
+        });
+        const result = await nearIntentsApi.checkTradeStatus(makeInput());
+        expect(result.sellTxHash).toBe('0xdeposit');
+        expect(result.buyTxHash).toBeUndefined();
+    });
+    it('reports both sides once the swap settles', async () => {
+        mockExecutionStatus({
+            status: 'SUCCESS',
+            swapDetails: {
+                originChainTxHashes: [{ hash: '0xdeposit', explorerUrl: '' }],
+                destinationChainTxHashes: [{ hash: '0xsettlement', explorerUrl: '' }],
+            },
+        });
+        const result = await nearIntentsApi.checkTradeStatus(makeInput());
+        expect(result.sellTxHash).toBe('0xdeposit');
+        expect(result.buyTxHash).toBe('0xsettlement');
+    });
+    it('has no deposit tx hash before the deposit lands', async () => {
+        mockExecutionStatus({
+            status: 'PENDING_DEPOSIT',
+            swapDetails: { originChainTxHashes: [], destinationChainTxHashes: [] },
+        });
+        expect((await nearIntentsApi.checkTradeStatus(makeInput())).sellTxHash).toBeUndefined();
+    });
+});

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

@@ -1,4 +1,4 @@
 export declare const ONE_CLICK_BASE_URL = "https://1click.chaindefuser.com";
 export declare const DEFAULT_SLIPPAGE_BPS = 50;
 export declare const DEFAULT_QUOTE_DEADLINE_MS: number;
-export declare const BTC_QUOTE_DEADLINE_MS: number;
+export declare const UTXO_QUOTE_DEADLINE_MS: number;

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

@@ -1,4 +1,5 @@
 export const ONE_CLICK_BASE_URL = 'https://1click.chaindefuser.com';
 export const DEFAULT_SLIPPAGE_BPS = 50;
-export const DEFAULT_QUOTE_DEADLINE_MS = 30 * 60 * 1000;
-export const BTC_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
+// 1Click refunds a deposit it cannot settle by the requested deadline, and prices a quote the same at any length
+export const DEFAULT_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
+export const UTXO_QUOTE_DEADLINE_MS = 4 * 60 * 60 * 1000;

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

@@ -163,14 +163,15 @@ export const nearIntentsApi = {
             const statusResponse = await OneClickService.getExecutionStatus(depositAddress);
             const txStatus = mapNearIntentsStatus(statusResponse.status);
             const message = getNearIntentsStatusMessage(statusResponse.status);
-            // Extract buyTxHash from destination chain transactions
             const buyTxHash = statusResponse.swapDetails?.destinationChainTxHashes?.[0]?.hash;
+            const sellTxHash = statusResponse.swapDetails?.originChainTxHashes?.[0]?.hash;
             // amountOut is only meaningful destination-denominated on terminal success - in-flight and
             // refund states may carry settlement-internal or refund values
             const actualBuyAmountCryptoBaseUnit = statusResponse.status === 'SUCCESS' ? statusResponse.swapDetails?.amountOut : undefined;
             return {
                 status: txStatus,
                 buyTxHash,
+                sellTxHash,
                 swapperTxLink: `https://explorer.near-intents.org/transactions/${depositAddress}`,
                 message,
                 actualBuyAmountCryptoBaseUnit,

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

@@ -17,8 +17,8 @@ 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, amount, slippageTolerancePercentageDecimal, affiliateBps, refundTo, recipient, refundType, recipientType, deadline, }: {
     originAsset: 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,10 +120,10 @@ 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();
 };

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.js

@@ -1,4 +1,5 @@
 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';
@@ -10,7 +11,7 @@ export async function getPortalsStepData(args) {
     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({
@@ -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({