Update packages, refactor scripts, update foundry

.github/workflows/ci.yml

@@ -16,8 +16,6 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
 
       - name: Install deps
         run: forge install

foundry.toml

@@ -16,8 +16,8 @@ cbor_metadata = false
 bytecode_hash = "none"
 optimizer = true
 optimizer_runs = 200
-solc = "0.8.20"
-evm_version = "shanghai"
+solc = "0.8.23"
+# evm_version = "shanghai"
 
 [fmt]
 line_length = 120

script/DeployEverything.s.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BaseScript } from "script/BaseScript.s.sol";
+import { DeployGuardians } from "script/DeployGuardians.s.sol";
+import { DeployPuffer } from "script/DeployPuffer.s.sol";
+import { SetupAccess } from "script/SetupAccess.s.sol";
+import { GuardiansDeployment, PufferDeployment } from "./DeploymentStructs.sol";
+
+contract DeployEverything is BaseScript {
+    function run(address[] calldata guardians, uint256 threshold) public returns (PufferDeployment memory) {
+        // Deploy guardians
+        GuardiansDeployment memory guardiansDeployment = new DeployGuardians().run(guardians, threshold, "");
+
+        PufferDeployment memory pufferDeployment = new DeployPuffer().run(guardiansDeployment);
+
+        address DAO = makeAddr("DAO");
+
+        new SetupAccess().run(pufferDeployment, DAO);
+
+        return pufferDeployment;
+    }
+}

script/1_DeployGuardians.s.sol → script/DeployGuardians.s.sol

@@ -9,6 +9,7 @@ import { SafeProxy } from "safe-contracts/proxies/SafeProxy.sol";
 import { SafeProxyFactory } from "safe-contracts/proxies/SafeProxyFactory.sol";
 import { AccessManager } from "openzeppelin/access/manager/AccessManager.sol";
 import { Strings } from "openzeppelin/utils/Strings.sol";
