feat: reset scheduled implementations on upgrade execution

Author: heueristik

src/XanV1.sol

@@ -384,7 +384,7 @@ contract XanV1 is
 
     /// @notice Authorizes an upgrade.
     /// @param newImpl The new implementation to authorize the upgrade to.
-    function _authorizeUpgrade(address newImpl) internal view override {
+    function _authorizeUpgrade(address newImpl) internal override {
         if (newImpl == address(0)) {
             revert ImplementationZero();
         }
@@ -410,6 +410,10 @@ contract XanV1 is
                 revert QuorumOrMinLockedSupplyNotReached(mostVotedImpl);
             }
             _checkDelayCriterion({endTime: votingData.scheduledEndTime});
+
+            // Reset the scheduled upgrade
+            votingData.scheduledImpl = address(0);
+            votingData.scheduledEndTime = 0;
         } else if (isScheduledByCouncil) {
             // Check if the best ranked implementation exists.
             if (mostVotedImpl != address(0)) {
@@ -420,6 +424,10 @@ contract XanV1 is
                 }
             }
             _checkDelayCriterion({endTime: councilData.scheduledEndTime});
+
+            // Reset the scheduled upgrade
+            councilData.scheduledImpl = address(0);
+            councilData.scheduledEndTime = 0;
         } else {
             revert UpgradeNotScheduled(newImpl);
         }

test/XanV1.upgrade.t.sol

@@ -219,6 +219,45 @@ contract XanV1UpgradeTest is Test {
         _xanProxy.upgradeToAndCall({newImplementation: _councilProposedImpl, data: ""});
     }
 
+    function test_authorizeUpgrade_resets_the_scheduled_council_upgrade_data_on_upgrade_execution() public {
+        // Cache the current implementation
+        address currentImpl = _xanProxy.implementation();
+
+        // Schedule and upgrade to the current implementation as the council
+        vm.prank(_COUNCIL);
+        _xanProxy.scheduleCouncilUpgrade(currentImpl);
+        (, uint48 endTime) = _xanProxy.scheduledCouncilUpgrade();
+        skip(endTime);
+        _xanProxy.upgradeToAndCall({newImplementation: currentImpl, data: ""});
+        assertEq(_xanProxy.implementation(), currentImpl);
+
+        // Check that the scheduled upgrade has been reset to 0
+        (address scheduledImplPostUpgrade, uint48 scheduledEndTimePostUpgrade) = _xanProxy.scheduledCouncilUpgrade();
+        assertEq(scheduledImplPostUpgrade, address(0));
+        assertEq(scheduledEndTimePostUpgrade, 0);
+    }
+
+    function test_authorizeUpgrade_resets_the_scheduled_voter_body_upgrade_data_on_upgrade_execution() public {
+        // Cache the current implementation
+        address currentImpl = _xanProxy.implementation();
+
+        // Schedule and upgrade to the current implementation as the voter body
+        vm.startPrank(_defaultSender);
+        _xanProxy.lock(Parameters.MIN_LOCKED_SUPPLY);
+        _xanProxy.castVote(currentImpl);
+        vm.stopPrank();
+        _xanProxy.scheduleVoterBodyUpgrade();
+        (, uint48 endTime) = _xanProxy.scheduledVoterBodyUpgrade();
+        skip(endTime);
+        _xanProxy.upgradeToAndCall({newImplementation: currentImpl, data: ""});
+        assertEq(_xanProxy.implementation(), currentImpl);
+
+        // Check that the scheduled upgrade has been reset to 0
+        (address scheduledImplPostUpgrade, uint48 scheduledEndTimePostUpgrade) = _xanProxy.scheduledVoterBodyUpgrade();
+        assertEq(scheduledImplPostUpgrade, address(0));
+        assertEq(scheduledEndTimePostUpgrade, 0);
+    }
+
     function test_upgradeToAndCall_emits_the_Upgraded_event() public {
         vm.prank(_COUNCIL);
         _xanProxy.scheduleCouncilUpgrade(_councilProposedImpl);