fix: address tmnt 155 (#16536)

Please read [contributing guidelines](CONTRIBUTING.md) and remove this
line.

For audit-related pull requests, please use the [audit PR
template](?expand=1&template=audit.md).

Author: LHerskind

l1-contracts/src/governance/Governance.sol

@@ -508,8 +508,17 @@ contract Governance is IGovernance {
 
   /**
    * @notice Get the power of an address at a given timestamp.
-   * @dev If the timestamp is the current block timestamp, we return the powerNow.
-   * Otherwise, we return the powerAt the timestamp.
+   *
+   * @param _owner The address to get the power of.
+   * @param _ts The timestamp to get the power at.
+   * @return The power of the address at the given timestamp.
+   */
+  function powerAt(address _owner, Timestamp _ts) external view override(IGovernance) returns (uint256) {
+    return users[_owner].valueAt(_ts);
+  }
+
+  /**
+   * @notice Get the power of an address at the current block timestamp.
    *
    * Note that `powerNow` with the current block timestamp is NOT STABLE.
    *
@@ -522,35 +531,32 @@ contract Governance is IGovernance {
    *  The powerNow at 4 will be different from the powerNow at 2.
    *
    * @param _owner The address to get the power of.
-   * @param _ts The timestamp to get the power at.
-   * @return The power of the address at the given timestamp.
+   * @return The power of the address at the current block timestamp.
    */
-  function powerAt(address _owner, Timestamp _ts) external view override(IGovernance) returns (uint256) {
-    if (_ts == Timestamp.wrap(block.timestamp)) {
-      return users[_owner].valueNow();
-    }
-    return users[_owner].valueAt(_ts);
+  function powerNow(address _owner) external view override(IGovernance) returns (uint256) {
+    return users[_owner].valueNow();
   }
 
   /**
    * @notice Get the total power in Governance at a given timestamp.
-   * @dev If the timestamp is the current block timestamp, we return the powerNow.
-   * Otherwise, we return the powerAt the timestamp.
-   *
-   * Note that `powerNow` with the current block timestamp is NOT STABLE.
-   *
-   * See `powerAt` for more details.
    *
    * @param _ts The timestamp to get the power at.
    * @return The total power at the given timestamp.
    */
   function totalPowerAt(Timestamp _ts) external view override(IGovernance) returns (uint256) {
-    if (_ts == Timestamp.wrap(block.timestamp)) {
-      return total.valueNow();
-    }
     return total.valueAt(_ts);
   }
 
+  /**
+   * @notice Get the total power in Governance at the current block timestamp.
+   * Note that `powerNow` with the current block timestamp is NOT STABLE.
+   *
+   * @return The total power at the current block timestamp.
+   */
+  function totalPowerNow() external view override(IGovernance) returns (uint256) {
+    return total.valueNow();
+  }
+
   /**
    * @notice Check if an address is permitted to hold power in Governance.
    *

l1-contracts/src/governance/interfaces/IGovernance.sol

@@ -88,7 +88,9 @@ interface IGovernance {
   function isAllBeneficiariesAllowed() external view returns (bool);
 
   function powerAt(address _owner, Timestamp _ts) external view returns (uint256);
+  function powerNow(address _owner) external view returns (uint256);
   function totalPowerAt(Timestamp _ts) external view returns (uint256);
+  function totalPowerNow() external view returns (uint256);
   function getProposalState(uint256 _proposalId) external view returns (ProposalState);
   function getConfiguration() external view returns (Configuration memory);
   function getProposal(uint256 _proposalId) external view returns (Proposal memory);

l1-contracts/test/delegation/minimal.t.sol

@@ -115,7 +115,7 @@ contract MinimalDelegationTest is GSEBase {
 
     vm.warp(ts.ts6);
 
-    assertEq(governance.totalPowerAt(Timestamp.wrap(ts.ts6)), activationThreshold * 3);
+    assertEq(governance.totalPowerNow(), activationThreshold * 3);
 
     if (_overwriteDelay) {
       stdstore.enable_packed_slots().target(address(ROLLUP)).sig("getExitDelay()").checked_write(5);
@@ -124,7 +124,7 @@ contract MinimalDelegationTest is GSEBase {
     vm.prank(WITHDRAWER);
     ROLLUP.initiateWithdraw(ATTESTER2, WITHDRAWER);
 
-    assertEq(governance.totalPowerAt(Timestamp.wrap(ts.ts6)), activationThreshold * 2);
+    assertEq(governance.totalPowerNow(), activationThreshold * 2);
 
     vm.warp(ts.ts7);
 
@@ -224,7 +224,7 @@ contract MinimalDelegationTest is GSEBase {
     }
     ROLLUP.finalizeWithdraw(ATTESTER2);
 
-    assertEq(governance.totalPowerAt(Timestamp.wrap(block.timestamp)), activationThreshold * 2);
+    assertEq(governance.totalPowerNow(), activationThreshold * 2);
     assertEq(stakingAsset.balanceOf(WITHDRAWER), activationThreshold);
 
     assertEq(governance.getProposal(proposalId).summedBallot.yea, activationThreshold * 3, "yeas");

l1-contracts/test/governance/governance/deposit.t.sol

@@ -65,9 +65,9 @@ contract DepositTest is GovernanceBase {
       governance.deposit(onBehalfOf, amount);
 
       assertEq(governance.powerAt(onBehalfOf, Timestamp.wrap(block.timestamp - 1)), sums[onBehalfOf] - amount);
-      assertEq(governance.powerAt(onBehalfOf, Timestamp.wrap(block.timestamp)), sums[onBehalfOf]);
+      assertEq(governance.powerNow(onBehalfOf), sums[onBehalfOf]);
       assertEq(governance.totalPowerAt(Timestamp.wrap(block.timestamp - 1)), sum - amount);
-      assertEq(governance.totalPowerAt(Timestamp.wrap(block.timestamp)), sum);
+      assertEq(governance.totalPowerNow(), sum);
 
       assertEq(token.balanceOf(address(this)), 0);
       assertEq(token.allowance(address(this), address(governance)), 0);

l1-contracts/test/governance/governance/getProposalState.t.sol

@@ -127,7 +127,7 @@ contract GetProposalStateTest is GovernanceBase {
     // it return Rejected
     _stateRejected("empty");
 
-    uint256 totalPower = governance.totalPowerAt(Timestamp.wrap(block.timestamp));
+    uint256 totalPower = governance.totalPowerNow();
     (VoteTabulationReturn vtr,) = proposal.voteTabulation(totalPower);
     assertEq(vtr, VoteTabulationReturn.Rejected, "invalid return value");
     assertEq(governance.getProposalState(proposalId), ProposalState.Rejected);
@@ -151,7 +151,7 @@ contract GetProposalStateTest is GovernanceBase {
     );
     assertEq(governance.getProposal(proposalId).config.quorum, 0);
 
-    uint256 totalPower = governance.totalPowerAt(Timestamp.wrap(block.timestamp));
+    uint256 totalPower = governance.totalPowerNow();
 
     proposal = governance.getProposal(proposalId);
     (VoteTabulationReturn vtr,) = proposal.voteTabulation(totalPower);

l1-contracts/test/governance/governance/initiateWithdraw.t.sol

@@ -103,7 +103,7 @@ contract InitiateWithdrawTest is GovernanceBase {
       assertEq(withdrawal.unlocksAt, Timestamp.wrap(block.timestamp) + config.withdrawalDelay(), "Invalid timestamp");
       assertEq(withdrawal.recipient, recipient, "invalid recipient");
       assertFalse(withdrawal.claimed, "already claimed");
-      assertEq(governance.totalPowerAt(Timestamp.wrap(block.timestamp)), sum);
+      assertEq(governance.totalPowerNow(), sum);
 
       withdrawalId++;
 

l1-contracts/test/governance/governance/limitedDeposit.t.sol

@@ -63,7 +63,7 @@ contract LimitedDepositTest is TestBase {
     vm.prank(_caller);
     governance.deposit(_depositor, 1000);
 
-    assertEq(governance.powerAt(_depositor, Timestamp.wrap(block.timestamp)), 1000);
+    assertEq(governance.powerNow(_depositor), 1000);
   }
 
   function test_WhenFloodgatesAreOpen(address _caller, address _depositor) external {
@@ -82,6 +82,6 @@ contract LimitedDepositTest is TestBase {
     vm.prank(_caller);
     governance.deposit(_depositor, 1000);
 
-    assertEq(governance.powerAt(_depositor, Timestamp.wrap(block.timestamp)), 1000);
+    assertEq(governance.powerNow(_depositor), 1000);
   }
 }

l1-contracts/test/governance/governance/vote.t.sol

@@ -106,7 +106,7 @@ contract VoteTest is GovernanceBase {
     vm.stopPrank();
 
     assertEq(token.balanceOf(address(governance)), depositPower);
-    assertEq(governance.powerAt(_voter, Timestamp.wrap(block.timestamp)), depositPower);
+    assertEq(governance.powerNow(_voter), depositPower);
 
     _stateActive("empty");