Merge upstream 1.14.0 (#51)

**Description**

merges upstream op-batcher/v.1.14.0 release tag.

Includes various fixes primarily for DA batcher tests and
kurtosis-devnet.

**Tests**

No new tests added (on our end). `fakeSyncStatus` used for batcher tests
has been updated (in merge commit)

**Additional context**

New commits that may be of interest:
[fix(kt-devnet): Update config, endpoints and
justfile](5a6533d)

Kurtosis was upgraded from 1.6.0 to 1.8.1. This version has a bug where
the `--` used by
`eigenda-devnet-add-tx-fuzzer` and `eigenda-devnet-restart-batcher` no
longer works as intended;

* `eigenda-devnet-add-tx-fuzzer` has been updated with a `--cmd`
workaround.
* `eigenda-devnet-restart-batcher` has been updated to utilize `kurtosis
service update`

The `github.com/ethpandaops/optimism-package` was updated. As a result,
`kurtosis-devnet/eigenda.yaml` has been updated to the new format.
Multiple container names have also changed.

**Metadata**
Ref:
https://linear.app/eigenlabs/issue/DAINT-630/rebase-on-top-of-batcherv1140

Author: iquidus

.cursor/rules/solidity-styles.mdc

@@ -0,0 +1,69 @@
+---
+description:
+globs: *.sol
+alwaysApply: false
+---
+# Optimism Solidity Style Guide
+
+Applies to Solidity files.
+
+## Comments
+- Use triple-slash solidity natspec comment style
+- Always use `@notice` instead of `@dev`
+- Use a line-length of 100 characters
+- Custom tags:
+  - `@custom:proxied`: Add to a contract whenever it's meant to live behind a proxy
+  - `@custom:upgradeable`: Add to a contract whenever it's meant to be inherited by an upgradeable contract
+  - `@custom:semver`: Add to `version` variable which indicate the contracts semver
+  - `@custom:legacy`: Add to an event or function when it only exists for legacy support
+  - `@custom:network-specific`: Add to state variables which vary between OP Chains
+
+## Errors
+- When adding new errors, always use custom Solidity errors
+- Custom errors should take the format `ContractName_ErrorDescription`
+
+## Naming Conventions
+- Function parameters should be prefixed with an underscore
+- Function return arguments should be suffixed with an underscore
+- Event parameters should NOT be prefixed with an underscore
+- Immutable variables:
+  - Should be in `SCREAMING_SNAKE_CASE`
+  - Should be `internal`
+  - Should have a hand-written getter function
+- Spacers must be named `spacer_<slot>_<offset>_<length>` and be `private`
+
+## Upgradeability
+- Contracts should be built assuming upgradeability by default
+- Extend OpenZeppelin's `Initializable` or base contract
+- Use the `ReinitializableBase` contract
+- Include an `initialize` function with the `reinitializer(initValue())` modifier
+- If including an `upgrade` function, use the `reinitializer(initValue())` modifier
+- In the constructor:
+  - Call `_disableInitializers()`
+  - Set any immutables (though generally avoid immutables)
+
+## Versioning
+- All non-library/non-abstract contracts must inherit `ISemver` and expose `version()`
+- Production-ready contracts must have version `1.0.0` or greater
+- Version increments:
+  - `patch`: changes that don't modify bytecode (comments)
+  - `minor`: changes that modify bytecode OR expand ABI without breaking existing interface
+  - `major`: changes that break existing interface OR modify security model
+
+## Dependencies
+- Prefer OpenZeppelin's Upgradeable contracts for basic functionality
+
+## State Changes
+- All state changing functions should emit a corresponding event
+
+## Testing
+- Tests should be written using Foundry
+- For testing reverts with low-level calls, use the `revertsAsExpected` pattern
+- Test function naming: `[method]_[functionName]_[reason]_[status]`
+  - `method`: `test`, `testFuzz`, or `testDiff`
+  - `status`: `succeeds`, `reverts`, `works`, `fails`, or `benchmark`
+- Test contract naming:
+  - `TargetContract_Init`: for basic setup contracts
+  - `TargetContract_FunctionName_Test`: for happy path tests
+  - `TargetContract_FunctionName_TestFail`: for sad path tests
+  - `TargetContract_Harness`: for harness contracts

.github/CODEOWNERS

@@ -10,6 +10,7 @@
 /op-proposer    @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
 /op-wheel       @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
 /ops-bedrock    @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-devstack    @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
 
 # Expert areas
 /op-node/rollup @ethereum-optimism/consensus @ethereum-optimism/go-reviewers
@@ -33,7 +34,7 @@
 /docker-bake.hcl @ethereum-optimism/monorepo-ops-reviewers
 
 # Contracts
-/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers
+/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers #[min:2]
 
 # Security docs
 /docs @ethereum-optimism/evm-safety

.semgrep/rules/sol-rules.yaml

@@ -45,7 +45,7 @@ rules:
       - pattern: vm.expectRevert()
     paths:
       exclude:
-        - packages/contracts-bedrock/test/dispute/WETH98.t.sol
+        - packages/contracts-bedrock/test/universal/WETH98.t.sol
 
   - id: sol-safety-natspec-semver-match
     languages: [generic]
@@ -123,7 +123,7 @@ rules:
         - packages/contracts-bedrock/interfaces
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/src/universal/WETH98.sol
-        - packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+        - packages/contracts-bedrock/src/L2/SuperchainETHBridge.sol
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
 
   - id: sol-style-return-arg-fmt
@@ -165,10 +165,6 @@ rules:
       exclude:
         - packages/contracts-bedrock/src/libraries/Bytes.sol
         - packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
-        - packages/contracts-bedrock/src/cannon/MIPS.sol
-        - packages/contracts-bedrock/src/cannon/MIPS2.sol
-        - packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
-        - packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
 
   - id: sol-style-malformed-revert
     languages: [solidity]
@@ -182,9 +178,6 @@ rules:
       - pattern-not-regex: string\.concat\(\"(\w+:\s[^"]*)\"\,.+\)
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
-    paths:
-      exclude:
-        - packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
 
   - id: sol-style-use-abi-encodecall
     languages: [solidity]
@@ -222,6 +215,36 @@ rules:
       exclude:
         - packages/contracts-bedrock/test
 
+  - id: sol-style-error-format
+    languages: [generic]
+    severity: ERROR
+    message: Error formatting is incorrect - must follow pattern ContractName_ErrorName with exactly one underscore
+    pattern-either:
+      - pattern-regex: contract\s+(\w+)\s*\{[^}]*error\s+(?!(\1_[^_]\w*))\w+[^;]*;
+      - pattern-regex: \berror\s+(?!([A-Z][a-zA-Z0-9]*_[^_][a-zA-Z0-9]*))[a-zA-Z0-9]+\s*\([^)]*\)\s*;
+    paths:
+      include:
+        - packages/contracts-bedrock/src
+      exclude:
+        - packages/contracts-bedrock/src/safe/LivenessModule.sol
+        - packages/contracts-bedrock/src/libraries/rlp/RLPErrors.sol
+        - packages/contracts-bedrock/src/libraries/errors/CommonErrors.sol
+        - packages/contracts-bedrock/src/libraries/TransientContext.sol
+        - packages/contracts-bedrock/src/libraries/L1BlockErrors.sol
+        - packages/contracts-bedrock/src/libraries/Blueprint.sol
+        - packages/contracts-bedrock/src/dispute/lib/Errors.sol
+        - packages/contracts-bedrock/src/dispute/SuperFaultDisputeGame.sol
+        - packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
+        - packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol
+        - packages/contracts-bedrock/src/L2/SuperchainETHBridge.sol
+        - packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
+        - packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+        - packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+        - packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
+        - packages/contracts-bedrock/src/L1/ResourceMetering.sol
+        - packages/contracts-bedrock/src/L1/OPContractsManager.sol
+        - packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
+
   - id: sol-safety-use-disable-initializer
     languages: [solidity]
     severity: ERROR
@@ -284,3 +307,59 @@ rules:
           function upgrade(...) external reinitializer(...) {
             ...
           }
