wip

Author: smartcontracts

.circleci/config.yml

@@ -2441,6 +2441,7 @@ workflows:
                 - main
                 - OPTIMISM_PORTAL_INTEROP
                 - CANNON_KONA,DEPLOY_V2_DISPUTE_GAMES
+                - OPCM_V2
           context:
             - circleci-repo-readonly-authenticated-github-token
           requires:

.semgrep/rules/sol-rules.yaml

@@ -383,3 +383,14 @@ rules:
         # LegacyMintableERC20 and the corresponding interface use legacy naming conventions.
         - packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
         - packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol
+
+  - id: sol-safety-loadorbuildproxy-false-requires-todo
+    languages: [generic]
+    severity: ERROR
+    message: _loadOrBuildProxy calls with false as _mustLoad parameter must include inline TODO on the same line
+    patterns:
+      - pattern: _loadOrBuildProxy(..., false)
+      - pattern-not: _loadOrBuildProxy(..., false // TODO(...))
+    paths:
+      include:
+        - packages/contracts-bedrock/src

op-chain-ops/addresses/contracts.go

@@ -49,6 +49,7 @@ type ImplementationsContracts struct {
 	AnchorStateRegistryImpl          common.Address
 	FaultDisputeGameV2Impl           common.Address
 	PermissionedDisputeGameV2Impl    common.Address
+	StorageSetterImpl                common.Address
 }
 
 // OpChainContracts struct contains all the contracts for a specific L2 OpChain

op-chain-ops/interopgen/deployments.go

@@ -17,6 +17,7 @@ type Implementations struct {
 	OpcmUpgrader                     common.Address `json:"OPCMUpgrader"`
 	OpcmInteropMigrator              common.Address `json:"OPCMInteropMigrator"`
 	OpcmStandardValidator            common.Address `json:"OPCMStandardValidator"`
+	OpcmV2                           common.Address `json:"OPCMV2"`
 	DelayedWETHImpl                  common.Address `json:"DelayedWETHImpl"`
 	OptimismPortalImpl               common.Address `json:"OptimismPortalImpl"`
 	OptimismPortalInteropImpl        common.Address `json:"OptimismPortalInteropImpl"`
@@ -36,6 +37,7 @@ type Implementations struct {
 	PermissionedDisputeGameV2Impl    common.Address `json:"PermissionedDisputeGameV2Impl"`
 	SuperFaultDisputeGameImpl        common.Address `json:"SuperFaultDisputeGameImpl"`
 	SuperPermissionedDisputeGameImpl common.Address `json:"SuperPermissionedDisputeGameImpl"`
+	StorageSetterImpl                common.Address `json:"StorageSetterImpl"`
 }
 
 type SuperchainDeployment struct {

op-deployer/pkg/deployer/opcm/implementations.go

@@ -35,6 +35,7 @@ type DeployImplementationsOutput struct {
 	OpcmUpgrader                     common.Address `json:"opcmUpgraderAddress"`
 	OpcmInteropMigrator              common.Address `json:"opcmInteropMigratorAddress"`
 	OpcmStandardValidator            common.Address `json:"opcmStandardValidatorAddress"`
+	OpcmV2                           common.Address `json:"opcmV2Address" abi:"opcmV2"`
 	DelayedWETHImpl                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImpl               common.Address `json:"optimismPortalImplAddress"`
 	OptimismPortalInteropImpl        common.Address `json:"optimismPortalInteropImplAddress"`
@@ -54,6 +55,7 @@ type DeployImplementationsOutput struct {
 	PermissionedDisputeGameV2Impl    common.Address `json:"permissionedDisputeGameV2ImplAddress"`
 	SuperFaultDisputeGameImpl        common.Address `json:"superFaultDisputeGameImplAddress"`
 	SuperPermissionedDisputeGameImpl common.Address `json:"superPermissionedDisputeGameImplAddress"`
+	StorageSetterImpl                common.Address `json:"storageSetterImplAddress"`
 }
 
 type DeployImplementationsScript script.DeployScriptWithOutput[DeployImplementationsInput, DeployImplementationsOutput]

op-deployer/pkg/deployer/pipeline/implementations.go

@@ -89,6 +89,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 		AnchorStateRegistryImpl:          dio.AnchorStateRegistryImpl,
 		FaultDisputeGameV2Impl:           dio.FaultDisputeGameV2Impl,
 		PermissionedDisputeGameV2Impl:    dio.PermissionedDisputeGameV2Impl,
+		StorageSetterImpl:                dio.StorageSetterImpl,
 	}
 
 	return nil

packages/contracts-bedrock/foundry.toml

@@ -29,7 +29,8 @@ compilation_restrictions = [
   { paths = "src/L1/OPContractsManager.sol", optimizer_runs = 5000 },
   { paths = "src/L1/OPContractsManagerStandardValidator.sol", optimizer_runs = 5000 },
   { paths = "src/L1/OptimismPortal2.sol", optimizer_runs = 5000 },
-  { paths = "src/L1/ProtocolVersions.sol", optimizer_runs = 5000 }
+  { paths = "src/L1/ProtocolVersions.sol", optimizer_runs = 5000 },
+  { paths = "src/universal/StorageSetter.sol", optimizer_runs = 5000 }
 ]
 
 extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']

packages/contracts-bedrock/interfaces/L1/IOPContractsManager.sol

@@ -23,6 +23,7 @@ import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
 import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { IOPContractsManagerStandardValidator } from "interfaces/L1/IOPContractsManagerStandardValidator.sol";
 
 interface IOPContractsManagerContractsContainer {
@@ -126,6 +127,117 @@ interface IOPContractsManagerInteropMigrator {
     function migrate(MigrateInput calldata _input) external;
 }
 
+interface IOPContractsManagerV2 {
+    /// @notice Dispute game configuration for a specific game type.
+    struct DisputeGameConfig {
+        bool enabled;
+        uint256 initBond;
+        GameType gameType;
+        bytes gameArgs;
+    }
+
+    /// @notice Addresses of the deployed and wired contracts for an OP Chain.
+    struct ChainContracts {
+        ISystemConfig systemConfig;
+        IProxyAdmin proxyAdmin;
+        IAddressManager addressManager;
+        IL1CrossDomainMessenger l1CrossDomainMessenger;
+        IL1ERC721Bridge l1ERC721Bridge;
+        IL1StandardBridge l1StandardBridge;
+        IOptimismPortal2 optimismPortal;
+        IETHLockbox ethLockbox;
+        IOptimismMintableERC20Factory optimismMintableERC20Factory;
+        IDisputeGameFactory disputeGameFactory;
+        IAnchorStateRegistry anchorStateRegistry;
+        IDelayedWETH delayedWETH;
+    }
+
+    /// @notice Full configuration for deploying a new OP Chain.
+    struct FullConfig {
+        string saltMixer;
+        ISuperchainConfig superchainConfig;
+        address proxyAdminOwner;
+        address systemConfigOwner;
+        address unsafeBlockSigner;
+        address batcher;
+        Proposal startingAnchorRoot;
+        GameType startingRespectedGameType;
+        uint32 basefeeScalar;
+        uint32 blobBasefeeScalar;
+        uint64 gasLimit;
+        uint256 l2ChainId;
+        IResourceMetering.ResourceConfig resourceConfig;
+        uint256 disputeMaxGameDepth;
+        uint256 disputeSplitDepth;
+        Duration disputeClockExtension;
+        Duration disputeMaxClockDuration;
+        DisputeGameConfig[] disputeGameConfigs;
+    }
+
+    /// @notice Input for upgrading an existing OP Chain.
+    struct UpgradeInput {
+        ISystemConfig systemConfig;
+        DisputeGameConfig[] disputeGameConfigs;
+    }
+
+    /// @notice Emitted when a proxy is created.
+    event ProxyCreation(string name, address proxy);
+
+    /// @notice Errors surfaced by OPContractsManagerV2.
+    error AddressHasNoCode(address who);
+    error BytesArrayTooLong();
+    error DeploymentFailed();
+    error EmptyInitcode();
+    error IdentityPrecompileCallFailed();
+    error NotABlueprint();
+    error OPContractsManagerV2_InvalidGameConfigs();
+    error OPContractsManagerV2_ProxyLoadBadError();
+    error OPContractsManagerV2_ProxyLoadBadReturn();
+    error OPContractsManagerV2_ProxyLoadNeedsGas();
+    error OPContractsManagerV2_ProxyLogOnlySelf();
+    error OPContractsManagerV2_ProxyMustLoad();
+    error OPContractsManagerV2_SuperchainConfigNeedsUpgrade();
+    error OPContractsManagerV2_UnsupportedGameType();
+    error OPContractsManager_InvalidGameType();
+    error ReservedBitsSet();
+    error SemverComp_InvalidSemverParts();
+    error UnexpectedPreambleData(bytes data);
+    error UnsupportedERCVersion(uint8 version);
+
+    /// @notice Pseudo-constructor for CREATE2 deployment via an external deployer.
+    function __constructor__(IOPContractsManagerContractsContainer _container) external;
+
+    /// @notice Deploys and wires a complete OP Chain per the provided configuration.
+    function deploy(FullConfig memory _cfg) external returns (ChainContracts memory);
+
+    /// @notice Upgrades contracts on an existing OP Chain per the provided input.
+    function upgrade(UpgradeInput memory _inp) external returns (ChainContracts memory);
+
+    /// @notice Returns the contracts container used by this manager.
+    function contractsContainer() external view returns (IOPContractsManagerContractsContainer);
+
+    /// @notice Returns the blueprint contract addresses used for deployment.
+    function blueprints() external view returns (IOPContractsManager.Blueprints memory);
+
+    /// @notice Returns the implementation contract addresses used for wiring proxies.
+    function implementations() external view returns (IOPContractsManager.Implementations memory);
+
+    /// @notice Retrieves the development feature bitmap stored in this contract.
+    function devFeatureBitmap() external view returns (bytes32);
+
+    /// @notice Returns whether a development feature is enabled.
+    function isDevFeatureEnabled(bytes32 _feature) external view returns (bool);
+
+    /// @notice Computes the L1 batch inbox address for an L2 chain ID.
+    function chainIdToBatchInboxAddress(uint256 _l2ChainId) external pure returns (address);
+
+    /// @notice Asserts an address is a deployed contract address.
+    function assertValidContractAddress(address _who) external view;
+
+    /// @notice Emits a ProxyCreation event for a new proxy (internal tooling hook).
+    function logProxyCreation(string calldata _name, address _proxy) external;
+}
+
 interface IOPContractsManager {
     // -------- Structs --------
 
@@ -216,6 +328,7 @@ interface IOPContractsManager {
         address permissionedDisputeGameV2Impl;
         address superFaultDisputeGameImpl;
         address superPermissionedDisputeGameImpl;
+        address storageSetterImpl;
     }
 
     /// @notice The input required to identify a chain for upgrading.
@@ -302,6 +415,10 @@ interface IOPContractsManager {
 
     error InvalidDevFeatureAccess(bytes32 devFeature);
 
+    error MissingPermissionedDisputeGame();
+
+    event Deployed(uint256 indexed l2ChainId, address indexed deployer, bytes deployOutput);
+
     // -------- Methods --------
 
     function __constructor__(
@@ -310,6 +427,7 @@ interface IOPContractsManager {
         IOPContractsManagerUpgrader _opcmUpgrader,
         IOPContractsManagerInteropMigrator _opcmInteropMigrator,
         IOPContractsManagerStandardValidator _opcmStandardValidator,
+        IOPContractsManagerV2 _opcmV2,
         ISuperchainConfig _superchainConfig,
         IProtocolVersions _protocolVersions
     )
@@ -391,6 +509,8 @@ interface IOPContractsManager {
 
     function opcmStandardValidator() external view returns (IOPContractsManagerStandardValidator);
 
+    function opcmV2() external view returns (IOPContractsManagerV2);
+
     /// @notice Retrieves the development feature bitmap stored in this OPCM contract
     /// @return The development feature bitmap.
     function devFeatureBitmap() external view returns (bytes32);

packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol

@@ -23,6 +23,7 @@ interface ISystemConfig is IProxyAdminOwnedBase {
         address l1StandardBridge;
         address optimismPortal;
         address optimismMintableERC20Factory;
+        address delayedWETH;
     }
 
     error ReinitializableBase_ZeroInitVersion();
@@ -39,6 +40,7 @@ interface ISystemConfig is IProxyAdminOwnedBase {
     function L1_STANDARD_BRIDGE_SLOT() external view returns (bytes32);
     function OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT() external view returns (bytes32);
     function OPTIMISM_PORTAL_SLOT() external view returns (bytes32);
+    function DELAYED_WETH_SLOT() external view returns (bytes32);
     function START_BLOCK_SLOT() external view returns (bytes32);
     function UNSAFE_BLOCK_SIGNER_SLOT() external view returns (bytes32);
     function VERSION() external view returns (uint256);
@@ -76,6 +78,7 @@ interface ISystemConfig is IProxyAdminOwnedBase {
     function operatorFeeScalar() external view returns (uint32);
     function minBaseFee() external view returns (uint64);
     function daFootprintGasScalar() external view returns (uint16);
+    function delayedWETH() external view returns (address addr_);
     function optimismMintableERC20Factory() external view returns (address addr_);
     function optimismPortal() external view returns (address addr_);
     function overhead() external view returns (uint256);

packages/contracts-bedrock/interfaces/universal/IStorageSetter.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface IStorageSetter {
+    struct Slot {
+        bytes32 key;
+        bytes32 value;
+    }
+
+    function version() external view returns (string memory);
+    function setBytes32(bytes32 _slot, bytes32 _value) external;
+    function setBytes32(Slot[] calldata _slots) external;
+    function getBytes32(bytes32 _slot) external view returns (bytes32 value_);
+    function setUint(bytes32 _slot, uint256 _value) external;
+    function getUint(bytes32 _slot) external view returns (uint256 value_);
+    function setAddress(bytes32 _slot, address _address) external;
+    function getAddress(bytes32 _slot) external view returns (address addr_);
+    function setBool(bytes32 _slot, bool _value) external;
+    function getBool(bytes32 _slot) external view returns (bool value_);
+
+    function __constructor__() external;
+}