fix: chainId in vault factory

lidofinance · Dec 20, 2024 · 784d2ee · 784d2ee
1 parent da76599
commit 784d2ee
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/contracts/vault-factory.ts b/contracts/vault-factory.ts
@@ -1,16 +1,17 @@
 import { getContract, createPublicClient, http, Chain } from "viem";
 import { VaultFactoryAbi } from "abi";
-import { getDeployedAddress, envs } from "@configs";
+import { getDeployedAddress, envs, getRpcUrl } from "@configs";
 
-export const getVaultFactoryContract = (chainId?: Chain) => {
-  const rpcUrl = envs?.[`RPC_URL_${chainId || process.env.CHAIN_ID}`];
+export const getVaultFactoryContract = (chain: Chain) => {
+  const rpcUrls = getRpcUrl() ?? envs?.[`RPC_URL_${chain}`];
+  const url = rpcUrls.split(',')[0];
 
   return getContract({
     address: getDeployedAddress("stakingVaultFactory"),
     abi: VaultFactoryAbi,
     client: createPublicClient({
-      chain: chainId,
-      transport: http(rpcUrl),
+      chain: chain,
+      transport: http(url),
     }),
   });
 };
diff --git a/programs/index.ts b/programs/index.ts
@@ -1,3 +1,3 @@
-// export * from "./vault-hub";
+export * from "./vault-hub";
 export * from "./vault";
 export * from "./vault-factory";
diff --git a/programs/vault-factory.ts b/programs/vault-factory.ts
@@ -21,10 +21,12 @@ vaultFactory
       operatorFee: string,
       { chainId, manager, operator }: ChainOption & { manager: Address, operator: Address }
     ) => {
-      const contract = getVaultFactoryContract(chainId);
+      const chain = chainId ?? getChainId()
+      const contract = getVaultFactoryContract(chain);
       const managementFee = BigInt(ownerFee);
       const performanceFee = BigInt(operatorFee);
-      const chain = chainId ?? getChainId()
+
+      console.log('vaultFactory::chain', chain)
 
       const tx = await contract.write.createVault(
         [
@@ -39,7 +41,7 @@ vaultFactory
         ],
         {
           account: getAccount(chain),
-          chain,
+          chain: chain,
         }
       );
 

diff --git a/providers/wallet.ts b/providers/wallet.ts
@@ -4,11 +4,12 @@ import {envs, getConfig, getChainId, getRpcUrl} from "@configs";
 
 export const getWalletClient = (chainId?: Chain) => {
   const chain = getChainId() ?? chainId;
-  const rpcUrl = getRpcUrl() ?? envs?.[`RPC_URL_${chain}`];
+  const rpcUrls = getRpcUrl() ?? envs?.[`RPC_URL_${chain}`];
+  const url = rpcUrls.split(',')[0];
 
   const client = createWalletClient({
     chain,
-    transport: http(rpcUrl),
+    transport: http(url),
   });
 
   return client;

diff --git a/utils/data-validators.ts b/utils/data-validators.ts
@@ -5,7 +5,6 @@ import { JSONConfig } from "@types";
 export const validateConfig = (config: JSONConfig) => {
   const errors = {} as Record<keyof JSONConfig, string>;
 
-  console.log('validateConfig::config', config)
   if (!isValidUrl(config.rpcLink)) {
     errors.rpcLink = 'Invalid rpcLink: must be a valid URL.';
   }