Fix review notes

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L1MultiMessageRelayer.sol

@@ -44,7 +44,8 @@ contract OVM_L1MultiMessageRelayer is iOVM_L1MultiMessageRelayer, Lib_AddressRes
     modifier onlyBatchRelayer() {
         require(
             msg.sender == resolve("OVM_L2BatchMessageRelayer"),
-            "OVM_L1MultiMessageRelayer: Function can only be called by the OVM_L2BatchMessageRelayer" // solhint-disable-line max-line-length
+            // solhint-disable-next-line max-line-length
+            "OVM_L1MultiMessageRelayer: Function can only be called by the OVM_L2BatchMessageRelayer"
         );
         _;
     }

packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol

@@ -427,8 +427,9 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
             "Must append at least one element."
         );
 
-        uint40 nextTransactionPtr = uint40(BATCH_CONTEXT_START_POS +
-            BATCH_CONTEXT_SIZE * numContexts);
+        uint40 nextTransactionPtr = uint40(
+            BATCH_CONTEXT_START_POS + BATCH_CONTEXT_SIZE * numContexts
+        );
 
         require(
             msg.data.length >= nextTransactionPtr,
@@ -845,8 +846,8 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
 
             mstore(add(chainElementStart, 1), ctxTimestamp)
             mstore(add(chainElementStart, 33), ctxBlockNumber)
-
-            calldatacopy(add(chainElementStart, BYTES_TILL_TX_DATA), add(_nextTransactionPtr, 3), _txDataLength) // solhint-disable-line max-line-length
+            // solhint-disable-next-line max-line-length
+            calldatacopy(add(chainElementStart, BYTES_TILL_TX_DATA), add(_nextTransactionPtr, 3), _txDataLength)
 
             leafHash := keccak256(chainElementStart, add(BYTES_TILL_TX_DATA, _txDataLength))
         }
@@ -887,8 +888,8 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
 
             mstore(add(chainElementStart, 1), ctxTimestamp)
             mstore(add(chainElementStart, 33), ctxBlockNumber)
-
-            pop(staticcall(gas(), 0x04, add(txData, 0x20), txDataLength, add(chainElementStart, BYTES_TILL_TX_DATA), txDataLength)) // solhint-disable-line max-line-length
+            // solhint-disable-next-line max-line-length
+            pop(staticcall(gas(), 0x04, add(txData, 0x20), txDataLength, add(chainElementStart, BYTES_TILL_TX_DATA), txDataLength))
 
             leafHash := keccak256(chainElementStart, add(BYTES_TILL_TX_DATA, txDataLength))
         }
@@ -1004,7 +1005,8 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
             // next chain element.
             require(
                 block.timestamp < nextQueueElement.timestamp + forceInclusionPeriodSeconds,
-                "Previously enqueued batches have expired and must be appended before a new sequencer batch." // solhint-disable-line max-line-length
+                // solhint-disable-next-line max-line-length
+                "Previously enqueued batches have expired and must be appended before a new sequencer batch."
             );
 
             // Just like sequencer transaction times must be increasing relative to each other,

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol

@@ -1319,7 +1319,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
             // developer experience, we do return the remaining gas.
             _revertWithFlag(
                 RevertFlag.UNSAFE_BYTECODE,
-                Lib_ErrorUtils.encodeRevertString("Contract creation code contains unsafe opcodes. Did you use the right compiler or pass an unsafe constructor argument?") // solhint-disable-line max-line-length
+                // solhint-disable-next-line max-line-length
+                Lib_ErrorUtils.encodeRevertString("Contract creation code contains unsafe opcodes. Did you use the right compiler or pass an unsafe constructor argument?")
             );
         }
 
@@ -1346,7 +1347,8 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         if (ovmSafetyChecker.isBytecodeSafe(deployedCode) == false) {
             _revertWithFlag(
                 RevertFlag.UNSAFE_BYTECODE,
-                Lib_ErrorUtils.encodeRevertString("Constructor attempted to deploy unsafe bytecode.") // solhint-disable-line max-line-length
+                // solhint-disable-next-line max-line-length
+                Lib_ErrorUtils.encodeRevertString("Constructor attempted to deploy unsafe bytecode.")
             );
         }
 

