@shapeshiftoss/swapper 17.8.0 → 19.0.0

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,35 +1,21 @@
-import type { Asset } from '@shapeshiftoss/types';
-export type RelayTradeBaseParams = {
-    buyAsset: Asset;
-    sellAsset: Asset;
-    sellAmountIncludingProtocolFeesCryptoBaseUnit: string;
-    affiliateBps: string;
-};
-export type RelayTradeInputParams<T extends 'rate' | 'quote'> = RelayTradeBaseParams & {
-    quoteOrRate: T;
-    receiveAddress: T extends 'rate' ? string | undefined : string;
-    sendAddress: T extends 'rate' ? undefined : string;
-    accountNumber: T extends 'rate' ? undefined : number;
-    slippageTolerancePercentageDecimal?: string;
-    xpub: string | undefined;
-};
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput, GetUtxoTradeQuoteInput, GetUtxoTradeRateInput } from '../../../types';
+export type RelayTradeQuoteInput = GetEvmTradeQuoteInput | GetUtxoTradeQuoteInput | GetSolanaTradeQuoteInput | GetTronTradeQuoteInput;
+export type RelayTradeRateInput = GetEvmTradeRateInput | GetUtxoTradeRateInput | GetSolanaTradeRateInput | GetTronTradeRateInput;
 export type RelayTransactionMetadata = {
     to?: string;
-    from?: string;
-    value?: string;
     data?: string;
-    gasLimit?: string;
-    psbt?: string;
-    opReturnData?: string;
+};
+export type RelayMetadata = {
+    name: 'relay';
     relayId: string;
-    orderId: string | undefined;
+    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;
 };

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

@@ -7,61 +7,21 @@ const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
 const utils_1 = require("../../utils");
 const getTradeQuote_1 = require("./swapperApi/getTradeQuote");
 const getTradeRate_1 = require("./swapperApi/getTradeRate");
+const constants_1 = require("./utils/constants");
+const helpers_1 = require("./utils/helpers");
 const omnistonManager_1 = require("./utils/omnistonManager");
-const TRADE_TRACKING_TIMEOUT_MS = 60000;
-const waitForFirstTradeStatus = (request, timeoutMs) => {
-    const omniston = omnistonManager_1.omnistonManager.getInstance();
-    return new Promise(resolve => {
-        const timer = setTimeout(() => {
-            subscription.unsubscribe();
-            resolve(null);
-        }, timeoutMs);
-        const subscription = omniston.trackTrade(request).subscribe({
-            next: (status) => {
-                clearTimeout(timer);
-                subscription.unsubscribe();
-                resolve(status);
-            },
-            error: err => {
-                console.error('[Stonfi] trackTrade error:', err);
-                clearTimeout(timer);
-                resolve(null);
-            },
-        });
-    });
-};
 exports.stonfiApi = {
-    getTradeQuote: (input, _deps) => (0, getTradeQuote_1.getTradeQuote)(input),
-    getTradeRate: input => (0, getTradeRate_1.getTradeRate)(input),
+    getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     getUnsignedTonTransaction: async ({ stepIndex, tradeQuote, from, assertGetTonChainAdapter }) => {
         if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote)) {
             throw new Error('Unable to execute a trade rate quote');
         }
         const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, stonfiSpecific } = step;
-        if (!stonfiSpecific) {
-            throw new Error('stonfiSpecific is required');
-        }
+        const { accountNumber, sellAsset, stonfiTransactionData } = step;
+        if (!stonfiTransactionData)
+            throw new Error('[Stonfi] invalid ton transaction');
         const adapter = assertGetTonChainAdapter(sellAsset.chainId);
-        const storedQuote = {
-            quoteId: stonfiSpecific.quoteId,
-            resolverId: stonfiSpecific.resolverId,
-            resolverName: stonfiSpecific.resolverName,
-            bidAssetAddress: stonfiSpecific.bidAssetAddress,
-            askAssetAddress: stonfiSpecific.askAssetAddress,
-            bidUnits: stonfiSpecific.bidUnits,
-            askUnits: stonfiSpecific.askUnits,
-            referrerAddress: stonfiSpecific.referrerAddress,
-            referrerFeeAsset: stonfiSpecific.referrerFeeAsset,
-            referrerFeeUnits: stonfiSpecific.referrerFeeUnits,
-            protocolFeeAsset: stonfiSpecific.protocolFeeAsset,
-            protocolFeeUnits: stonfiSpecific.protocolFeeUnits,
-            quoteTimestamp: stonfiSpecific.quoteTimestamp,
-            tradeStartDeadline: stonfiSpecific.tradeStartDeadline,
-            gasBudget: stonfiSpecific.gasBudget,
-            estimatedGasConsumption: stonfiSpecific.estimatedGasConsumption,
-            params: stonfiSpecific.params,
-        };
         const omniston = omnistonManager_1.omnistonManager.getInstance();
         const maxRetries = 3;
         let lastError = null;
