Refactor FactoryDeployer to use chainId and streamline factory initialization; update config for optional factoryType and salt

Author: gfournierPro

config/config.json

@@ -137,6 +137,7 @@
         "ERC1538Proxy": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
         "IexecLibOrders_v5": "0xE8b04c85C47fcEc0e9eE30D4034e2997f6519123",
         "factory": "0xfAC000a12dA42B871c0AaD5F25391aAe62958Db1",
+        "factoryType": "generic",
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -154,6 +155,8 @@
       },
       "v5": {
         "factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
+        "factoryType": "createx",
+        "ERC1538Proxy": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -169,6 +172,7 @@
       },
       "v5": {
         "factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
+        "factoryType": "createx",
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },

deploy/0_deploy.ts

@@ -56,9 +56,7 @@ export default async function deploy() {
     const chainId = (await ethers.provider.getNetwork()).chainId;
     const [owner] = await ethers.getSigners();
     const deploymentOptions = config.getChainConfigOrDefault(chainId);
-    const salt = process.env.SALT || deploymentOptions.v5.salt || ethers.ZeroHash;
-    const factoryAddress = process.env.FACTORY_ADDRESS || deploymentOptions.v5.factory;
-    const factoryDeployer = new FactoryDeployer(owner, salt, factoryAddress);
+    const factoryDeployer = new FactoryDeployer(owner, chainId);
     // Deploy RLC
     const isTokenMode = !config.isNativeChain(deploymentOptions);
     let rlcInstanceAddress = isTokenMode

scripts/deploy-timelock.ts

@@ -5,7 +5,6 @@ import { duration } from '@nomicfoundation/hardhat-network-helpers/dist/src/help
 import { ethers } from 'hardhat';
 import { TimelockController__factory } from '../typechain';
 import { FactoryDeployer } from '../utils/FactoryDeployer';
-import config from '../utils/config';
 
 /**
  * Deploy TimelockController contract using the generic factory.
@@ -15,12 +14,7 @@ export const deploy = async () => {
     console.log('Deploying TimelockController..');
     const chainId = (await ethers.provider.getNetwork()).chainId;
     const [owner] = await ethers.getSigners();
-    const deploymentOptions = config.getChainConfigOrDefault(chainId);
-    const salt = process.env.SALT || deploymentOptions.v5.salt;
-
-    // Initialize factory deployer
-    const factoryAddress = process.env.FACTORY_ADDRESS || deploymentOptions.v5.factory;
-    const factoryDeployer = new FactoryDeployer(owner, salt, factoryAddress);
+    const factoryDeployer = new FactoryDeployer(owner, chainId);
 
     // Deploy TimelockController
     const ONE_WEEK_IN_SECONDS = duration.days(7);

utils/FactoryDeployer.ts

@@ -6,28 +6,22 @@ import factorySignedTxJson from 'createx/scripts/presigned-createx-deployment-tr
 import { ContractFactory } from 'ethers';
 import { deployments, ethers } from 'hardhat';
 import { GenericFactory, GenericFactory__factory, ICreateX, ICreateX__factory } from '../typechain';
+import config from '../utils/config';
 import { getBaseNameFromContractFactory } from './deploy-tools';
-
-// Define factory types
-type FactoryType = 'createx' | 'generic';
-
 export class FactoryDeployer {
     owner: SignerWithAddress;
     salt: string;
     factoryAddress?: string;
-    factoryType: FactoryType;
+    factoryType: string;
     factory?: ICreateX | GenericFactory;
 
-    constructor(
-        owner: SignerWithAddress,
-        salt: string,
-        factoryAddress?: string,
-        factoryType: FactoryType = 'createx',
-    ) {
+    constructor(owner: SignerWithAddress, chainId: bigint) {
+        const deploymentOptions = config.getChainConfigOrDefault(chainId);
         this.owner = owner;
-        this.salt = salt;
-        this.factoryAddress = factoryAddress;
-        this.factoryType = factoryType;
+        this.salt = process.env.SALT || deploymentOptions.v5.salt || ethers.ZeroHash;
+        this.factoryAddress = process.env.FACTORY_ADDRESS || deploymentOptions.v5.factory;
+        this.factoryType =
+            process.env.FACTORY_TYPE || deploymentOptions.v5.factoryType || 'createx';
     }
 
     /**

utils/config.ts

@@ -50,7 +50,8 @@ type ChainConfig = {
     };
     v5: {
         factory?: string;
-        salt: string;
+        factoryType?: string;
+        salt?: string;
         AppRegistry?: string;
         DatasetRegistry?: string;
         WorkerpoolRegistry?: string;