@@ -44,8 +44,8 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
4444 error ProtocolVersions_InvalidProtocolVersion ();
4545 /// @notice Thrown when modifying a timestamp whose activation has already passed.
4646 error ProtocolVersions_ActivationAlreadyPassed (uint256 id , uint64 activationTimestamp );
47- /// @notice Thrown when the caller is not the chainTeam .
48- error ProtocolVersions_NotChainTeam ();
47+ /// @notice Thrown when the caller is not the incidentResponder .
48+ error ProtocolVersions_NotIncidentResponder ();
4949 /// @notice Thrown when delaying an upgrade that has no scheduled activation.
5050 error ProtocolVersions_NotScheduled (uint256 id );
5151 /// @notice Thrown when a new timestamp is not sufficiently later than the current one.
@@ -63,8 +63,8 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
6363 event TimestampSet (uint256 indexed id , uint256 timestamp );
6464 /// @notice Emitted when the schedule commitment changes.
6565 event ScheduleIdUpdated (bytes32 indexed newScheduleId );
66- /// @notice Emitted when the chainTeam role changes.
67- event ChainTeamUpdated (address indexed previousChainTeam , address indexed newChainTeam );
66+ /// @notice Emitted when the incidentResponder role changes.
67+ event IncidentResponderUpdated (address indexed previousIncidentResponder , address indexed newIncidentResponder );
6868
6969 /// @notice Minimum notice period required when scheduling or modifying an activation timestamp.
7070 uint64 public constant MIN_NOTICE = 1 hours ;
@@ -90,7 +90,7 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
9090 /// only move an already-scheduled, not-yet-activated upgrade further into the future via
9191 /// `delayTimestamp`. It cannot register upgrades, clear timestamps, pull an activation
9292 /// earlier, or schedule a brand-new activation. Unset (zero) by default.
93- address public chainTeam ;
93+ address public incidentResponder ;
9494
9595 /// @notice Semantic version.
9696 /// @custom:semver 1.0.0
@@ -104,9 +104,9 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
104104 }
105105
106106 /// @notice Initializes the registry by seeding the hash chain and appointing the initial
107- /// chainTeam . Callable only by the ProxyAdmin or its owner.
108- /// @param _chainTeam Initial chainTeam allowed to delay activations, or address(0) to leave unset.
109- function initialize (address _chainTeam ) external reinitializer (initVersion ()) {
107+ /// incidentResponder . Callable only by the ProxyAdmin or its owner.
108+ /// @param _incidentResponder Initial incidentResponder allowed to delay activations, or address(0) to leave unset.
109+ function initialize (address _incidentResponder ) external reinitializer (initVersion ()) {
110110 // Initialization transactions must come from the ProxyAdmin or its owner.
111111 _assertOnlyProxyAdminOrProxyAdminOwner ();
112112
@@ -116,8 +116,8 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
116116 _upgradeScheduleId.push (bytes32 (0 ));
117117 emit ScheduleIdUpdated (bytes32 (0 ));
118118
119- chainTeam = _chainTeam ;
120- emit ChainTeamUpdated (address (0 ), _chainTeam );
119+ incidentResponder = _incidentResponder ;
120+ emit IncidentResponderUpdated (address (0 ), _incidentResponder );
121121 }
122122
123123 /// @notice Returns the canonical schedule commitment.
@@ -202,26 +202,26 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
202202 _assertOnlyProxyAdminOwner ();
203203 _assertRegistered (id);
204204 uint64 current = _timestamps[id];
205+ if (current == timestamp) return ;
205206 if (current != 0 && uint64 (block .timestamp ) >= current) {
206207 revert ProtocolVersions_ActivationAlreadyPassed (id, current);
207208 }
208209 if (timestamp != 0 && timestamp < uint64 (block .timestamp ) + MIN_NOTICE) {
209210 revert ProtocolVersions_InsufficientNotice (timestamp);
210211 }
211- if (current == timestamp) return ;
212212 _writeTimestamp (id, timestamp);
213213 }
214214
215- /// @notice Appoints, replaces, or clears (set to zero) the chainTeam role. Owner only.
216- /// @param newChainTeam New chainTeam address, or address(0) to revoke the role.
217- function setChainTeam (address newChainTeam ) external {
215+ /// @notice Appoints, replaces, or clears (set to zero) the incidentResponder role. Owner only.
216+ /// @param newIncidentResponder New incidentResponder address, or address(0) to revoke the role.
217+ function setIncidentResponder (address newIncidentResponder ) external {
218218 _assertOnlyProxyAdminOwner ();
219- emit ChainTeamUpdated (chainTeam, newChainTeam );
220- chainTeam = newChainTeam ;
219+ emit IncidentResponderUpdated (incidentResponder, newIncidentResponder );
220+ incidentResponder = newIncidentResponder ;
221221 }
222222
223223 /// @notice Pushes an already-scheduled upgrade's activation timestamp further into the future.
224- /// Can only be called by the chainTeam .
224+ /// Can only be called by the incidentResponder .
225225 /// @dev The upgrade must already have a non-zero activation timestamp that has not yet passed,
226226 /// and `newTimestamp` must be strictly later than the current value. This role can only
227227 /// delay an activation; it cannot pull one earlier, clear it, or schedule a new one — use
@@ -230,7 +230,7 @@ contract ProtocolVersions is ProxyAdminOwnedBase, Initializable, Reinitializable
230230 /// @param id The upgrade whose activation to delay.
231231 /// @param newTimestamp New activation timestamp, must be strictly later than the current one.
232232 function delayTimestamp (uint256 id , uint64 newTimestamp ) external {
233- if (msg .sender != chainTeam ) revert ProtocolVersions_NotChainTeam ();
233+ if (msg .sender != incidentResponder ) revert ProtocolVersions_NotIncidentResponder ();
234234 _assertRegistered (id);
235235 uint64 current = _timestamps[id];
236236
0 commit comments