fixes

Author: laisolizq

src/genesis-hardhat/constants.ts

@@ -5,9 +5,12 @@
 // Those genesis are already imported on different tooling and added as a metadata on-chain. Therefore, this util aims
 // to support them too
 
-import { GENESIS_CONTRACT_NAMES } from "../utils-common-aggchain";
+import { GENESIS_CONTRACT_NAMES } from '../utils-common-aggchain';
 
-export const SUPPORTED_GER_MANAGERS = ['LegacyAgglayerGERL2 implementation'];
+export const SUPPORTED_GER_MANAGERS = [
+    'PolygonZkEVMGlobalExitRootL2 implementation',
+    GENESIS_CONTRACT_NAMES.GER_L2_IMPLEMENTATION,
+];
 
 export const SUPPORTED_BRIDGE_CONTRACTS = ['PolygonZkEVMBridge implementation', 'AgglayerBridge implementation'];
 

src/genesis-hardhat/create-genesis-hardhat.ts

@@ -32,8 +32,8 @@ export async function getAddressesGenesisBase(genesisBase: any) {
     ).address;
 
     // get the bridge proxy address
-    const gerManagerProxyAddress = genesisBase.find(
-        (account: any) => account.contractName === GENESIS_CONTRACT_NAMES.GER_L2_PROXY,
+    const gerManagerProxyAddress = genesisBase.find((account: any) =>
+        SUPPORTED_GER_MANAGERS.includes(account.contractName),
     ).address;
 
     // get the bridge proxy implementation address
@@ -154,7 +154,7 @@ export async function deployProxyWithTxCapture(implementation: any, proxyAdmin:
 }
 
 /**
- * Deploy implmentation and proxy for BridgeL2SovereignChain
+ * Deploy implmentation and proxy for AgglayerBridgeL2
  * @param {String} proxyAdmin - proxy admin, for proxy deployment
  * @param {Array} deployer - deployer for deploy transactions
  * @returns {Object} - proxy address, implementation address, txHashes: { proxy txHash, impl txHash }
@@ -168,7 +168,7 @@ export async function deployBridgeL2SovereignChain(proxyAdmin: any, deployer: an
 }
 
 /**
- * Deploy implmentation and proxy for GlobalExitRootManagerL2SovereignChain
+ * Deploy implmentation and proxy for AgglayerGERL2
  * @param {String} proxyAdmin - proxy admin, for proxy deployment
  * @param {Array} deployer - deployer for deploy transactions
  * @param {String} bridgeProxyAddress - bridge address (ger constructor)
@@ -195,7 +195,7 @@ export async function deployGlobalExitRootManagerL2SovereignChain(
  */
 export async function deployAggOracleCommittee(proxyAdmin: any, deployer: any, gerManagerAddress: any) {
     // Deploy implementation
-    const GERManagerFactory = await ethers.getContractFactory(GENESIS_CONTRACT_NAMES.AGGORACLE_COMMITTEE, deployer);
+    const GERManagerFactory = await ethers.getContractFactory(GENESIS_CONTRACT_NAMES.AGG_ORACLE, deployer);
     const implementation = await GERManagerFactory.deploy(gerManagerAddress);
     const result = await deployProxyWithTxCapture(implementation, proxyAdmin, deployer);
     return result;

src/genesis-hardhat/utils.ts

@@ -36,6 +36,7 @@ export const GENESIS_CONTRACT_NAMES = {
     POLYGON_TIMELOCK: 'PolygonZkEVMTimelock',
     POLYGON_DEPLOYER: 'PolygonZkEVMDeployer',
     BRIDGE_LIB: `BridgeLib`,
+    AGG_ORACLE: 'AggOracleCommittee',
     AGG_ORACLE_PROXY: 'AggOracleCommittee proxy',
     AGG_ORACLE_IMPL: 'AggOracleCommittee implementation',
     ROLLUP_MANAGER_IMPLEMENTATION: 'AgglayerManager implementation',

src/utils-common-aggchain.ts

@@ -8,7 +8,7 @@ import * as dotenv from 'dotenv';
 import { ethers, hardhatArguments } from 'hardhat';
 
 // internal dependencies
-import { PolygonRollupManager, PolygonZkEVMBridgeV2 } from '../../typechain-types';
+import { AgglayerManager, AgglayerBridge } from '../../typechain-types';
 import '../../deployment/helpers/utils';
 import { initializeTimelockStorage } from '../../src/genesis/genesis-helpers';
 import { checkParams, getGitInfo } from '../../src/utils';
@@ -97,10 +97,10 @@ async function main() {
     logger.info('Check SovereignBridge requirements for its correct initialization');
 
     // Load Rollup manager
-    const PolygonRollupManagerFactory = await ethers.getContractFactory('PolygonRollupManager');
+    const PolygonRollupManagerFactory = await ethers.getContractFactory('AgglayerManager');
     const rollupManagerContract = PolygonRollupManagerFactory.attach(
         createGenesisSovereignParams.rollupManagerAddress,
-    ) as PolygonRollupManager;
+    ) as AgglayerManager;
 
     // Checks like in bridge contract
     if (
@@ -133,9 +133,9 @@ async function main() {
     let gasTokenMetadata;
 
     // Get bridge instance
-    const bridgeFactory = await ethers.getContractFactory('PolygonZkEVMBridgeV2');
+    const bridgeFactory = await ethers.getContractFactory('AgglayerBridge');
     const bridgeContractAddress = await rollupManagerContract.bridgeAddress();
-    const rollupBridgeContract = bridgeFactory.attach(bridgeContractAddress) as PolygonZkEVMBridgeV2;
+    const rollupBridgeContract = bridgeFactory.attach(bridgeContractAddress) as AgglayerBridge;
 
     // check bridge address is the same in genesisBase and on-chain
     checkBridgeAddress(genesisBase, bridgeContractAddress);