Reducing the uint size needed for periods and durations

aragon · Nov 28, 2024 · 2065c03 · 2065c03
1 parent 6b0cdaf
commit 2065c03
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/EmergencyMultisig.sol b/src/EmergencyMultisig.sol
@@ -58,7 +58,7 @@ contract EmergencyMultisig is IEmergencyMultisig, PluginUUPSUpgradeable, Proposa
         bool onlyListed;
         uint16 minApprovals;
         SignerList signerList;
-        uint64 proposalExpirationPeriod;
+        uint32 proposalExpirationPeriod; // uint32 is enough, not a timestamp
     }
 
     /// @notice The ID of the permission required to call the `addAddresses` and `removeAddresses` functions.
@@ -128,7 +128,7 @@ contract EmergencyMultisig is IEmergencyMultisig, PluginUUPSUpgradeable, Proposa
     /// @param signerList The contract defining who is a member and/or who is appointed as a decryption wallet
     /// @param proposalExpirationPeriod The amount of seconds after which a non executed proposal expires.
     event MultisigSettingsUpdated(
-        bool onlyListed, uint16 indexed minApprovals, SignerList signerList, uint64 proposalExpirationPeriod
+        bool onlyListed, uint16 indexed minApprovals, SignerList signerList, uint32 proposalExpirationPeriod
     );
 
     /// @notice Initializes Release 1, Build 1.

diff --git a/src/Multisig.sol b/src/Multisig.sol
@@ -59,9 +59,9 @@ contract Multisig is IMultisig, PluginUUPSUpgradeable, ProposalUpgradeable {
     struct MultisigSettings {
         bool onlyListed;
         uint16 minApprovals;
-        uint64 destinationProposalDuration;
+        uint32 destinationProposalDuration; // uint32 is enough, not a timestamp
         SignerList signerList;
-        uint64 proposalExpirationPeriod;
+        uint32 proposalExpirationPeriod; // uint32 is enough, not a timestamp
     }
 
     /// @notice The ID of the permission required to call the `addAddresses` and `removeAddresses` functions.
@@ -124,9 +124,9 @@ contract Multisig is IMultisig, PluginUUPSUpgradeable, ProposalUpgradeable {
     event MultisigSettingsUpdated(
         bool onlyListed,
         uint16 indexed minApprovals,
-        uint64 destinationProposalDuration,
+        uint32 destinationProposalDuration,
         SignerList signerList,
-        uint64 proposalExpirationPeriod
+        uint32 proposalExpirationPeriod
     );
 
     /// @notice Initializes Release 1, Build 1.

diff --git a/test/EmergencyMultisig.t.sol b/test/EmergencyMultisig.t.sol
@@ -20,7 +20,7 @@ import {IProposal} from "@aragon/osx/core/plugin/proposal/IProposal.sol";
 import {IPlugin} from "@aragon/osx/core/plugin/IPlugin.sol";
 import {IEmergencyMultisig} from "../src/interfaces/IEmergencyMultisig.sol";
 
-uint64 constant EMERGENCY_MULTISIG_PROPOSAL_EXPIRATION_PERIOD = 10 days;
+uint32 constant EMERGENCY_MULTISIG_PROPOSAL_EXPIRATION_PERIOD = 10 days;
 
 contract EmergencyMultisigTest is AragonTest {
     DaoBuilder builder;
@@ -38,7 +38,7 @@ contract EmergencyMultisigTest is AragonTest {
     error InvalidActions(uint256 proposalId);
 
     event MultisigSettingsUpdated(
-        bool onlyListed, uint16 indexed minApprovals, SignerList signerList, uint64 proposalExpirationPeriod
+        bool onlyListed, uint16 indexed minApprovals, SignerList signerList, uint32 proposalExpirationPeriod
     );
 
     event EmergencyProposalCreated(uint256 indexed proposalId, address indexed creator, bytes encryptedPayloadURI);

diff --git a/test/Multisig.t.sol b/test/Multisig.t.sol
@@ -20,7 +20,7 @@ import {IProposal} from "@aragon/osx/core/plugin/proposal/IProposal.sol";
 import {IPlugin} from "@aragon/osx/core/plugin/IPlugin.sol";
 import {IMultisig} from "../src/interfaces/IMultisig.sol";
 
-uint64 constant MULTISIG_PROPOSAL_EXPIRATION_PERIOD = 10 days;
+uint32 constant MULTISIG_PROPOSAL_EXPIRATION_PERIOD = 10 days;
 uint32 constant DESTINATION_PROPOSAL_DURATION = 9 days;
 
 contract MultisigTest is AragonTest {
@@ -41,9 +41,9 @@ contract MultisigTest is AragonTest {
     event MultisigSettingsUpdated(
         bool onlyListed,
         uint16 indexed minApprovals,
-        uint64 destinationProposalDuration,
+        uint32 destinationProposalDuration,
         SignerList signerList,
-        uint64 proposalExpirationPeriod
+        uint32 proposalExpirationPeriod
     );
     // Multisig and OptimisticTokenVotingPlugin's event
     event ProposalCreated(

diff --git a/test/helpers/DaoBuilder.sol b/test/helpers/DaoBuilder.sol
@@ -51,8 +51,8 @@ contract DaoBuilder is Test {
 
     bool public onlyListed = true;
     uint16 public minApprovals = 1;
-    uint64 public stdProposalDuration = 10 days;
-    uint64 multisigProposalExpirationPeriod = 10 days;
+    uint32 public stdProposalDuration = 10 days;
+    uint32 public multisigProposalExpirationPeriod = 10 days;
 
     function withDaoOwner(address newOwner) public returns (DaoBuilder) {
         owner = newOwner;
@@ -105,7 +105,7 @@ contract DaoBuilder is Test {
         return this;
     }
 
-    function withExpiration(uint64 newExpirationPeriod) public returns (DaoBuilder) {
+    function withExpiration(uint32 newExpirationPeriod) public returns (DaoBuilder) {
         multisigProposalExpirationPeriod = newExpirationPeriod;
         return this;
     }