@rabbitio/ui-kit 1.0.0-beta.95 → 1.0.0-beta.98

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rabbitio/ui-kit",
-    "version": "1.0.0-beta.95",
+    "version": "1.0.0-beta.98",
     "description": "Rabbit.io react.js components kit",
     "type": "module",
     "main": "./dist/index.cjs",

package/src/common-apis/adapters/analyticsAdapters/googleAnalyticsAdapter.js

@@ -3,6 +3,7 @@ import { safeStringify } from "../../utils/safeStringify.js";
 
 export class GoogleAnalyticsAdapter {
     static sendEvent(eventName, parameters) {
+        // eslint-disable-next-line no-console
         console.log("Sending ga event: ", parameters, ["event", eventName, parameters]);
         this.doActionOnGTag(["event", eventName, parameters]);
     }

package/src/common-apis/adapters/analyticsAdapters/metrikaAdapter.js

@@ -11,6 +11,7 @@ export class MetrikaAdapter {
     static callMetrikaReachGoal(METRIKA_ID, goalName, usdPrice = null) {
         try {
             if (window.ym) {
+                // eslint-disable-next-line no-console
                 console.log("Sending metrika goal reached: ", goalName, String(usdPrice));
                 window.ym(
                     METRIKA_ID,

package/src/common-apis/external-apis/apiGroups.js

@@ -26,7 +26,7 @@ export const ApiGroups = {
      * Currently we use free version of etherscan provider with 0.2 RPS. But we have API key with 100k requests free
      * per month. So we can add it if not enough current RPS.
      */
-    ETHERSCAN: new ApiGroup("etherscan", 0.17), // Actually 0.2 but fails sometime, so we use smaller
+    ETHERSCAN: new ApiGroup("etherscan", 0.2, networkKey => `etherscan-${networkKey}`),
     ALCHEMY: new ApiGroup("alchemy", 0.3, networkKey => `alchemy-${networkKey}`),
     BLOCKSTREAM: new ApiGroup("blockstream", 0.2),
     BLOCKCHAIN_INFO: new ApiGroup("blockchain.info", 1),

package/src/swaps-lib/external-apis/exolixSwapProvider.js

@@ -14,6 +14,7 @@ import { SwapProvider } from "./swapProvider";
 import { ExistingSwap } from "../models/existingSwap";
 import { Partner } from "../models/partner";
 import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo";
+import { createRobustTimeoutSetupForAxios } from "./utils.js";
 
 export class ExolixSwapProvider extends SwapProvider {
     constructor(
@@ -24,18 +25,21 @@ export class ExolixSwapProvider extends SwapProvider {
         apiKey = ""
     ) {
         super("exolix", cache, customCoinBuilder, useRestrictedCoinsSet, false, true);
+
+        const headers = apiKey ? { Authorization: "Bearer " + apiKey } : {};
+
         this._partners = [];
         this._URL = apiKey ? "https://exolix.com/api/v2" : `${apiKeysProxyUrl}/${this.id}`;
         this.COINS_EXPIRATION_TIME_MS = 5 * 60 * 1000;
         this.coinsLastUpdateTimestamp = null;
-        this.headers = apiKey ? { Authorization: "Bearer " + apiKey } : {};
+        this.headers = headers;
+        this.axiosGetPreset = {
+            headers: headers,
+            validateStatus: responseCode => [200, 201, 404].find(code => code === responseCode),
+            ...createRobustTimeoutSetupForAxios()
+        };
     }
 
-    axiosGetPreset = (headers = {}) => ({
-        headers: headers,
-        validateStatus: responseCode => [200, 201, 404].find(code => code === responseCode),
-    });
-
     getSwapCreationInfoTtlMs() {
         return 110000;
     }
@@ -50,7 +54,7 @@ export class ExolixSwapProvider extends SwapProvider {
 
                 while (true) {
                     const responseRaw = await axios.get(this._URL + "/currencies", {
-                        ...this.axiosGetPreset(this.headers),
+                        ...this.axiosGetPreset,
                         params: { withNetworks: true, page: page, size: pageSize },
                     });
 
@@ -245,7 +249,7 @@ export class ExolixSwapProvider extends SwapProvider {
             }
 
             const response = await axios.get(this._URL + "/rate", {
-                ...this.axiosGetPreset(this.headers),
+                ...this.axiosGetPreset,
                 params: {
                     coinFrom: fromCoinDetails.code,
                     networkFrom: fromCoinDetails.network,
@@ -258,7 +262,10 @@ export class ExolixSwapProvider extends SwapProvider {
             });
             Logger.log(`Retrieved ${response?.data}`, loggerSource);
             if (typeof response?.data !== "object") {
-                Logger.log(`Swap response didn't include the data object ${safeStringify(e)}`, loggerSource);
+                Logger.log(
+                    `Swap response didn't include the data object ${safeStringify(response?.data)}`,
+                    loggerSource
+                );
                 return { result: false, reason: SwapProvider.NO_SWAPS_REASONS.NOT_SUPPORTED };
             }
 
@@ -398,11 +405,7 @@ export class ExolixSwapProvider extends SwapProvider {
             };
 
             Logger.log(`Sending create request: ${safeStringify(requestData)}`, loggerSource);
-            const response = await axios.post(
-                this._URL + "/transactions",
-                requestData,
-                this.axiosGetPreset(this.headers)
-            );
+            const response = await axios.post(this._URL + "/transactions", requestData, this.axiosGetPreset);
 
             const result = response?.data;
             Logger.log(`Creation result ${safeStringify(result)}`, loggerSource);
@@ -478,7 +481,7 @@ export class ExolixSwapProvider extends SwapProvider {
             }
             const getSwap = async swapId => {
                 try {
-                    return await axios.get(this._URL + "/transactions/" + swapId, this.axiosGetPreset(this.headers));
+                    return await axios.get(this._URL + "/transactions/" + swapId, this.axiosGetPreset);
                 } catch (error) {
                     if (error?.response?.status === 404) return [];
                     throw error;

package/src/swaps-lib/external-apis/letsExchangeSwapProvider.js

@@ -12,6 +12,7 @@ import { DEFAULT_CRYPTO_DECIMAL_COUNT, FALLBACK_ASSET_ICON_URL } from "../../com
 import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo.js";
 import { Partner } from "../models/partner.js";
 import { toRabbitTicker } from "../../common-apis/utils/rabbitTicker.js";
+import { createRobustTimeoutSetupForAxios } from "./utils.js";
 
 export class LetsExchangeSwapProvider extends SwapProvider {
     constructor(
@@ -43,7 +44,10 @@ export class LetsExchangeSwapProvider extends SwapProvider {
         const loggerSource = "_fetchSupportedCurrenciesIfNeeded";
         try {
             if (this._shouldCoinsListBeLoaded()) {
-                const rawResponse = await axios.get(`${this._URL}/v2/coins`, { headers: this._headers });
+                const rawResponse = await axios.get(`${this._URL}/v2/coins`, {
+                    headers: this._headers,
+                    ...createRobustTimeoutSetupForAxios(),
+                });
                 Logger.log(`Retrieved ${rawResponse?.data?.length}`, loggerSource);
                 let allowedCoins = rawResponse?.data ?? [];
                 Logger.log(`Allowed cnt ${allowedCoins.length}`, loggerSource);
@@ -168,7 +172,7 @@ export class LetsExchangeSwapProvider extends SwapProvider {
                     amount: amountCoins,
                     affiliate_id: LetsExchangeSwapProvider.AFFILIATE_ID,
                 },
-                { headers: this._headers }
+                { headers: this._headers, ...createRobustTimeoutSetupForAxios() }
             );
             Logger.log(`Retrieved ${response?.data}`, loggerSource);
             const data = response.data;
@@ -323,7 +327,7 @@ export class LetsExchangeSwapProvider extends SwapProvider {
             const response = await axios.post(
                 `${this._URL}/v1/transaction${amountIsToReceive ? "-revert" : `?float=${!fixed}`}`,
                 requestBody,
-                { headers: this._headers }
+                { headers: this._headers, ...createRobustTimeoutSetupForAxios() }
             );
             const result = response.data;
             Logger.log(`Creation result ${safeStringify(result)}`, loggerSource);
@@ -378,6 +382,7 @@ export class LetsExchangeSwapProvider extends SwapProvider {
             }
             const response = await axios.get(`${this._URL}/v1/transactions-list?ids[]=${swapIds.join("&ids[]=")}`, {
                 headers: this._headers,
+                ...createRobustTimeoutSetupForAxios(),
             });
 
             Logger.log("All swaps RAW: " + safeStringify(response.data), loggerSource);

package/src/swaps-lib/external-apis/swapProvider.js

@@ -378,6 +378,7 @@ export class SwapProvider {
      *        by provider with some fixed "insurance" amount to cover min amount fluctuations.
      * @param [amountIsToReceive=false] {boolean} whether the given amount is receiving amount. False means the amount is the sending amount.
      * @param [bannedPartners=[]] {string[]} list of ids of banned partners to be excluded from list, suitable only for swap aggregators
+     * @param [whitelistedPartners=null] {string[]|null} list of ids of whitelisted partners. Banned whitelisted partner will not be used for estimation.
      * @return {Promise<({
      *            result: false,
      *            reason: string,
@@ -403,7 +404,8 @@ export class SwapProvider {
         fixed = false,
         fromCoinToUsdRate = null,
         amountIsToReceive = false,
-        bannedPartners = []
+        bannedPartners = [],
+        whitelistedPartners = null
     ) {
         throw new Error("Not implemented in base");
     }

package/src/swaps-lib/external-apis/swapspaceSwapProvider.js

@@ -13,8 +13,7 @@ import { FALLBACK_ASSET_ICON_URL } from "../../common-apis/globalConstants.jsx";
 import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo.js";
 import { KYC_LEVELS, Partner } from "../models/partner.js";
 import { toRabbitTicker } from "../../common-apis/utils/rabbitTicker.js";
-
-export const BANNED_PARTNERS = ["stealthex", "changee", "coincraddle", "easybit", "changelly"];
+import { createRobustTimeoutSetupForAxios } from "./utils.js";
 
 export class SwapspaceSwapProvider extends SwapProvider {
     /**
@@ -49,7 +48,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
         const loggerSource = "_fetchSupportedCurrenciesIfNeeded";
         try {
             if (this._shouldCoinsListBeLoaded()) {
-                const rawResponse = await axios.get(`${this._URL}/api/v2/currencies`, { headers: this._headers });
+                const rawResponse = await axios.get(`${this._URL}/api/v2/currencies`, {
+                    headers: this._headers,
+                    ...createRobustTimeoutSetupForAxios(),
+                });
                 Logger.log(`Retrieved ${rawResponse?.data?.length}`, loggerSource);
                 let allowedCoins = rawResponse?.data ?? [];
                 Logger.log(`Allowed cnt ${allowedCoins.length}`, loggerSource);
@@ -127,7 +129,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
         const loggerSource = "_fetchPartnersListIfNeeded";
         try {
             if (this._partners?.length === 0) {
-                const rawResponse = await axios.get(`${this._URL}/api/v2/partners`, { headers: this._headers });
+                const rawResponse = await axios.get(`${this._URL}/api/v2/partners`, {
+                    headers: this._headers,
+                    ...createRobustTimeoutSetupForAxios(),
+                });
                 Logger.log(`Retrieved ${rawResponse?.data?.length} partners`, loggerSource);
                 this._partners = Array.isArray(rawResponse?.data) ? rawResponse?.data : [];
             }
@@ -143,7 +148,8 @@ export class SwapspaceSwapProvider extends SwapProvider {
         fixed = false,
         fromCoinToUsdRate = null,
         amountIsToReceive = false,
-        bannedPartners = []
+        bannedPartners = [],
+        whitelistedPartners = null
     ) {
         const loggerSource = "getSwapInfo";
         try {
@@ -185,7 +191,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
              */
             const response = await axios.get(
                 `${this._URL}/api/v2/amounts?fromCurrency=${fromCoinSwapspaceDetails.code}&fromNetwork=${fromCoinSwapspaceDetails.network}&toNetwork=${toCoinSwapspaceDetails.network}&toCurrency=${toCoinSwapspaceDetails.code}&amount=${amountCoins}&estimated=false`,
-                { headers: this._headers }
+                { headers: this._headers, ...createRobustTimeoutSetupForAxios() }
             );
             Logger.log(`Retrieved ${response?.data?.length} options`, loggerSource);
             const options = Array.isArray(response.data) ? response.data : [];
@@ -193,7 +199,8 @@ export class SwapspaceSwapProvider extends SwapProvider {
             let exchangesSupportingThePairDespiteFixedOrFloating = options.filter(
                 exchange =>
                     exchange?.exists &&
-                    !bannedPartners.find(bannedPartner => bannedPartner === exchange?.partner) &&
+                    !bannedPartners.includes(exchange?.partner) &&
+                    (whitelistedPartners == null || whitelistedPartners.includes(exchange?.partner)) &&
                     (exchange?.fixed === false || exchange?.fixed === true) &&
                     typeof exchange.toAmount === "number" &&
                     ((typeof exchange.min === "number" && typeof exchange.max === "number") || exchange.toAmount > 0) &&
@@ -379,7 +386,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
             };
 
             Logger.log(`Sending create request: ${safeStringify(requestData)}`, loggerSource);
-            const response = await axios.post(`${this._URL}/api/v2/exchange`, requestData, { headers: this._headers });
+            const response = await axios.post(`${this._URL}/api/v2/exchange`, requestData, {
+                headers: this._headers,
+                ...createRobustTimeoutSetupForAxios(),
+            });
             const result = response.data;
             Logger.log(`Creation result ${safeStringify(result)}`, loggerSource);
 
@@ -488,7 +498,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
             }
             const getNotFailingOn404 = async swapId => {
                 try {
-                    return await axios.get(`${this._URL}/api/v2/exchange/${swapId}`, { headers: this._headers });
+                    return await axios.get(`${this._URL}/api/v2/exchange/${swapId}`, {
+                        headers: this._headers,
+                        ...createRobustTimeoutSetupForAxios(),
+                    });
                 } catch (error) {
                     if (error?.response?.status === 404) return [];
                     throw error;

package/src/swaps-lib/external-apis/utils.js

@@ -0,0 +1,15 @@
+export const HTTP_TIMEOUT_MS = 30 * 1000;
+
+export function createAbortSignalForHttpRequest(timeoutMs = HTTP_TIMEOUT_MS) {
+    const abortController = new AbortController();
+    setTimeout(() => abortController.abort(), timeoutMs);
+
+    return abortController.signal;
+}
+
+export function createRobustTimeoutSetupForAxios() {
+    return {
+        timeout: HTTP_TIMEOUT_MS,
+        signal: createAbortSignalForHttpRequest(HTTP_TIMEOUT_MS),
+    };
+}

package/src/swaps-lib/services/publicSwapService.js

@@ -68,6 +68,7 @@ export class PublicSwapService {
      * @param [amountIsToReceive=false] {boolean} whether the given amount is receiving amount.
      *        False means the amount is the sending amount.
      * @param bannedPartners {string[]} array of banned swap partners (providers) ids (rabbit ids)
+     * @param [whitelistedPartners=null] {string[]|null} array of banned swap partners (providers) ids (rabbit ids)
      * @return {Promise<{
      *             result: false,
      *             reason: string,
@@ -89,7 +90,8 @@ export class PublicSwapService {
         fixed = false,
         coinUsdtRate = null,
         amountIsToReceive = false,
-        bannedPartners = []
+        bannedPartners = [],
+        whitelistedPartners = null
     ) {
         const loggerSource = "getPublicSwapDetails";
         try {
@@ -105,7 +107,9 @@ export class PublicSwapService {
             if (typeof toCoin === "string") {
                 toCoin = this.getCoinByTickerIfPresent(toCoin);
             }
-            const isPartnerBanned = !!bannedPartners.find(banned => banned === provider.id);
+            const isPartnerBanned =
+                bannedPartners.includes(provider.id) ||
+                (whitelistedPartners != null && !whitelistedPartners.includes(provider.id));
             if (!fromCoin || !toCoin || isPartnerBanned) {
                 return {
                     result: false,
@@ -125,7 +129,8 @@ export class PublicSwapService {
                 fixed,
                 coinUsdtRate,
                 amountIsToReceive,
-                bannedPartners
+                bannedPartners,
+                whitelistedPartners
             );
 
             // eslint-disable-next-line no-console

package/src/swaps-lib/test/external-apis/swapspaceSwapProvider/getSwapInfo.test.js

@@ -1678,6 +1678,7 @@ describe("swapspaceSwapProvider", function () {
                 result.isRefundAddressRequired.should.be.equal(expected.isRefundAddressRequired);
             });
         });
+
         it("should call _fetchPartnersListIfNeeded ones", async () => {
             swapspaceSwapProvider._supportedCoins = [
                 { coin: BTC, code: "btc", network: "btc", deposit: true, isAvailable: true },
@@ -1703,5 +1704,40 @@ describe("swapspaceSwapProvider", function () {
 
             _fetchPartnersListIfNeededStub.callCount.should.be.equal(1);
         });
+
+        it("should ignore non-whitelisted partners", async () => {
+            swapspaceSwapProvider._supportedCoins = [
+                { coin: BTC, code: "btc", network: "btc", deposit: true, isAvailable: true },
+                { coin: ETH, code: "eth", network: "eth", withdrawal: true, isAvailable: true },
+            ];
+            const mockData = [
+                {
+                    exists: true,
+                    fixed: false,
+                    toAmount: 200,
+                    fromAmount: 1,
+                    duration: "10-20",
+                    max: 5,
+                    min: 0.1,
+                    partner: "partner1",
+                },
+                {
+                    exists: true,
+                    fixed: false,
+                    toAmount: 2,
+                    fromAmount: 1,
+                    duration: "10-20",
+                    max: 5,
+                    min: 0.1,
+                    partner: "partner2",
+                },
+            ];
+            axiosGetStub.returns(Promise.resolve({ data: mockData }));
+
+            const result = await swapspaceSwapProvider.getSwapInfo(BTC, ETH, "1", false, null, false, [], ["partner2"]);
+
+            result.result.should.be.true();
+            result.rawSwapData.partner.should.be.equal("partner2");
+        });
     });
 });

package/src/ui-kit/hooks/useCallHandlingErrors.js

@@ -2,21 +2,26 @@ import { useCallback, useState } from "react";
 
 import { Logger } from "../../common-apis/utils/logging/logger.js";
 
+/**
+ * This hook retrieves an error-handler function.
+ * The error-handler function triggers ErrorBoundary displaying in case of error during the callback function execution.
+ * (Actually, we just re-throw an error so react can catch it in the ErrorBoundary, so you should have ErrorBoundary setup for proper behavior).
+ *
+ * Optionally you can pass a single parameter to the callback.
+ *
+ * @return {(function(function, any): Promise<void>)} - error handling function accepting callback and optional parameter for it
+ */
 export function useCallHandlingErrors() {
     const [, setState] = useState();
-    return useCallback(
-        async (functionToBeCalled, event) => {
-            try {
-                await functionToBeCalled(event);
-            } catch (error) {
-                Logger.logError(error, functionToBeCalled?.name || "errorBoundaryTrigger", "Caught by ErrorBoundary");
-                // Triggering ErrorBoundary
-                setState(() => {
-                    throw error;
-                });
-            }
-        },
-
-        []
-    );
+    return useCallback(async (functionToBeCalled, parameter) => {
+        try {
+            await functionToBeCalled(parameter);
+        } catch (error) {
+            Logger.logError(error, functionToBeCalled?.name || "errorBoundaryTrigger", "Caught by ErrorBoundary");
+            // Triggering ErrorBoundary
+            setState(() => {
+                throw error;
+            });
+        }
+    }, []);
 }