fix lint

invocamanman · invocamanman · commit 95d852d36e88 · 2025-10-03T14:37:19.000+02:00
diff --git a/upgrade/fullUpgradeV12/fullUpgradeV12.test.ts b/upgrade/fullUpgradeV12/fullUpgradeV12.test.ts
@@ -172,8 +172,8 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
         logger.info('\n========== INDIVIDUAL EXECUTION TEST ==========');
         logger.info('Executing all batch operations individually from timelock contract...');
 
-        const targets = upgradeOutput.decodedScheduleData.targets;
-        const values = upgradeOutput.decodedScheduleData.values;
+        const { targets } = upgradeOutput.decodedScheduleData;
+        const { values } = upgradeOutput.decodedScheduleData;
         const datas = upgradeOutput.decodedScheduleData.payloads;
 
         // Impersonate the timelock contract to simulate calls from its perspective
@@ -200,13 +200,13 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
                 // Actually send the transaction from timelock's perspective
                 const tx = await timelockSigner.sendTransaction({
                     to: target,
-                    value: value,
-                    data: data,
+                    value,
+                    data,
                     gasLimit: 3000000,
                 });
                 const receipt = await tx.wait();
 
-                logger.info(`  ✅ Execution SUCCESS (gas used: ${receipt.gasUsed}, block: ${receipt.blockNumber})`);
+                logger.info(`  ✅ Execution SUCCESS (gas used: ${receipt?.gasUsed}, block: ${receipt?.blockNumber})`);
             } catch (error: any) {
                 allSimulationsSuccess = false;
                 failedOperations.push({
@@ -222,7 +222,7 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
                     try {
                         const decodedError = ethers.AbiCoder.defaultAbiCoder().decode(
                             ['string'],
-                            '0x' + error.data.slice(10),
+                            `0x${error.data.slice(10)}`,
                         );
                         logger.error(`     Revert reason: ${decodedError[0]}`);
                     } catch (e) {
@@ -240,6 +240,7 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
             logger.info(`✅ All ${targets.length} operations executed successfully individually!`);
         } else {
             logger.error(`❌ ${failedOperations.length} operation(s) failed execution:`);
+            // eslint-disable-next-line no-restricted-syntax
             for (const failed of failedOperations) {
                 logger.error(`   - Operation ${failed.index + 1} to ${failed.target}: ${failed.error}`);
             }
@@ -279,7 +280,7 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
             gasLimit: 6000000,
         };
         const executeTx = await (await proposerRoleSigner.sendTransaction(txExecuteUpgrade)).wait();
-        logger.info(`✅ Batch execution SUCCESS (gas used: ${executeTx.gasUsed})`);
+        logger.info(`✅ Batch execution SUCCESS (gas used: ${executeTx?.gasUsed})`);
         logger.info('============================================\n');
 
         // Validate all contracts after upgrade
@@ -414,7 +415,6 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
 
             // Check if this was originally a PP rollup (will have ECDSA type now)
             // or AL gateway rollup (will have FEP type now)
-            const rollupType = await rollupManagerContract.rollupTypeMap(rollupData.rollupTypeID);
             if (rollupData.rollupTypeID === ecdsaRollupTypeID) {
                 PPRollups.push(rollupObject);
             } else if (rollupData.rollupTypeID === fepRollupTypeID) {
@@ -428,6 +428,7 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
 
         // 7. Verify FEP rollups were upgraded correctly
         const aggchainFEPFactory = await ethers.getContractFactory('AggchainFEP');
+        // eslint-disable-next-line no-restricted-syntax
         for (const rollup of ALgatewayRollups) {
             const aggchainFEPContract = aggchainFEPFactory.attach(rollup.rollupContract as string) as AggchainFEP;
 
@@ -475,6 +476,7 @@ describe('Should shadow fork network, execute upgrade and validate Upgrade V12',
 
         // 8. Verify ECDSA rollups were upgraded correctly
         const aggchainECDSAFactory = await ethers.getContractFactory('AggchainECDSAMultisig');
+        // eslint-disable-next-line no-restricted-syntax
         for (const rollup of PPRollups) {
             const aggchainECDSAContract = aggchainECDSAFactory.attach(
                 rollup.rollupContract as string,
diff --git a/upgrade/fullUpgradeV12/fullUpgradeV12.ts b/upgrade/fullUpgradeV12/fullUpgradeV12.ts
@@ -7,9 +7,8 @@ import * as dotenv from 'dotenv';
 import { ethers, upgrades } from 'hardhat';
 import { logger } from '../../src/logger';
 import { AgglayerManager, AgglayerBridge } from '../../typechain-types';
-import { genTimelockOperation, decodeScheduleData, decodeScheduleBatchData, genTimelockBatchOperation } from '../utils';
+import { genTimelockOperation, decodeScheduleBatchData, genTimelockBatchOperation } from '../utils';
 import { checkParams, getProviderAdjustingMultiplierGas, getDeployerFromParameters } from '../../src/utils';
-import { addInfoOutput } from '../../tools/utils';
 import * as upgradeParameters from './upgrade_parameters.json';
 
 dotenv.config({ path: path.resolve(__dirname, '../../.env') });
@@ -64,6 +63,7 @@ async function main() {
     expect(await upgrades.erc1967.getAdminAddress(globalExitRootV2Address as string)).to.be.equal(proxyAdmin.target);
 
     // Validate AgglayerGateway initialization parameters
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
     const signersToAdd = _validateAgglayerGatewayInitialization(initializeAgglayerGateway);
     const timelockAddress = await proxyAdmin.owner();
 
@@ -72,7 +72,7 @@ async function main() {
     const timelockContract = await timelockContractFactory.attach(timelockAddress);
 
     // Determine timelock delay: use parameter if provided, otherwise use contract's min delay
-    const contractMinDelay = await timelockContract.getMinDelay();
+    const contractMinDelay = await (timelockContract as any).getMinDelay();
     const paramsMinDelay = upgradeParameters.timelockDelay;
 
     let timelockDelay;
@@ -244,8 +244,10 @@ async function main() {
 
     const aggchianFEPFactory = (await ethers.getContractFactory('AggchainFEP', deployer)) as any;
 
+    // eslint-disable-next-line no-restricted-syntax
     for (const rollup of ALgatewayRollups) {
         const aggchainFEPContract = await aggchianFEPFactory.attach(rollup.rollupContract as string);
+        // eslint-disable-next-line eqeqeq
         if ((await aggchainFEPContract.AGGCHAIN_TYPE()) != 1n) {
             throw new Error(`Rollup ${rollup.rollupID} is not an FEP rollup`);
         }
@@ -324,7 +326,9 @@ async function main() {
     const computedNewRollupTypeECDSA = rollupTypeCount + 2n;
 
     // generate transaction to upgrade all FEP rollups to the new FEP implementation
+    // eslint-disable-next-line no-restricted-syntax
     for (const rollup of ALgatewayRollups) {
+        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         const isInitialized = await _isInitialized(rollup.rollupContract, ethers);
         const encodedData = isInitialized
             ? aggchianFEPFactory.interface.encodeFunctionData('upgradeFromPreviousFEP')
@@ -349,7 +353,9 @@ async function main() {
     }
 
     // generate transaction to upgrade all PP rollups to the new ECDSAMultisig implementation
+    // eslint-disable-next-line no-restricted-syntax
     for (const rollup of PPRollups) {
+        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         const isInitialized = await _isInitialized(rollup.rollupContract, ethers);
         const encodedData = isInitialized
             ? aggchainECDSAFactory.interface.encodeFunctionData('migrateFromLegacyConsensus')
@@ -377,6 +383,7 @@ async function main() {
     const targets = [];
     const values = [];
     const datas = [];
+    // eslint-disable-next-line no-restricted-syntax
     for (const operation of timelockOperations) {
         targets.push(operation.target);
         values.push(operation.value);
@@ -433,7 +440,7 @@ async function main() {
         ];
         const objectDecoded = await decodeScheduleBatchData(scheduleData, contractFactories);
         (outputJson as any).decodedScheduleData = objectDecoded;
-    } catch (error) {
+    } catch (error: any) {
         logger.warn('⚠️  Could not decode schedule data:', error.message);
         (outputJson as any).decodedScheduleData = { error: 'Failed to decode', message: error.message };
     }
@@ -459,6 +466,7 @@ main().catch((e) => {
     process.exit(1);
 });
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
 function _validateAgglayerGatewayInitialization(initializeAgglayerGateway: any): Array<{ addr: string; url: string }> {
     logger.info('Validating AgglayerGateway initialization parameters...');
 
@@ -526,9 +534,10 @@ function _validateAgglayerGatewayInitialization(initializeAgglayerGateway: any):
     return signersToAdd;
 }
 
-async function _isInitialized(contractAddress: string, ethers: any): Promise<boolean> {
+// eslint-disable-next-line @typescript-eslint/naming-convention
+async function _isInitialized(contractAddress: string, ethersLib: any): Promise<boolean> {
     // Read storage slot 0 which contains uint8 private _initialized (OpenZeppelin Initializable pattern)
-    const storageValue = await ethers.provider.getStorage(contractAddress, 0);
+    const storageValue = await ethersLib.provider.getStorage(contractAddress, 0);
 
     // The _initialized flag is a uint8 (1 byte) stored at the rightmost position in slot 0
     // Mask with 0xFF to extract only the last byte
diff --git a/upgrade/fullUpgradeV12/verifyUpgradeV12.ts b/upgrade/fullUpgradeV12/verifyUpgradeV12.ts
@@ -97,7 +97,7 @@ async function main() {
     // 8. Verify AggchainFEP Implementation (if exists)
     if (deployedContracts.aggchainFEPImplementation) {
         logger.info('Verifying AggchainFEP Implementation...');
-        verificationResults['AggchainFEP'] = await trackVerification(
+        verificationResults.AggchainFEP = await trackVerification(
             'AggchainFEP',
             deployedContracts.aggchainFEPImplementation,
             [globalExitRootV2Address, polAddress, bridgeV2Address, rollupManagerAddress, aggLayerGatewayAddress],
@@ -107,7 +107,7 @@ async function main() {
     // 9. Verify AggchainECDSA Implementation (if exists)
     if (deployedContracts.aggchainECDSAImplementation) {
         logger.info('Verifying AggchainECDSA Implementation...');
-        verificationResults['AggchainECDSA'] = await trackVerification(
+        verificationResults.AggchainECDSA = await trackVerification(
             'AggchainECDSA',
             deployedContracts.aggchainECDSAImplementation,
             [globalExitRootV2Address, polAddress, bridgeV2Address, rollupManagerAddress, aggLayerGatewayAddress],
diff --git a/upgrade/importOZState/importOZState.ts b/upgrade/importOZState/importOZState.ts
@@ -10,7 +10,7 @@ dotenv.config({ path: path.resolve(__dirname, '../../.env') });
 
 // Configuration: Set the RollupManager or AgglayerManager address here
 // You can also set this via environment variable: ROLLUP_MANAGER_ADDRESS
-const ROLLUP_MANAGER_ADDRESS = process.env.ROLLUP_MANAGER_ADDRESS;
+const { ROLLUP_MANAGER_ADDRESS } = process.env;
 
 /**
  * Plain script to import OpenZeppelin upgrade state for all proxy contracts
diff --git a/upgrade/utils.ts b/upgrade/utils.ts
@@ -83,7 +83,7 @@ async function verifyContractEtherscan(
             contract: contractPath,
         });
         logger.info(`✅ Contract ${implementationAddress} verified successfully on Etherscan`);
-    } catch (error) {
+    } catch (error: any) {
         if (error.name === 'ContractAlreadyVerifiedError') {
             logger.info(`✅ Contract ${implementationAddress} is already verified on Etherscan`);
             return true;
@@ -219,17 +219,17 @@ async function decodeScheduleBatchData(scheduleData: any, contractFactories: any
             // Try to decode single data with multiple factories
             const data = timelockTx?.args[i];
             let decodedData = null;
-            let usedFactory = null;
 
+            // eslint-disable-next-line no-restricted-syntax
             for (const factory of contractFactories) {
                 try {
                     const decodedAttempt = factory.interface.parseTransaction({ data });
                     if (decodedAttempt) {
                         decodedData = decodedAttempt;
-                        usedFactory = factory;
                         break;
                     }
                 } catch (error) {
+                    // eslint-disable-next-line no-continue
                     continue;
                 }
             }
@@ -253,18 +253,18 @@ async function decodeScheduleBatchData(scheduleData: any, contractFactories: any
             for (let j = 0; j < payloads.length; j++) {
                 const data = payloads[j];
                 let decodedProxyAdmin = null;
-                let usedFactory = null;
 
                 // Try to decode with each contract factory
+                // eslint-disable-next-line no-restricted-syntax
                 for (const factory of contractFactories) {
                     try {
                         const decodedAttempt = factory.interface.parseTransaction({ data });
                         if (decodedAttempt) {
                             decodedProxyAdmin = decodedAttempt;
-                            usedFactory = factory;
                             break;
                         }
                     } catch (error) {
+                        // eslint-disable-next-line no-continue
                         continue;
                     }
                 }
