fix: merge conflicts in lockbox

.semgrep/rules/sol-rules.yaml

@@ -84,18 +84,18 @@ rules:
     pattern-regex: function\s+\w+\s*\(\s*([^)]*?\b\w+\s+(?!_)(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH98.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH.sol
         - packages/contracts-bedrock/src/universal/WETH98.sol
-        - packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+        - packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
         - packages/contracts-bedrock/src/L2/SuperchainWETH.sol
-        - packages/contracts-bedrock/src/governance/interfaces/IGovernanceToken.sol
+        - packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
 
   - id: sol-style-return-arg-fmt
@@ -105,13 +105,13 @@ rules:
     pattern-regex: returns\s*(\w+\s*)?\(\s*([^)]*?\b\w+\s+(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+(?<!_)\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
 
   - id: sol-style-doc-comment
     languages: [solidity]

CONTRIBUTING.md

@@ -20,63 +20,54 @@ Interactions within this repository are subject to a [Code of Conduct](https://g
 
 ## Development Quick Start
 
-### Software Dependencies
-
-| Dependency                                                    | Version  | Version Check Command    |
-| ------------------------------------------------------------- | -------- | ------------------------ |
-| [git](https://git-scm.com/)                                   | `^2`     | `git --version`          |
-| [go](https://go.dev/)                                         | `^1.21`  | `go version`             |
-| [node](https://nodejs.org/en/)                                | `^20`    | `node --version`         |
-| [nvm](https://github.com/nvm-sh/nvm)                          | `^0.39`  | `nvm --version`          |
-| [just](https://github.com/casey/just)                         | `^1.34.0`| `just --version`         |
-| [foundry](https://github.com/foundry-rs/foundry#installation) | `^0.2.0` | `forge --version`        |
-| [make](https://linux.die.net/man/1/make)                      | `^3`     | `make --version`         |
-| [jq](https://github.com/jqlang/jq)                            | `^1.6`   | `jq --version`           |
-| [direnv](https://direnv.net)                                  | `^2`     | `direnv --version`       |
-| [docker](https://docs.docker.com/get-docker/)                 | `^24`    | `docker --version`       |
-| [docker compose](https://docs.docker.com/compose/install/)    | `^2.23`  | `docker compose version` |
+### Setting Up
 
-### Notes on Specific Dependencies
+Clone the repository and open it:
 
-#### `node`
+```bash
+git clone git@github.com:ethereum-optimism/optimism.git
+cd optimism
+```
 
-Make sure to use the version of `node` specified within [`.nvmrc`](./.nvmrc).
-You can use [`nvm`](https://github.com/nvm-sh/nvm) to manage multiple versions of Node.js on your machine and automatically switch to the correct version when you enter this repository.
+### Software Dependencies
 
-#### `foundry`
+You will need to install a number of software dependencies to effectively contribute to the
+Optimism Monorepo. We use [`mise`](https://mise.jdx.dev/) as a dependency manager for these tools.
+Once properly installed, `mise` will provide the correct versions for each tool. `mise` does not
+replace any other installations of these binaries and will only serve these binaries when you are
+working inside of the `optimism` directory.
 
-`foundry` is updated frequently and occasionally contains breaking changes.
-This repository pins a specific version of `foundry` inside of [`versions.json`](./versions.json).
-Use the command `just update-foundry` at the root of the monorepo to make sure that your version of `foundry` is the same as the one currently being used in CI.
+#### Install `mise`
 
-#### `direnv`
+Install `mise` by following the instructions provided on the
+[Getting Started page](https://mise.jdx.dev/getting-started.html#_1-install-mise-cli).
 
-[`direnv`](https://direnv.net) is a tool used to load environment variables from [`.envrc`](./.envrc) into your shell so you don't have to manually export variables every time you want to use them.
-`direnv` only has access to files that you explicitly allow it to see.
-After [installing `direnv`](https://direnv.net/docs/installation.html), you will need to **make sure that [`direnv` is hooked into your shell](https://direnv.net/docs/hook.html)**.
-Make sure you've followed [the guide on the `direnv` website](https://direnv.net/docs/hook.html), then **close your terminal and reopen it** so that the changes take effect (or `source` your config file if you know how to do that).
+#### Trust the `mise.toml` file
 
-#### `docker compose`
+`mise` requires that you explicitly trust the `mise.toml` file which lists the dependencies that
+this repository uses. After you've installed `mise` you'll be able to trust the file via:
 
-[Docker Desktop](https://docs.docker.com/get-docker/) should come with `docker compose` installed by default.
-You'll have to install the `compose` plugin if you're not using Docker Desktop or you're on linux.
+```bash
+mise trust mise.toml
+```
 
-### Setting Up
+#### Install dependencies
 
-Clone the repository and open it:
+Use `mise` to install the correct versions for all of the required tools:
 
 ```bash
-git clone git@github.com:ethereum-optimism/optimism.git
-cd optimism
+mise install
 ```
 
-### Building the Monorepo
+#### Installing updates
 
-Make sure that you've installed all of the required [Software Dependencies](#software-dependencies) before you continue.
-You will need [foundry](https://github.com/foundry-rs/foundry) to build the smart contracts found within this repository.
-Refer to the note on [foundry as a dependency](#foundry) for instructions.
+`mise` will notify you if any dependencies are outdated. Simply run `mise install` again to install
+the latest versions of the dependencies if you receive these notifications.
+
+### Building the Monorepo
 
-Install dependencies and build all packages within the monorepo by running:
+You must install all of the required [Software Dependencies](#software-dependencies) to build the
+Optimism Monorepo. Once you've done so, run the following command to build:
 
 ```bash
 make build
@@ -88,7 +79,7 @@ Use the above command to rebuild the monorepo.
 
 ### Running tests
 
-Before running tests: **follow the above instructions to get everything built.**
+Before running tests: **follow the above instructions to get everything built**.
 
 #### Running unit tests (solidity)
 

Makefile

@@ -248,5 +248,5 @@ update-op-geth: ## Updates the Geth version used in the project
 .PHONY: update-op-geth
 
 install-eth2-testnet-genesis:
-	go install -v github.com/protolambda/eth2-testnet-genesis@$(shell jq -r .eth2_testnet_genesis < versions.json)
+	go install -v github.com/protolambda/eth2-testnet-genesis@v$(shell yq '.tools."go:github.com/protolambda/eth2-testnet-genesis"' mise.toml)
 .PHONY: install-eth2-testnet-genesis

README.md

@@ -99,7 +99,7 @@ For contract releases, refer to the GitHub release notes for a given release whi
 
 Tags of the form `v<semver>`, such as `v1.1.4`, indicate releases of all Go code only, and **DO NOT** include smart contracts.
 This naming scheme is required by Golang.
-In the above list, this means these `v<semver` releases contain all `op-*` components and exclude all `contracts-*` components.
+In the above list, this means these `v<semver>` releases contain all `op-*` components and exclude all `contracts-*` components.
 
 `op-geth` embeds upstream geth’s version inside its own version as follows: `vMAJOR.GETH_MAJOR GETH_MINOR GETH_PATCH.PATCH`.
 Basically, geth’s version is our minor version.

bedrock-devnet/README.md

@@ -2,4 +2,4 @@
 
 This is a utility for running a local Bedrock devnet. It is designed to replace the legacy Bash-based devnet runner as part of a progressive migration away from Bash automation.
 
-The easiest way to invoke this script is to run `make devnet-up` from the root of this repository. Otherwise, to use this script run `python3 main.py --monorepo-dir=<path to the monorepo>`. You may need to set `PYTHONPATH` to this directory if you are invoking the script from somewhere other than `bedrock-devnet`.
+The easiest way to invoke this script is to run `make devnet-up` from the root of this repository. Otherwise, to use this script run `python3 main.py --monorepo-dir=<path to the monorepo>`. You may need to set `PYTHONPATH` to this directory if you invoke the script from somewhere other than the `bedrock-devnet` directory.

cannon/mipsevm/exec/mips_syscalls.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 type Word = arch.Word
@@ -99,12 +100,12 @@ const (
 )
 
 func GetSyscallArgs(registers *[32]Word) (syscallNum, a0, a1, a2, a3 Word) {
-	syscallNum = registers[RegSyscallNum] // v0
+	syscallNum = registers[register.RegSyscallNum] // v0
 
-	a0 = registers[RegSyscallParam1]
-	a1 = registers[RegSyscallParam2]
-	a2 = registers[RegSyscallParam3]
-	a3 = registers[RegSyscallParam4]
+	a0 = registers[register.RegSyscallParam1]
+	a1 = registers[register.RegSyscallParam2]
+	a2 = registers[register.RegSyscallParam3]
+	a3 = registers[register.RegSyscallParam4]
 
 	return syscallNum, a0, a1, a2, a3
 }
@@ -281,8 +282,8 @@ func HandleSysFcntl(a0, a1 Word) (v0, v1 Word) {
 }
 
 func HandleSyscallUpdates(cpu *mipsevm.CpuScalars, registers *[32]Word, v0, v1 Word) {
-	registers[RegSyscallRet1] = v0
-	registers[RegSyscallErrno] = v1
+	registers[register.RegSyscallRet1] = v0
+	registers[register.RegSyscallErrno] = v1
 
 	cpu.PC = cpu.NextPC
 	cpu.NextPC = cpu.NextPC + 4

cannon/mipsevm/multithreaded/mips.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 type Word = arch.Word
@@ -57,10 +58,10 @@ func (m *InstrumentedState) handleSyscall() error {
 			Registers: thread.Registers,
 		}
 
-		newThread.Registers[29] = a1
+		newThread.Registers[register.RegSP] = a1
 		// the child will perceive a 0 value as returned value instead, and no error
-		newThread.Registers[exec.RegSyscallRet1] = 0
-		newThread.Registers[exec.RegSyscallErrno] = 0
+		newThread.Registers[register.RegSyscallRet1] = 0
+		newThread.Registers[register.RegSyscallErrno] = 0
 		m.state.NextThreadId++
 
 		// Preempt this thread for the new one. But not before updating PCs

cannon/mipsevm/program/patch.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 const WordSizeBytes = arch.WordSizeBytes
@@ -63,7 +64,7 @@ func PatchStack(st mipsevm.FPVMState) error {
 	if err := st.GetMemory().SetMemoryRange(sp-4*memory.PageSize, bytes.NewReader(make([]byte, 5*memory.PageSize))); err != nil {
 		return errors.New("failed to allocate page for stack content")
 	}
-	st.GetRegistersRef()[29] = sp
+	st.GetRegistersRef()[register.RegSP] = sp
 
 	storeMem := func(addr Word, v Word) {
 		var dat [WordSizeBytes]byte

cannon/mipsevm/exec/calling_convention.go → cannon/mipsevm/register/calling_convention.go

@@ -1,4 +1,4 @@
-package exec
+package register
 
 // FYI: https://en.wikibooks.org/wiki/MIPS_Assembly/Register_File
 //
@@ -12,6 +12,8 @@ const (
 	RegA2 = 6
 	// 4th syscall argument; set to 0/1 for success/error
 	RegA3 = 7
+	// Stack pointer
+	RegSP = 29
 )
 
 // FYI: https://web.archive.org/web/20231223163047/https://www.linux-mips.org/wiki/Syscall

cannon/mipsevm/tests/evm_multithreaded_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
@@ -327,9 +328,9 @@ func TestEVM_SysClone_Successful(t *testing.T) {
 			expectedNewThread.PC = state.GetCpu().NextPC
 			expectedNewThread.NextPC = state.GetCpu().NextPC + 4
 			expectedNewThread.ThreadId = 1
-			expectedNewThread.Registers[2] = 0
-			expectedNewThread.Registers[7] = 0
-			expectedNewThread.Registers[29] = stackPtr
+			expectedNewThread.Registers[register.RegSyscallRet1] = 0
+			expectedNewThread.Registers[register.RegSyscallErrno] = 0
+			expectedNewThread.Registers[register.RegSP] = stackPtr
 
 			var err error
 			var stepWitness *mipsevm.StepWitness

cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
@@ -46,9 +47,9 @@ func FuzzStateSyscallCloneMT(f *testing.F) {
 		epxectedNewThread := expected.ExpectNewThread()
 		epxectedNewThread.PC = state.GetCpu().NextPC
 		epxectedNewThread.NextPC = state.GetCpu().NextPC + 4
-		epxectedNewThread.Registers[2] = 0
-		epxectedNewThread.Registers[7] = 0
-		epxectedNewThread.Registers[29] = stackPtr
+		epxectedNewThread.Registers[register.RegSyscallNum] = 0
+		epxectedNewThread.Registers[register.RegSyscallErrno] = 0
+		epxectedNewThread.Registers[register.RegSP] = stackPtr
 		expected.NextThreadId = nextThreadId + 1
 		expected.StepsSinceLastContextSwitch = 0
 		if state.TraverseRight {

cannon/mipsevm/testutil/mips.go

@@ -223,7 +223,7 @@ func (v *EvmValidator) ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitnes
 
 // ValidateEVM runs a single evm step and validates against an FPVM poststate
 func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) {
-	validator := NewEvmValidator(t, hashFn, contracts)
+	validator := NewEvmValidator(t, hashFn, contracts, opts...)
 	validator.ValidateEVM(t, stepWitness, step, goVm)
 }
 

codecov.yml

@@ -1,5 +1,6 @@
 codecov:
   require_ci_to_pass: false
+
 comment:
   layout: "diff, flags, files"
   behavior: default
@@ -12,8 +13,14 @@ ignore:
   - "**/*.t.sol"
   - "packages/contracts-bedrock/test/**/*.sol"
   - "packages/contracts-bedrock/scripts/**/*.sol"
-  - "packages/contracts-bedrock/contracts/vendor/WETH9.sol"
-  - 'packages/contracts-bedrock/contracts/EAS/**/*.sol'
+  - "packages/contracts-bedrock/src/vendor/**/*.sol"
+  - "packages/contracts-bedrock/src/interfaces/**/*.sol"
+  # TODO: add coverage for MIPS64 back once tests are merged in
+  - "packages/contracts-bedrock/src/cannon/MIPS64.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol"
+
 coverage:
   status:
     patch:
@@ -26,16 +33,14 @@ coverage:
     project:
       default:
         informational: true
+
 flag_management:
   # Note: flags should have the same name as the circleci job in which they
   # are uploaded.
   individual_flags:
-    - name: contracts-bedrock-tests
+    - name: contracts-bedrock-coverage
       paths:
         - packages/contracts-bedrock/src
       statuses:
         - type: patch
           target: 100%
-    - name: bedrock-go-tests
-    - name: contracts-tests
-    - name: sdk-tests

docker-bake.hcl

@@ -6,6 +6,10 @@ variable "REPOSITORY" {
   default = "oplabs-tools-artifacts/images"
 }
 
+variable "KONA_VERSION" {
+  default = "kona-client-v0.1.0-beta.5"
+}
+
 variable "GIT_COMMIT" {
   default = "dev"
 }
@@ -119,6 +123,7 @@ target "op-challenger" {
     GIT_COMMIT = "${GIT_COMMIT}"
     GIT_DATE = "${GIT_DATE}"
     OP_CHALLENGER_VERSION = "${OP_CHALLENGER_VERSION}"
+    KONA_VERSION="${KONA_VERSION}"
   }
   target = "op-challenger-target"
   platforms = split(",", PLATFORMS)
@@ -207,7 +212,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-beta.1"
+    KONA_VERSION="${KONA_VERSION}"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)
@@ -241,15 +246,6 @@ target "ci-builder-rust" {
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/ci-builder-rust:${tag}"]
 }
 
-target "contracts-bedrock" {
-  dockerfile = "./ops/docker/Dockerfile.packages"
-  context = "."
-  target = "contracts-bedrock"
-  # See comment in Dockerfile.packages for why we only build for linux/amd64.
-  platforms = ["linux/amd64"]
-  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/contracts-bedrock:${tag}"]
-}
-
 target "op-deployer" {
   dockerfile = "ops/docker/op-stack-go/Dockerfile"
   context = "."