update

Author: aditya520

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

@@ -10,6 +10,7 @@ import {
   Label,
 } from "@headlessui/react";
 import { ArrowPathIcon } from "@heroicons/react/24/outline";
+import { getEvmContractAddress } from "@pythnetwork/contract-manager/utils/utils";
 import PythAbi from "@pythnetwork/pyth-sdk-solidity/abis/IPyth.json";
 import PythErrorsAbi from "@pythnetwork/pyth-sdk-solidity/abis/PythErrors.json";
 import { ChainIcon } from "connectkit";
@@ -29,7 +30,6 @@ import { ParameterInput } from "./parameter-input";
 import type { EvmApiType } from "./run-button";
 import { RunButton } from "./run-button";
 import { getLogger } from "../../browser-logger";
-import { getContractAddress } from "../../evm-networks";
 import { useIsMounted } from "../../use-is-mounted";
 import type { SupportedLanguage } from "../Code";
 import { Code } from "../Code";
@@ -251,7 +251,7 @@ export const EvmApi = <ParameterName extends string>({
                       ? {
                           name: currentChain.name,
                           rpcUrl: currentChain.rpcUrls.default.http[0] ?? "",
-                          contractAddress: getContractAddress(chainId) ?? "",
+                          contractAddress: getEvmContractAddress(chainId, "priceFeed"),
                         }
                       : { name: "", rpcUrl: "", contractAddress: "" },
                     paramValues,
@@ -294,7 +294,7 @@ const Example = <ParameterName extends string>({
   const updateValues = useCallback(() => {
     if (typeof example.parameters === "function") {
       setError(undefined);
-      const address = getContractAddress(config.state.chainId);
+      const address = getEvmContractAddress(config.state.chainId, "priceFeed");
       if (!address) {
         throw new Error(
           `No contract for chain id: ${config.state.chainId.toString()}`,

apps/api-reference/src/components/EvmApi/run-button.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { ArrowPathIcon } from "@heroicons/react/24/outline";
+import { getEvmContractAddress } from "@pythnetwork/contract-manager/utils/utils";
 import PythAbi from "@pythnetwork/pyth-sdk-solidity/abis/IPyth.json";
 import PythErrorsAbi from "@pythnetwork/pyth-sdk-solidity/abis/PythErrors.json";
 import { ConnectKitButton, Avatar } from "connectkit";
@@ -9,9 +10,9 @@ import { ContractFunctionExecutionError } from "viem";
 import { useAccount, useConfig } from "wagmi";
 import { readContract, simulateContract, writeContract } from "wagmi/actions";
 
+
 import type { Parameter } from "./parameter";
 import { TRANSFORMS } from "./parameter";
-import { getContractAddress } from "../../evm-networks";
 import { useIsMounted } from "../../use-is-mounted";
 import { Button } from "../Button";
 import { Code } from "../Code";
@@ -166,7 +167,7 @@ const useRunButton = <ParameterName extends string>({
     if (args === undefined) {
       setStatus(ErrorStatus(new Error("Invalid parameters!")));
     } else {
-      const address = getContractAddress(config.state.chainId);
+      const address = getEvmContractAddress(config.state.chainId, "priceFeed");
       if (!address) {
         throw new Error(
           `No contract for chain id: ${config.state.chainId.toString()}`,

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

@@ -1,35 +1,40 @@
 "use client";
 
+import { getEvmChainRpcUrl, getAllEvmChainsIds } from "@pythnetwork/contract-manager/utils/utils";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ConnectKitProvider, getDefaultConfig } from "connectkit";
 import { useTheme } from "next-themes";
 import type { ReactNode } from "react";
 import * as chains from "viem/chains";
 import { WagmiProvider, createConfig, http, useChainId } from "wagmi";
 
-import { NETWORK_IDS, getRpcUrl } from "../../evm-networks";
+
 import { metadata } from "../../metadata";
 
-const CHAINS = NETWORK_IDS.map((id) =>
+const CHAINS = getAllEvmChainsIds().map((id) =>
   Object.values(chains).find((chain) => chain.id === id),
 ).filter((chain) => chain !== undefined) as unknown as readonly [
   chains.Chain,
   ...chains.Chain[],
 ];
 
 const TRANSPORTS = Object.fromEntries(
-  CHAINS.map((chain) => {
-    const rpcUrl = getRpcUrl(chain.id);
-    if (rpcUrl) {
-      return [chain.id, http(rpcUrl)];
-    } else if (chain.rpcUrls.default.http[0]) {
-      return [chain.id, http(chain.rpcUrls.default.http[0])];
-    } else {
-      throw new Error(`No rpc url found for ${chain.name}`);
-    }
-  }),
+  CHAINS.map((chain) => [chain.id, http(getEvmChainRpcUrl(chain.id))]),
 );
 
+// TODO: Remove this once we have a way to get the TRANSPORTS from the contract manager
+// const chainEntries = await Promise.all(
+//   CHAINS.map(async (chain) => {
+//     const url = await getEvmChainRpcUrl(chain.id);
+//     return url ? [chain.id, http(url)] : undefined;
+//   }),
+// );
+
+// const TRANSPORTS = Object.fromEntries(
+//   chainEntries.filter((entry): entry is [number, ReturnType<typeof http>] => entry !== undefined)
+// ) as Record<number, ReturnType<typeof http>>;
+
+
 type EvmProviderProps = {
   children: ReactNode;
   walletConnectProjectId?: string | undefined;

apps/api-reference/src/evm-networks.ts

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/contract-manager",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Set of tools to manage pyth contracts",
   "private": true,
   "exports": {
@@ -23,6 +23,10 @@
     },
     "./data/vaults/*.json": {
       "default": "./store/vaults/*.json"
+    },
+    "./utils/*": {
+      "types": "./lib/utils/*.d.ts",
+      "default": "./lib/utils/*.js"
     }
   },
   "files": [

contract_manager/package.json

@@ -0,0 +1,91 @@
+import Web3 from 'web3';
+import evmChainsData from '../../store/chains/EvmChains.json';
+import evmPriceFeedContractsData from '../../store/contracts/EvmPriceFeedContracts.json';
+import evmWormholeContractsData from '../../store/contracts/EvmWormholeContracts.json';
+import * as chains from "viem/chains";
+
+export const getEvmContractAddress = (chainId: number, contractType: string): `0x${string}` => {
+  const chain = evmChainsData.find((c) => c.networkId === chainId);
+  if (!chain) {
+    throw new Error(`Chain with network ID ${chainId} not found`);
+  }
+  
+  if (contractType === 'priceFeed') {
+    const contract = evmPriceFeedContractsData.find((c) => c.chain === chain.id);
+    if (!contract) {
+      throw new Error(`Price feed contract not found for chain ${chainId}`);
+    }
+    return contract.address as `0x${string}`;
+  }
+  
+  if (contractType === 'wormhole') {
+    const contract = evmWormholeContractsData.find((c) => c.chain === chain.id);
+    if (!contract) {
+      throw new Error(`Wormhole contract not found for chain ${chainId}`);
+    }
+    return contract.address as `0x${string}`;
+  }
+  
+  throw new Error(`Unknown contract type: ${contractType}`);
+}
+
+export const getAllEvmChainsIds = () => evmChainsData.map((c) => c.networkId);
+
+
+// TODO: The below method should be used to get the RPC URL for a chain, but it is not working as expecte
+// export const getEvmChainRpcUrl = async (chainId: number) => {
+//   const chain = evmChainsData.find((c) => c.networkId === chainId);
+//   if (!chain) {
+//     throw new Error(`Chain with network ID ${chainId} not found`);
+//   }
+  
+//   // Try JSON RPC URL first
+//   if (await checkRpcUrl(chain.rpcUrl)) {
+//     return chain.rpcUrl;
+//   }
+  
+//   // Fallback to viem chains
+//   const viemChain = Object.values(chains).find((c: any) => c.id === chain.id);
+//   if (viemChain && viemChain.rpcUrls && viemChain.rpcUrls.default) {
+//     const viemRpcUrl = viemChain.rpcUrls.default.http[0];
+//     if (await checkRpcUrl(viemRpcUrl)) {
+//       return viemRpcUrl;
+//     }
+//   }
+  
+//   throw new Error(`No working RPC URL found for chain ${chainId}`);
+// }
+
+
+export const getEvmChainRpcUrl = (chainId: number) => {
+  const chain = evmChainsData.find((c) => c.networkId === chainId);
+  if (!chain) {
+    throw new Error(`Chain with network ID ${chainId} not found`);
+  }
+  
+  
+  // Let's try to use the viem chains without checking if they are working
+  const viemChain = Object.values(chains).find((c: any) => c.id === chain.id);
+  if (viemChain && viemChain.rpcUrls && viemChain.rpcUrls.default) {
+    const viemRpcUrl = viemChain.rpcUrls.default.http[0];
+    return viemRpcUrl;
+  } 
+
+  // Now let's try to use the json rpc url
+  if (chain.rpcUrl) {
+    return chain.rpcUrl;
+  }
+  
+  throw new Error(`No working RPC URL found for chain ${chainId}`);
+}
+
+
+// const checkRpcUrl = (rpcUrl: string) => {
+//   const web3 = new Web3(rpcUrl);
+//   return web3.eth.getBlockNumber().then((blockNumber) => {
+//     return true;
+//   }).catch((error) => {
+//     console.error(`Error checking RPC URL ${rpcUrl}: ${error}`);
+//     return false;
+//   });
+// }