fix: fix conflicts and ci issues

Co-authored-by: j75689 <[email protected]>

.github/workflows/bench.yml

@@ -10,7 +10,7 @@ env:
   CARGO_TERM_COLOR: always
   BASELINE: base
   IAI_CALLGRIND_RUNNER: iai-callgrind-runner
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/build-check.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 jobs:
   extract-version:

.github/workflows/dependencies.yml

@@ -10,7 +10,7 @@ on:
     # Needed so we can run it manually
 
 env:
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BRANCH: cargo-update
   TITLE: "chore(deps): weekly `cargo update`"

.github/workflows/docker.yml

@@ -18,7 +18,7 @@ env:
   OP_DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/op-reth
   BSC_DOCKER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/bsc-reth
   DOCKER_USERNAME: ${{ github.actor }}
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 jobs:
   build:

.github/workflows/hive.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/integration.yml

@@ -12,7 +12,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   SEED: rustethereumethereumrust
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/kurtosis.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/release.yml

@@ -13,7 +13,7 @@ env:
   OP_IMAGE_NAME: ${{ github.repository_owner }}/op-reth
   IMAGE_NAME: ${{ github.repository_owner }}/bsc-reth
   CARGO_TERM_COLOR: always
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 jobs:
   extract-version:

.github/workflows/stage.yml

@@ -12,7 +12,7 @@ env:
   CARGO_TERM_COLOR: always
   FROM_BLOCK: 0
   TO_BLOCK: 50000
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/unit.yml

@@ -12,7 +12,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   SEED: rustethereumethereumrust
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/windows.yml

@@ -10,7 +10,7 @@ on:
   merge_group:
 
 env:
-  TOOL_CHAIN: "1.81"
+  TOOL_CHAIN: "1.82"
 
 jobs:
   check-reth: