Merge branch 'master' into optimize/governor/timelock-control-execute

contracts/governance/extensions/GovernorTimelockControl.sol

@@ -59,7 +59,9 @@ abstract contract GovernorTimelockControl is IGovernorTimelock, Governor {
         // core tracks execution, so we just have to check if successful proposal have been queued.
         bytes32 queueid = _timelockIds[proposalId];
         if (queueid == bytes32(0)) {
-            return status;
+            return currentState;
+        } else if (_timelock.isOperationDone(queueid)) {
+            return ProposalState.Executed;
         } else if (_timelock.isOperationPending(queueid)) {
             return ProposalState.Queued;
         } else if (_timelock.isOperationDone(queueid)) {
@@ -145,12 +147,13 @@ abstract contract GovernorTimelockControl is IGovernorTimelock, Governor {
         bytes32 descriptionHash
     ) internal virtual override returns (uint256) {
         uint256 proposalId = super._cancel(targets, values, calldatas, descriptionHash);
+        bytes32 timelockId = _timelockIds[proposalId];
 
-        if (_timelockIds[proposalId] != 0) {
-            // cancel
-            _timelock.cancel(_timelockIds[proposalId]);
+        if (timelockId != 0) {
             // cleanup
             delete _timelockIds[proposalId];
+            // cancel
+            _timelock.cancel(timelockId);
         }
 
         return proposalId;