refactor methods of AssetRegistry (#55)

TheDotflow · Aug 20, 2023 · dde0fb3 · dde0fb3
1 parent 86e7742
commit dde0fb3
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 12 deletions.
diff --git a/__tests__/assetRegistry.test.ts b/__tests__/assetRegistry.test.ts
@@ -27,6 +27,32 @@ describe('AssetRegistry', () => {
     ]);
   });
 
+  test('Getting assets by para id works', async () => { 
+    const assets = await AssetRegistry.getAssetsOnBlockchain(
+      'polkadot',
+      0
+    );
+
+    expect(assets).toStrictEqual([
+      {
+        asset: {
+          Token: 'DOT',
+        },
+        name: 'DOT',
+        symbol: 'DOT',
+        decimals: 10,
+        xcmInteriorKey: [
+          {
+            network: 'polkadot',
+          },
+          'here',
+        ],
+        inferred: true,
+        confidence: 0,
+      },
+    ]);
+  });
+
   test("Checking whether an asset exists on both chains works", async () => {
     const GLMR = [
       {

diff --git a/src/utils/assetRegistry.ts b/src/utils/assetRegistry.ts
@@ -1,5 +1,9 @@
 import axios from 'axios';
 
+type ChainId = number | string;
+
+type RelayChain = 'polkadot' | 'kusama';
+
 type Asset = {
   asset: any;
   name: string;
@@ -29,13 +33,13 @@ const xcmGAR =
 
 class AssetRegistry {
   public static async getAssetsOnBlockchain(
-    network: 'polkadot' | 'kusama',
-    chain: string
+    relay: RelayChain,
+    chain: ChainId
   ): Promise<Asset[]> {
     const blockchains = (await axios.get(xcmGAR)).data;
 
-    const blockchain = blockchains.assets[network].find(
-      (b: any) => b.id.toLowerCase() == chain.toLowerCase()
+    const blockchain = blockchains.assets[relay].find(
+      (b: any) => (typeof chain === 'string') ? b.id.toLowerCase() == chain.toLowerCase() : b.paraID === chain
     );
 
     if (!blockchain) {
@@ -138,23 +142,23 @@ class AssetRegistry {
   }
 
   public static async isSupportedOnBothChains(
-    network: 'polkadot' | 'kusama',
-    chainA: string,
-    chainB: string,
+    relay: RelayChain,
+    chainA: ChainId,
+    chainB: ChainId,
     asset: any
   ): Promise<boolean> {
-    const foundOnChainA = await this.isSupportedOnChain(network, chainA, asset);
-    const foundOnChainB = await this.isSupportedOnChain(network, chainB, asset);
+    const foundOnChainA = await this.isSupportedOnChain(relay, chainA, asset);
+    const foundOnChainB = await this.isSupportedOnChain(relay, chainB, asset);
 
     return foundOnChainA && foundOnChainB;
   }
 
   public static async isSupportedOnChain(
-    network: 'polkadot' | 'kusama',
-    chain: string,
+    relay: RelayChain,
+    chain: ChainId,
     asset: any
   ): Promise<boolean> {
-    const assets = await this.getAssetsOnBlockchain(network, chain);
+    const assets = await this.getAssetsOnBlockchain(relay, chain);
 
     const found = assets.find(
       (el: Asset) =>