From 11eeadb3de44b1f081c2b99bd5f56941d2ece799 Mon Sep 17 00:00:00 2001 From: Jonathan LEI Date: Tue, 1 Oct 2024 02:41:13 +0800 Subject: [PATCH 1/2] fix: revm semver violation https://github.com/bluealloy/revm/issues/1812 --- Cargo.lock | 2 ++ Cargo.toml | 2 ++ bin/client-eth/Cargo.lock | 2 ++ bin/client-linea/Cargo.lock | 2 ++ bin/client-op/Cargo.lock | 2 ++ crates/primitives/Cargo.toml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 52b53a9..dac2785 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5399,6 +5399,8 @@ dependencies = [ "reth-primitives", "reth-revm", "reth-trie", + "revm-interpreter", + "revm-precompile", "revm-primitives", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 7c3c9f2..5bea075 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,6 +95,8 @@ revm-primitives = { version = "9.0.0", features = [ "serde", ], default-features = false } revm-inspectors = "0.6" +revm-interpreter = { version = "=10.0.1", default-features = false } +revm-precompile = { version = "=11.0.1", default-features = false } # alloy alloy-primitives = "0.8.0" diff --git a/bin/client-eth/Cargo.lock b/bin/client-eth/Cargo.lock index 0437baf..f3e2693 100644 --- a/bin/client-eth/Cargo.lock +++ b/bin/client-eth/Cargo.lock @@ -2654,6 +2654,8 @@ dependencies = [ "reth-primitives", "reth-revm", "reth-trie", + "revm-interpreter", + "revm-precompile", "revm-primitives", "serde", "serde_json", diff --git a/bin/client-linea/Cargo.lock b/bin/client-linea/Cargo.lock index dac6566..78778f2 100644 --- a/bin/client-linea/Cargo.lock +++ b/bin/client-linea/Cargo.lock @@ -2654,6 +2654,8 @@ dependencies = [ "reth-primitives", "reth-revm", "reth-trie", + "revm-interpreter", + "revm-precompile", "revm-primitives", "serde", "serde_json", diff --git a/bin/client-op/Cargo.lock b/bin/client-op/Cargo.lock index fe3a270..1e25c3f 100644 --- a/bin/client-op/Cargo.lock +++ b/bin/client-op/Cargo.lock @@ -2654,6 +2654,8 @@ dependencies = [ "reth-primitives", "reth-revm", "reth-trie", + "revm-interpreter", + "revm-precompile", "revm-primitives", "serde", "serde_json", diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 2949106..b4d8910 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -21,6 +21,8 @@ reth-chainspec.workspace = true reth-optimism-chainspec.workspace = true # revm +revm-interpreter.workspace = true +revm-precompile.workspace = true revm-primitives.workspace = true # alloy From ab900d040145cb36c2df6aa872c89b0a6e1a2cca Mon Sep 17 00:00:00 2001 From: Jonathan LEI Date: Tue, 1 Oct 2024 02:42:52 +0800 Subject: [PATCH 2/2] ci: check dependency semver --- .github/workflows/pr.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f8277e9..c17db3d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -34,6 +34,30 @@ jobs: exit 1 fi + deps-semver: + name: "Check upstream SemVer violations" + runs-on: ["runs-on", "runner=8cpu-linux-x64", "run-id=${{ github.run_id }}"] + steps: + - name: "Checkout sources" + uses: "actions/checkout@v4" + + - name: "Install sp1up" + run: | + curl -L https://sp1.succinct.xyz | bash + echo "$HOME/.sp1/bin" >> $GITHUB_PATH + + - name: "Install SP1 toolchain" + run: | + sp1up + + - name: "Remove lock files" + run: | + find -name Cargo.lock -type f -exec rm {} \; + + - name: "Build without lock files" + run: | + cargo build --all --all-targets + fmt: name: "Check code format" runs-on: ["runs-on", "runner=8cpu-linux-x64", "run-id=${{ github.run_id }}"]