chore(sdk): Simplify generics syntax by using adapters

.github/CODEOWNERS

@@ -1,45 +1,10 @@
-*                           @gakonst
-crates/blockchain-tree-api/ @rakita @mattsse @Rjected
-crates/blockchain-tree/     @rakita @mattsse @Rjected
-crates/chain-state/         @fgimenez @mattsse
-crates/chainspec/           @Rjected @joshieDo @mattsse
-crates/cli/                 @mattsse
-crates/consensus/           @mattsse @Rjected
-crates/e2e-test-utils/      @mattsse @Rjected @klkvr @fgimenez
-crates/engine/              @mattsse @Rjected @fgimenez @mediocregopher @yongkangc
-crates/era/                 @mattsse @RomanHodulak
-crates/errors/              @mattsse
-crates/ethereum-forks/      @mattsse @Rjected
-crates/ethereum/            @mattsse @Rjected
-crates/etl/                 @joshieDo @shekhirin
-crates/evm/                 @rakita @mattsse @Rjected
-crates/exex/                @shekhirin
-crates/net/                 @mattsse @Rjected
-crates/net/downloaders/     @Rjected
-crates/node/                @mattsse @Rjected @klkvr
-crates/optimism/            @mattsse @Rjected @fgimenez
-crates/payload/             @mattsse @Rjected
-crates/primitives-traits/   @Rjected @RomanHodulak @mattsse @klkvr
-crates/primitives/          @Rjected @mattsse @klkvr
-crates/prune/               @shekhirin @joshieDo
-crates/ress                 @shekhirin @Rjected
-crates/revm/                @mattsse @rakita
-crates/rpc/                 @mattsse @Rjected @RomanHodulak
-crates/stages/              @shekhirin @mediocregopher
-crates/static-file/         @joshieDo @shekhirin
-crates/storage/codecs/      @joshieDo
-crates/storage/db-api/      @joshieDo @rakita
-crates/storage/db-common/   @Rjected
-crates/storage/db/          @joshieDo @rakita
-crates/storage/errors/      @rakita
-crates/storage/libmdbx-rs/  @rakita @shekhirin
-crates/storage/nippy-jar/   @joshieDo @shekhirin
-crates/storage/provider/    @rakita @joshieDo @shekhirin
-crates/storage/storage-api/ @joshieDo
-crates/tasks/               @mattsse
-crates/tokio-util/          @fgimenez
-crates/transaction-pool/    @mattsse @yongkangc
-crates/trie/                @Rjected @shekhirin @mediocregopher
-bin/reth-bench-compare/     @mediocregopher @shekhirin @yongkangc
-etc/                        @Rjected @shekhirin
-.github/                    @gakonst @DaniPopes
+*                           @emhane @theochap @BioMark3r
+crates/blockchain-tree-api/ @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/blockchain-tree/     @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/engine/              @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/exex/                @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/node/                @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/optimism/            @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+crates/rpc/                 @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane
+etc/                        @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane @op-will
+.github/                    @dhyaniarun1993 @itschaindev @sadiq1971 @meyer9 @emhane

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a bug report
-labels: ["C-bug", "S-needs-triage"]
+labels: ["K-bug", "S-needs-triage"]
 body:
   - type: markdown
     attributes:

.github/assets/check_wasm.sh

