Merge pull request #85 from aragon/f/lighter-plugin-setup

Lighter plugin setup

Author: brickpop

npm-artifacts/CHANGELOG.md

@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.1.7
+
+- Lighter plugin setup, same logic
+
 ## v1.1.6
 
 - Adding Katana

npm-artifacts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aragon/staged-proposal-processor-plugin-artifacts",
   "author": "Aragon X",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/aragon/staged-proposal-processor-plugin",

script/Base.sol

@@ -6,6 +6,7 @@ import {console} from "forge-std/console.sol";
 
 import {Constants} from "./utils/Constants.sol";
 import {PluginSettings} from "../src/utils/PluginSettings.sol";
+import {StagedProposalProcessor as SPP} from "../src/StagedProposalProcessor.sol";
 import {StagedProposalProcessorSetup as SPPSetup} from "../src/StagedProposalProcessorSetup.sol";
 import {StagedProposalProcessorSetup as SPPSetupZkSync} from "../src/StagedProposalProcessorSetupZkSync.sol";
 
@@ -84,9 +85,9 @@ contract BaseScript is Script, Constants {
     function _createAndCheckNewVersion() internal returns (SPPSetup _sppSetup) {
         bytes32 networkHash = keccak256(abi.encodePacked(network));
         if(networkHash == keccak256(abi.encodePacked("zksyncSepolia")) || networkHash == keccak256(abi.encodePacked("zksyncMainnet"))) {
-            _sppSetup = SPPSetup(address(new SPPSetupZkSync()));
+            _sppSetup = SPPSetup(address(new SPPSetupZkSync(new SPP())));
         } else {
-            _sppSetup = new SPPSetup();
+            _sppSetup = new SPPSetup(new SPP());
         }
 
         // Check release number

script/NewVersion.s.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.18;
 
 import {BaseScript} from "./Base.sol";
 import {PluginSettings} from "../src/utils/PluginSettings.sol";
+import {StagedProposalProcessor as SPP} from "../src/StagedProposalProcessor.sol";
 import {StagedProposalProcessorSetup as SPPSetup} from "../src/StagedProposalProcessorSetup.sol";
 
 import {PluginRepo} from "@aragon/osx/framework/plugin/repo/PluginRepo.sol";
@@ -37,7 +38,7 @@ contract NewVersion is BaseScript {
             // if deployer has permission create new version
             _createAndCheckNewVersion();
         } else {
-            sppSetup = new SPPSetup();
+            sppSetup = new SPPSetup(new SPP());
             string memory json = _serializeToJson(_buildProposalData(address(sppSetup)));
 
             // Write the serialized JSON data to a file

src/StagedProposalProcessorSetup.sol

@@ -33,7 +33,7 @@ contract StagedProposalProcessorSetup is PluginUpgradeableSetup {
     /// @notice Constructs the `PluginUpgradeableSetup` by storing the `SPP` implementation address.
     /// @dev The implementation address is used to deploy UUPS proxies referencing it and
     /// to verify the plugin on the respective block explorers.
-    constructor() PluginUpgradeableSetup(address(new SPP())) {
+    constructor(SPP _spp) PluginUpgradeableSetup(address(_spp)) {
         CONDITION_IMPLEMENTATION = address(
             new SPPRuleCondition(address(0), new RuledCondition.Rule[](0))
         );

src/StagedProposalProcessorSetupZkSync.sol

@@ -33,7 +33,7 @@ contract StagedProposalProcessorSetup is PluginUpgradeableSetup {
     /// @notice Constructs the `PluginUpgradeableSetup` by storing the `SPP` implementation address.
     /// @dev The implementation address is used to deploy UUPS proxies referencing it and
     /// to verify the plugin on the respective block explorers.
-    constructor() PluginUpgradeableSetup(address(new SPP())) {
+    constructor(SPP _spp) PluginUpgradeableSetup(address(_spp)) {
         CONDITION_IMPLEMENTATION = address(
             new SPPRuleCondition(address(0), new RuledCondition.Rule[](0))
         );

test/fork/ForkBaseTest.t.sol

@@ -77,7 +77,7 @@ contract ForkBaseTest is Assertions, Constants, Events, Fuzzers, ScriptConstants
         trustedForwarder = new TrustedForwarder();
 
         // publish new spp version
-        sppSetup = new SPPSetup();
+        sppSetup = new SPPSetup(new SPP());
         // Check release number
         uint256 latestRelease = sppRepo.latestRelease();
 

test/unit/stagedProposalProcessorSetup/concrete/prepareInstallation/prepareInstallation.t.sol

@@ -22,7 +22,7 @@ contract PrepareInstallation_SPPSetup_UnitTest is BaseTest {
         super.setUp();
 
         // deploy SPPSetup contract.
-        sppSetup = new SPPSetup();
+        sppSetup = new SPPSetup(new SPP());
     }
 
     modifier whenPreparingInstallation() {

test/unit/stagedProposalProcessorSetup/concrete/prepareUninstallation/prepareUninstallation.t.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.18;
 
 import {BaseTest} from "../../../../BaseTest.t.sol";
+import {StagedProposalProcessor as SPP} from "../../../../../src/StagedProposalProcessor.sol";
 import {
     StagedProposalProcessorSetup as SPPSetup
 } from "../../../../../src/StagedProposalProcessorSetup.sol";
@@ -16,7 +17,7 @@ contract PrepareUninstallation_SPPSetup_UnitTest is BaseTest {
         super.setUp();
 
         // deploy SPPSetup contract.
-        sppSetup = new SPPSetup();
+        sppSetup = new SPPSetup(new SPP());
     }
 
     function test_WhenPreparingUninstallation() external {

test/unit/stagedProposalProcessorSetup/concrete/prepareUpdate/prepareUpdate.t.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.18;
 
 import {BaseTest} from "../../../../BaseTest.t.sol";
+import {StagedProposalProcessor as SPP} from "../../../../../src/StagedProposalProcessor.sol";
 import {
     StagedProposalProcessorSetup as SPPSetup
 } from "../../../../../src/StagedProposalProcessorSetup.sol";
@@ -18,7 +19,7 @@ contract PrepareUpdate_SPPSetup_UnitTest is BaseTest {
         super.setUp();
 
         // deploy SPPSetup contract.
-        sppSetup = new SPPSetup();
+        sppSetup = new SPPSetup(new SPP());
     }
 
     function test_RevertWhen_PreparingUpdate() external {