fixup! Use ratex v3 if transactions has full pluginId/tokenId values

Author: paullinator

src/ratesEngine.ts

@@ -6,10 +6,10 @@ import { config } from './config'
 import {
   asDbCurrencyCodeMappings,
   asDbTx,
-  asV3RatesParams,
+  asRatesV3Params,
   CurrencyCodeMappings,
   DbTx,
-  V3RatesParams
+  RatesV3Params
 } from './types'
 import { datelog, safeParseFloat, standardizeNames } from './util'
 import { isFiatCurrency } from './util/fiatCurrency'
@@ -125,7 +125,7 @@ async function updateTxValuesV3(transaction: DbTx): Promise<void> {
 
   let depositIsFiat = false
   let payoutIsFiat = false
-  const ratesRequest: V3RatesParams = {
+  const ratesRequest: RatesV3Params = {
     targetFiat: 'USD',
     crypto: [],
     fiat: []
@@ -184,7 +184,7 @@ async function updateTxValuesV3(transaction: DbTx): Promise<void> {
     body: JSON.stringify(ratesRequest)
   })
   const ratesResponseJson = await ratesResponse.json()
-  const rates = asV3RatesParams(ratesResponseJson)
+  const rates = asRatesV3Params(ratesResponseJson)
   const depositRateObf = depositIsFiat
     ? rates.fiat.find(rate => rate.fiatCode === depositCurrency)
     : rates.crypto.find(
@@ -236,27 +236,17 @@ async function updateTxValues(
   transaction: DbTx,
   mappings: CurrencyCodeMappings
 ): Promise<void> {
-  if (
+  const hasDepositPluginInfo =
     transaction.depositChainPluginId != null &&
-    transaction.depositTokenId !== undefined &&
+    transaction.depositTokenId !== undefined
+  const hasPayoutPluginInfo =
     transaction.payoutChainPluginId != null &&
     transaction.payoutTokenId !== undefined
-  ) {
-    return await updateTxValuesV3(transaction)
-  }
-
-  if (
-    transaction.depositChainPluginId != null &&
-    transaction.depositTokenId !== undefined &&
-    isFiatCurrency(transaction.payoutCurrency)
-  ) {
-    return await updateTxValuesV3(transaction)
-  }
 
   if (
-    isFiatCurrency(transaction.depositCurrency) &&
-    transaction.payoutChainPluginId != null &&
-    transaction.payoutTokenId !== undefined
+    (hasDepositPluginInfo && hasPayoutPluginInfo) ||
+    (hasDepositPluginInfo && isFiatCurrency(transaction.payoutCurrency)) ||
+    (isFiatCurrency(transaction.depositCurrency) && hasPayoutPluginInfo)
   ) {
     return await updateTxValuesV3(transaction)
   }

src/types.ts

@@ -212,27 +212,27 @@ export const asAnalyticsResult = asObject({
 })
 
 // v3/rates response cleaner (matches GUI's shape)
-const asV3CryptoAsset = asObject({
+const asRatesV3CryptoAsset = asObject({
   pluginId: asString,
   tokenId: asOptional(asEither(asString, asNull))
 })
-const asV3CryptoRate = asObject({
+const asRatesV3CryptoRate = asObject({
   isoDate: asOptional(asDate),
-  asset: asV3CryptoAsset,
+  asset: asRatesV3CryptoAsset,
   rate: asOptional(asNumber)
 })
-const asV3FiatRate = asObject({
+const asRatesV3FiatRate = asObject({
   isoDate: asOptional(asDate),
   fiatCode: asString,
   rate: asOptional(asNumber)
 })
-export const asV3RatesParams = asObject({
+export const asRatesV3Params = asObject({
   targetFiat: asString,
-  crypto: asArray(asV3CryptoRate),
-  fiat: asArray(asV3FiatRate)
+  crypto: asArray(asRatesV3CryptoRate),
+  fiat: asArray(asRatesV3FiatRate)
 })
 
-export type V3RatesParams = ReturnType<typeof asV3RatesParams>
+export type RatesV3Params = ReturnType<typeof asRatesV3Params>
 export type Bucket = ReturnType<typeof asBucket>
 export type AnalyticsResult = ReturnType<typeof asAnalyticsResult>