fixed conflicts

paradigmxyz · Jun 14, 2024 · 29bc993 · 29bc993
2 parents d8a97e5 + a96884d
commit 29bc993
Show file tree

Hide file tree

Showing 1,054 changed files with 30,764 additions and 87,131 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,6 +15,9 @@ indent_size = 4
 [*.rs]
 max_line_length = 100
 
+[*.{yml,yaml}]
+indent_size = 2
+
 [*.md]
 # double whitespace at end of line
 # denotes a line break in Markdown

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,4 +5,4 @@ contact_links:
     about: Please ask and answer questions here to keep the issue tracker clean.
   - name: Security
     url: mailto:georgios@paradigm.xyz
-    about: Please report security vulnerabilities here.
+    about: Please report security vulnerabilities here.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
@@ -11,7 +11,7 @@ body:
       label: Describe the feature
       description: |
         Please describe the feature and what it is aiming to solve, if relevant.
-        
+
         If the feature is for a crate, please include a proposed API surface.
     validations:
       required: true

diff --git a/.github/workflows/assertoor.yml b/.github/workflows/assertoor.yml
@@ -29,11 +29,11 @@ jobs:
       id: services
       run: |
         export github_sha=${{ github.sha }}
-        export github_repository=${{ github.repository }} 
+        export github_repository=${{ github.repository }}
 
         cat etc/assertoor/assertoor-template.yaml | envsubst > etc/assertoor/assertoor.yaml
 
-        kurtosis run github.com/kurtosis-tech/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file etc/assertoor/assertoor.yaml
+        kurtosis run github.com/ethpandaops/ethereum-package --enclave assertoor-${{ github.run_id }} --args-file etc/assertoor/assertoor.yaml
 
         enclave_dump=$(kurtosis enclave inspect assertoor-${{ github.run_id }})
 
@@ -92,7 +92,7 @@ jobs:
             elif [ "$task_result" == "failure" ]; then
               task_result="${RED}failure${NC}"
             fi
-            
+
             echo -e " $(printf '%-4s' "$task_id")\t$task_status\t$task_result\t$(printf '%-50s' "$task_graph$task_name") \t$task_title"
           done <<< $(echo "$tasks")
         }
@@ -153,7 +153,7 @@ jobs:
             echo "$task_lines"
           fi
 
-          if [ $failed_tests -gt 0 ]; then 
+          if [ $failed_tests -gt 0 ]; then
             final_test_result="failure"
             break
           fi
@@ -197,7 +197,7 @@ jobs:
       with:
         name: "kurtosis-enclave-dump-${{ github.run_id }}"
         path: ./temp/dump
-    
+
     - name: Return test result
       shell: bash
       run: |
@@ -227,4 +227,3 @@ jobs:
 
           exit 1 # fail action
         fi
-
diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml
@@ -66,7 +66,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sim: [ethereum/rpc, smoke/genesis, smoke/network, ethereum/sync]
+        # TODO: enable etherem/sync once resolved:
+        # https://github.com/paradigmxyz/reth/issues/8579
+        # TODO: enable ethereum/rpc once resolved:
+        # https://github.com/ethereum/hive/pull/1117
+        # sim: [ethereum/rpc, smoke/genesis, smoke/network, ethereum/sync]
+        sim: [smoke/genesis, smoke/network]
         include:
           - sim: devp2p
             limit: discv4
@@ -93,17 +98,26 @@ jobs:
               - TestBlobViolations
           - sim: ethereum/engine
             limit: engine-exchange-capabilities
-          - sim: ethereum/engine
-            limit: engine-withdrawals
+          # TODO: enable engine-withdrawals once resolved:
+          # https://github.com/paradigmxyz/reth/issues/8732
+          # - sim: ethereum/engine
+          #   limit: engine-withdrawals
           - sim: ethereum/engine
             limit: engine-auth
           - sim: ethereum/engine
             limit: engine-transition
-          - sim: ethereum/engine
-            limit: engine-api
-          - sim: ethereum/engine
-            limit: cancun
-            # eth_ rpc methods
+          # TODO: enable engine-api once resolved:
+          # https://github.com/paradigmxyz/reth/issues/6217
+          # https://github.com/paradigmxyz/reth/issues/8305
+          # - sim: ethereum/engine
+          #   limit: engine-api
+          # TODO: enable cancun once resolved:
+          # https://github.com/paradigmxyz/reth/issues/6217
+          # https://github.com/paradigmxyz/reth/issues/8306
+          # https://github.com/paradigmxyz/reth/issues/7144
+          # - sim: ethereum/engine
+          #   limit: cancun
+          # eth_ rpc methods
           - sim: ethereum/rpc-compat
             include:
               - eth_blockNumber
@@ -123,9 +137,12 @@ jobs:
               - eth_getTransactionReceipt
               - eth_sendRawTransaction
               - eth_syncing
-            # debug_ rpc methods
-          - sim: ethereum/rpc-compat
-            include: [debug_]
+          # TODO: enable debug_ rpc-compat once resolved:
+          # https://github.com/paradigmxyz/reth/issues/7015
+          # https://github.com/paradigmxyz/reth/issues/6332
+          # debug_ rpc methods
+          # - sim: ethereum/rpc-compat
+          # include: [debug_]
           # Pyspec cancun jobs
           - sim: pyspec
             include: [cancun/eip4844]

diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -21,4 +21,3 @@ jobs:
           script: |
             const label_pr = require('./.github/scripts/label_pr.js')
             await label_pr({github, context})
-
diff --git a/.github/workflows/lint-actions.yml b/.github/workflows/lint-actions.yml
@@ -0,0 +1,22 @@
+name: Lint GitHub Actions workflows
+on:
+  pull_request:
+    paths:
+    - '.github/**'
+  merge_group:
+  push:
+    paths:
+    - '.github/**'
+
+jobs:
+  actionlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download actionlint
+        id: get_actionlint
+        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+        shell: bash
+      - name: Check workflow files
+        run: SHELLCHECK_OPTS="-S error" ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -107,11 +107,33 @@ jobs:
           components: rustfmt
       - run: cargo fmt --all --check
 
+  book:
+    name: book
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.76" # MSRV
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - run: cargo build --bin reth --workspace --features ethereum
+        env:
+          RUSTFLAGS: -D warnings
+      - run: ./book/cli/update.sh target/debug/reth
+      - name: Check book changes
+        run: git diff --exit-code
+
   codespell:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
+      - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@v2
+        with:
+          skip: "*.json"
 
   grafana:
     runs-on: ubuntu-latest
@@ -127,7 +149,7 @@ jobs:
     name: lint success
     runs-on: ubuntu-latest
     if: always()
-    needs: [clippy-binaries, clippy, crate-checks, docs, fmt, codespell, grafana]
+    needs: [clippy-binaries, clippy, crate-checks, docs, fmt, book, codespell, grafana]
     timeout-minutes: 30
     steps:
       - name: Decide whether the needed jobs succeeded or failed

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,27 +1,44 @@
 *                           @gakonst
 bin/                        @onbjerg
-crates/blockchain-tree      @rakita @rkrasiuk
+crates/blockchain-tree/     @rakita @rkrasiuk @mattsse @Rjected
+crates/blockchain-tree-api/ @rakita @rkrasiuk @mattsse @Rjected
 crates/cli/                 @onbjerg @mattsse
-crates/consensus            @rkrasiuk @mattsse @Rjected
-crates/exex                 @onbjerg @shekhirin
-crates/metrics              @onbjerg
+crates/config/              @onbjerg
+crates/consensus/           @rkrasiuk @mattsse @Rjected
+crates/e2e-test-utils/      @mattsse @Rjected
+crates/engine-primitives/   @rkrasiuk @mattsse @Rjected
+crates/errors/              @mattsse
+crates/ethereum/            @mattsse @Rjected
+crates/ethereum-forks/      @mattsse @Rjected
+crates/etl/                 @joshieDo @shekhirin
+crates/evm/                 @rakita @mattsse @Rjected @DaniPopes
+crates/exex/                @onbjerg @shekhirin
+crates/fs-util/             @onbjerg @DaniPopes @emhane
+crates/metrics/             @onbjerg
 crates/net/                 @emhane @mattsse @Rjected
-crates/net/downloaders/     @onbjerg @rkrasiuk
+crates/net/downloaders/     @onbjerg @rkrasiuk @emhane
 crates/node/                @mattsse @Rjected @onbjerg
 crates/node-core/           @mattsse @Rjected @onbjerg
-crates/node-ethereum/       @mattsse @Rjected
+crates/optimism/            @mattsse @Rjected @fgimenez
 crates/payload/             @mattsse @Rjected
-crates/prune                @shekhirin @joshieDo
+crates/primitives/          @DaniPopes @Rjected
+crates/prune/               @shekhirin @joshieDo
 crates/revm/                @mattsse @rakita
 crates/rpc/                 @mattsse @Rjected
 crates/stages/              @onbjerg @rkrasiuk @shekhirin
-crates/stages-api/          @onbjerg @rkrasiuk @shekhirin
-crates/static-file          @joshieDo @shekhirin
-crates/storage/             @rakita @joshieDo @shekhirin
-crates/tasks                @mattsse
-crates/tracing              @onbjerg
+crates/static-file/         @joshieDo @shekhirin
+crates/storage/codecs/      @joshieDo
+crates/storage/db/          @joshieDo @rakita
+crates/storage/db-api/      @joshieDo @rakita
+crates/storage/db-common/   @Rjected @onbjerg
+crates/storage/errors/      @rakita @onbjerg
+crates/storage/libmdbx-rs/  @rakita @shekhirin
+crates/storage/nippy-jar/   @joshieDo @shekhirin
+crates/storage/provider/    @rakita @joshieDo @shekhirin
+crates/storage/storage-api/ @joshieDo @rkrasiuk
+crates/tasks/               @mattsse
+crates/tokio-util/          @fgimenez @emhane
+crates/tracing/             @onbjerg
 crates/transaction-pool/    @mattsse
-crates/trie                 @rkrasiuk
-crates/trie-parallel        @rkrasiuk
-crates/optimism             @mattsse
+crates/trie/                @rkrasiuk @Rjected
 .github/                    @onbjerg @gakonst @DaniPopes