@shapeshiftoss/swapper 18.1.0 → 20.0.0

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTradeQuote = void 0;
+exports.getExactOutputTradeQuote = exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getRelayStepData_1 = require("../utils/getRelayStepData");
 const getRelayTradeContext_1 = require("../utils/getRelayTradeContext");
-const getTradeQuote = async (input, deps, relayChainMap) => {
+const getQuote = async (input, deps, relayChainMap) => {
     const { accountNumber } = input;
     const addresses = (0, utils_1.assertQuoteAddresses)(input);
     if (addresses.isErr())
@@ -45,9 +46,13 @@ const getTradeQuote = async (input, deps, relayChainMap) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps,
     };
     return (0, monads_1.Ok)([tradeQuote]);
 };
+const getTradeQuote = (input, deps, relayChainMap) => getQuote(input, deps, relayChainMap);
 exports.getTradeQuote = getTradeQuote;
+const getExactOutputTradeQuote = (input, deps, relayChainMap) => getQuote(input, deps, relayChainMap);
+exports.getExactOutputTradeQuote = getExactOutputTradeQuote;

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

@@ -1,5 +1,6 @@
 import type { Result } from '@sniptt/monads';
 import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
 import type { chainIdToRelayChainId as relayChainMapImplementation } from '../constant';
-import type { RelayTradeRateInput } from '../utils/types';
+import type { RelayExactOutputTradeRateInput, RelayTradeRateInput } from '../utils/types';
 export declare const getTradeRate: (input: RelayTradeRateInput, deps: SwapperDeps, relayChainMap: typeof relayChainMapImplementation) => Promise<Result<TradeRate[], SwapErrorRight>>;
+export declare const getExactOutputTradeRate: (input: RelayExactOutputTradeRateInput, deps: SwapperDeps, relayChainMap: typeof relayChainMapImplementation) => Promise<Result<TradeRate[], SwapErrorRight>>;

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTradeRate = void 0;
+exports.getExactOutputTradeRate = exports.getTradeRate = void 0;
 const monads_1 = require("@sniptt/monads");
 const getRelayStepData_1 = require("../utils/getRelayStepData");
 const getRelayTradeContext_1 = require("../utils/getRelayTradeContext");
-const getTradeRate = async (input, deps, relayChainMap) => {
+const getRate = async (input, deps, relayChainMap) => {
     const maybeContext = await (0, getRelayTradeContext_1.getRelayTradeContext)({ input, deps, relayChainMap });
     if (maybeContext.isErr())
         return (0, monads_1.Err)(maybeContext.unwrapErr());
@@ -39,4 +39,7 @@ const getTradeRate = async (input, deps, relayChainMap) => {
     };
     return (0, monads_1.Ok)([tradeRate]);
 };
+const getTradeRate = (input, deps, relayChainMap) => getRate(input, deps, relayChainMap);
 exports.getTradeRate = getTradeRate;
+const getExactOutputTradeRate = (input, deps, relayChainMap) => getRate(input, deps, relayChainMap);
+exports.getExactOutputTradeRate = getExactOutputTradeRate;

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

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchRelayTrade = void 0;
 const relayService_1 = require("./relayService");
 const fetchRelayTrade = async (params, config) => {
-    return await relayService_1.relayService.post(`${config.VITE_RELAY_API_URL}/quote/v2`, params);
+    return await relayService_1.relayService.post(`${config.VITE_RELAY_API_URL}/quote/v2`, params, (0, relayService_1.getRelayRequestConfig)(config));
 };
 exports.fetchRelayTrade = fetchRelayTrade;

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

@@ -10,10 +10,12 @@ const getLatestRelayStatusMessage = (status) => {
         case statusValue === 'delayed':
             return constant_1.RelayStatusMessage.Retrying;
         case statusValue === 'pending':
+        case statusValue === 'depositing':
+        case statusValue === 'submitted':
             return constant_1.RelayStatusMessage.DepositDetected;
         case statusValue === 'success':
             return constant_1.RelayStatusMessage.SwapComplete;
-        case statusValue === 'failed':
+        case statusValue === 'failure':
             return constant_1.RelayStatusMessage.SwapFailed;
         default:
             return 'Unknown status';

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

@@ -2,7 +2,7 @@ import type { Result } from '@sniptt/monads';
 import type { QuoteFeeData, SwapErrorRight, SwapperDeps, TradeCommon, TradeStepCommon } from '../../../types';
 import type { chainIdToRelayChainId as relayChainMapImplementation } from '../constant';
 import type { GetRelayStepDataArgs } from './getRelayStepData';
-import type { RelayQuoteItem, RelayTradeQuoteInput, RelayTradeRateInput } from './types';
+import type { RelayExactOutputTradeQuoteInput, RelayExactOutputTradeRateInput, RelayQuoteItem, RelayTradeQuoteInput, RelayTradeRateInput } from './types';
 type RelayTradeContext = {
     tradeCommon: TradeCommon;
     stepCommon: Omit<TradeStepCommon, 'feeData' | 'allowanceContract'>;
@@ -15,7 +15,7 @@ type RelayTradeContext = {
     relayId: string;
 };
 export declare const getRelayTradeContext: ({ input, deps, relayChainMap, }: {
-    input: RelayTradeQuoteInput | RelayTradeRateInput;
+    input: RelayTradeQuoteInput | RelayTradeRateInput | RelayExactOutputTradeQuoteInput | RelayExactOutputTradeRateInput;
     deps: SwapperDeps;
     relayChainMap: typeof relayChainMapImplementation;
 }) => Promise<Result<RelayTradeContext, SwapErrorRight>>;

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

@@ -22,7 +22,9 @@ const fetchRelayTrade_1 = require("./fetchRelayTrade");
 const helpers_2 = require("./helpers");
 const types_2 = require("./types");
 const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
-    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, affiliateBps } = input;
+    const { sellAsset, buyAsset, affiliateBps } = input;
+    const amount = (0, helpers_1.getTradeAmount)(input);
+    const isExactOutput = amount.direction === 'exactOut';
     const xpub = 'xpub' in input ? input.xpub : undefined;
     const slippageToleranceBps = input.slippageTolerancePercentageDecimal
         ? (0, utils_1.convertDecimalPercentageToBasisPoints)(input.slippageTolerancePercentageDecimal).toFixed()
@@ -41,8 +43,8 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
         originCurrency: (0, getRelayAssetAddress_1.getRelayAssetAddress)(sellAsset),
         destinationChainId: buyRelayChainId,
         destinationCurrency: (0, getRelayAssetAddress_1.getRelayAssetAddress)(buyAsset),
-        tradeType: 'EXACT_INPUT',
-        amount: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        tradeType: isExactOutput ? 'EXACT_OUTPUT' : 'EXACT_INPUT',
+        amount: amount.cryptoBaseUnit,
         recipient,
         user: sendAddress,
         refundTo,
@@ -84,10 +86,19 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
             code: types_1.TradeQuoteError.UnknownError,
         }));
     }
-    const { slippageTolerance, currencyOut, timeEstimate } = quote.details;
-    const buyAmountAfterFeesCryptoBaseUnit = currencyOut.amount;
+    const { slippageTolerance, currencyIn, currencyOut, timeEstimate } = quote.details;
+    const sellAmountCryptoBaseUnit = currencyIn.amount;
+    const buyAmountAfterFeesCryptoBaseUnit = isExactOutput
+        ? currencyOut.minimumAmount
+        : currencyOut.amount;
+    if (isExactOutput && !(0, utils_1.bnOrZero)(buyAmountAfterFeesCryptoBaseUnit).eq(amount.cryptoBaseUnit)) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: `Relay guarantees ${buyAmountAfterFeesCryptoBaseUnit} against a requested exact output of ${amount.cryptoBaseUnit}`,
+            code: types_1.TradeQuoteError.InvalidResponse,
+        }));
+    }
     const rate = (0, utils_2.getInputOutputRate)({
-        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        sellAmountCryptoBaseUnit,
         buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
         sellAsset,
         buyAsset,
@@ -248,7 +259,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
     })();
     // Add back relayer service and gas fees (relayer is including both) since they are downsides,
     // and add appFees — these are quote-level and identical across every step