packages/contracts/contracts/optimistic-ethereum/OVM/execution/OVM_SafetyChecker.sol

@@ -89,7 +89,7 @@ contract OVM_SafetyChecker is iOVM_SafetyChecker {
 
                 opNum := byte(indexInWord, word)
             }
-            /* solhint-disable max-line-length */
+            /* solhint-enable max-line-length */
 
             // + push opcodes
             // + stop opcodes [STOP(0x00),JUMP(0x56),RETURN(0xf3),INVALID(0xfe)]
@@ -100,11 +100,12 @@ contract OVM_SafetyChecker is iOVM_SafetyChecker {
                 if (opBit & opcodePushMask == 0) {
                     // all pushes are valid opcodes
                     // subsequent bytes are not opcodes. Skip them.
-                    _pc += (opNum - 0x5e); // PUSH1 is 0x60, so opNum-0x5f = PUSHed bytes and we +1 to
-                    // skip the _pc++; line below in order to save gas ((-0x5f + 1) = -0x5e)
+                    _pc += (opNum - 0x5e); // PUSH1 is 0x60, so opNum-0x5f = PUSHed bytes and we
+                    // +1 to skip the _pc++; line below in order to save gas ((-0x5f + 1) = -0x5e)
                     continue;
                 } else if (opBit & opcodeHaltingMask == 0) {
-                    // STOP or JUMP or RETURN or INVALID (Note: REVERT is blacklisted, so not included here)
+                    // STOP or JUMP or RETURN or INVALID (Note: REVERT is blacklisted, so not
+                    // included here)
                     // We are now inside unreachable code until we hit a JUMPDEST!
                     do {
                         _pc++;
@@ -114,7 +115,8 @@ contract OVM_SafetyChecker is iOVM_SafetyChecker {
                         // encountered a JUMPDEST
                         if (opNum == 0x5b) break;
                         // skip PUSHed bytes
-                        if ((1 << opNum) & opcodePushMask == 0) _pc += (opNum - 0x5f); // opNum-0x5f = PUSHed bytes (PUSH1 is 0x60)
+                        // opNum-0x5f = PUSHed bytes (PUSH1 is 0x60)
+                        if ((1 << opNum) & opcodePushMask == 0) _pc += (opNum - 0x5f);
                     } while (_pc < codeLength);
                     // opNum is 0x5b, so we don't continue here since the pc++ is fine
                 } else if (opNum == 0x33) { // Caller opcode
@@ -133,7 +135,11 @@ contract OVM_SafetyChecker is iOVM_SafetyChecker {
                     if ((firstOps >> 192) == 0x3350600060045af1) {
                         _pc += 8;
                     // Call EM and abort execution if instructed
-                    // CALLER PUSH1 0x00 SWAP1 GAS CALL PC PUSH1 0x0E ADD JUMPI RETURNDATASIZE PUSH1 0x00 DUP1 RETURNDATACOPY RETURNDATASIZE PUSH1 0x00 REVERT JUMPDEST RETURNDATASIZE PUSH1 0x01 EQ ISZERO PC PUSH1 0x0a ADD JUMPI PUSH1 0x01 PUSH1 0x00 RETURN JUMPDEST
+                    // CALLER PUSH1 0x00 SWAP1 GAS CALL PC PUSH1 0x0E ADD JUMPI RETURNDATASIZE
+                    // PUSH1 0x00 DUP1 RETURNDATACOPY RETURNDATASIZE PUSH1 0x00 REVERT JUMPDEST
+                    // RETURNDATASIZE PUSH1 0x01 EQ ISZERO PC PUSH1 0x0a ADD JUMPI PUSH1 0x01 PUSH1
+                    // 0x00 RETURN JUMPDEST
+                    // solhint-disable-next-line max-line-length
                     } else if (firstOps == 0x336000905af158600e01573d6000803e3d6000fd5b3d6001141558600a015760 && secondOps == 0x016000f35b) {
                         _pc += 37;
                     } else {