chore: Resolve revm state integration conflicts

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+docs = "doc --workspace --all-features --no-deps"

.dockerignore

@@ -12,6 +12,9 @@
 !deny.toml
 !Makefile
 
+# include for vergen constants
+!/.git
+
 # include dist directory, where the reth binary is located after compilation
 !/dist
 

.github/ISSUE_TEMPLATE/bug.yml

@@ -56,17 +56,36 @@ body:
     validations:
       required: false
   - type: input
+    id: client-version
     attributes:
       label: What version/commit are you on?
       description: This can be obtained with `reth --version` or `git rev-parse HEAD` if you've built Reth from source
     validations:
       required: false
   - type: textarea
+    id: database-version
     attributes:
       label: What database version are you on?
       description: This can be obtained with `reth db version`
     validations:
       required: false
+  - type: dropdown
+    id: node-type
+    attributes:
+      label: What type of node are you running?
+      options:
+        - Archive (default)
+        - Full via --full flag
+        - Pruned with custom reth.toml config
+    validations:
+      required: false
+  - type: textarea
+    id: prune-config
+    attributes:
+      label: What prune config do you use, if any?
+      description: `[prune]` section in `reth.toml` file
+    validations:
+      required: false
   - type: input
     attributes:
       label: If you've built Reth from source, provide the full command you used

.github/workflows/bench.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Install Valgrind
         run: |
-          sudo apt install valgrind
+          sudo apt update && sudo apt install valgrind
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -52,36 +52,17 @@ jobs:
           mv testdata pr
 
       - name: Set main baseline
-        run: cargo bench --package reth-db --bench iai --manifest-path main/Cargo.toml
+        run: cargo bench --package reth-db --bench iai --features test-utils --manifest-path main/Cargo.toml
 
       - name: Compare PR benchmark
         shell: 'script -q -e -c "bash {0}"' # required to workaround /dev/tty not being available
         run: |
           ./pr/.github/scripts/compare_iai.sh
 
