From 748201eaf699f8a528e64b9ab1bcc45da8b38c51 Mon Sep 17 00:00:00 2001
From: Tim <tim@dexorder.trade>
Date: Mon, 18 Mar 2024 22:23:20 -0400
Subject: [PATCH] finaldata fixes

---
 dexorder-finaldata.toml  |  1 +
 metadata-finaldata.json  | 25 +++++++++++++------------
 src/dexorder/metadata.py |  4 ++--
 src/dexorder/tokens.py   |  5 +++--
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/dexorder-finaldata.toml b/dexorder-finaldata.toml
index 10bf7e6..2f282b3 100644
--- a/dexorder-finaldata.toml
+++ b/dexorder-finaldata.toml
@@ -1,3 +1,4 @@
+metadata='metadata.json'  # the Dockerfile will move metadata-finaldata.json into positon
 ohlc_dir='/ohlc'
 rpc_url='https://arb-mainnet.g.alchemy.com/v2/fneXR05VTXzNS6ApcPd-QuyX-gv7AWzL'
 account='test1' # Dev Account #1
diff --git a/metadata-finaldata.json b/metadata-finaldata.json
index 3f4d49d..dded459 100644
--- a/metadata-finaldata.json
+++ b/metadata-finaldata.json
@@ -2,23 +2,28 @@
   "42161": {
     "t": [
       {
-        "a": "0x2653aB60a6fD19d3e1f4E729412C219257CA6e24",
-        "n": "USD Coin (Arbitrum Native)",
-        "s": "USDC",
-        "d": 6
-      },
-      {
-        "a": "0x87b60276434d5cB5CE46d2316B596c7Bc5f87cCA",
+        "a": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
         "n": "Wrapped Ether",
         "s": "WETH",
         "d": 18
       },
       {
-        "a": "0xEaD55ce1cC577C8020F5FcE39D4e5C643F591a0c",
+        "a": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+        "n": "USD Coin (Arbitrum Native)",
+        "s": "USDC",
+        "d": 6
+      },
+      {
+        "a": "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
         "n": "USD Coin (Ethereum Bridged)",
         "s": "USDC.e",
         "d": 6
       },
+      {
+        "a": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
+        "n": "Tether USD",
+        "s": "USDT"
+      },
       {
         "a": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f",
         "s": "WBTC"
@@ -31,10 +36,6 @@
         "a": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
         "s": "GRT"
       },
-      {
-        "a": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
-        "s": "USDT"
-      },
       {
         "a": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
         "s": "DAI"
diff --git a/src/dexorder/metadata.py b/src/dexorder/metadata.py
index 3642981..51dcd7f 100644
--- a/src/dexorder/metadata.py
+++ b/src/dexorder/metadata.py
@@ -144,9 +144,9 @@ def get_metadata(addr=None, *, chain_id=None):
             else:
                 for chain_id, chain_info in metadata.items():
                     chain_id = int(chain_id)
-                    for t in chain_info['t']:
+                    for t in chain_info.get('t',[]):
                         metadata_by_chainaddr[chain_id,t['a']] = t
-                    for p in chain_info['p']:
+                    for p in chain_info.get('p',[]):
                         metadata_by_chainaddr[chain_id,p['a']] = p
                 log.info(f'Loaded metadata from {config.metadata}')
     return metadata if addr is None else metadata_by_chainaddr.get((chain_id,addr))
diff --git a/src/dexorder/tokens.py b/src/dexorder/tokens.py
index 66c7278..8f93320 100644
--- a/src/dexorder/tokens.py
+++ b/src/dexorder/tokens.py
@@ -45,10 +45,10 @@ async def load_token(address: str) -> Optional[TokenDict]:
         log.warning(f'token {address} has no decimals()')
         decimals = 0
     name = await name_prom
-    log.debug(f'new token {name} {symbol} {address}')
+    approved = config.metadata is None
     chain_id = current_chain.get().chain_id
     td = TokenDict(type='Token', chain=chain_id, address=address,
-                   name=name, symbol=symbol, decimals=decimals, approved=config.metadata is None)
+                   name=name, symbol=symbol, decimals=decimals, approved=approved)
     md = get_metadata(address, chain_id=chain_id)
     if md is not None:
         td['approved'] = True
@@ -58,4 +58,5 @@ async def load_token(address: str) -> Optional[TokenDict]:
             td['symbol'] = md['s']
         if 'd' in md:
             td['decimals'] = md['d']
+    log.debug(f'new token {name} {symbol} {address}{" approved" if approved else ""}')
     return td