From 90901fccc9059810d697105f655013ab1dfac952 Mon Sep 17 00:00:00 2001 From: vicnaum Date: Fri, 17 May 2024 15:48:32 +0200 Subject: [PATCH] misc: Removed the collectActionModule from the publicActProxy as it was not needed anymore --- contracts/misc/PublicActProxy.sol | 4 +--- script/DeployFreshLensV2.s.sol | 5 +---- script/DeployPublicActProxy.s.sol | 13 +------------ script/S02_DeployLensV2Periphery.s.sol | 5 +---- test/misc/PublicActProxyTest.t.sol | 2 +- 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/contracts/misc/PublicActProxy.sol b/contracts/misc/PublicActProxy.sol index 71ca412..379a8bf 100644 --- a/contracts/misc/PublicActProxy.sol +++ b/contracts/misc/PublicActProxy.sol @@ -41,11 +41,9 @@ contract PublicActProxy is PublicActProxy_MetaTx { using SafeERC20 for IERC20; ILensHub public immutable HUB; - CollectPublicationAction public immutable COLLECT_PUBLICATION_ACTION; - constructor(address lensHub, address collectPublicationAction) { + constructor(address lensHub) { HUB = ILensHub(lensHub); - COLLECT_PUBLICATION_ACTION = CollectPublicationAction(collectPublicationAction); } // The free act is pretty simple, but should follow the rules above: diff --git a/script/DeployFreshLensV2.s.sol b/script/DeployFreshLensV2.s.sol index a403ff3..f59de81 100644 --- a/script/DeployFreshLensV2.s.sol +++ b/script/DeployFreshLensV2.s.sol @@ -401,10 +401,7 @@ contract DeployFreshLensV2 is Script, ForkManagement, ArrayHelpers { litAccessControl = LitAccessControl(address(litAccessControlProxy)); _logDeployedAddress(address(litAccessControl), 'LitAccessControl'); - publicActProxy = new PublicActProxy({ - lensHub: address(hub), - collectPublicationAction: address(collectPublicationAction) - }); + publicActProxy = new PublicActProxy({lensHub: address(hub)}); _logDeployedAddress(address(publicActProxy), 'PublicActProxy'); } diff --git a/script/DeployPublicActProxy.s.sol b/script/DeployPublicActProxy.s.sol index 07b9513..64d4d40 100644 --- a/script/DeployPublicActProxy.s.sol +++ b/script/DeployPublicActProxy.s.sol @@ -32,7 +32,6 @@ contract DeployPublicActProxy is Script, ForkManagement, ArrayHelpers { string mnemonic; address lensHub; - address collectPublicationAction; address publicActProxy; @@ -95,22 +94,12 @@ contract DeployPublicActProxy is Script, ForkManagement, ArrayHelpers { lensHub = json.readAddress(string(abi.encodePacked('.', targetEnv, '.LensHub'))); vm.label(lensHub, 'LensHub'); console.log('Lens Hub Proxy: %s', lensHub); - - Module[] memory actModules = abi.decode( - vm.parseJson(json, string(abi.encodePacked('.', targetEnv, '.Modules.v2.act'))), - (Module[]) - ); - collectPublicationAction = findModuleHelper(actModules, 'CollectPublicationAction').addy; - vm.label(collectPublicationAction, 'CollectPublicationAction'); - console.log('CollectPublicationAction: %s', collectPublicationAction); } function deploy() internal { vm.startBroadcast(deployer.ownerPk); { - publicActProxy = address( - new PublicActProxy({lensHub: lensHub, collectPublicationAction: collectPublicationAction}) - ); + publicActProxy = address(new PublicActProxy({lensHub: lensHub})); _logDeployedAddress(publicActProxy, 'PublicActProxy'); } vm.stopBroadcast(); diff --git a/script/S02_DeployLensV2Periphery.s.sol b/script/S02_DeployLensV2Periphery.s.sol index 4a0fdf2..058a631 100644 --- a/script/S02_DeployLensV2Periphery.s.sol +++ b/script/S02_DeployLensV2Periphery.s.sol @@ -230,10 +230,7 @@ contract S02_DeployLensV2Periphery is Script, ForkManagement, ArrayHelpers { vm.label(address(profileCreationProxy), 'ProfileCreationProxy'); saveContractAddress('ProfileCreationProxy', address(profileCreationProxy)); - publicActProxy = new PublicActProxy({ - lensHub: address(hub), - collectPublicationAction: address(collectPublicationAction) - }); + publicActProxy = new PublicActProxy({lensHub: address(hub)}); console.log('\n+ + + PublicActProxy: %s', address(publicActProxy)); vm.writeLine(addressesFile, string.concat('PublicActProxy: ', vm.toString(address(publicActProxy)))); vm.label(address(publicActProxy), 'PublicActProxy'); diff --git a/test/misc/PublicActProxyTest.t.sol b/test/misc/PublicActProxyTest.t.sol index d664cf4..45ac6e9 100644 --- a/test/misc/PublicActProxyTest.t.sol +++ b/test/misc/PublicActProxyTest.t.sol @@ -43,7 +43,7 @@ contract PublicActProxyTest is BaseTest { ); } else { console.log('PublicActProxy key does not exist'); - publicActProxy = new PublicActProxy(address(hub), address(collectPublicationAction)); + publicActProxy = new PublicActProxy(address(hub)); } publicProfile = _loadAccountAs('PUBLIC_PROFILE');