chore: resolve merge conflicts

bnb-chain · Sep 2, 2024 · 1120418 · 1120418
1 parent ee228d7
commit 1120418
Show file tree

Hide file tree

Showing 81 changed files with 2,660 additions and 1,196 deletions.
diff --git a/.github/assets/check_wasm.sh b/.github/assets/check_wasm.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set +e  # Disable immediate exit on error
 
+tool_chain=$1
+
 # Array of crates to compile
 crates=($(cargo metadata --format-version=1 --no-deps | jq -r '.packages[].name' | grep '^reth' | sort))
 # Array of crates to exclude

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -12,7 +12,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   SEED: rustethereumethereumrust
-  TOOL_CHAIN: "1.79"
+  TOOL_CHAIN: "1.80"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -12,7 +12,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   SEED: rustethereumethereumrust
-  TOOL_CHAIN: "1.79"
+  TOOL_CHAIN: "1.80"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}