iExecBlockchainComputing · gfournieriExec · Apr 24, 2025 · Apr 24, 2025 · Apr 24, 2025 · Apr 24, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - [x] `IexecPoco2Delegate.sol`
 
 ### Features
+- Fix new testnets chain name (#217)
 - Deploy on new testnet chains using CreateX factory (#216)
 - Add CreateX factory for new chain deployment (#215)
 - Support Arbitrum & Avalanche Fuji testnets (#215)

diff --git a/deployments/arbitrum-sepolia/.chainId → deployments/arbitrumSepolia/.chainId b/deployments/arbitrum-sepolia/.chainId → deployments/arbitrumSepolia/.chainId
diff --git a/...oyments/arbitrum-sepolia/AppRegistry.json → deployments/arbitrumSepolia/AppRegistry.json b/...oyments/arbitrum-sepolia/AppRegistry.json → deployments/arbitrumSepolia/AppRegistry.json
diff --git a/...nts/arbitrum-sepolia/DatasetRegistry.json → ...ents/arbitrumSepolia/DatasetRegistry.json b/...nts/arbitrum-sepolia/DatasetRegistry.json → ...ents/arbitrumSepolia/DatasetRegistry.json
diff --git a/...itrum-sepolia/ENSIntegrationDelegate.json → ...bitrumSepolia/ENSIntegrationDelegate.json b/...itrum-sepolia/ENSIntegrationDelegate.json → ...bitrumSepolia/ENSIntegrationDelegate.json
diff --git a/...oyments/arbitrum-sepolia/ENSRegistry.json → deployments/arbitrumSepolia/ENSRegistry.json b/...oyments/arbitrum-sepolia/ENSRegistry.json → deployments/arbitrumSepolia/ENSRegistry.json
diff --git a/...yments/arbitrum-sepolia/ERC1538Proxy.json → ...oyments/arbitrumSepolia/ERC1538Proxy.json b/...yments/arbitrum-sepolia/ERC1538Proxy.json → ...oyments/arbitrumSepolia/ERC1538Proxy.json
diff --git a/...rbitrum-sepolia/ERC1538QueryDelegate.json → ...arbitrumSepolia/ERC1538QueryDelegate.json b/...rbitrum-sepolia/ERC1538QueryDelegate.json → ...arbitrumSepolia/ERC1538QueryDelegate.json
diff --git a/...bitrum-sepolia/ERC1538UpdateDelegate.json → ...rbitrumSepolia/ERC1538UpdateDelegate.json b/...bitrum-sepolia/ERC1538UpdateDelegate.json → ...rbitrumSepolia/ERC1538UpdateDelegate.json
diff --git a/...ments/arbitrum-sepolia/FIFSRegistrar.json → ...yments/arbitrumSepolia/FIFSRegistrar.json b/...ments/arbitrum-sepolia/FIFSRegistrar.json → ...yments/arbitrumSepolia/FIFSRegistrar.json
diff --git a/...olia/IexecAccessorsABILegacyDelegate.json → ...olia/IexecAccessorsABILegacyDelegate.json b/...olia/IexecAccessorsABILegacyDelegate.json → ...olia/IexecAccessorsABILegacyDelegate.json
diff --git a/...itrum-sepolia/IexecAccessorsDelegate.json → ...bitrumSepolia/IexecAccessorsDelegate.json b/...itrum-sepolia/IexecAccessorsDelegate.json → ...bitrumSepolia/IexecAccessorsDelegate.json
diff --git a/...sepolia/IexecCategoryManagerDelegate.json → ...Sepolia/IexecCategoryManagerDelegate.json b/...sepolia/IexecCategoryManagerDelegate.json → ...Sepolia/IexecCategoryManagerDelegate.json
diff --git a/.../arbitrum-sepolia/IexecERC20Delegate.json → ...s/arbitrumSepolia/IexecERC20Delegate.json b/.../arbitrum-sepolia/IexecERC20Delegate.json → ...s/arbitrumSepolia/IexecERC20Delegate.json
diff --git a/...rum-sepolia/IexecEscrowTokenDelegate.json → ...trumSepolia/IexecEscrowTokenDelegate.json b/...rum-sepolia/IexecEscrowTokenDelegate.json → ...trumSepolia/IexecEscrowTokenDelegate.json
diff --git a/...s/arbitrum-sepolia/IexecLibOrders_v5.json → ...ts/arbitrumSepolia/IexecLibOrders_v5.json b/...s/arbitrum-sepolia/IexecLibOrders_v5.json → ...ts/arbitrumSepolia/IexecLibOrders_v5.json
diff --git a/...rum-sepolia/IexecMaintenanceDelegate.json → ...trumSepolia/IexecMaintenanceDelegate.json b/...rum-sepolia/IexecMaintenanceDelegate.json → ...trumSepolia/IexecMaintenanceDelegate.json
diff --git a/...epolia/IexecMaintenanceExtraDelegate.json → ...epolia/IexecMaintenanceExtraDelegate.json b/...epolia/IexecMaintenanceExtraDelegate.json → ...epolia/IexecMaintenanceExtraDelegate.json
diff --git a/...sepolia/IexecOrderManagementDelegate.json → ...Sepolia/IexecOrderManagementDelegate.json b/...sepolia/IexecOrderManagementDelegate.json → ...Sepolia/IexecOrderManagementDelegate.json
diff --git a/.../arbitrum-sepolia/IexecPoco1Delegate.json → ...s/arbitrumSepolia/IexecPoco1Delegate.json b/.../arbitrum-sepolia/IexecPoco1Delegate.json → ...s/arbitrumSepolia/IexecPoco1Delegate.json
diff --git a/.../arbitrum-sepolia/IexecPoco2Delegate.json → ...s/arbitrumSepolia/IexecPoco2Delegate.json b/.../arbitrum-sepolia/IexecPoco2Delegate.json → ...s/arbitrumSepolia/IexecPoco2Delegate.json
diff --git a/...m-sepolia/IexecPocoAccessorsDelegate.json → ...umSepolia/IexecPocoAccessorsDelegate.json b/...m-sepolia/IexecPocoAccessorsDelegate.json → ...umSepolia/IexecPocoAccessorsDelegate.json
diff --git a/...olia/IexecPocoBoostAccessorsDelegate.json → ...olia/IexecPocoBoostAccessorsDelegate.json b/...olia/IexecPocoBoostAccessorsDelegate.json → ...olia/IexecPocoBoostAccessorsDelegate.json
diff --git a/...itrum-sepolia/IexecPocoBoostDelegate.json → ...bitrumSepolia/IexecPocoBoostDelegate.json b/...itrum-sepolia/IexecPocoBoostDelegate.json → ...bitrumSepolia/IexecPocoBoostDelegate.json
diff --git a/.../arbitrum-sepolia/IexecRelayDelegate.json → ...s/arbitrumSepolia/IexecRelayDelegate.json b/.../arbitrum-sepolia/IexecRelayDelegate.json → ...s/arbitrumSepolia/IexecRelayDelegate.json
diff --git a/...ents/arbitrum-sepolia/PublicResolver.json → ...ments/arbitrumSepolia/PublicResolver.json b/...ents/arbitrum-sepolia/PublicResolver.json → ...ments/arbitrumSepolia/PublicResolver.json
diff --git a/deployments/arbitrum-sepolia/RLC.json → deployments/arbitrumSepolia/RLC.json b/deployments/arbitrum-sepolia/RLC.json → deployments/arbitrumSepolia/RLC.json
diff --git a/...ts/arbitrum-sepolia/ReverseRegistrar.json → ...nts/arbitrumSepolia/ReverseRegistrar.json b/...ts/arbitrum-sepolia/ReverseRegistrar.json → ...nts/arbitrumSepolia/ReverseRegistrar.json
diff --git a/.../arbitrum-sepolia/WorkerpoolRegistry.json → ...s/arbitrumSepolia/WorkerpoolRegistry.json b/.../arbitrum-sepolia/WorkerpoolRegistry.json → ...s/arbitrumSepolia/WorkerpoolRegistry.json
diff --git a/deployments/avalancheFujiTestnet/.chainId → deployments/avalancheFuji/.chainId b/deployments/avalancheFujiTestnet/.chainId → deployments/avalancheFuji/.chainId
diff --git a/...nts/avalancheFujiTestnet/AppRegistry.json → deployments/avalancheFuji/AppRegistry.json b/...nts/avalancheFujiTestnet/AppRegistry.json → deployments/avalancheFuji/AppRegistry.json
diff --git a/...avalancheFujiTestnet/DatasetRegistry.json → ...yments/avalancheFuji/DatasetRegistry.json b/...avalancheFujiTestnet/DatasetRegistry.json → ...yments/avalancheFuji/DatasetRegistry.json
diff --git a/...heFujiTestnet/ENSIntegrationDelegate.json → ...avalancheFuji/ENSIntegrationDelegate.json b/...heFujiTestnet/ENSIntegrationDelegate.json → ...avalancheFuji/ENSIntegrationDelegate.json
diff --git a/...nts/avalancheFujiTestnet/ENSRegistry.json → deployments/avalancheFuji/ENSRegistry.json b/...nts/avalancheFujiTestnet/ENSRegistry.json → deployments/avalancheFuji/ENSRegistry.json
diff --git a/...ts/avalancheFujiTestnet/ERC1538Proxy.json → deployments/avalancheFuji/ERC1538Proxy.json b/...ts/avalancheFujiTestnet/ERC1538Proxy.json → deployments/avalancheFuji/ERC1538Proxy.json
diff --git a/...ncheFujiTestnet/ERC1538QueryDelegate.json → ...s/avalancheFuji/ERC1538QueryDelegate.json b/...ncheFujiTestnet/ERC1538QueryDelegate.json → ...s/avalancheFuji/ERC1538QueryDelegate.json
diff --git a/...cheFujiTestnet/ERC1538UpdateDelegate.json → .../avalancheFuji/ERC1538UpdateDelegate.json b/...cheFujiTestnet/ERC1538UpdateDelegate.json → .../avalancheFuji/ERC1538UpdateDelegate.json
diff --git a/...s/avalancheFujiTestnet/FIFSRegistrar.json → deployments/avalancheFuji/FIFSRegistrar.json b/...s/avalancheFujiTestnet/FIFSRegistrar.json → deployments/avalancheFuji/FIFSRegistrar.json
diff --git a/...tnet/IexecAccessorsABILegacyDelegate.json → ...Fuji/IexecAccessorsABILegacyDelegate.json b/...tnet/IexecAccessorsABILegacyDelegate.json → ...Fuji/IexecAccessorsABILegacyDelegate.json
diff --git a/...heFujiTestnet/IexecAccessorsDelegate.json → ...avalancheFuji/IexecAccessorsDelegate.json b/...heFujiTestnet/IexecAccessorsDelegate.json → ...avalancheFuji/IexecAccessorsDelegate.json
diff --git a/...Testnet/IexecCategoryManagerDelegate.json → ...cheFuji/IexecCategoryManagerDelegate.json b/...Testnet/IexecCategoryManagerDelegate.json → ...cheFuji/IexecCategoryManagerDelegate.json
diff --git a/...lancheFujiTestnet/IexecERC20Delegate.json → ...nts/avalancheFuji/IexecERC20Delegate.json b/...lancheFujiTestnet/IexecERC20Delegate.json → ...nts/avalancheFuji/IexecERC20Delegate.json
diff --git a/...FujiTestnet/IexecEscrowTokenDelegate.json → ...alancheFuji/IexecEscrowTokenDelegate.json b/...FujiTestnet/IexecEscrowTokenDelegate.json → ...alancheFuji/IexecEscrowTokenDelegate.json
diff --git a/...alancheFujiTestnet/IexecLibOrders_v5.json → ...ents/avalancheFuji/IexecLibOrders_v5.json b/...alancheFujiTestnet/IexecLibOrders_v5.json → ...ents/avalancheFuji/IexecLibOrders_v5.json
diff --git a/...FujiTestnet/IexecMaintenanceDelegate.json → ...alancheFuji/IexecMaintenanceDelegate.json b/...FujiTestnet/IexecMaintenanceDelegate.json → ...alancheFuji/IexecMaintenanceDelegate.json
diff --git a/...estnet/IexecMaintenanceExtraDelegate.json → ...heFuji/IexecMaintenanceExtraDelegate.json b/...estnet/IexecMaintenanceExtraDelegate.json → ...heFuji/IexecMaintenanceExtraDelegate.json
diff --git a/...Testnet/IexecOrderManagementDelegate.json → ...cheFuji/IexecOrderManagementDelegate.json b/...Testnet/IexecOrderManagementDelegate.json → ...cheFuji/IexecOrderManagementDelegate.json
diff --git a/...lancheFujiTestnet/IexecPoco1Delegate.json → ...nts/avalancheFuji/IexecPoco1Delegate.json b/...lancheFujiTestnet/IexecPoco1Delegate.json → ...nts/avalancheFuji/IexecPoco1Delegate.json
diff --git a/...lancheFujiTestnet/IexecPoco2Delegate.json → ...nts/avalancheFuji/IexecPoco2Delegate.json b/...lancheFujiTestnet/IexecPoco2Delegate.json → ...nts/avalancheFuji/IexecPoco2Delegate.json
diff --git a/...jiTestnet/IexecPocoAccessorsDelegate.json → ...ancheFuji/IexecPocoAccessorsDelegate.json b/...jiTestnet/IexecPocoAccessorsDelegate.json → ...ancheFuji/IexecPocoAccessorsDelegate.json
diff --git a/...tnet/IexecPocoBoostAccessorsDelegate.json → ...Fuji/IexecPocoBoostAccessorsDelegate.json b/...tnet/IexecPocoBoostAccessorsDelegate.json → ...Fuji/IexecPocoBoostAccessorsDelegate.json
diff --git a/...heFujiTestnet/IexecPocoBoostDelegate.json → ...avalancheFuji/IexecPocoBoostDelegate.json b/...heFujiTestnet/IexecPocoBoostDelegate.json → ...avalancheFuji/IexecPocoBoostDelegate.json
diff --git a/...lancheFujiTestnet/IexecRelayDelegate.json → ...nts/avalancheFuji/IexecRelayDelegate.json b/...lancheFujiTestnet/IexecRelayDelegate.json → ...nts/avalancheFuji/IexecRelayDelegate.json
diff --git a/.../avalancheFujiTestnet/PublicResolver.json → ...oyments/avalancheFuji/PublicResolver.json b/.../avalancheFujiTestnet/PublicResolver.json → ...oyments/avalancheFuji/PublicResolver.json
diff --git a/deployments/avalancheFujiTestnet/RLC.json → deployments/avalancheFuji/RLC.json b/deployments/avalancheFujiTestnet/RLC.json → deployments/avalancheFuji/RLC.json
diff --git a/...valancheFujiTestnet/ReverseRegistrar.json → ...ments/avalancheFuji/ReverseRegistrar.json b/...valancheFujiTestnet/ReverseRegistrar.json → ...ments/avalancheFuji/ReverseRegistrar.json
diff --git a/...lancheFujiTestnet/WorkerpoolRegistry.json → ...nts/avalancheFuji/WorkerpoolRegistry.json b/...lancheFujiTestnet/WorkerpoolRegistry.json → ...nts/avalancheFuji/WorkerpoolRegistry.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -175,7 +175,7 @@ const config: HardhatUserConfig = {
             },
         },
         // Add Fuji as a network
-        avalancheFujiTestnet: {
+        avalancheFuji: {
             url: process.env.FUJI_RPC_URL || 'https://api.avax-test.network/ext/bc/C/rpc',
             accounts: [
                 process.env.DEV_PRIVATE_KEY ||
@@ -184,7 +184,7 @@ const config: HardhatUserConfig = {
             ...fujiBaseConfig,
         },
         // Add Arbitrum Sepolia as a network
-        'arbitrum-sepolia': {
+        arbitrumSepolia: {
             url: process.env.ARBITRUM_SEPOLIA_RPC_URL || 'https://sepolia-rollup.arbitrum.io/rpc',
             accounts: [
                 process.env.DEV_PRIVATE_KEY ||
@@ -219,7 +219,7 @@ const config: HardhatUserConfig = {
     etherscan: {
         apiKey: {
             mainnet: process.env.ETHERSCAN_API_KEY || '',
-            avalancheFujiTestnet: 'nothing', // a non-empty string is needed by the plugin.
+            avalancheFuji: '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.
@@ -313,10 +313,10 @@ task('test').setAction(async (taskArgs: any, hre, runSuper) => {
     let networkName = '';
     try {
         if (process.env.ARBITRUM_SEPOLIA_FORK === 'true') {
-            networkName = 'arbitrum-sepolia';
+            networkName = 'arbitrumSepolia';
             deploymentsCopied = await copyDeployments(networkName);
         } else if (process.env.FUJI_FORK === 'true') {
-            networkName = 'avalancheFujiTestnet';
+            networkName = 'avalancheFuji';
             deploymentsCopied = await copyDeployments(networkName);
         }
         await runSuper(taskArgs);

diff --git a/package.json b/package.json
@@ -14,8 +14,8 @@
     "check-storage-layout": "npx hardhat run scripts/check-storage.ts",
     "clean": "rm -rf deployments/hardhat",
     "test": "npm run clean && REPORT_GAS=true npx hardhat test",
-    "test:arbitrum-sepolia": "npm run clean && ARBITRUM_SEPOLIA_FORK=true npx hardhat test",
-    "test:fuji": "npm run clean && FUJI_FORK=true npx hardhat test",
+    "test:arbitrumSepolia": "npm run clean && ARBITRUM_SEPOLIA_FORK=true npx hardhat test",
+    "test:avalancheFuji": "npm run clean && FUJI_FORK=true npx hardhat test",
     "test:native": "npm run clean && TEST__IS_NATIVE_CHAIN=true npx hardhat test test/byContract/IexecEscrow/IexecEscrowNative.test.ts",
     "coverage": "npx hardhat coverage",
     "verify": "npx hardhat verify",