@shapeshiftoss/swapper 19.0.0 → 20.1.0

package/dist/cjs/exactOutputFiltering.test.d.ts

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

package/dist/cjs/exactOutputFiltering.test.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const constants_1 = require("./constants");
+const swapper_1 = require("./swapper");
+const types_1 = require("./types");
+const assets_1 = require("./utils/test-data/assets");
+// Exact-output support is structural - a swapper cannot claim it without implementing it
+(0, vitest_1.describe)('exact output capability', () => {
+    (0, vitest_1.it)('is implemented by the swappers whose upstream API can honour an exact buy amount', () => {
+        for (const swapperName of [types_1.SwapperName.NearIntents, types_1.SwapperName.Relay]) {
+            (0, vitest_1.expect)(constants_1.swappers[swapperName]?.getExactOutputTradeRate).toBeDefined();
+            (0, vitest_1.expect)(constants_1.swappers[swapperName]?.getExactOutputTradeQuote).toBeDefined();
+        }
+    });
+    (0, vitest_1.it)('is absent everywhere else', () => {
+        const exactOutputCapable = Object.values(types_1.SwapperName).filter(swapperName => constants_1.swappers[swapperName]?.getExactOutputTradeRate !== undefined);
+        (0, vitest_1.expect)(exactOutputCapable).toEqual([types_1.SwapperName.Relay, types_1.SwapperName.NearIntents]);
+    });
+});
+const exactOutputInput = {
+    sellAsset: assets_1.ETH,
+    buyAsset: assets_1.BTC,
+    buyAmountCryptoBaseUnit: '100000',
+    affiliateBps: '0',
+    allowMultiHop: true,
+    receiveAddress: undefined,
+    accountNumber: undefined,
+    quoteOrRate: 'rate',
+};
+const deps = {};
+(0, vitest_1.describe)('getTradeRates on an exact buy amount', () => {
+    // Silently omitting these would read as the swapper being unavailable rather than unable
+    (0, vitest_1.it)('reports an error for a swapper that cannot quote one', async () => {
+        const result = await (0, swapper_1.getTradeRates)(exactOutputInput, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeDefined();
+        (0, vitest_1.expect)(result?.isErr()).toBe(true);
+        (0, vitest_1.expect)(result?.unwrapErr().code).toEqual(types_1.TradeQuoteError.ExactOutputNotSupported);
+        (0, vitest_1.expect)(result?.swapperName).toEqual(types_1.SwapperName.Thorchain);
+    });
+    (0, vitest_1.it)('skips entirely on a zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeRates)({ ...exactOutputInput, buyAmountCryptoBaseUnit: '0' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+    // The base-unit regex upstream admits padded zeros, so the check can't be a string comparison
+    (0, vitest_1.it)('skips entirely on a padded zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeRates)({ ...exactOutputInput, buyAmountCryptoBaseUnit: '00' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+});
+// Quotes dispatch on the same input shape as rates, so they gate the same way
+(0, vitest_1.describe)('getTradeQuotes on an exact buy amount', () => {
+    const exactOutputQuoteInput = {
+        ...exactOutputInput,
+        receiveAddress: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
+        accountNumber: 0,
+        quoteOrRate: 'quote',
+    };
+    (0, vitest_1.it)('reports an error for a swapper that cannot quote one', async () => {
+        const result = await (0, swapper_1.getTradeQuotes)(exactOutputQuoteInput, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeDefined();
+        (0, vitest_1.expect)(result?.isErr()).toBe(true);
+        (0, vitest_1.expect)(result?.unwrapErr().code).toEqual(types_1.TradeQuoteError.ExactOutputNotSupported);
+        (0, vitest_1.expect)(result?.swapperName).toEqual(types_1.SwapperName.Thorchain);
+    });
+    (0, vitest_1.it)('skips entirely on a zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeQuotes)({ ...exactOutputQuoteInput, buyAmountCryptoBaseUnit: '0' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+});

package/dist/cjs/swapper.d.ts

@@ -1,3 +1,3 @@
-import type { GetTradeQuoteInput, GetTradeRateInput, QuoteResult, RateResult, SwapperDeps, SwapperName } from './types';
-export declare const getTradeQuotes: (getTradeQuoteInput: GetTradeQuoteInput, swapperName: SwapperName, deps: SwapperDeps) => Promise<QuoteResult | undefined>;
-export declare const getTradeRates: (getTradeRateInput: GetTradeRateInput, swapperName: SwapperName, deps: SwapperDeps, quoteTimeoutMs?: number) => Promise<RateResult | undefined>;
+import type { GetExactOutputTradeQuoteInput, GetExactOutputTradeRateInput, GetTradeQuoteInput, GetTradeRateInput, QuoteResult, RateResult, SwapperDeps, SwapperName } from './types';
+export declare const getTradeQuotes: (getTradeQuoteInput: GetTradeQuoteInput | GetExactOutputTradeQuoteInput, swapperName: SwapperName, deps: SwapperDeps) => Promise<QuoteResult | undefined>;
+export declare const getTradeRates: (getTradeRateInput: GetTradeRateInput | GetExactOutputTradeRateInput, swapperName: SwapperName, deps: SwapperDeps, quoteTimeoutMs?: number) => Promise<RateResult | undefined>;

package/dist/cjs/swapper.js

@@ -2,19 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRates = exports.getTradeQuotes = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
+const monads_1 = require("@sniptt/monads");
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const utils_2 = require("./utils");
+const EXACT_OUTPUT_NOT_SUPPORTED_ERROR = (0, utils_2.makeSwapErrorRight)({
+    code: types_1.TradeQuoteError.ExactOutputNotSupported,
+    message: 'This swapper cannot derive a sell amount from an exact buy amount',
+});
 const getTradeQuotes = async (getTradeQuoteInput, swapperName, deps) => {
     if ((0, utils_1.bnOrZero)(getTradeQuoteInput.affiliateBps).lt(0))
         return;
-    if (getTradeQuoteInput.sellAmountIncludingProtocolFeesCryptoBaseUnit === '0')
-        return;
     const swapper = constants_1.swappers[swapperName];
     if (swapper === undefined)
         return;
+    // Compared numerically so a padded zero can't slip through as an amount
+    const drivingAmount = 'buyAmountCryptoBaseUnit' in getTradeQuoteInput
+        ? getTradeQuoteInput.buyAmountCryptoBaseUnit
+        : getTradeQuoteInput.sellAmountIncludingProtocolFeesCryptoBaseUnit;
+    if ((0, utils_1.bnOrZero)(drivingAmount).isZero())
+        return;
+    const quotePromise = 'buyAmountCryptoBaseUnit' in getTradeQuoteInput
+        ? swapper.getExactOutputTradeQuote?.(getTradeQuoteInput, deps)
+        : swapper.getTradeQuote(getTradeQuoteInput, deps);
+    if (!quotePromise)
+        return { ...(0, monads_1.Err)(EXACT_OUTPUT_NOT_SUPPORTED_ERROR), swapperName };
     try {
-        const quote = await (0, utils_1.timeoutMonadic)(swapper.getTradeQuote(getTradeQuoteInput, deps), constants_1.QUOTE_TIMEOUT_MS, constants_1.QUOTE_TIMEOUT_ERROR);
+        const quote = await (0, utils_1.timeoutMonadic)(quotePromise, constants_1.QUOTE_TIMEOUT_MS, constants_1.QUOTE_TIMEOUT_ERROR);
         return {
             ...quote,
             swapperName,
@@ -30,13 +44,22 @@ exports.getTradeQuotes = getTradeQuotes;
 const getTradeRates = async (getTradeRateInput, swapperName, deps, quoteTimeoutMs = constants_1.QUOTE_TIMEOUT_MS) => {
     if ((0, utils_1.bnOrZero)(getTradeRateInput.affiliateBps).lt(0))
         return;
-    if (getTradeRateInput.sellAmountIncludingProtocolFeesCryptoBaseUnit === '0')
-        return;
     const swapper = constants_1.swappers[swapperName];
     if (swapper === undefined)
         return;
+    // Compared numerically so a padded zero can't slip through as an amount
+    const drivingAmount = 'buyAmountCryptoBaseUnit' in getTradeRateInput
+        ? getTradeRateInput.buyAmountCryptoBaseUnit
+        : getTradeRateInput.sellAmountIncludingProtocolFeesCryptoBaseUnit;
+    if ((0, utils_1.bnOrZero)(drivingAmount).isZero())
+        return;
+    const ratePromise = 'buyAmountCryptoBaseUnit' in getTradeRateInput
+        ? swapper.getExactOutputTradeRate?.(getTradeRateInput, deps)
+        : swapper.getTradeRate(getTradeRateInput, deps);
+    if (!ratePromise)
+        return { ...(0, monads_1.Err)(EXACT_OUTPUT_NOT_SUPPORTED_ERROR), swapperName };
     try {
-        const { timed, original } = (0, utils_1.timeoutMonadicWithOriginal)(swapper.getTradeRate(getTradeRateInput, deps), quoteTimeoutMs, (0, utils_2.makeSwapErrorRight)({
+        const { timed, original } = (0, utils_1.timeoutMonadicWithOriginal)(ratePromise, quoteTimeoutMs, (0, utils_2.makeSwapErrorRight)({
             code: types_1.TradeQuoteError.Timeout,
             message: `quote timed out after ${quoteTimeoutMs / 1000}s`,
         }));

package/dist/cjs/swappers/AcrossSwapper/utils/getAcrossStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { AcrossSwapTx } from './types';
 type BaseArgs = {
     swapTx: AcrossSwapTx;
+    sellAmountCryptoBaseUnit: string;
     spenderAddress: string;
     fallbackNetworkFeeCryptoBaseUnit: string;
 };

package/dist/cjs/swappers/AcrossSwapper/utils/getAcrossStepData.js

@@ -10,7 +10,7 @@ const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 const solana_1 = require("../../../utils/solana");
 async function getAcrossStepData(args) {
-    const { swapTx, sellAsset, spenderAddress, from, type, input, fallbackNetworkFeeCryptoBaseUnit, deps, } = args;
+    const { swapTx, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, from, type, input, fallbackNetworkFeeCryptoBaseUnit, deps, } = args;
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     switch (swapTx.ecosystem) {
         case 'evm': {
@@ -25,7 +25,7 @@ async function getAcrossStepData(args) {
             };
             const stateOverride = {
                 sellAsset,
-                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 spenderAddress,
             };
             if (type === 'rate') {

package/dist/cjs/swappers/AcrossSwapper/utils/getAcrossTradeContext.js

@@ -173,6 +173,7 @@ const getAcrossTradeContext = async ({ input, deps, depositor, recipient, }) =>
         stepDataArgs: {
             swapTx: quote.swapTx,
             sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             from: depositor,
             spenderAddress: allowanceContract,
             fallbackNetworkFeeCryptoBaseUnit: quote.fees.originGas.amount,

package/dist/cjs/swappers/BebopSwapper/utils/getBebopStepData.d.ts

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

package/dist/cjs/swappers/BebopSwapper/utils/getBebopStepData.js

@@ -8,7 +8,7 @@ const viem_1 = require("viem");
 const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 async function getBebopStepData(args) {
-    const { tx, spenderAddress, sellAsset, type, input, from, deps } = args;
+    const { tx, spenderAddress, sellAsset, sellAmountCryptoBaseUnit, type, input, from, deps } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     if (type === 'rate') {
@@ -43,7 +43,7 @@ async function getBebopStepData(args) {
             supportsEIP1559,
             stateOverride: {
                 sellAsset,
-                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 spenderAddress,
             },
         });

package/dist/cjs/swappers/BebopSwapper/utils/getBebopTradeContext.js

@@ -78,6 +78,7 @@ const getBebopTradeContext = async ({ input, deps, from, receiver, }) => {
             tx: quote.tx,
             spenderAddress: allowanceContract,
             sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             from,
             deps,
         },

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

@@ -13,14 +13,18 @@ const getBobGatewayTradeQuote = async (input, deps) => {
     if (maybeAddresses.isErr())
         return (0, monads_1.Err)(maybeAddresses.unwrapErr());
     const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    const isEvmSell = (0, chain_adapters_1.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 = (0, chain_adapters_1.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 (0, getBobGatewayTradeContext_1.getBobGatewayTradeContext)({
         input,
         deps,
         sender,
         recipient: receiveAddress,
+        refundAddress,
     });
     if (maybeContext.isErr())
         return (0, monads_1.Err)(maybeContext.unwrapErr());

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

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

package/dist/cjs/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/cjs/swappers/BobGatewaySwapper/utils/getBobGatewayTradeContext.js

@@ -7,7 +7,7 @@ const uuid_1 = require("uuid");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const helpers_1 = require("./helpers");
-const getBobGatewayTradeContext = async ({ input, deps, sender, recipient, }) => {
+const getBobGatewayTradeContext = async ({ input, deps, sender, recipient, refundAddress, }) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps, slippageTolerancePercentageDecimal, } = input;
     const assertion = (0, helpers_1.assertValidTrade)({ sellAsset, buyAsset });
     if (assertion.isErr())
@@ -21,6 +21,7 @@ const getBobGatewayTradeContext = async ({ input, deps, sender, recipient, }) =>
         buyChainName,
         sender,
         recipient,
+        refundAddress,
         amount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
         affiliateBps,
         slippageTolerancePercentageDecimal,

package/dist/cjs/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/cjs/swappers/BobGatewaySwapper/utils/helpers.js

@@ -49,7 +49,7 @@ const getBobGatewayAffiliates = (affiliateBps) => {
     return [{ address: (0, viem_1.getAddress)(affiliateAddress), bps: bps.toNumber() }];
 };
 exports.getBobGatewayAffiliates = getBobGatewayAffiliates;
-const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, amount, affiliateBps, slippageTolerancePercentageDecimal, }) => {
+const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName, buyChainName, sender, recipient, refundAddress, amount, affiliateBps, slippageTolerancePercentageDecimal, }) => {
     const slippage = (0, constants_2.decimalSlippageToBobBps)(slippageTolerancePercentageDecimal ??
         (0, constants_1.getDefaultSlippageDecimalPercentageForSwapper)(types_1.SwapperName.BobGateway));
     try {
@@ -63,6 +63,7 @@ const getBobGatewayQuote = async ({ config, sellAsset, buyAsset, sellChainName,
             amount,
             maxSlippage: Number(slippage),
             ownerAddress: sellChainName === 'bitcoin' ? recipient : sender,
+            refundAddress,
             affiliates: (0, exports.getBobGatewayAffiliates)(affiliateBps),
         });
         return (0, monads_1.Ok)(quote);

package/dist/cjs/swappers/ChainflipSwapper/ChainflipSwapper.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.chainflipSwapper = void 0;
 const utils_1 = require("../../utils");
 exports.chainflipSwapper = {
+    supportsExternalPayment: true,
     executeEvmTransaction: utils_1.executeEvmTransaction,
     executeSolanaTransaction: utils_1.executeSolanaTransaction,
     executeTronTransaction: utils_1.executeTronTransaction,

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

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

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const monads_1 = require("@sniptt/monads");
+const vitest_1 = require("vitest");
+const endpoints_1 = require("./endpoints");
+const chainflipService_1 = require("./utils/chainflipService");
+vitest_1.vi.mock('./utils/chainflipService', () => ({
+    chainflipService: { get: vitest_1.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) => vitest_1.vi.mocked(chainflipService_1.chainflipService.get).mockResolvedValue((0, monads_1.Ok)({ data: { status } }));
+(0, vitest_1.describe)('chainflip checkTradeStatus', () => {
+    (0, vitest_1.beforeEach)(() => {
+        vitest_1.vi.clearAllMocks();
+    });
+    (0, vitest_1.it)('reports the deposit tx hash while the swap is still pending', async () => {
+        mockStatus({
+            state: 'swapping',
+            swapId: '1234',
+            deposit: { transactionReference: '0xdeposit' },
+        });
+        const result = await endpoints_1.chainflipApi.checkTradeStatus(makeInput());
+        (0, vitest_1.expect)(result.sellTxHash).toBe('0xdeposit');
+        (0, vitest_1.expect)(result.buyTxHash).toBeUndefined();
+    });
+    (0, vitest_1.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 endpoints_1.chainflipApi.checkTradeStatus(makeInput());
+        (0, vitest_1.expect)(result.sellTxHash).toBe('0xdeposit');
+        (0, vitest_1.expect)(result.buyTxHash).toBe('0xegress');
+    });
+    (0, vitest_1.it)('has no deposit tx hash before the deposit is witnessed', async () => {
+        mockStatus({ state: 'waiting', swapId: '1234' });
+        (0, vitest_1.expect)((await endpoints_1.chainflipApi.checkTradeStatus(makeInput())).sellTxHash).toBeUndefined();
+    });
+    (0, vitest_1.it)('treats a null transaction reference as no deposit yet', async () => {
+        mockStatus({ state: 'receiving', swapId: '1234', deposit: { transactionReference: null } });
+        (0, vitest_1.expect)((await endpoints_1.chainflipApi.checkTradeStatus(makeInput())).sellTxHash).toBeUndefined();
+    });
+});

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

@@ -55,13 +55,15 @@ exports.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: unchained_client_1.TxStatus.Pending,
                 swapperTxId,
                 swapperTxLink,
@@ -72,6 +74,7 @@ exports.chainflipApi = {
         // Chainflip waits for 3 confirmations to assume complete (vs. 1 for us), which is turbo long.
         return {
             buyTxHash,
+            sellTxHash,
             status: unchained_client_1.TxStatus.Confirmed,
             swapperTxId,
             swapperTxLink,

package/dist/cjs/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/cjs/swappers/DebridgeSwapper/utils/getDebridgeStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { DebridgeTx } from './types';
 type BaseArgs = {
     tx: DebridgeTx;
+    sellAmountCryptoBaseUnit: string;
     gasLimit: string | undefined;
     spenderAddress: string;
     fallbackNetworkFeeCryptoBaseUnit: string | undefined;

package/dist/cjs/swappers/DebridgeSwapper/utils/getDebridgeStepData.js

@@ -6,7 +6,7 @@ const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 async function getDebridgeStepData(args) {
-    const { tx, gasLimit, spenderAddress, fallbackNetworkFeeCryptoBaseUnit, sellAsset, from, type, input, deps, } = args;
+    const { tx, sellAmountCryptoBaseUnit, gasLimit, spenderAddress, fallbackNetworkFeeCryptoBaseUnit, sellAsset, from, type, input, deps, } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     const transactionData = {
@@ -19,7 +19,7 @@ async function getDebridgeStepData(args) {
     };
     const stateOverride = {
         sellAsset,
-        sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        sellAmountCryptoBaseUnit,
         spenderAddress,
     };
     if (type === 'rate') {

package/dist/cjs/swappers/DebridgeSwapper/utils/getDebridgeTradeContext.js

@@ -84,6 +84,7 @@ const getDebridgeTradeContext = async ({ input, deps, senderAddress, recipientAd
         protocolFees: quote.protocolFees,
         stepDataArgs: {
             tx: quote.tx,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             gasLimit: quote.gasLimit,
             fallbackNetworkFeeCryptoBaseUnit: quote.fallbackNetworkFeeCryptoBaseUnit,
             sellAsset,

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nearIntentsSwapper = void 0;
 const utils_1 = require("../../utils");
 exports.nearIntentsSwapper = {
+    supportsExternalPayment: true,
     executeEvmTransaction: utils_1.executeEvmTransaction,
     executeSolanaTransaction: utils_1.executeSolanaTransaction,
     executeStarknetTransaction: utils_1.executeStarknetTransaction,

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

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

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

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

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BTC_QUOTE_DEADLINE_MS = exports.DEFAULT_QUOTE_DEADLINE_MS = exports.DEFAULT_SLIPPAGE_BPS = exports.ONE_CLICK_BASE_URL = void 0;
+exports.UTXO_QUOTE_DEADLINE_MS = exports.DEFAULT_QUOTE_DEADLINE_MS = exports.DEFAULT_SLIPPAGE_BPS = exports.ONE_CLICK_BASE_URL = void 0;
 exports.ONE_CLICK_BASE_URL = 'https://1click.chaindefuser.com';
 exports.DEFAULT_SLIPPAGE_BPS = 50;
-exports.DEFAULT_QUOTE_DEADLINE_MS = 30 * 60 * 1000;
-exports.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
+exports.DEFAULT_QUOTE_DEADLINE_MS = 60 * 60 * 1000;
+exports.UTXO_QUOTE_DEADLINE_MS = 4 * 60 * 60 * 1000;

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

@@ -14,6 +14,8 @@ const oneClickService_1 = require("./utils/oneClickService");
 exports.nearIntentsApi = {
     getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
     getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
+    getExactOutputTradeQuote: (input, deps) => (0, getTradeQuote_1.getExactOutputTradeQuote)(input, deps),
+    getExactOutputTradeRate: (input, deps) => (0, getTradeRate_1.getExactOutputTradeRate)(input, deps),
     getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
     getEvmTransactionFees: evm_1.getEvmTransactionFees,
     getUnsignedUtxoTransaction: utxo_1.getUnsignedUtxoTransaction,
@@ -164,14 +166,15 @@ exports.nearIntentsApi = {
             const statusResponse = await oneClickService_1.OneClickService.getExecutionStatus(depositAddress);
             const txStatus = (0, helpers_1.mapNearIntentsStatus)(statusResponse.status);
             const message = (0, helpers_1.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/cjs/swappers/NearIntentsSwapper/swapperApi/getTradeQuote.d.ts

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