Merge remote-tracking branch 'upstream/develop' into develop

Author: Rjected

.circleci/config.yml

@@ -1,9 +1,8 @@
 .github
 .vscode
 
-node_modules
-**/node_modules
 .env
+.envrc
 **/.env
 
 test

.dockerignore

@@ -1,44 +1,35 @@
-# Packages
-/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers
-/packages/sdk                   @ethereum-optimism/devxpod
+# Monorepo - default to go-reviewers
+* @ethereum-optimism/go-reviewers
+
+# OP Stack general
+/bedrock-devnet @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-alt-da      @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-batcher     @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-chain-ops   @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-e2e         @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/op-node        @ethereum-optimism/op-stack @ethereum-optimism/go-reviewers
+/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
+
+# Expert areas
+/op-node/rollup @ethereum-optimism/consensus @ethereum-optimism/go-reviewers
+
+/op-supervisor  @ethereum-optimism/interop @ethereum-optimism/go-reviewers
 
-# Bedrock codebases
-/bedrock-devnet @ethereum-optimism/go-reviewers
-/cannon         @ethereum-optimism/go-reviewers
-/op-batcher     @ethereum-optimism/go-reviewers
-/op-bootnode    @ethereum-optimism/go-reviewers
-/op-chain-ops   @ethereum-optimism/go-reviewers
-/op-challenger  @ethereum-optimism/go-reviewers
-/op-dispute-mon  @ethereum-optimism/go-reviewers
-/op-e2e         @ethereum-optimism/go-reviewers
-/op-heartbeat   @ethereum-optimism/go-reviewers
-/op-node        @ethereum-optimism/go-reviewers
-/op-node/rollup @protolambda @ajsutton
-/op-alt-da      @ethereum-optimism/go-reviewers
-/op-preimage    @ethereum-optimism/go-reviewers
-/op-program     @ethereum-optimism/go-reviewers
-/op-proposer    @ethereum-optimism/go-reviewers
-/op-service     @ethereum-optimism/go-reviewers
-/op-supervisor  @ethereum-optimism/go-reviewers
-/op-wheel       @ethereum-optimism/go-reviewers
-/ops-bedrock    @ethereum-optimism/go-reviewers
-/op-conductor   @0x00101010 @zhwrd @mslipper
+/op-conductor   @ethereum-optimism/op-conductor @ethereum-optimism/go-reviewers
+
+/cannon         @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
+/op-dispute-mon @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
+/op-challenger  @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
+/op-preimage    @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
+/op-program     @ethereum-optimism/proofs @ethereum-optimism/go-reviewers
 
 # Ops
 /.circleci       @ethereum-optimism/monorepo-ops-reviewers
 /.github         @ethereum-optimism/monorepo-ops-reviewers
 /ops             @ethereum-optimism/monorepo-ops-reviewers
 /docker-bake.hcl @ethereum-optimism/monorepo-ops-reviewers
 
-# Misc
-/proxyd           @ethereum-optimism/infra-reviewers
-/infra            @ethereum-optimism/infra-reviewers
-/specs            @ethereum-optimism/contract-reviewers @ethereum-optimism/go-reviewers
-
-# Don't add owners if only package.json is updated
-/packages/*/package.json
-/*/package.json
-
-# JavaScript Releases
-/packages/*/CHANGELOG.md @ethereum-optimism/release-managers
-/*/CHANGELOG.md          @ethereum-optimism/release-managers
+# Contracts
+/packages/contracts-bedrock     @ethereum-optimism/contract-reviewers

.github/CODEOWNERS

@@ -20,7 +20,6 @@ on:
         options:
           - ci-builder
           - ci-builder-rust
-          - op-heartbeat
           - op-node
           - op-batcher
           - op-proposer

.github/workflows/tag-service.yml

@@ -15,6 +15,9 @@ dist
 artifacts
 cache
 
+!op-chain-ops/foundry/testdata/srcmaps/cache
+!op-chain-ops/foundry/testdata/srcmaps/artifacts
+
 packages/contracts-bedrock/deployments/devnetL1
 packages/contracts-bedrock/deployments/anvil
 

.gitignore

@@ -22,3 +22,6 @@ op-chain-ops/script/testdata
 
 packages/*/node_modules
 packages/*/test
+
+# Autogenerated solidity library
+packages/contracts-bedrock/scripts/libraries/Solarray.sol

.npmrc

@@ -1,12 +1,7 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-  // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-  // List of extensions which should be recommended for users of this workspace.
   "recommendations": [
-    "dbaeumer.vscode-eslint",
     "editorconfig.editorconfig",
-    "juanblanco.solidity",
-    "golang.go",
-  ],
-}
+    "nomicfoundation.hardhat-solidity",
+    "golang.go"
+  ]
+}

.semgrepignore

@@ -1,16 +1,4 @@
 {
-  "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
-    "editor.formatOnSave": true
-  },
-  "eslint.workingDirectories": [
-    {
-      "directory": "packages/chain-mon",
-      "changeProcessCWD": true
-    }
-  ],
-  "eslint.nodePath": "./node_modules/eslint/bin/",
-  "eslint.format.enable": true,
   "editorconfig.generateAuto": false,
   "files.trimTrailingWhitespace": true
 }

.vscode/extensions.json

@@ -146,8 +146,8 @@ cannon-prestate: op-program cannon ## Generates prestate using cannon and op-pro
 .PHONY: cannon-prestate
 
 cannon-prestate-mt: op-program cannon ## Generates prestate using cannon and op-program in the multithreaded cannon format
-	./cannon/bin/cannon load-elf --type mt --path op-program/bin/op-program-client.elf --out op-program/bin/prestate-mt.json --meta op-program/bin/meta-mt.json
-	./cannon/bin/cannon run --type mt --proof-at '=0' --stop-at '=1' --input op-program/bin/prestate-mt.json --meta op-program/bin/meta-mt.json --proof-fmt 'op-program/bin/%d-mt.json' --output ""
+	./cannon/bin/cannon load-elf --type cannon-mt --path op-program/bin/op-program-client.elf --out op-program/bin/prestate-mt.bin.gz --meta op-program/bin/meta-mt.json
+	./cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input op-program/bin/prestate-mt.bin.gz --meta op-program/bin/meta-mt.json --proof-fmt 'op-program/bin/%d-mt.json' --output ""
 	mv op-program/bin/0-mt.json op-program/bin/prestate-proof-mt.json
 .PHONY: cannon-prestate