-  # Checks that benchmarks not run in CI compile
-  bench-check:
-    name: check
-    runs-on:
-      group: Reth
-    strategy:
-      matrix:
-        network: ["ethereum", "optimism"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-      - name: Check if benchmarks build
-        run: cargo check --workspace --benches --features "jemalloc-prof,${{ matrix.network }},min-error-logs,min-warn-logs,min-info-logs,min-debug-logs,min-trace-logs"
-
   bench-success:
     if: always()
     name: bench success
-    needs: bench-check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Decide whether the needed jobs succeeded or failed
-        uses: re-actors/alls-green@release/v1
-        with:
-          jobs: ${{ toJSON(needs) }}
+      # Note: This check is a dummy because we don't have any bench checks enabled.
+      - run: echo OK.

.github/workflows/book.yml

@@ -8,8 +8,9 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: test
+    timeout-minutes: 60
 
     steps:
       - uses: actions/checkout@v3
@@ -18,20 +19,21 @@ jobs:
         run: |
           mkdir mdbook
           curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
-          echo `pwd`/mdbook >> $GITHUB_PATH
+          echo $(pwd)/mdbook >> $GITHUB_PATH
 
       - name: Install mdbook-template
         run: |
           mkdir mdbook-template
           curl -sSL https://github.com/sgoudham/mdbook-template/releases/latest/download/mdbook-template-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook-template
-          echo `pwd`/mdbook-template >> $GITHUB_PATH
+          echo $(pwd)/mdbook-template >> $GITHUB_PATH
 
       - name: Run tests
         run: mdbook test
 
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: lint
+    timeout-minutes: 60
 
     steps:
       - uses: actions/checkout@v3
@@ -41,42 +43,45 @@ jobs:
           mkdir mdbook-linkcheck
           curl -sSL -o mdbook-linkcheck.zip https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/latest/download/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip
           unzip mdbook-linkcheck.zip -d ./mdbook-linkcheck
-          chmod +x `pwd`/mdbook-linkcheck/mdbook-linkcheck
-          echo `pwd`/mdbook-linkcheck >> $GITHUB_PATH
+          chmod +x $(pwd)/mdbook-linkcheck/mdbook-linkcheck
+          echo $(pwd)/mdbook-linkcheck >> $GITHUB_PATH
 
       - name: Run linkcheck
         run: mdbook-linkcheck --standalone
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@nightly
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
+      - uses: dtolnay/rust-toolchain@nightly
 
       - name: Install mdbook
         run: |
           mkdir mdbook
           curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
-          echo `pwd`/mdbook >> $GITHUB_PATH
+          echo $(pwd)/mdbook >> $GITHUB_PATH
 
       - name: Install mdbook-template
         run: |
           mkdir mdbook-template
           curl -sSL https://github.com/sgoudham/mdbook-template/releases/latest/download/mdbook-template-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook-template
-          echo `pwd`/mdbook-template >> $GITHUB_PATH
+          echo $(pwd)/mdbook-template >> $GITHUB_PATH
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
 
       - name: Build book
         run: mdbook build
 
       - name: Build docs
-        run: RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo +nightly doc --all --no-deps
+        run: cargo docs
+        env:
+          # Keep in sync with ./ci.yml:jobs.docs
+          RUSTDOCFLAGS:
+            --cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page
+            -Zunstable-options
 
       - name: Move docs to book folder
         run: |
@@ -108,7 +113,7 @@ jobs:
   deploy:
     # Only deploy if a push to main
     if: github.ref_name == 'main' && github.event_name == 'push'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [test, lint, build]
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -120,6 +125,8 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
 
+    timeout-minutes: 60
+
     steps:
       - name: Deploy to GitHub Pages
         id: deployment

.github/workflows/ci.yml

@@ -5,61 +5,57 @@ on:
     branches: [main]
 
 env:
-  RUSTFLAGS: -D warnings
   CARGO_TERM_COLOR: always
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 name: ci
 jobs:
-  lint:
-    name: code lint
-    runs-on: ubuntu-20.04
+  clippy:
+    name: clippy
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: rustfmt, clippy
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@clippy
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
+      - run: cargo clippy --workspace --all-targets --all-features
+        env:
+          RUSTFLAGS: -D warnings
 
-      - name: cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all --all-features
-
-      - name: cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all --check
-
-      - name: cargo clippy
-        uses: actions-rs/cargo@v1
+  docs:
+    name: docs
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: Swatinem/rust-cache@v2
         with:
-          command: clippy
-          args: --all --all-features
+          cache-on-failure: true
+      - run: cargo docs --document-private-items
+        env:
+          # Keep in sync with ./book.yml:jobs.build
+          # This should only add `-D warnings`
+          RUSTDOCFLAGS:
+            --cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page
+            -Zunstable-options -D warnings
 
-  doc-lint:
-    name: doc lint
-    runs-on: ubuntu-20.04
+  fmt:
+    name: fmt
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-      - name: Check if documentation builds
-        run: RUSTDOCFLAGS="-D warnings" cargo doc --all --no-deps --all-features --document-private-items
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+      - run: cargo fmt --all --check
 
   grafana-lint:
     name: grafana lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
       - name: Check dashboard JSON with jq
@@ -70,8 +66,9 @@ jobs:
   lint-success:
     if: always()
     name: lint success
-    runs-on: ubuntu-20.04
-    needs: [lint, doc-lint, grafana-lint]
+    runs-on: ubuntu-latest
+    needs: [clippy, docs, fmt, grafana-lint]
+    timeout-minutes: 30
     steps:
       - name: Decide whether the needed jobs succeeded or failed
         uses: re-actors/alls-green@release/v1

.github/workflows/deny.yml

@@ -18,7 +18,7 @@ concurrency: deny-${{ github.head_ref || github.run_id }}
 jobs:
   deny:
     name: deny
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v1

.github/workflows/fuzz.yml

@@ -64,7 +64,7 @@ jobs:
   fuzz-success:
     if: always()
     name: fuzz success
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: all
     steps:
       # Note: This check is a dummy because we currently have fuzz tests disabled.