PR comments fixed - errors, fetch

Author: xgram

src/swap/central/xgram.ts

@@ -1,13 +1,5 @@
 import { gt, lt } from 'biggystring'
-import {
-  asArray,
-  asBoolean,
-  asMaybe,
-  asObject,
-  asOptional,
-  asString,
-  Cleaner
-} from 'cleaners'
+import { asNumber, asObject, asOptional, asString, Cleaner } from 'cleaners'
 import {
   EdgeCorePluginOptions,
   EdgeMemo,
@@ -17,7 +9,8 @@ import {
   EdgeSwapQuote,
   EdgeSwapRequest,
   SwapAboveLimitError,
-  SwapBelowLimitError
+  SwapBelowLimitError,
+  SwapCurrencyError
 } from 'edge-core-js/types'
 
 import {
@@ -121,15 +114,13 @@ export const MAINNET_CODE_TRANSCRIPTION: CurrencyPluginIdSwapChainCodeMap = {
   sonic: null
 }
 
-let chainCodeTickerMap: ChainCodeTickerMap = new Map()
-let lastUpdated = 0
-const EXPIRATION = 1000 * 60 * 60
+const chainCodeTickerMap: ChainCodeTickerMap = new Map()
 
 const swapType: FlowType = 'fixed'
 type FlowType = 'fixed' | 'float'
 
 export function xgramPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
-  const { io, log } = opts
+  const { io } = opts
 
   const fetchCors = io.fetch
   const { apiKey } = asInitOptions(opts.initOptions)
@@ -139,53 +130,9 @@ export function xgramPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     'x-api-key': apiKey
   }
 
-  async function fetchSupportedAssets(): Promise<void> {
-    if (lastUpdated > Date.now() - EXPIRATION && lastUpdated !== 0) return
-    try {
-      const response = await fetchCors(`${uri}list-currency-options`, {
-        headers
-      })
-
-      if (!response.ok) {
-        log.warn('Xgram: list-currency-options HTTP error', response.status)
-        return
-      }
-
-      const json = await response.json()
-      const jsonArr = Object.entries(json).map(([key, data]) => ({
-        ...(data as object),
-        coinName: key
-      }))
-      const assets = asXgramAssets(jsonArr)
-
-      const mainnetValueToPlugin: Record<string, string> = {}
-      for (const [pluginIdKey, mainnetCode] of Object.entries(
-        MAINNET_CODE_TRANSCRIPTION
-      )) {
-        if (mainnetCode != null) mainnetValueToPlugin[mainnetCode] = pluginIdKey
-      }
-
-      const out: ChainCodeTickerMap = new Map()
-      for (const asset of assets) {
-        const pluginKey = mainnetValueToPlugin[asset.coinName]
-
-        const tokenCodes = out.get(pluginKey) ?? []
-        tokenCodes.push({
-          tokenCode: asset.coinName,
-          contractAddress: asset.contract ?? null
-        })
-        out.set(pluginKey, tokenCodes)
-      }
-
-      chainCodeTickerMap = out
-      lastUpdated = Date.now()
-    } catch (e) {
-      log.warn('Xgram: Error updating supported assets', e)
-    }
-  }
-
   const fetchSwapQuoteInner = async (
-    request: EdgeSwapRequestPlugin
+    request: EdgeSwapRequestPlugin,
+    opts: { promoCode?: string }
   ): Promise<SwapOrder> => {
     const { fromWallet, toWallet, nativeAmount } = request
 
@@ -235,8 +182,6 @@ export function xgramPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
       )
 
       if (!orderResponse.ok) {
-        const text = await orderResponse.text().catch(() => '')
-        log.warn('Xgram: create order HTTP error', orderResponse.status, text)
         throw new Error('Xgram create order failed')
       }
 
@@ -294,44 +239,52 @@ export function xgramPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
       const marketRangeResponse = await fetchCors(uri + rateQs, { headers })
 
       if (!marketRangeResponse.ok) {
-        const text = await marketRangeResponse.text().catch(() => '')
-        log.warn(
-          'Xgram: retrieve-rate-value HTTP error',
-          marketRangeResponse.status,
-          text
-        )
         throw new Error('Xgram retrieve-rate-value failed')
       }
+      const marketRangeResponseJson: {
+        result: boolean
+        error?: string
+      } = await marketRangeResponse.json()
+
+      // Below/Above limits errors
+      // Unsupported currency error
+      if (!marketRangeResponseJson.result) {
+        const { minFromCcyAmount, maxFromCcyAmount } = asMarketRange(
+          marketRangeResponseJson
+        )
+        const minFrom = minFromCcyAmount.toString()
+        const maxFrom = maxFromCcyAmount.toString()
 
-      const marketRangeResponseJson = await marketRangeResponse.json()
-      const { minFrom, maxFrom } = asMarketRange(marketRangeResponseJson)
+        if (marketRangeResponseJson.error === 'Pair not found') {
+          throw new SwapCurrencyError(swapInfo, request)
+        }
 
-      if (lt(largeDenomAmount, minFrom)) {
-        const minNativeAmount = denominationToNative(
-          isSelling ? request.fromWallet : request.toWallet,
-          minFrom,
-          isSelling ? request.fromTokenId : request.toTokenId
-        )
-        throw new SwapBelowLimitError(
-          swapInfo,
-          minNativeAmount,
-          isSelling ? undefined : 'to'
-        )
-      }
+        if (lt(largeDenomAmount, minFrom)) {
+          const minNativeAmount = denominationToNative(
+            isSelling ? request.fromWallet : request.toWallet,
+            minFrom,
+            isSelling ? request.fromTokenId : request.toTokenId
+          )
+          throw new SwapBelowLimitError(
+            swapInfo,
+            minNativeAmount,
+            isSelling ? undefined : 'to'
+          )
+        }
 
-      if (gt(largeDenomAmount, maxFrom)) {
-        const maxNativeAmount = denominationToNative(
-          isSelling ? request.fromWallet : request.toWallet,
-          maxFrom,
-          isSelling ? request.fromTokenId : request.toTokenId
-        )
-        throw new SwapAboveLimitError(
-          swapInfo,
-          maxNativeAmount,
-          isSelling ? undefined : 'to'
-        )
+        if (gt(largeDenomAmount, maxFrom)) {
+          const maxNativeAmount = denominationToNative(
+            isSelling ? request.fromWallet : request.toWallet,
+            maxFrom,
+            isSelling ? request.fromTokenId : request.toTokenId
+          )
+          throw new SwapAboveLimitError(
+            swapInfo,
+            maxNativeAmount,
+            isSelling ? undefined : 'to'
+          )
+        }
       }
-
       const {
         fromAmount,
         toAmount,
@@ -421,19 +374,27 @@ export function xgramPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
   const out: EdgeSwapPlugin = {
     swapInfo,
 
-    async fetchSwapQuote(req: EdgeSwapRequest): Promise<EdgeSwapQuote> {
+    async fetchSwapQuote(
+      req: EdgeSwapRequest,
+      userSettings: Object | undefined,
+      opts: { promoCode?: string }
+    ): Promise<EdgeSwapQuote> {
       const request = convertRequest(req)
 
-      await fetchSupportedAssets()
+      // await fetchSupportedAssets()
 
       checkWhitelistedMainnetCodes(
         MAINNET_CODE_TRANSCRIPTION,
         request,
         swapInfo
       )
 
-      const newRequest = await getMaxSwappable(fetchSwapQuoteInner, request)
-      const swapOrder = await fetchSwapQuoteInner(newRequest)
+      const newRequest = await getMaxSwappable(
+        fetchSwapQuoteInner,
+        request,
+        opts
+      )
+      const swapOrder = await fetchSwapQuoteInner(newRequest, opts)
       return await makeSwapPluginQuote(swapOrder)
     }
   }
@@ -450,8 +411,8 @@ export function asOptionalBlank<T>(
 }
 
 const asMarketRange = asObject({
-  maxFrom: asString,
-  minFrom: asString
+  maxFromCcyAmount: asNumber,
+  minFromCcyAmount: asNumber
 })
 
 interface XgramResponse {
@@ -462,12 +423,3 @@ interface XgramResponse {
   payinAddress: string
   validUntil?: Date | null
 }
-
-const asXgramAssets = asArray(
-  asObject({
-    coinName: asString,
-    network: asString,
-    available: asBoolean,
-    contract: asMaybe(asString, null)
-  })
-)