@@ -73,7 +33,7 @@ exports.stonfiApi = {
                         blockchain: omniston_sdk_1.Blockchain.TON,
                         address: tradeQuote.receiveAddress,
                     },
-                    quote: storedQuote,
+                    quote: stonfiTransactionData,
                     useRecommendedSlippage: true,
                 });
                 if (!txResponse?.ton?.messages || txResponse.ton.messages.length === 0) {
@@ -139,31 +99,41 @@ exports.stonfiApi = {
                 return (0, utils_1.createDefaultStatusResponse)(sellTxHash);
             }
         };
-        const { metadata } = swap;
-        if (!metadata?.quoteId) {
-            return checkTxStatusViaChainAdapter();
-        }
+        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 waitForFirstTradeStatus({
-                quoteId: metadata.quoteId,
+            const tradeStatus = await (0, helpers_1.waitForFirstTradeStatus)({
+                quoteId,
                 traderWalletAddress: {
                     blockchain: omniston_sdk_1.Blockchain.TON,
                     address: swap.sellAccountId.split(':')[2] ?? '',
                 },
                 outgoingTxHash: sellTxHash,
-            }, TRADE_TRACKING_TIMEOUT_MS);
+            }, constants_1.STONFI_TRADE_TRACKING_TIMEOUT_MS);
             if (!tradeStatus?.status) {
                 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,
@@ -195,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.d.ts

@@ -1,2 +1,3 @@
-import type { CommonTradeQuoteInput, TradeQuoteResult } from '../../../types';
-export declare const getTradeQuote: (input: CommonTradeQuoteInput) => Promise<TradeQuoteResult>;
+import type { SwapperDeps, TradeQuoteResult } from '../../../types';
+import type { StonfiTradeQuoteInput } from '../types';
+export declare const getTradeQuote: (input: StonfiTradeQuoteInput, deps: SwapperDeps) => Promise<TradeQuoteResult>;

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

@@ -1,130 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const monads_1 = require("@sniptt/monads");
-const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
-const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const helpers_1 = require("../../utils/helpers/helpers");
-const constants_1 = require("../utils/constants");
-const helpers_2 = require("../utils/helpers");
-const omnistonManager_1 = require("../utils/omnistonManager");
-const buildStonfiSpecific = (quote, bidAssetAddress, askAssetAddress) => ({
-    quoteId: quote.quoteId,
-    resolverId: quote.resolverId,
-    resolverName: quote.resolverName,
-    tradeStartDeadline: quote.tradeStartDeadline,
-    gasBudget: quote.gasBudget,
-    bidAssetAddress: quote.bidAssetAddress ?? bidAssetAddress,
-    askAssetAddress: quote.askAssetAddress ?? askAssetAddress,
-    bidUnits: quote.bidUnits,
-    askUnits: quote.askUnits,
-    referrerAddress: quote.referrerAddress,
-    referrerFeeAsset: quote.referrerFeeAsset,
-    referrerFeeUnits: quote.referrerFeeUnits,
-    protocolFeeAsset: quote.protocolFeeAsset,
-    protocolFeeUnits: quote.protocolFeeUnits,
-    quoteTimestamp: quote.quoteTimestamp,
-    estimatedGasConsumption: quote.estimatedGasConsumption,
-    params: quote.params,
-});
-const getTradeQuote = async (input) => {
-    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, accountNumber, slippageTolerancePercentageDecimal, affiliateBps, } = input;
-    const validation = (0, helpers_2.validateTonAssets)(sellAsset, buyAsset);
-    if (!validation.isValid) {
-        return validation.error;
-    }
-    const { bidAssetAddress, askAssetAddress } = validation;
-    const omniston = omnistonManager_1.omnistonManager.getInstance();
-    try {
-        const slippageBps = (0, helpers_2.slippageDecimalToBps)(slippageTolerancePercentageDecimal, constants_1.STONFI_DEFAULT_SLIPPAGE_BPS);
-        const referrerFeeBps = (0, helpers_2.affiliateBpsToNumber)(affiliateBps);
-        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(caip_1.tonChainId);
-        const referrerAddress = (0, helpers_2.tonAddressToOmnistonAddress)(tonTreasuryAddress);
-        const quoteResult = await (0, helpers_2.waitForQuote)(omniston, {
-            settlementMethods: [omniston_sdk_1.SettlementMethod.SETTLEMENT_METHOD_SWAP],
-            bidAssetAddress,
-            askAssetAddress,
-            amount: { bidUnits: sellAmountIncludingProtocolFeesCryptoBaseUnit },
-            referrerAddress,
-            referrerFeeBps,
-            settlementParams: {
-                maxPriceSlippageBps: slippageBps,
-                gaslessSettlement: 'GASLESS_SETTLEMENT_PROHIBITED',
-                flexibleReferrerFee: true,
+const helpers_1 = require("../../../utils/helpers");
+const getStonfiStepData_1 = require("../utils/getStonfiStepData");
+const getStonfiTradeContext_1 = require("../utils/getStonfiTradeContext");
+const getTradeQuote = async (input, deps) => {
+    const { accountNumber } = input;
+    const addresses = (0, utils_1.assertQuoteAddresses)(input);
+    if (addresses.isErr())
+        return (0, monads_1.Err)(addresses.unwrapErr());
+    const { sendAddress, receiveAddress } = addresses.unwrap();
+    const maybeContext = await (0, getStonfiTradeContext_1.getStonfiTradeContext)({ input, deps });
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = (0, getStonfiStepData_1.getStonfiStepData)({
+        ...stepDataArgs,
+        type: 'quote',
+        input,
+        from: sendAddress,
+    });
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit, stonfiTransactionData } = maybeStepData.unwrap();
+    const tradeQuote = {
+        ...tradeCommon,
+        quoteOrRate: 'quote',
+        deadline: (0, helpers_1.normalizeEpochToMs)(stonfiTransactionData.tradeStartDeadline),
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                stonfiTransactionData,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
             },
-        }, constants_1.STONFI_QUOTE_TIMEOUT_MS);
-        if (quoteResult.type === 'error') {
-            console.error('[Stonfi] Quote request error:', quoteResult.error);
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `[Stonfi] Connection error while fetching quote`,
-                code: types_1.TradeQuoteError.QueryFailed,
-                cause: quoteResult.error,
-            }));
-        }
-        if (quoteResult.type === 'timeout') {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `[Stonfi] Quote request timed out`,
-                code: types_1.TradeQuoteError.QueryFailed,
-            }));
-        }
-        if (quoteResult.type === 'noQuote') {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `[Stonfi] No quote available for this pair`,
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
-        const quote = quoteResult.quote;
-        const buyAmountCryptoBaseUnit = quote.askUnits;
-        const networkFeeCryptoBaseUnit = quote.gasBudget;
-        const rate = (0, helpers_2.calculateRate)(buyAmountCryptoBaseUnit, sellAmountIncludingProtocolFeesCryptoBaseUnit, buyAsset.precision, sellAsset.precision);
-        const tradeQuote = {
-            id: quote.quoteId,
-            rate,
-            receiveAddress,
-            affiliateBps,
-            slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ?? String(constants_1.STONFI_DEFAULT_SLIPPAGE_BPS / 10000),
-            quoteOrRate: 'quote',
-            swapperName: types_1.SwapperName.Stonfi,
-            steps: [
-                {
-                    buyAmountBeforeFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    feeData: {
-                        networkFeeCryptoBaseUnit,
-                        protocolFees: undefined,
-                    },
-                    rate,
-                    source: types_1.SwapperName.Stonfi,
-                    buyAsset,
-                    sellAsset,
-                    accountNumber,
-                    allowanceContract: '0x0',
-                    estimatedExecutionTimeMs: 30000,
-                    stonfiSpecific: buildStonfiSpecific(quote, bidAssetAddress, askAssetAddress),
-                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                        buyAmountCryptoBaseUnit,
-                        isEstimate: true,
-                    }),
-                },
-            ],
-        };
-        return (0, monads_1.Ok)([tradeQuote]);
-    }
-    catch (err) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[Stonfi] Error getting quote: ${err}`,
-            code: types_1.TradeQuoteError.QueryFailed,
-            cause: err,
-        }));
-    }
+        ],
+    };
+    return (0, monads_1.Ok)([tradeQuote]);
 };
 exports.getTradeQuote = getTradeQuote;

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

@@ -1,2 +1,3 @@
-import type { GetTradeRateInput, TradeRateResult } from '../../../types';
-export declare const getTradeRate: (input: GetTradeRateInput) => Promise<TradeRateResult>;
+import type { SwapperDeps, TradeRateResult } from '../../../types';
+import type { StonfiTradeRateInput } from '../types';
+export declare const getTradeRate: (input: StonfiTradeRateInput, deps: SwapperDeps) => Promise<TradeRateResult>;

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

@@ -2,114 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRate = void 0;
 const monads_1 = require("@sniptt/monads");
-const omniston_sdk_1 = require("@ston-fi/omniston-sdk");
-const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const helpers_1 = require("../../utils/helpers/helpers");
-const constants_1 = require("../utils/constants");
-const helpers_2 = require("../utils/helpers");
-const omnistonManager_1 = require("../utils/omnistonManager");
-const buildStonfiSpecific = (quote, bidAssetAddress, askAssetAddress) => ({
-    quoteId: quote.quoteId,
-    resolverId: quote.resolverId,
-    resolverName: quote.resolverName,
-    tradeStartDeadline: quote.tradeStartDeadline,
-    gasBudget: quote.gasBudget,
-    bidAssetAddress: quote.bidAssetAddress ?? bidAssetAddress,
-    askAssetAddress: quote.askAssetAddress ?? askAssetAddress,
-    bidUnits: quote.bidUnits,
-    askUnits: quote.askUnits,
-    referrerAddress: quote.referrerAddress,
-    referrerFeeAsset: quote.referrerFeeAsset,
-    referrerFeeUnits: quote.referrerFeeUnits,
-    protocolFeeAsset: quote.protocolFeeAsset,
-    protocolFeeUnits: quote.protocolFeeUnits,
-    quoteTimestamp: quote.quoteTimestamp,
-    estimatedGasConsumption: quote.estimatedGasConsumption,
-    params: quote.params,
-});
-const getTradeRate = async (input) => {
-    const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit, receiveAddress, slippageTolerancePercentageDecimal, affiliateBps, } = input;
-    const validation = (0, helpers_2.validateTonAssets)(sellAsset, buyAsset);
-    if (!validation.isValid) {
-        return validation.error;
-    }
-    const { bidAssetAddress, askAssetAddress } = validation;
-    const omniston = omnistonManager_1.omnistonManager.getInstance();
-    try {
-        const slippageBps = (0, helpers_2.slippageDecimalToBps)(slippageTolerancePercentageDecimal, constants_1.STONFI_DEFAULT_SLIPPAGE_BPS);
-        const referrerFeeBps = (0, helpers_2.affiliateBpsToNumber)(affiliateBps);
-        const tonTreasuryAddress = (0, helpers_1.getTreasuryAddressFromChainId)(sellAsset.chainId);
-        const referrerAddress = (0, helpers_2.tonAddressToOmnistonAddress)(tonTreasuryAddress);
-        const quoteResult = await (0, helpers_2.waitForQuote)(omniston, {
-            settlementMethods: [omniston_sdk_1.SettlementMethod.SETTLEMENT_METHOD_SWAP],
-            bidAssetAddress,
-            askAssetAddress,
-            amount: { bidUnits: sellAmountIncludingProtocolFeesCryptoBaseUnit },
-            referrerAddress,
-            referrerFeeBps,
-            settlementParams: {
-                maxPriceSlippageBps: slippageBps,
-                gaslessSettlement: 'GASLESS_SETTLEMENT_PROHIBITED',
-                flexibleReferrerFee: true,
+const getStonfiStepData_1 = require("../utils/getStonfiStepData");
+const getStonfiTradeContext_1 = require("../utils/getStonfiTradeContext");
+const getTradeRate = async (input, deps) => {
+    const { accountNumber, receiveAddress } = input;
+    const maybeContext = await (0, getStonfiTradeContext_1.getStonfiTradeContext)({ input, deps });
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = (0, getStonfiStepData_1.getStonfiStepData)({ ...stepDataArgs, type: 'rate', input });
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeRate = {
+        ...tradeCommon,
+        quoteOrRate: 'rate',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
             },
-        }, constants_1.STONFI_QUOTE_TIMEOUT_MS);
-        if (quoteResult.type !== 'success') {
-            return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-                message: `[Stonfi] No quote available for this pair`,
-                code: types_1.TradeQuoteError.NoRouteFound,
-            }));
-        }
-        const quote = quoteResult.quote;
-        const buyAmountCryptoBaseUnit = quote.askUnits;
-        const networkFeeCryptoBaseUnit = quote.gasBudget;
-        const rate = (0, helpers_2.calculateRate)(buyAmountCryptoBaseUnit, sellAmountIncludingProtocolFeesCryptoBaseUnit, buyAsset.precision, sellAsset.precision);
-        const tradeRate = {
-            id: quote.quoteId,
-            rate,
-            receiveAddress,
-            affiliateBps,
-            slippageTolerancePercentageDecimal: slippageTolerancePercentageDecimal ?? String(constants_1.STONFI_DEFAULT_SLIPPAGE_BPS / 10000),
-            quoteOrRate: 'rate',
-            swapperName: types_1.SwapperName.Stonfi,
-            steps: [
-                {
-                    buyAmountBeforeFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit: buyAmountCryptoBaseUnit,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    feeData: {
-                        networkFeeCryptoBaseUnit,
-                        protocolFees: undefined,
-                    },
-                    rate,
-                    source: types_1.SwapperName.Stonfi,
-                    buyAsset,
-                    sellAsset,
-                    accountNumber: undefined,
-                    allowanceContract: '0x0000000000000000000000000000000000000000',
-                    estimatedExecutionTimeMs: 30000,
-                    stonfiSpecific: buildStonfiSpecific(quote, bidAssetAddress, askAssetAddress),
-                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                        buyAmountCryptoBaseUnit,
-                        isEstimate: true,
-                    }),
-                },
-            ],
-        };
-        return (0, monads_1.Ok)([tradeRate]);
-    }
-    catch (err) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[Stonfi] Error getting rate: ${err}`,
-            code: types_1.TradeQuoteError.QueryFailed,
-            cause: err,
-        }));
-    }
+        ],
+    };
+    return (0, monads_1.Ok)([tradeRate]);
 };
 exports.getTradeRate = getTradeRate;

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

