Make rpcs+frontends global values (#46)

prax-wallet · Jun 6, 2024 · 1d61fc5 · 1d61fc5
1 parent 1327472
commit 1d61fc5
Show file tree

Hide file tree

Showing 21 changed files with 246 additions and 161 deletions.
diff --git a/input/penumbra-testnet-deimos-6.json → input/chains/penumbra-testnet-deimos-6.json b/input/penumbra-testnet-deimos-6.json → input/chains/penumbra-testnet-deimos-6.json
@@ -1,19 +1,5 @@
 {
   "chainId": "penumbra-testnet-deimos-6",
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
   "ibcConnections": [
     {
       "displayName": "Osmosis",

diff --git a/input/penumbra-testnet-deimos-7.json → input/chains/penumbra-testnet-deimos-7.json b/input/penumbra-testnet-deimos-7.json → input/chains/penumbra-testnet-deimos-7.json
@@ -1,19 +1,5 @@
 {
   "chainId": "penumbra-testnet-deimos-7",
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
   "ibcConnections": [
     {
       "displayName": "Osmosis",

diff --git a/input/penumbra-testnet-deimos-8.json → input/chains/penumbra-testnet-deimos-8.json b/input/penumbra-testnet-deimos-8.json → input/chains/penumbra-testnet-deimos-8.json
@@ -1,19 +1,5 @@
 {
   "chainId": "penumbra-testnet-deimos-8",
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
   "ibcConnections": [
     {
       "displayName": "Osmosis",

diff --git a/input/globals.json b/input/globals.json
@@ -0,0 +1,16 @@
+{
+  "rpcs": [
+    {
+      "name": "Penumbra Labs Testnet RPC",
+      "url": "https://grpc.testnet.penumbra.zone",
+      "images": [
+        {
+          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
+        }
+      ]
+    }
+  ],
+  "frontends": [
+    "https://app.testnet.penumbra.zone"
+  ]
+}
diff --git a/npm/CHANGELOG.md b/npm/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @penumbra-labs/registry
 
+## 8.0.0
+
+### Major Changes
+
+- New API for global rpcs & frontends
+
 ## 7.7.0
 
 ### Minor Changes

diff --git a/npm/package.json b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@penumbra-labs/registry",
-  "version": "7.7.0",
+  "version": "8.0.0",
   "description": "Chain and asset registry for Penumbra",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

diff --git a/npm/src/client.ts b/npm/src/client.ts
@@ -1,6 +1,6 @@
 import { deriveTestnetChainIdFromPreview, isTestnetPreviewChainId } from './utils/testnet-parser';
 import { Registry } from './registry';
-import { allJsonRegistries } from './json';
+import { allJsonRegistries, registryGlobals, RegistryGlobals } from './json';
 
 export class ChainRegistryClient {
   get(chainId: string): Registry {
@@ -13,6 +13,10 @@ export class ChainRegistryClient {
     return new Registry(jsonRegistry);
   }
 
+  globals(): RegistryGlobals {
+    return registryGlobals;
+  }
+
   version() {
     return {
       commit: __COMMIT_HASH__,

diff --git a/npm/src/json.ts b/npm/src/json.ts
@@ -1,14 +1,18 @@
-import * as Deimos6 from '../../registry/penumbra-testnet-deimos-6.json';
-import * as Deimos7 from '../../registry/penumbra-testnet-deimos-7.json';
-import * as Deimos8 from '../../registry/penumbra-testnet-deimos-8.json';
+import * as Deimos6 from '../../registry/chains/penumbra-testnet-deimos-6.json';
+import * as Deimos7 from '../../registry/chains/penumbra-testnet-deimos-7.json';
+import * as Deimos8 from '../../registry/chains/penumbra-testnet-deimos-8.json';
+import * as GlobalsJson from '../../registry/globals.json';
 
 import { Base64AssetId, Chain, Rpc } from './registry';
 
+export interface RegistryGlobals {
+  rpcs: Rpc[];
+  frontends: string[];
+}
+
 export interface JsonRegistry {
   chainId: string;
   ibcConnections: Chain[];
-  rpcs: Rpc[];
-  frontends: string[];
   assetById: Record<Base64AssetId, JsonMetadata>;
   stakingAssetId: Base64AssetId;
   numeraires: Base64AssetId[];
@@ -44,3 +48,5 @@ export const allJsonRegistries: Record<string, JsonRegistry> = {
   'penumbra-testnet-deimos-7': Deimos7,
   'penumbra-testnet-deimos-8': Deimos8,
 };
+
+export const registryGlobals = GlobalsJson;
diff --git a/npm/src/registry.test.ts b/npm/src/registry.test.ts
@@ -20,18 +20,6 @@ const testRegistry: JsonRegistry = {
       ],
     },
   ],
-  rpcs: [
-    {
-      name: 'Penumbra Labs Testnet RPC',
-      url: 'https://grpc.testnet.penumbra.zone',
-      images: [
-        {
-          png: 'https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png',
-        },
-      ],
-    },
-  ],
-  frontends: ['https://app.testnet.penumbra.zone'],
   assetById: {
     'KeqcLzNx9qSH5+lcJHBB9KNW+YPrBk5dKzvPMiypahA=': {
       denomUnits: [
@@ -106,10 +94,4 @@ describe('Registry', () => {
     const res = registry.getAllAssets();
     expect(res.length).toEqual(2);
   });
-
-  it('frontends are accessible', () => {
-    const registry = new Registry(testRegistry);
-    expect(registry.frontends.length).toEqual(1);
-    expect(registry.frontends[0]).toEqual('https://app.testnet.penumbra.zone');
-  });
 });
diff --git a/npm/src/registry.ts b/npm/src/registry.ts
@@ -36,8 +36,6 @@ export interface Image {
 export class Registry {
   public readonly chainId: string;
   public readonly ibcConnections: Chain[];
-  public readonly rpcs: Rpc[];
-  public readonly frontends: string[];
   public readonly stakingAssetId: AssetId;
   public readonly numeraires: AssetId[];
 
@@ -46,8 +44,6 @@ export class Registry {
   constructor(r: JsonRegistry) {
     this.chainId = r.chainId;
     this.ibcConnections = r.ibcConnections;
-    this.rpcs = r.rpcs;
-    this.frontends = r.frontends;
     this.assetById = mapObjectValues(r.assetById, jsonMetadata =>
       Metadata.fromJson(jsonMetadata as unknown as JsonValue),
     );

diff --git a/registry/penumbra-testnet-deimos-6.json → ...try/chains/penumbra-testnet-deimos-6.json b/registry/penumbra-testnet-deimos-6.json → ...try/chains/penumbra-testnet-deimos-6.json
@@ -26,20 +26,6 @@
       ]
     }
   ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
   "assetById": {
     "+jDercxZxs90BjC91PrWyA53/p7uN3ZcSJj3N0mHjhI=": {
       "description": "USDLR is a fiat-backed stablecoin issued by Stable. Stable pays DeFi protocols who distribute USDLR.",

diff --git a/registry/penumbra-testnet-deimos-7.json → ...try/chains/penumbra-testnet-deimos-7.json b/registry/penumbra-testnet-deimos-7.json → ...try/chains/penumbra-testnet-deimos-7.json
@@ -26,20 +26,6 @@
       ]
     }
   ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
   "assetById": {
     "+jDercxZxs90BjC91PrWyA53/p7uN3ZcSJj3N0mHjhI=": {
       "description": "USDLR is a fiat-backed stablecoin issued by Stable. Stable pays DeFi protocols who distribute USDLR.",

diff --git a/registry/penumbra-testnet-deimos-8.json → ...try/chains/penumbra-testnet-deimos-8.json b/registry/penumbra-testnet-deimos-8.json → ...try/chains/penumbra-testnet-deimos-8.json
@@ -26,20 +26,6 @@
       ]
     }
   ],
-  "frontends": [
-    "https://app.testnet.penumbra.zone"
-  ],
-  "rpcs": [
-    {
-      "name": "Penumbra Labs Testnet RPC",
-      "url": "https://grpc.testnet.penumbra.zone",
-      "images": [
-        {
-          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
-        }
-      ]
-    }
-  ],
   "assetById": {
     "/5AHh95RAybBbUhQ5zXMWCvstH4rRK/5KMVIVGQltAw=": {
       "denomUnits": [

diff --git a/registry/globals.json b/registry/globals.json
@@ -0,0 +1,16 @@
+{
+  "rpcs": [
+    {
+      "name": "Penumbra Labs Testnet RPC",
+      "url": "https://grpc.testnet.penumbra.zone",
+      "images": [
+        {
+          "png": "https://raw.githubusercontent.com/prax-wallet/registry/main/images/penumbra-favicon.png"
+        }
+      ]
+    }
+  ],
+  "frontends": [
+    "https://app.testnet.penumbra.zone"
+  ]
+}
diff --git a/tools/compiler/Cargo.lock b/tools/compiler/Cargo.lock
diff --git a/tools/compiler/Cargo.toml b/tools/compiler/Cargo.toml
@@ -4,8 +4,8 @@ version = "1.0.0"
 edition = "2021"
 
 [dependencies]
-penumbra-asset = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.77.1", package = "penumbra-asset" }
-penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.77.1", package = "penumbra-proto", default-features = false }
+penumbra-asset = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.77.2", package = "penumbra-asset" }
+penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.77.2", package = "penumbra-proto", default-features = false }
 
 anyhow = "1.0.86"
 futures = "0.3.30"