chore: reject gov deposit into gov

Author: LHerskind

l1-contracts/src/governance/Governance.sol

@@ -233,6 +233,7 @@ contract Governance is IGovernance {
    * @dev Modifier to ensure that the beneficiary is allowed to hold power in Governance.
    */
   modifier isDepositAllowed(address _beneficiary) {
+    require(msg.sender != address(this), Errors.Governance__CallerCannotBeSelf());
     require(
       depositControl.allBeneficiariesAllowed || depositControl.isAllowed[_beneficiary],
       Errors.Governance__DepositNotAllowed()

l1-contracts/src/governance/libraries/Errors.sol

@@ -16,6 +16,7 @@ library Errors {
   error Governance__CallerNotGovernanceProposer(address caller, address governanceProposer);
   error Governance__GovernanceProposerCannotBeSelf();
   error Governance__CallerNotSelf(address caller, address self);
+  error Governance__CallerCannotBeSelf();
   error Governance__NoCheckpointsFound();
   error Governance__InsufficientPower(address voter, uint256 have, uint256 required);
   error Governance__InvalidConfiguration();

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

@@ -121,7 +121,7 @@ contract GovernanceBase is TestBase {
   function _stateQueued(bytes32 _proposalName, address _voter, uint256 _totalPower, uint256 _votesCast, uint256 _yeas)
     internal
   {
-    vm.assume(_voter != address(0));
+    vm.assume(_voter != address(0) && _voter != address(governance));
     proposal = proposals[_proposalName];
     proposalId = proposalIds[_proposalName];
 

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

@@ -40,17 +40,28 @@ contract LimitedDepositTest is TestBase {
   function test_WhenNotAllowedToDeposit(address _caller, address _depositor) external {
     // it reverts
 
-    vm.assume(_caller != address(0) && _depositor != address(0));
+    vm.assume(_caller != address(0) && _depositor != address(0) && _caller != address(governance));
     vm.assume(!governance.isPermittedInGovernance(_depositor));
 
     vm.prank(_caller);
     vm.expectRevert(abi.encodeWithSelector(Errors.Governance__DepositNotAllowed.selector));
     governance.deposit(_depositor, 1000);
   }
 
+  function test_WhenNotAllowedToDepositSelf(address _depositor, bool _floodgatesOpen) external {
+    if (_floodgatesOpen) {
+      vm.prank(address(governance));
+      governance.openFloodgates();
+    }
+
+    vm.prank(address(governance));
+    vm.expectRevert(abi.encodeWithSelector(Errors.Governance__CallerCannotBeSelf.selector));
+    governance.deposit(_depositor, 1000);
+  }
+
   function test_WhenIsAllowedToDeposit(address _caller, address _depositor) external {
     // it deposits
-    vm.assume(_caller != address(0) && _depositor != address(0));
+    vm.assume(_caller != address(0) && _depositor != address(0) && _caller != address(governance));
 
     vm.prank(address(governance));
     governance.addBeneficiary(_depositor);
@@ -69,7 +80,7 @@ contract LimitedDepositTest is TestBase {
   function test_WhenFloodgatesAreOpen(address _caller, address _depositor) external {
     // it deposits
 
-    vm.assume(_caller != address(0) && _depositor != address(0));
+    vm.assume(_caller != address(0) && _depositor != address(0) && _caller != address(governance));
 
     vm.prank(address(governance));
     governance.openFloodgates();

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

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.27;
+
+import {TestBase} from "@test/base/Base.sol";
+import {TestERC20} from "@aztec/mock/TestERC20.sol";
+import {Governance} from "@aztec/governance/Governance.sol";
+import {GovernanceProposer} from "@aztec/governance/proposer/GovernanceProposer.sol";
+import {Registry} from "@aztec/governance/Registry.sol";
+import {IMintableERC20} from "@aztec/shared/interfaces/IMintableERC20.sol";
+import {TestGov} from "@test/governance/helpers/TestGov.sol";
+import {TestConstants} from "@test/harnesses/TestConstants.sol";
+import {IGSE} from "@aztec/governance/GSE.sol";
+import {Errors} from "@aztec/governance/libraries/Errors.sol";
+
+contract OddERC20 is TestERC20 {
+  constructor(string memory _name, string memory _symbol, address _owner) TestERC20(_name, _symbol, _owner) {}
+
+  function _spendAllowance(address owner, address spender, uint256 value) internal virtual override {
+    if (owner == msg.sender) {
+      return;
+    }
+    super._spendAllowance(owner, spender, value);
+  }
+}
+
+contract DepositTest is TestBase {
+  IMintableERC20 internal token;
+  Registry internal registry;
+  Governance internal governance;
+  GovernanceProposer internal governanceProposer;
+
+  function setUp() public {
+    token = IMintableERC20(address(new OddERC20("test", "TEST", address(this))));
+
+    registry = new Registry(address(this), token);
+    governanceProposer = new GovernanceProposer(registry, IGSE(address(0x03)), 677, 1000);
+
+    governance =
+      new TestGov(token, address(governanceProposer), address(this), TestConstants.getGovernanceConfiguration());
+  }
+
+  function test_when_calling_self() public {
+    vm.prank(address(governance));
+    governance.openFloodgates();
+
+    uint256 amount = 1000e18;
+    token.mint(address(this), amount);
+    token.approve(address(governance), amount);
+
+    governance.deposit(address(this), amount);
+    assertEq(token.balanceOf(address(governance)), amount);
+
+    vm.prank(address(governance));
+    vm.expectRevert(abi.encodeWithSelector(Errors.Governance__CallerCannotBeSelf.selector, address(governance)));
+    governance.deposit(address(governance), amount);
+
+    assertEq(governance.powerNow(address(governance)), 0);
+  }
+}