From fb3b1f0fcd6175b5e706f99f82c00ab356da3714 Mon Sep 17 00:00:00 2001
From: Tim <tim@dexorder.trade>
Date: Tue, 26 Mar 2024 14:55:07 -0400
Subject: [PATCH] token metadata fixes for vault and orders view; faucet fix

---
 faucet.js | 18 +++++++++---------
 token.js  |  9 ++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/faucet.js b/faucet.js
index 6cd44fc..6700f69 100644
--- a/faucet.js
+++ b/faucet.js
@@ -19,18 +19,18 @@ export async function gib( chainId, owner, vault, tokenAmounts ) {
         let nonce = await provider.getTransactionCount(address, 'pending')
         const signer = await provider.getSigner()  // regular server signer not the #8 faucet
         for (const [token, amount] of Object.entries(tokenAmounts)) {
-            if (!(token in mock_token_decimals)) {
-                const contract = erc20(chainId, token)
-                mock_token_decimals[token] = Number(await contract.decimals())
-            }
-            const bAmount = BigInt(Math.trunc(amount * 10**mock_token_decimals[token]))
+            // if (!(token in mock_token_decimals)) {
+            //     const contract = erc20(chainId, token)
+            //     mock_token_decimals[token] = Number(await contract.decimals())
+            // }
+            // const bAmount = BigInt(Math.trunc(amount * 10**mock_token_decimals[token]))
             if (token==='') {
-                console.log(`faucet sending native coin to ${owner}`)
-                await faucet.sendTransaction({to:owner, value:bAmount, nonce: nonce++})
+                console.log(`faucet sending native coin to ${owner} +${amount}`)
+                await faucet.sendTransaction({to:owner, value:amount, nonce: nonce++})
             }
             else {
-                console.log(`sending ${token} coin to ${vault}`)
-                await new ethers.Contract(token, mockErc20Abi, signer).mint(vault, bAmount)
+                console.log(`sending ${token} coin to ${vault} +${amount}`)
+                await new ethers.Contract(token, mockErc20Abi, signer).mint(vault, amount)
             }
         }
 
diff --git a/token.js b/token.js
index 3b77d74..6635e73 100644
--- a/token.js
+++ b/token.js
@@ -34,12 +34,11 @@ export async function lookupToken(chainId, address) {
         if (result === undefined) {
             // todo look in tokens project
             const addr = ethers.getAddress(address)
-            // console.log('addr', addr)
             const token = erc20(chainId, addr)
-            const symbol = await token.symbol()
-            // console.log('symbol', symbol)
-            const decimals = Number(await token.decimals())
-            result = {name: null, symbol, decimals, address: addr}
+            let [name, symbol, decimals] = await Promise.all([token.name(), token.symbol(), token.decimals()])
+            name = Number(name)
+            decimals = Number(decimals)
+            result = {a: addr, n: name, s:symbol, d:decimals}
             chainTokens[addr] = result
         }
         return result