wip: scale-ts

TalismanSociety · Apr 17, 2024 · 8cda5cd · 8cda5cd
1 parent f161a4a
commit 8cda5cd
Show file tree

Hide file tree

Showing 22 changed files with 823 additions and 706 deletions.
diff --git a/apps/balances-demo/src/main.tsx b/apps/balances-demo/src/main.tsx
@@ -3,11 +3,14 @@ import "anylogger-loglevel"
 import "./index.css"
 
 import { BalancesProvider } from "@talismn/balances-react"
+import loglevel from "loglevel"
 import { StrictMode, useState } from "react"
 import { createRoot } from "react-dom/client"
 
 import { App } from "./App"
 
+loglevel.setLevel("info")
+
 const onfinalityApiKey = undefined
 
 const Root = () => {
@@ -28,16 +31,23 @@ const Root = () => {
         //   // westend
         //   "0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e",
         // ]}
-        // enabledTokens={[
-        //   // DOT (polkadot relay chain)
-        //   "polkadot-substrate-native",
-        //   // USDC (polkadot asset hub)
-        //   "polkadot-asset-hub-substrate-assets-1337-usdc",
-        //   // ETH (ethereum mainnet)
-        //   "1-evm-native",
-        //   // GM (gm chain)
-        //   "gm-substrate-tokens-gm",
-        // ]}
+        enabledTokens={[
+          "polkadot-substrate-native",
+          "acala-substrate-native",
+          "astar-substrate-native",
+          "composable-substrate-native",
+          "crust-substrate-native",
+          "hydradx-substrate-native",
+          "interlay-substrate-native",
+          "karura-substrate-native",
+          "kintsugi-substrate-native",
+          "mangata-substrate-native",
+          "moonbeam-substrate-native",
+          "moonriver-substrate-native",
+          "polimec-substrate-native",
+          "westend-testnet-substrate-native",
+          "rococo-testnet-substrate-native",
+        ]}
       >
         <App withTestnets={withTestnets} setWithTestnets={setWithTestnets} />
       </BalancesProvider>

diff --git a/packages/balances-react/src/atoms/balances.ts b/packages/balances-react/src/atoms/balances.ts
@@ -181,8 +181,8 @@ const balancesSubscriptionAtomEffect = atomEffect((get) => {
         addressesByTokenByModule[token.type][token.id] = allAddresses.filter((address) => {
           // for each address, fetch balances only from compatible chains
           return isEthereumAddress(address)
-            ? !!token.evmNetwork?.id || chainsById[token.chain?.id ?? ""]?.account === "secp256k1"
-            : !!token.chain?.id
+            ? token.evmNetwork?.id || chainsById[token.chain?.id ?? ""]?.account === "secp256k1"
+            : token.chain?.id && chainsById[token.chain?.id ?? ""]?.account !== "secp256k1"
         })
       })
 
@@ -212,11 +212,12 @@ const balancesSubscriptionAtomEffect = atomEffect((get) => {
       const hasChain = balance.chainId && chainIds.has(balance.chainId)
       const hasEvmNetwork = balance.evmNetworkId && evmNetworkIds.has(balance.evmNetworkId)
       const chainUsesSecp256k1Accounts = chain?.account === "secp256k1"
-      if (!isEthereumAddress(balance.address) && !hasChain) {
-        return true
+      if (!isEthereumAddress(balance.address)) {
+        if (!hasChain) return true
+        if (chainUsesSecp256k1Accounts) return true
       }
-      if (isEthereumAddress(balance.address) && !(hasEvmNetwork || chainUsesSecp256k1Accounts)) {
-        return true
+      if (isEthereumAddress(balance.address)) {
+        if (!hasEvmNetwork && !chainUsesSecp256k1Accounts) return true
       }
 
       // keep balance

diff --git a/packages/balances-react/src/atoms/chaindata.ts b/packages/balances-react/src/atoms/chaindata.ts
@@ -25,14 +25,12 @@ export const miniMetadatasAtom = atom(async (get) => (await get(chaindataAtom)).
 export const chaindataAtom = atomWithObservable((get) => {
   const enableTestnets = get(enableTestnetsAtom)
 
-  const filterTestnets = <T extends { id: string; isTestnet: boolean }>(items: T[]) =>
-    items.filter(({ id }) => ["polkadot", "polimec"].includes(id))
-  const filterMapTestnets = <T extends { id: string; isTestnet: boolean }>(
-    items: Record<string, T>
-  ) =>
-    Object.fromEntries(
-      Object.entries(items).filter(([, { id }]) => ["polkadot", "polimec"].includes(id))
-    )
+  const filterTestnets = <T extends { isTestnet: boolean }>(items: T[]) =>
+    enableTestnets ? items : items.filter(({ isTestnet }) => !isTestnet)
+  const filterMapTestnets = <T extends { isTestnet: boolean }>(items: Record<string, T>) =>
+    enableTestnets
+      ? items
+      : Object.fromEntries(Object.entries(items).filter(([, { isTestnet }]) => !isTestnet))
 
   const filterEnabledTokens = (tokens: Token[]) =>
     tokens.filter((token) => token.isDefault || ("isCustom" in token && token.isCustom))

diff --git a/packages/balances/src/MiniMetadataUpdater.ts b/packages/balances/src/MiniMetadataUpdater.ts
@@ -233,7 +233,23 @@ export class MiniMetadataUpdater {
       await balancesDb.miniMetadatas.bulkDelete(unwantedIds)
     }
 
-    const needUpdates = ["polkadot", "astar", "hydradx", "polimec"]
+    const needUpdates = [
+      "polkadot",
+      "acala",
+      "astar",
+      "composable",
+      "crust",
+      "hydradx",
+      "interlay",
+      "karura",
+      "kintsugi",
+      "mangata",
+      "moonbeam",
+      "moonriver",
+      "polimec",
+      "westend-testnet",
+      "rococo-testnet",
+    ]
     // const needUpdates = Array.from(statusesByChain.entries())
     //   .filter(([, status]) => status !== "good")
     //   .map(([chainId]) => chainId)