Revert with supplied proposalId for unknown proposals in GovernorStorage (#6160)

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>

Author: sashass1315

contracts/governance/extensions/GovernorStorage.sol

@@ -55,6 +55,9 @@ abstract contract GovernorStorage is Governor {
     function queue(uint256 proposalId) public virtual {
         // here, using storage is more efficient than memory
         ProposalDetails storage details = _proposalDetails[proposalId];
+        if (details.descriptionHash == 0) {
+            revert GovernorNonexistentProposal(proposalId);
+        }
         queue(details.targets, details.values, details.calldatas, details.descriptionHash);
     }
 
@@ -64,6 +67,9 @@ abstract contract GovernorStorage is Governor {
     function execute(uint256 proposalId) public payable virtual {
         // here, using storage is more efficient than memory
         ProposalDetails storage details = _proposalDetails[proposalId];
+        if (details.descriptionHash == 0) {
+            revert GovernorNonexistentProposal(proposalId);
+        }
         execute(details.targets, details.values, details.calldatas, details.descriptionHash);
     }
 
@@ -73,6 +79,9 @@ abstract contract GovernorStorage is Governor {
     function cancel(uint256 proposalId) public virtual {
         // here, using storage is more efficient than memory
         ProposalDetails storage details = _proposalDetails[proposalId];
+        if (details.descriptionHash == 0) {
+            revert GovernorNonexistentProposal(proposalId);
+        }
         cancel(details.targets, details.values, details.calldatas, details.descriptionHash);
     }
 

test/governance/extensions/GovernorStorage.test.js

@@ -150,6 +150,26 @@ describe('GovernorStorage', function () {
           .to.emit(this.mock, 'ProposalCanceled')
           .withArgs(this.proposal.id);
       });
+
+      describe('with non-existing proposalId', function () {
+        it('queue', async function () {
+          await expect(this.mock.queue(this.proposal.id))
+            .to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
+            .withArgs(this.proposal.id);
+        });
+
+        it('execute', async function () {
+          await expect(this.mock.execute(this.proposal.id))
+            .to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
+            .withArgs(this.proposal.id);
+        });
+
+        it('cancel', async function () {
+          await expect(this.mock.cancel(this.proposal.id))
+            .to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
+            .withArgs(this.proposal.id);
+        });
+      });
     });
   }
 });