Add CreateX factory for new chain deployment

CHANGELOG.md

@@ -9,7 +9,8 @@
 - [x] `IexecPoco2Delegate.sol`
 
 ### Features
-
+- Add CreateX factory for new chain deployment (#215)
+- Support Arbitrum & Avalanche Fuji testnets (#215)
 - Housekeeping (#207, )
 - Add Halborn "Poco v5.5 & Voucher v1.0" audit report (#205)
 - Refactor Factory deployer (#206)

README.md

@@ -53,7 +53,7 @@ It contains:
 	- **"asset":** can be "Token" or "Native", select which escrow to use.
 	- **"token":** the address of the token to use. If asset is set to token, and no token address is provided, a mock will be deployed on the fly.
 	- **"v3":** a list of resources from a previous (v3) deployment. This allows previous resources to be automatically available. It also enables score transfer from v3 to v5. [optional]
-	- **"v5":** deployment parameters for the new version. If usefactory is set to true, and no salt is provided, `bytes32(0)` will be used by default.
+	- **"v5":** deployment parameters for the new version. If factory address is set, and no salt is provided, `bytes32(0)` will be used by default.
 
 If you want to deploy the iExec PoCo V5 smart contracts on a new blockchain, the recommended process is to:
 

config/config.json

@@ -44,7 +44,6 @@
         "WorkerpoolRegistry": "0xc398052563469e6Ea7C442aBf124aADE7ec2CC92"
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
         "AppRegistry": "0xB1C52075b276f87b1834919167312221d50c9D16",
         "DatasetRegistry": "0x799DAa22654128d0C64d5b79eac9283008158730",
@@ -63,7 +62,6 @@
         "WorkerpoolRegistry": null
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -79,7 +77,6 @@
         "WorkerpoolRegistry": null
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -96,7 +93,6 @@
         "WorkerpoolRegistry": "0xdAD30AAb14F569830bFd26EdF72df876dc30D20c"
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -112,7 +108,6 @@
         "WorkerpoolRegistry": "0x3f4C18C322064576C048b1284b700288ffEf126B"
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -126,7 +121,6 @@
         "WorkerpoolRegistry": "0x1Cae59C7745A61dD37CD17f174745959D0f3f400"
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -142,7 +136,43 @@
       "v5": {
         "ERC1538Proxy": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",
         "IexecLibOrders_v5": "0xE8b04c85C47fcEc0e9eE30D4034e2997f6519123",
-        "usefactory": true,
+        "factory": "0xfAC000a12dA42B871c0AaD5F25391aAe62958Db1",
+        "factoryType": "generic",
+        "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "43113": {
+      "_comment": "Avalanche Fuji Testnet",
+      "asset": "Token",
+      "token": "0xb96484C8B0e27B08a86661a3c19A028f4d3e89ad",
+      "richman": "0xd88CF17D89533816E99C0427581aa8C72129037D",
+      "uniswap": false,
+      "v3": {
+        "Hub": null,
+        "AppRegistry": null,
+        "DatasetRegistry": null,
+        "WorkerpoolRegistry": null
+      },
+      "v5": {
+        "factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
+        "factoryType": "createx",
+        "ERC1538Proxy": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
+        "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "421614": {
+      "_comment": "Arbitrum Sepolia Testnet",
+      "asset": "Token",
+      "uniswap": false,
+      "v3": {
+        "Hub": null,
+        "AppRegistry": null,
+        "DatasetRegistry": null,
+        "WorkerpoolRegistry": null
+      },
+      "v5": {
+        "factory": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed",
+        "factoryType": "createx",
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     },
@@ -158,7 +188,6 @@
         "WorkerpoolRegistry": null
       },
       "v5": {
-        "usefactory": true,
         "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
       }
     }

config/config_native.json

@@ -43,7 +43,6 @@
         "WorkerpoolRegistry": null
       },
       "v5": {
-        "usefactory": true,
         "salt": "0xbe1a000000000000000000000000000000000000000000000000000000000000"
       }
     }

config/config_token.json

@@ -43,7 +43,6 @@
         "WorkerpoolRegistry": null
       },
       "v5": {
-        "usefactory": true,
         "salt": "0xbe1a000000000000000000000000000000000000000000000000000000000000"
       }
     }

deploy/0_deploy.ts

@@ -3,7 +3,7 @@
 
 import { SignerWithAddress } from '@nomicfoundation/hardhat-ethers/signers';
 import { ZeroAddress, ZeroHash } from 'ethers';
-import { ethers } from 'hardhat';
+import { deployments, ethers } from 'hardhat';
 import {
     AppRegistry__factory,
     DatasetRegistry__factory,
@@ -37,8 +37,8 @@ import {
     WorkerpoolRegistry__factory,
 } from '../typechain';
 import { Ownable__factory } from '../typechain/factories/@openzeppelin/contracts/access';
-import config from '../utils/config';
 import { FactoryDeployer } from '../utils/FactoryDeployer';
+import config from '../utils/config';
 import { linkContractToProxy } from '../utils/proxy-tools';
 
 /**
@@ -56,16 +56,15 @@ 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 factoryDeployer = new FactoryDeployer(owner, salt);
+    const factoryDeployer = new FactoryDeployer(owner, chainId);
     // Deploy RLC
     const isTokenMode = !config.isNativeChain(deploymentOptions);
     let rlcInstanceAddress = isTokenMode
         ? await getOrDeployRlc(deploymentOptions.token!, owner) // token
         : ZeroAddress; // native
     console.log(`RLC: ${rlcInstanceAddress}`);
     // Deploy ERC1538 proxy contracts
-    const erc1538UpdateAddress = await factoryDeployer.deployWithFactory(
+    const erc1538UpdateAddress = await factoryDeployer.deployContract(
         new ERC1538UpdateDelegate__factory(),
     );
     const transferOwnershipCall = await Ownable__factory.connect(
@@ -77,15 +76,15 @@ export default async function deploy() {
         .catch(() => {
             throw new Error('Failed to prepare transferOwnership data');
         });
-    const erc1538ProxyAddress = await factoryDeployer.deployWithFactory(
+    const erc1538ProxyAddress = await factoryDeployer.deployContract(
         new ERC1538Proxy__factory(),
         [erc1538UpdateAddress],
         transferOwnershipCall,
     );
     const erc1538: ERC1538Update = ERC1538Update__factory.connect(erc1538ProxyAddress, owner);
     console.log(`IexecInstance found at address: ${await erc1538.getAddress()}`);
     // Deploy library & modules
-    const iexecLibOrdersAddress = await factoryDeployer.deployWithFactory(
+    const iexecLibOrdersAddress = await factoryDeployer.deployContract(
         new IexecLibOrders_v5__factory(),
     );
     const iexecLibOrders = {
@@ -112,7 +111,7 @@ export default async function deploy() {
         new IexecPocoBoostAccessorsDelegate__factory(),
     ];
     for (const module of modules) {
-        const address = await factoryDeployer.deployWithFactory(module);
+        const address = await factoryDeployer.deployContract(module);
         await linkContractToProxy(erc1538, address, module);
     }
     // Verify linking on ERC1538Proxy
@@ -126,17 +125,17 @@ export default async function deploy() {
         const [method, , contract] = await erc1538QueryInstance.functionByIndex(i);
         console.log(`[${i}] ${contract} ${method}`);
     }
-    const appRegistryAddress = await factoryDeployer.deployWithFactory(
+    const appRegistryAddress = await factoryDeployer.deployContract(
         new AppRegistry__factory(),
         [],
         transferOwnershipCall,
     );
-    const datasetRegistryAddress = await factoryDeployer.deployWithFactory(
+    const datasetRegistryAddress = await factoryDeployer.deployContract(
         new DatasetRegistry__factory(),
         [],
         transferOwnershipCall,
     );
-    const workerpoolRegistryAddress = await factoryDeployer.deployWithFactory(
+    const workerpoolRegistryAddress = await factoryDeployer.deployContract(
         new WorkerpoolRegistry__factory(),
         [],
         transferOwnershipCall,
@@ -213,11 +212,26 @@ export default async function deploy() {
 }
 
 async function getOrDeployRlc(token: string, owner: SignerWithAddress) {
-    return token // token
-        ? token
-        : await new RLC__factory()
-              .connect(owner)
-              .deploy()
-              .then((contract) => contract.waitForDeployment())
-              .then((contract) => contract.getAddress());
+    const rlcFactory = new RLC__factory().connect(owner);
+    let rlcAddress: string;
+
+    if (token) {
+        console.log(`Using existing RLC token at: ${token}`);
+        rlcAddress = token;
+    } else {
+        console.log('Deploying new RLC token...');
+        rlcAddress = await rlcFactory
+            .deploy()
+            .then((contract) => contract.waitForDeployment())
+            .then((contract) => contract.getAddress());
+        console.log(`New RLC token deployed at: ${rlcAddress}`);
+    }
+
+    await deployments.save('RLC', {
+        abi: (rlcFactory as any).constructor.abi,
+        address: rlcAddress,
+        bytecode: (await rlcFactory.getDeployTransaction()).data,
+        deployedBytecode: await ethers.provider.getCode(rlcAddress),
+    });
+    return rlcAddress;
 }

hardhat.config.ts

@@ -13,6 +13,8 @@ import chainConfig from './utils/config';
 
 const isNativeChainType = chainConfig.isNativeChain();
 const isLocalFork = process.env.LOCAL_FORK == 'true';
+const isFujiFork = process.env.FUJI_FORK == 'true';
+const isArbitrumSepoliaFork = process.env.ARBITRUM_SEPOLIA_FORK == 'true';
 const bellecourBlockscoutUrl = 'https://blockscout.bellecour.iex.ec';
 
 /**
@@ -28,6 +30,20 @@ const bellecourBaseConfig = {
     blockGasLimit: 6_700_000,
 };
 
+// Avalanche Fuji specific configuration
+const fujiBaseConfig = {
+    gasPrice: 25_000_000_000, // 25 Gwei default
+    blockGasLimit: 8_000_000,
+    chainId: 43113,
+};
+
+// Arbitrum Sepolia specific configuration
+const arbitrumSepoliaBaseConfig = {
+    gasPrice: 100_000_000, // 0.1 Gwei default (Arbitrum has lower gas prices)
+    blockGasLimit: 30_000_000, // Arbitrum has higher block gas limits
+    chainId: 421614,
+};
+
 const settings = {
     optimizer: {
         enabled: true,
@@ -81,6 +97,26 @@ const config: HardhatUserConfig = {
                 },
                 chainId: 134,
             }),
+            ...(isFujiFork && {
+                forking: {
+                    url: process.env.FUJI_RPC_URL || 'https://api.avax-test.network/ext/bc/C/rpc',
+                    blockNumber: process.env.FUJI_BLOCK_NUMBER
+                        ? parseInt(process.env.FUJI_BLOCK_NUMBER)
+                        : undefined,
+                },
+                ...fujiBaseConfig,
+            }),
+            ...(isArbitrumSepoliaFork && {
+                forking: {
+                    url:
+                        process.env.ARBITRUM_SEPOLIA_RPC_URL ||
+                        'https://sepolia-rollup.arbitrum.io/rpc',
+                    blockNumber: process.env.ARBITRUM_SEPOLIA_BLOCK_NUMBER
+                        ? parseInt(process.env.ARBITRUM_SEPOLIA_BLOCK_NUMBER)
+                        : undefined,
+                },
+                ...arbitrumSepoliaBaseConfig,
+            }),
         },
         'external-hardhat': {
             ...defaultHardhatNetworkParams,
@@ -93,6 +129,14 @@ const config: HardhatUserConfig = {
                 accounts: 'remote', // Override defaults accounts for impersonation
                 chainId: 134,
             }),
+            ...(isFujiFork && {
+                accounts: 'remote', // Override defaults accounts for impersonation
+                ...fujiBaseConfig,
+            }),
+            ...(isArbitrumSepoliaFork && {
+                accounts: 'remote', // Override defaults accounts for impersonation
+                ...arbitrumSepoliaBaseConfig,
+            }),
         },
         'dev-native': {
             chainId: 65535,
@@ -128,6 +172,22 @@ const config: HardhatUserConfig = {
                 mnemonic: process.env.MNEMONIC || '',
             },
         },
+        // Add Fuji as a network
+        avalancheFujiTestnet: {
+            url: process.env.FUJI_RPC_URL || 'https://api.avax-test.network/ext/bc/C/rpc',
+            accounts: {
+                mnemonic: process.env.MNEMONIC || HARDHAT_NETWORK_MNEMONIC,
+            },
+            ...fujiBaseConfig,
+        },
+        // Add Arbitrum Sepolia as a network
+        'arbitrum-sepolia': {
+            url: process.env.ARBITRUM_SEPOLIA_RPC_URL || 'https://sepolia-rollup.arbitrum.io/rpc',
+            accounts: {
+                mnemonic: process.env.MNEMONIC || HARDHAT_NETWORK_MNEMONIC,
+            },
+            ...arbitrumSepoliaBaseConfig,
+        },
         viviani: {
             chainId: 133,
             url: 'https://viviani.iex.ec',
@@ -155,6 +215,8 @@ const config: HardhatUserConfig = {
     etherscan: {
         apiKey: {
             mainnet: process.env.ETHERSCAN_API_KEY || '',
+            avalancheFujiTestnet: 'nothing', // a non-empty string is needed by the plugin.
+            arbitrumSepolia: process.env.ARBISCAN_API_KEY || '',
             viviani: 'nothing', // a non-empty string is needed by the plugin.
             bellecour: 'nothing', // a non-empty string is needed by the plugin.
         },
@@ -195,6 +257,7 @@ const config: HardhatUserConfig = {
             '@openzeppelin/contracts-v5/interfaces/IERC1271.sol',
             // Used in deployment
             '@amxx/factory/contracts/v6/GenericFactory.sol',
+            'createx/src/ICreateX.sol',
         ],
         keep: true, // Slither requires compiled dependencies
     },
@@ -218,7 +281,7 @@ const config: HardhatUserConfig = {
             'Store.v8.sol',
         ],
     },
-    mocha: { timeout: 50000 },
+    mocha: { timeout: 300000 },
 };
 
 /**