fix(deploy): upgrade ProtocolVersions proxy

Author: PelleKrab

scripts/deploy/SystemDeploy.s.sol

@@ -108,6 +108,7 @@ contract SystemDeploy is Script {
         ISuperchainConfig superchainConfigProxy;
         Types.Implementations implementations;
         ISystemConfig systemConfigProxy;
+        IProtocolVersions protocolVersionsProxy;
     }
 
     struct UpgradeOutput {
@@ -339,7 +340,12 @@ contract SystemDeploy is Script {
                 revert SuperchainConfigNeedsUpgrade();
             }
 
-            _upgradeOPChain(systemConfigProxy, _input.implementations);
+            IProtocolVersions protocolVersionsProxy = _input.protocolVersionsProxy;
+            if (address(protocolVersionsProxy) == address(0) && address(artifacts).code.length != 0) {
+                protocolVersionsProxy = IProtocolVersions(artifacts.getAddress("ProtocolVersionsProxy"));
+            }
+
+            _upgradeOPChain(systemConfigProxy, _input.implementations, protocolVersionsProxy);
             output_.chainUpgraded = true;
         }
 
@@ -650,7 +656,13 @@ contract SystemDeploy is Script {
         upgraded_ = true;
     }
 
-    function _upgradeOPChain(ISystemConfig _systemConfigProxy, Types.Implementations memory _impls) internal {
+    function _upgradeOPChain(
+        ISystemConfig _systemConfigProxy,
+        Types.Implementations memory _impls,
+        IProtocolVersions _protocolVersionsProxy
+    )
+        internal
+    {
         IProxyAdmin proxyAdmin = _systemConfigProxy.proxyAdmin();
         uint256 l2ChainId = _systemConfigProxy.l2ChainId();
 
@@ -675,6 +687,10 @@ contract SystemDeploy is Script {
             _upgradeTo(proxyAdmin, opChainAddrs.delayedWETH, _impls.delayedWETHImpl);
         }
 
+        if (address(_protocolVersionsProxy) != address(0)) {
+            _upgradeTo(proxyAdmin, address(_protocolVersionsProxy), _impls.protocolVersionsImpl);
+        }
+
         emit Upgraded(l2ChainId, _systemConfigProxy, msg.sender);
     }
 

test/deploy/SystemDeploy.t.sol

@@ -9,6 +9,8 @@ import { Types } from "scripts/libraries/Types.sol";
 import { SystemDeployAssertions } from "test/deploy/SystemDeployAssertions.sol";
 
 import { ISP1Verifier } from "interfaces/L1/proofs/zk/ISP1Verifier.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
+import { ProtocolVersions } from "src/L1/ProtocolVersions.sol";
 import { TEEProverRegistry } from "src/L1/proofs/tee/TEEProverRegistry.sol";
 import { TEEVerifier } from "src/L1/proofs/tee/TEEVerifier.sol";
 import { ZKVerifier } from "src/L1/proofs/zk/ZKVerifier.sol";
@@ -140,13 +142,17 @@ contract SystemDeploy_Test is Test, SystemDeployAssertions {
     function test_upgrade_withoutManagerDelegatecall_succeeds() public {
         SystemDeploy.DeployInput memory input = _defaultDeployInput();
         SystemDeploy.DeployOutput memory output = systemDeploy.deploy(input);
+        Types.Implementations memory implementations = output.impls;
+        ProtocolVersions protocolVersionsImpl = new ProtocolVersions();
+        implementations.protocolVersionsImpl = address(protocolVersionsImpl);
 
         SystemDeploy.UpgradeOutput memory upgradeOutput = systemDeploy.upgrade(
             SystemDeploy.UpgradeInput({
                 saveArtifacts: false,
                 superchainConfigProxy: output.superchain.superchainConfigProxy,
-                implementations: output.impls,
-                systemConfigProxy: output.opChain.systemConfigProxy
+                implementations: implementations,
+                systemConfigProxy: output.opChain.systemConfigProxy,
+                protocolVersionsProxy: output.opChain.protocolVersionsProxy
             })
         );
 
@@ -158,9 +164,42 @@ contract SystemDeploy_Test is Test, SystemDeployAssertions {
             output.impls.superchainConfigImpl,
             "superchain config impl"
         );
+        assertEq(
+            output.opChain.opChainProxyAdmin.getProxyImplementation(address(output.opChain.protocolVersionsProxy)),
+            address(protocolVersionsImpl),
+            "protocol versions impl"
+        );
         assertValidStandardSystem(_expected(output, input));
     }
 
+    function test_upgrade_discoversProtocolVersionsProxyFromArtifacts_succeeds() public {
+        SystemDeploy.DeployInput memory input = _defaultDeployInput();
+        SystemDeploy.DeployOutput memory output = systemDeploy.deploy(input);
+        Types.Implementations memory implementations = output.impls;
+        ProtocolVersions protocolVersionsImpl = new ProtocolVersions();
+        implementations.protocolVersionsImpl = address(protocolVersionsImpl);
+
+        _saveArtifact("ProtocolVersionsProxy", address(output.opChain.protocolVersionsProxy));
+
+        SystemDeploy.UpgradeOutput memory upgradeOutput = systemDeploy.upgrade(
+            SystemDeploy.UpgradeInput({
+                saveArtifacts: false,
+                superchainConfigProxy: output.superchain.superchainConfigProxy,
+                implementations: implementations,
+                systemConfigProxy: output.opChain.systemConfigProxy,
+                protocolVersionsProxy: IProtocolVersions(address(0))
+            })
+        );
+
+        assertFalse(upgradeOutput.superchainConfigUpgraded, "superchain already current");
+        assertTrue(upgradeOutput.chainUpgraded, "chain upgraded");
+        assertEq(
+            output.opChain.opChainProxyAdmin.getProxyImplementation(address(output.opChain.protocolVersionsProxy)),
+            address(protocolVersionsImpl),
+            "protocol versions impl"
+        );
+    }
+
     function test_deploy_reusingImplementations_doesNotSaveZeroImplementationOnlyArtifacts() public {
         SystemDeploy.DeployInput memory input = _defaultDeployInput();
         SystemDeploy.DeployOutput memory output = systemDeploy.deploy(input);
@@ -278,6 +317,13 @@ contract SystemDeploy_Test is Test, SystemDeployAssertions {
         );
     }
 
+    function _saveArtifact(string memory _name, address _addr) internal {
+        vm.etch(address(artifacts), vm.getDeployedCode("Artifacts.s.sol:Artifacts"));
+        bytes32 slot = keccak256(abi.encodePacked(_name, uint256(0)));
+        vm.store(address(artifacts), slot, bytes32(uint256(uint160(_addr))));
+        assertEq(artifacts.getAddress(_name), _addr, "artifact saved");
+    }
+
     function _expected(
         SystemDeploy.DeployOutput memory _output,
         SystemDeploy.DeployInput memory _input

test/setup/ForkLive.s.sol

@@ -21,6 +21,7 @@ import { IDisputeGameFactory } from "interfaces/L1/proofs/IDisputeGameFactory.so
 import { IAggregateVerifier } from "interfaces/L1/proofs/IAggregateVerifier.sol";
 import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
 import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
 import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
 import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
@@ -190,6 +191,7 @@ contract ForkLive is Script {
         ISuperchainConfig superchainConfig = ISuperchainConfig(artifacts.mustGetAddress("SuperchainConfigProxy"));
         IProxyAdmin superchainProxyAdmin = IProxyAdmin(EIP1967Helper.getAdmin(address(superchainConfig)));
         address superchainPAO = superchainProxyAdmin.owner();
+        IProtocolVersions protocolVersionsProxy = IProtocolVersions(artifacts.getAddress("ProtocolVersionsProxy"));
 
         // Run the shared SuperchainConfig upgrade as the Superchain ProxyAdmin owner. The script
         // skips this step when the proxy is already at or above the target implementation version.
@@ -199,7 +201,8 @@ contract ForkLive is Script {
                 saveArtifacts: false,
                 superchainConfigProxy: superchainConfig,
                 implementations: implementations,
-                systemConfigProxy: ISystemConfig(address(0))
+                systemConfigProxy: ISystemConfig(address(0)),
+                protocolVersionsProxy: IProtocolVersions(address(0))
             })
         );
 
@@ -210,7 +213,8 @@ contract ForkLive is Script {
                 saveArtifacts: false,
                 superchainConfigProxy: ISuperchainConfig(address(0)),
                 implementations: implementations,
-                systemConfigProxy: _systemConfigProxy
+                systemConfigProxy: _systemConfigProxy,
+                protocolVersionsProxy: protocolVersionsProxy
             })
         );
     }