+import { GuardiansDeployment } from "./DeploymentStructs.sol";
 
 // forge script script/1_DeployGuardians.s.sol:DeployGuardians --rpc-url=$EPHEMERY_RPC_URL --sig 'run(address[] calldata, uint256)' "[0x5F9a7EA6A79Ef04F103bfe7BD45dA65476a5155C]" 1
 contract DeployGuardians is BaseScript {
@@ -18,7 +19,7 @@ contract DeployGuardians is BaseScript {
     function run(address[] calldata guardians, uint256 threshold, bytes calldata emptyData)
         public
         broadcast
-        returns (Safe, GuardianModule)
+        returns (GuardiansDeployment memory)
     {
         safeProxy = vm.envOr("SAFE_PROXY_ADDRESS", address(new SafeProxyFactory()));
         safeImplementation = vm.envOr("SAFE_IMPLEMENTATION_ADDRESS", address(new Safe()));
@@ -46,7 +47,16 @@ contract DeployGuardians is BaseScript {
 
         vm.writeJson(finalJson, string.concat("./output/", Strings.toString(block.chainid), "-guardians.json"));
 
-        return (guardiansSafe, module);
+        GuardiansDeployment memory deployment;
+        deployment.guardians = address(guardiansSafe);
+        deployment.accessManager = address(accessManager);
+        deployment.guardianModule = address(module);
+        deployment.safeProxyFactory = address(safeProxy);
+        deployment.safeImplementation = address(safeImplementation);
+        deployment.enclaveVerifier = address(verifier);
+        deployment.pauser = 0x98BDB87fCF3697F4b356C36Cd621ffF94Ee3Aa19;
+
+        return deployment;
     }
 
     function deploySafe(address[] calldata owners, uint256 threshold, address to, bytes calldata data)

script/DeployPuffer.s.sol

@@ -16,6 +16,7 @@ import { IEigenPodManager } from "eigenlayer/interfaces/IEigenPodManager.sol";
 import { Strings } from "openzeppelin/utils/Strings.sol";
 import { AccessManager } from "openzeppelin/access/manager/AccessManager.sol";
 import { UpgradeableBeacon } from "openzeppelin/proxy/beacon/UpgradeableBeacon.sol";
+import { GuardiansDeployment, PufferDeployment } from "./DeploymentStructs.sol";
 
 /**
  * @title DeployPuffer
@@ -33,25 +34,29 @@ import { UpgradeableBeacon } from "openzeppelin/proxy/beacon/UpgradeableBeacon.s
  *         forge script script/DeployPuffer.s.sol:DeployPuffer -vvvv --rpc-url=$EPHEMERY_RPC_URL --broadcast
  */
 contract DeployPuffer is BaseScript {
-    function run() public broadcast returns (PufferProtocol, PufferPool, AccessManager) {
-        string memory guardiansDeployment =
-            vm.readFile(string.concat("./output/", Strings.toString(block.chainid), "-guardians.json"));
+    PufferProtocol pufferProtocolImpl;
+    AccessManager accessManager;
+    ERC1967Proxy proxy;
+    PufferProtocol pufferProtocol;
+    PufferPool pool;
+    WithdrawalPool withdrawalPool;
+    UpgradeableBeacon beacon;
+
+    function run(GuardiansDeployment calldata guardiansDeployment) public broadcast returns (PufferDeployment memory) {
         string memory obj = "";
 
-        PufferProtocol pufferProtocolImpl;
-
-        AccessManager accessManager = AccessManager(stdJson.readAddress(guardiansDeployment, ".accessManager"));
+        accessManager = AccessManager(guardiansDeployment.accessManager);
 
         {
             // PufferTreasury
             address payable treasury = payable(vm.envOr("TREASURY", address(1337)));
-            address payable guardians = payable(stdJson.readAddress(guardiansDeployment, ".guardians"));
+            address payable guardians = payable(guardiansDeployment.guardians);
 
             address eigenPodManager = vm.envOr("EIGENPOD_MANAGER", address(new EigenPodManagerMock()));
 
             PufferStrategy strategyImplementation = new PufferStrategy(IEigenPodManager(eigenPodManager));
 
-            UpgradeableBeacon beacon = new UpgradeableBeacon(address(strategyImplementation), address(accessManager));
+            beacon = new UpgradeableBeacon(address(strategyImplementation), address(accessManager));
             vm.serializeAddress(obj, "PufferStrategyBeacon", address(beacon));
 
             // Puffer Service implementation
@@ -60,16 +65,16 @@ contract DeployPuffer is BaseScript {
         }
 
         // UUPS proxy for PufferProtocol
-        ERC1967Proxy proxy = new ERC1967Proxy(address(pufferProtocolImpl), "");
+        proxy = new ERC1967Proxy(address(pufferProtocolImpl), "");
 
-        PufferProtocol pufferProtocol = PufferProtocol(payable(address(proxy)));
+        pufferProtocol = PufferProtocol(payable(address(proxy)));
         // Deploy pool
-        PufferPool pool = new PufferPool(pufferProtocol, address(accessManager));
+        pool = new PufferPool(pufferProtocol, address(accessManager));
 
-        WithdrawalPool withdrawalPool = new WithdrawalPool(pool, address(accessManager));
+        withdrawalPool = new WithdrawalPool(pool, address(accessManager));
 
         // Read guardians module variable
-        address payable guardiansModule = payable(stdJson.readAddress(guardiansDeployment, ".guardianModule"));
+        address payable guardiansModule = payable(guardiansDeployment.guardianModule);
 
         NoRestakingStrategy noRestaking =
             new NoRestakingStrategy(address(accessManager), pufferProtocol, getStakingContract());
@@ -106,12 +111,27 @@ contract DeployPuffer is BaseScript {
         vm.serializeAddress(obj, "pufferPool", address(pool));
         vm.serializeAddress(obj, "withdrawalPool", address(withdrawalPool));
         vm.serializeAddress(obj, "PufferProtocol", address(proxy));
+        vm.serializeAddress(obj, "guardianModule", guardiansDeployment.guardianModule);
+        vm.serializeAddress(obj, "guardians", guardiansDeployment.guardians);
+        vm.serializeAddress(obj, "accessManager", guardiansDeployment.accessManager);
 
         string memory finalJson = vm.serializeString(obj, "", "");
 
         vm.writeJson(finalJson, "./output/puffer.json");
-
-        return (pufferProtocol, pool, accessManager);
+        // return (pufferProtocol, pool, accessManager);
+        return PufferDeployment({
+            pufferProtocolImplementation: address(pufferProtocolImpl),
+            noRestakingStrategy: address(noRestaking),
+            pufferPool: address(pool),
+            withdrawalPool: address(withdrawalPool),
+            pufferProtocol: address(proxy),
+            guardianModule: guardiansDeployment.guardianModule,
+            guardians: guardiansDeployment.guardians,
+            accessManager: guardiansDeployment.accessManager,
+            enclaveVerifier: guardiansDeployment.enclaveVerifier,
+            pauser: guardiansDeployment.pauser,
+            beacon: address(beacon)
+        });
     }
 
     function getStakingContract() internal returns (address) {

script/DeploymentStructs.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.8.0 <0.9.0;
+
+/**
+ * @notice Guardians deployment struct
+ */
+struct GuardiansDeployment {
+    address guardians;
+    address accessManager;
+    address guardianModule;
+    address safeProxyFactory;
+    address safeImplementation;
+    address enclaveVerifier;
+    address pauser;
+}
+
+/**
+ * @notice PufferDeployment
+ */
+struct PufferDeployment {
+    address pufferProtocolImplementation;
+    address noRestakingStrategy;
+    address pufferPool;
+    address withdrawalPool;
+    address pufferProtocol;
+    address guardianModule;
+    address guardians;
+    address accessManager;
+    address enclaveVerifier;
+    address pauser;
+    address beacon; // Beacon for Puffer startegies
+}