🔧 [Tooling] Fixed changeNetwork function

tooling/task-runner.ts

@@ -225,7 +225,7 @@ const _main = async () => {
         }
     }
 
-    tooling.changeNetwork(selectedNetwork);
+    await tooling.changeNetwork(selectedNetwork);
 
     try {
         await runTask(task, taskArgs);

tooling/tasks/core/forge-deploy-multichain.ts

@@ -25,7 +25,7 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
     }
 
     for (const network of networks) {
-        tooling.changeNetwork(network);
+        await tooling.changeNetwork(network);
         console.log(`Deploying to ${network}...`);
         await runTask("forge-deploy", {
             network,

tooling/tasks/lz/bridge.ts

@@ -152,7 +152,7 @@ const defaultBridge = Object.freeze({
 });
 
 export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) => {
-    tooling.changeNetwork(taskArgs.from as NetworkName);
+    await tooling.changeNetwork(taskArgs.from as NetworkName);
 
     const remoteLzChainId = tooling.getLzChainIdByName(taskArgs.to as NetworkName);
     const gnosisAddress = taskArgs.gnosis;
@@ -256,7 +256,7 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
         }
     }
 
-    tooling.changeNetwork(taskArgs.from as NetworkName);
+    await tooling.changeNetwork(taskArgs.from as NetworkName);
 
     console.log(`⏳ Sending tokens [${tooling.network.name}] sendTokens() to OFT @ LZ chainId[${remoteLzChainId}]`);
     let tx;

tooling/tasks/lz/check-total-supply.ts

@@ -26,7 +26,7 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
     const supportedNetworks = lz.getSupportedNetworks(tokenName);
 
     for (const network of supportedNetworks) {
-        tooling.changeNetwork(network);
+        await tooling.changeNetwork(network);
 
         const config = lz.getDeployementConfig(tooling, tokenName, network);
         const networkConfig = tooling.getNetworkConfigByName(network);

tooling/tasks/lz/deploy-oftv2.ts

@@ -118,7 +118,7 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
 
     if (taskArgs.stage === "precrime:configure") {
         for (const srcNetwork of networks) {
-            tooling.changeNetwork(srcNetwork);
+            await tooling.changeNetwork(srcNetwork);
             const deployer = await tooling.getOrLoadDeployer();
 
             const sourceLzDeployementConfig = await lz.getDeployementConfig(tooling, tokenName, srcNetwork);

tooling/tasks/lz/ua-get-config.ts

@@ -33,7 +33,7 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
     const lzDeployementConfig = await lz.getDeployementConfig(tooling, tokenName, taskArgs.from as NetworkName);
 
     const network = taskArgs.from as NetworkName;
-    tooling.changeNetwork(network);
+    await tooling.changeNetwork(network);
 
     let toNetworks = (taskArgs.to as string).split(",") as NetworkName[];
 

tooling/tasks/lz/ua-get-default-config.ts

@@ -1,37 +1,37 @@
-import type { Tooling } from '../../tooling';
-import type { NetworkName, TaskArgs, TaskFunction, TaskMeta } from '../../types';
+import type {Tooling} from "../../tooling";
+import type {NetworkName, TaskArgs, TaskFunction, TaskMeta} from "../../types";
 
 export const meta: TaskMeta = {
-    name: 'lz/ua-get-default-config',
-    description: 'Get LayerZero configuration for specified networks',
+    name: "lz/ua-get-default-config",
+    description: "Get LayerZero configuration for specified networks",
     options: {
         networks: {
-            type: 'string',
+            type: "string",
             description: 'Comma-separated list of networks or "all"',
             required: true,
         },
     },
 };
 
 export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) => {
-    let networks = (taskArgs.networks as string).split(',') as NetworkName[];
+    let networks = (taskArgs.networks as string).split(",") as NetworkName[];
 
-    if (networks.length === 1 && (networks as string[])[0] === 'all') {
+    if (networks.length === 1 && (networks as string[])[0] === "all") {
         networks = tooling.getAllNetworksLzSupported();
     }
 
     const configByNetwork = [];
     for (let network of networks) {
-        tooling.changeNetwork(network);
+        await tooling.changeNetwork(network);
 
-        const endpointAddress = tooling.getAddressByLabel(network, 'LZendpoint') as `0x${string}`;
-        const endpoint = await tooling.getContractAt('ILzEndpoint', endpointAddress);
+        const endpointAddress = tooling.getAddressByLabel(network, "LZendpoint") as `0x${string}`;
+        const endpoint = await tooling.getContractAt("ILzEndpoint", endpointAddress);
 
         console.log(`Getting config for ${network}...`);
         const sendVersion = await endpoint.defaultSendVersion();
         const receiveVersion = await endpoint.defaultReceiveVersion();
         const sendLibraryAddress = await endpoint.defaultSendLibrary();
-        const messagingLibrary = await tooling.getContractAt('ILzUltraLightNodeV2', sendLibraryAddress);
+        const messagingLibrary = await tooling.getContractAt("ILzUltraLightNodeV2", sendLibraryAddress);
 
         const config = await messagingLibrary.defaultAppConfig(tooling.getLzChainIdByName(network));
 
@@ -49,4 +49,4 @@ export const task: TaskFunction = async (taskArgs: TaskArgs, tooling: Tooling) =
     }
 
     console.table(configByNetwork);
-};
+};

tooling/tooling.ts

@@ -97,8 +97,13 @@ const changeNetwork = async (networkName: NetworkName): Promise<NetworkConfig> =
     network.config = config.networks[networkName];
 
     if (!providers[networkName]) {
-        providers[networkName] = new ethers.JsonRpcProvider(config.networks[networkName].url);
-    }
+        const jsonRpcProvider = new ethers.JsonRpcProvider(config.networks[networkName].url);
+        providers[networkName] = jsonRpcProvider;
+
+        const chainId = (await jsonRpcProvider.getNetwork()).chainId;
+        if (Number(chainId) !== config.networks[networkName].chainId) {
+            throw new Error(`ChainId mismatch: ${chainId} !== ${config.networks[networkName].chainId}`);
+        }    }
 
     network.provider = providers[networkName];