@rabbitio/ui-kit 1.0.0-beta.32 → 1.0.0-beta.34

package/dist/index.modern.js

@@ -2390,18 +2390,24 @@ class ExistingSwap {
    * @param confirmations {number}
    * @param rate {string}
    * @param refundAddress {string}
+   * @param payToAddress {string}
    * @param fromCoin {Coin}
    * @param fromAmount {string}
    * @param fromTransactionId {string}
+   * @param fromTransactionLink {string}
    * @param toCoin {Coin}
    * @param toAmount {string}
    * @param toTransactionId {string|null}
+   * @param toTransactionLink {string}
    * @param toAddress {string}
    * @param partner {string}
+   * @param fromExtraId {string}
+   * @param toExtraId {string}
+   * @param refundExtraId {string}
    */
   constructor(swapId, status, createdAt, expiresAt, confirmations, rate, refundAddress, payToAddress, fromCoin, fromAmount, fromTransactionId, fromTransactionLink, toCoin, toAmount, toTransactionId, toTransactionLink, toAddress,
   // TODO: [refactoring, moderate] toAddress is not quite clear. How about recipientAddress? task_id=0815a111c99543b78d374217eadbde4f
-  partner) {
+  partner, fromExtraId, toExtraId, refundExtraId) {
     this.swapId = swapId;
     this.status = status;
     this.createdAt = createdAt;
@@ -2420,6 +2426,9 @@ class ExistingSwap {
     this.toAmount = toAmount;
     this.toAddress = toAddress;
     this.partner = partner;
+    this.fromExtraId = fromExtraId;
+    this.toExtraId = toExtraId;
+    this.refundExtraId = refundExtraId;
   }
 }
 
@@ -2432,21 +2441,27 @@ class ExistingSwapWithFiatData extends ExistingSwap {
    * @param confirmations {number}
    * @param rate {string}
    * @param refundAddress {string}
+   * @param payToAddress {string}
    * @param fromCoin {Coin}
    * @param fromAmount {string}
    * @param fromTransactionId {string}
+   * @param fromTransactionLink {string}
    * @param toCoin {Coin}
    * @param toAmount {string}
    * @param toTransactionId {string|null}
+   * @param toTransactionLink
    * @param toAddress {string}
    * @param partner {string}
+   * @param fromExtraId {string}
+   * @param toExtraId {string}
+   * @param refundExtraId {string}
    * @param fromAmountFiat {number}
    * @param toAmountFiat {number}
    * @param fiatCurrencyCode {string}
    * @param fiatCurrencyDecimals {number}
    */
-  constructor(swapId, status, createdAt, expiresAt, confirmations, rate, refundAddress, payToAddress, fromCoin, fromAmount, fromTransactionId, fromTransactionLink, toCoin, toAmount, toTransactionId, toTransactionLink, toAddress, partner, fromAmountFiat, toAmountFiat, fiatCurrencyCode, fiatCurrencyDecimals) {
-    super(swapId, status, createdAt, expiresAt, confirmations, rate, refundAddress, payToAddress, fromCoin, fromAmount, fromTransactionId, fromTransactionLink, toCoin, toAmount, toTransactionId, toTransactionLink, toAddress, partner);
+  constructor(swapId, status, createdAt, expiresAt, confirmations, rate, refundAddress, payToAddress, fromCoin, fromAmount, fromTransactionId, fromTransactionLink, toCoin, toAmount, toTransactionId, toTransactionLink, toAddress, partner, fromExtraId, toExtraId, refundExtraId, fromAmountFiat, toAmountFiat, fiatCurrencyCode, fiatCurrencyDecimals) {
+    super(swapId, status, createdAt, expiresAt, confirmations, rate, refundAddress, payToAddress, fromCoin, fromAmount, fromTransactionId, fromTransactionLink, toCoin, toAmount, toTransactionId, toTransactionLink, toAddress, partner, fromExtraId, toExtraId, refundExtraId);
     this.fromAmountFiat = fromAmountFiat;
     this.toAmountFiat = toAmountFiat;
     this.fiatCurrencyCode = fiatCurrencyCode;
@@ -2462,7 +2477,7 @@ class ExistingSwapWithFiatData extends ExistingSwap {
    * @return {ExistingSwapWithFiatData}
    */
   static fromExistingSwap(existingSwap, fromAmountFiat, toAmountFiat, fiatCurrencyCode, fiatCurrencyDecimals) {
-    return new ExistingSwapWithFiatData(existingSwap.swapId, existingSwap.status, existingSwap.createdAt, existingSwap.expiresAt, existingSwap.confirmations, existingSwap.rate, existingSwap.refundAddress, existingSwap.payToAddress, existingSwap.fromCoin, existingSwap.fromAmount, existingSwap.fromTransactionId, existingSwap.fromTransactionLink, existingSwap.toCoin, existingSwap.toAmount, existingSwap.toTransactionId, existingSwap.toTransactionLink, existingSwap.toAddress, existingSwap.partner, fromAmountFiat, toAmountFiat, fiatCurrencyCode, fiatCurrencyDecimals);
+    return new ExistingSwapWithFiatData(existingSwap.swapId, existingSwap.status, existingSwap.createdAt, existingSwap.expiresAt, existingSwap.confirmations, existingSwap.rate, existingSwap.refundAddress, existingSwap.payToAddress, existingSwap.fromCoin, existingSwap.fromAmount, existingSwap.fromTransactionId, existingSwap.fromTransactionLink, existingSwap.toCoin, existingSwap.toAmount, existingSwap.toTransactionId, existingSwap.toTransactionLink, existingSwap.toAddress, existingSwap.partner, existingSwap.fromExtraId, existingSwap.toExtraId, existingSwap.refundExtraId, fromAmountFiat, toAmountFiat, fiatCurrencyCode, fiatCurrencyDecimals);
   }
 }
 
@@ -2602,6 +2617,8 @@ class SwapProvider {
    * @param refundAddress {string}
    * @param rawSwapData {Object|null}
    * @param clientIpAddress {string}
+   * @param [toCurrencyExtraId=""] {string} optional extra ID
+   * @param [refundExtraId=""] {string} optional extra ID for refund address
    * @return {Promise<({
    *                     result: true,
    *                     swapId: string,
@@ -2611,14 +2628,15 @@ class SwapProvider {
    *                     toCoin: Coin,
    *                     toAmount: string,
    *                     toAddress: string,
-   *                     rate: string
+   *                     rate: string,
+   *                     fromCurrencyExtraId: string|undefined
    *                 }|{
    *                     result: false,
    *                     reason: string,
    *                     partner: string
    *                 })>}
    */
-  async createSwap(fromCoin, toCoin, amount, toAddress, refundAddress, rawSwapData = null, clientIpAddress) {
+  async createSwap(fromCoin, toCoin, amount, toAddress, refundAddress, rawSwapData = null, clientIpAddress, toCurrencyExtraId = "", refundExtraId = "") {
     throw new Error("Not implemented in base");
   }
 
@@ -2649,6 +2667,14 @@ class SwapProvider {
   isAddressValidForAsset(asset, address) {
     throw new Error("Not implemented in base");
   }
+
+  /**
+   * @param asset {Coin}
+   * @return {string|null}
+   */
+  getExtraIdNameIfPresent(asset) {
+    throw new Error("Not implemented in base");
+  }
 }
 SwapProvider.COMMON_ERRORS = {
   REQUESTS_LIMIT_EXCEEDED: "requestsLimitExceeded"
@@ -2684,7 +2710,7 @@ class SwapspaceSwapProvider extends SwapProvider {
   constructor(apiKeysProxyUrl, cache, customCoinBuilder = (coin, network) => null, useRestrictedCoinsSet = true) {
     super();
     this._supportedCoins = [];
-    this._URL = `${apiKeysProxyUrl}`;
+    this._URL = `${apiKeysProxyUrl}/swapspace`;
     this._maxRateDigits = 20;
     this.useRestrictedCoinsSet = useRestrictedCoinsSet;
     this._customCoinBuilder = customCoinBuilder;
@@ -2790,8 +2816,6 @@ class SwapspaceSwapProvider extends SwapProvider {
         const rawResponse = await axios.get(`${this._URL}/api/v2/currencies`);
         Logger.log(`Retrieved ${rawResponse == null || (_rawResponse$data = rawResponse.data) == null ? void 0 : _rawResponse$data.length}`, loggerSource);
         let allowedCoins = (_rawResponse$data2 = rawResponse == null ? void 0 : rawResponse.data) != null ? _rawResponse$data2 : [];
-        // TODO: [feature, critical] add support for extra ID. task_id=7219d65d41c242a292dfa47479b8d63f
-        allowedCoins = allowedCoins.filter(c => c.hasExtraId !== true && c.hasExtraId !== "true");
         Logger.log(`Allowed cnt ${allowedCoins.length}`, loggerSource);
         this._supportedCoins = allowedCoins.map(item => {
           let coin = this._customCoinBuilder(item.code, item.network);
@@ -2820,7 +2844,8 @@ class SwapspaceSwapProvider extends SwapProvider {
               coin: coin,
               code: item.code,
               network: item.network,
-              extraId: item.extraIdName,
+              hasExtraId: item.hasExtraId,
+              extraIdName: item.extraIdName,
               isPopular: !!(item != null && item.popular),
               iconURL: item.icon ? `https://storage.swapspace.co${item.icon}` : FALLBACK_ICON_URL,
               deposit: (_item$deposit = item.deposit) != null ? _item$deposit : false,
@@ -3019,11 +3044,10 @@ class SwapspaceSwapProvider extends SwapProvider {
       improveAndRethrow(e, loggerSource);
     }
   }
-  async createSwap(fromCoin, toCoin, amount, toAddress, refundAddress, rawSwapData, clientIpAddress) {
+  async createSwap(fromCoin, toCoin, amount, toAddress, refundAddress, rawSwapData, clientIpAddress, toCurrencyExtraId = "", refundExtraId = "") {
     const loggerSource = "createSwap";
     const partner = rawSwapData == null ? void 0 : rawSwapData.partner;
     try {
-      var _this$_supportedCoins9, _this$_supportedCoins10;
       if (!(fromCoin instanceof Coin) || !(toCoin instanceof Coin) || typeof amount !== "string" || typeof toAddress !== "string" || typeof refundAddress !== "string") {
         throw new Error(`Invalid input: ${fromCoin} ${toCoin} ${amount} ${toAddress} ${refundAddress}`);
       }
@@ -3032,10 +3056,6 @@ class SwapspaceSwapProvider extends SwapProvider {
         throw new Error(`Invalid raw swap data: ${safeStringify(rawSwapData)}`);
       }
       await this._fetchSupportedCurrenciesIfNeeded();
-      const toCurrencyExtraId = (_this$_supportedCoins9 = (_this$_supportedCoins10 = this._supportedCoins.find(item => {
-        var _item$coin4;
-        return ((_item$coin4 = item.coin) == null ? void 0 : _item$coin4.ticker) === (toCoin == null ? void 0 : toCoin.ticker);
-      })) == null ? void 0 : _this$_supportedCoins10.extraId) != null ? _this$_supportedCoins9 : "";
       const requestData = {
         partner: partner,
         fromCurrency: rawSwapData == null ? void 0 : rawSwapData.fromCurrency,
@@ -3046,6 +3066,8 @@ class SwapspaceSwapProvider extends SwapProvider {
         amount: amount,
         fixed: false,
         extraId: toCurrencyExtraId != null ? toCurrencyExtraId : "",
+        refundExtraId: refundExtraId != null ? refundExtraId : "",
+        // This param is not documented. But the refund is usually manual so this is not critical.
         rateId: rawSwapData == null ? void 0 : rawSwapData.id,
         userIp: clientIpAddress,
         refund: refundAddress
@@ -3055,7 +3077,7 @@ class SwapspaceSwapProvider extends SwapProvider {
       const result = response.data;
       Logger.log(`Creation result ${safeStringify(result)}`, loggerSource);
       if (result != null && result.id) {
-        var _result$from, _result$from2, _result$to, _result$to2, _result$from4, _result$from5, _result$to4, _result$to5;
+        var _result$from, _result$from2, _result$to, _result$to2, _result$from4, _result$from5, _result$to4, _result$to5, _result$from$extraId, _result$from6;
         if (typeof (result == null || (_result$from = result.from) == null ? void 0 : _result$from.amount) !== "number" || typeof (result == null || (_result$from2 = result.from) == null ? void 0 : _result$from2.address) !== "string" || typeof (result == null || (_result$to = result.to) == null ? void 0 : _result$to.amount) !== "number" || typeof (result == null || (_result$to2 = result.to) == null ? void 0 : _result$to2.address) !== "string") throw new Error(`Wrong swap creation result ${result}`);
         /* We use the returned rate preferably but if the retrieved
          * rate 0/null/undefined we calculate it manually */
@@ -3075,6 +3097,7 @@ class SwapspaceSwapProvider extends SwapProvider {
           toCoin: toCoin,
           toAmount: AmountUtils.trim(result == null || (_result$to4 = result.to) == null ? void 0 : _result$to4.amount, toCoin.digits),
           toAddress: result == null || (_result$to5 = result.to) == null ? void 0 : _result$to5.address,
+          fromCurrencyExtraId: (_result$from$extraId = result == null || (_result$from6 = result.from) == null ? void 0 : _result$from6.extraId) != null ? _result$from$extraId : "",
           rate: AmountUtils.trim(rate, this._maxRateDigits)
         };
       }
@@ -3152,9 +3175,9 @@ class SwapspaceSwapProvider extends SwapProvider {
       const wo404 = responses.flat();
       Logger.log("All swaps RAW: " + JSON.stringify(wo404.map(r => r.data)), loggerSource);
       const swaps = wo404.map(r => r.data).map((swap, index) => {
-        var _this$_supportedCoins11, _this$_supportedCoins12;
-        const fromCoin = (_this$_supportedCoins11 = this._supportedCoins.find(i => i.code === swap.from.code && i.network === swap.from.network)) == null ? void 0 : _this$_supportedCoins11.coin;
-        const toCoin = (_this$_supportedCoins12 = this._supportedCoins.find(i => i.code === swap.to.code && i.network === swap.to.network)) == null ? void 0 : _this$_supportedCoins12.coin;
+        var _this$_supportedCoins9, _this$_supportedCoins10, _swap$from$extraId, _swap$to$extraId, _swap$refundExtraId;
+        const fromCoin = (_this$_supportedCoins9 = this._supportedCoins.find(i => i.code === swap.from.code && i.network === swap.from.network)) == null ? void 0 : _this$_supportedCoins9.coin;
+        const toCoin = (_this$_supportedCoins10 = this._supportedCoins.find(i => i.code === swap.to.code && i.network === swap.to.network)) == null ? void 0 : _this$_supportedCoins10.coin;
         if (!fromCoin || !toCoin) {
           return []; // We skip swaps with not supported coins for now
         }
@@ -3164,7 +3187,7 @@ class SwapspaceSwapProvider extends SwapProvider {
         const status = this._mapSwapspaceStatusToRabbitStatus(swap.status, isExpiredByTime);
         const toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
         const addressToSendCoinsToSwapspace = swap.from.address;
-        return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, this._maxRateDigits), swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, swap.blockExplorerTransactionUrl.to, swap.to.address, swap.partner);
+        return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, this._maxRateDigits), swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, swap.blockExplorerTransactionUrl.to, swap.to.address, swap.partner, (_swap$from$extraId = swap.from.extraId) != null ? _swap$from$extraId : null, (_swap$to$extraId = swap.to.extraId) != null ? _swap$to$extraId : null, (_swap$refundExtraId = swap.refundExtraId) != null ? _swap$refundExtraId : null);
       }).flat();
       Logger.log(`Swap details result ${safeStringify(swaps)}`, loggerSource);
       return {
@@ -3204,6 +3227,17 @@ class SwapspaceSwapProvider extends SwapProvider {
     }
     return false;
   }
+  getExtraIdNameIfPresent(asset) {
+    try {
+      const assetData = this._supportedCoins.find(i => {
+        var _i$coin4;
+        return ((_i$coin4 = i.coin) == null ? void 0 : _i$coin4.ticker) === (asset == null ? void 0 : asset.ticker);
+      });
+      return assetData != null && assetData.hasExtraId ? assetData == null ? void 0 : assetData.extraIdName : null;
+    } catch (e) {
+      improveAndRethrow(e, "getExtraIdNameIfPresent");
+    }
+  }
 }
 
 class SwapUtils {
@@ -3443,6 +3477,7 @@ class PublicSwapService {
    * @param fromCoin {Coin}
    * @param toCoin {Coin}
    * @param fromAmountCoins {string}
+   * @param [withoutFiat=false] {boolean} pass true if you don't need the fiat equivalent - this will diminish requests count
    * @return {Promise<{
    *             result: false,
    *             reason: string,
@@ -3456,11 +3491,11 @@ class PublicSwapService {
    *             swapCreationInfo: BaseSwapCreationInfo
    *         }>}
    */
-  async getPublicSwapDetails(fromCoin, toCoin, fromAmountCoins) {
+  async getPublicSwapDetails(fromCoin, toCoin, fromAmountCoins, withoutFiat = false) {
     const loggerSource = "getPublicSwapDetails";
     try {
       var _await$this$_swapProv, _await$this$_swapProv2, _result$swapCreationI, _result$swapCreationI2;
-      const coinUsdtRate = (_await$this$_swapProv = (_await$this$_swapProv2 = await this._swapProvider.getCoinToUSDTRate(fromCoin)) == null ? void 0 : _await$this$_swapProv2.rate) != null ? _await$this$_swapProv : null;
+      const coinUsdtRate = withoutFiat ? null : (_await$this$_swapProv = (_await$this$_swapProv2 = await this._swapProvider.getCoinToUSDTRate(fromCoin)) == null ? void 0 : _await$this$_swapProv2.rate) != null ? _await$this$_swapProv : null;
       const details = await this._swapProvider.getSwapInfo(fromCoin, toCoin, fromAmountCoins, coinUsdtRate);
       const min = details.result ? details.min : details.smallestMin;
       const max = details.result ? details.max : details.greatestMax;
@@ -3526,6 +3561,8 @@ class PublicSwapService {
    * @param toAddress {string}
    * @param refundAddress {string}
    * @param clientIp {string}
+   * @param [toCurrencyExtraId] {string}
+   * @param [refundExtraId] {string}
    * @return {Promise<{
    *             result: true,
    *             fiatCurrencyCode: string,
@@ -3539,13 +3576,14 @@ class PublicSwapService {
    *             fiatCurrencyDecimals: number,
    *             fromCoin: Coin,
    *             rate: string,
-   *             swapId: string
+   *             swapId: string,
+   *             fromCurrencyExtraId: string
    *         }|{
    *             result: false,
    *             reason: string
    *         }>}
    */
-  async createPublicSwap(fromCoin, toCoin, fromAmount, swapCreationInfo, toAddress, refundAddress, clientIp) {
+  async createPublicSwap(fromCoin, toCoin, fromAmount, swapCreationInfo, toAddress, refundAddress, clientIp, toCurrencyExtraId, refundExtraId) {
     const loggerSource = "createPublicSwap";
     try {
       var _swapCreationInfo$fro, _swapCreationInfo$toC;
@@ -3556,7 +3594,7 @@ class PublicSwapService {
         fromCoin: swapCreationInfo == null || (_swapCreationInfo$fro = swapCreationInfo.fromCoin) == null ? void 0 : _swapCreationInfo$fro.ticker,
         toCoin: swapCreationInfo == null || (_swapCreationInfo$toC = swapCreationInfo.toCoin) == null ? void 0 : _swapCreationInfo$toC.ticker
       }))}`, loggerSource);
-      const result = await this._swapProvider.createSwap(fromCoin, toCoin, fromAmount, toAddress, refundAddress, swapCreationInfo.rawSwapData, clientIp);
+      const result = await this._swapProvider.createSwap(fromCoin, toCoin, fromAmount, toAddress, refundAddress, swapCreationInfo.rawSwapData, clientIp, toCurrencyExtraId, refundExtraId);
       Logger.log(`Created:${safeStringify(_extends({}, result, {
         fromCoin: fromCoin == null ? void 0 : fromCoin.ticker,
         toCoin: toCoin == null ? void 0 : toCoin.ticker
@@ -3578,6 +3616,7 @@ class PublicSwapService {
         }
       }
       if (result.result && result != null && result.swapId) {
+        var _result$fromCurrencyE;
         let fromAmountFiat = null,
           toAmountFiat = null;
         try {
@@ -3607,7 +3646,9 @@ class PublicSwapService {
           fiatCurrencyDecimals: PublicSwapService._fiatDecimalsCount,
           rate: result.rate,
           durationMinutesRange: swapCreationInfo.durationMinutesRange,
-          address: result.fromAddress // CRITICAL: this is the address to send coins to swaps provider
+          address: result.fromAddress,
+          // CRITICAL: this is the address to send coins to swaps provider
+          fromCurrencyExtraId: (_result$fromCurrencyE = result.fromCurrencyExtraId) != null ? _result$fromCurrencyE : "" // CRITICAL: this is the extra ID for address to send coins to swaps provider
         };
         this._savePublicSwapIdLocally(result.swapId);
         Logger.log(`Returning: ${safeStringify(_extends({}, toReturn, {
@@ -3776,6 +3817,18 @@ class PublicSwapService {
     }
     return null;
   }
+
+  /**
+   * @param asset {Coin}
+   * @return {string|null}
+   */
+  getExtraIdNameIfPresentForAsset(asset) {
+    try {
+      return this._swapProvider.getExtraIdNameIfPresent(asset);
+    } catch (e) {
+      improveAndRethrow(e, "getExtraIdNameIfPresentForAsset");
+    }
+  }
 }
 PublicSwapService.PUBLIC_SWAP_CREATED_EVENT = "publicSwapCreatedEvent";
 PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS = {