Merge remote-tracking branch 'origin/develop' into aj/deploy-dispute-game-e2e

.changeset/beige-masks-prove.md

----
-'@eth-optimism/chain-mon': patch
----
-
-Update import path for artifact

.changeset/breezy-spoons-hope.md

----
-'@eth-optimism/fault-detector': patch
----
-
-Bump contracts-bedrock version

.changeset/bright-mayflies-jog.md

----
-'@eth-optimism/sdk': patch
----
-
-Fixed missing indexes for multicall support

.changeset/cuddly-panthers-trade.md

----
-'@eth-optimism/sdk': minor
----
-
-Add support for claiming multicall3 withdrawals

.changeset/fuzzy-lobsters-wait.md

----
-'@eth-optimism/sdk': minor
----
-
-Fixes issue with legacy withdrawal message status detection

.changeset/little-scissors-own.md

----
-'@eth-optimism/contracts-bedrock': patch
-'@eth-optimism/fault-detector': patch
-'@eth-optimism/core-utils': patch
-'@eth-optimism/endpoint-monitor': patch
-'@eth-optimism/sdk': patch
----
-
-fix typo

.changeset/nervous-icons-retire.md

----
-'@eth-optimism/fault-detector': minor
----
-
-Remove pre-bedrock support from fault detector.

.changeset/seven-cameras-sip.md

----
-'@eth-optimism/contracts-bedrock': minor
----
-
-Migrate contracts periphery into bedrock

.changeset/shy-yaks-smell.md

----
-'@eth-optimism/contracts-bedrock': patch
-'@eth-optimism/core-utils': patch
-'@eth-optimism/sdk': patch
----
-
-Delete dead typescript https://github.com/ethereum-optimism/optimism/pull/6148.

.changeset/tender-files-sort.md

----
-'@eth-optimism/sdk': patch
----
-
-Update the addresses of the bridges on optimism and optimism goerli for the ECO bridge adapter

.changeset/violet-pants-dress.md

----
-'@eth-optimism/sdk': minor
----
-
-Added to and from block filters to several methods in CrossChainMessenger

.circleci/config.yml

@@ -140,7 +140,6 @@ jobs:
             - "packages/common-ts/node_modules"
             - "packages/contracts-bedrock/node_modules"
             - "packages/core-utils/node_modules"
-            - "packages/fault-detector/node_modules"
             - "packages/replica-healthcheck/node_modules"
             - "packages/sdk/node_modules"
             - "packages/contracts-ts/node_modules"
@@ -376,7 +375,7 @@ jobs:
   contracts-bedrock-tests:
     docker:
       - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
-    resource_class: large
+    resource_class: xlarge
     steps:
       - checkout
       - attach_workspace: { at: "." }
@@ -409,10 +408,12 @@ jobs:
           environment:
             FOUNDRY_PROFILE: ci
           working_directory: packages/contracts-bedrock
+          no_output_timeout: 15m
 
   contracts-bedrock-checks:
     docker:
       - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
+    resource_class: xlarge
     steps:
       - checkout
       - attach_workspace: { at: "." }
@@ -448,6 +449,7 @@ jobs:
           environment:
             FOUNDRY_PROFILE: ci
           working_directory: packages/contracts-bedrock
+          no_output_timeout: 15m
       - run:
           name: validate deploy configs
           command: |
@@ -1115,6 +1117,18 @@ jobs:
                 command: |
                   docker logs ops-bedrock-op-proposer-1 || echo "No logs."
                 when: on_fail
+            - run:
+                name: Log deployment artifact
+                command: |
+                  cat broadcast/Deploy.s.sol/900/run-latest.json || echo "No deployment file found"
+                when: on_fail
+                working_directory: packages/contracts-bedrock
+            - run:
+                name: Log artifacts directory
+                command: |
+                  ls -R forge-artifacts || echo "No forge artifacts found"
+                when: on_fail
+                working_directory: packages/contracts-bedrock
       - when:
           condition:
             and:
@@ -1348,13 +1362,6 @@ workflows:
           dependencies: "(common-ts|contracts-bedrock|core-utils|sdk)"
           requires:
             - pnpm-monorepo
-      - js-lint-test:
-          name: fault-detector-tests
-          coverage_flag: fault-detector-tests
-          package_name: fault-detector
-          dependencies: "(common-ts|core-utils|sdk)"
-          requires:
-            - pnpm-monorepo
       - js-lint-test:
           name: contracts-ts-tests
           coverage_flag: contracts-ts-tests
@@ -1601,14 +1608,6 @@ workflows:
           docker_target: wd-mon
           context:
             - oplabs-gcr
-      - docker-publish:
-          name: fault-detector-docker-publish
-          docker_file: ./ops/docker/Dockerfile.packages
-          docker_name: fault-detector
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
-          docker_target: fault-detector
-          context:
-            - oplabs-gcr
       - hive-test:
           name: hive-test-rpc
           version: <<pipeline.git.revision>>
@@ -1646,7 +1645,7 @@ workflows:
           type: approval
           filters:
             tags:
-              only: /^(fault-detector|proxyd|indexer|ci-builder|op-[a-z0-9\-]*)\/v.*/
+              only: /^(proxyd|indexer|ci-builder|op-[a-z0-9\-]*)\/v.*/
             branches:
               ignore: /.*/
       - docker-release:
@@ -1713,23 +1712,6 @@ workflows:
             - oplabs-gcr-release
           requires:
             - hold
-      - docker-release:
-          name: fault-detector-docker-release
-          filters:
-            tags:
-              only: /^fault-detector\/v.*/
-            branches:
-              ignore: /.*/
-          docker_file: ./ops/docker/Dockerfile.packages
-          docker_name: fault-detector
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
-          docker_target: fault-detector
-          docker_context: .
-          platforms: "linux/amd64,linux/arm64"
-          context:
-            - oplabs-gcr-release
-          requires:
-            - hold
       - docker-build:
           name: op-migrate-docker-release
           filters:

.github/CODEOWNERS

@@ -3,14 +3,14 @@
 /packages/contracts             @ethereum-optimism/contract-reviewers
 /packages/contracts-bedrock     @ethereum-optimism/contract-reviewers
 /packages/core-utils            @ethereum-optimism/legacy-reviewers
-/packages/chain-mon             @smartcontracts
-/packages/fault-detector        @ethereum-optimism/devxpod
+/packages/chain-mon             @ethereum-optimism/devxpod
 /packages/replica-healthcheck   @ethereum-optimism/legacy-reviewers
 /packages/sdk                   @ethereum-optimism/devxpod
 /packages/atst                  @ethereum-optimism/devxpod
 
 # Bedrock codebases
 /bedrock-devnet @ethereum-optimism/go-reviewers
+/cannon         @ethereum-optimism/go-reviewers
 /op-batcher     @ethereum-optimism/go-reviewers
 /op-chain-ops   @ethereum-optimism/go-reviewers
 /op-e2e         @ethereum-optimism/go-reviewers
@@ -35,3 +35,11 @@
 /infra            @ethereum-optimism/infra-reviewers
 /specs            @ethereum-optimism/contract-reviewers @ethereum-optimism/go-reviewers
 /endpoint-monitor @ethereum-optimism/infra-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

.github/workflows/release-docker-canary.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     # map the step outputs to job outputs
     outputs:
-      fault-detector: ${{ steps.packages.outputs.fault-detector }}
+      fault-mon: ${{ steps.packages.outputs.fault-mon }}
       balance-mon: ${{ steps.packages.outputs.balance-mon }}
       drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       wd-mon: ${{ steps.packages.outputs.wd-mon }}
@@ -43,10 +43,10 @@ jobs:
         env:
           CUSTOM_IMAGE_NAME: ${{ github.event.inputs.customImageName }}
 
-  fault-detector:
-    name: Publish Fault Detector Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
+  fault-mon:
+    name: Publish fault-mon Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
     needs: canary-publish
-    if: needs.canary-publish.outputs.fault-detector != ''
+    if: needs.canary-publish.outputs.fault-mon != ''
     runs-on: ubuntu-latest
 
     steps:
@@ -66,9 +66,9 @@ jobs:
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
-          target: fault-detector
+          target: fault-mon
           push: true
-          tags: ethereumoptimism/fault-detector:${{ needs.canary-publish.outputs.canary-docker-tag }}
+          tags: ethereumoptimism/fault-mon:${{ needs.canary-publish.outputs.canary-docker-tag }}
 
   balance-mon:
     name: Publish Balance Monitor Version ${{ needs.canary-publish.outputs.canary-docker-tag }}

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.repository == 'ethereum-optimism/optimism'
     # map the step outputs to job outputs
     outputs:
-      fault-detector: ${{ steps.packages.outputs.fault-detector }}
+      fault-mon: ${{ steps.packages.outputs.fault-mon }}
       balance-mon: ${{ steps.packages.outputs.drippie-mon }}
       drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       wd-mon: ${{ steps.packages.outputs.wd-mon }}
@@ -100,10 +100,10 @@ jobs:
             GITCOMMIT=${{ steps.build_args.outputs.GITCOMMIT }}
             GITVERSION=${{ steps.build_args.outputs.GITVERSION }}
 
-  fault-detector:
-    name: Publish Fault Detector Version ${{ needs.release.outputs.fault-detector }}
+  fault-mon:
+    name: Publish fault-mon Version ${{ needs.release.outputs.fault-mon }}
     needs: release
-    if: needs.release.outputs.fault-detector != ''
+    if: needs.release.outputs.fault-mon != ''
     runs-on: ubuntu-latest
 
     steps:
@@ -123,9 +123,9 @@ jobs:
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
-          target: fault-detector
+          target: fault-mon
           push: true
-          tags: ethereumoptimism/fault-detector:${{ needs.release.outputs.fault-detector }},ethereumoptimism/fault-detector:latest
+          tags: ethereumoptimism/fault-mon:${{ needs.release.outputs.fault-mon }},ethereumoptimism/fault-mon:latest
 
   wd-mon:
     name: Publish Withdrawal Monitor Version ${{ needs.release.outputs.wd-mon }}

.github/workflows/tag-service.yml

@@ -26,6 +26,8 @@ on:
           - op-proposer
           - op-ufm
           - proxyd
+          - indexer
+          - ci-builder
       prerelease:
         description: Increment major/minor/patch as prerelease?
         required: false

.vscode/settings.json

@@ -19,14 +19,10 @@
     {
       "directory": "packages/chain-mon",
       "changeProcessCWD": true
-    },
-    {
-      "directory": "packages/fault-detector",
-      "changeProcessCWD": true
     }
   ],
   "eslint.nodePath": "./node_modules/eslint/bin/",
   "eslint.format.enable": true,
   "editorconfig.generateAuto": false,
   "files.trimTrailingWhitespace": true
-}
+}
\ No newline at end of file

Makefile

@@ -130,4 +130,6 @@ update-op-geth:
 .PHONY: update-op-geth
 
 bedrock-markdown-links:
-	docker run --init -it -v `pwd`:/input lycheeverse/lychee --verbose --no-progress --exclude-loopback --exclude twitter.com --exclude explorer.optimism.io --exclude-mail /input/README.md "/input/specs/**/*.md"
+	docker run --init -it -v `pwd`:/input lycheeverse/lychee --verbose --no-progress --exclude-loopback \
+		--exclude twitter.com --exclude explorer.optimism.io --exclude linux-mips.org \
+		--exclude-mail /input/README.md "/input/specs/**/*.md"

README.md

@@ -54,7 +54,6 @@ Refer to the Directory Structure section below to understand which packages are
 │   ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: Bedrock smart contracts.
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
-│   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
 │   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
 ├── <a href="./op-bindings">op-bindings</a>: Go bindings for Bedrock smart contracts.
@@ -80,7 +79,6 @@ Refer to the Directory Structure section below to understand which packages are
 │   ├── <a href="./packages/common-ts">common-ts</a>: Common tools for building apps in TypeScript
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/chain-mon">chain-mon</a>: Chain monitoring services
-│   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node
 │   └── <a href="./packages/sdk">sdk</a>: provides a set of tools for interacting with Optimism
 ├── <a href="./indexer">indexer</a>: indexes and syncs transactions

cannon/docs/README.md

@@ -44,48 +44,17 @@ There are 3 types of witness data involved in onchain execution:
 
 ### Packed State
 