+
+  - id: sol-safety-no-immutable-variables
+    languages: [solidity]
+    severity: ERROR
+    message: Immutable variables are not allowed in this codebase
+    pattern-regex: |
+      (?:\bimmutable\b\s+\w+\s+\w+|\b\w+\s+\bimmutable\b\s+\w+)(?:\s*=\s*[^;]+)?\s*;
+    paths:
+      include:
+        - packages/contracts-bedrock/src
+      exclude:
+        - packages/contracts-bedrock/src/L1/OPContractsManager.sol
+        - packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+        - packages/contracts-bedrock/src/L2/FeeVault.sol
+        - packages/contracts-bedrock/src/L2/OptimismMintableERC721.sol
+        - packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
+        - packages/contracts-bedrock/src/cannon/MIPS64.sol
+        - packages/contracts-bedrock/src/cannon/PreimageOracle.sol
+        - packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
+        - packages/contracts-bedrock/src/dispute/DelayedWETH.sol
+        - packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/SuperFaultDisputeGame.sol
+        - packages/contracts-bedrock/src/dispute/SuperPermissionedDisputeGame.sol
+        - packages/contracts-bedrock/src/governance/MintManager.sol
+        - packages/contracts-bedrock/src/periphery/TransferOnion.sol
+        - packages/contracts-bedrock/src/periphery/faucet/Faucet.sol
+        - packages/contracts-bedrock/src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol
+        - packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
+        - packages/contracts-bedrock/src/safe/DeputyPauseModule.sol
+        - packages/contracts-bedrock/src/safe/LivenessGuard.sol
+        - packages/contracts-bedrock/src/safe/LivenessModule.sol
+        - packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
+        - packages/contracts-bedrock/src/universal/ReinitializableBase.sol
+
+  - id: sol-style-use-process-run
+    languages: [solidity]
+    severity: ERROR
+    message: Use Process.run instead of vm.ffi or vm.tryFfi
+    pattern-either:
+      - pattern: |
+          vm.ffi(...);
+      - pattern: |
+          vm.tryFfi(...);
+    paths:
+      exclude:
+        - packages/contracts-bedrock/scripts/libraries/Process.sol
+
+  - id: sol-style-vm-env-only-in-config-sol
+    languages: [solidity]
+    severity: ERROR
+    message: vm.env* should only be used in Config.sol
+    pattern-regex: vm.env
+    paths:
+      exclude:
+        - packages/contracts-bedrock/scripts/libraries/Config.sol

.semgrep/tests/sol-rules.sol-safety-no-immutable-variables.t.sol

@@ -0,0 +1,22 @@
+contract SemgrepTest__sol_safety_no_immutable_variables {
+    // ok: sol-safety-no-immutable-variables
+    uint256 public normalVar;
+
+    // ok: sol-safety-no-immutable-variables
+    address public normalAddress;
+
+    // ok: sol-safety-no-immutable-variables
+    string public normalString;
+
+    // ok: sol-safety-no-immutable-variables
+    bool public normalBool;
+
+    // ruleid: sol-safety-no-immutable-variables
+    uint256 immutable invalidImmutable1;
+
+    // ruleid: sol-safety-no-immutable-variables
+    bytes32 immutable invalidImmutable3 = "test";
+
+    // ok: sol-safety-no-immutable-variables
+    uint256 constant constantVar = 1;
+}

.semgrep/tests/sol-rules.sol-style-error-format.t.sol

@@ -0,0 +1,15 @@
+// ruleid: sol-style-error-format
+contract SemgrepTest__sol_style_error_format__bad1 {
+    // ruleid: sol-style-error-format
+    error BadError();
+}
+
+// ruleid: sol-style-error-format
+contract SemgrepTest__sol_style_error_format__bad2 {
+    error SemgrepTest__sol_style_error_format__bad2___BadError();
+}
+
+// ok: sol-style-error-format
+contract SemgrepTest__sol_style_error_format__good {
+    error SemgrepTest__sol_style_error_format__good_GoodError();
+}

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
   "editorconfig.generateAuto": false,
-  "files.trimTrailingWhitespace": true
+  "files.trimTrailingWhitespace": true,
+  "openInGitHub.defaultBranch": "develop",
+  "openInGitHub.alwaysUseDefaultBranch": false,
+  "openInGitHub.excludeCurrentRevision": true
 }