From 31ea053f01a5dc887f64376a6e6d1daa9de1bc6e Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Wed, 9 Oct 2024 17:12:34 -0400 Subject: [PATCH 1/2] Don't compile ModuleProxyFactory, and don't deploy it any longer --- deploy/core/011_deploy_ModuleProxyFactory.ts | 6 ++++-- hardhat.config.ts | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/core/011_deploy_ModuleProxyFactory.ts b/deploy/core/011_deploy_ModuleProxyFactory.ts index fc6eafa3..17873611 100644 --- a/deploy/core/011_deploy_ModuleProxyFactory.ts +++ b/deploy/core/011_deploy_ModuleProxyFactory.ts @@ -1,9 +1,11 @@ import { HardhatRuntimeEnvironment } from "hardhat/types"; import { DeployFunction } from "hardhat-deploy/types"; -import { deployNonUpgradeable } from "../helpers/deployNonUpgradeable"; +// import { deployNonUpgradeable } from "../helpers/deployNonUpgradeable"; const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { - await deployNonUpgradeable(hre, "ModuleProxyFactory", []); + // No longer deploying ModuleProxyFactory to any new networks.. + // This contract is deployed by the Zodiac team. + // await deployNonUpgradeable(hre, "ModuleProxyFactory", []); }; export default func; diff --git a/hardhat.config.ts b/hardhat.config.ts index 85d222f6..51e93cc0 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -26,7 +26,6 @@ const config: HardhatUserConfig = { "@gnosis.pm/safe-contracts/contracts/libraries/MultiSendCallOnly.sol", "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxyFactory.sol", "@gnosis.pm/safe-contracts/contracts/GnosisSafeL2.sol", - "@gnosis.pm/zodiac/contracts/factory/ModuleProxyFactory.sol", ], }, namedAccounts: { From 77ccd7319a0808aa914f07d86609d7de797fa7eb Mon Sep 17 00:00:00 2001 From: Adam Gall Date: Wed, 9 Oct 2024 17:17:08 -0400 Subject: [PATCH 2/2] Alright I guess we do need to compile it, the tests need it --- hardhat.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/hardhat.config.ts b/hardhat.config.ts index 51e93cc0..85d222f6 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -26,6 +26,7 @@ const config: HardhatUserConfig = { "@gnosis.pm/safe-contracts/contracts/libraries/MultiSendCallOnly.sol", "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxyFactory.sol", "@gnosis.pm/safe-contracts/contracts/GnosisSafeL2.sol", + "@gnosis.pm/zodiac/contracts/factory/ModuleProxyFactory.sol", ], }, namedAccounts: {