-    const buyAmountBeforeFeesCryptoBaseUnit = (0, utils_1.bnOrZero)(currencyOut.amount)
+    const buyAmountBeforeFeesCryptoBaseUnit = (0, utils_1.bnOrZero)(buyAmountAfterFeesCryptoBaseUnit)
         .plus(relayerFeesBuyAssetCryptoBaseUnit)
         .plus(appFeesBaseUnit)
         .toFixed();
@@ -262,6 +273,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
             id: relayId,
             rate,
             swapperName: types_1.SwapperName.Relay,
+            isExactOutput,
             affiliateBps,
             slippageTolerancePercentageDecimal,
         },
@@ -269,7 +281,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
             rate,
             buyAmountBeforeFeesCryptoBaseUnit,
             buyAmountAfterFeesCryptoBaseUnit,
-            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
             buyAsset,
             sellAsset,
             source: types_1.SwapperName.Relay,
@@ -279,7 +291,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
                 affiliateBps,
                 sellAsset,
                 buyAsset,
-                sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 buyAmountCryptoBaseUnit: buyAmountAfterFeesCryptoBaseUnit,
                 fixedAssetId: (0, utils_1.chainIdToFeeAssetId)(caip_1.baseChainId),
                 fixedAsset: deps.assetsById[(0, utils_1.chainIdToFeeAssetId)(caip_1.baseChainId)],