@@ -12,6 +12,7 @@ exclude_crates=(
   reth-basic-payload-builder
   reth-bench
   reth-bench-compare
+  op-reth-proof-bench
   reth-cli
   reth-cli-commands
   reth-cli-runner
@@ -77,6 +78,8 @@ exclude_crates=(
   reth-trie-parallel # tokio
   reth-trie-sparse-parallel # rayon
   reth-testing-utils
+  reth-optimism-exex # reth-exex and reth-optimism-trie
+  reth-optimism-trie # reth-trie
   reth-optimism-txpool # reth-transaction-pool
   reth-era-downloader # tokio
   reth-era-utils # tokio

.github/workflows/bench.yml

@@ -5,7 +5,7 @@ on:
   # TODO: Disabled temporarily for https://github.com/CodSpeedHQ/runner/issues/55
   # merge_group:
   push:
-    branches: [main]
+    branches: [unstable, main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -16,7 +16,7 @@ env:
 name: bench
 jobs:
   codspeed:
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
@@ -35,6 +35,10 @@ jobs:
         run: ./.github/scripts/codspeed-build.sh
       - name: Run the benchmarks
         uses: CodSpeedHQ/action@v4
+        env:
+          CODSPEED_TOKEN: ${{ secrets.CODSPEED_TOKEN }}
+        # op-reth does not have a codspeed token
+        if: ${{ env.CODSPEED_TOKEN != '' }}
         with:
           run: cargo codspeed run --workspace
           mode: instrumentation

.github/workflows/book.yml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   build:
-    runs-on: depot-ubuntu-latest-8
+    runs-on: ubuntu-latest
     timeout-minutes: 90
     steps:
       - name: Checkout

.github/workflows/compact.yml

@@ -9,7 +9,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [unstable, main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -18,12 +18,12 @@ env:
 name: compact-codec
 jobs:
   compact-codec:
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         bin:
           - cargo run --bin reth --features "dev"
-          - cargo run --bin op-reth --features "dev" --manifest-path crates/optimism/bin/Cargo.toml
+          - cargo run --bin op-reth --features "dev" --manifest-path crates/optimism/bin/op-reth/Cargo.toml
     steps:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@stable
@@ -34,7 +34,7 @@ jobs:
       - name: Checkout base
         uses: actions/checkout@v6
         with:
-          ref: ${{ github.base_ref || 'main' }}
+          ref: ${{ github.base_ref || 'unstable' }}
       # On `main` branch, generates test vectors and serializes them to disk using `Compact`.
       - name: Generate compact vectors
         run: |

.github/workflows/cov-op-historical-proof.yml

@@ -0,0 +1,44 @@
+name: coverage-op-historical-proof
+
+on:
+  push:
+    branches: [ unstable, main]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  reth-op-historical-proof-unit-tests:
+    name: coverage op-historical-proof unit tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.23'
+
+      - name: Install llvm
+        run: |
+          sudo apt-get update 
+          sudo apt-get install -y llvm
+          cargo install cargo-llvm-cov
+
+      - name: Coverage
+        run: |
+          cargo llvm-cov --package reth-optimism-exex --package reth-optimism-trie --lcov --output-path unit.lcov
+
+      - name: Upload coverage to codecov.io
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: unit.lcov
+          flags: unit
+          env_vars: OS,RUST
+          name: reth-op-historical-proof-unit-tests
+          verbose: true
+          force: true

.github/workflows/e2e-op-historical-proof.yml

@@ -0,0 +1,146 @@
+name: e2e-op-historical-proof
+
+on:
+  push:
+    branches: [ unstable, main]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  op-reth-as-verifier:
+    name: op-reth-as-verifier
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.24.0'
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: Verify tools
+        run: |
+          echo "forge: $(command -v forge || true)"
+          go version
+
+      - name: Build contract artifacts with forge
+        working-directory: crates/optimism/tests/proofs/contracts
+        run: |
+          forge build
+
+      - uses: jdx/mise-action@v3
+
+      - name: Run e2e tests
+        working-directory: crates/optimism/tests
+        run: |
+          source <(cargo llvm-cov show-env --export-prefix)
+          make build
+          make test-e2e-sysgo GO_PKG_NAME=proofs/core OP_DEVSTACK_PROOF_SEQUENCER_EL=op-geth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-reth
+          make test-e2e-sysgo GO_PKG_NAME=proofs/reorg OP_DEVSTACK_PROOF_SEQUENCER_EL=op-geth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-reth
+          make test-e2e-sysgo GO_PKG_NAME=proofs/prune OP_DEVSTACK_PROOF_SEQUENCER_EL=op-geth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-reth
+          cargo llvm-cov report --lcov --output-path verifier_cov.lcov
+
+      - name: Upload coverage to codecov.io
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: verifier_cov.lcov
+          flags: e2e
+          env_vars: OS,RUST
+          name: verifier-sysgo-tests
+          verbose: true
+
+  op-reth-as-sequencer:
+    name: op-reth-as-sequencer
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: '1.24.0'
+
+      - name: Cache Go modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: Verify tools
+        run: |
+          echo "forge: $(command -v forge || true)"
+          go version
+
+      - name: Build contract artifacts with forge
+        working-directory: crates/optimism/tests/proofs/contracts
+        run: |
+          forge build
+
+      - uses: jdx/mise-action@v3
+
+      - name: Run e2e tests
+        working-directory: crates/optimism/tests
+        run: |
+          source <(cargo llvm-cov show-env --export-prefix)
+          make build
+          make test-e2e-sysgo GO_PKG_NAME=proofs/core OP_DEVSTACK_PROOF_SEQUENCER_EL=op-reth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-geth
+          make test-e2e-sysgo GO_PKG_NAME=proofs/reorg OP_DEVSTACK_PROOF_SEQUENCER_EL=op-reth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-geth
+          make test-e2e-sysgo GO_PKG_NAME=proofs/prune OP_DEVSTACK_PROOF_SEQUENCER_EL=op-reth OP_DEVSTACK_PROOF_VALIDATOR_EL=op-geth
+          cargo llvm-cov report --lcov --output-path sequencer_cov.lcov
+
+      - name: Upload coverage to codecov.io
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: sequencer_cov.lcov
+          flags: e2e
+          env_vars: OS,RUST
+          name: sequencer-sysgo-tests
+          verbose: true
+
+  e2e-op-historical-proof-success:
+    name: e2e-op-historical-proof-success
+    runs-on: ubuntu-latest
+    if: always()
+    needs:
+      - op-reth-as-verifier
+      - op-reth-as-sequencer
+    timeout-minutes: 60
+    steps:
+      - name: E2E tests for Proof History ExEx succeeded
+        uses: re-actors/alls-green@release/v1
+        with:
+          jobs: ${{ toJSON(needs) }}

.github/workflows/e2e.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [unstable, main]
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,7 +20,7 @@ concurrency:
 jobs:
   test:
     name: e2e-testsuite
-    runs-on: depot-ubuntu-latest-4
+    runs-on: ubuntu-latest
     env:
       RUST_BACKTRACE: 1
     timeout-minutes: 90

.github/workflows/grafana.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: [main]
+    branches: [unstable, main]
 
 jobs:
   check-dashboard: