proposalCount fix (#91)

ScopeLift · Dec 23, 2024 · 6036b80 · 6036b80
1 parent 45fac85
commit 6036b80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/contracts/CompoundGovernor.sol b/contracts/CompoundGovernor.sol
@@ -131,6 +131,12 @@ contract CompoundGovernor is
         _setNextProposalId(compoundGovernorBravo.proposalCount() + 1);
     }
 
+    /// @inheritdoc GovernorSequentialProposalIdUpgradeable
+    /// @dev Since GovernorBravo indexed from 1, we decrement the proposal count by 1.
+    function proposalCount() public view override returns (uint256) {
+        return super.proposalCount() - 1;
+    }
+
     /// @notice A modified `hashProposal` that supports sequential proposal IDs.
     function hashProposal(
         address[] memory _targets,

diff --git a/contracts/test/GovernorSequentialProposalIdUpgradeable.t.sol b/contracts/test/GovernorSequentialProposalIdUpgradeable.t.sol
@@ -30,7 +30,7 @@ contract GovernorSequentialProposalIdUpgradeableTest is CompoundGovernorTest {
 
 contract ProposalCount is GovernorSequentialProposalIdUpgradeableTest {
     function test_ReturnsCorrectProposalCount() public {
-        assertEq(governor.proposalCount(), compoundGovernorBravo.proposalCount() + 1);
+        assertEq(governor.proposalCount(), compoundGovernorBravo.proposalCount());
     }
 
     function testFuzz_ProposalCreatedEventEmittedWithEnumeratedProposalId(uint256 _newValue) public {