-The following state is packed together, and provided in every executed onchain instruction:
-```solidity
-struct State {
-  bytes32 memRoot;
-  bytes32 preimageKey;
-  uint32 preimageOffset;
-  uint32 pc;
-  uint32 nextPC;
-  uint32 lo;
-  uint32 hi;
-  uint32 heap;
-  uint8 exitCode;
-  bool exited;
-  uint64 step;
-  uint32[32] registers;
-}
-```
+The Packed State is provided in every executed onchain instruction.
+See [Cannon VM Specs](../../specs/cannon-fault-proof-vm.md#state) for
+details on the state structure.
 
 The packed state is small! The `State` data can be packed in such a small amount of EVM words,
 that it is more efficient to fully provide it, than to create a proof for each individual part involved in execution.
 
-The memory is represented as a merkle-tree root, committing to a binary merkle tree of all memory data,
-see [memory proofs](#memory-proofs).
-
-The `State` covers all general purpose registers, as well as the `lo`, `hi` and `pc` values.
-
-`nextPC` helps pre-schedule the program counter change, to emulate delay-slot behavior of MIPS
-after branch and jump instructions.
-
 The program stops changing the state when `exited` is set to true. The exit-code is remembered,
 to determine if the program is successful, or panicked/exited in some unexpected way.
 This outcome can be used to determine truthiness of claims that are verified as part of the program execution.
 
-The `heap` value is a special value, used to emulate a growing heap, to map new memory upon `mmap` calls by the program.
-No memory reads/writes are actually illegal however, mmap-ing is purely to satisfy program runtimes that
-need the memory-pointer result of the syscall to locate free memory.
-
-The `preimageKey` and `preimageOffset` are backing the in-flight communication of [pre-image data](#pre-image-data).
-
-The VM `stateHash` is computed as `keccak256(encoded_packed_state)`,
-where `encoded_packed_state` is the concatenation of all state-values (all `uint` values are big-endian).
-
 
 ### Memory proofs
 
@@ -133,11 +102,7 @@ Pre-image data is accessed through syscalls exclusively.
 The OP-stack fault-proof [Pre-image Oracle specs](../../specs/fault-proof.md#pre-image-oracle)
 define the ABI for communicating pre-images.
 
-This ABI is implemented by the VM by intercepting the `read`/`write` syscalls to specific file descriptors:
-- `hint client read = 3`: used by the client to send hint data to the host. Optional, implemented as blocking.
-- `hint client write = 4`: used by the client to wait for the host. Always instant, since the above is implemented as blocking.
-- `preimage client read = 5`: used by the client to read pre-image data, starting from the latest pre-image reading offset.
-- `preimage client write = 6`: used by the client to change the pre-image key. The key may change a little bit at a time. The last 32 written bytes count as key for retrieval when reading the pre-image. Changing the key also resets the read offset to 0.
+This ABI is implemented by the VM by intercepting the `read`/`write` syscalls to specific file descriptors. See [Cannon VM Specs](../../specs/cannon-fault-proof-vm.md#io) for more details.
 
 The data is loaded into `PreimageOracle.sol` using the respective loading function based on the pre-image type.
 And then retrieved during execution of the `read` syscall.

codecov.yml

@@ -8,6 +8,7 @@ ignore:
   - "op-bindings/bindings/*.go"
   - "packages/contracts-bedrock/contracts/vendor/WETH9.sol"
   - "packages/contracts-bedrock/contracts/cannon"  # tested through Go tests
+  - 'packages/contracts-bedrock/contracts/EAS/**/*.sol'
 coverage:
   status:
     patch:
@@ -35,6 +36,5 @@ flag_management:
     - name: core-utils-tests
     - name: dtl-tests
     - name: chain-mon-tests
-    - name: fault-detector-tests
     - name: replica-healthcheck-tests
     - name: sdk-tests

docs/op-stack/src/docs/releases/bedrock/README.md

@@ -5,7 +5,7 @@ lang: en-US
 
 ## Overview
 
-The first release of the OP Stack codebase is called **Bedrock**. 
+The first release of the OP Stack codebase is called **Bedrock**.
 The Bedrock release primarily consists of the core software required to run L2 blockchains and was originally designed to power an upgrade to the Optimism Mainnet network.
 
 ## Resources
@@ -29,6 +29,6 @@ Dive deep into the specifications for the Bedrock release in the [specs folder o
 - [`op-batcher`](https://github.com/ethereum-optimism/optimism/tree/develop/op-batcher)
 - [`op-proposer`](https://github.com/ethereum-optimism/optimism/tree/develop/op-proposer)
 - [`contracts-bedrock`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts-bedrock)
-- [`fault-detector`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/fault-detector)
+- [`fault-mon`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/chain-mon/src/fault-mon)
 - [`sdk`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/sdk)
-- [`chain-mon`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/chain-mon)
+- [`chain-mon`](https://github.com/ethereum-optimism/optimism/tree/develop/packages/chain-mon)
\ No newline at end of file

endpoint-monitor/CHANGELOG.md

 # @eth-optimism/endpoint-monitor
 
+## 1.0.2
+
+### Patch Changes
+
+- [#6164](https://github.com/ethereum-optimism/optimism/pull/6164) [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a) Thanks [@pengin7384](https://github.com/pengin7384)! - fix typo
+
 ## 1.0.1
 
 ### Patch Changes

endpoint-monitor/package.json

 {
   "name": "@eth-optimism/endpoint-monitor",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "dependencies": {}
 }

op-bindings/artifacts.json

@@ -32,5 +32,7 @@
   "StandardBridge",
   "CrossDomainMessenger",
   "MIPS",
-  "PreimageOracle"
+  "PreimageOracle",
+  "EAS",
+  "SchemaRegistry"
 ]

op-bindings/bindings/erc20_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const ERC20StorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"node_modules/.pnpm/@openzeppelin+contracts@4.7.3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":1001,\"contract\":\"node_modules/.pnpm/@openzeppelin+contracts@4.7.3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":1002,\"contract\":\"node_modules/.pnpm/@openzeppelin+contracts@4.7.3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1003,\"contract\":\"node_modules/.pnpm/@openzeppelin+contracts@4.7.3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":1004,\"contract\":\"node_modules/.pnpm/@openzeppelin+contracts@4.7.3/node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
+const ERC20StorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":1001,\"contract\":\"node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":1002,\"contract\":\"node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1003,\"contract\":\"node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":1004,\"contract\":\"node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
 
 var ERC20StorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/preimageoracle.go

@@ -31,7 +31,7 @@ var (
 // PreimageOracleMetaData contains all meta data concerning the PreimageOracle contract.
 var PreimageOracleMetaData = &bind.MetaData{
 	ABI: "[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"partOffset\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"key\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"part\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"size\",\"type\":\"uint256\"}],\"name\":\"cheat\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_preimage\",\"type\":\"bytes\"}],\"name\":\"computePreimageKey\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"key_\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_partOffset\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_preimage\",\"type\":\"bytes\"}],\"name\":\"loadKeccak256PreimagePart\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"preimageLengths\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"preimagePartOk\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"preimageParts\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_key\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"_offset\",\"type\":\"uint256\"}],\"name\":\"readPreimage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"dat_\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"datLen_\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-	Bin: "0x608060405234801561001057600080fd5b506105e2806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c8063e03110e11161005b578063e03110e114610111578063e159261114610139578063fe4ac08e1461014e578063fef2b4ed146101c357600080fd5b806361238bde146100825780638542cf50146100c0578063a57c202c146100fe575b600080fd5b6100ad610090366004610433565b600160209081526000928352604080842090915290825290205481565b6040519081526020015b60405180910390f35b6100ee6100ce366004610433565b600260209081526000928352604080842090915290825290205460ff1681565b60405190151581526020016100b7565b6100ad61010c36600461049e565b6101e3565b61012461011f366004610433565b610242565b604080519283526020830191909152016100b7565b61014c6101473660046104e0565b610333565b005b61014c61015c36600461052c565b6000838152600260209081526040808320878452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558684528252808320968352958152858220939093559283529082905291902055565b6100ad6101d136600461055e565b60006020819052908152604090205481565b60243560c081901b608052600090608881858237207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0200000000000000000000000000000000000000000000000000000000000000179392505050565b6000828152600260209081526040808320848452909152812054819060ff166102cb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f7072652d696d616765206d757374206578697374000000000000000000000000604482015260640160405180910390fd5b50600083815260208181526040909120546102e78160086105a6565b6102f28560206105a6565b1061031057836103038260086105a6565b61030d91906105be565b91505b506000938452600160209081526040808620948652939052919092205492909150565b6044356000806008830186111561034957600080fd5b60c083901b6080526088838682378087017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80151908490207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f02000000000000000000000000000000000000000000000000000000000000001760008181526002602090815260408083208b8452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209a83529981528982209390935590815290819052959095209190915550505050565b6000806040838503121561044657600080fd5b50508035926020909101359150565b60008083601f84011261046757600080fd5b50813567ffffffffffffffff81111561047f57600080fd5b60208301915083602082850101111561049757600080fd5b9250929050565b600080602083850312156104b157600080fd5b823567ffffffffffffffff8111156104c857600080fd5b6104d485828601610455565b90969095509350505050565b6000806000604084860312156104f557600080fd5b83359250602084013567ffffffffffffffff81111561051357600080fd5b61051f86828701610455565b9497909650939450505050565b6000806000806080858703121561054257600080fd5b5050823594602084013594506040840135936060013592509050565b60006020828403121561057057600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082198211156105b9576105b9610577565b500190565b6000828210156105d0576105d0610577565b50039056fea164736f6c634300080f000a",
+	Bin: "0x608060405234801561001057600080fd5b506105df806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c8063e03110e11161005b578063e03110e114610111578063e159261114610139578063fe4ac08e1461014e578063fef2b4ed146101c357600080fd5b806361238bde146100825780638542cf50146100c0578063a57c202c146100fe575b600080fd5b6100ad610090366004610433565b600160209081526000928352604080842090915290825290205481565b6040519081526020015b60405180910390f35b6100ee6100ce366004610433565b600260209081526000928352604080842090915290825290205460ff1681565b60405190151581526020016100b7565b6100ad61010c36600461049e565b6101e3565b61012461011f366004610433565b610242565b604080519283526020830191909152016100b7565b61014c6101473660046104e0565b610333565b005b61014c61015c36600461052c565b6000838152600260209081526040808320878452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558684528252808320968352958152858220939093559283529082905291902055565b6100ad6101d136600461055e565b60006020819052908152604090205481565b60243560c081901b608052600090608881858237207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0200000000000000000000000000000000000000000000000000000000000000179392505050565b6000828152600260209081526040808320848452909152812054819060ff166102cb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f7072652d696d616765206d757374206578697374000000000000000000000000604482015260640160405180910390fd5b50600083815260208181526040909120546102e78160086105a6565b6102f28560206105a6565b1061031057836103038260086105a6565b61030d91906105bf565b91505b506000938452600160209081526040808620948652939052919092205492909150565b6044356000806008830186111561034957600080fd5b60c083901b6080526088838682378087017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80151908490207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f02000000000000000000000000000000000000000000000000000000000000001760008181526002602090815260408083208b8452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209a83529981528982209390935590815290819052959095209190915550505050565b6000806040838503121561044657600080fd5b50508035926020909101359150565b60008083601f84011261046757600080fd5b50813567ffffffffffffffff81111561047f57600080fd5b60208301915083602082850101111561049757600080fd5b9250929050565b600080602083850312156104b157600080fd5b823567ffffffffffffffff8111156104c857600080fd5b6104d485828601610455565b90969095509350505050565b6000806000604084860312156104f557600080fd5b83359250602084013567ffffffffffffffff81111561051357600080fd5b61051f86828701610455565b9497909650939450505050565b6000806000806080858703121561054257600080fd5b5050823594602084013594506040840135936060013592509050565b60006020828403121561057057600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b808201808211156105b9576105b9610577565b92915050565b818103818111156105b9576105b961057756fea164736f6c6343000813000a",
 }
 
 // PreimageOracleABI is the input ABI used to generate the binding from.

op-bindings/bindings/schemaregistry_more.go

+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package bindings
+
+import (
+	"encoding/json"
+
+	"github.com/ethereum-optimism/optimism/op-bindings/solc"
+)
+
+const SchemaRegistryStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":\"contracts/EAS/SchemaRegistry.sol:SchemaRegistry\",\"label\":\"_registry\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_bytes32,t_struct(SchemaRecord)1003_storage)\"},{\"astId\":1001,\"contract\":\"contracts/EAS/SchemaRegistry.sol:SchemaRegistry\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_array(t_uint256)49_storage\"}],\"types\":{\"t_array(t_uint256)49_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[49]\",\"numberOfBytes\":\"1568\",\"base\":\"t_uint256\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_contract(ISchemaResolver)1002\":{\"encoding\":\"inplace\",\"label\":\"contract ISchemaResolver\",\"numberOfBytes\":\"20\"},\"t_mapping(t_bytes32,t_struct(SchemaRecord)1003_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(bytes32 =\u003e struct SchemaRecord)\",\"numberOfBytes\":\"32\",\"key\":\"t_bytes32\",\"value\":\"t_struct(SchemaRecord)1003_storage\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_struct(SchemaRecord)1003_storage\":{\"encoding\":\"inplace\",\"label\":\"struct SchemaRecord\",\"numberOfBytes\":\"96\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
+
+var SchemaRegistryStorageLayout = new(solc.StorageLayout)
+
+var SchemaRegistryDeployedBin = "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806360d7a27814610064578063a2ea7c6e14610085575b600080fd5b61004e6100a5565b60405161005b9190610604565b60405180910390f35b61007761007236600461061e565b610148565b60405190815260200161005b565b6100986100933660046106d0565b6102f1565b60405161005b91906106e9565b60606100d07f0000000000000000000000000000000000000000000000000000000000000000610419565b6100f97f0000000000000000000000000000000000000000000000000000000000000000610419565b6101227f0000000000000000000000000000000000000000000000000000000000000000610419565b6040516020016101349392919061073a565b604051602081830303815290604052905090565b60008060405180608001604052806000801b81526020018573ffffffffffffffffffffffffffffffffffffffff168152602001841515815260200187878080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250939094525092935091506101ca905082610556565b60008181526020819052604090205490915015610213576040517f23369fa600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b80825260008181526020818152604091829020845181559084015160018201805493860151151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00000000000000000000000000000000000000000090941673ffffffffffffffffffffffffffffffffffffffff9092169190911792909217909155606083015183919060028201906102af9082610881565b50506040513381528291507f7d917fcbc9a29a9705ff9936ffa599500e4fd902e4486bae317414fe967b307c9060200160405180910390a29695505050505050565b604080516080810182526000808252602082018190529181019190915260608082015260008281526020818152604091829020825160808101845281548152600182015473ffffffffffffffffffffffffffffffffffffffff8116938201939093527401000000000000000000000000000000000000000090920460ff16151592820192909252600282018054919291606084019190610390906107df565b80601f01602080910402602001604051908101604052809291908181526020018280546103bc906107df565b80156104095780601f106103de57610100808354040283529160200191610409565b820191906000526020600020905b8154815290600101906020018083116103ec57829003601f168201915b5050505050815250509050919050565b60608160000361045c57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b81156104865780610470816109ca565b915061047f9050600a83610a31565b9150610460565b60008167ffffffffffffffff8111156104a1576104a16107b0565b6040519080825280601f01601f1916602001820160405280156104cb576020820181803683370190505b5090505b841561054e576104e0600183610a45565b91506104ed600a86610a5e565b6104f8906030610a72565b60f81b81838151811061050d5761050d610a85565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610547600a86610a31565b94506104cf565b949350505050565b600081606001518260200151836040015160405160200161057993929190610ab4565b604051602081830303815290604052805190602001209050919050565b60005b838110156105b1578181015183820152602001610599565b50506000910152565b600081518084526105d2816020860160208601610596565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061061760208301846105ba565b9392505050565b6000806000806060858703121561063457600080fd5b843567ffffffffffffffff8082111561064c57600080fd5b818701915087601f83011261066057600080fd5b81358181111561066f57600080fd5b88602082850101111561068157600080fd5b6020928301965094505085013573ffffffffffffffffffffffffffffffffffffffff811681146106b057600080fd5b9150604085013580151581146106c557600080fd5b939692955090935050565b6000602082840312156106e257600080fd5b5035919050565b602081528151602082015273ffffffffffffffffffffffffffffffffffffffff60208301511660408201526040820151151560608201526000606083015160808084015261054e60a08401826105ba565b6000845161074c818460208901610596565b80830190507f2e000000000000000000000000000000000000000000000000000000000000008082528551610788816001850160208a01610596565b600192019182015283516107a3816002840160208801610596565b0160020195945050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600181811c908216806107f357607f821691505b60208210810361082c577f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b50919050565b601f82111561087c57600081815260208120601f850160051c810160208610156108595750805b601f850160051c820191505b8181101561087857828155600101610865565b5050505b505050565b815167ffffffffffffffff81111561089b5761089b6107b0565b6108af816108a984546107df565b84610832565b602080601f83116001811461090257600084156108cc5750858301515b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600386901b1c1916600185901b178555610878565b6000858152602081207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08616915b8281101561094f57888601518255948401946001909101908401610930565b508582101561098b57878501517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600388901b60f8161c191681555b5050505050600190811b01905550565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036109fb576109fb61099b565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082610a4057610a40610a02565b500490565b81810381811115610a5857610a5861099b565b92915050565b600082610a6d57610a6d610a02565b500690565b80820180821115610a5857610a5861099b565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008451610ac6818460208901610596565b60609490941b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190930190815290151560f81b60148201526015019291505056fea164736f6c6343000813000a"
+
+func init() {
+	if err := json.Unmarshal([]byte(SchemaRegistryStorageLayoutJSON), SchemaRegistryStorageLayout); err != nil {
+		panic(err)
+	}
+
+	layouts["SchemaRegistry"] = SchemaRegistryStorageLayout
+	deployedBytecodes["SchemaRegistry"] = SchemaRegistryDeployedBin
+}

op-bindings/gen/main.go

@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"text/template"
 
@@ -84,17 +85,22 @@ func main() {
 	// and hold a mapping from the contract name to the contract path.
 	// Walk walks the directory deterministically, so the later instance
 	// of the contract with the same name will be used
+	re := regexp.MustCompile(`\.\d+\.\d+\.\d+`)
 	artifactPaths := make(map[string]string)
 	if err := filepath.Walk(f.ForgeArtifacts,
 		func(path string, info os.FileInfo, err error) error {
 			if err != nil {
 				return err
 			}
-			base := filepath.Base(path)
-			if strings.HasSuffix(base, ".json") {
-				name := base[:len(base)-5]
-				if _, ok := artifactPaths[name]; !ok {
-					artifactPaths[name] = path
+
+			if strings.HasSuffix(path, ".json") {
+				base := filepath.Base(path)
+				name := strings.TrimSuffix(base, ".json")
+
+				// remove the compiler version from the name
+				sanitized := re.ReplaceAllString(name, "")
+				if _, ok := artifactPaths[sanitized]; !ok {
+					artifactPaths[sanitized] = path
 				}
 			}
 			return nil
@@ -108,6 +114,7 @@ func main() {
 		artifactPath := path.Join(f.ForgeArtifacts, name+".sol", name+".json")
 		forgeArtifactData, err := os.ReadFile(artifactPath)
 		if errors.Is(err, os.ErrNotExist) {
+			log.Printf("cannot find forge-artifact for %s at standard path %s, trying %s\n", name, artifactPath, artifactPaths[name])
 			artifactPath = artifactPaths[name]
 			forgeArtifactData, err = os.ReadFile(artifactPath)
 			if errors.Is(err, os.ErrNotExist) {

op-bindings/predeploys/addresses.go

@@ -23,6 +23,8 @@ const (
 	ProxyAdmin                    = "0x4200000000000000000000000000000000000018"
 	BaseFeeVault                  = "0x4200000000000000000000000000000000000019"
 	L1FeeVault                    = "0x420000000000000000000000000000000000001a"
+	SchemaRegistry                = "0x4200000000000000000000000000000000000020"
+	EAS                           = "0x4200000000000000000000000000000000000021"
 )
 
 var (
@@ -43,6 +45,8 @@ var (
 	ProxyAdminAddr                    = common.HexToAddress(ProxyAdmin)
 	BaseFeeVaultAddr                  = common.HexToAddress(BaseFeeVault)
 	L1FeeVaultAddr                    = common.HexToAddress(L1FeeVault)
+	SchemaRegistryAddr                = common.HexToAddress(SchemaRegistry)
+	EASAddr                           = common.HexToAddress(EAS)
 
 	Predeploys = make(map[string]*common.Address)
 )
@@ -76,4 +80,6 @@ func init() {
 	Predeploys["ProxyAdmin"] = &ProxyAdminAddr
 	Predeploys["BaseFeeVault"] = &BaseFeeVaultAddr
 	Predeploys["L1FeeVault"] = &L1FeeVaultAddr
+	Predeploys["SchemaRegistry"] = &SchemaRegistryAddr
+	Predeploys["EAS"] = &EASAddr
 }

op-chain-ops/cmd/check-l2/main.go

@@ -225,6 +225,16 @@ func checkPredeployConfig(client *ethclient.Client, name string) error {
 			if err := checkL2ToL1MessagePasser(p, client); err != nil {
 				return err
 			}
+
+		case predeploys.SchemaRegistryAddr:
+			if err := checkSchemaRegistry(p, client); err != nil {
+				return err
+			}
+
+		case predeploys.EASAddr:
+			if err := checkEAS(p, client); err != nil {
+				return err
+			}
 		}
 		return nil
 	})
@@ -712,6 +722,43 @@ func checkDeployerWhitelist(addr common.Address, client *ethclient.Client) error
 	return nil
 }
 
+func checkSchemaRegistry(addr common.Address, client *ethclient.Client) error {
+	contract, err := bindings.NewSchemaRegistry(addr, client)
+	if err != nil {
+		return err
+	}
+
+	version, err := contract.Version(&bind.CallOpts{})
+	if err != nil {
+		return err
+	}
+	log.Info("SchemaRegistry version", "version", version)
+	return nil
+}
+
+func checkEAS(addr common.Address, client *ethclient.Client) error {
+	contract, err := bindings.NewEAS(addr, client)
+	if err != nil {
+		return err
+	}
+
+	registry, err := contract.GetSchemaRegistry(&bind.CallOpts{})
+	if err != nil {
+		return err
+	}
+	if registry != predeploys.SchemaRegistryAddr {
+		return fmt.Errorf("Incorrect registry address %s", registry)
+	}
+	log.Info("EAS", "registry", registry)
+
+	version, err := contract.Version(&bind.CallOpts{})
+	if err != nil {
+		return err
+	}
+	log.Info("EAS version", "version", version)
+	return nil
+}
+
 func getEIP1967AdminAddress(client *ethclient.Client, addr common.Address) (common.Address, error) {
 	slot, err := client.StorageAt(context.Background(), addr, util.EIP1967AdminSlot, nil)
 	if err != nil {

op-chain-ops/genesis/layer_two.go

@@ -61,6 +61,7 @@ func BuildL2Genesis(config *DeployConfig, l1StartBlock *types.Block) (*core.Gene
 			}
 			db.CreateAccount(codeAddr)
 			db.SetState(addr, ImplementationSlot, codeAddr.Hash())
+			log.Info("Set proxy", "name", name, "address", addr, "implementation", codeAddr)
 		} else {
 			db.DeleteState(addr, AdminSlot)
 		}

op-chain-ops/genesis/layer_two_test.go

@@ -81,7 +81,7 @@ func TestBuildL2DeveloperGenesis(t *testing.T) {
 	err = config.InitDeveloperDeployedAddresses()
 	require.NoError(t, err)
 	gen := testBuildL2Genesis(t, config)
-	require.Equal(t, 2342, len(gen.Alloc))
+	require.Equal(t, 2344, len(gen.Alloc))
 }
 
 func TestBuildL2MainnetGenesis(t *testing.T) {
@@ -90,7 +90,7 @@ func TestBuildL2MainnetGenesis(t *testing.T) {
 	config.EnableGovernance = true
 	config.FundDevAccounts = false
 	gen := testBuildL2Genesis(t, config)
-	require.Equal(t, 2064, len(gen.Alloc))
+	require.Equal(t, 2066, len(gen.Alloc))
 }
 
 func TestBuildL2MainnetNoGovernanceGenesis(t *testing.T) {
@@ -99,5 +99,5 @@ func TestBuildL2MainnetNoGovernanceGenesis(t *testing.T) {
 	config.EnableGovernance = false
 	config.FundDevAccounts = false
 	gen := testBuildL2Genesis(t, config)
-	require.Equal(t, 2064, len(gen.Alloc))
+	require.Equal(t, 2066, len(gen.Alloc))
 }

op-chain-ops/immutables/immutables.go

@@ -144,6 +144,12 @@ func BuildOptimism(immutable ImmutableConfig) (DeploymentResults, error) {
 		{
 			Name: "LegacyERC20ETH",
 		},
+		{
+			Name: "EAS",
+		},
+		{
+			Name: "SchemaRegistry",
+		},
 	}
 	return BuildL2(deployments)
 }
@@ -239,6 +245,10 @@ func l2Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
 		_, tx, _, err = bindings.DeployOptimismMintableERC721Factory(opts, backend, bridge, remoteChainId)
 	case "LegacyERC20ETH":
 		_, tx, _, err = bindings.DeployLegacyERC20ETH(opts, backend)
+	case "EAS":
+		_, tx, _, err = bindings.DeployEAS(opts, backend)
+	case "SchemaRegistry":
+		_, tx, _, err = bindings.DeploySchemaRegistry(opts, backend)
 	default:
 		return tx, fmt.Errorf("unknown contract: %s", deployment.Name)
 	}

op-chain-ops/immutables/immutables_test.go

@@ -63,6 +63,8 @@ func TestBuildOptimism(t *testing.T) {
 		"L2ERC721Bridge":                true,
 		"OptimismMintableERC721Factory": true,
 		"LegacyERC20ETH":                true,
+		"EAS":                           true,
+		"SchemaRegistry":                true,
 	}
 
 	// Only the exact contracts that we care about are being

op-challenger/challenger.go

@@ -49,10 +49,15 @@ func Main(ctx context.Context, logger log.Logger, cfg *config.Config) error {
 
 	for {
 		logger.Info("Performing action")
-		_ = agent.Act()
-		caller.LogGameInfo()
+		_ = agent.Act(ctx)
+		status, _ := caller.GetGameStatus(ctx)
+		if status != 0 {
+			caller.LogGameStatus()
+			return nil
+		} else {
+			caller.LogGameInfo()
+		}
 		select {
-		// nosemgrep: dgryski.semgrep-go.timeafter.leaky-time-after
 		case <-time.After(300 * time.Millisecond):
 		// Continue
 		case <-ctx.Done():

op-challenger/fault/agent.go

@@ -29,8 +29,11 @@ func NewAgent(loader Loader, maxDepth int, trace TraceProvider, responder Respon
 }
 
 // Act iterates the game & performs all of the next actions.
-func (a *Agent) Act() error {
-	game, err := a.newGameFromContracts(context.Background())
+func (a *Agent) Act(ctx context.Context) error {
+	if a.tryResolve(ctx) {
+		return nil
+	}
+	game, err := a.newGameFromContracts(ctx)
 	if err != nil {
 		a.log.Error("Failed to create new game", "err", err)
 		return err
@@ -50,6 +53,19 @@ func (a *Agent) Act() error {
 	return nil
 }
 
+// tryResolve resolves the game if it is in a terminal state
+// and returns true if the game resolves successfully.
+func (a *Agent) tryResolve(ctx context.Context) bool {
+	if a.responder.CanResolve(ctx) {
+		err := a.responder.Resolve(ctx)
+		if err != nil {
+			return true
+		}
+		a.log.Error("failed to resolve the game", "err", err)
+	}
+	return false
+}
+
 // newGameFromContracts initializes a new game state from the state in the contract
 func (a *Agent) newGameFromContracts(ctx context.Context) (Game, error) {
 	claims, err := a.loader.FetchClaims(ctx)

op-challenger/fault/responder.go

@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -77,6 +78,20 @@ func (r *faultResponder) BuildTx(ctx context.Context, response Claim) ([]byte, e
 	}
 }
 
+// CanResolve determines if the resolve function on the fault dispute game contract
+// would succeed. Returns true if the game can be resolved, otherwise false.
+func (r *faultResponder) CanResolve(ctx context.Context) bool {
+	txData, err := r.buildResolveData()
+	if err != nil {
+		return false
+	}
+	_, err = r.txMgr.Call(ctx, ethereum.CallMsg{
+		To:   &r.fdgAddr,
+		Data: txData,
+	}, nil)
+	return err == nil
+}
+
 // Resolve executes a resolve transaction to resolve a fault dispute game.
 func (r *faultResponder) Resolve(ctx context.Context) error {
 	txData, err := r.buildResolveData()

op-challenger/fault/responder_test.go

@@ -26,6 +26,7 @@ var (
 type mockTxManager struct {
 	from      common.Address
 	sends     int
+	calls     int
 	sendFails bool
 }
 
@@ -42,7 +43,11 @@ func (m *mockTxManager) Send(ctx context.Context, candidate txmgr.TxCandidate) (
 }
 
 func (m *mockTxManager) Call(_ context.Context, _ ethereum.CallMsg, _ *big.Int) ([]byte, error) {
-	panic("unimplemented")
+	if m.sendFails {
+		return nil, mockSendError
+	}
+	m.calls++
+	return []byte{}, nil
 }
 
 func (m *mockTxManager) BlockNumber(ctx context.Context) (uint64, error) {
@@ -62,6 +67,24 @@ func newTestFaultResponder(t *testing.T, sendFails bool) (*faultResponder, *mock
 	return responder, mockTxMgr
 }
 
+// TestResponder_CanResolve_CallFails tests the [Responder.CanResolve] method
+// bubbles up the error returned by the [txmgr.Call] method.
+func TestResponder_CanResolve_CallFails(t *testing.T) {
+	responder, mockTxMgr := newTestFaultResponder(t, true)
+	resolved := responder.CanResolve(context.Background())
+	require.False(t, resolved)
+	require.Equal(t, 0, mockTxMgr.sends)
+}
+
+// TestResponder_CanResolve_Success tests the [Responder.CanResolve] method
+// succeeds when the call message is successfully sent through the txmgr.
+func TestResponder_CanResolve_Success(t *testing.T) {
+	responder, mockTxMgr := newTestFaultResponder(t, false)
+	resolved := responder.CanResolve(context.Background())
+	require.True(t, resolved)
+	require.Equal(t, 1, mockTxMgr.calls)
+}
+
 // TestResponder_Resolve_SendFails tests the [Responder.Resolve] method
 // bubbles up the error returned by the [txmgr.Send] method.
 func TestResponder_Resolve_SendFails(t *testing.T) {

op-challenger/fault/types.go

@@ -76,6 +76,8 @@ func (c *Claim) DefendsParent() bool {
 // Responder takes a response action & executes.
 // For full op-challenger this means executing the transaction on chain.
 type Responder interface {
+	CanResolve(ctx context.Context) bool
+	Resolve(ctx context.Context) error
 	Respond(ctx context.Context, response Claim) error
 	Step(ctx context.Context, stepData StepCallData) error
 }

ops/docker/Dockerfile.packages

@@ -75,11 +75,6 @@ COPY ./packages ./packages
 
 RUN pnpm build
 
-FROM base as fault-detector
-WORKDIR /opt/optimism/packages/fault-detector
-COPY ./ops/scripts/detector.sh .
-CMD ["pnpm", "run", "start"]
-
 FROM base as replica-healthcheck
 WORKDIR /opt/optimism/packages/replica-healthcheck
 ENTRYPOINT ["pnpm", "run", "start"]
@@ -92,7 +87,6 @@ FROM base as drippie-mon
 WORKDIR /opt/optimism/packages/chain-mon
 ENTRYPOINT ["pnpm", "run", "start:drippie-mon"]
 
-
 FROM base as wd-mon
 WORKDIR /opt/optimism/packages/chain-mon
 ENTRYPOINT ["pnpm", "run", "start:wd-mon"]
@@ -100,3 +94,7 @@ ENTRYPOINT ["pnpm", "run", "start:wd-mon"]
 FROM base as wallet-mon
 WORKDIR /opt/optimism/packages/chain-mon
 ENTRYPOINT ["pnpm", "run", "start:wallet-mon"]
+
+from base as fault-mon
+WORKDIR /opt/optimism/packages/chain-mon
+ENTRYPOINT ["pnpm", "run", "start:fault-mon"]

ops/scripts/ci-docker-tag-op-stack-release.sh

@@ -6,7 +6,7 @@ DOCKER_REPO=$1
 GIT_TAG=$2
 GIT_SHA=$3
 
-IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder|fault-detector|proxyd|indexer|op-[a-z0-9\-]*)' || true)
+IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder|proxyd|indexer|op-[a-z0-9\-]*)' || true)
 if [ -z "$IMAGE_NAME" ]; then
   echo "image name could not be parsed from git tag '$GIT_TAG'"
   exit 1

ops/scripts/detector.sh

-#!/bin/bash
-
-set -e
-
-RETRIES=${RETRIES:-60}
-
-# waits for l2geth to be up
-curl \
-    --fail \
-    --show-error \
-    --silent \
-    --output /dev/null \
-    --retry-connrefused \
-    --retry $RETRIES \
-    --retry-delay 1 \
-    $FAULT_DETECTOR__L2_RPC_PROVIDER
-
-# go
-exec pnpm start

ops/tag-service/tag-service.py

@@ -15,7 +15,6 @@ MIN_VERSIONS = {
     'op-proposer': '0.10.14',
     'proxyd': '3.16.0',
     'indexer': '0.5.0',
-    'fault-detector': '0.6.3',
     'ci-builder': '0.6.0'
 }
 

packages/chain-mon/.env.example

@@ -39,3 +39,31 @@ TWO_STEP_MONITOR__L2_RPC_PROVIDER=
 
 # The block number to start monitoring from
 TWO_STEP_MONITOR__START_BLOCK_NUMBER=
+
+###############################################################################
+#                               ↓  fault-mon  ↓                               #
+###############################################################################
+
+#  --l1rpcprovider                Provider for interacting with L1 (env: FAULT_DETECTOR__L1_RPC_PROVIDER)
+FAULT_DETECTOR__L1_RPC_PROVIDER=
+#  --l2rpcprovider                Provider for interacting with L2 (env: FAULT_DETECTOR__L2_RPC_PROVIDER)
+FAULT_DETECTOR__L2_RPC_PROVIDER=
+#  --bedrock                      Whether or not the service is running against a Bedrock chain (env: FAULT_DETECTOR__BEDROCK)
+BEDROCK=true
+
+# Optional Params
+
+#  --startbatchindex              Batch index to start checking from. For bedrock chains, this is the L2 height to start from (env: FAULT_DETECTOR__START_BATCH_INDEX)
+# FAULT_DETECTOR__START_BATCH_INDEX=
+#  --optimismportaladdress        [Custom Bedrock Chains] Deployed OptimismPortal contract address. Used to retrieve necessary info for ouput verification  (env: FAULT_DETECTOR__OPTIMISM_PORTAL_ADDRESS)
+# FAULT_DETECTOR__OPTIMISM_PORTAL_ADDRESS=
+#  --statecommitmentchainaddress  [Custom Legacy Chains] Deployed StateCommitmentChain contract address. Used to fetch necessary info for output verification. (env: FAULT_DETECTOR__STATE_COMMITMENT_CHAIN_ADDRESS)
+# FAULT_DETECTOR__STATE_COMMITMENT_CHAIN_ADDRESS=
+#  --loopintervalms               Loop interval in milliseconds, only applies if service is set to loop (env: FAULT_DETECTOR__LOOP_INTERVAL_MS)
+# FAULT_DETECTOR__LOOP_INTERVAL_MS=
+#  --port                         Port for the app server (env: FAULT_DETECTOR__PORT)
+# FAULT_DETECTOR__PORT=
+#  --hostname                     Hostname for the app server (env: FAULT_DETECTOR__HOSTNAME)
+# FAULT_DETECTOR__HOSTNAME=
+#  --loglevel                     Log level (env: FAULT_DETECTOR__LOG_LEVEL)
+# FAULT_DETECTOR__LOG_LEVEL=

packages/chain-mon/CHANGELOG.md

 # @eth-optimism/drippie-mon
 
+## 0.4.1
+
+### Patch Changes
+
+- [#6206](https://github.com/ethereum-optimism/optimism/pull/6206) [`3969730dc`](https://github.com/ethereum-optimism/optimism/commit/3969730dc938947a7105c27989e53d4b5cf788a9) Thanks [@tynes](https://github.com/tynes)! - Update import path for artifact
+
+- Updated dependencies [[`a666c4f20`](https://github.com/ethereum-optimism/optimism/commit/a666c4f2082253abbb68c0678e5a0a1ed0c00f4b), [`ff577455f`](https://github.com/ethereum-optimism/optimism/commit/ff577455f196b5f5b8a889339b845561ca6c538a), [`89ca741a6`](https://github.com/ethereum-optimism/optimism/commit/89ca741a63c5e07f9d691bb6f7a89f7718fc49ca), [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a), [`72d184854`](https://github.com/ethereum-optimism/optimism/commit/72d184854ebad8b2025641f126ed76573b1f0ac3), [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876), [`3f13fd0bb`](https://github.com/ethereum-optimism/optimism/commit/3f13fd0bbea051a4550f1df6def1a53a616aa6f6), [`639163253`](https://github.com/ethereum-optimism/optimism/commit/639163253a5e2128f1c21c446b68d358d38cbd30)]:
+  - @eth-optimism/sdk@3.1.0
+  - @eth-optimism/contracts-bedrock@0.16.0
+  - @eth-optimism/core-utils@0.12.2
+  - @eth-optimism/common-ts@0.8.3
+
 ## 0.4.0
 
 ### Minor Changes

packages/chain-mon/package.json

 {
   "private": true,
   "name": "@eth-optimism/chain-mon",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "[Optimism] Chain monitoring services",
   "main": "dist/index",
   "types": "dist/index",
@@ -13,7 +13,9 @@
     "start:wallet-mon": "ts-node ./src/wallet-mon/service.ts",
     "start:drippie-mon": "ts-node ./src/drippie-mon/service.ts",
     "start:wd-mon": "ts-node ./src/wd-mon/service.ts",
-    "test:coverage": "echo 'No tests defined.'",
+    "start:fault-mon": "ts-node ./src/fault-mon/service.ts",
+    "test": "hardhat test",
+    "test:coverage": "nyc hardhat test && nyc merge .nyc_output coverage.json",
     "build": "tsc -p ./tsconfig.json",
     "clean": "rimraf  dist/ ./tsconfig.tsbuildinfo",
     "lint": "pnpm lint:fix && pnpm lint:check",
@@ -34,18 +36,22 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "dependencies": {
-    "@eth-optimism/common-ts": "0.8.2",
+    "@eth-optimism/common-ts": "0.8.3",
     "@eth-optimism/contracts-periphery": "1.0.8",
-    "@eth-optimism/contracts-bedrock": "0.15.0",
-    "@eth-optimism/core-utils": "0.12.1",
-    "@eth-optimism/sdk": "3.0.0",
+    "@eth-optimism/contracts-bedrock": "0.16.0",
+    "@eth-optimism/core-utils": "0.12.2",
+    "@eth-optimism/sdk": "3.1.0",
     "ethers": "^5.7.0",
+    "dotenv": "^16.1.4",
     "@types/dateformat": "^5.0.0",
     "chai-as-promised": "^7.1.1",
     "dateformat": "^4.5.1"
   },
   "devDependencies": {
     "@ethersproject/abstract-provider": "^5.7.0",
+    "@nomiclabs/hardhat-ethers": "^2.0.6",
+    "@nomiclabs/hardhat-waffle": "^2.0.3",
+    "hardhat": "^2.9.6",
     "ts-node": "^10.9.1"
   }
 }

packages/fault-detector/README.md → packages/chain-mon/src/fault-mon/README.md

-# @eth-optimism/fault-detector
+# @eth-optimism/fault-mon
 
 [![codecov](https://codecov.io/gh/ethereum-optimism/optimism/branch/develop/graph/badge.svg?token=0VTG7PG7YR&flag=fault-detector-tests)](https://codecov.io/gh/ethereum-optimism/optimism)
 
-The `fault-detector` is a simple service for detecting discrepancies between your local view of the Optimism network and the L2 output proposals published to Ethereum.
+The `fault-mon` is a simple service for detecting discrepancies between your local view of the Optimism network and the L2 output proposals published to Ethereum.
 
 ## Installation
 
@@ -34,7 +34,7 @@ pnpm start
 
 ## What this service does
 
-The `fault-detector` detects differences between the transaction results generated by your local Optimism node and the transaction results actually published to Ethereum.
+The `fault-mon` detects differences between the transaction results generated by your local Optimism node and the transaction results actually published to Ethereum.
 Currently, transaction results take the form of [the root of the Optimism state trie](https://medium.com/@eiki1212/ethereum-state-trie-architecture-explained-a30237009d4e).
 
 The state root of the block is published to the [`L2OutputOracle`](https://github.com/ethereum-optimism/optimism/blob/39b7262cc3ffd78cd314341b8512b2683c1d9af7/packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol) contract on Ethereum.

packages/fault-detector/src/service.ts → packages/chain-mon/src/fault-mon/service.ts

@@ -24,7 +24,7 @@ import { Provider } from '@ethersproject/abstract-provider'
 import { Contract, ethers } from 'ethers'
 import dateformat from 'dateformat'
 
-import { version } from '../package.json'
+import { version } from '../../package.json'
 import {
   findFirstUnfinalizedStateBatchIndex,
   findOutputForIndex,

packages/chain-mon/src/index.ts

@@ -2,3 +2,4 @@ export * from './balance-mon/service'
 export * from './drippie-mon/service'
 export * from './wd-mon/service'
 export * from './wallet-mon/service'
+export * from './fault-mon/index'

packages/fault-detector/test/helpers.spec.ts → packages/chain-mon/test/fault-mon/helpers.spec.ts

@@ -6,7 +6,10 @@ import Artifact__L2OutputOracle from '@eth-optimism/contracts-bedrock/forge-arti
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers'
 
 import { expect } from './setup'
-import { findOutputForIndex, findFirstUnfinalizedStateBatchIndex } from '../src'
+import {
+  findOutputForIndex,
+  findFirstUnfinalizedStateBatchIndex,
+} from '../../src/fault-mon'
 
 describe('helpers', () => {
   const deployConfig = {

packages/common-ts/CHANGELOG.md

 # @eth-optimism/common-ts
 
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies [[`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a), [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876)]:
+  - @eth-optimism/core-utils@0.12.2
+
 ## 0.8.2
 
 ### Patch Changes

packages/common-ts/package.json

 {
   "name": "@eth-optimism/common-ts",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "[Optimism] Advanced typescript tooling used by various services",
   "main": "dist/index",
   "types": "dist/index",
@@ -33,7 +33,7 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "dependencies": {
-    "@eth-optimism/core-utils": "0.12.1",
+    "@eth-optimism/core-utils": "0.12.2",
     "@sentry/node": "^6.3.1",
     "bcfg": "^0.1.7",
     "body-parser": "^1.20.0",

packages/contracts-bedrock/.gas-snapshot

@@ -433,9 +433,9 @@ OptimistTest:test_supportsInterface_returnsCorrectInterfaceForERC721_succeeds()
 OptimistTest:test_tokenIdOfAddress_returnsOwnerID_succeeds() (gas: 63730)
 OptimistTest:test_tokenURI_returnsCorrectTokenURI_succeeds() (gas: 195908)
 OptimistTest:test_transferFrom_soulbound_reverts() (gas: 75512)
-PreimageOracle_Test:test_computePreimageKey_succeeds() (gas: 6267)
-PreimageOracle_Test:test_loadKeccak256PreimagePart_outOfBoundsOffset_reverts() (gas: 9025)
-PreimageOracle_Test:test_loadKeccak256PreimagePart_succeeds() (gas: 77552)
+PreimageOracle_Test:test_computePreimageKey_succeeds() (gas: 6242)
+PreimageOracle_Test:test_loadKeccak256PreimagePart_outOfBoundsOffset_reverts() (gas: 9005)
+PreimageOracle_Test:test_loadKeccak256PreimagePart_succeeds() (gas: 77502)
 ProxyAdmin_Test:test_chugsplashChangeProxyAdmin_succeeds() (gas: 35586)
 ProxyAdmin_Test:test_chugsplashGetProxyAdmin_succeeds() (gas: 15675)
 ProxyAdmin_Test:test_chugsplashGetProxyImplementation_succeeds() (gas: 51084)

packages/contracts-bedrock/CHANGELOG.md

 # @eth-optimism/contracts-bedrock
 
+## 0.16.0
+
+### Minor Changes
+
+- [#6206](https://github.com/ethereum-optimism/optimism/pull/6206) [`72d184854`](https://github.com/ethereum-optimism/optimism/commit/72d184854ebad8b2025641f126ed76573b1f0ac3) Thanks [@tynes](https://github.com/tynes)! - Migrate contracts periphery into bedrock
+
+### Patch Changes
+
+- [#6164](https://github.com/ethereum-optimism/optimism/pull/6164) [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a) Thanks [@pengin7384](https://github.com/pengin7384)! - fix typo
+
+- [#6198](https://github.com/ethereum-optimism/optimism/pull/6198) [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876) Thanks [@tremarkley](https://github.com/tremarkley)! - Delete dead typescript https://github.com/ethereum-optimism/optimism/pull/6148.
+
 ## 0.15.0
 
 ### Minor Changes

packages/contracts-bedrock/contracts/EAS/Common.sol

+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+// A representation of an empty/uninitialized UID.
+bytes32 constant EMPTY_UID = 0;
+
+// A zero expiration represents an non-expiring attestation.
+uint64 constant NO_EXPIRATION_TIME = 0;
+
+error AccessDenied();
+error InvalidEAS();
+error InvalidLength();
+error InvalidSignature();
+error NotFound();
+
+/**
+ * @dev A struct representing EIP712 signature data.
+ */
+struct EIP712Signature {
+    uint8 v; // The recovery ID.
+    bytes32 r; // The x-coordinate of the nonce R.
+    bytes32 s; // The signature data.
+}
+
+/**
+ * @dev A struct representing a single attestation.
+ */
+struct Attestation {
+    bytes32 uid; // A unique identifier of the attestation.
+    bytes32 schema; // The unique identifier of the schema.
+    uint64 time; // The time when the attestation was created (Unix timestamp).
+    uint64 expirationTime; // The time when the attestation expires (Unix timestamp).
+    uint64 revocationTime; // The time when the attestation was revoked (Unix timestamp).
+    bytes32 refUID; // The UID of the related attestation.
+    address recipient; // The recipient of the attestation.
+    address attester; // The attester/sender of the attestation.
+    bool revocable; // Whether the attestation is revocable.
+    bytes data; // Custom attestation data.
+}
+
+// Maximum upgrade forward-compatibility storage gap.
+uint32 constant MAX_GAP = 50;
+
+/**
+ * @dev A helper function to work with unchecked iterators in loops.
+ *
+ * @param i The index to increment.
+ *
+ * @return j The incremented index.
+ */
+function uncheckedInc(uint256 i) pure returns (uint256 j) {
+    unchecked {
+        j = i + 1;
+    }
+}
+
+/**
+ * @dev A helper function that converts a string to a bytes32.
+ *
+ * @param str The string to convert.
+ *
+ * @return The converted bytes32.
+ */
+function stringToBytes32(string memory str) pure returns (bytes32) {
+    bytes32 result;
+
+    assembly {
+        result := mload(add(str, 32))
+    }
+
+    return result;
+}
+
+/**
+ * @dev A helper function that converts a bytes32 to a string.
+ *
+ * @param data The bytes32 data to convert.
+ *
+ * @return The converted string.
+ */
+function bytes32ToString(bytes32 data) pure returns (string memory) {
+    bytes memory byteArray = new bytes(32);
+
+    uint256 length = 0;
+    for (uint256 i = 0; i < 32; i = uncheckedInc(i)) {
+        bytes1 char = data[i];
+        if (char == 0x00) {
+            break;
+        }
+
+        byteArray[length] = char;
+        length = uncheckedInc(length);
+    }
+
+    bytes memory terminatedBytes = new bytes(length);
+    for (uint256 j = 0; j < length; j = uncheckedInc(j)) {
+        terminatedBytes[j] = byteArray[j];
+    }
+
+    return string(terminatedBytes);
+}

packages/contracts-bedrock/contracts/EAS/ISchemaRegistry.sol

+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
+
+/**
+ * @title A struct representing a record for a submitted schema.
+ */
+struct SchemaRecord {
+    bytes32 uid; // The unique identifier of the schema.
+    ISchemaResolver resolver; // Optional schema resolver.
+    bool revocable; // Whether the schema allows revocations explicitly.
+    string schema; // Custom specification of the schema (e.g., an ABI).
+}
+
+/// @title ISchemaRegistry
+/// @notice The interface of global attestation schemas for the Ethereum Attestation Service protocol.
+interface ISchemaRegistry {
+    /**
+     * @dev Emitted when a new schema has been registered
+     *
+     * @param uid The schema UID.
+     * @param registerer The address of the account used to register the schema.
+     */
+    event Registered(bytes32 indexed uid, address registerer);
+
+    /**
+     * @dev Submits and reserves a new schema
+     *
+     * @param schema The schema data schema.
+     * @param resolver An optional schema resolver.
+     * @param revocable Whether the schema allows revocations explicitly.
+     *
+     * @return The UID of the new schema.
+     */
+    function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32);
+
+    /**
+     * @dev Returns an existing schema by UID
+     *
+     * @param uid The UID of the schema to retrieve.
+     *
+     * @return The schema data members.
+     */
+    function getSchema(bytes32 uid) external view returns (SchemaRecord memory);
+}

packages/contracts-bedrock/contracts/EAS/SchemaRegistry.sol

+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.19;
+
+import { Semver } from "../universal/Semver.sol";
+
+import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
+
+import { EMPTY_UID, MAX_GAP } from "./Common.sol";
+import { ISchemaRegistry, SchemaRecord } from "./ISchemaRegistry.sol";
+
+/// @custom:proxied
+/// @custom:predeploy 0x4200000000000000000000000000000000000020
+/// @title SchemaRegistry
+/// @notice The global attestation schemas for the Ethereum Attestation Service protocol.
+contract SchemaRegistry is ISchemaRegistry, Semver {
+    error AlreadyExists();
+
+    // The global mapping between schema records and their IDs.
+    mapping(bytes32 uid => SchemaRecord schemaRecord) private _registry;
+
+    // Upgrade forward-compatibility storage gap
+    uint256[MAX_GAP - 1] private __gap;
+
+    /**
+     * @dev Creates a new SchemaRegistry instance.
+     */
+    constructor() Semver(1, 0, 0) {}
+
+    /**
+     * @inheritdoc ISchemaRegistry
+     */
+    function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
+        SchemaRecord memory schemaRecord = SchemaRecord({
+            uid: EMPTY_UID,
+            schema: schema,
+            resolver: resolver,
+            revocable: revocable
+        });
+
+        bytes32 uid = _getUID(schemaRecord);
+        if (_registry[uid].uid != EMPTY_UID) {
+            revert AlreadyExists();
+        }
+
+        schemaRecord.uid = uid;
+        _registry[uid] = schemaRecord;
+
+        emit Registered(uid, msg.sender);
+
+        return uid;
+    }
+
+    /**
+     * @inheritdoc ISchemaRegistry
+     */
+    function getSchema(bytes32 uid) external view returns (SchemaRecord memory) {
+        return _registry[uid];
+    }
+
+    /**
+     * @dev Calculates a UID for a given schema.
+     *
+     * @param schemaRecord The input schema.
+     *
+     * @return schema UID.
+     */
+    function _getUID(SchemaRecord memory schemaRecord) private pure returns (bytes32) {
+        return keccak256(abi.encodePacked(schemaRecord.schema, schemaRecord.resolver, schemaRecord.revocable));
+    }
+}

packages/contracts-bedrock/contracts/EAS/eip712/EIP712Verifier.sol

+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
+import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+// prettier-ignore
+import {
+    AttestationRequest,
+    AttestationRequestData,
+    DelegatedAttestationRequest,
+    DelegatedRevocationRequest,
+    RevocationRequest,
+    RevocationRequestData
+} from "../IEAS.sol";
+
+import { EIP712Signature, InvalidSignature, MAX_GAP, stringToBytes32, bytes32ToString } from "../Common.sol";
+
+/// @title EIP712
+/// @notice The EIP712 typed signatures verifier for EAS delegated attestations.
+abstract contract EIP712Verifier is EIP712 {
+    // The hash of the data type used to relay calls to the attest function. It's the value of
+    // keccak256("Attest(bytes32 schema,address recipient,uint64 expirationTime,bool revocable,bytes32 refUID,bytes data,uint256 nonce)").
+    bytes32 private constant ATTEST_TYPEHASH = 0xdbfdf8dc2b135c26253e00d5b6cbe6f20457e003fd526d97cea183883570de61;
+
+    // The hash of the data type used to relay calls to the revoke function. It's the value of
+    // keccak256("Revoke(bytes32 schema,bytes32 uid,uint256 nonce)").
+    bytes32 private constant REVOKE_TYPEHASH = 0xa98d02348410c9c76735e0d0bb1396f4015ac2bb9615f9c2611d19d7a8a99650;
+
+    // The user readable name of the signing domain.
+    bytes32 private immutable _name;
+
+    // Replay protection nonces.
+    mapping(address => uint256) private _nonces;
+
+    // Upgrade forward-compatibility storage gap
+    uint256[MAX_GAP - 1] private __gap;
+
+    /**
+     * @dev Creates a new EIP712Verifier instance.
+     *
+     * @param version The current major version of the signing domain
+     */
+    constructor(string memory name, string memory version) EIP712(name, version) {
+        _name = stringToBytes32(name);
+    }
+
+    /**
+     * @dev Returns the domain separator used in the encoding of the signatures for attest, and revoke.
+     */
+    function getDomainSeparator() external view returns (bytes32) {
+        return _domainSeparatorV4();
+    }
+
+    /**
+     * @dev Returns the current nonce per-account.
+     *
+     * @param account The requested account.
+     *
+     * @return The current nonce.
+     */
+    function getNonce(address account) external view returns (uint256) {
+        return _nonces[account];
+    }
+
+    /**
+     * Returns the EIP712 type hash for the attest function.
+     */
+    function getAttestTypeHash() external pure returns (bytes32) {
+        return ATTEST_TYPEHASH;
+    }
+
+    /**
+     * Returns the EIP712 type hash for the revoke function.
+     */
+    function getRevokeTypeHash() external pure returns (bytes32) {
+        return REVOKE_TYPEHASH;
+    }
+
+    /**
+     * Returns the EIP712 name.
+     */
+    function getName() external view returns (string memory) {
+        return bytes32ToString(_name);
+    }
+
+    /**
+     * @dev Verifies delegated attestation request.
+     *
+     * @param request The arguments of the delegated attestation request.
+     */
+    function _verifyAttest(DelegatedAttestationRequest memory request) internal {
+        AttestationRequestData memory data = request.data;
+        EIP712Signature memory signature = request.signature;
+
+        uint256 nonce;
+        unchecked {
+            nonce = _nonces[request.attester]++;
+        }
+
+        bytes32 digest = _hashTypedDataV4(
+            keccak256(
+                abi.encode(
+                    ATTEST_TYPEHASH,
+                    request.schema,
+                    data.recipient,
+                    data.expirationTime,
+                    data.revocable,
+                    data.refUID,
+                    keccak256(data.data),
+                    nonce
+                )
+            )
+        );
+
+        if (ECDSA.recover(digest, signature.v, signature.r, signature.s) != request.attester) {
+            revert InvalidSignature();
+        }
+    }
+
+    /**
+     * @dev Verifies delegated revocation request.
+     *
+     * @param request The arguments of the delegated revocation request.
+     */
+    function _verifyRevoke(DelegatedRevocationRequest memory request) internal {
+        RevocationRequestData memory data = request.data;
+        EIP712Signature memory signature = request.signature;
+
+        uint256 nonce;
+        unchecked {
+            nonce = _nonces[request.revoker]++;
+        }
+
+        bytes32 digest = _hashTypedDataV4(keccak256(abi.encode(REVOKE_TYPEHASH, request.schema, data.uid, nonce)));
+
+        if (ECDSA.recover(digest, signature.v, signature.r, signature.s) != request.revoker) {
+            revert InvalidSignature();
+        }
+    }
+}

packages/contracts-bedrock/contracts/EAS/resolver/ISchemaResolver.sol

+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { Attestation } from "../Common.sol";
+
+/// @title ISchemaResolver
+/// @notice The interface of an optional schema resolver.
+interface ISchemaResolver {
+    /**
+     * @dev Returns whether the resolver supports ETH transfers.
+     */
+    function isPayable() external pure returns (bool);
+
+    /**
+     * @dev Processes an attestation and verifies whether it's valid.
+     *
+     * @param attestation The new attestation.
+     *
+     * @return Whether the attestation is valid.
+     */
+    function attest(Attestation calldata attestation) external payable returns (bool);
+
+    /**
+     * @dev Processes multiple attestations and verifies whether they are valid.
+     *
+     * @param attestations The new attestations.
+     * @param values Explicit ETH amounts which were sent with each attestation.
+     *
+     * @return Whether all the attestations are valid.
+     */
+    function multiAttest(
+        Attestation[] calldata attestations,
+        uint256[] calldata values
+    ) external payable returns (bool);
+
+    /**
+     * @dev Processes an attestation revocation and verifies if it can be revoked.
+     *
+     * @param attestation The existing attestation to be revoked.
+     *
+     * @return Whether the attestation can be revoked.
+     */
+    function revoke(Attestation calldata attestation) external payable returns (bool);
+
+    /**
+     * @dev Processes revocation of multiple attestation and verifies they can be revoked.
+     *
+     * @param attestations The existing attestations to be revoked.
+     * @param values Explicit ETH amounts which were sent with each revocation.
+     *
+     * @return Whether the attestations can be revoked.
+     */
+    function multiRevoke(
+        Attestation[] calldata attestations,
+        uint256[] calldata values
+    ) external payable returns (bool);
+}

packages/contracts-bedrock/contracts/EAS/resolver/SchemaResolver.sol

+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.19;
+
+import { Semver } from "../../universal/Semver.sol";
+
+import { IEAS, Attestation } from "../IEAS.sol";
+import { InvalidEAS, uncheckedInc } from "../Common.sol";
+
+import { ISchemaResolver } from "./ISchemaResolver.sol";
+
+/// @title SchemaResolver
+/// @notice The base schema resolver contract.
+abstract contract SchemaResolver is ISchemaResolver, Semver {
+    error AccessDenied();
+    error InsufficientValue();
+    error NotPayable();
+
+    // The global EAS contract.
+    IEAS internal immutable _eas;
+
+    /**
+     * @dev Creates a new resolver.
+     *
+     * @param eas The address of the global EAS contract.
+     */
+    constructor(IEAS eas) Semver(1, 0, 0) {
+        if (address(eas) == address(0)) {
+            revert InvalidEAS();
+        }
+
+        _eas = eas;
+    }
+
+    /**
+     * @dev Ensures that only the EAS contract can make this call.
+     */
+    modifier onlyEAS() {
+        _onlyEAS();
+
+        _;
+    }
+
+    /**
+     * @inheritdoc ISchemaResolver
+     */
+    function isPayable() public pure virtual returns (bool) {
+        return false;
+    }
+
+    /**
+     * @dev ETH callback.
+     */
+    receive() external payable virtual {
+        if (!isPayable()) {
+            revert NotPayable();
+        }
+    }
+
+    /**
+     * @inheritdoc ISchemaResolver
+     */
+    function attest(Attestation calldata attestation) external payable onlyEAS returns (bool) {
+        return onAttest(attestation, msg.value);
+    }
+
+    /**
+     * @inheritdoc ISchemaResolver
+     */
+    function multiAttest(
+        Attestation[] calldata attestations,
+        uint256[] calldata values
+    ) external payable onlyEAS returns (bool) {
+        uint256 length = attestations.length;
+
+        // We are keeping track of the remaining ETH amount that can be sent to resolvers and will keep deducting
+        // from it to verify that there isn't any attempt to send too much ETH to resolvers. Please note that unless
+        // some ETH was stuck in the contract by accident (which shouldn't happen in normal conditions), it won't be
+        // possible to send too much ETH anyway.
+        uint256 remainingValue = msg.value;
+
+        for (uint256 i = 0; i < length; i = uncheckedInc(i)) {
+            // Ensure that the attester/revoker doesn't try to spend more than available.
+            uint256 value = values[i];
+            if (value > remainingValue) {
+                revert InsufficientValue();
+            }
+
+            // Forward the attestation to the underlying resolver and revert in case it isn't approved.
+            if (!onAttest(attestations[i], value)) {
+                return false;
+            }
+
+            unchecked {
+                // Subtract the ETH amount, that was provided to this attestation, from the global remaining ETH amount.
+                remainingValue -= value;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc ISchemaResolver
+     */
+    function revoke(Attestation calldata attestation) external payable onlyEAS returns (bool) {
+        return onRevoke(attestation, msg.value);
+    }
+
+    /**
+     * @inheritdoc ISchemaResolver
+     */
+    function multiRevoke(
+        Attestation[] calldata attestations,
+        uint256[] calldata values
+    ) external payable onlyEAS returns (bool) {
+        uint256 length = attestations.length;
+
+        // We are keeping track of the remaining ETH amount that can be sent to resolvers and will keep deducting
+        // from it to verify that there isn't any attempt to send too much ETH to resolvers. Please note that unless
+        // some ETH was stuck in the contract by accident (which shouldn't happen in normal conditions), it won't be
+        // possible to send too much ETH anyway.
+        uint256 remainingValue = msg.value;
+
+        for (uint256 i = 0; i < length; i = uncheckedInc(i)) {
+            // Ensure that the attester/revoker doesn't try to spend more than available.
+            uint256 value = values[i];
+            if (value > remainingValue) {
+                revert InsufficientValue();
+            }
+
+            // Forward the revocation to the underlying resolver and revert in case it isn't approved.
+            if (!onRevoke(attestations[i], value)) {
+                return false;
+            }
+
+            unchecked {
+                // Subtract the ETH amount, that was provided to this attestation, from the global remaining ETH amount.
+                remainingValue -= value;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @dev A resolver callback that should be implemented by child contracts.
+     *
+     * @param attestation The new attestation.
+     * @param value An explicit ETH amount that was sent to the resolver. Please note that this value is verified in
+     * both attest() and multiAttest() callbacks EAS-only callbacks and that in case of multi attestations, it'll
+     * usually hold that msg.value != value, since msg.value aggregated the sent ETH amounts for all the attestations
+     * in the batch.
+     *
+     * @return Whether the attestation is valid.
+     */
+    function onAttest(Attestation calldata attestation, uint256 value) internal virtual returns (bool);
+
+    /**
+     * @dev Processes an attestation revocation and verifies if it can be revoked.
+     *
+     * @param attestation The existing attestation to be revoked.
+     * @param value An explicit ETH amount that was sent to the resolver. Please note that this value is verified in
+     * both revoke() and multiRevoke() callbacks EAS-only callbacks and that in case of multi attestations, it'll
+     * usually hold that msg.value != value, since msg.value aggregated the sent ETH amounts for all the attestations
+     * in the batch.
+     *
+     * @return Whether the attestation can be revoked.
+     */
+    function onRevoke(Attestation calldata attestation, uint256 value) internal virtual returns (bool);
+
+    /**
+     * @dev Ensures that only the EAS contract can make this call.
+     */
+    function _onlyEAS() private view {
+        if (msg.sender != address(_eas)) {
+            revert AccessDenied();
+        }
+    }
+}

packages/contracts-bedrock/contracts/libraries/Predeploys.sol

@@ -71,4 +71,10 @@ library Predeploys {
 
     /// @notice Address of the GovernanceToken predeploy.
     address internal constant GOVERNANCE_TOKEN = 0x4200000000000000000000000000000000000042;
+
+    /// @notice Address of the SchemaRegistry predeploy.
+    address internal constant SCHEMA_REGISTRY = 0x4200000000000000000000000000000000000020;
+
+    /// @notice Address of the EAS predeploy.
+    address internal constant EAS = 0x4200000000000000000000000000000000000021;
 }

packages/contracts-bedrock/deploy-config/devnetL1.json

@@ -46,5 +46,5 @@
   "l2GenesisRegolithTimeOffset": "0x0",
   "faultGameAbsolutePrestate": 96,
   "faultGameMaxDepth": 4,
-  "faultGameMaxDuration": 604800
-}
+  "faultGameMaxDuration": 120
+}
\ No newline at end of file

packages/contracts-bedrock/package.json

 {
   "name": "@eth-optimism/contracts-bedrock",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Contracts for Optimism Specs",
   "license": "MIT",
   "files": [
@@ -31,10 +31,10 @@
     "clean": "rm -rf ./dist ./artifacts ./forge-artifacts ./cache ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo ./src/contract-artifacts.ts ./test-case-generator/fuzz",
     "lint:ts:check": "eslint . --max-warnings=0",
     "lint:forge-tests:check": "ts-node scripts/forge-test-names.ts",
-    "lint:contracts:check": "pnpm solhint -f table 'contracts/**/!(DisputeTypes|RLPReader).sol' && pnpm prettier --check 'contracts/**/!(DisputeTypes|RLPReader).sol' && pnpm lint:forge-tests:check",
+    "lint:contracts:check": "pnpm solhint -f table 'contracts/**/!(DisputeTypes|RLPReader|EAS|SchemaRegistry|IEAS|ISchemaRegistry|SchemaResolver|EIP712Verifier|ISchemaResolver).sol' && pnpm prettier --check 'contracts/**/!(DisputeTypes|RLPReader|EAS|SchemaRegistry|IEAS|ISchemaRegistry|SchemaResolver|EIP712Verifier|ISchemaResolver).sol' && pnpm lint:forge-tests:check",
     "lint:check": "pnpm lint:contracts:check && pnpm lint:ts:check",
     "lint:ts:fix": "eslint --fix .",
-    "lint:contracts:fix": "pnpm solhint --fix 'contracts/**/!(DisputeTypes|RLPReader).sol' && pnpm prettier --write 'contracts/**/!(DisputeTypes|RLPReader).sol'",
+    "lint:contracts:fix": "pnpm solhint --fix 'contracts/**/!(DisputeTypes|RLPReader|EAS|SchemaRegistry|IEAS|ISchemaRegistry|SchemaResolver|EIP712Verifier|ISchemaResolver).sol' && pnpm prettier --write 'contracts/**/!(DisputeTypes|RLPReader|EAS|SchemaRegistry|IEAS|ISchemaRegistry|SchemaResolver|EIP712Verifier|ISchemaResolver).sol'",
     "lint:fix": "pnpm lint:contracts:fix && pnpm lint:ts:fix",
     "lint": "pnpm lint:fix && pnpm lint:check"
   },

packages/contracts-bedrock/scripts/Deploy.s.sol

 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 import { Script } from "forge-std/Script.sol";
 import { Test } from "forge-std/Test.sol";

packages/contracts-bedrock/scripts/DeployConfig.s.sol

 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";

packages/contracts-bedrock/scripts/DeployL2.s.sol

+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Deployer } from "./Deployer.sol";
+import { DeployConfig } from "./DeployConfig.s.sol";
+import { console2 as console } from "forge-std/console2.sol";
+
+import { EAS } from "../contracts/EAS/EAS.sol";
+import { SchemaRegistry } from "../contracts/EAS/SchemaRegistry.sol";
+import { ISchemaRegistry } from "../contracts/EAS/ISchemaRegistry.sol";
+import { Predeploys } from "../contracts/libraries/Predeploys.sol";
+
+/// @title DeployL2
+/// @notice Script used to deploy predeploy implementations to L2.
+contract DeployL2 is Deployer {
+    DeployConfig cfg;
+
+    /// @notice The name of the script, used to ensure the right deploy artifacts
+    ///         are used.
+    function name() public pure override returns (string memory) {
+        return "DeployL2";
+    }
+
+    function setUp() public override {
+        super.setUp();
+
+        string memory path = string.concat(vm.projectRoot(), "/deploy-config/", deploymentContext, ".json");
+        cfg = new DeployConfig(path);
+
+        console.log("Deploying from %s", deployScript);
+        console.log("Deployment context: %s", deploymentContext);
+    }
+
+    /// @notice Modifier that wraps a function in broadcasting.
+    modifier broadcast() {
+        vm.startBroadcast();
+        _;
+        vm.stopBroadcast();
+    }
+
+    /// @notice Deploy the EAS implementation.
+    function deployEAS() broadcast() public returns (address) {
+        EAS eas = new EAS();
+
+        ISchemaRegistry registry = eas.getSchemaRegistry();
+        require(address(registry) == Predeploys.SCHEMA_REGISTRY, "EAS: invalid SchemaRegistry address");
+
+        save("EAS", address(eas));
+        console.log("EAS deployed at %s", address(eas));
+
+        string memory version = eas.version();
+        console.log("EAS version: %s", version);
+
+        return address(eas);
+    }
+
+    /// @notice Deploy the SchemaManager implementation.
+    function deploySchemaRegistry() broadcast() public returns (address) {
+        SchemaRegistry registry = new SchemaRegistry();
+
+        save("SchemaRegistry", address(registry));
+        console.log("SchemaRegistry deployed at %s", address(registry));
+
+        string memory version = registry.version();
+        console.log("SchemaRegistry version: %s", version);
+
+        return address(registry);
+    }
+}
+

packages/contracts-bedrock/scripts/Deployer.sol

 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 import { Script } from "forge-std/Script.sol";
 import { stdJson } from "forge-std/StdJson.sol";
@@ -103,13 +103,12 @@ abstract contract Deployer is Script {
             string memory deploymentName = deployments[i].name;
 
             string memory deployTx = _getDeployTransactionByContractAddress(addr);
-            string memory contractName = stdJson.readString(deployTx, ".contractName");
-            console.log("Syncing %s", deploymentName);
+            string memory contractName = _getContractNameFromDeployTransaction(deployTx);
+            console.log("Syncing deployment %s: contract %s", deploymentName, contractName);
 
-            string memory fqn = getFullyQualifiedName(contractName);
             string[] memory args = getDeployTransactionConstructorArguments(deployTx);
-            bytes memory code = vm.getCode(fqn);
-            bytes memory deployedCode = vm.getDeployedCode(fqn);
+            bytes memory code = _getCode(contractName);
+            bytes memory deployedCode = _getDeployedCode(contractName);
             string memory receipt = _getDeployReceiptByContractAddress(addr);
 
             string memory artifactPath = string.concat(deploymentsDir, "/", deploymentName, ".json");
@@ -119,6 +118,7 @@ abstract contract Deployer is Script {
                 numDeployments = stdJson.readUint(string(res), "$.numDeployments");
                 vm.removeFile(artifactPath);
             } catch {}
+            numDeployments++;
 
             Artifact memory artifact = Artifact({
                 abi: getAbi(contractName),
@@ -261,6 +261,36 @@ abstract contract Deployer is Script {
         return string(res);
     }
 
+    /// @notice Returns the contract name from a deploy transaction.
+    function _getContractNameFromDeployTransaction(string memory _deployTx) internal returns (string memory) {
+        return stdJson.readString(_deployTx, ".contractName");
+    }
+
+    /// @notice Wrapper for vm.getCode that handles semver in the name.
+    function _getCode(string memory _name) internal returns (bytes memory) {
+        string memory fqn = _getFullyQualifiedName(_name);
+        bytes memory code = vm.getCode(fqn);
+        return code;
+    }
+
+    /// @notice Wrapper for vm.getDeployedCode that handles semver in the name.
+    function _getDeployedCode(string memory _name) internal returns (bytes memory) {
+        string memory fqn = _getFullyQualifiedName(_name);
+        bytes memory code = vm.getDeployedCode(fqn);
+        return code;
+    }
+
+    /// @notice Removes the semantic versioning from a contract name. The semver will exist if the contract is compiled more than
+    ///         once with different versions of the compiler.
+    function _stripSemver(string memory _name) internal returns (string memory) {
+        string[] memory cmd = new string[](3);
+        cmd[0] = Executables.bash;
+        cmd[1] = "-c";
+        cmd[2] = string.concat(Executables.echo, " ", _name, " | ", Executables.sed, " -E 's/[.][0-9]+\\.[0-9]+\\.[0-9]+//g'");
+        bytes memory res = vm.ffi(cmd);
+        return string(res);
+    }
+
     /// @notice Returns the constructor arguent of a deployment transaction given a transaction json.
     function getDeployTransactionConstructorArguments(string memory _transaction) internal returns (string[] memory) {
         string[] memory cmd = new string[](3);
@@ -277,9 +307,10 @@ abstract contract Deployer is Script {
     }
 
     /// @notice Builds the fully qualified name of a contract. Assumes that the
-    ///         file name is the same as the contract name.
-    function getFullyQualifiedName(string memory _name) internal pure returns (string memory) {
-        return string.concat(_name, ".sol:", _name);
+    ///         file name is the same as the contract name but strips semver for the file name.
+    function _getFullyQualifiedName(string memory _name) internal returns (string memory) {
+        string memory sanitized = _stripSemver(_name);
+        return string.concat(sanitized, ".sol:", _name);
     }
 
     /// @notice Returns the filesystem path to the artifact path. Assumes that the name of the
@@ -290,7 +321,8 @@ abstract contract Deployer is Script {
         cmd[1] = "-c";
         cmd[2] = string.concat(Executables.forge, " config --json | ", Executables.jq, " -r .out");
         bytes memory res = vm.ffi(cmd);
-        string memory forgeArtifactPath = string.concat(vm.projectRoot(), "/", string(res), "/", _name, ".sol/", _name, ".json");
+        string memory contractName = _stripSemver(_name);
+        string memory forgeArtifactPath = string.concat(vm.projectRoot(), "/", string(res), "/", contractName, ".sol/", _name, ".json");
         return forgeArtifactPath;
     }
 

packages/contracts-bedrock/scripts/Executables.sol

@@ -8,4 +8,6 @@ library Executables {
     string internal constant bash = "bash";
     string internal constant jq = "jq";
     string internal constant forge = "forge";
+    string internal constant echo = "echo";
+    string internal constant sed = "sed";
 }

packages/core-utils/CHANGELOG.md

 # @eth-optimism/core-utils
 
+## 0.12.2
+
+### Patch Changes
+
+- [#6164](https://github.com/ethereum-optimism/optimism/pull/6164) [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a) Thanks [@pengin7384](https://github.com/pengin7384)! - fix typo
+
+- [#6198](https://github.com/ethereum-optimism/optimism/pull/6198) [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876) Thanks [@tremarkley](https://github.com/tremarkley)! - Delete dead typescript https://github.com/ethereum-optimism/optimism/pull/6148.
+
 ## 0.12.1
 
 ### Patch Changes

packages/core-utils/package.json

 {
   "name": "@eth-optimism/core-utils",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "[Optimism] Core typescript utilities",
   "main": "dist/index",
   "types": "dist/index",

packages/fault-detector/.depcheckrc

-ignores: [
-  "@babel/eslint-parser",
-  "@typescript-eslint/parser",
-  "eslint-plugin-import",
-  "eslint-plugin-unicorn",
-  "eslint-plugin-jsdoc",
-  "eslint-plugin-prefer-arrow",
-  "eslint-plugin-react",
-  "@typescript-eslint/eslint-plugin",
-  "eslint-config-prettier",
-  "eslint-plugin-prettier",
-  "chai"
-]

packages/fault-detector/.env.example

-# URL for an L1 RPC provider, used to query L2 output proposals
-FAULT_DETECTOR__L1_RPC_PROVIDER=
-
-# URL for an L2 RPC provider, used to query canonical L2 state
-FAULT_DETECTOR__L2_RPC_PROVIDER=

packages/fault-detector/.eslintrc.js

-module.exports = {
-  extends: '../../.eslintrc.js',
-}

packages/fault-detector/.gitignore

-node_modules/
-build/

packages/fault-detector/.lintstagedrc.yml

-"*.{ts,js}":
-  - eslint

packages/fault-detector/.prettierrc.js

-module.exports = {
-  ...require('../../.prettierrc.js'),
-};

packages/fault-detector/CHANGELOG.md

-# @eth-optimism/fault-detector
-
-## 1.0.0
-
-### Major Changes
-
-- 119754c2f: Make optimism/sdk default to bedrock mode
-
-### Patch Changes
-
-- 16ccbee24: Fix false error to warning
-- 685addec2: Add better source maps and developer support
-- Updated dependencies [8d7dcc70c]
-- Updated dependencies [119754c2f]
-- Updated dependencies [d6388be4a]
-  - @eth-optimism/core-utils@0.12.1
-  - @eth-optimism/sdk@3.0.0
-  - @eth-optimism/common-ts@0.8.2
-
-## 0.6.4
-
-### Patch Changes
-
-- Updated dependencies [a1b7ff9e3]
-- Updated dependencies [8133872ed]
-- Updated dependencies [afc2ab8c9]
-- Updated dependencies [5063a69fb]
-- Updated dependencies [aa854bdd8]
-  - @eth-optimism/sdk@2.1.0
-  - @eth-optimism/contracts@0.6.0
-
-## 0.6.3
-
-### Patch Changes
-
-- dbe5eb308: Empty patch release to re-release packages that failed to be released by a bug in the release process.
-- Updated dependencies [be3315689]
-  - @eth-optimism/sdk@2.0.2
-
-## 0.6.2
-
-### Patch Changes
-
-- f9b579d55: Fixes a bug that would cause the fault detector to error out if no outputs had been proposed yet.
-- Updated dependencies [fecd42d67]
-- Updated dependencies [66cafc00a]
-  - @eth-optimism/common-ts@0.8.1
-  - @eth-optimism/sdk@2.0.1
-
-## 0.6.1
-
-### Patch Changes
-
-- Updated dependencies [cb19e2f9c]
-  - @eth-optimism/sdk@2.0.0
-
-## 0.6.0
-
-### Minor Changes
-
-- b004d1ad4: Updates the fault detector to support Bedrock networks.
-
-### Patch Changes
-
-- Updated dependencies [0e179781b]
-- Updated dependencies [5372c9f5b]
-- Updated dependencies [4ae94b412]
-  - @eth-optimism/common-ts@0.8.0
-  - @eth-optimism/sdk@1.10.2
-
-## 0.5.0
-
-### Minor Changes
-
-- 9b2891852: Refactors BaseServiceV2 slightly, merges standard options with regular options
-
-### Patch Changes
-
-- ab8ec365c: Updates BaseServiceV2 so that options are secret by default. Services will have to explicitly mark options as "public" for those options to be logged and included in the metadata metric.
-- c6c9c7dbf: Fault detector will now wait for providers to be connected
-- Updated dependencies [e23f60f63]
-- Updated dependencies [ab8ec365c]
-- Updated dependencies [ba8b94a60]
-- Updated dependencies [9b2891852]
-- Updated dependencies [d1f9098f9]
-- Updated dependencies [c6c9c7dbf]
-- Updated dependencies [ffcee1013]
-- Updated dependencies [eceb0de1d]
-  - @eth-optimism/common-ts@0.7.0
-  - @eth-optimism/sdk@1.9.0
-  - @eth-optimism/contracts@0.5.40
-
-## 0.4.0
-
-### Minor Changes
-
-- ab5c1b897: Includes a new event caching mechanism for running the fault detector against Geth.
-
-### Patch Changes
-
-- 1d3c749a2: Bumps the version of ts-node used
-- Updated dependencies [1d3c749a2]
-- Updated dependencies [767585b07]
-- Updated dependencies [c975c9620]
-- Updated dependencies [1d3c749a2]
-- Updated dependencies [136ea1785]
-  - @eth-optimism/contracts@0.5.39
-  - @eth-optimism/sdk@1.8.0
-  - @eth-optimism/core-utils@0.12.0
-  - @eth-optimism/common-ts@0.6.8
-
-## 0.3.2
-
-### Patch Changes
-
-- 97b5f578c: Fixes how versions are imported for BaseServiceV2 services
-  - @eth-optimism/sdk@1.6.11
-
-## 0.3.1
-
-### Patch Changes
-
-- Updated dependencies [1e76cdb86]
-  - @eth-optimism/core-utils@0.11.0
-  - @eth-optimism/common-ts@0.6.7
-  - @eth-optimism/contracts@0.5.38
-  - @eth-optimism/sdk@1.6.10
-
-## 0.3.0
-
-### Minor Changes
-
-- 4a5e1832: Updates metrics to use better labels.
-
-### Patch Changes
-
-- Updated dependencies [e2faaa8b]
-  - @eth-optimism/sdk@1.6.5
-
-## 0.2.7
-
-### Patch Changes
-
-- 7215f4ce: Bump ethers to 5.7.0 globally
-- 17999a54: Adds a fault status API to the Fault Detector.
-- 2f058b84: Fixes a small bug in the fault detector that would cause errors for testnets where the fault proof window is extremely short.
-- Updated dependencies [7215f4ce]
-- Updated dependencies [206f6033]
-- Updated dependencies [d7679ca4]
-  - @eth-optimism/common-ts@0.6.5
-  - @eth-optimism/contracts@0.5.36
-  - @eth-optimism/core-utils@0.10.1
-  - @eth-optimism/sdk@1.6.4
-
-## 0.2.6
-
-### Patch Changes
-
-- Updated dependencies [b27d0fa7]
-- Updated dependencies [dbfea116]
-- Updated dependencies [299157e7]
-  - @eth-optimism/sdk@1.6.1
-  - @eth-optimism/core-utils@0.10.0
-  - @eth-optimism/contracts@0.5.34
-  - @eth-optimism/common-ts@0.6.4
-
-## 0.2.5
-
-### Patch Changes
-
-- 98206b7e: Properly handle connection failures for L2 node
-
-## 0.2.4
-
-### Patch Changes
-
-- 89d01f2e: Update dev deps
-- Updated dependencies [6e3449ba]
-- Updated dependencies [f9fee446]
-  - @eth-optimism/contracts@0.5.30
-  - @eth-optimism/core-utils@0.9.1
-  - @eth-optimism/sdk@1.2.1
-  - @eth-optimism/common-ts@0.6.1
-
-## 0.2.3
-
-### Patch Changes
-
-- 977493bc: Update SDK version and usage to account for new constructor
-- 2296cf81: Fix bug where FD would try to sync beyond local tip
-- Updated dependencies [977493bc]
-- Updated dependencies [700dcbb0]
-- Updated dependencies [3d1cb720]
-  - @eth-optimism/sdk@1.2.0
-  - @eth-optimism/core-utils@0.9.0
-  - @eth-optimism/common-ts@0.6.0
-  - @eth-optimism/contracts@0.5.29
-
-## 0.2.2
-
-### Patch Changes
-
-- Updated dependencies [cb71fcde]
-- Updated dependencies [10e41522]
-  - @eth-optimism/common-ts@0.5.0
-
-## 0.2.1
-
-### Patch Changes
-
-- 29ff7462: Revert es target back to 2017
-- Updated dependencies [27234f68]
-- Updated dependencies [c201f3f1]
-- Updated dependencies [29ff7462]
-- Updated dependencies [52b26878]
-  - @eth-optimism/contracts@0.5.28
-  - @eth-optimism/common-ts@0.4.0
-  - @eth-optimism/core-utils@0.8.7
-  - @eth-optimism/sdk@1.1.9
-
-## 0.2.0
-
-### Minor Changes
-
-- 84a8934c: BaseServiceV2 exposes service name and version as standard synthetic metric
-
-### Patch Changes
-
-- 37dfe4f6: Smarter starting height for fault-detector
-- 6fe58eb2: Fix order in which a metric was bumped then emitted to fix off by one issue
-- Updated dependencies [d9e39931]
-- Updated dependencies [84a8934c]
-  - @eth-optimism/common-ts@0.3.0
-
-## 0.1.1
-
-### Patch Changes
-
-- d18ae135: Updates all ethers versions in response to BN.js bug
-- Updated dependencies [f16383f2]
-- Updated dependencies [d18ae135]
-  - @eth-optimism/common-ts@0.2.8
-  - @eth-optimism/core-utils@0.8.5
-  - @eth-optimism/sdk@1.1.6
-
-## 0.1.0
-
-### Minor Changes
-
-- 2177c8ef: Releases the first public version of the fault detector
-
-### Patch Changes
-
-- @eth-optimism/sdk@1.1.4

packages/fault-detector/LICENSE

-(The MIT License)
-
-Copyright 2020-2021 Optimism
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/fault-detector/example.env

-#  --l1rpcprovider                Provider for interacting with L1 (env: FAULT_DETECTOR__L1_RPC_PROVIDER)
-FAULT_DETECTOR__L1_RPC_PROVIDER=
-#  --l2rpcprovider                Provider for interacting with L2 (env: FAULT_DETECTOR__L2_RPC_PROVIDER)
-FAULT_DETECTOR__L2_RPC_PROVIDER=
-#  --bedrock                      Whether or not the service is running against a Bedrock chain (env: FAULT_DETECTOR__BEDROCK)
-BEDROCK=true
-
-# Optional Params
-
-#  --startbatchindex              Batch index to start checking from. For bedrock chains, this is the L2 height to start from (env: FAULT_DETECTOR__START_BATCH_INDEX)
-# FAULT_DETECTOR__START_BATCH_INDEX=
-#  --optimismportaladdress        [Custom Bedrock Chains] Deployed OptimismPortal contract address. Used to retrieve necessary info for ouput verification  (env: FAULT_DETECTOR__OPTIMISM_PORTAL_ADDRESS)
-# FAULT_DETECTOR__OPTIMISM_PORTAL_ADDRESS=
-#  --statecommitmentchainaddress  [Custom Legacy Chains] Deployed StateCommitmentChain contract address. Used to fetch necessary info for output verification. (env: FAULT_DETECTOR__STATE_COMMITMENT_CHAIN_ADDRESS)
-# FAULT_DETECTOR__STATE_COMMITMENT_CHAIN_ADDRESS=
-#  --loopintervalms               Loop interval in milliseconds, only applies if service is set to loop (env: FAULT_DETECTOR__LOOP_INTERVAL_MS)
-# FAULT_DETECTOR__LOOP_INTERVAL_MS=
-#  --port                         Port for the app server (env: FAULT_DETECTOR__PORT)
-# FAULT_DETECTOR__PORT=
-#  --hostname                     Hostname for the app server (env: FAULT_DETECTOR__HOSTNAME)
-# FAULT_DETECTOR__HOSTNAME=
-#  --loglevel                     Log level (env: FAULT_DETECTOR__LOG_LEVEL)
-# FAULT_DETECTOR__LOG_LEVEL=

packages/fault-detector/package.json

-{
-  "private": true,
-  "name": "@eth-optimism/fault-detector",
-  "version": "1.0.0",
-  "description": "[Optimism] Service for detecting faulty L2 output proposals",
-  "main": "dist/index",
-  "types": "dist/index",
-  "files": [
-    "dist/*"
-  ],
-  "scripts": {
-    "start": "node --enable-source-maps dist/src/service.js",
-    "dev": "tsx watch ./src/service.ts",
-    "test": "hardhat test",
-    "test:coverage": "nyc hardhat test && nyc merge .nyc_output coverage.json",
-    "build": "tsc -p tsconfig.json",
-    "preview": "pnpm build && pnpm start",
-    "clean": "rimraf dist/ ./tsconfig.tsbuildinfo",
-    "lint": "pnpm lint:fix && pnpm lint:check",
-    "pre-commit": "lint-staged",
-    "lint:fix": "pnpm lint:check --fix",
-    "lint:check": "eslint . --max-warnings=0"
-  },
-  "keywords": [
-    "optimism",
-    "ethereum",
-    "fault",
-    "detector"
-  ],
-  "homepage": "https://github.com/ethereum-optimism/optimism/tree/develop/packages/fault-detector#readme",
-  "license": "MIT",
-  "author": "Optimism PBC",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ethereum-optimism/optimism.git"
-  },
-  "devDependencies": {
-    "@defi-wonderland/smock": "^2.0.7",
-    "@nomiclabs/hardhat-ethers": "^2.0.6",
-    "@nomiclabs/hardhat-waffle": "^2.0.3",
-    "@types/chai": "^4.3.1",
-    "@types/dateformat": "^5.0.0",
-    "chai-as-promised": "^7.1.1",
-    "dateformat": "^4.5.1",
-    "dotenv": "^16.1.4",
-    "ethereum-waffle": "^3.4.4",
-    "ethers": "^5.7.0",
-    "hardhat": "^2.9.6",
-    "lodash": "^4.17.21",
-    "tsx": "^3.12.7"
-  },
-  "dependencies": {
-    "@eth-optimism/common-ts": "^0.8.2",
-    "@eth-optimism/contracts-bedrock": "0.15.0",
-    "@eth-optimism/core-utils": "^0.12.1",
-    "@eth-optimism/sdk": "^3.0.0",
-    "@ethersproject/abstract-provider": "^5.7.0"
-  }
-}

packages/fault-detector/tsconfig.json

-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./dist",
-    "sourceMap": true
-  },
-  "include": [
-    "package.json",
-    "src/**/*"
-  ]
-}

packages/replica-healthcheck/CHANGELOG.md

 # @eth-optimism/replica-healthcheck
 
+## 1.2.6
+
+### Patch Changes
+
+- Updated dependencies [[`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a), [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876)]:
+  - @eth-optimism/core-utils@0.12.2
+  - @eth-optimism/common-ts@0.8.3
+
 ## 1.2.5
 
 ### Patch Changes

packages/replica-healthcheck/package.json

 {
   "private": true,
   "name": "@eth-optimism/replica-healthcheck",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "[Optimism] Service for monitoring the health of replica nodes",
   "main": "dist/index",
   "types": "dist/index",
@@ -32,8 +32,8 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "dependencies": {
-    "@eth-optimism/common-ts": "0.8.2",
-    "@eth-optimism/core-utils": "0.12.1",
+    "@eth-optimism/common-ts": "0.8.3",
+    "@eth-optimism/core-utils": "0.12.2",
     "@ethersproject/abstract-provider": "^5.7.0"
   },
   "devDependencies": {

packages/sdk/CHANGELOG.md

 # @eth-optimism/sdk
 
+## 3.1.0
+
+### Minor Changes
+
+- [#6053](https://github.com/ethereum-optimism/optimism/pull/6053) [`ff577455f`](https://github.com/ethereum-optimism/optimism/commit/ff577455f196b5f5b8a889339b845561ca6c538a) Thanks [@roninjin10](https://github.com/roninjin10)! - Add support for claiming multicall3 withdrawals
+
+- [#6042](https://github.com/ethereum-optimism/optimism/pull/6042) [`89ca741a6`](https://github.com/ethereum-optimism/optimism/commit/89ca741a63c5e07f9d691bb6f7a89f7718fc49ca) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixes issue with legacy withdrawal message status detection
+
+- [#6332](https://github.com/ethereum-optimism/optimism/pull/6332) [`639163253`](https://github.com/ethereum-optimism/optimism/commit/639163253a5e2128f1c21c446b68d358d38cbd30) Thanks [@wilsoncusack](https://github.com/wilsoncusack)! - Added to and from block filters to several methods in CrossChainMessenger
+
+### Patch Changes
+
+- [#6254](https://github.com/ethereum-optimism/optimism/pull/6254) [`a666c4f20`](https://github.com/ethereum-optimism/optimism/commit/a666c4f2082253abbb68c0678e5a0a1ed0c00f4b) Thanks [@roninjin10](https://github.com/roninjin10)! - Fixed missing indexes for multicall support
+
+- [#6164](https://github.com/ethereum-optimism/optimism/pull/6164) [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a) Thanks [@pengin7384](https://github.com/pengin7384)! - fix typo
+
+- [#6198](https://github.com/ethereum-optimism/optimism/pull/6198) [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876) Thanks [@tremarkley](https://github.com/tremarkley)! - Delete dead typescript https://github.com/ethereum-optimism/optimism/pull/6148.
+
+- [#6182](https://github.com/ethereum-optimism/optimism/pull/6182) [`3f13fd0bb`](https://github.com/ethereum-optimism/optimism/commit/3f13fd0bbea051a4550f1df6def1a53a616aa6f6) Thanks [@tremarkley](https://github.com/tremarkley)! - Update the addresses of the bridges on optimism and optimism goerli for the ECO bridge adapter
+
+- Updated dependencies [[`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a), [`72d184854`](https://github.com/ethereum-optimism/optimism/commit/72d184854ebad8b2025641f126ed76573b1f0ac3), [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876)]:
+  - @eth-optimism/contracts-bedrock@0.16.0
+  - @eth-optimism/core-utils@0.12.2
+
 ## 3.0.0
 
 ### Major Changes

packages/sdk/package.json

 {
   "name": "@eth-optimism/sdk",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "[Optimism] Tools for working with Optimism",
   "main": "dist/index",
   "types": "dist/index",
@@ -55,8 +55,8 @@
   },
   "dependencies": {
     "@eth-optimism/contracts": "0.6.0",
-    "@eth-optimism/core-utils": "0.12.1",
-    "@eth-optimism/contracts-bedrock": "0.15.0",
+    "@eth-optimism/core-utils": "0.12.2",
+    "@eth-optimism/contracts-bedrock": "0.16.0",
     "lodash": "^4.17.21",
     "merkletreejs": "^0.2.27",
     "rlp": "^2.2.7"

specs/cannon-fault-proof-vm.md

@@ -66,7 +66,9 @@ location as the entire address space is unprotected.
 ### Heap
 
 FPVM state contains a `heap` that tracks the base address of the most recent memory allocation.
-Heap pages are bump allocated at the page boundary, per `mmap` syscall. The page size is 4096.
+Heap pages are bump allocated at the page boundary, per `mmap` syscall.
+mmap-ing is purely to satisfy program runtimes that need the memory-pointer
+result of the syscall to locate free memory. The page size is 4096.
 
 The FPVM has a fixed program break at `0x40000000`. However, the FPVM is permitted to extend the
 heap beyond this limit via mmap syscalls.
@@ -105,8 +107,9 @@ The following table list summarizes the supported syscalls and their behaviors.
 | 4004 | write | uint32 fd | char *buf | uint32 count | Similar behavior as Linux/MIPS with support for unaligned writes. See [I/O](#io) for more details. |
 | 4055 | fcntl | uint32 fd | int32 cmd | | Similar behavior as Linux/MIPS. Only the `F_GETFL` (3) cmd is supported. Sets errno to `0x16` for all other commands |
 
-For all of the above syscalls, an error is indicated by setting the return register (`$v0`) to
-`0xFFFFFFFF` (-1) and `errno` (`$a3`) is set accordingly.
+For all of the above syscalls, an error is indicated by setting the return
+register (`$v0`) to `0xFFFFFFFF` (-1) and `errno` (`$a3`) is set accordingly.
+The VM must not modify any register other than `$v0` and `$a3` during syscall handling.
 For unsupported syscalls, the VM must do nothing except to zero out the syscall return (`$v0`)
 and errno (`$a3`) registers.
 

specs/predeploys.md

@@ -21,6 +21,8 @@
 - [OptimismMintableERC721Factory](#optimismmintableerc721factory)
 - [BaseFeeVault](#basefeevault)
 - [L1FeeVault](#l1feevault)
+- [SchemaRegistry](#schemaregistry)
+- [EAS](#eas)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -311,3 +313,20 @@ Address: `0x420000000000000000000000000000000000001a`
 The `L1FeeVault` predeploy receives the L1 portion of the transaction fees.
 Once the contract has received a certain amount of fees, the ETH can be
 withdrawn to an immutable address on L1.
+
+## SchemaRegistry
+
+[Implementation](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/contracts/EAS/SchemaRegistry.sol)
+
+Address: `0x4200000000000000000000000000000000000020`
+
+The `SchemaRegistry` predeploy implements the global attestation schemas for the `Ethereum Attestation Service`
+protocol.
+
+## EAS
+
+[Implementation](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/contracts/EAS/EAS.sol)
+
+Address: `0x4200000000000000000000000000000000000021`
+
+The `EAS` predeploy implements the `Ethereum Attestation Service` protocol.