Update testnet preview matcher (#48)

npm/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @penumbra-labs/registry
 
+## 9.1.1
+
+### Patch Changes
+
+- Fix testnet-preview parsing
+
 ## 9.1.0
 
 ### Minor Changes

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penumbra-labs/registry",
-  "version": "9.1.0",
+  "version": "9.1.1",
   "description": "Chain and asset registry for Penumbra",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -26,7 +26,7 @@
     "tsup": "^8.1.0",
     "typescript": "^5.5.2",
     "typescript-eslint": "^7.14.1",
-    "vite": "^5.3.1",
+    "vite": "^5.3.2",
     "vite-plugin-dts": "^3.9.1",
     "vitest": "^1.6.0"
   },

npm/src/client.test.ts

@@ -16,7 +16,7 @@ describe('ChainRegistryClient', () => {
   });
 
   it('handles preview chain IDs by swapping them', () => {
-    const registry = client.get('penumbra-testnet-deimos-7-711be12a');
+    const registry = client.get('penumbra-testnet-deimos-7-xf2dbce94');
     expect(registry).toBeInstanceOf(Registry);
     expect(registry.chainId).toEqual('penumbra-testnet-deimos-7');
   });

npm/src/utils/testnet-parser.test.ts

@@ -3,10 +3,10 @@ import { deriveTestnetChainIdFromPreview, isTestnetPreviewChainId } from './test
 
 describe('testnet-preview helper', () => {
   it('should correctly identify testnet-preview chain-id', () => {
-    expect(isTestnetPreviewChainId('penumbra-testnet-deimos-6-711be12a')).toBeTruthy();
-    expect(isTestnetPreviewChainId('penumbra-testnet-deimos-222-711be12a')).toBeTruthy();
-    expect(isTestnetPreviewChainId('penumbra-testnet-rhea-8b2dfc5c')).toBeTruthy();
-    expect(isTestnetPreviewChainId('penumbra-testnet-tethy12-8777cb20')).toBeTruthy();
+    expect(isTestnetPreviewChainId('penumbra-testnet-deimos-8-xf2dbce94')).toBeTruthy();
+    expect(isTestnetPreviewChainId('penumbra-testnet-deimos-x0044bb22')).toBeTruthy();
+    expect(isTestnetPreviewChainId('penumbra-testnet-rhea-xff99ee10')).toBeTruthy();
+    expect(isTestnetPreviewChainId('penumbra-testnet-tethy12-xb4d8f9a0')).toBeTruthy();
   });
 
   it('should not identify chain-id as testnet-preview', () => {
@@ -16,13 +16,13 @@ describe('testnet-preview helper', () => {
   });
 
   it('should correctly derive testnet chain-id from testnet-preview chain-id', () => {
-    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-deimos-6-711be12a')).toEqual(
-      'penumbra-testnet-deimos-6',
+    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-deimos-8-xf2dbce94')).toEqual(
+      'penumbra-testnet-deimos-8',
     );
-    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-rhea-8b2dfc5c')).toEqual(
+    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-rhea-x0044bb22')).toEqual(
       'penumbra-testnet-rhea',
     );
-    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-tethys12-8777cb20')).toEqual(
+    expect(deriveTestnetChainIdFromPreview('penumbra-testnet-tethys12-xb4d8f9a0')).toEqual(
       'penumbra-testnet-tethys12',
     );
   });

npm/src/utils/testnet-parser.ts

@@ -1,13 +1,10 @@
-const TESTNET_PREVIEW_PATTERN = /^(penumbra-testnet-(?:\w+-)*\w+)-[a-f0-9]{8}$/;
-
-export const isTestnetPreviewChainId = (chainId: string) => {
-  return TESTNET_PREVIEW_PATTERN.test(chainId);
+// Test preview chain ids end with -x followed by a hexadecimal string
+export const isTestnetPreviewChainId = (chainId: string): boolean => {
+  const previewRegex = /-x[0-9a-f]+$/i;
+  return previewRegex.test(chainId);
 };
 
-export const deriveTestnetChainIdFromPreview = (previewChainId: string): string | undefined => {
-  const match = previewChainId.match(TESTNET_PREVIEW_PATTERN);
-  if (match) {
-    return match[1];
-  }
-  return undefined;
+export const deriveTestnetChainIdFromPreview = (previewChainId: string): string => {
+  const index = previewChainId.lastIndexOf('-x');
+  return previewChainId.substring(0, index);
 };