Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions .circleci/continue/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ commands:
toolchain_version:
description: The specific toolchain version for stable channel
type: string
default: "1.92.0"
default: "1.94.0"
target:
description: A custom target architecture to add to the toolchain
type: string
Expand Down Expand Up @@ -794,7 +794,8 @@ jobs:
op-reth-compact-codec:
docker:
- image: <<pipeline.parameters.c-default_docker_image>>
resource_class: medium
# This job frequently gets killed for smaller resource_class
resource_class: xlarge
steps:
- utils/checkout-with-mise:
checkout-method: blobless
Expand Down Expand Up @@ -1133,7 +1134,7 @@ workflows:
- rust-build-binary:
name: rust-msrv
directory: rust
toolchain: "1.92.0"
toolchain: "1.94.0"
context: *rust-ci-context

# -----------------------------------------------------------------------
Expand All @@ -1144,7 +1145,7 @@ workflows:
directory: rust
command: |
just check-no-std
toolchain: "1.92.0"
toolchain: "1.94.0"
context: *rust-ci-context

- rust-ci-cargo-hack-build:
Expand Down Expand Up @@ -1174,14 +1175,6 @@ workflows:
cache_profile: debug
context: *rust-ci-context

- rust-ci-cargo-tests:
name: op-reth-tests-edge
directory: rust
command: "--justfile op-reth/justfile test"
flags: "edge"
cache_profile: debug
context: *rust-ci-context

# -----------------------------------------------------------------------
# Kona crate-specific jobs (lint, FPVM builds, benches, coverage)
# -----------------------------------------------------------------------
Expand Down Expand Up @@ -1236,14 +1229,6 @@ workflows:
cache_profile: debug
context: *rust-ci-context

- rust-ci-cargo-tests:
name: op-reth-tests-edge
directory: rust
command: "--justfile op-reth/justfile test"
flags: "edge"
cache_profile: debug
context: *rust-ci-context

- kona-build-fpvm:
name: kona-build-fpvm-cannon-client
target: "cannon-client"
Expand All @@ -1253,7 +1238,6 @@ workflows:
requires:
- rust-tests
- op-reth-integration-tests
- op-reth-tests-edge
- kona-build-fpvm-cannon-client

# ==========================================================================
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ coverage.json
**/lcov-upgrade.info
**/lcov-all.info

# Rust files
**/target

yarn-error.log
.yarn/*
!.yarn/releases
Expand Down Expand Up @@ -50,4 +53,4 @@ __pycache__
crytic-export

# ignore local asdf config
.tool-versions
.tool-versions
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
[submodule "packages/contracts-bedrock/lib/superchain-registry"]
path = packages/contracts-bedrock/lib/superchain-registry
url = https://github.com/ethereum-optimism/superchain-registry
[submodule "rust/kona/crates/protocol/registry/superchain-registry"]
path = rust/kona/crates/protocol/registry/superchain-registry
url = https://github.com/ethereum-optimism/superchain-registry
[submodule "op-rbuilder"]
path = op-rbuilder
url = https://github.com/flashbots/op-rbuilder
Expand Down
2 changes: 1 addition & 1 deletion mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go = "1.24.13"
golangci-lint = "2.8.0"
gotestsum = "1.12.3"
mockery = "2.53.3"
rust = "1.92.0"
rust = "1.94.0"
python = "3.12.0"
uv = "0.5.5"
jq = "1.7.1"
Expand Down
4 changes: 2 additions & 2 deletions op-devstack/sysgo/mixed_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ func startMixedOpRethNode(
"--chain=" + chainConfigPath,
"--proofs-history.storage-path=" + proofHistoryDir,
}
err = exec.Command(execPath, initProofsArgs...).Run()
t.Require().NoError(err, "must init op-reth proof history")
initOut, initErr := exec.Command(execPath, initProofsArgs...).CombinedOutput()
t.Require().NoError(initErr, "must init op-reth proof history: %s", string(initOut))

args = append(
args,
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/op-stack-go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
just op-interop-mon/op-interop-mon

# The Rust version must match rust/rust-toolchain.toml. We don't use "latest" to ensure reproducibility
FROM --platform=$BUILDPLATFORM rust:1.92 AS kona-host-builder
FROM --platform=$BUILDPLATFORM rust:1.94 AS kona-host-builder
ARG TARGETARCH
# Install build dependencies and cross-compilation toolchains
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
Loading
Loading