refactor: caster initializes with caster config

src/lib/Structs.sol

@@ -34,6 +34,15 @@ struct Action {
   uint96 totalDisapprovals; // The total quantity of policyholder disapprovals.
 }
 
+/// @dev Quorum and period data for token voting caster contracts.
+struct CasterConfig {
+  uint16 voteQuorumPct;
+  uint16 vetoQuorumPct;
+  uint16 delayPeriodPct;
+  uint16 castingPeriodPct;
+  uint16 submissionPeriodPct;
+}
+
 /// @dev Data that represents a permission.
 struct PermissionData {
   address target; // Contract being called by an action.

src/token-voting/LlamaERC20TokenCaster.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.23;
 import {ERC20Votes} from "@openzeppelin/token/ERC20/extensions/ERC20Votes.sol";
 
 import {ILlamaCore} from "src/interfaces/ILlamaCore.sol";
+import {CasterConfig} from "src/lib/Structs.sol";
 import {ILlamaTokenClockAdapter} from "src/token-voting/ILlamaTokenClockAdapter.sol";
 import {LlamaTokenCaster} from "src/token-voting/LlamaTokenCaster.sol";
 
@@ -27,17 +28,15 @@ contract LlamaERC20TokenCaster is LlamaTokenCaster {
   /// @param _token The ERC20 token to be used for voting.
   /// @param _llamaCore The `LlamaCore` contract for this Llama instance.
   /// @param _role The role used by this contract to cast approvals and disapprovals.
-  /// @param _voteQuorumPct The minimum % of votes required to submit an approval to `LlamaCore`.
-  /// @param _vetoQuorumPct The minimum % of vetoes required to submit a disapproval to `LlamaCore`.
+  /// @param casterConfig Contains the quorum and period pct values to initialize the contract with.
   function initialize(
     ERC20Votes _token,
     ILlamaCore _llamaCore,
     ILlamaTokenClockAdapter _clockAdapter,
     uint8 _role,
-    uint16 _voteQuorumPct,
-    uint16 _vetoQuorumPct
+    CasterConfig memory casterConfig
   ) external initializer {
-    __initializeLlamaTokenCasterMinimalProxy(_llamaCore, _clockAdapter, _role, _voteQuorumPct, _vetoQuorumPct);
+    __initializeLlamaTokenCasterMinimalProxy(_llamaCore, _clockAdapter, _role, casterConfig);
     token = _token;
     uint256 totalSupply = token.getPastTotalSupply(_currentTimepointMinusOne());
     if (totalSupply == 0) revert InvalidTokenAddress();

src/token-voting/LlamaERC721TokenCaster.sol

@@ -5,6 +5,7 @@ import {ERC721Votes} from "@openzeppelin/token/ERC721/extensions/ERC721Votes.sol
 import {IERC721} from "@openzeppelin/token/ERC721/IERC721.sol";
 
 import {ILlamaCore} from "src/interfaces/ILlamaCore.sol";
+import {CasterConfig} from "src/lib/Structs.sol";
 import {ILlamaTokenClockAdapter} from "src/token-voting/ILlamaTokenClockAdapter.sol";
 import {LlamaTokenCaster} from "src/token-voting/LlamaTokenCaster.sol";
 /// @title LlamaERC721TokenCaster
@@ -28,17 +29,15 @@ contract LlamaERC721TokenCaster is LlamaTokenCaster {
   /// @param _token The ERC721 token to be used for voting.
   /// @param _llamaCore The `LlamaCore` contract for this Llama instance.
   /// @param _role The role used by this contract to cast approvals and disapprovals.
-  /// @param _voteQuorumPct The minimum % of votes required to submit an approval to `LlamaCore`.
-  /// @param _vetoQuorumPct The minimum % of vetoes required to submit a disapproval to `LlamaCore`.
+  /// @param casterConfig Contains the quorum and period pct values to initialize the contract with.
   function initialize(
     ERC721Votes _token,
     ILlamaCore _llamaCore,
     ILlamaTokenClockAdapter _clockAdapter,
     uint8 _role,
-    uint16 _voteQuorumPct,
-    uint16 _vetoQuorumPct
+    CasterConfig memory casterConfig
   ) external initializer {
-    __initializeLlamaTokenCasterMinimalProxy(_llamaCore, _clockAdapter, _role, _voteQuorumPct, _vetoQuorumPct);
+    __initializeLlamaTokenCasterMinimalProxy(_llamaCore, _clockAdapter, _role, casterConfig);
     token = _token;
     if (!token.supportsInterface(type(IERC721).interfaceId)) revert InvalidTokenAddress();
     uint256 totalSupply = token.getPastTotalSupply(_currentTimepointMinusOne());

src/token-voting/LlamaTokenCaster.sol

@@ -8,6 +8,7 @@ import {ILlamaCore} from "src/interfaces/ILlamaCore.sol";
 import {ILlamaTokenClockAdapter} from "src/token-voting/ILlamaTokenClockAdapter.sol";
 import {ActionState, VoteType} from "src/lib/Enums.sol";
 import {LlamaUtils} from "src/lib/LlamaUtils.sol";
+import {CasterConfig} from "src/lib/Structs.sol";
 import {PeriodPctCheckpoints} from "src/lib/PeriodPctCheckpoints.sol";
 import {QuorumCheckpoints} from "src/lib/QuorumCheckpoints.sol";
 import {Action, ActionInfo} from "src/lib/Structs.sol";
@@ -197,23 +198,21 @@ abstract contract LlamaTokenCaster is Initializable {
   /// @dev This will be called by the `initialize` of the inheriting contract.
   /// @param _llamaCore The `LlamaCore` contract for this Llama instance.
   /// @param _role The role used by this contract to cast approvals and disapprovals.
-  /// @param _voteQuorumPct The minimum % of votes required to submit an approval to `LlamaCore`.
-  /// @param _vetoQuorumPct The minimum % of vetoes required to submit a disapproval to `LlamaCore`.
+  /// @param casterConfig Contains the quorum and period pct values to initialize the contract with.
   function __initializeLlamaTokenCasterMinimalProxy(
     ILlamaCore _llamaCore,
     ILlamaTokenClockAdapter _clockAdapter,
     uint8 _role,
-    uint16 _voteQuorumPct,
-    uint16 _vetoQuorumPct
+    CasterConfig memory casterConfig
   ) internal {
     if (_llamaCore.actionsCount() < 0) revert InvalidLlamaCoreAddress();
     if (_role > _llamaCore.policy().numRoles()) revert RoleNotInitialized(_role);
 
     llamaCore = _llamaCore;
     clockAdapter = _clockAdapter;
     role = _role;
-    _setQuorumPct(_voteQuorumPct, _vetoQuorumPct);
-    _setPeriodPcts(2500, 5000, 2500); // default to 25% delay, 50% casting, 25% submission periods
+    _setQuorumPct(casterConfig.voteQuorumPct, casterConfig.vetoQuorumPct);
+    _setPeriodPcts(casterConfig.delayPeriodPct, casterConfig.castingPeriodPct, casterConfig.submissionPeriodPct);
   }
 
   // ===========================================

src/token-voting/LlamaTokenVotingFactory.sol

@@ -6,6 +6,7 @@ import {ERC20Votes} from "@openzeppelin/token/ERC20/extensions/ERC20Votes.sol";
 import {ERC721Votes} from "@openzeppelin/token/ERC721/extensions/ERC721Votes.sol";
 
 import {ILlamaCore} from "src/interfaces/ILlamaCore.sol";
+import {CasterConfig} from "src/lib/Structs.sol";
 import {ILlamaTokenClockAdapter} from "src/token-voting/ILlamaTokenClockAdapter.sol";
 import {LlamaERC20TokenActionCreator} from "src/token-voting/LlamaERC20TokenActionCreator.sol";
 import {LlamaERC20TokenCaster} from "src/token-voting/LlamaERC20TokenCaster.sol";
@@ -64,8 +65,7 @@ contract LlamaTokenVotingFactory {
   ///@param actionCreatorRole The role required by the `LlamaTokenActionCreator` to create an action.
   ///@param casterRole The role required by the `LlamaTokenCaster` to cast approvals and disapprovals.
   ///@param creationThreshold The number of tokens required to create an action.
-  ///@param voteQuorumPct The minimum percentage of tokens required to approve an action.
-  ///@param vetoQuorumPct The minimum percentage of tokens required to disapprove an action.
+  ///@param casterConfig Contains the quorum and period pct values to initialize the contract with.
   function deploy(
     ILlamaCore llamaCore,
     address token,
@@ -75,8 +75,7 @@ contract LlamaTokenVotingFactory {
     uint8 actionCreatorRole,
     uint8 casterRole,
     uint256 creationThreshold,
-    uint16 voteQuorumPct,
-    uint16 vetoQuorumPct
+    CasterConfig memory casterConfig
   ) external returns (address actionCreator, address caster) {
     if (isERC20) {
       actionCreator = address(
@@ -85,9 +84,7 @@ contract LlamaTokenVotingFactory {
         )
       );
       caster = address(
-        _deployLlamaERC20TokenCaster(
-          ERC20Votes(token), llamaCore, clockAdapter, nonce, casterRole, voteQuorumPct, vetoQuorumPct
-        )
+        _deployLlamaERC20TokenCaster(ERC20Votes(token), llamaCore, clockAdapter, nonce, casterRole, casterConfig)
       );
     } else {
       actionCreator = address(
@@ -96,9 +93,7 @@ contract LlamaTokenVotingFactory {
         )
       );
       caster = address(
-        _deployLlamaERC721TokenCaster(
-          ERC721Votes(token), llamaCore, clockAdapter, nonce, casterRole, voteQuorumPct, vetoQuorumPct
-        )
+        _deployLlamaERC721TokenCaster(ERC721Votes(token), llamaCore, clockAdapter, nonce, casterRole, casterConfig)
       );
     }
 
@@ -164,16 +159,15 @@ contract LlamaTokenVotingFactory {
     ILlamaTokenClockAdapter clockAdapter,
     uint256 nonce,
     uint8 role,
-    uint16 voteQuorumPct,
-    uint16 vetoQuorumPct
+    CasterConfig memory casterConfig
   ) internal returns (LlamaERC20TokenCaster caster) {
     caster = LlamaERC20TokenCaster(
       Clones.cloneDeterministic(
         address(ERC20_TOKEN_CASTER_LOGIC),
         keccak256(abi.encodePacked(msg.sender, address(llamaCore), address(token), nonce))
       )
     );
-    caster.initialize(token, llamaCore, clockAdapter, role, voteQuorumPct, vetoQuorumPct);
+    caster.initialize(token, llamaCore, clockAdapter, role, casterConfig);
   }
 
   /// @dev Deploys and initiliazes a new `LlamaERC721TokenCaster` clone.
@@ -183,15 +177,14 @@ contract LlamaTokenVotingFactory {
     ILlamaTokenClockAdapter clockAdapter,
     uint256 nonce,
     uint8 role,
-    uint16 voteQuorumPct,
-    uint16 vetoQuorumPct
+    CasterConfig memory casterConfig
   ) internal returns (LlamaERC721TokenCaster caster) {
     caster = LlamaERC721TokenCaster(
       Clones.cloneDeterministic(
         address(ERC721_TOKEN_CASTER_LOGIC),
         keccak256(abi.encodePacked(msg.sender, address(llamaCore), address(token), nonce))
       )
     );
-    caster.initialize(token, llamaCore, clockAdapter, role, voteQuorumPct, vetoQuorumPct);
+    caster.initialize(token, llamaCore, clockAdapter, role, casterConfig);
   }
 }

test/token-voting/LlamaERC20TokenCaster.t.sol

@@ -117,7 +117,7 @@ contract CastVote is LlamaERC20TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC20_VOTE_QUORUM_PCT, ERC20_VETO_QUORUM_PCT
+      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
 
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
@@ -332,7 +332,7 @@ contract CastVeto is LlamaERC20TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC20_VOTE_QUORUM_PCT, ERC20_VETO_QUORUM_PCT
+      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
 
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
@@ -594,7 +594,7 @@ contract SubmitApprovals is LlamaERC20TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC20_VOTE_QUORUM_PCT, ERC20_VETO_QUORUM_PCT
+      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
     casterWithWrongRole.submitApproval(actionInfo);
@@ -679,7 +679,7 @@ contract SubmitDisapprovals is LlamaERC20TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC20_VOTE_QUORUM_PCT, ERC20_VETO_QUORUM_PCT
+      erc20VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
     casterWithWrongRole.submitDisapproval(actionInfo);

test/token-voting/LlamaERC721TokenCaster.t.sol

@@ -117,7 +117,7 @@ contract CastVote is LlamaERC721TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC721_VOTE_QUORUM_PCT, ERC721_VETO_QUORUM_PCT
+      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
 
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
@@ -332,7 +332,7 @@ contract CastVeto is LlamaERC721TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC721_VOTE_QUORUM_PCT, ERC721_VETO_QUORUM_PCT
+      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
 
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
@@ -592,7 +592,7 @@ contract SubmitApprovals is LlamaERC721TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC721_VOTE_QUORUM_PCT, ERC721_VETO_QUORUM_PCT
+      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
     casterWithWrongRole.submitApproval(actionInfo);
@@ -677,7 +677,7 @@ contract SubmitDisapprovals is LlamaERC721TokenCasterTest {
       )
     );
     casterWithWrongRole.initialize(
-      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, ERC721_VOTE_QUORUM_PCT, ERC721_VETO_QUORUM_PCT
+      erc721VotesToken, CORE, LLAMA_TOKEN_TIMESTAMP_ADAPTER, madeUpRole, defaultCasterConfig
     );
     vm.expectRevert(abi.encodeWithSelector(ILlamaRelativeStrategyBase.InvalidRole.selector, tokenVotingCasterRole));
     casterWithWrongRole.submitDisapproval(actionInfo);

test/token-voting/LlamaTokenVotingFactory.t.sol

@@ -102,8 +102,7 @@ contract DeployTokenVotingModule is LlamaTokenVotingFactoryTest {
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC20_CREATION_THRESHOLD,
-      ERC20_VOTE_QUORUM_PCT,
-      ERC20_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
     ActionInfo memory actionInfo = _setPermissionCreateApproveAndQueueAction(data);
 
@@ -168,8 +167,7 @@ contract DeployTokenVotingModule is LlamaTokenVotingFactoryTest {
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC721_CREATION_THRESHOLD,
-      ERC721_VOTE_QUORUM_PCT,
-      ERC721_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
     ActionInfo memory actionInfo = _setPermissionCreateApproveAndQueueAction(data);
 
@@ -271,8 +269,7 @@ contract DeployTokenVotingModule is LlamaTokenVotingFactoryTest {
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC20_CREATION_THRESHOLD,
-      ERC20_VOTE_QUORUM_PCT,
-      ERC20_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
 
     assertEq(address(llamaERC20TokenActionCreator.token()), address(erc20VotesToken));
@@ -303,8 +300,7 @@ contract DeployTokenVotingModule is LlamaTokenVotingFactoryTest {
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC20_CREATION_THRESHOLD,
-      ERC20_VOTE_QUORUM_PCT,
-      ERC20_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
 
     ActionInfo memory actionInfo = _setPermissionCreateApproveAndQueueAction(data);
@@ -357,8 +353,7 @@ contract DeployTokenVotingModule is LlamaTokenVotingFactoryTest {
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC20_CREATION_THRESHOLD,
-      ERC20_VOTE_QUORUM_PCT,
-      ERC20_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
 
     actionInfo = _setPermissionCreateApproveAndQueueAction(data);

test/token-voting/LlamaTokenVotingTestSetup.sol

@@ -10,7 +10,7 @@ import {LlamaPeripheryTestSetup} from "test/LlamaPeripheryTestSetup.sol";
 
 import {DeployLlamaTokenVotingFactory} from "script/DeployLlamaTokenVotingFactory.s.sol";
 
-import {ActionInfo} from "src/lib/Structs.sol";
+import {ActionInfo, CasterConfig} from "src/lib/Structs.sol";
 import {ILlamaPolicy} from "src/interfaces/ILlamaPolicy.sol";
 import {ILlamaRelativeStrategyBase} from "src/interfaces/ILlamaRelativeStrategyBase.sol";
 import {ILlamaStrategy} from "src/interfaces/ILlamaStrategy.sol";
@@ -46,6 +46,8 @@ contract LlamaTokenVotingTestSetup is LlamaPeripheryTestSetup, DeployLlamaTokenV
   MockERC20Votes public erc20VotesToken;
   MockERC721Votes public erc721VotesToken;
 
+  CasterConfig public defaultCasterConfig;
+
   // Token Voting Roles
   uint8 tokenVotingActionCreatorRole;
   uint8 tokenVotingCasterRole;
@@ -73,6 +75,14 @@ contract LlamaTokenVotingTestSetup is LlamaPeripheryTestSetup, DeployLlamaTokenV
     erc20VotesToken = new MockERC20Votes();
     erc721VotesToken = new MockERC721Votes();
 
+    defaultCasterConfig = CasterConfig({
+      voteQuorumPct: ERC20_VOTE_QUORUM_PCT,
+      vetoQuorumPct: ERC20_VETO_QUORUM_PCT,
+      delayPeriodPct: uint16(ONE_QUARTER_IN_BPS),
+      castingPeriodPct: uint16(TWO_QUARTERS_IN_BPS),
+      submissionPeriodPct: uint16(ONE_QUARTER_IN_BPS)
+    });
+
     //Deploy
 
     // Setting up tokenholder addresses and private keys.
@@ -112,8 +122,7 @@ contract LlamaTokenVotingTestSetup is LlamaPeripheryTestSetup, DeployLlamaTokenV
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC20_CREATION_THRESHOLD,
-      ERC20_VOTE_QUORUM_PCT,
-      ERC20_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
     // Assign roles to Token Voting Modules
     POLICY.setRoleHolder(
@@ -140,8 +149,7 @@ contract LlamaTokenVotingTestSetup is LlamaPeripheryTestSetup, DeployLlamaTokenV
       tokenVotingActionCreatorRole,
       tokenVotingCasterRole,
       ERC721_CREATION_THRESHOLD,
-      ERC721_VOTE_QUORUM_PCT,
-      ERC721_VETO_QUORUM_PCT
+      defaultCasterConfig
     );
     // Assign roles to Token Voting Modules
     POLICY.setRoleHolder(