Merge branch 'chaosnet-config' into deps/update-superchain-registry

op-node/rollup/superchain.go

@@ -25,6 +25,7 @@ const (
 	zoraGoerli  = 999
 	zoraMainnet = 7777777
 	labsDevnet  = 997
+	chaosnet    = 888
 )
 
 // LoadOPStackRollupConfig loads the rollup configuration of the requested chain ID from the superchain-registry.
@@ -69,6 +70,8 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 		regolithTime = 1679079600
 	case labsDevnet:
 		regolithTime = 1677984480
+	case chaosnet:
+		regolithTime = 1692156862
 	}
 
 	cfg := &Config{
@@ -102,7 +105,7 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 	if superChain.Config.ProtocolVersionsAddr != nil { // Set optional protocol versions address
 		cfg.ProtocolVersionsAddress = common.Address(*superChain.Config.ProtocolVersionsAddr)
 	}
-	if chainID == labsDevnet {
+	if chainID == labsDevnet || chainID == chaosnet {
 		cfg.ChannelTimeout = 120
 		cfg.MaxSequencerDrift = 1200
 	}

packages/contracts-bedrock/deploy-config/getting-started.json

@@ -53,5 +53,8 @@
   "eip1559Denominator": 50,
   "eip1559Elasticity": 10,
 
-  "systemConfigStartBlock": 0
+  "systemConfigStartBlock": 0,
+
+  "requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000"
 }

packages/contracts-bedrock/src/cannon/MIPS.sol

@@ -77,7 +77,7 @@ contract MIPS {
     }
 
     /// @notice Computes the hash of the MIPS state.
-    /// @return out_ The hash of the MIPS state.
+    /// @return out_ The hashed MIPS state.
     function outputState() internal returns (bytes32 out_) {
         assembly {
             // copies 'size' bytes, right-aligned in word at 'from', to 'to', incl. trailing data
@@ -141,6 +141,7 @@ contract MIPS {
     }
 
     /// @notice Handles a syscall.
+    /// @return out_ The hashed MIPS state.
     function handleSyscall() internal returns (bytes32 out_) {
         unchecked {
             // Load state from memory
@@ -372,7 +373,7 @@ contract MIPS {
     /// @param _rs The value of the RS register.
     /// @param _rt The value of the RT register.
     /// @param _storeReg The register to store the result in.
-    /// @return out_ The hash of the resulting MIPS state.
+    /// @return out_ The hashed MIPS state.
     function handleHiLo(uint32 _func, uint32 _rs, uint32 _rt, uint32 _storeReg) internal returns (bytes32 out_) {
         unchecked {
             // Load state from memory