diff --git a/CHANGELOG.md b/CHANGELOG.md index df1e7774d..ac3486ea9 100644 --- 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 b/deployments/arbitrumSepolia/.chainId similarity index 100% rename from deployments/arbitrum-sepolia/.chainId rename to deployments/arbitrumSepolia/.chainId diff --git a/deployments/arbitrum-sepolia/AppRegistry.json b/deployments/arbitrumSepolia/AppRegistry.json similarity index 100% rename from deployments/arbitrum-sepolia/AppRegistry.json rename to deployments/arbitrumSepolia/AppRegistry.json diff --git a/deployments/arbitrum-sepolia/DatasetRegistry.json b/deployments/arbitrumSepolia/DatasetRegistry.json similarity index 100% rename from deployments/arbitrum-sepolia/DatasetRegistry.json rename to deployments/arbitrumSepolia/DatasetRegistry.json diff --git a/deployments/arbitrum-sepolia/ENSIntegrationDelegate.json b/deployments/arbitrumSepolia/ENSIntegrationDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/ENSIntegrationDelegate.json rename to deployments/arbitrumSepolia/ENSIntegrationDelegate.json diff --git a/deployments/arbitrum-sepolia/ENSRegistry.json b/deployments/arbitrumSepolia/ENSRegistry.json similarity index 100% rename from deployments/arbitrum-sepolia/ENSRegistry.json rename to deployments/arbitrumSepolia/ENSRegistry.json diff --git a/deployments/arbitrum-sepolia/ERC1538Proxy.json b/deployments/arbitrumSepolia/ERC1538Proxy.json similarity index 100% rename from deployments/arbitrum-sepolia/ERC1538Proxy.json rename to deployments/arbitrumSepolia/ERC1538Proxy.json diff --git a/deployments/arbitrum-sepolia/ERC1538QueryDelegate.json b/deployments/arbitrumSepolia/ERC1538QueryDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/ERC1538QueryDelegate.json rename to deployments/arbitrumSepolia/ERC1538QueryDelegate.json diff --git a/deployments/arbitrum-sepolia/ERC1538UpdateDelegate.json b/deployments/arbitrumSepolia/ERC1538UpdateDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/ERC1538UpdateDelegate.json rename to deployments/arbitrumSepolia/ERC1538UpdateDelegate.json diff --git a/deployments/arbitrum-sepolia/FIFSRegistrar.json b/deployments/arbitrumSepolia/FIFSRegistrar.json similarity index 100% rename from deployments/arbitrum-sepolia/FIFSRegistrar.json rename to deployments/arbitrumSepolia/FIFSRegistrar.json diff --git a/deployments/arbitrum-sepolia/IexecAccessorsABILegacyDelegate.json b/deployments/arbitrumSepolia/IexecAccessorsABILegacyDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecAccessorsABILegacyDelegate.json rename to deployments/arbitrumSepolia/IexecAccessorsABILegacyDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecAccessorsDelegate.json b/deployments/arbitrumSepolia/IexecAccessorsDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecAccessorsDelegate.json rename to deployments/arbitrumSepolia/IexecAccessorsDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecCategoryManagerDelegate.json b/deployments/arbitrumSepolia/IexecCategoryManagerDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecCategoryManagerDelegate.json rename to deployments/arbitrumSepolia/IexecCategoryManagerDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecERC20Delegate.json b/deployments/arbitrumSepolia/IexecERC20Delegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecERC20Delegate.json rename to deployments/arbitrumSepolia/IexecERC20Delegate.json diff --git a/deployments/arbitrum-sepolia/IexecEscrowTokenDelegate.json b/deployments/arbitrumSepolia/IexecEscrowTokenDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecEscrowTokenDelegate.json rename to deployments/arbitrumSepolia/IexecEscrowTokenDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecLibOrders_v5.json b/deployments/arbitrumSepolia/IexecLibOrders_v5.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecLibOrders_v5.json rename to deployments/arbitrumSepolia/IexecLibOrders_v5.json diff --git a/deployments/arbitrum-sepolia/IexecMaintenanceDelegate.json b/deployments/arbitrumSepolia/IexecMaintenanceDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecMaintenanceDelegate.json rename to deployments/arbitrumSepolia/IexecMaintenanceDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecMaintenanceExtraDelegate.json b/deployments/arbitrumSepolia/IexecMaintenanceExtraDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecMaintenanceExtraDelegate.json rename to deployments/arbitrumSepolia/IexecMaintenanceExtraDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecOrderManagementDelegate.json b/deployments/arbitrumSepolia/IexecOrderManagementDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecOrderManagementDelegate.json rename to deployments/arbitrumSepolia/IexecOrderManagementDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecPoco1Delegate.json b/deployments/arbitrumSepolia/IexecPoco1Delegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecPoco1Delegate.json rename to deployments/arbitrumSepolia/IexecPoco1Delegate.json diff --git a/deployments/arbitrum-sepolia/IexecPoco2Delegate.json b/deployments/arbitrumSepolia/IexecPoco2Delegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecPoco2Delegate.json rename to deployments/arbitrumSepolia/IexecPoco2Delegate.json diff --git a/deployments/arbitrum-sepolia/IexecPocoAccessorsDelegate.json b/deployments/arbitrumSepolia/IexecPocoAccessorsDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecPocoAccessorsDelegate.json rename to deployments/arbitrumSepolia/IexecPocoAccessorsDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecPocoBoostAccessorsDelegate.json b/deployments/arbitrumSepolia/IexecPocoBoostAccessorsDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecPocoBoostAccessorsDelegate.json rename to deployments/arbitrumSepolia/IexecPocoBoostAccessorsDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecPocoBoostDelegate.json b/deployments/arbitrumSepolia/IexecPocoBoostDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecPocoBoostDelegate.json rename to deployments/arbitrumSepolia/IexecPocoBoostDelegate.json diff --git a/deployments/arbitrum-sepolia/IexecRelayDelegate.json b/deployments/arbitrumSepolia/IexecRelayDelegate.json similarity index 100% rename from deployments/arbitrum-sepolia/IexecRelayDelegate.json rename to deployments/arbitrumSepolia/IexecRelayDelegate.json diff --git a/deployments/arbitrum-sepolia/PublicResolver.json b/deployments/arbitrumSepolia/PublicResolver.json similarity index 100% rename from deployments/arbitrum-sepolia/PublicResolver.json rename to deployments/arbitrumSepolia/PublicResolver.json diff --git a/deployments/arbitrum-sepolia/RLC.json b/deployments/arbitrumSepolia/RLC.json similarity index 100% rename from deployments/arbitrum-sepolia/RLC.json rename to deployments/arbitrumSepolia/RLC.json diff --git a/deployments/arbitrum-sepolia/ReverseRegistrar.json b/deployments/arbitrumSepolia/ReverseRegistrar.json similarity index 100% rename from deployments/arbitrum-sepolia/ReverseRegistrar.json rename to deployments/arbitrumSepolia/ReverseRegistrar.json diff --git a/deployments/arbitrum-sepolia/WorkerpoolRegistry.json b/deployments/arbitrumSepolia/WorkerpoolRegistry.json similarity index 100% rename from deployments/arbitrum-sepolia/WorkerpoolRegistry.json rename to deployments/arbitrumSepolia/WorkerpoolRegistry.json diff --git a/deployments/avalancheFujiTestnet/.chainId b/deployments/avalancheFuji/.chainId similarity index 100% rename from deployments/avalancheFujiTestnet/.chainId rename to deployments/avalancheFuji/.chainId diff --git a/deployments/avalancheFujiTestnet/AppRegistry.json b/deployments/avalancheFuji/AppRegistry.json similarity index 100% rename from deployments/avalancheFujiTestnet/AppRegistry.json rename to deployments/avalancheFuji/AppRegistry.json diff --git a/deployments/avalancheFujiTestnet/DatasetRegistry.json b/deployments/avalancheFuji/DatasetRegistry.json similarity index 100% rename from deployments/avalancheFujiTestnet/DatasetRegistry.json rename to deployments/avalancheFuji/DatasetRegistry.json diff --git a/deployments/avalancheFujiTestnet/ENSIntegrationDelegate.json b/deployments/avalancheFuji/ENSIntegrationDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/ENSIntegrationDelegate.json rename to deployments/avalancheFuji/ENSIntegrationDelegate.json diff --git a/deployments/avalancheFujiTestnet/ENSRegistry.json b/deployments/avalancheFuji/ENSRegistry.json similarity index 100% rename from deployments/avalancheFujiTestnet/ENSRegistry.json rename to deployments/avalancheFuji/ENSRegistry.json diff --git a/deployments/avalancheFujiTestnet/ERC1538Proxy.json b/deployments/avalancheFuji/ERC1538Proxy.json similarity index 100% rename from deployments/avalancheFujiTestnet/ERC1538Proxy.json rename to deployments/avalancheFuji/ERC1538Proxy.json diff --git a/deployments/avalancheFujiTestnet/ERC1538QueryDelegate.json b/deployments/avalancheFuji/ERC1538QueryDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/ERC1538QueryDelegate.json rename to deployments/avalancheFuji/ERC1538QueryDelegate.json diff --git a/deployments/avalancheFujiTestnet/ERC1538UpdateDelegate.json b/deployments/avalancheFuji/ERC1538UpdateDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/ERC1538UpdateDelegate.json rename to deployments/avalancheFuji/ERC1538UpdateDelegate.json diff --git a/deployments/avalancheFujiTestnet/FIFSRegistrar.json b/deployments/avalancheFuji/FIFSRegistrar.json similarity index 100% rename from deployments/avalancheFujiTestnet/FIFSRegistrar.json rename to deployments/avalancheFuji/FIFSRegistrar.json diff --git a/deployments/avalancheFujiTestnet/IexecAccessorsABILegacyDelegate.json b/deployments/avalancheFuji/IexecAccessorsABILegacyDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecAccessorsABILegacyDelegate.json rename to deployments/avalancheFuji/IexecAccessorsABILegacyDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecAccessorsDelegate.json b/deployments/avalancheFuji/IexecAccessorsDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecAccessorsDelegate.json rename to deployments/avalancheFuji/IexecAccessorsDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecCategoryManagerDelegate.json b/deployments/avalancheFuji/IexecCategoryManagerDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecCategoryManagerDelegate.json rename to deployments/avalancheFuji/IexecCategoryManagerDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecERC20Delegate.json b/deployments/avalancheFuji/IexecERC20Delegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecERC20Delegate.json rename to deployments/avalancheFuji/IexecERC20Delegate.json diff --git a/deployments/avalancheFujiTestnet/IexecEscrowTokenDelegate.json b/deployments/avalancheFuji/IexecEscrowTokenDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecEscrowTokenDelegate.json rename to deployments/avalancheFuji/IexecEscrowTokenDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecLibOrders_v5.json b/deployments/avalancheFuji/IexecLibOrders_v5.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecLibOrders_v5.json rename to deployments/avalancheFuji/IexecLibOrders_v5.json diff --git a/deployments/avalancheFujiTestnet/IexecMaintenanceDelegate.json b/deployments/avalancheFuji/IexecMaintenanceDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecMaintenanceDelegate.json rename to deployments/avalancheFuji/IexecMaintenanceDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecMaintenanceExtraDelegate.json b/deployments/avalancheFuji/IexecMaintenanceExtraDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecMaintenanceExtraDelegate.json rename to deployments/avalancheFuji/IexecMaintenanceExtraDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecOrderManagementDelegate.json b/deployments/avalancheFuji/IexecOrderManagementDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecOrderManagementDelegate.json rename to deployments/avalancheFuji/IexecOrderManagementDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecPoco1Delegate.json b/deployments/avalancheFuji/IexecPoco1Delegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecPoco1Delegate.json rename to deployments/avalancheFuji/IexecPoco1Delegate.json diff --git a/deployments/avalancheFujiTestnet/IexecPoco2Delegate.json b/deployments/avalancheFuji/IexecPoco2Delegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecPoco2Delegate.json rename to deployments/avalancheFuji/IexecPoco2Delegate.json diff --git a/deployments/avalancheFujiTestnet/IexecPocoAccessorsDelegate.json b/deployments/avalancheFuji/IexecPocoAccessorsDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecPocoAccessorsDelegate.json rename to deployments/avalancheFuji/IexecPocoAccessorsDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecPocoBoostAccessorsDelegate.json b/deployments/avalancheFuji/IexecPocoBoostAccessorsDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecPocoBoostAccessorsDelegate.json rename to deployments/avalancheFuji/IexecPocoBoostAccessorsDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecPocoBoostDelegate.json b/deployments/avalancheFuji/IexecPocoBoostDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecPocoBoostDelegate.json rename to deployments/avalancheFuji/IexecPocoBoostDelegate.json diff --git a/deployments/avalancheFujiTestnet/IexecRelayDelegate.json b/deployments/avalancheFuji/IexecRelayDelegate.json similarity index 100% rename from deployments/avalancheFujiTestnet/IexecRelayDelegate.json rename to deployments/avalancheFuji/IexecRelayDelegate.json diff --git a/deployments/avalancheFujiTestnet/PublicResolver.json b/deployments/avalancheFuji/PublicResolver.json similarity index 100% rename from deployments/avalancheFujiTestnet/PublicResolver.json rename to deployments/avalancheFuji/PublicResolver.json diff --git a/deployments/avalancheFujiTestnet/RLC.json b/deployments/avalancheFuji/RLC.json similarity index 100% rename from deployments/avalancheFujiTestnet/RLC.json rename to deployments/avalancheFuji/RLC.json diff --git a/deployments/avalancheFujiTestnet/ReverseRegistrar.json b/deployments/avalancheFuji/ReverseRegistrar.json similarity index 100% rename from deployments/avalancheFujiTestnet/ReverseRegistrar.json rename to deployments/avalancheFuji/ReverseRegistrar.json diff --git a/deployments/avalancheFujiTestnet/WorkerpoolRegistry.json b/deployments/avalancheFuji/WorkerpoolRegistry.json similarity index 100% rename from deployments/avalancheFujiTestnet/WorkerpoolRegistry.json rename to deployments/avalancheFuji/WorkerpoolRegistry.json diff --git a/hardhat.config.ts b/hardhat.config.ts index 9621cc04a..32aa0b125 100644 --- 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 index e60797c0c..b73f4442e 100644 --- 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",