@@ -297,7 +309,7 @@ const getRelayTradeContext = async ({ input, deps, relayChainMap, }) => {
         relayStepInputs,
         stepDataArgs: {
             sellAsset,
-            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAmountCryptoBaseUnit,
             orderId,
             from: sendAddress,
             xpub,

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

@@ -4,7 +4,7 @@ import type { Result } from '@sniptt/monads';
 import type { TransactionInstruction } from '@solana/web3.js';
 import type { SwapErrorRight } from '../../../types';
 import type { chainIdToRelayChainId as relayChainMapImplementation } from '../constant';
-import type { RelayQuoteItem, RelaySolanaInstruction, RelayTradeQuoteInput, RelayTradeRateInput } from './types';
+import type { RelayExactOutputTradeQuoteInput, RelayExactOutputTradeRateInput, RelayQuoteItem, RelaySolanaInstruction, RelayTradeQuoteInput, RelayTradeRateInput } from './types';
 export declare const assertValidTrade: ({ sellAsset, buyAsset, relayChainMap, }: {
     sellAsset: Asset;
     buyAsset: Asset;
@@ -14,7 +14,7 @@ export declare const assertValidTrade: ({ sellAsset, buyAsset, relayChainMap, }:
     buyRelayChainId: number;
 }, SwapErrorRight>;
 export declare const resolveRelayAddresses: ({ input, sellChainId, buyChainId, }: {
-    input: RelayTradeQuoteInput | RelayTradeRateInput;
+    input: RelayTradeQuoteInput | RelayTradeRateInput | RelayExactOutputTradeQuoteInput | RelayExactOutputTradeRateInput;
     sellChainId: ChainId;
     buyChainId: ChainId;
 }) => {

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

@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyTransactionIndexing = void 0;
 const relayService_1 = require("./relayService");
 const notifyTransactionIndexing = async (params, config) => {
-    return await relayService_1.relayService.post(`${config.VITE_RELAY_API_URL}/transactions/single`, params);
+    return await relayService_1.relayService.post(`${config.VITE_RELAY_API_URL}/transactions/single`, params, (0, relayService_1.getRelayRequestConfig)(config));
 };
 exports.notifyTransactionIndexing = notifyTransactionIndexing;

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

@@ -1,5 +1,8 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { SwapperConfig } from '../../../types';
 export declare const relayService: {
-    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../..").SwapErrorRight>>;
-    post: <T_1 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../../..").SwapErrorRight>>;
-    delete: <T_2 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../../..").SwapErrorRight>>;
+    get: <T = any>(url: string, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../../types").SwapErrorRight>>;
+    post: <T_1 = any>(url: string, data: any, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../../../types").SwapErrorRight>>;
+    delete: <T_2 = any>(url: string, data: any, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../../../types").SwapErrorRight>>;
 };
+export declare const getRelayRequestConfig: (config: SwapperConfig) => AxiosRequestConfig | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.relayService = void 0;
+exports.getRelayRequestConfig = exports.relayService = void 0;
 const utils_1 = require("../../../utils");
 const maxAgeMillis = 15 * 1000;
 const cachedUrls = [];
@@ -13,3 +13,5 @@ const axiosConfig = {
 };
 const relayServiceBase = (0, utils_1.createCache)(maxAgeMillis, cachedUrls, axiosConfig);
 exports.relayService = (0, utils_1.makeSwapperAxiosServiceMonadic)(relayServiceBase);
+const getRelayRequestConfig = (config) => config.VITE_RELAY_API_KEY ? { headers: { 'x-api-key': config.VITE_RELAY_API_KEY } } : undefined;
+exports.getRelayRequestConfig = getRelayRequestConfig;

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

@@ -232,6 +232,11 @@ const relayTokenToAssetId = (relayToken) => {
                     assetReference: caip_1.ASSET_REFERENCE.Abstract,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
+            case caip_1.CHAIN_REFERENCE.RobinhoodMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Robinhood,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
             default:
                 throw Error(`chainId '${relayToken.chainId}' not supported`);
         }

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

@@ -1,6 +1,8 @@
-import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput } from '../../../types';
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput, WithExactBuyAmount } from '../../../types';
 export type RelayTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
 export type RelayTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
+export type RelayExactOutputTradeQuoteInput = WithExactBuyAmount<RelayTradeQuoteInput>;
+export type RelayExactOutputTradeRateInput = WithExactBuyAmount<RelayTradeRateInput>;
 export type RelayTransactionMetadata = {
     to?: string;
     data?: string;
@@ -11,11 +13,11 @@ export type RelayMetadata = {
     data?: string;
 };
 export type RelayStatus = {
-    status: 'success' | 'failed' | 'pending' | 'refund' | 'delayed' | 'waiting';
+    status: 'success' | 'failure' | 'pending' | 'submitted' | 'depositing' | 'refund' | 'delayed' | 'waiting';
     details?: string;
     inTxHashes: string[];
     txHashes: string[];
-    time: number;
+    updatedAt: number;
     originChainId: number;
     destinationChainId: number;
 };
@@ -64,6 +66,7 @@ export type RelayFees = {
     app: RelayCurrencyData;
 };
 export type QuoteDetails = {
+    currencyIn: RelayCurrencyData;
     currencyOut: RelayCurrencyData;
     rate: string;
     slippageTolerance: {

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

@@ -100,6 +100,20 @@ exports.stonfiApi = {
             }
         };
         const { quoteId } = (0, utils_1.getSwapMetadata)(swap.metadata.swapperMetadata, 'stonfi');
+        // Settlement precedes toncenter's jetton indexer, and confirmed rows are never re-parsed -
+        // hold confirmation until the receive leg is visible so the confirmed-time parse and upsert
+        // carries both legs of the swap
+        const hasVisibleReceiveLeg = async () => {
+            const adapter = assertGetTonChainAdapter(swap.sellAsset.chainId);
+            const sellAddress = swap.sellAccountId.split(':')[2] ?? '';
+            const addresses = new Set([sellAddress, swap.receiveAddress].filter((address) => Boolean(address)));
+            for (const address of addresses) {
+                const tx = await adapter.parseTx(sellTxHash, address);
+                if (tx.transfers.some(transfer => transfer.type === unchained_client_1.TransferType.Receive))
+                    return true;
+            }
+            return false;
+        };
         try {
             const tradeStatus = await (0, helpers_1.waitForFirstTradeStatus)({
                 quoteId,
@@ -113,14 +127,13 @@ exports.stonfiApi = {
                 return checkTxStatusViaChainAdapter();
             }
             const statusOneOf = tradeStatus.status;
+            // While the trade is in flight the wallet tx may already be confirmed, but the payout leg
+            // hasn't landed - confirming here would parse and upsert a trace without the receive, so
+            // completion waits for settlement
             if (statusOneOf.awaitingTransfer ||
                 statusOneOf.transferring ||
                 statusOneOf.swapping ||
                 statusOneOf.receivingFunds) {
-                const chainStatus = await checkTxStatusViaChainAdapter();
-                if (chainStatus.status === unchained_client_1.TxStatus.Confirmed) {
-                    return chainStatus;
-                }
                 if (statusOneOf.awaitingTransfer) {
                     return {
                         status: unchained_client_1.TxStatus.Pending,
@@ -152,19 +165,32 @@ exports.stonfiApi = {
             }
             if (statusOneOf.tradeSettled) {
                 const result = statusOneOf.tradeSettled.result;
-                if (result === 'TRADE_RESULT_FULLY_FILLED') {
-                    return {
-                        status: unchained_client_1.TxStatus.Confirmed,
-                        buyTxHash: sellTxHash,
-                        message: undefined,
-                    };
-                }
-                if (result === 'TRADE_RESULT_PARTIALLY_FILLED') {
-                    return {
+                if (result === 'TRADE_RESULT_FULLY_FILLED' || result === 'TRADE_RESULT_PARTIALLY_FILLED') {
+                    const settled = {
                         status: unchained_client_1.TxStatus.Confirmed,
                         buyTxHash: sellTxHash,
-                        message: 'trade.statuses.partiallyFilled',
+                        message: result === 'TRADE_RESULT_PARTIALLY_FILLED'
+                            ? 'trade.statuses.partiallyFilled'
+                            : undefined,
                     };
+                    try {
+                        if (await hasVisibleReceiveLeg())
+                            return settled;
+                        return {
+                            status: unchained_client_1.TxStatus.Pending,
+                            buyTxHash: undefined,
+                            message: 'trade.statuses.receivingFunds',
+                        };
+                    }
+                    catch (error) {
+                        // Indexer/API failure must not block completion
+                        console.error('[Stonfi] Error verifying settlement receive leg:', {
+                            sellTxHash,
+                            result,
+                            error,
+                        });
+                        return settled;
+                    }
                 }
                 if (result === 'TRADE_RESULT_ABORTED') {
                     return {

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getStonfiStepData_1 = require("../utils/getStonfiStepData");
 const getStonfiTradeContext_1 = require("../utils/getStonfiTradeContext");
 const getTradeQuote = async (input, deps) => {
@@ -27,6 +28,7 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: (0, helpers_1.normalizeEpochToMs)(stonfiTransactionData.tradeStartDeadline),
         receiveAddress,
         steps: [
             {

package/dist/cjs/swappers/SunioSwapper/getSunioTradeQuote/getSunioTradeQuote.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSunioTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getSunioStepData_1 = require("../utils/getSunioStepData");
 const getSunioTradeContext_1 = require("../utils/getSunioTradeContext");
 const getSunioTradeQuote = async (input, deps) => {
@@ -27,6 +28,7 @@ const getSunioTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/cjs/swappers/SunioSwapper/utils/getSunioStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight } from '../../../types';
 import type { SunioRoute, SunioTransactionData } from '../types';
 type BaseArgs = {
     route: SunioRoute;
+    sellAmountCryptoBaseUnit: string;
 };
 export type GetSunioStepDataArgs = StepDataArgs<BaseArgs>;
 type SunioRateStepData = {

package/dist/cjs/swappers/SunioSwapper/utils/getSunioStepData.js

@@ -6,12 +6,12 @@ const monads_1 = require("@sniptt/monads");
 const utils_2 = require("../../../utils");
 const estimateSunioNetworkFee_1 = require("./estimateSunioNetworkFee");
 async function getSunioStepData(args) {
-    const { type, route, sellAsset, from, input, deps } = args;
+    const { type, route, sellAsset, sellAmountCryptoBaseUnit, from, input, deps } = args;
     const estimateArgs = {
         rpcUrl: deps.config.VITE_TRON_NODE_URL,
         apiKey: deps.config.VITE_TRON_GRID_API_KEY,
         route,
-        sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+        sellAmountCryptoBaseUnit,
         isSellingNativeTrx: !(0, utils_1.contractAddressOrUndefined)(sellAsset.assetId),
         address: from,
         slippageTolerancePercentageDecimal: input.slippageTolerancePercentageDecimal,

package/dist/cjs/swappers/SunioSwapper/utils/getSunioTradeContext.js

@@ -83,7 +83,12 @@ const getSunioTradeContext = async ({ input, deps, }) => {
                 }),
             },
             protocolFees,
-            stepDataArgs: { deps, sellAsset, route: bestRoute },
+            stepDataArgs: {
+                deps,
+                sellAsset,
+                sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                route: bestRoute,
+            },
         });
     }
     catch (error) {

package/dist/cjs/swappers/ThorchainSwapper/getTradeQuote/getTradeQuote.test.js

@@ -64,6 +64,7 @@ const expectedQuoteResponse = [
         tradeType: thorchain_1.TradeType.L1ToL1,
         slippageTolerancePercentageDecimal: '0.04357',
         expiry: 1713710808,
+        deadline: 1713710808000,
         swapperName: types_1.SwapperName.Thorchain,
         steps: [
             {
@@ -114,6 +115,7 @@ const expectedQuoteResponse = [
         tradeType: thorchain_1.TradeType.L1ToL1,
         slippageTolerancePercentageDecimal: undefined,
         expiry: 1713710808,
+        deadline: 1713710808000,
         swapperName: types_1.SwapperName.Thorchain,
         steps: [
             {

package/dist/cjs/swappers/ThorchainSwapper/utils/getLongtailQuote.js

@@ -76,6 +76,8 @@ const getLongtailToL1Quote = async (input, deps, streamingInterval, swapperName)
         const { data, transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
         return (0, monads_1.Ok)({
             ...quote,
+            // The aggregator swapIn deadline is tighter than the daemon quote expiry
+            deadline: Math.min(quote.deadline, Number(deadline) * 1000),
             data: data ?? quote.data,
             // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
             steps: quote.steps.map(s => ({

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.js

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

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

@@ -3,7 +3,7 @@ import type { Address, TypedData } from 'viem';
 import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput } from '../../types';
 export type ZrxTradeQuoteInput = GetEvmTradeQuoteInput;
 export type ZrxTradeRateInput = GetEvmTradeRateInput;
-export declare const zrxSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet];
+export declare const zrxSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.RobinhoodMainnet];
 export type ZrxSupportedChainId = (typeof zrxSupportedChainIds)[number];
 type ZrxFee = {
     amount: string;

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

@@ -10,4 +10,5 @@ exports.zrxSupportedChainIds = [
     types_1.KnownChainIds.PolygonMainnet,
     types_1.KnownChainIds.ArbitrumMainnet,
     types_1.KnownChainIds.BaseMainnet,
+    types_1.KnownChainIds.RobinhoodMainnet,
 ];

package/dist/cjs/swappers/ZrxSwapper/utils/constants.js

@@ -21,6 +21,7 @@ exports.ZRX_SUPPORTED_CHAINIDS = Object.freeze([
     types_1.KnownChainIds.PolygonMainnet,
     types_1.KnownChainIds.ArbitrumMainnet,
     types_1.KnownChainIds.BaseMainnet,
+    types_1.KnownChainIds.RobinhoodMainnet,
 ]);
 // https://0x.org/docs/developer-resources/faqs-and-troubleshooting
 exports.ZRX_NATIVE_ASSET_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';

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

@@ -6,7 +6,7 @@ import type { SwapErrorRight } from '../../../types';
 import type { ZrxFees, ZrxPriceResponse } from '../types';
 export declare const assetIdToZrxToken: (assetId: AssetId) => string;
 export declare const zrxTokenToAssetId: (token: string, chainId: ChainId) => AssetId;
-export declare const isSupportedChainId: (chainId: ChainId) => chainId is KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet | KnownChainIds.BnbSmartChainMainnet | KnownChainIds.PolygonMainnet | KnownChainIds.ArbitrumMainnet | KnownChainIds.BaseMainnet;
+export declare const isSupportedChainId: (chainId: ChainId) => chainId is KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet | KnownChainIds.OptimismMainnet | KnownChainIds.BnbSmartChainMainnet | KnownChainIds.PolygonMainnet | KnownChainIds.ArbitrumMainnet | KnownChainIds.BaseMainnet | KnownChainIds.RobinhoodMainnet;
 export declare const isWrappedNativeSell: (route: ZrxPriceResponse['route']) => boolean;
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;

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

@@ -60,6 +60,11 @@ const zrxTokenToAssetId = (token, chainId) => {
                     assetReference: caip_1.ASSET_REFERENCE.Base,
                     assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
                 };
+            case types_1.KnownChainIds.RobinhoodMainnet:
+                return {
+                    assetReference: caip_1.ASSET_REFERENCE.Robinhood,
+                    assetNamespace: caip_1.ASSET_NAMESPACE.slip44,
+                };
             default:
                 throw Error(`chainId '${chainId}' not supported`);
         }

package/dist/cjs/types.d.ts

@@ -49,11 +49,13 @@ export type SwapperConfig = {
     VITE_CHAINFLIP_API_URL: string;
     VITE_FEATURE_CHAINFLIP_SWAP_DCA: boolean;
     VITE_RELAY_API_URL: string;
+    VITE_RELAY_API_KEY: string;
     VITE_BEBOP_API_KEY: string;
     VITE_NEAR_INTENTS_API_KEY: string;
     VITE_SUI_NODE_URL: string;
     VITE_ACROSS_API_URL: string;
     VITE_ACROSS_INTEGRATOR_ID: string;
+    VITE_ACROSS_API_KEY: string;
     VITE_DEBRIDGE_API_URL: string;
     VITE_BOB_GATEWAY_API_KEY: string;
 };
@@ -91,6 +93,7 @@ export declare enum TradeQuoteError {
     NoRouteFound = "NoRouteFound",
     UnsupportedChain = "UnsupportedChain",
     CrossChainNotSupported = "CrossChainNotSupported",
+    ExactOutputNotSupported = "ExactOutputNotSupported",
     NetworkFeeEstimationFailed = "NetworkFeeEstimationFailed",
     TradingHalted = "TradingHalted",
     SellAmountBelowMinimum = "SellAmountBelowMinimum",
@@ -210,17 +213,30 @@ export type GetUtxoTradeRateInput = CommonTradeRateInput & {
 export type GetUtxoTradeQuoteInput = GetUtxoTradeQuoteWithWallet;
 export type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput | GetTronTradeQuoteInput | GetNearTradeQuoteInput | GetTonTradeQuoteInput | GetSolanaTradeQuoteInput | GetStarknetTradeQuoteInput | GetSuiTradeQuoteInput;
 export type GetTradeRateInput = GetEvmTradeRateInput | GetCosmosSdkTradeRateInput | GetUtxoTradeRateInput | GetTronTradeRateInput | GetNearTradeRateInput | GetTonTradeRateInput | GetSolanaTradeRateInput | GetStarknetTradeRateInput | GetSuiTradeRateInput;
+export type WithExactBuyAmount<T extends {
+    sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
+}> = T extends unknown ? Omit<T, 'sellAmountIncludingProtocolFeesCryptoBaseUnit'> & {
+    buyAmountCryptoBaseUnit: string;
+} : never;
+export type GetExactOutputTradeQuoteInput = WithExactBuyAmount<GetTradeQuoteInput>;
+export type GetExactOutputTradeRateInput = WithExactBuyAmount<GetTradeRateInput>;
+export type TradeAmount = {
+    direction: 'exactIn' | 'exactOut';
+    cryptoBaseUnit: string;
+};
 type StepDataBaseArgs = {
     deps: SwapperDeps;
     sellAsset: Asset;
 };
+type StepDataRateInput = GetTradeRateInput | GetExactOutputTradeRateInput;
+type StepDataQuoteInput = GetTradeQuoteInput | GetExactOutputTradeQuoteInput;
 export type StepDataArgs<Base, Rate = unknown, Quote = unknown> = (StepDataBaseArgs & Base & {
     type: 'rate';
-    input: GetTradeRateInput;
+    input: StepDataRateInput;
     from?: string;
 } & Rate) | (StepDataBaseArgs & Base & {
     type: 'quote';
-    input: GetTradeQuoteInput;
+    input: StepDataQuoteInput;
     from: string;
 } & Quote);
 export type EvmSwapperDeps = {
@@ -353,6 +369,7 @@ export type TradeCommon = {
     slippageTolerancePercentageDecimal: string | undefined;
     isLongtail?: boolean;
     swapperName: SwapperName;
+    isExactOutput?: boolean;
 };
 type TradeQuoteBase = TradeCommon & {
     receiveAddress: string | undefined;
@@ -439,6 +456,7 @@ export type TradeQuote = TradeQuoteBase & {
 } & {
     quoteOrRate: 'quote';
     receiveAddress: string;
+    deadline: number;
 };
 export type MultiHopTradeQuote = TradeQuote & {
     steps: MultiHopTradeQuoteSteps;
@@ -581,6 +599,8 @@ export type SwapperApi = {
     checkTradeStatus: (input: CheckTradeStatusInput) => Promise<TradeStatus>;
     getTradeQuote: (input: GetTradeQuoteInput, deps: SwapperDeps) => Promise<TradeQuoteResult>;
     getTradeRate: (input: GetTradeRateInput, deps: SwapperDeps) => Promise<TradeRateResult>;
+    getExactOutputTradeQuote?: (input: GetExactOutputTradeQuoteInput, deps: SwapperDeps) => Promise<TradeQuoteResult>;
+    getExactOutputTradeRate?: (input: GetExactOutputTradeRateInput, deps: SwapperDeps) => Promise<TradeRateResult>;
     getUnsignedEvmTransaction?: (input: GetUnsignedEvmTransactionArgs) => Promise<SignTx<EvmChainId>>;
     getUnsignedEvmMessage?: (input: GetUnsignedEvmMessageArgs) => Promise<EvmMessageToSign>;
     getUnsignedUtxoTransaction?: (input: GetUnsignedUtxoTransactionArgs) => Promise<SignTx<UtxoChainId>>;

package/dist/cjs/types.js

@@ -33,6 +33,8 @@ var TradeQuoteError;
     TradeQuoteError["UnsupportedChain"] = "UnsupportedChain";
     // the swapper can't swap across chains
     TradeQuoteError["CrossChainNotSupported"] = "CrossChainNotSupported";
+    // the swapper can quote this pair, but can't derive a sell amount from an exact buy amount
+    TradeQuoteError["ExactOutputNotSupported"] = "ExactOutputNotSupported";
     // the swapper wasn't able to get a network fee estimate
     TradeQuoteError["NetworkFeeEstimationFailed"] = "NetworkFeeEstimationFailed";
     // trading has been halted upstream