@@ -1,20 +1,36 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
-import type { Result } from '@sniptt/monads';
 import type { Quote } from '@ston-fi/omniston-sdk';
-import type { SwapErrorRight } from '../../types';
+import type { GetTonTradeQuoteInput, GetTonTradeRateInput } from '../../types';
+export type StonfiTradeQuoteInput = GetTonTradeQuoteInput;
+export type StonfiTradeRateInput = GetTonTradeRateInput;
 export type StonfiSupportedChainId = typeof KnownChainIds.TonMainnet;
 export declare const stonfiSupportedChainIds: readonly [KnownChainIds.TonMainnet];
-export type OmnistonAssetAddress = {
-    blockchain: number;
-    address: string;
+export type StonfiMetadata = {
+    name: 'stonfi';
+    quoteId: string;
 };
-export type TonAssetValidationResult = {
-    isValid: true;
+export type StonfiTransactionData = {
+    quoteId: string;
+    resolverId: string;
+    resolverName: string;
+    tradeStartDeadline: number;
+    gasBudget: string;
     bidAssetAddress: OmnistonAssetAddress;
     askAssetAddress: OmnistonAssetAddress;
-} | {
-    isValid: false;
-    error: Result<never, SwapErrorRight>;
+    bidUnits: string;
+    askUnits: string;
+    referrerAddress?: OmnistonAssetAddress;
+    referrerFeeAsset?: OmnistonAssetAddress;
+    referrerFeeUnits: string;
+    protocolFeeAsset?: OmnistonAssetAddress;
+    protocolFeeUnits: string;
+    quoteTimestamp: number;
+    estimatedGasConsumption: string;
+    params?: unknown;
+};
+export type OmnistonAssetAddress = {
+    blockchain: number;
+    address: string;
 };
 export type QuoteResult = {
     type: 'success';
@@ -39,22 +55,3 @@ export type StonfiQuote = {
     estimatedGasConsumption: string;
     tradeStartDeadline: number;
 };
-export type StonfiTradeSpecific = {
-    quoteId: string;
-    resolverId: string;
-    resolverName: string;
-    tradeStartDeadline: number;
-    gasBudget: string;
-    bidAssetAddress: OmnistonAssetAddress;
-    askAssetAddress: OmnistonAssetAddress;
-    bidUnits: string;
-    askUnits: string;
-    referrerAddress?: OmnistonAssetAddress;
-    referrerFeeAsset?: OmnistonAssetAddress;
-    referrerFeeUnits: string;
-    protocolFeeAsset?: OmnistonAssetAddress;
-    protocolFeeUnits: string;
-    quoteTimestamp: number;
-    estimatedGasConsumption: string;
-    params?: unknown;
-};

package/dist/cjs/swappers/StonfiSwapper/utils/constants.d.ts

@@ -3,3 +3,4 @@ export declare const STONFI_SUPPORTED_CHAIN_IDS: readonly [KnownChainIds.TonMain
 export declare const STONFI_WEBSOCKET_URL = "wss://omni-ws.ston.fi";
 export declare const STONFI_DEFAULT_SLIPPAGE_BPS = 100;
 export declare const STONFI_QUOTE_TIMEOUT_MS = 30000;
+export declare const STONFI_TRADE_TRACKING_TIMEOUT_MS = 60000;