update

Author: aditya520

apps/api-reference/src/components/EvmProvider/index.tsx

@@ -2,7 +2,7 @@
 
 import {
   getEvmChainRpcUrl,
-  getAllEvmChainsIds,
+  allEvmChainIds,
 } from "@pythnetwork/contract-manager/utils/utils";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ConnectKitProvider, getDefaultConfig } from "connectkit";
@@ -13,7 +13,7 @@ import { WagmiProvider, createConfig, http, useChainId } from "wagmi";
 
 import { metadata } from "../../metadata";
 
-const CHAINS = getAllEvmChainsIds
+const CHAINS = allEvmChainIds
   .map((id) => Object.values(chains).find((chain) => chain.id === id))
   .filter((chain) => chain !== undefined) as unknown as readonly [
   chains.Chain,

contract_manager/src/utils/utils.ts

@@ -3,56 +3,52 @@ import evmPriceFeedContractsData from "../../store/contracts/EvmPriceFeedContrac
 import evmWormholeContractsData from "../../store/contracts/EvmWormholeContracts.json";
 import * as chains from "viem/chains";
 
+export const allEvmChainIds: number[] = evmChainsData.map((c) => c.networkId);
+
 export const getEvmPriceFeedContractAddress = (
   chainId: number,
 ): `0x${string}` | undefined => {
-  const chain = evmChainsData.find((c) => c.networkId === chainId);
-  if (!chain) {
-    return undefined;
-  }
-  const contract = evmPriceFeedContractsData.find((c) => c.chain === chain.id);
-  if (!contract?.address || !contract.address.startsWith("0x")) {
-    return undefined;
-  }
-  return contract.address as `0x${string}`;
+  return getContractAddress(chainId, evmPriceFeedContractsData);
 };
 
 export const getEvmWormholeContractAddress = (
   chainId: number,
+): `0x${string}` | undefined => {
+  return getContractAddress(chainId, evmWormholeContractsData);
+};
+
+const getContractAddress = (
+  chainId: number,
+  contractsData: { chain: string; address: string }[],
 ): `0x${string}` | undefined => {
   const chain = evmChainsData.find((c) => c.networkId === chainId);
-  if (!chain) {
-    return undefined;
-  }
-  const contract = evmWormholeContractsData.find((c) => c.chain === chain.id);
-  if (!contract?.address || !contract.address.startsWith("0x")) {
+  if (chain === undefined) {
     return undefined;
+  } else {
+    const contract = contractsData.find((c) => c.chain === chain.id);
+    if (contract?.address === undefined) {
+      return undefined;
+    } else if (isZeroXString(contract.address)) {
+      return contract.address as `0x${string}`;
+    } else {
+      throw new Error(
+        `Invariant failed: invalid contract address ${contract.address} for chain ${contract.chain}`,
+      );
+    }
   }
-  return contract.address as `0x${string}`;
 };
 
-export const getAllEvmChainsIds: number[] = evmChainsData.map(
-  (c) => c.networkId,
-);
+const isZeroXString = (str: string): str is `0x${string}` =>
+  str.startsWith("0x") && str.length === 42;
 
 export const getEvmChainRpcUrl = (chainId: number): string | undefined => {
   const chain = evmChainsData.find((c) => c.networkId === chainId);
-  if (!chain) {
+  if (chain === undefined) {
     return undefined;
+  } else {
+    const viemChain = Object.values(chains).find(
+      (c) => c.id === Number.parseInt(chain.id, 10),
+    );
+    return viemChain?.rpcUrls.default.http[0] ?? chain.rpcUrl;
   }
-
-  // Let's try to use the viem chains without checking if they are working
-  const viemChain = Object.values(chains).find(
-    (c) => c.id === Number(chain.id),
-  );
-  if (viemChain && viemChain.rpcUrls && viemChain.rpcUrls.default) {
-    return viemChain.rpcUrls.default.http[0];
-  }
-
-  // Now let's try to use the json rpc url
-  if (chain.rpcUrl) {
-    return chain.rpcUrl;
-  }
-
-  return undefined;
 };