fixup! Add loop fetch meta tokens from info server

Author: Lex Peterson

src/ethereum/ethEngine.js

@@ -46,7 +46,6 @@ import {
   type EthereumTxOtherParams,
   type EthereumWalletOtherData,
   type LastEstimatedGasLimit,
-  type MetaToken,
   type MetaTokenMap,
   asEthereumFees,
   asMetaTokenMap
@@ -209,23 +208,7 @@ export class EthereumEngine extends CurrencyEngine {
       const valid = asMaybe(asMetaTokenMap)(jsonObj) != null
 
       if (valid) {
-        for (const contractAddress in jsonObj) {
-          const { name, symbol, decimals, iconUrl }: MetaToken =
-            jsonObj[contractAddress]
-
-          this.allTokens.push({
-            currencyCode: symbol,
-            currencyName: name,
-            denominations: [
-              {
-                name: symbol,
-                multiplier: Math.pow(10, decimals).toString()
-              }
-            ],
-            symbolImage: iconUrl,
-            contractAddress
-          })
-        }
+        this.allTokens.push(...jsonObj)
       } else {
         this.log.error(
           `Error: Fetched invalid metaTokens ${JSON.stringify(jsonObj)}`
@@ -244,13 +227,13 @@ export class EthereumEngine extends CurrencyEngine {
 
     Formula:
       fee = baseMultiplier * baseFee + minPriorityFee
-    
+
     Where:
       minPriorityFee = <minimum priority fee from info server>
       baseFee = <latest block's base fee>
       baseMultiplier = <multiplier from info server for low, standard, high, etc>
 
-    Reference analysis for choosing 2 gwei minimum priority fee: 
+    Reference analysis for choosing 2 gwei minimum priority fee:
       https://hackmd.io/@q8X_WM2nTfu6nuvAzqXiTQ/1559-wallets#:~:text=2%20gwei%20is%20probably%20a%20very%20good%20default
     */
 

src/ethereum/ethTypes.js

@@ -78,16 +78,21 @@ export const asEthereumFees = asObject<EthereumFee>(asEthereumFee)
 export type EthereumFees = $Call<typeof asEthereumFees>
 
 export const asMetaToken = asObject({
-  name: asString,
-  symbol: asString,
-  decimals: asNumber,
-  tradable: asBoolean,
-  iconUrl: asString
+  currencyCode: asString,
+  currencyName: asString,
+  denominations: asArray(
+    asObject({
+      name: asString,
+      multiplier: asString
+    })
+  ),
+  symbolImage: asOptional(asString),
+  contractAddress: asOptional(asString)
 })
 
 export type MetaToken = $Call<typeof asMetaToken>
 
-export const asMetaTokenMap = asObject<MetaToken>(asMetaToken)
+export const asMetaTokenMap = asArray<MetaToken>(asMetaToken)
 
 export type MetaTokenMap = $Call<typeof asMetaTokenMap>