Merge pull request #119 from PufferFinance/external-protocol-logic

Refactor PufferProtocol to keep <24KB

Author: eladiosch

mainnet-contracts/script/DeployPuffer.s.sol

@@ -30,6 +30,7 @@ import { RewardsCoordinatorMock } from "../test/mocks/RewardsCoordinatorMock.sol
 import { EigenAllocationManagerMock } from "../test/mocks/EigenAllocationManagerMock.sol";
 import { RestakingOperatorController } from "../src/RestakingOperatorController.sol";
 import { RestakingOperatorController } from "../src/RestakingOperatorController.sol";
+import { PufferProtocolLogic } from "../src/PufferProtocolLogic.sol";
 /**
  * @title DeployPuffer
  * @author Puffer Finance
@@ -181,8 +182,21 @@ contract DeployPuffer is BaseScript {
             address(moduleManager), abi.encodeCall(moduleManager.initialize, (address(accessManager)))
         );
 
+        PufferProtocolLogic pufferProtocolLogic = new PufferProtocolLogic({
+            pufferVault: PufferVaultV5(payable(pufferVault)),
+            validatorTicket: ValidatorTicket(address(validatorTicketProxy)),
+            guardianModule: GuardianModule(payable(guardiansDeployment.guardianModule)),
+            moduleManager: address(moduleManagerProxy),
+            oracle: IPufferOracleV2(oracle),
+            beaconDepositContract: getStakingContract(),
+            pufferRevenueDistributor: payable(revenueDepositor)
+        });
+
         // Initialize the Pool
-        pufferProtocol.initialize({ accessManager: address(accessManager) });
+        pufferProtocol.initialize({
+            accessManager: address(accessManager),
+            pufferProtocolLogic: address(pufferProtocolLogic)
+        });
 
         vm.label(address(accessManager), "AccessManager");
         vm.label(address(operationsCoordinator), "OperationsCoordinator");
@@ -216,8 +230,9 @@ contract DeployPuffer is BaseScript {
             pufferVault: address(0), // overwritten in DeployEverything
             pufferDepositor: address(0), // overwritten in DeployEverything
             weth: address(0), // overwritten in DeployEverything
-            revenueDepositor: address(0) // overwritten in DeployEverything
-         });
+            revenueDepositor: address(0), // overwritten in DeployEverything
+            pufferProtocolLogic: address(pufferProtocolLogic)
+        });
     }
 
     function getStakingContract() internal returns (address) {

mainnet-contracts/script/DeploymentStructs.sol

@@ -34,6 +34,7 @@ struct PufferProtocolDeployment {
     address weth; // from pufETH repository (dependency)
     address timelock; // from pufETH repository (dependency)
     address revenueDepositor;
+    address pufferProtocolLogic;
 }
 
 struct BridgingDeployment {

mainnet-contracts/script/GenerateBLSKeysAndRegisterValidators.s.sol

@@ -5,7 +5,7 @@ import "forge-std/Script.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { Permit } from "../src/structs/Permit.sol";
 import { ValidatorKeyData } from "../src/struct/ValidatorKeyData.sol";
-import { IPufferProtocol } from "../src/interface/IPufferProtocol.sol";
+import { IPufferProtocolFull } from "../src/interface/IPufferProtocolFull.sol";
 import { PufferProtocol } from "../src/PufferProtocol.sol";
 import { PufferVaultV5 } from "../src/PufferVaultV5.sol";
 import { ValidatorTicket } from "../src/ValidatorTicket.sol";
@@ -107,7 +107,7 @@ contract GenerateBLSKeysAndRegisterValidators is Script {
                 numBatches: 1
             });
 
-            IPufferProtocol(protocolAddress).registerValidatorKey(
+            IPufferProtocolFull(protocolAddress).registerValidatorKey(
                 validatorData, moduleName, 0, new bytes[](0), block.timestamp + SIGNATURE_VALIDITY_PERIOD
             );
 
@@ -156,8 +156,9 @@ contract GenerateBLSKeysAndRegisterValidators is Script {
     function _generateValidatorKey(uint256 idx, bytes32 moduleName) internal {
         uint256 numberOfGuardians = pufferProtocol.GUARDIAN_MODULE().getGuardians().length;
         bytes[] memory guardianPubKeys = pufferProtocol.GUARDIAN_MODULE().getGuardiansEnclavePubkeys();
-        address moduleAddress = IPufferProtocol(protocolAddress).getModuleAddress(moduleName);
-        bytes memory withdrawalCredentials = IPufferProtocol(protocolAddress).getWithdrawalCredentials(moduleAddress);
+        address moduleAddress = IPufferProtocolFull(protocolAddress).getModuleAddress(moduleName);
+        bytes memory withdrawalCredentials =
+            IPufferProtocolFull(protocolAddress).getWithdrawalCredentials(moduleAddress);
 
         string[] memory inputs = new string[](17);
         inputs[0] = "coral-cli";

mainnet-contracts/script/SetupAccess.s.sol

@@ -21,6 +21,7 @@ import { GenerateAccessManagerCallData } from "../script/GenerateAccessManagerCa
 import { GenerateAccessManagerCalldata2 } from "../script/AccessManagerMigrations/GenerateAccessManagerCalldata2.s.sol";
 import { GenerateRestakingOperatorCalldata } from
     "../script/AccessManagerMigrations/07_GenerateRestakingOperatorCalldata.s.sol";
+import { IPufferProtocolLogic } from "../src/interface/IPufferProtocolLogic.sol";
 
 import {
     ROLE_ID_OPERATIONS_MULTISIG,
@@ -322,8 +323,8 @@ contract SetupAccess is BaseScript {
 
         bytes4[] memory paymasterSelectors = new bytes4[](3);
         paymasterSelectors[0] = PufferProtocol.provisionNode.selector;
-        paymasterSelectors[1] = PufferProtocol.skipProvisioning.selector;
-        paymasterSelectors[2] = PufferProtocol.batchHandleWithdrawals.selector;
+        paymasterSelectors[1] = IPufferProtocolLogic.skipProvisioning.selector;
+        paymasterSelectors[2] = IPufferProtocolLogic.batchHandleWithdrawals.selector;
 
         calldatas[1] = abi.encodeWithSelector(
             AccessManager.setTargetFunctionRole.selector,
@@ -333,12 +334,12 @@ contract SetupAccess is BaseScript {
         );
 
         bytes4[] memory publicSelectors = new bytes4[](6);
-        publicSelectors[0] = PufferProtocol.registerValidatorKey.selector;
+        publicSelectors[0] = IPufferProtocolLogic.registerValidatorKey.selector;
         publicSelectors[1] = PufferProtocol.depositValidatorTickets.selector;
         publicSelectors[2] = PufferProtocol.withdrawValidatorTickets.selector;
         publicSelectors[3] = PufferProtocol.revertIfPaused.selector;
-        publicSelectors[4] = PufferProtocol.depositValidationTime.selector;
-        publicSelectors[5] = PufferProtocol.withdrawValidationTime.selector;
+        publicSelectors[4] = IPufferProtocolLogic.depositValidationTime.selector;
+        publicSelectors[5] = IPufferProtocolLogic.withdrawValidationTime.selector;
 
         calldatas[2] = abi.encodeWithSelector(
             AccessManager.setTargetFunctionRole.selector,

mainnet-contracts/src/ProtocolSignatureNonces.sol

@@ -78,23 +78,4 @@ abstract contract ProtocolSignatureNonces {
             return $._nonces[selector][owner]++;
         }
     }
-
-    /**
-     * @dev Same as {_useNonce} but checking that `nonce` is the next valid for `owner`.
-     * @param selector The function selector that determines the nonce space
-     * @param owner The address whose nonce to validate and consume
-     * @param nonce The expected nonce value
-     *
-     * @dev This function validates that the provided nonce matches the expected
-     * current nonce before consuming it. This prevents replay attacks and
-     * ensures proper signature ordering.
-     *
-     * @dev Reverts with InvalidAccountNonce if the nonce doesn't match.
-     */
-    function _useCheckedNonce(bytes32 selector, address owner, uint256 nonce) internal virtual {
-        uint256 current = _useNonce(selector, owner);
-        if (nonce != current) {
-            revert InvalidAccountNonce(selector, owner, current);
-        }
-    }
 }