refactor: remove encoding commitment (#1071 )

* refactor: remove encoding commitment * remove unused field * clippy
chore(bench): dont bench large payloads (#1074 )
2026-01-11 14:28:03 -05:00 · 2026-01-08 07:55:03 -08:00 · 2026-01-05 09:55:35 +00:00 · 2026-01-05 09:38:31 +00:00 · 2025-12-23 13:59:14 +00:00 · 2025-12-16 09:36:11 +01:00
314 changed files with 12387 additions and 21026 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,10 +0,0 @@
-[target.wasm32-unknown-unknown]
-rustflags = [
-    "-C",
-    "target-feature=+atomics,+bulk-memory,+mutable-globals",
-    "-A",
-    "unused_qualifications"
-]
-
-[unstable]
-build-std = ["panic_abort", "std"]
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -21,17 +21,21 @@ jobs:

    - name: Build Docker Image
      run: |
-        docker build -t tlsn-bench . -f ./crates/benches/binary/benches.Dockerfile --build-arg BENCH_TYPE=${{ github.event.inputs.bench_type }}
+        docker build -t tlsn-bench . -f ./crates/harness/harness.Dockerfile

    - name: Run Benchmarks
      run: |
-        docker run --privileged -v ${{ github.workspace }}/crates/benches/binary:/benches tlsn-bench
+        docker run --privileged -v ./crates/harness/:/benches tlsn-bench bash -c "runner setup; runner --target ${{ github.event.inputs.bench_type }} bench"

+    - name: Plot Benchmarks
+      run: |
+        docker run -v ./crates/harness/:/benches tlsn-bench bash -c "tlsn-harness-plot /benches/bench.toml /benches/metrics.csv --min-max-band --prover-kind  ${{ github.event.inputs.bench_type }}"
    - name: Upload graphs
      uses: actions/upload-artifact@v4
      with:
        name: benchmark_graphs
        path: |
-          ./crates/benches/binary/runtime_vs_latency.html
-          ./crates/benches/binary/runtime_vs_bandwidth.html
-          ./crates/benches/binary/download_size_vs_memory.html
+          ./crates/harness/metrics.csv
+          ./crates/harness/bench.toml
+          ./crates/harness/runtime_vs_latency.html
+          ./crates/harness/runtime_vs_bandwidth.html
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,6 @@ on:
 permissions:
  id-token: write
  contents: read
-  attestations: write

 env:
  CARGO_TERM_COLOR: always
@@ -19,11 +18,11 @@ env:
  # We need a higher number of parallel rayon tasks than the default (which is 4)
  # in order to prevent a deadlock, c.f.
  #   - https://github.com/tlsnotary/tlsn/issues/548
-  #   - https://github.com/privacy-scaling-explorations/mpz/issues/178
+  #   - https://github.com/privacy-ethereum/mpz/issues/178
  # 32 seems to be big enough for the foreseeable future
  RAYON_NUM_THREADS: 32
-  GIT_COMMIT_HASH: ${{ github.event.pull_request.head.sha || github.sha }}
-  RUST_VERSION: 1.87.0
+  RUST_VERSION: 1.92.0
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

 jobs:
  clippy:
@@ -34,7 +33,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@master
        with:
          toolchain: ${{ env.RUST_VERSION }}
          components: clippy
@@ -43,7 +42,7 @@ jobs:
        uses: Swatinem/rust-cache@v2.7.7

      - name: Clippy
-        run: cargo clippy --keep-going --all-features --all-targets --locked -- -D warnings
+        run: cargo clippy --keep-going --all-features --all-targets --locked

  fmt:
    name: Check formatting
@@ -112,7 +111,8 @@ jobs:
          sudo apt-get install -y chromium-chromedriver

      - name: Install wasm-pack
-        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+        # we install a specific version which supports custom profiles
+        run: cargo install --git https://github.com/rustwasm/wasm-pack.git --rev 32e52ca

      - name: Use caching
        uses: Swatinem/rust-cache@v2.7.7
@@ -158,9 +158,6 @@ jobs:
      - name: Use caching
        uses: Swatinem/rust-cache@v2.7.7

-      - name: Add custom DNS entry to /etc/hosts for notary TLS test
-        run: echo "127.0.0.1 tlsnotaryserver.io" | sudo tee -a /etc/hosts
-
      - name: Run integration tests
        run: cargo test  --locked --profile tests-integration --workspace --exclude tlsn-tls-client --exclude tlsn-tls-core --no-fail-fast -- --include-ignored

@@ -185,201 +182,9 @@ jobs:
          files: lcov.info
          fail_ci_if_error: true

-  build-sgx:
-    runs-on: ubuntu-latest
-    needs: build-and-test
-    container:
-      image: rust:latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Clang
-        run: |
-          apt update
-          apt install -y clang
-
-      - name: Use caching
-        uses: Swatinem/rust-cache@v2.7.7
-
-      - name: Build Rust Binary
-        run: |
-          cargo build  --locked --bin notary-server --release --features tee_quote
-          cp --verbose target/release/notary-server $GITHUB_WORKSPACE
-
-      - name: Upload Binary for use in the Gramine Job
-        uses: actions/upload-artifact@v4
-        with:
-          name: notary-server
-          path: notary-server
-          if-no-files-found: error
-
-  gramine-sgx:
-    runs-on: ubuntu-latest
-    needs: build-sgx
-    container:
-      image: gramineproject/gramine:latest
-    if: github.ref == 'refs/heads/dev' || (startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.'))
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Restore SGX signing key from secrets
-        run: |
-          mkdir -p "${HOME}/.config/gramine/"
-          echo "${{ secrets.SGX_SIGNING_KEY }}" > "${HOME}/.config/gramine/enclave-key.pem"
-          # verify key
-          openssl rsa -in "${HOME}/.config/gramine/enclave-key.pem" -check -noout
-
-      - name: Download notary-server binary from build job
-        uses: actions/download-artifact@v4
-        with:
-          name: notary-server
-          path: crates/notary/server/tee
-
-      - name: Install jq
-        run: |
-          apt update
-          apt install -y jq
-
-      - name: Use Gramine to calculate measurements
-        run: |
-          cd crates/notary/server/tee
-
-          chmod +x notary-server
-
-          gramine-manifest \
-            -Dlog_level=debug \
-            -Darch_libdir=/lib/x86_64-linux-gnu \
-            -Dself_exe=notary-server \
-            notary-server.manifest.template \
-            notary-server.manifest
-
-          gramine-sgx-sign \
-            --manifest notary-server.manifest \
-            --output notary-server.manifest.sgx
-
-          gramine-sgx-sigstruct-view --verbose --output-format=json notary-server.sig | tee >> notary-server-sigstruct.json
-
-          cat notary-server-sigstruct.json
-
-          mr_enclave=$(jq -r '.mr_enclave' notary-server-sigstruct.json)
-          mr_signer=$(jq -r '.mr_signer' notary-server-sigstruct.json)
-
-          echo "mrenclave=$mr_enclave" >>"$GITHUB_OUTPUT"
-          echo "#### sgx mrenclave" | tee >>$GITHUB_STEP_SUMMARY
-          echo "\`\`\`mr_enclave: ${mr_enclave}\`\`\`" | tee >>$GITHUB_STEP_SUMMARY
-          echo "\`\`\`mr_signer: ${mr_signer}\`\`\`" | tee >>$GITHUB_STEP_SUMMARY
-
-      - name: Upload notary-server and signatures
-        id: upload-notary-server-sgx
-        uses: actions/upload-artifact@v4
-        with:
-          name: notary-server-sgx.zip
-          path: |
-            crates/notary/server/tee/notary-server
-            crates/notary/server/tee/notary-server-sigstruct.json
-            crates/notary/server/tee/notary-server.sig
-            crates/notary/server/tee/notary-server.manifest
-            crates/notary/server/tee/notary-server.manifest.sgx
-            crates/notary/server/tee/README.md
-          if-no-files-found: error
-
-      - name: Attest Build Provenance
-        if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/dev'
-        uses: actions/attest-build-provenance@v2
-        with:
-            subject-name: notary-server-sgx.zip
-            subject-digest: sha256:${{ steps.upload-notary-server-sgx.outputs.artifact-digest }}
-
-      - uses: geekyeggo/delete-artifact@v5 # Delete notary-server from the build job, It is part of the zipfile with the signature
-        with:
-          name: notary-server
-
-  gramine-sgx-docker:
-    runs-on: ubuntu-latest
-    needs: gramine-sgx
-    permissions:
-      contents: read
-      packages: write
-    env:
-      CONTAINER_REGISTRY: ghcr.io
-    if: github.ref == 'refs/heads/dev' || (startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.'))
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: './crates/notary/server/tee/notary-server-sgx.Dockerfile'
-
-      - name: Download notary-server-sgx.zip from gramine-sgx job
-        uses: actions/download-artifact@v4
-        with:
-          name: notary-server-sgx.zip
-          path: ./notary-server-sgx
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.CONTAINER_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker image of notary server
-        id: meta-notary-server-sgx
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.CONTAINER_REGISTRY }}/${{ github.repository }}/notary-server-sgx
-
-      - name: Build and push Docker image of notary server
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta-notary-server-sgx.outputs.tags }}
-          labels: ${{ steps.meta-notary-server-sgx.outputs.labels }}
-          file: ./crates/notary/server/tee/notary-server-sgx.Dockerfile
-
-  build_and_publish_notary_server_image:
-    name: Build and publish notary server's image
-    runs-on: ubuntu-latest
-    needs: build-and-test
-    permissions:
-      contents: read
-      packages: write
-    env:
-      CONTAINER_REGISTRY: ghcr.io
-    if: github.ref == 'refs/heads/dev' || (startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '.'))
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.CONTAINER_REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker image of notary server
-        id: meta-notary-server
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.CONTAINER_REGISTRY }}/${{ github.repository }}/notary-server
-
-      - name: Build and push Docker image of notary server
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta-notary-server.outputs.tags }}
-          labels: ${{ steps.meta-notary-server.outputs.labels }}
-          file: ./crates/notary/server/notary-server.Dockerfile
-
  create-release-draft:
    name: Create Release Draft
-    needs: build_and_publish_notary_server_image
+    needs: build-and-test
    runs-on: ubuntu-latest
    permissions:
      contents: write
@@ -394,4 +199,4 @@ jobs:
          draft: true
          tag_name: ${{ github.ref_name }}
          prerelease: true
-          generate_release_notes: true
+          generate_release_notes: true
--- a/.github/workflows/releng.yml
+++ b/.github/workflows/releng.yml
@@ -6,7 +6,7 @@ on:
      tag:
        description: 'Tag to publish to NPM'
        required: true
-        default: 'v0.1.0-alpha.12'
+        default: 'v0.1.0-alpha.14-pre'

 jobs:
  release:
@@ -22,7 +22,7 @@ jobs:
          RUN_ID=$(gh api \
            -H "Accept: application/vnd.github+json" \
            "/repos/tlsnotary/tlsn/actions/workflows/ci.yml/runs?per_page=100" \
-            --jq '.workflow_runs[] | select(.head_branch == "${{ github.event.inputs.tag }}") | .id')
+            --jq '.workflow_runs[] | select(.head_branch == "${{ github.event.inputs.tag }}") | .id' | sort | tail -1)

          if [ -z "$RUN_ID" ]; then
            echo "No run found for tag ${{ github.event.inputs.tag }}"
--- a/.github/workflows/rustdoc.yml
+++ b/.github/workflows/rustdoc.yml
@@ -23,7 +23,6 @@ jobs:
      - name: "rustdoc"
        run: crates/wasm/build-docs.sh

-
      - name: Deploy
        uses: peaceiris/actions-gh-pages@v3
        if: ${{ github.ref == 'refs/heads/dev' }}
--- a/.github/workflows/updatemain.yml
+++ b/.github/workflows/updatemain.yml
@@ -1,6 +1,7 @@
 name: Fast-forward main branch to published release tag

 on:
+  workflow_dispatch:
  release:
    types: [published]

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 members = [
-    "crates/common",
+    "crates/attestation",
    "crates/components/deap",
    "crates/components/cipher",
    "crates/components/hmac-sha256",
@@ -9,11 +9,6 @@ members = [
    "crates/data-fixtures",
    "crates/examples",
    "crates/formats",
-    "crates/notary/client",
-    "crates/notary/common",
-    "crates/notary/server",
-    "crates/notary/tests-integration",
-    "crates/prover",
    "crates/server-fixture/certs",
    "crates/server-fixture/server",
    "crates/tls/backend",
@@ -22,11 +17,12 @@ members = [
    "crates/tls/core",
    "crates/mpc-tls",
    "crates/tls/server-fixture",
-    "crates/verifier",
    "crates/wasm",
    "crates/harness/core",
    "crates/harness/executor",
    "crates/harness/runner",
+    "crates/harness/plot",
+    "crates/tlsn",
 ]
 resolver = "2"

@@ -40,19 +36,16 @@ resolver = "2"
 inherits = "release"
 opt-level = 1

-[profile.release.package."tlsn-wasm"]
-opt-level = "z"
-
-[profile.dev.package."tlsn-wasm"]
-debug = false
+[profile.wasm]
+inherits = "release"
+lto = true
+panic = "abort"
+codegen-units = 1

 [workspace.dependencies]
-notary-client = { path = "crates/notary/client" }
-notary-common = { path = "crates/notary/common" }
-notary-server = { path = "crates/notary/server" }
 tls-server-fixture = { path = "crates/tls/server-fixture" }
+tlsn-attestation = { path = "crates/attestation" }
 tlsn-cipher = { path = "crates/components/cipher" }
-tlsn-common = { path = "crates/common" }
 tlsn-core = { path = "crates/core" }
 tlsn-data-fixtures = { path = "crates/data-fixtures" }
 tlsn-deap = { path = "crates/components/deap" }
@@ -60,7 +53,6 @@ tlsn-formats = { path = "crates/formats" }
 tlsn-hmac-sha256 = { path = "crates/components/hmac-sha256" }
 tlsn-key-exchange = { path = "crates/components/key-exchange" }
 tlsn-mpc-tls = { path = "crates/mpc-tls" }
-tlsn-prover = { path = "crates/prover" }
 tlsn-server-fixture = { path = "crates/server-fixture/server" }
 tlsn-server-fixture-certs = { path = "crates/server-fixture/certs" }
 tlsn-tls-backend = { path = "crates/tls/backend" }
@@ -72,33 +64,35 @@ tlsn-harness-core = { path = "crates/harness/core" }
 tlsn-harness-executor = { path = "crates/harness/executor" }
 tlsn-harness-runner = { path = "crates/harness/runner" }
 tlsn-wasm = { path = "crates/wasm" }
-tlsn-verifier = { path = "crates/verifier" }
+tlsn = { path = "crates/tlsn" }

-mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-memory-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-common = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-vm-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-ole = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-fields = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-zk = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
-mpz-hash = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ccc0057" }
+mpz-circuits = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-circuits-data = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-memory-core = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-common = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-core = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-vm-core = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-garble = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-garble-core = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-ole = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-ot = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-share-conversion = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-fields = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-zk = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-hash = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }
+mpz-ideal-vm = { git = "https://github.com/privacy-ethereum/mpz", rev = "9c343f8" }

-rangeset = { version = "0.2" }
+rangeset = { version = "0.4" }
 serio = { version = "0.2" }
-spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "6168663" }
+spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "6f1a934" }
 uid-mux = { version = "0.2" }
-websocket-relay = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "6168663" }
+websocket-relay = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "6f1a934" }

+aead = { version = "0.4" }
 aes = { version = "0.8" }
 aes-gcm = { version = "0.9" }
 anyhow = { version = "1.0" }
 async-trait = { version = "0.1" }
-async-tungstenite = { version = "0.28.2" }
 axum = { version = "0.8" }
 bcs = { version = "0.1" }
 bincode = { version = "1.3" }
@@ -118,13 +112,11 @@ elliptic-curve = { version = "0.13" }
 enum-try-as-inner = { version = "0.1" }
 env_logger = { version = "0.10" }
 futures = { version = "0.3" }
-futures-rustls = { version = "0.26" }
-futures-util = { version = "0.3" }
+futures-rustls = { version = "0.25" }
 generic-array = { version = "0.14" }
 ghash = { version = "0.5" }
 hex = { version = "0.4" }
 hmac = { version = "0.12" }
-http = { version = "1.1" }
 http-body-util = { version = "0.1" }
 hyper = { version = "1.1" }
 hyper-util = { version = "0.1" }
@@ -137,7 +129,6 @@ log = { version = "0.4" }
 once_cell = { version = "1.19" }
 opaque-debug = { version = "0.3" }
 p256 = { version = "0.13" }
-pkcs8 = { version = "0.10" }
 pin-project-lite = { version = "0.2" }
 pollster = { version = "0.4" }
 rand = { version = "0.9" }
@@ -151,30 +142,29 @@ rs_merkle = { git = "https://github.com/tlsnotary/rs-merkle.git", rev = "85f3e82
 rstest = { version = "0.17" }
 rustls = { version = "0.21" }
 rustls-pemfile = { version = "1.0" }
+rustls-webpki = { version = "0.103" }
+rustls-pki-types = { version = "1.12" }
 sct = { version = "0.7" }
+semver = { version = "1.0" }
 serde = { version = "1.0" }
 serde_json = { version = "1.0" }
 sha2 = { version = "0.10" }
 signature = { version = "2.2" }
 thiserror = { version = "1.0" }
+tiny-keccak = { version = "2.0" }
 tokio = { version = "1.38" }
-tokio-rustls = { version = "0.24" }
 tokio-util = { version = "0.7" }
 toml = { version = "0.8" }
 tower = { version = "0.5" }
 tower-http = { version = "0.5" }
 tower-service = { version = "0.3" }
-tower-util = { version = "0.3.1" }
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3" }
-uuid = { version = "1.4" }
 wasm-bindgen = { version = "0.2" }
 wasm-bindgen-futures = { version = "0.4" }
 web-spawn = { version = "0.2" }
 web-time = { version = "0.2" }
-webpki = { version = "0.22" }
-webpki-roots = { version = "0.26" }
-ws_stream_tungstenite = { version = "0.14" }
-# Use the patched ws_stream_wasm to fix the issue https://github.com/najamelan/ws_stream_wasm/issues/12#issuecomment-1711902958
-ws_stream_wasm = { git = "https://github.com/tlsnotary/ws_stream_wasm", rev = "2ed12aad9f0236e5321f577672f309920b2aef51" }
+webpki-roots = { version = "1.0" }
+webpki-root-certs = { version = "1.0" }
+ws_stream_wasm = { version = "0.7.5" }
 zeroize = { version = "1.8" }
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 [actions-url]: https://github.com/tlsnotary/tlsn/actions?query=workflow%3Aci+branch%3Adev

 [Website](https://tlsnotary.org) |
-[Documentation](https://docs.tlsnotary.org) |
+[Documentation](https://tlsnotary.org/docs/intro) |
 [API Docs](https://tlsnotary.github.io/tlsn) |
 [Discord](https://discord.gg/9XwESXtcN7)

@@ -44,12 +44,9 @@ at your option.
 ## Directory

 - [examples](./crates/examples/): Examples on how to use the TLSNotary protocol.
- [tlsn-prover](./crates/prover/): The library for the prover component.
- [tlsn-verifier](./crates/verifier/): The library for the verifier component.
- [notary](./crates/notary/): Implements the [notary server](https://docs.tlsnotary.org/intro.html#tls-verification-with-a-general-purpose-notary) and its client.
- [components](./crates/components/): Houses low-level libraries.
+- [tlsn](./crates/tlsn/): The TLSNotary library.

-This repository contains the source code for the Rust implementation of the TLSNotary protocol. For additional tools and implementations related to TLSNotary, visit <https://github.com/tlsnotary>. This includes repositories such as [`tlsn-js`](https://github.com/tlsnotary/tlsn-js), [`tlsn-extension`](https://github.com/tlsnotary/tlsn-extension), [`explorer`](https://github.com/tlsnotary/explorer), among others.
+This repository contains the source code for the Rust implementation of the TLSNotary protocol. For additional tools and implementations related to TLSNotary, visit <https://github.com/tlsnotary>. This includes repositories such as [`tlsn-js`](https://github.com/tlsnotary/tlsn-js), [`tlsn-extension`](https://github.com/tlsnotary/tlsn-extension), among others.


 ## Development
--- a/crates/attestation/Cargo.toml
+++ b/crates/attestation/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "tlsn-attestation"
+version = "0.1.0-alpha.14-pre"
+edition = "2024"
+
+[features]
+default = []
+fixtures = ["tlsn-core/fixtures", "dep:tlsn-data-fixtures"]
+
+[dependencies]
+tlsn-tls-core = { workspace = true }
+tlsn-core = { workspace = true, features = ["mozilla-certs"] }
+tlsn-data-fixtures = { workspace = true, optional = true }
+
+bcs = { workspace = true }
+blake3 = { workspace = true }
+p256 = { workspace = true, features = ["serde"] }
+k256 = { workspace = true }
+opaque-debug = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+tiny-keccak = { workspace = true, features = ["keccak"] }
+
+[dev-dependencies]
+alloy-primitives = { version = "1.3.1", default-features = false }
+alloy-signer = { version = "1.0", default-features = false }
+alloy-signer-local = { version = "1.0", default-features = false }
+rand06-compat = { workspace = true }
+rangeset = { workspace = true }
+rstest = { workspace = true }
+tlsn-core = { workspace = true, features = ["fixtures"] }
+tlsn-data-fixtures = { workspace = true }
+
+[lints]
+workspace = true
+
+[[test]]
+name = "api"
+required-features = ["fixtures"]
--- a/crates/core/src/attestation/builder.rs
+++ b/crates/core/src/attestation/builder.rs
@@ -1,19 +1,17 @@
 use std::error::Error;

-use rand::{rng, Rng};
+use rand::{Rng, rng};

-use crate::{
-    attestation::{
-        Attestation, AttestationConfig, Body, Extension, FieldId, Header, ServerCertCommitment,
-        VERSION,
-    },
+use tlsn_core::{
    connection::{ConnectionInfo, ServerEphemKey},
    hash::HashAlgId,
-    request::Request,
-    serialize::CanonicalSerialize,
-    signing::SignatureAlgId,
    transcript::TranscriptCommitment,
-    CryptoProvider,
+};
+
+use crate::{
+    Attestation, AttestationConfig, Body, CryptoProvider, Extension, FieldId, Header,
+    ServerCertCommitment, VERSION, request::Request, serialize::CanonicalSerialize,
+    signing::SignatureAlgId,
 };

 /// Attestation builder state for accepting a request.
@@ -233,7 +231,7 @@ impl std::fmt::Display for AttestationBuilderError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
@@ -243,14 +241,14 @@ impl std::fmt::Display for AttestationBuilderError {
 #[cfg(test)]
 mod test {
    use rstest::{fixture, rstest};
-    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};
-
-    use crate::{
-        connection::{HandshakeData, HandshakeDataV1_2},
-        fixtures::{encoding_provider, request_fixture, ConnectionFixture, RequestFixture},
-        hash::Blake3,
+    use tlsn_core::{
+        connection::{CertBinding, CertBindingV1_2},
+        fixtures::ConnectionFixture,
        transcript::Transcript,
    };
+    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};
+
+    use crate::fixtures::{RequestFixture, request_fixture};

    use super::*;

@@ -276,13 +274,7 @@ mod test {
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
        let connection = ConnectionFixture::tlsnotary(transcript.length());

-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection,
-            Blake3::default(),
-            Vec::new(),
-        );
+        let RequestFixture { request, .. } = request_fixture(transcript, connection, Vec::new());

        let attestation_config = AttestationConfig::builder()
            .supported_signature_algs([SignatureAlgId::SECP256R1])
@@ -301,13 +293,7 @@ mod test {
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
        let connection = ConnectionFixture::tlsnotary(transcript.length());

-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection,
-            Blake3::default(),
-            Vec::new(),
-        );
+        let RequestFixture { request, .. } = request_fixture(transcript, connection, Vec::new());

        let attestation_config = AttestationConfig::builder()
            .supported_signature_algs([SignatureAlgId::SECP256K1])
@@ -327,13 +313,7 @@ mod test {
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
        let connection = ConnectionFixture::tlsnotary(transcript.length());

-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection,
-            Blake3::default(),
-            Vec::new(),
-        );
+        let RequestFixture { request, .. } = request_fixture(transcript, connection, Vec::new());

        let attestation_builder = Attestation::builder(attestation_config)
            .accept_request(request)
@@ -354,13 +334,8 @@ mod test {
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
        let connection = ConnectionFixture::tlsnotary(transcript.length());

-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
+        let RequestFixture { request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());

        let mut attestation_builder = Attestation::builder(attestation_config)
            .accept_request(request)
@@ -384,13 +359,8 @@ mod test {
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
        let connection = ConnectionFixture::tlsnotary(transcript.length());

-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
+        let RequestFixture { request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());

        let mut attestation_builder = Attestation::builder(attestation_config)
            .accept_request(request)
@@ -400,10 +370,13 @@ mod test {
            server_cert_data, ..
        } = connection;

-        let HandshakeData::V1_2(HandshakeDataV1_2 {
+        let CertBinding::V1_2(CertBindingV1_2 {
            server_ephemeral_key,
            ..
-        }) = server_cert_data.handshake;
+        }) = server_cert_data.binding
+        else {
+            panic!("expected v1.2 handshake data");
+        };

        attestation_builder.server_ephemeral_key(server_ephemeral_key);

@@ -420,9 +393,7 @@ mod test {

        let RequestFixture { request, .. } = request_fixture(
            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
            connection.clone(),
-            Blake3::default(),
            vec![Extension {
                id: b"foo".to_vec(),
                value: b"bar".to_vec(),
@@ -449,9 +420,7 @@ mod test {

        let RequestFixture { request, .. } = request_fixture(
            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
            connection.clone(),
-            Blake3::default(),
            vec![Extension {
                id: b"foo".to_vec(),
                value: b"bar".to_vec(),
@@ -468,10 +437,13 @@ mod test {
            ..
        } = connection;

-        let HandshakeData::V1_2(HandshakeDataV1_2 {
+        let CertBinding::V1_2(CertBindingV1_2 {
            server_ephemeral_key,
            ..
-        }) = server_cert_data.handshake;
+        }) = server_cert_data.binding
+        else {
+            panic!("expected v1.2 handshake data");
+        };

        attestation_builder
            .connection_info(connection_info)
--- a/crates/core/src/attestation/config.rs
+++ b/crates/core/src/attestation/config.rs
@@ -1,9 +1,9 @@
 use std::{fmt::Debug, sync::Arc};

+use tlsn_core::hash::HashAlgId;
+
 use crate::{
-    attestation::{Extension, InvalidExtension},
-    hash::{HashAlgId, DEFAULT_SUPPORTED_HASH_ALGS},
-    signing::SignatureAlgId,
+    Extension, InvalidExtension, hash::DEFAULT_SUPPORTED_HASH_ALGS, signing::SignatureAlgId,
 };

 type ExtensionValidator = Arc<dyn Fn(&[Extension]) -> Result<(), InvalidExtension> + Send + Sync>;
@@ -124,7 +124,7 @@ impl AttestationConfigBuilder {
    ///
    /// # Example
    /// ```
-    /// # use tlsn_core::attestation::{AttestationConfig, InvalidExtension};
+    /// # use tlsn_attestation::{AttestationConfig, InvalidExtension};
    /// # let mut builder = AttestationConfig::builder();
    /// builder.extension_validator(|extensions| {
    ///     for extension in extensions {
--- a/crates/attestation/src/connection.rs
+++ b/crates/attestation/src/connection.rs
@@ -0,0 +1,149 @@
+//! Types for committing details of a connection.
+//!
+//! ## Commitment
+//!
+//! During the TLS handshake the Notary receives the Server's ephemeral public
+//! key, and this key serves as a binding commitment to the identity of the
+//! Server. The ephemeral key itself does not reveal the Server's identity, but
+//! it is bound to it via a signature created using the Server's
+//! X.509 certificate.
+//!
+//! A Prover can withhold the Server's signature and certificate chain from the
+//! Notary to improve privacy and censorship resistance.
+//!
+//! ## Proving the Server's identity
+//!
+//! A Prover can prove the Server's identity to a Verifier by sending a
+//! [`ServerIdentityProof`]. This proof contains all the information required to
+//! establish the link between the TLS connection and the Server's X.509
+//! certificate. A Verifier checks the Server's certificate against their own
+//! trust anchors, the same way a typical TLS client would.
+
+use serde::{Deserialize, Serialize};
+
+use tlsn_core::{
+    connection::{HandshakeData, HandshakeVerificationError, ServerEphemKey, ServerName},
+    hash::{Blinded, HashAlgorithm, HashProviderError, TypedHash},
+};
+
+use crate::{CryptoProvider, hash::HashAlgorithmExt, serialize::impl_domain_separator};
+
+/// Opens a [`ServerCertCommitment`].
+#[derive(Clone, Serialize, Deserialize)]
+pub struct ServerCertOpening(Blinded<HandshakeData>);
+
+impl_domain_separator!(ServerCertOpening);
+
+opaque_debug::implement!(ServerCertOpening);
+
+impl ServerCertOpening {
+    pub(crate) fn new(data: HandshakeData) -> Self {
+        Self(Blinded::new(data))
+    }
+
+    pub(crate) fn commit(&self, hasher: &dyn HashAlgorithm) -> ServerCertCommitment {
+        ServerCertCommitment(TypedHash {
+            alg: hasher.id(),
+            value: hasher.hash_separated(self),
+        })
+    }
+
+    /// Returns the server identity data.
+    pub fn data(&self) -> &HandshakeData {
+        self.0.data()
+    }
+}
+
+/// Commitment to a server certificate.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct ServerCertCommitment(pub(crate) TypedHash);
+
+impl_domain_separator!(ServerCertCommitment);
+
+/// TLS server identity proof.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ServerIdentityProof {
+    name: ServerName,
+    opening: ServerCertOpening,
+}
+
+impl ServerIdentityProof {
+    pub(crate) fn new(name: ServerName, opening: ServerCertOpening) -> Self {
+        Self { name, opening }
+    }
+
+    /// Verifies the server identity proof.
+    ///
+    /// # Arguments
+    ///
+    /// * `provider` - Crypto provider.
+    /// * `time` - The time of the connection.
+    /// * `server_ephemeral_key` - The server's ephemeral key.
+    /// * `commitment` - Commitment to the server certificate.
+    pub fn verify_with_provider(
+        self,
+        provider: &CryptoProvider,
+        time: u64,
+        server_ephemeral_key: &ServerEphemKey,
+        commitment: &ServerCertCommitment,
+    ) -> Result<ServerName, ServerIdentityProofError> {
+        let hasher = provider.hash.get(&commitment.0.alg)?;
+
+        if commitment.0.value != hasher.hash_separated(&self.opening) {
+            return Err(ServerIdentityProofError {
+                kind: ErrorKind::Commitment,
+                message: "certificate opening does not match commitment".to_string(),
+            });
+        }
+
+        // Verify certificate and identity.
+        self.opening
+            .data()
+            .verify(&provider.cert, time, server_ephemeral_key, &self.name)?;
+
+        Ok(self.name)
+    }
+}
+
+/// Error for [`ServerIdentityProof`].
+#[derive(Debug, thiserror::Error)]
+#[error("server identity proof error: {kind}: {message}")]
+pub struct ServerIdentityProofError {
+    kind: ErrorKind,
+    message: String,
+}
+
+impl From<HashProviderError> for ServerIdentityProofError {
+    fn from(err: HashProviderError) -> Self {
+        Self {
+            kind: ErrorKind::Provider,
+            message: err.to_string(),
+        }
+    }
+}
+
+impl From<HandshakeVerificationError> for ServerIdentityProofError {
+    fn from(err: HandshakeVerificationError) -> Self {
+        Self {
+            kind: ErrorKind::Certificate,
+            message: err.to_string(),
+        }
+    }
+}
+
+#[derive(Debug)]
+enum ErrorKind {
+    Provider,
+    Commitment,
+    Certificate,
+}
+
+impl std::fmt::Display for ErrorKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ErrorKind::Provider => write!(f, "provider"),
+            ErrorKind::Commitment => write!(f, "commitment"),
+            ErrorKind::Certificate => write!(f, "certificate"),
+        }
+    }
+}
--- a/crates/core/src/attestation/extension.rs
+++ b/crates/core/src/attestation/extension.rs
@@ -2,7 +2,7 @@ use std::error::Error;

 use serde::{Deserialize, Serialize};

-use crate::hash::impl_domain_separator;
+use crate::serialize::impl_domain_separator;

 /// An attestation extension.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
--- a/crates/attestation/src/fixtures.rs
+++ b/crates/attestation/src/fixtures.rs
@@ -0,0 +1,176 @@
+//! Attestation fixtures.
+use tlsn_core::{
+    connection::{CertBinding, CertBindingV1_2},
+    fixtures::ConnectionFixture,
+    transcript::{Transcript, TranscriptCommitConfigBuilder, TranscriptCommitment},
+};
+
+use crate::{
+    Attestation, AttestationConfig, CryptoProvider, Extension,
+    request::{Request, RequestConfig},
+    signing::{
+        KeyAlgId, SignatureAlgId, SignatureVerifier, SignatureVerifierProvider, Signer,
+        SignerProvider,
+    },
+};
+
+/// A Request fixture used for testing.
+#[allow(missing_docs)]
+pub struct RequestFixture {
+    pub request: Request,
+}
+
+/// Returns a request fixture for testing.
+pub fn request_fixture(
+    transcript: Transcript,
+    connection: ConnectionFixture,
+    extensions: Vec<Extension>,
+) -> RequestFixture {
+    let provider = CryptoProvider::default();
+    let (sent_len, recv_len) = transcript.len();
+
+    let ConnectionFixture {
+        server_name,
+        server_cert_data,
+        ..
+    } = connection;
+
+    let mut transcript_commitment_builder = TranscriptCommitConfigBuilder::new(&transcript);
+    transcript_commitment_builder
+        .commit_sent(&(0..sent_len))
+        .unwrap()
+        .commit_recv(&(0..recv_len))
+        .unwrap();
+    let transcripts_commitment_config = transcript_commitment_builder.build().unwrap();
+
+    let mut builder = RequestConfig::builder();
+
+    builder.transcript_commit(transcripts_commitment_config);
+
+    for extension in extensions {
+        builder.extension(extension);
+    }
+
+    let request_config = builder.build().unwrap();
+
+    let mut request_builder = Request::builder(&request_config);
+    request_builder
+        .server_name(server_name)
+        .handshake_data(server_cert_data)
+        .transcript(transcript);
+
+    let (request, _) = request_builder.build(&provider).unwrap();
+
+    RequestFixture { request }
+}
+
+/// Returns an attestation fixture for testing.
+pub fn attestation_fixture(
+    request: Request,
+    connection: ConnectionFixture,
+    signature_alg: SignatureAlgId,
+    transcript_commitments: &[TranscriptCommitment],
+) -> Attestation {
+    let ConnectionFixture {
+        connection_info,
+        server_cert_data,
+        ..
+    } = connection;
+
+    let CertBinding::V1_2(CertBindingV1_2 {
+        server_ephemeral_key,
+        ..
+    }) = server_cert_data.binding
+    else {
+        panic!("expected v1.2 binding data");
+    };
+
+    let mut provider = CryptoProvider::default();
+    match signature_alg {
+        SignatureAlgId::SECP256K1 => provider.signer.set_secp256k1(&[42u8; 32]).unwrap(),
+        SignatureAlgId::SECP256K1ETH => provider.signer.set_secp256k1eth(&[43u8; 32]).unwrap(),
+        SignatureAlgId::SECP256R1 => provider.signer.set_secp256r1(&[44u8; 32]).unwrap(),
+        _ => unimplemented!(),
+    };
+
+    let attestation_config = AttestationConfig::builder()
+        .supported_signature_algs([signature_alg])
+        .build()
+        .unwrap();
+
+    let mut attestation_builder = Attestation::builder(&attestation_config)
+        .accept_request(request)
+        .unwrap();
+
+    attestation_builder
+        .connection_info(connection_info)
+        .server_ephemeral_key(server_ephemeral_key)
+        .transcript_commitments(transcript_commitments.to_vec());
+
+    attestation_builder.build(&provider).unwrap()
+}
+
+/// Returns a crypto provider which supports only a custom signature alg.
+pub fn custom_provider_fixture() -> CryptoProvider {
+    const CUSTOM_SIG_ALG_ID: SignatureAlgId = SignatureAlgId::new(128);
+
+    // A dummy signer.
+    struct DummySigner {}
+    impl Signer for DummySigner {
+        fn alg_id(&self) -> SignatureAlgId {
+            CUSTOM_SIG_ALG_ID
+        }
+
+        fn sign(
+            &self,
+            msg: &[u8],
+        ) -> Result<crate::signing::Signature, crate::signing::SignatureError> {
+            Ok(crate::signing::Signature {
+                alg: CUSTOM_SIG_ALG_ID,
+                data: msg.to_vec(),
+            })
+        }
+
+        fn verifying_key(&self) -> crate::signing::VerifyingKey {
+            crate::signing::VerifyingKey {
+                alg: KeyAlgId::new(128),
+                data: vec![1, 2, 3, 4],
+            }
+        }
+    }
+
+    // A dummy verifier.
+    struct DummyVerifier {}
+    impl SignatureVerifier for DummyVerifier {
+        fn alg_id(&self) -> SignatureAlgId {
+            CUSTOM_SIG_ALG_ID
+        }
+
+        fn verify(
+            &self,
+            _key: &crate::signing::VerifyingKey,
+            msg: &[u8],
+            sig: &[u8],
+        ) -> Result<(), crate::signing::SignatureError> {
+            if msg == sig {
+                Ok(())
+            } else {
+                Err(crate::signing::SignatureError::from_str(
+                    "invalid signature",
+                ))
+            }
+        }
+    }
+
+    let mut provider = CryptoProvider::default();
+
+    let mut signer_provider = SignerProvider::default();
+    signer_provider.set_signer(Box::new(DummySigner {}));
+    provider.signer = signer_provider;
+
+    let mut verifier_provider = SignatureVerifierProvider::empty();
+    verifier_provider.set_verifier(Box::new(DummyVerifier {}));
+    provider.signature = verifier_provider;
+
+    provider
+}
--- a/crates/attestation/src/hash.rs
+++ b/crates/attestation/src/hash.rs
@@ -0,0 +1,19 @@
+use tlsn_core::hash::{Hash, HashAlgId, HashAlgorithm};
+
+use crate::serialize::{CanonicalSerialize, DomainSeparator};
+
+pub(crate) const DEFAULT_SUPPORTED_HASH_ALGS: &[HashAlgId] =
+    &[HashAlgId::SHA256, HashAlgId::BLAKE3, HashAlgId::KECCAK256];
+
+pub(crate) trait HashAlgorithmExt: HashAlgorithm {
+    #[allow(dead_code)]
+    fn hash_canonical<T: CanonicalSerialize>(&self, data: &T) -> Hash {
+        self.hash(&data.serialize())
+    }
+
+    fn hash_separated<T: DomainSeparator + CanonicalSerialize>(&self, data: &T) -> Hash {
+        self.hash_prefixed(data.domain(), &data.serialize())
+    }
+}
+
+impl<T: HashAlgorithm + ?Sized> HashAlgorithmExt for T {}
--- a/crates/core/src/attestation.rs
+++ b/crates/core/src/attestation.rs
@@ -1,4 +1,28 @@
-//! Attestation types.
+//! TLSNotary attestation types.
+//!
+//! # Introduction
+//!
+//! This library provides core functionality for TLSNotary **attestations**.
+//!
+//! Once the TLS commitment protocol has been completed the Prover holds a
+//! collection of commitments pertaining to the TLS connection. Most
+//! importantly, the Prover is committed to the
+//! [`ServerName`](tlsn_core::connection::ServerName),
+//! and the [`Transcript`](tlsn_core::transcript::Transcript) of application
+//! data. Subsequently, the Prover can request an [`Attestation`] from the
+//! Notary who will include the commitments as well as any additional
+//! information which may be useful to an attestation Verifier.
+//!
+//! Holding an attestation, the Prover can construct a
+//! [`Presentation`](crate::presentation::Presentation) which facilitates
+//! selectively disclosing various aspects of the TLS connection to a Verifier.
+//! If the Verifier trusts the Notary, or more specifically the verifying key of
+//! the attestation, then the Verifier can trust the authenticity of the
+//! information disclosed in the presentation.
+//!
+//! **Be sure to check out the various submodules for more information.**
+//!
+//! # Structure
 //!
 //! An attestation is a cryptographically signed document issued by a Notary who
 //! witnessed a TLS connection. It contains various fields which can be used to
@@ -24,37 +48,190 @@
 //! extensions](crate::request::RequestConfigBuilder::extension)
 //! to their attestation request, provided that the Notary supports them
 //! (disallowed by default). A Notary may also be configured to
-//! [validate](crate::attestation::AttestationConfigBuilder::extension_validator)
+//! [validate](crate::AttestationConfigBuilder::extension_validator)
 //! any extensions requested by a Prover using custom application logic.
 //! Additionally, a Notary may
-//! [include](crate::attestation::AttestationBuilder::extension)
+//! [include](crate::AttestationBuilder::extension)
 //! their own extensions.
+//!
+//! # Committing to the transcript
+//!
+//! The TLS commitment protocol produces commitments to the entire transcript of
+//! application data. However, we may want to disclose only a subset of the data
+//! in a presentation. Prior to attestation, the Prover has the opportunity to
+//! slice and dice the commitments into smaller sections which can be
+//! selectively disclosed. Additionally, the Prover may want to use different
+//! commitment schemes depending on the context they expect to disclose.
+//!
+//! The primary API for this process is the
+//! [`TranscriptCommitConfigBuilder`](tlsn_core::transcript::TranscriptCommitConfigBuilder)
+//! which is used to build up a configuration.
+//!
+//! ```no_run
+//! # use tlsn_core::transcript::{TranscriptCommitConfigBuilder, Transcript, Direction};
+//! # use tlsn_core::hash::HashAlgId;
+//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
+//! # let transcript: Transcript = unimplemented!();
+//! let (sent_len, recv_len) = transcript.len();
+//!
+//! // Create a new configuration builder.
+//! let mut builder = TranscriptCommitConfigBuilder::new(&transcript);
+//!
+//! // Specify all the transcript commitments we want to make.
+//! builder
+//!     // Commit to all sent data.
+//!     .commit_sent(&(0..sent_len))?
+//!     // Commit to the first 10 bytes of sent data.
+//!     .commit_sent(&(0..10))?
+//!     // Skip some bytes so it can be omitted in the presentation.
+//!     .commit_sent(&(20..sent_len))?
+//!     // Commit to all received data.
+//!     .commit_recv(&(0..recv_len))?;
+//!
+//! let config = builder.build()?;
+//! # Ok(())
+//! # }
+//! ```
+//!
+//! # Requesting an attestation
+//!
+//! The first step in the attestation protocol is for the Prover to make a
+//! [`Request`](crate::request::Request), which can be configured using the
+//! associated [builder](crate::request::RequestConfigBuilder). With it the
+//! Prover can configure some of the details of the attestation, such as which
+//! cryptographic algorithms are used (if the Notary supports them).
+//!
+//! The Prover may also request for extensions to be added to the attestation,
+//! see [here](#extensions) for more information.
+//!
+//! Upon being issued an attestation, the Prover will also hold a corresponding
+//! [`Secrets`] which contains all private information. This pair can be stored
+//! and used later to construct a
+//! [`Presentation`](crate::presentation::Presentation), [see
+//! below](#constructing-a-presentation).
+//!
+//! # Issuing an attestation
+//!
+//! Upon receiving a request, the Notary can issue an [`Attestation`] which can
+//! be configured using the associated
+//! [builder](crate::AttestationConfigBuilder).
+//!
+//! The Notary's [`CryptoProvider`] must be configured with an appropriate
+//! signing key for attestations. See
+//! [`SignerProvider`](crate::signing::SignerProvider) for more information.
+//!
+//! # Constructing a presentation
+//!
+//! A Prover can use an [`Attestation`] and the corresponding [`Secrets`] to
+//! construct a verifiable [`Presentation`](crate::presentation::Presentation).
+//!
+//! ```no_run
+//! # use tlsn_attestation::{Attestation, CryptoProvider, Secrets, presentation::Presentation};
+//! # use tlsn_core::transcript::Direction;
+//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
+//! # let attestation: Attestation = unimplemented!();
+//! # let secrets: Secrets = unimplemented!();
+//! # let crypto_provider: CryptoProvider = unimplemented!();
+//! let (_sent_len, recv_len) = secrets.transcript().len();
+//!
+//! // First, we decide which application data we would like to disclose.
+//! let mut builder = secrets.transcript_proof_builder();
+//!
+//! builder
+//!     // Disclose the first 10 bytes of the sent data.
+//!     .reveal(&(0..10), Direction::Sent)?
+//!     // Disclose all of the received data.
+//!     .reveal(&(0..recv_len), Direction::Received)?;
+//!
+//! let transcript_proof = builder.build()?;
+//!
+//! // Most cases we will also disclose the server identity.
+//! let identity_proof = secrets.identity_proof();
+//!
+//! // Now we can construct the presentation.
+//! let mut builder = attestation.presentation_builder(&crypto_provider);
+//!
+//! builder
+//!     .identity_proof(identity_proof)
+//!     .transcript_proof(transcript_proof);
+//!
+//! // Finally, we build the presentation. Send it to a verifier!
+//! let presentation: Presentation = builder.build()?;
+//! # Ok(())
+//! # }
+//! ```
+//!
+//! # Verifying a presentation
+//!
+//! Verifying a presentation is as simple as checking the verifier trusts the
+//! verifying key then calling
+//! [`Presentation::verify`](crate::presentation::Presentation::verify).
+//!
+//! ```no_run
+//! # use tlsn_attestation::{CryptoProvider, presentation::{Presentation, PresentationOutput}, signing::VerifyingKey};
+//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
+//! # let presentation: Presentation = unimplemented!();
+//! # let trusted_key: VerifyingKey = unimplemented!();
+//! # let crypto_provider: CryptoProvider = unimplemented!();
+//! // Assert that we trust the verifying key.
+//! assert_eq!(presentation.verifying_key(), &trusted_key);
+//!
+//! let PresentationOutput {
+//!     attestation,
+//!     server_name,
+//!     connection_info,
+//!     transcript,
+//!     ..
+//! } = presentation.verify(&crypto_provider)?;
+//! # Ok(())
+//! # }
+//! ```
+
+#![deny(missing_docs, unreachable_pub, unused_must_use)]
+#![deny(clippy::all)]
+#![forbid(unsafe_code)]

 mod builder;
 mod config;
+pub mod connection;
 mod extension;
+#[cfg(any(test, feature = "fixtures"))]
+pub mod fixtures;
+pub(crate) mod hash;
+pub mod presentation;
 mod proof;
+mod provider;
+pub mod request;
+mod secrets;
+pub(crate) mod serialize;
+pub mod signing;

 use std::fmt;

 use rand::distr::{Distribution, StandardUniform};
 use serde::{Deserialize, Serialize};

-use crate::{
-    connection::{ConnectionInfo, ServerCertCommitment, ServerEphemKey},
-    hash::{impl_domain_separator, Hash, HashAlgorithm, HashAlgorithmExt, TypedHash},
+use tlsn_core::{
+    connection::{ConnectionInfo, ServerEphemKey},
+    hash::{Hash, HashAlgorithm, TypedHash},
    merkle::MerkleTree,
-    presentation::PresentationBuilder,
-    signing::{Signature, VerifyingKey},
    transcript::TranscriptCommitment,
-    CryptoProvider,
+};
+
+use crate::{
+    connection::ServerCertCommitment,
+    hash::HashAlgorithmExt,
+    presentation::PresentationBuilder,
+    serialize::impl_domain_separator,
+    signing::{Signature, VerifyingKey},
 };

 pub use builder::{AttestationBuilder, AttestationBuilderError};
 pub use config::{AttestationConfig, AttestationConfigBuilder, AttestationConfigError};
 pub use extension::{Extension, InvalidExtension};
 pub use proof::{AttestationError, AttestationProof};
-
+pub use provider::CryptoProvider;
+pub use secrets::Secrets;
 /// Current version of attestations.
 pub const VERSION: Version = Version(0);

@@ -120,15 +297,11 @@ pub enum FieldKind {
    ServerEphemKey = 0x02,
    /// Server identity commitment.
    ServerIdentityCommitment = 0x03,
-    /// Encoding commitment.
-    EncodingCommitment = 0x04,
    /// Plaintext hash commitment.
    PlaintextHash = 0x05,
 }

 /// Attestation header.
-///
-/// See [module level documentation](crate::attestation) for more information.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Header {
    /// An identifier for the attestation.
@@ -142,8 +315,6 @@ pub struct Header {
 impl_domain_separator!(Header);

 /// Attestation body.
-///
-/// See [module level documentation](crate::attestation) for more information.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Body {
    verifying_key: Field<VerifyingKey>,
@@ -246,8 +417,6 @@ impl Body {
 }

 /// An attestation document.
-///
-/// See [module level documentation](crate::attestation) for more information.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Attestation {
    /// The signature of the attestation.
--- a/crates/attestation/src/presentation.rs
+++ b/crates/attestation/src/presentation.rs
@@ -26,12 +26,15 @@ use std::fmt;

 use serde::{Deserialize, Serialize};

-use crate::{
-    attestation::{Attestation, AttestationError, AttestationProof, Extension},
-    connection::{ConnectionInfo, ServerIdentityProof, ServerIdentityProofError, ServerName},
-    signing::VerifyingKey,
+use tlsn_core::{
+    connection::{ConnectionInfo, ServerName},
    transcript::{PartialTranscript, TranscriptProof, TranscriptProofError},
-    CryptoProvider,
+};
+
+use crate::{
+    Attestation, AttestationError, AttestationProof, CryptoProvider, Extension,
+    connection::{ServerIdentityProof, ServerIdentityProofError},
+    signing::VerifyingKey,
 };

 /// A verifiable presentation.
@@ -86,7 +89,7 @@ impl Presentation {
        let transcript = transcript
            .map(|transcript| {
                transcript.verify_with_provider(
-                    provider,
+                    &provider.hash,
                    &attestation.body.connection_info().transcript_length,
                    attestation.body.transcript_commitments(),
                )
@@ -186,7 +189,7 @@ impl fmt::Display for PresentationBuilderError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
@@ -227,7 +230,7 @@ impl fmt::Display for PresentationError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
--- a/crates/core/src/attestation/proof.rs
+++ b/crates/core/src/attestation/proof.rs
@@ -2,13 +2,15 @@ use std::fmt;

 use serde::{Deserialize, Serialize};

-use crate::{
-    attestation::{Attestation, Body, Header},
+use tlsn_core::{
    hash::HashAlgorithm,
    merkle::{MerkleProof, MerkleTree},
+};
+
+use crate::{
+    Attestation, Body, CryptoProvider, Header,
    serialize::CanonicalSerialize,
    signing::{Signature, VerifyingKey},
-    CryptoProvider,
 };

 /// Proof of an attestation.
@@ -165,7 +167,7 @@ impl fmt::Display for AttestationError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
--- a/crates/attestation/src/provider.rs
+++ b/crates/attestation/src/provider.rs
@@ -1,12 +1,6 @@
-use tls_core::{
-    anchors::{OwnedTrustAnchor, RootCertStore},
-    verify::WebPkiVerifier,
-};
+use tlsn_core::{hash::HashProvider, webpki::ServerCertVerifier};

-use crate::{
-    hash::HashProvider,
-    signing::{SignatureVerifierProvider, SignerProvider},
-};
+use crate::signing::{SignatureVerifierProvider, SignerProvider};

 /// Cryptography provider.
 ///
@@ -17,7 +11,7 @@ use crate::{
 /// implementations.
 ///
 /// Algorithms are uniquely identified using an 8-bit ID, eg.
-/// [`HashAlgId`](crate::hash::HashAlgId), half of which is reserved for the
+/// [`HashAlgId`](tlsn_core::hash::HashAlgId), half of which is reserved for the
 /// officially supported algorithms. If you think that a new algorithm should be
 /// added to the official set, please open an issue. Beware that other parties
 /// may assign different algorithms to the same ID as you, and we make no effort
@@ -30,7 +24,7 @@ pub struct CryptoProvider {
    /// This is used to verify the server's certificate chain.
    ///
    /// The default verifier uses the Mozilla root certificates.
-    pub cert: WebPkiVerifier,
+    pub cert: ServerCertVerifier,
    /// Signer provider.
    ///
    /// This is used for signing attestations.
@@ -47,21 +41,9 @@ impl Default for CryptoProvider {
    fn default() -> Self {
        Self {
            hash: Default::default(),
-            cert: default_cert_verifier(),
+            cert: ServerCertVerifier::mozilla(),
            signer: Default::default(),
            signature: Default::default(),
        }
    }
 }
-
-pub(crate) fn default_cert_verifier() -> WebPkiVerifier {
-    let mut root_store = RootCertStore::empty();
-    root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
-        OwnedTrustAnchor::from_subject_spki_name_constraints(
-            ta.subject.as_ref(),
-            ta.subject_public_key_info.as_ref(),
-            ta.name_constraints.as_ref().map(|nc| nc.as_ref()),
-        )
-    }));
-    WebPkiVerifier::new(root_store, None)
-}
--- a/crates/attestation/src/request.rs
+++ b/crates/attestation/src/request.rs
@@ -0,0 +1,281 @@
+//! Attestation requests.
+//!
+//! After the TLS connection, a Prover can request an attestation from the
+//! Notary which contains various information about the connection. During this
+//! process the Prover has the opportunity to configure certain aspects of the
+//! attestation, such as which signature algorithm the Notary should use to sign
+//! the attestation. Or which hash algorithm the Notary should use to merkelize
+//! the fields.
+//!
+//! A [`Request`] can be created using a [`RequestBuilder`]. The builder will
+//! take both configuration via a [`RequestConfig`] as well as the Prover's
+//! secret data. The [`Secrets`](crate::Secrets) are of course not shared with
+//! the Notary but are used to create commitments which are included in the
+//! attestation.
+
+mod builder;
+mod config;
+
+use serde::{Deserialize, Serialize};
+
+use tlsn_core::hash::HashAlgId;
+
+use crate::{
+    Attestation, CryptoProvider, Extension, connection::ServerCertCommitment,
+    serialize::CanonicalSerialize, signing::SignatureAlgId,
+};
+
+pub use builder::{RequestBuilder, RequestBuilderError};
+pub use config::{RequestConfig, RequestConfigBuilder, RequestConfigBuilderError};
+
+/// Attestation request.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Request {
+    pub(crate) signature_alg: SignatureAlgId,
+    pub(crate) hash_alg: HashAlgId,
+    pub(crate) server_cert_commitment: ServerCertCommitment,
+    pub(crate) extensions: Vec<Extension>,
+}
+
+impl Request {
+    /// Returns a new request builder.
+    pub fn builder(config: &RequestConfig) -> RequestBuilder<'_> {
+        RequestBuilder::new(config)
+    }
+
+    /// Validates the content of the attestation against this request.
+    pub fn validate(
+        &self,
+        attestation: &Attestation,
+        provider: &CryptoProvider,
+    ) -> Result<(), AttestationValidationError> {
+        if attestation.signature.alg != self.signature_alg {
+            return Err(AttestationValidationError::inconsistent(format!(
+                "signature algorithm: expected {:?}, got {:?}",
+                self.signature_alg, attestation.signature.alg
+            )));
+        }
+
+        if attestation.header.root.alg != self.hash_alg {
+            return Err(AttestationValidationError::inconsistent(format!(
+                "hash algorithm: expected {:?}, got {:?}",
+                self.hash_alg, attestation.header.root.alg
+            )));
+        }
+
+        if attestation.body.cert_commitment() != &self.server_cert_commitment {
+            return Err(AttestationValidationError::inconsistent(
+                "server certificate commitment does not match",
+            ));
+        }
+
+        // TODO: improve the O(M*N) complexity of this check.
+        for extension in &self.extensions {
+            if !attestation.body.extensions().any(|e| e == extension) {
+                return Err(AttestationValidationError::inconsistent(
+                    "extension is missing from the attestation",
+                ));
+            }
+        }
+
+        let verifier = provider
+            .signature
+            .get(&attestation.signature.alg)
+            .map_err(|_| {
+                AttestationValidationError::provider(format!(
+                    "provider not configured for signature algorithm id {:?}",
+                    attestation.signature.alg,
+                ))
+            })?;
+
+        verifier
+            .verify(
+                &attestation.body.verifying_key.data,
+                &CanonicalSerialize::serialize(&attestation.header),
+                &attestation.signature.data,
+            )
+            .map_err(|_| {
+                AttestationValidationError::inconsistent("failed to verify the signature")
+            })?;
+
+        Ok(())
+    }
+}
+
+/// Error for [`Request::validate`].
+#[derive(Debug, thiserror::Error)]
+#[error("attestation validation error: {kind}: {message}")]
+pub struct AttestationValidationError {
+    kind: ErrorKind,
+    message: String,
+}
+
+impl AttestationValidationError {
+    fn inconsistent(msg: impl Into<String>) -> Self {
+        Self {
+            kind: ErrorKind::Inconsistent,
+            message: msg.into(),
+        }
+    }
+
+    fn provider(msg: impl Into<String>) -> Self {
+        Self {
+            kind: ErrorKind::Provider,
+            message: msg.into(),
+        }
+    }
+}
+
+#[derive(Debug)]
+enum ErrorKind {
+    Inconsistent,
+    Provider,
+}
+
+impl std::fmt::Display for ErrorKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ErrorKind::Inconsistent => write!(f, "inconsistent"),
+            ErrorKind::Provider => write!(f, "provider"),
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use tlsn_core::{
+        connection::TranscriptLength, fixtures::ConnectionFixture, hash::HashAlgId,
+        transcript::Transcript,
+    };
+    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};
+
+    use crate::{
+        CryptoProvider,
+        connection::ServerCertOpening,
+        fixtures::{RequestFixture, attestation_fixture, custom_provider_fixture, request_fixture},
+        request::{AttestationValidationError, ErrorKind},
+        signing::SignatureAlgId,
+    };
+
+    #[test]
+    fn test_success() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        let provider = CryptoProvider::default();
+
+        assert!(request.validate(&attestation, &provider).is_ok())
+    }
+
+    #[test]
+    fn test_wrong_signature_alg() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { mut request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        request.signature_alg = SignatureAlgId::SECP256R1;
+
+        let provider = CryptoProvider::default();
+
+        let res = request.validate(&attestation, &provider);
+        assert!(res.is_err());
+    }
+
+    #[test]
+    fn test_wrong_hash_alg() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { mut request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        request.hash_alg = HashAlgId::SHA256;
+
+        let provider = CryptoProvider::default();
+
+        let res = request.validate(&attestation, &provider);
+        assert!(res.is_err())
+    }
+
+    #[test]
+    fn test_wrong_server_commitment() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { mut request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        let ConnectionFixture {
+            server_cert_data, ..
+        } = ConnectionFixture::appliedzkp(TranscriptLength {
+            sent: 100,
+            received: 100,
+        });
+        let opening = ServerCertOpening::new(server_cert_data);
+
+        let provider = CryptoProvider::default();
+        request.server_cert_commitment =
+            opening.commit(provider.hash.get(&HashAlgId::BLAKE3).unwrap());
+
+        let res = request.validate(&attestation, &provider);
+        assert!(res.is_err())
+    }
+
+    #[test]
+    fn test_wrong_sig() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let mut attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        // Corrupt the signature.
+        attestation.signature.data[1] = attestation.signature.data[1].wrapping_add(1);
+
+        let provider = CryptoProvider::default();
+
+        assert!(request.validate(&attestation, &provider).is_err())
+    }
+
+    #[test]
+    fn test_wrong_provider() {
+        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
+        let connection = ConnectionFixture::tlsnotary(transcript.length());
+
+        let RequestFixture { request, .. } =
+            request_fixture(transcript, connection.clone(), Vec::new());
+
+        let attestation =
+            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
+
+        let provider = custom_provider_fixture();
+
+        assert!(matches!(
+            request.validate(&attestation, &provider),
+            Err(AttestationValidationError {
+                kind: ErrorKind::Provider,
+                ..
+            })
+        ))
+    }
+}
--- a/crates/attestation/src/request/builder.rs
+++ b/crates/attestation/src/request/builder.rs
@@ -1,16 +1,19 @@
-use crate::{
-    connection::{ServerCertData, ServerCertOpening, ServerName},
-    request::{Request, RequestConfig},
-    secrets::Secrets,
+use tlsn_core::{
+    connection::{HandshakeData, ServerName},
    transcript::{Transcript, TranscriptCommitment, TranscriptSecret},
-    CryptoProvider,
+};
+
+use crate::{
+    CryptoProvider, Secrets,
+    connection::ServerCertOpening,
+    request::{Request, RequestConfig},
 };

 /// Builder for [`Request`].
 pub struct RequestBuilder<'a> {
    config: &'a RequestConfig,
    server_name: Option<ServerName>,
-    server_cert_data: Option<ServerCertData>,
+    handshake_data: Option<HandshakeData>,
    transcript: Option<Transcript>,
    transcript_commitments: Vec<TranscriptCommitment>,
    transcript_commitment_secrets: Vec<TranscriptSecret>,
@@ -22,7 +25,7 @@ impl<'a> RequestBuilder<'a> {
        Self {
            config,
            server_name: None,
-            server_cert_data: None,
+            handshake_data: None,
            transcript: None,
            transcript_commitments: Vec::new(),
            transcript_commitment_secrets: Vec::new(),
@@ -35,9 +38,9 @@ impl<'a> RequestBuilder<'a> {
        self
    }

-    /// Sets the server identity data.
-    pub fn server_cert_data(&mut self, data: ServerCertData) -> &mut Self {
-        self.server_cert_data = Some(data);
+    /// Sets the handshake data.
+    pub fn handshake_data(&mut self, data: HandshakeData) -> &mut Self {
+        self.handshake_data = Some(data);
        self
    }

@@ -66,7 +69,7 @@ impl<'a> RequestBuilder<'a> {
        let Self {
            config,
            server_name,
-            server_cert_data,
+            handshake_data: server_cert_data,
            transcript,
            transcript_commitments,
            transcript_commitment_secrets,
--- a/crates/attestation/src/request/config.rs
+++ b/crates/attestation/src/request/config.rs
@@ -1,7 +1,6 @@
-use crate::{
-    attestation::Extension, hash::HashAlgId, signing::SignatureAlgId,
-    transcript::TranscriptCommitConfig,
-};
+use tlsn_core::{hash::HashAlgId, transcript::TranscriptCommitConfig};
+
+use crate::{Extension, signing::SignatureAlgId};

 /// Request configuration.
 #[derive(Debug, Clone)]
--- a/crates/attestation/src/secrets.rs
+++ b/crates/attestation/src/secrets.rs
@@ -1,11 +1,13 @@
 use serde::{Deserialize, Serialize};

-use crate::{
-    connection::{ServerCertOpening, ServerIdentityProof, ServerName},
+use tlsn_core::{
+    connection::ServerName,
    transcript::{Transcript, TranscriptCommitment, TranscriptProofBuilder, TranscriptSecret},
 };

-/// Secret data of an [`Attestation`](crate::attestation::Attestation).
+use crate::connection::{ServerCertOpening, ServerIdentityProof};
+
+/// Secret data of an [`Attestation`](crate::Attestation).
 #[derive(Clone, Serialize, Deserialize)]
 pub struct Secrets {
    pub(crate) server_name: ServerName,
--- a/crates/attestation/src/serialize.rs
+++ b/crates/attestation/src/serialize.rs
@@ -0,0 +1,52 @@
+/// Canonical serialization of TLSNotary types.
+///
+/// This trait is used to serialize types into a canonical byte representation.
+pub(crate) trait CanonicalSerialize {
+    /// Serializes the type.
+    fn serialize(&self) -> Vec<u8>;
+}
+
+impl<T> CanonicalSerialize for T
+where
+    T: serde::Serialize,
+{
+    fn serialize(&self) -> Vec<u8> {
+        // For now we use BCS for serialization. In future releases we will want to
+        // consider this further, particularly with respect to EVM compatibility.
+        bcs::to_bytes(self).unwrap()
+    }
+}
+
+/// A type with a domain separator which is used during hashing to mitigate type
+/// confusion attacks.
+pub(crate) trait DomainSeparator {
+    /// Returns the domain separator for the type.
+    fn domain(&self) -> &[u8];
+}
+
+macro_rules! impl_domain_separator {
+    ($type:ty) => {
+        impl $crate::serialize::DomainSeparator for $type {
+            fn domain(&self) -> &[u8] {
+                use std::sync::LazyLock;
+
+                // Computes a 16 byte hash of the type's name to use as a domain separator.
+                static DOMAIN: LazyLock<[u8; 16]> = LazyLock::new(|| {
+                    let domain: [u8; 32] = blake3::hash(stringify!($type).as_bytes()).into();
+                    domain[..16].try_into().unwrap()
+                });
+
+                &*DOMAIN
+            }
+        }
+    };
+}
+
+pub(crate) use impl_domain_separator;
+
+impl_domain_separator!(tlsn_core::connection::ServerEphemKey);
+impl_domain_separator!(tlsn_core::connection::ConnectionInfo);
+impl_domain_separator!(tlsn_core::connection::CertBinding);
+impl_domain_separator!(tlsn_core::transcript::TranscriptCommitment);
+impl_domain_separator!(tlsn_core::transcript::TranscriptSecret);
+impl_domain_separator!(tlsn_core::transcript::hash::PlaintextHash);
--- a/crates/attestation/src/signing.rs
+++ b/crates/attestation/src/signing.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;

 use serde::{Deserialize, Serialize};

-use crate::hash::impl_domain_separator;
+use crate::serialize::impl_domain_separator;

 /// Key algorithm identifier.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -202,6 +202,14 @@ impl SignatureVerifierProvider {
            .map(|s| &**s)
            .ok_or(UnknownSignatureAlgId(*alg))
    }
+
+    /// Returns am empty provider.
+    #[cfg(any(test, feature = "fixtures"))]
+    pub fn empty() -> Self {
+        Self {
+            verifiers: HashMap::default(),
+        }
+    }
 }

 /// Signature verifier.
@@ -229,6 +237,14 @@ impl_domain_separator!(VerifyingKey);
 #[error("signature verification failed: {0}")]
 pub struct SignatureError(String);

+impl SignatureError {
+    /// Creates a new error with the given message.
+    #[allow(clippy::should_implement_trait)]
+    pub fn from_str(msg: &str) -> Self {
+        Self(msg.to_string())
+    }
+}
+
 /// A signature.
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Signature {
@@ -242,8 +258,8 @@ mod secp256k1 {
    use std::sync::{Arc, Mutex};

    use k256::ecdsa::{
-        signature::{SignerMut, Verifier},
        Signature as Secp256K1Signature, SigningKey,
+        signature::{SignerMut, Verifier},
    };

    use super::*;
@@ -318,8 +334,8 @@ mod secp256r1 {
    use std::sync::{Arc, Mutex};

    use p256::ecdsa::{
-        signature::{SignerMut, Verifier},
        Signature as Secp256R1Signature, SigningKey,
+        signature::{SignerMut, Verifier},
    };

    use super::*;
@@ -394,7 +410,7 @@ mod secp256k1eth {
    use std::sync::{Arc, Mutex};

    use k256::ecdsa::{
-        signature::hazmat::PrehashVerifier, Signature as Secp256K1Signature, SigningKey,
+        Signature as Secp256K1Signature, SigningKey, signature::hazmat::PrehashVerifier,
    };
    use tiny_keccak::{Hasher, Keccak};

@@ -437,8 +453,7 @@ mod secp256k1eth {
            // Based on Ethereum Yellow Paper Appendix F, only values 0 and 1 are valid.
            if recid > 1 {
                return Err(SignatureError(format!(
-                    "expected recovery id 0 or 1, got {:?}",
-                    recid
+                    "expected recovery id 0 or 1, got {recid:?}"
                )));
            }
            // `ecrecover` expects that 0 and 1 are mapped to 27 and 28.
--- a/crates/attestation/tests/api.rs
+++ b/crates/attestation/tests/api.rs
@@ -1,23 +1,26 @@
-use tlsn_core::{
-    attestation::{Attestation, AttestationConfig},
-    connection::{HandshakeData, HandshakeDataV1_2},
-    fixtures::{self, encoder_secret, ConnectionFixture},
-    hash::Blake3,
+use rand::{Rng, SeedableRng, rngs::StdRng};
+use rangeset::set::RangeSet;
+use tlsn_attestation::{
+    Attestation, AttestationConfig, CryptoProvider,
    presentation::PresentationOutput,
    request::{Request, RequestConfig},
    signing::SignatureAlgId,
+};
+use tlsn_core::{
+    connection::{CertBinding, CertBindingV1_2},
+    fixtures::ConnectionFixture,
+    hash::{Blake3, Blinder, HashAlgId},
    transcript::{
-        encoding::{EncodingCommitment, EncodingTree},
-        Direction, Transcript, TranscriptCommitConfigBuilder, TranscriptCommitment,
-        TranscriptSecret,
+        Direction, Transcript, TranscriptCommitment, TranscriptSecret,
+        hash::{PlaintextHash, PlaintextHashSecret, hash_plaintext},
    },
-    CryptoProvider,
 };
 use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};

 /// Tests that the attestation protocol and verification work end-to-end
 #[test]
 fn test_api() {
+    let mut rng = StdRng::seed_from_u64(0);
    let mut provider = CryptoProvider::default();

    // Configure signer for Notary
@@ -25,8 +28,6 @@ fn test_api() {

    let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
    let (sent_len, recv_len) = transcript.len();
-    // Plaintext encodings which the Prover obtained from GC evaluation
-    let encodings_provider = fixtures::encoding_provider(GET_WITH_HEADER, OK_JSON);

    // At the end of the TLS connection the Prover holds the:
    let ConnectionFixture {
@@ -35,35 +36,46 @@ fn test_api() {
        server_cert_data,
    } = ConnectionFixture::tlsnotary(transcript.length());

-    let HandshakeData::V1_2(HandshakeDataV1_2 {
+    let CertBinding::V1_2(CertBindingV1_2 {
        server_ephemeral_key,
        ..
-    }) = server_cert_data.handshake.clone()
+    }) = server_cert_data.binding.clone()
    else {
        unreachable!()
    };

-    // Prover specifies the ranges it wants to commit to.
-    let mut transcript_commitment_builder = TranscriptCommitConfigBuilder::new(&transcript);
-    transcript_commitment_builder
-        .commit_sent(&(0..sent_len))
-        .unwrap()
-        .commit_recv(&(0..recv_len))
-        .unwrap();
+    // Create hash commitments
+    let hasher = Blake3::default();
+    let sent_blinder: Blinder = rng.random();
+    let recv_blinder: Blinder = rng.random();

-    let transcripts_commitment_config = transcript_commitment_builder.build().unwrap();
+    let sent_idx = RangeSet::from(0..sent_len);
+    let recv_idx = RangeSet::from(0..recv_len);

-    // Prover constructs encoding tree.
-    let encoding_tree = EncodingTree::new(
-        &Blake3::default(),
-        transcripts_commitment_config.iter_encoding(),
-        &encodings_provider,
-    )
-    .unwrap();
+    let sent_hash_commitment = PlaintextHash {
+        direction: Direction::Sent,
+        idx: sent_idx.clone(),
+        hash: hash_plaintext(&hasher, transcript.sent(), &sent_blinder),
+    };

-    let encoding_commitment = EncodingCommitment {
-        root: encoding_tree.root(),
-        secret: encoder_secret(),
+    let recv_hash_commitment = PlaintextHash {
+        direction: Direction::Received,
+        idx: recv_idx.clone(),
+        hash: hash_plaintext(&hasher, transcript.received(), &recv_blinder),
+    };
+
+    let sent_hash_secret = PlaintextHashSecret {
+        direction: Direction::Sent,
+        idx: sent_idx,
+        alg: HashAlgId::BLAKE3,
+        blinder: sent_blinder,
+    };
+
+    let recv_hash_secret = PlaintextHashSecret {
+        direction: Direction::Received,
+        idx: recv_idx,
+        alg: HashAlgId::BLAKE3,
+        blinder: recv_blinder,
    };

    let request_config = RequestConfig::default();
@@ -71,11 +83,17 @@ fn test_api() {

    request_builder
        .server_name(server_name.clone())
-        .server_cert_data(server_cert_data)
+        .handshake_data(server_cert_data)
        .transcript(transcript)
        .transcript_commitments(
-            vec![TranscriptSecret::Encoding(encoding_tree)],
-            vec![TranscriptCommitment::Encoding(encoding_commitment.clone())],
+            vec![
+                TranscriptSecret::Hash(sent_hash_secret),
+                TranscriptSecret::Hash(recv_hash_secret),
+            ],
+            vec![
+                TranscriptCommitment::Hash(sent_hash_commitment.clone()),
+                TranscriptCommitment::Hash(recv_hash_commitment.clone()),
+            ],
        );

    let (request, secrets) = request_builder.build(&provider).unwrap();
@@ -95,12 +113,15 @@ fn test_api() {
        .connection_info(connection_info.clone())
        // Server key Notary received during handshake
        .server_ephemeral_key(server_ephemeral_key)
-        .transcript_commitments(vec![TranscriptCommitment::Encoding(encoding_commitment)]);
+        .transcript_commitments(vec![
+            TranscriptCommitment::Hash(sent_hash_commitment),
+            TranscriptCommitment::Hash(recv_hash_commitment),
+        ]);

    let attestation = attestation_builder.build(&provider).unwrap();

    // Prover validates the attestation is consistent with its request.
-    request.validate(&attestation).unwrap();
+    request.validate(&attestation, &provider).unwrap();

    let mut transcript_proof_builder = secrets.transcript_proof_builder();

--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,44 +0,0 @@
-[package]
-name = "tlsn-common"
-description = "Common code shared between tlsn-prover and tlsn-verifier"
-version = "0.1.0-alpha.12"
-edition = "2021"
-
-[lints]
-workspace = true
-
-[features]
-default = []
-
-[dependencies]
-tlsn-core = { workspace = true }
-tlsn-tls-core = { workspace = true }
-tlsn-cipher = { workspace = true }
-mpz-core = { workspace = true }
-mpz-common = { workspace = true }
-mpz-memory-core = { workspace = true }
-mpz-hash = { workspace = true }
-mpz-vm-core = { workspace = true }
-mpz-zk = { workspace = true }
-
-async-trait = { workspace = true }
-derive_builder = { workspace = true }
-futures = { workspace = true }
-ghash = { workspace = true }
-once_cell = { workspace = true }
-opaque-debug = { workspace = true }
-rand = { workspace = true }
-rangeset = { workspace = true }
-serio = { workspace = true, features = ["codec", "bincode"] }
-thiserror = { workspace = true }
-tracing = { workspace = true }
-uid-mux = { workspace = true, features = ["serio"] }
-serde = { workspace = true, features = ["derive"] }
-semver = { version = "1.0", features = ["serde"] }
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = { version = "0.2" }
-web-spawn = { workspace = true }
-
-[dev-dependencies]
-rstest = { workspace = true }
--- a/crates/common/src/commit.rs
+++ b/crates/common/src/commit.rs
@@ -1,110 +0,0 @@
-//! Plaintext commitment and proof of encryption.
-
-pub mod hash;
-
-use mpz_core::bitvec::BitVec;
-use mpz_memory_core::{binary::Binary, DecodeFutureTyped};
-use mpz_vm_core::{prelude::*, Vm};
-
-use crate::{
-    transcript::Record,
-    zk_aes_ctr::{ZkAesCtr, ZkAesCtrError},
-    Role,
-};
-
-/// Commits the plaintext of the provided records, returning a proof of
-/// encryption.
-///
-/// Writes the plaintext VM reference to the provided records.
-pub fn commit_records<'record>(
-    vm: &mut dyn Vm<Binary>,
-    aes: &mut ZkAesCtr,
-    records: impl IntoIterator<Item = &'record mut Record>,
-) -> Result<RecordProof, RecordProofError> {
-    let mut ciphertexts = Vec::new();
-    for record in records {
-        if record.plaintext_ref.is_some() {
-            return Err(ErrorRepr::PlaintextRefAlreadySet.into());
-        }
-
-        let (plaintext_ref, ciphertext_ref) = aes
-            .encrypt(vm, record.explicit_nonce.clone(), record.ciphertext.len())
-            .map_err(ErrorRepr::Aes)?;
-
-        record.plaintext_ref = Some(plaintext_ref);
-
-        if let Role::Prover = aes.role() {
-            let Some(plaintext) = record.plaintext.clone() else {
-                return Err(ErrorRepr::MissingPlaintext.into());
-            };
-
-            vm.assign(plaintext_ref, plaintext)
-                .map_err(RecordProofError::vm)?;
-        }
-        vm.commit(plaintext_ref).map_err(RecordProofError::vm)?;
-
-        let ciphertext = vm.decode(ciphertext_ref).map_err(RecordProofError::vm)?;
-        ciphertexts.push((ciphertext, record.ciphertext.clone()));
-    }
-
-    Ok(RecordProof { ciphertexts })
-}
-
-/// Proof of encryption.
-#[derive(Debug)]
-#[must_use]
-#[allow(clippy::type_complexity)]
-pub struct RecordProof {
-    ciphertexts: Vec<(DecodeFutureTyped<BitVec, Vec<u8>>, Vec<u8>)>,
-}
-
-impl RecordProof {
-    /// Verifies the proof.
-    pub fn verify(self) -> Result<(), RecordProofError> {
-        let Self { ciphertexts } = self;
-
-        for (mut ciphertext, expected) in ciphertexts {
-            let ciphertext = ciphertext
-                .try_recv()
-                .map_err(RecordProofError::vm)?
-                .ok_or_else(|| ErrorRepr::NotDecoded)?;
-
-            if ciphertext != expected {
-                return Err(ErrorRepr::InvalidCiphertext.into());
-            }
-        }
-
-        Ok(())
-    }
-}
-
-/// Error for [`RecordProof`].
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct RecordProofError(#[from] ErrorRepr);
-
-impl RecordProofError {
-    fn vm<E>(err: E) -> Self
-    where
-        E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
-    {
-        Self(ErrorRepr::Vm(err.into()))
-    }
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("record proof error: {0}")]
-enum ErrorRepr {
-    #[error("VM error: {0}")]
-    Vm(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error("zk aes error: {0}")]
-    Aes(ZkAesCtrError),
-    #[error("plaintext is missing")]
-    MissingPlaintext,
-    #[error("plaintext reference is already set")]
-    PlaintextRefAlreadySet,
-    #[error("ciphertext was not decoded")]
-    NotDecoded,
-    #[error("ciphertext does not match expected")]
-    InvalidCiphertext,
-}
--- a/crates/common/src/config.rs
+++ b/crates/common/src/config.rs
@@ -1,364 +0,0 @@
-//! TLSNotary protocol config and config utilities.
-use core::fmt;
-use once_cell::sync::Lazy;
-use semver::Version;
-use serde::{Deserialize, Serialize};
-use std::error::Error;
-
-// Default is 32 bytes to decrypt the TLS protocol messages.
-const DEFAULT_MAX_RECV_ONLINE: usize = 32;
-// Default maximum number of TLS records to allow.
-//
-// This would allow for up to 50Mb upload from prover to verifier.
-const DEFAULT_RECORDS_LIMIT: usize = 256;
-
-// Current version that is running.
-static VERSION: Lazy<Version> = Lazy::new(|| {
-    Version::parse(env!("CARGO_PKG_VERSION"))
-        .map_err(|err| ProtocolConfigError::new(ErrorKind::Version, err))
-        .unwrap()
-});
-
-/// Protocol configuration to be set up initially by prover and verifier.
-#[derive(derive_builder::Builder, Clone, Debug, Deserialize, Serialize)]
-#[builder(build_fn(validate = "Self::validate"))]
-pub struct ProtocolConfig {
-    /// Maximum number of bytes that can be sent.
-    max_sent_data: usize,
-    /// Maximum number of application data records that can be sent.
-    #[builder(setter(strip_option), default)]
-    max_sent_records: Option<usize>,
-    /// Maximum number of bytes that can be decrypted online, i.e. while the
-    /// MPC-TLS connection is active.
-    #[builder(default = "DEFAULT_MAX_RECV_ONLINE")]
-    max_recv_data_online: usize,
-    /// Maximum number of bytes that can be received.
-    max_recv_data: usize,
-    /// Maximum number of received application data records that can be
-    /// decrypted online, i.e. while the MPC-TLS connection is active.
-    #[builder(setter(strip_option), default)]
-    max_recv_records_online: Option<usize>,
-    /// Whether the `deferred decryption` feature is toggled on from the start
-    /// of the MPC-TLS connection.
-    #[builder(default = "true")]
-    defer_decryption_from_start: bool,
-    /// Network settings.
-    #[builder(default)]
-    network: NetworkSetting,
-    /// Version that is being run by prover/verifier.
-    #[builder(setter(skip), default = "VERSION.clone()")]
-    version: Version,
-}
-
-impl ProtocolConfigBuilder {
-    fn validate(&self) -> Result<(), String> {
-        if self.max_recv_data_online > self.max_recv_data {
-            return Err(
-                "max_recv_data_online must be smaller or equal to max_recv_data".to_string(),
-            );
-        }
-        Ok(())
-    }
-}
-
-impl ProtocolConfig {
-    /// Creates a new builder for `ProtocolConfig`.
-    pub fn builder() -> ProtocolConfigBuilder {
-        ProtocolConfigBuilder::default()
-    }
-
-    /// Returns the maximum number of bytes that can be sent.
-    pub fn max_sent_data(&self) -> usize {
-        self.max_sent_data
-    }
-
-    /// Returns the maximum number of application data records that can
-    /// be sent.
-    pub fn max_sent_records(&self) -> Option<usize> {
-        self.max_sent_records
-    }
-
-    /// Returns the maximum number of bytes that can be decrypted online.
-    pub fn max_recv_data_online(&self) -> usize {
-        self.max_recv_data_online
-    }
-
-    /// Returns the maximum number of bytes that can be received.
-    pub fn max_recv_data(&self) -> usize {
-        self.max_recv_data
-    }
-
-    /// Returns the maximum number of received application data records that
-    /// can be decrypted online.
-    pub fn max_recv_records_online(&self) -> Option<usize> {
-        self.max_recv_records_online
-    }
-
-    /// Returns whether the `deferred decryption` feature is toggled on from the
-    /// start of the MPC-TLS connection.
-    pub fn defer_decryption_from_start(&self) -> bool {
-        self.defer_decryption_from_start
-    }
-
-    /// Returns the network settings.
-    pub fn network(&self) -> NetworkSetting {
-        self.network
-    }
-}
-
-/// Protocol configuration validator used by checker (i.e. verifier) to perform
-/// compatibility check with the peer's (i.e. the prover's) configuration.
-#[derive(derive_builder::Builder, Clone, Debug)]
-pub struct ProtocolConfigValidator {
-    /// Maximum number of bytes that can be sent.
-    max_sent_data: usize,
-    /// Maximum number of application data records that can be sent.
-    #[builder(default = "DEFAULT_RECORDS_LIMIT")]
-    max_sent_records: usize,
-    /// Maximum number of bytes that can be received.
-    max_recv_data: usize,
-    /// Maximum number of application data records that can be received online.
-    #[builder(default = "DEFAULT_RECORDS_LIMIT")]
-    max_recv_records_online: usize,
-    /// Version that is being run by checker.
-    #[builder(setter(skip), default = "VERSION.clone()")]
-    version: Version,
-}
-
-impl ProtocolConfigValidator {
-    /// Creates a new builder for `ProtocolConfigValidator`.
-    pub fn builder() -> ProtocolConfigValidatorBuilder {
-        ProtocolConfigValidatorBuilder::default()
-    }
-
-    /// Returns the maximum number of bytes that can be sent.
-    pub fn max_sent_data(&self) -> usize {
-        self.max_sent_data
-    }
-
-    /// Returns the maximum number of application data records that can
-    /// be sent.
-    pub fn max_sent_records(&self) -> usize {
-        self.max_sent_records
-    }
-
-    /// Returns the maximum number of bytes that can be received.
-    pub fn max_recv_data(&self) -> usize {
-        self.max_recv_data
-    }
-
-    /// Returns the maximum number of application data records that can
-    /// be received online.
-    pub fn max_recv_records_online(&self) -> usize {
-        self.max_recv_records_online
-    }
-
-    /// Performs compatibility check of the protocol configuration between
-    /// prover and verifier.
-    pub fn validate(&self, config: &ProtocolConfig) -> Result<(), ProtocolConfigError> {
-        self.check_max_transcript_size(config.max_sent_data, config.max_recv_data)?;
-        self.check_max_records(config.max_sent_records, config.max_recv_records_online)?;
-        self.check_version(&config.version)?;
-        Ok(())
-    }
-
-    // Checks if both the sent and recv data are within limits.
-    fn check_max_transcript_size(
-        &self,
-        max_sent_data: usize,
-        max_recv_data: usize,
-    ) -> Result<(), ProtocolConfigError> {
-        if max_sent_data > self.max_sent_data {
-            return Err(ProtocolConfigError::max_transcript_size(format!(
-                "max_sent_data {:?} is greater than the configured limit {:?}",
-                max_sent_data, self.max_sent_data,
-            )));
-        }
-
-        if max_recv_data > self.max_recv_data {
-            return Err(ProtocolConfigError::max_transcript_size(format!(
-                "max_recv_data {:?} is greater than the configured limit {:?}",
-                max_recv_data, self.max_recv_data,
-            )));
-        }
-
-        Ok(())
-    }
-
-    fn check_max_records(
-        &self,
-        max_sent_records: Option<usize>,
-        max_recv_records_online: Option<usize>,
-    ) -> Result<(), ProtocolConfigError> {
-        if let Some(max_sent_records) = max_sent_records {
-            if max_sent_records > self.max_sent_records {
-                return Err(ProtocolConfigError::max_record_count(format!(
-                    "max_sent_records {} is greater than the configured limit {}",
-                    max_sent_records, self.max_sent_records,
-                )));
-            }
-        }
-
-        if let Some(max_recv_records_online) = max_recv_records_online {
-            if max_recv_records_online > self.max_recv_records_online {
-                return Err(ProtocolConfigError::max_record_count(format!(
-                    "max_recv_records_online {} is greater than the configured limit {}",
-                    max_recv_records_online, self.max_recv_records_online,
-                )));
-            }
-        }
-
-        Ok(())
-    }
-
-    // Checks if both versions are the same (might support check for different but
-    // compatible versions in the future).
-    fn check_version(&self, peer_version: &Version) -> Result<(), ProtocolConfigError> {
-        if *peer_version != self.version {
-            return Err(ProtocolConfigError::version(format!(
-                "prover's version {:?} is different from verifier's version {:?}",
-                peer_version, self.version
-            )));
-        }
-
-        Ok(())
-    }
-}
-
-/// Settings for the network environment.
-///
-/// Provides optimization options to adapt the protocol to different network
-/// situations.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub enum NetworkSetting {
-    /// Prefers a bandwidth-heavy protocol.
-    Bandwidth,
-    /// Prefers a latency-heavy protocol.
-    Latency,
-}
-
-impl Default for NetworkSetting {
-    fn default() -> Self {
-        Self::Bandwidth
-    }
-}
-
-/// A ProtocolConfig error.
-#[derive(thiserror::Error, Debug)]
-pub struct ProtocolConfigError {
-    kind: ErrorKind,
-    #[source]
-    source: Option<Box<dyn Error + Send + Sync>>,
-}
-
-impl ProtocolConfigError {
-    fn new<E>(kind: ErrorKind, source: E) -> Self
-    where
-        E: Into<Box<dyn Error + Send + Sync>>,
-    {
-        Self {
-            kind,
-            source: Some(source.into()),
-        }
-    }
-
-    fn max_transcript_size(msg: impl Into<String>) -> Self {
-        Self {
-            kind: ErrorKind::MaxTranscriptSize,
-            source: Some(msg.into().into()),
-        }
-    }
-
-    fn max_record_count(msg: impl Into<String>) -> Self {
-        Self {
-            kind: ErrorKind::MaxRecordCount,
-            source: Some(msg.into().into()),
-        }
-    }
-
-    fn version(msg: impl Into<String>) -> Self {
-        Self {
-            kind: ErrorKind::Version,
-            source: Some(msg.into().into()),
-        }
-    }
-}
-
-impl fmt::Display for ProtocolConfigError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self.kind {
-            ErrorKind::MaxTranscriptSize => write!(f, "max transcript size exceeded")?,
-            ErrorKind::MaxRecordCount => write!(f, "max record count exceeded")?,
-            ErrorKind::Version => write!(f, "version error")?,
-        }
-
-        if let Some(ref source) = self.source {
-            write!(f, " caused by: {}", source)?;
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-enum ErrorKind {
-    MaxTranscriptSize,
-    MaxRecordCount,
-    Version,
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use rstest::{fixture, rstest};
-
-    const TEST_MAX_SENT_LIMIT: usize = 1 << 12;
-    const TEST_MAX_RECV_LIMIT: usize = 1 << 14;
-
-    #[fixture]
-    #[once]
-    fn config_validator() -> ProtocolConfigValidator {
-        ProtocolConfigValidator::builder()
-            .max_sent_data(TEST_MAX_SENT_LIMIT)
-            .max_recv_data(TEST_MAX_RECV_LIMIT)
-            .build()
-            .unwrap()
-    }
-
-    #[rstest]
-    #[case::same_max_sent_recv_data(TEST_MAX_SENT_LIMIT, TEST_MAX_RECV_LIMIT)]
-    #[case::smaller_max_sent_data(1 << 11, TEST_MAX_RECV_LIMIT)]
-    #[case::smaller_max_recv_data(TEST_MAX_SENT_LIMIT, 1 << 13)]
-    #[case::smaller_max_sent_recv_data(1 << 7, 1 << 9)]
-    fn test_check_success(
-        config_validator: &ProtocolConfigValidator,
-        #[case] max_sent_data: usize,
-        #[case] max_recv_data: usize,
-    ) {
-        let peer_config = ProtocolConfig::builder()
-            .max_sent_data(max_sent_data)
-            .max_recv_data(max_recv_data)
-            .build()
-            .unwrap();
-
-        assert!(config_validator.validate(&peer_config).is_ok())
-    }
-
-    #[rstest]
-    #[case::bigger_max_sent_data(1 << 13, TEST_MAX_RECV_LIMIT)]
-    #[case::bigger_max_recv_data(1 << 10, 1 << 16)]
-    #[case::bigger_max_sent_recv_data(1 << 14, 1 << 21)]
-    fn test_check_fail(
-        config_validator: &ProtocolConfigValidator,
-        #[case] max_sent_data: usize,
-        #[case] max_recv_data: usize,
-    ) {
-        let peer_config = ProtocolConfig::builder()
-            .max_sent_data(max_sent_data)
-            .max_recv_data(max_recv_data)
-            .build()
-            .unwrap();
-
-        assert!(config_validator.validate(&peer_config).is_err())
-    }
-}
--- a/crates/common/src/encoding.rs
+++ b/crates/common/src/encoding.rs
@@ -1,238 +0,0 @@
-//! Encoding commitment protocol.
-
-use std::ops::Range;
-
-use mpz_common::Context;
-use mpz_memory_core::{
-    binary::U8,
-    correlated::{Delta, Key, Mac},
-    Vector,
-};
-use rand::Rng;
-use serde::{Deserialize, Serialize};
-use serio::{stream::IoStreamExt, SinkExt};
-use tlsn_core::{
-    hash::HashAlgorithm,
-    transcript::{
-        encoding::{
-            new_encoder, Encoder, EncoderSecret, EncodingCommitment, EncodingProvider,
-            EncodingProviderError, EncodingTree, EncodingTreeError,
-        },
-        Direction, Idx,
-    },
-};
-
-use crate::transcript::TranscriptRefs;
-
-/// Bytes of encoding, per byte.
-const ENCODING_SIZE: usize = 128;
-
-#[derive(Debug, Serialize, Deserialize)]
-struct Encodings {
-    sent: Vec<u8>,
-    recv: Vec<u8>,
-}
-
-/// Transfers the encodings using the provided seed and keys.
-///
-/// The keys must be consistent with the global delta used in the encodings.
-pub async fn transfer<'a>(
-    ctx: &mut Context,
-    refs: &TranscriptRefs,
-    delta: &Delta,
-    f: impl Fn(Vector<U8>) -> &'a [Key],
-) -> Result<EncodingCommitment, EncodingError> {
-    let secret = EncoderSecret::new(rand::rng().random(), delta.as_block().to_bytes());
-    let encoder = new_encoder(&secret);
-
-    let sent_keys: Vec<u8> = refs
-        .sent()
-        .iter()
-        .copied()
-        .flat_map(&f)
-        .flat_map(|key| key.as_block().as_bytes())
-        .copied()
-        .collect();
-    let recv_keys: Vec<u8> = refs
-        .recv()
-        .iter()
-        .copied()
-        .flat_map(&f)
-        .flat_map(|key| key.as_block().as_bytes())
-        .copied()
-        .collect();
-
-    assert_eq!(sent_keys.len() % ENCODING_SIZE, 0);
-    assert_eq!(recv_keys.len() % ENCODING_SIZE, 0);
-
-    let mut sent_encoding = Vec::with_capacity(sent_keys.len());
-    let mut recv_encoding = Vec::with_capacity(recv_keys.len());
-
-    encoder.encode_range(
-        Direction::Sent,
-        0..sent_keys.len() / ENCODING_SIZE,
-        &mut sent_encoding,
-    );
-    encoder.encode_range(
-        Direction::Received,
-        0..recv_keys.len() / ENCODING_SIZE,
-        &mut recv_encoding,
-    );
-
-    sent_encoding
-        .iter_mut()
-        .zip(sent_keys)
-        .for_each(|(enc, key)| *enc ^= key);
-    recv_encoding
-        .iter_mut()
-        .zip(recv_keys)
-        .for_each(|(enc, key)| *enc ^= key);
-
-    ctx.io_mut()
-        .send(Encodings {
-            sent: sent_encoding,
-            recv: recv_encoding,
-        })
-        .await?;
-
-    let root = ctx.io_mut().expect_next().await?;
-    ctx.io_mut().send(secret.clone()).await?;
-
-    Ok(EncodingCommitment {
-        root,
-        secret: secret.clone(),
-    })
-}
-
-/// Receives the encodings using the provided MACs.
-///
-/// The MACs must be consistent with the global delta used in the encodings.
-pub async fn receive<'a>(
-    ctx: &mut Context,
-    hasher: &(dyn HashAlgorithm + Send + Sync),
-    refs: &TranscriptRefs,
-    f: impl Fn(Vector<U8>) -> &'a [Mac],
-    idxs: impl IntoIterator<Item = &(Direction, Idx)>,
-) -> Result<(EncodingCommitment, EncodingTree), EncodingError> {
-    let Encodings { mut sent, mut recv } = ctx.io_mut().expect_next().await?;
-
-    let sent_macs: Vec<u8> = refs
-        .sent()
-        .iter()
-        .copied()
-        .flat_map(&f)
-        .flat_map(|mac| mac.as_bytes())
-        .copied()
-        .collect();
-    let recv_macs: Vec<u8> = refs
-        .recv()
-        .iter()
-        .copied()
-        .flat_map(&f)
-        .flat_map(|mac| mac.as_bytes())
-        .copied()
-        .collect();
-
-    assert_eq!(sent_macs.len() % ENCODING_SIZE, 0);
-    assert_eq!(recv_macs.len() % ENCODING_SIZE, 0);
-
-    if sent.len() != sent_macs.len() {
-        return Err(ErrorRepr::IncorrectMacCount {
-            direction: Direction::Sent,
-            expected: sent_macs.len(),
-            got: sent.len(),
-        }
-        .into());
-    }
-
-    if recv.len() != recv_macs.len() {
-        return Err(ErrorRepr::IncorrectMacCount {
-            direction: Direction::Received,
-            expected: recv_macs.len(),
-            got: recv.len(),
-        }
-        .into());
-    }
-
-    sent.iter_mut()
-        .zip(sent_macs)
-        .for_each(|(enc, mac)| *enc ^= mac);
-    recv.iter_mut()
-        .zip(recv_macs)
-        .for_each(|(enc, mac)| *enc ^= mac);
-
-    let provider = Provider { sent, recv };
-
-    let tree = EncodingTree::new(hasher, idxs, &provider)?;
-    let root = tree.root();
-
-    ctx.io_mut().send(root.clone()).await?;
-    let secret = ctx.io_mut().expect_next().await?;
-
-    let commitment = EncodingCommitment { root, secret };
-
-    Ok((commitment, tree))
-}
-
-#[derive(Debug)]
-struct Provider {
-    sent: Vec<u8>,
-    recv: Vec<u8>,
-}
-
-impl EncodingProvider for Provider {
-    fn provide_encoding(
-        &self,
-        direction: Direction,
-        range: Range<usize>,
-        dest: &mut Vec<u8>,
-    ) -> Result<(), EncodingProviderError> {
-        let encodings = match direction {
-            Direction::Sent => &self.sent,
-            Direction::Received => &self.recv,
-        };
-
-        let start = range.start * ENCODING_SIZE;
-        let end = range.end * ENCODING_SIZE;
-
-        if end > encodings.len() {
-            return Err(EncodingProviderError);
-        }
-
-        dest.extend_from_slice(&encodings[start..end]);
-
-        Ok(())
-    }
-}
-
-/// Encoding protocol error.
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct EncodingError(#[from] ErrorRepr);
-
-#[derive(Debug, thiserror::Error)]
-#[error("encoding protocol error: {0}")]
-enum ErrorRepr {
-    #[error("I/O error: {0}")]
-    Io(std::io::Error),
-    #[error("incorrect MAC count for {direction}: expected {expected}, got {got}")]
-    IncorrectMacCount {
-        direction: Direction,
-        expected: usize,
-        got: usize,
-    },
-    #[error("encoding tree error: {0}")]
-    EncodingTree(EncodingTreeError),
-}
-
-impl From<std::io::Error> for EncodingError {
-    fn from(value: std::io::Error) -> Self {
-        Self(ErrorRepr::Io(value))
-    }
-}
-
-impl From<EncodingTreeError> for EncodingError {
-    fn from(value: EncodingTreeError) -> Self {
-        Self(ErrorRepr::EncodingTree(value))
-    }
-}
--- a/crates/common/src/lib.rs
+++ b/crates/common/src/lib.rs
@@ -1,27 +0,0 @@
-//! Common code shared between `tlsn-prover` and `tlsn-verifier`.
-
-#![deny(missing_docs, unreachable_pub, unused_must_use)]
-#![deny(clippy::all)]
-#![forbid(unsafe_code)]
-
-pub mod commit;
-pub mod config;
-pub mod context;
-pub mod encoding;
-pub mod ghash;
-pub mod msg;
-pub mod mux;
-pub mod tag;
-pub mod transcript;
-pub mod zk_aes_ctr;
-
-/// The party's role in the TLSN protocol.
-///
-/// A Notary is classified as a Verifier.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Role {
-    /// The prover.
-    Prover,
-    /// The verifier.
-    Verifier,
-}
--- a/crates/common/src/msg.rs
+++ b/crates/common/src/msg.rs
@@ -1,14 +0,0 @@
-//! Message types.
-
-use serde::{Deserialize, Serialize};
-
-use tlsn_core::connection::{ServerCertData, ServerName};
-
-/// Message sent from Prover to Verifier to prove the server identity.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ServerIdentityProof {
-    /// Server name.
-    pub name: ServerName,
-    /// Server identity data.
-    pub data: ServerCertData,
-}
--- a/crates/common/src/transcript.rs
+++ b/crates/common/src/transcript.rs
@@ -1,315 +0,0 @@
-//! TLS transcript.
-
-use mpz_memory_core::{
-    binary::{Binary, U8},
-    MemoryExt, Vector,
-};
-use mpz_vm_core::{Vm, VmError};
-use rangeset::Intersection;
-use tls_core::msgs::enums::{ContentType, ProtocolVersion};
-use tlsn_core::transcript::{Direction, Idx, PartialTranscript, Transcript};
-
-/// A transcript of TLS records sent and received by the prover.
-#[derive(Debug, Default, Clone)]
-pub struct TlsTranscript {
-    /// Sent records.
-    pub sent: Vec<Record>,
-    /// Received records.
-    pub recv: Vec<Record>,
-}
-
-impl TlsTranscript {
-    /// Returns the application data transcript.
-    pub fn to_transcript(&self) -> Result<Transcript, TlsTranscriptError> {
-        let mut sent = Vec::new();
-        let mut recv = Vec::new();
-
-        for record in self
-            .sent
-            .iter()
-            .filter(|record| record.typ == ContentType::ApplicationData)
-        {
-            let plaintext = record
-                .plaintext
-                .as_ref()
-                .ok_or(ErrorRepr::IncompleteTranscript {})?
-                .clone();
-            sent.extend_from_slice(&plaintext);
-        }
-
-        for record in self
-            .recv
-            .iter()
-            .filter(|record| record.typ == ContentType::ApplicationData)
-        {
-            let plaintext = record
-                .plaintext
-                .as_ref()
-                .ok_or(ErrorRepr::IncompleteTranscript {})?
-                .clone();
-            recv.extend_from_slice(&plaintext);
-        }
-
-        Ok(Transcript::new(sent, recv))
-    }
-
-    /// Returns the application data transcript references.
-    pub fn to_transcript_refs(&self) -> Result<TranscriptRefs, TlsTranscriptError> {
-        let mut sent = Vec::new();
-        let mut recv = Vec::new();
-
-        for record in self
-            .sent
-            .iter()
-            .filter(|record| record.typ == ContentType::ApplicationData)
-        {
-            let plaintext_ref = record
-                .plaintext_ref
-                .as_ref()
-                .ok_or(ErrorRepr::IncompleteTranscript {})?;
-            sent.push(*plaintext_ref);
-        }
-
-        for record in self
-            .recv
-            .iter()
-            .filter(|record| record.typ == ContentType::ApplicationData)
-        {
-            let plaintext_ref = record
-                .plaintext_ref
-                .as_ref()
-                .ok_or(ErrorRepr::IncompleteTranscript {})?;
-            recv.push(*plaintext_ref);
-        }
-
-        Ok(TranscriptRefs { sent, recv })
-    }
-}
-
-/// A TLS record.
-#[derive(Clone)]
-pub struct Record {
-    /// Sequence number.
-    pub seq: u64,
-    /// Content type.
-    pub typ: ContentType,
-    /// Plaintext.
-    pub plaintext: Option<Vec<u8>>,
-    /// VM reference to the plaintext.
-    pub plaintext_ref: Option<Vector<U8>>,
-    /// Explicit nonce.
-    pub explicit_nonce: Vec<u8>,
-    /// Ciphertext.
-    pub ciphertext: Vec<u8>,
-    /// Tag.
-    pub tag: Option<Vec<u8>>,
-    /// Version.
-    pub version: ProtocolVersion,
-}
-
-opaque_debug::implement!(Record);
-
-/// References to the application plaintext in the transcript.
-#[derive(Debug, Default, Clone)]
-pub struct TranscriptRefs {
-    sent: Vec<Vector<U8>>,
-    recv: Vec<Vector<U8>>,
-}
-
-impl TranscriptRefs {
-    /// Returns the sent plaintext references.
-    pub fn sent(&self) -> &[Vector<U8>] {
-        &self.sent
-    }
-
-    /// Returns the received plaintext references.
-    pub fn recv(&self) -> &[Vector<U8>] {
-        &self.recv
-    }
-
-    /// Returns VM references for the given direction and index, otherwise
-    /// `None` if the index is out of bounds.
-    pub fn get(&self, direction: Direction, idx: &Idx) -> Option<Vec<Vector<U8>>> {
-        if idx.is_empty() {
-            return Some(Vec::new());
-        }
-
-        let refs = match direction {
-            Direction::Sent => &self.sent,
-            Direction::Received => &self.recv,
-        };
-
-        // Computes the transcript range for each reference.
-        let mut start = 0;
-        let mut slice_iter = refs.iter().map(move |slice| {
-            let out = (slice, start..start + slice.len());
-            start += slice.len();
-            out
-        });
-
-        let mut slices = Vec::new();
-        let (mut slice, mut slice_range) = slice_iter.next()?;
-        for range in idx.iter_ranges() {
-            loop {
-                if let Some(intersection) = slice_range.intersection(&range) {
-                    let start = intersection.start - slice_range.start;
-                    let end = intersection.end - slice_range.start;
-                    slices.push(slice.get(start..end).expect("range should be in bounds"));
-                }
-
-                // Proceed to next range if the current slice extends beyond. Otherwise, proceed
-                // to the next slice.
-                if range.end <= slice_range.end {
-                    break;
-                } else {
-                    (slice, slice_range) = slice_iter.next()?;
-                }
-            }
-        }
-
-        Some(slices)
-    }
-}
-
-/// Error for [`TlsTranscript`].
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct TlsTranscriptError(#[from] ErrorRepr);
-
-#[derive(Debug, thiserror::Error)]
-#[error("TLS transcript error")]
-enum ErrorRepr {
-    #[error("not all application plaintext was committed to in the TLS transcript")]
-    IncompleteTranscript {},
-}
-
-/// Decodes the transcript.
-pub fn decode_transcript(
-    vm: &mut dyn Vm<Binary>,
-    sent: &Idx,
-    recv: &Idx,
-    refs: &TranscriptRefs,
-) -> Result<(), VmError> {
-    let sent_refs = refs.get(Direction::Sent, sent).expect("index is in bounds");
-    let recv_refs = refs
-        .get(Direction::Received, recv)
-        .expect("index is in bounds");
-
-    for slice in sent_refs.into_iter().chain(recv_refs) {
-        // Drop the future, we don't need it.
-        drop(vm.decode(slice)?);
-    }
-
-    Ok(())
-}
-
-/// Verifies a partial transcript.
-pub fn verify_transcript(
-    vm: &mut dyn Vm<Binary>,
-    transcript: &PartialTranscript,
-    refs: &TranscriptRefs,
-) -> Result<(), InconsistentTranscript> {
-    let sent_refs = refs
-        .get(Direction::Sent, transcript.sent_authed())
-        .expect("index is in bounds");
-    let recv_refs = refs
-        .get(Direction::Received, transcript.received_authed())
-        .expect("index is in bounds");
-
-    let mut authenticated_data = Vec::new();
-    for data in sent_refs.into_iter().chain(recv_refs) {
-        let plaintext = vm
-            .get(data)
-            .expect("reference is valid")
-            .expect("plaintext is decoded");
-        authenticated_data.extend_from_slice(&plaintext);
-    }
-
-    let mut purported_data = Vec::with_capacity(authenticated_data.len());
-    for range in transcript.sent_authed().iter_ranges() {
-        purported_data.extend_from_slice(&transcript.sent_unsafe()[range]);
-    }
-
-    for range in transcript.received_authed().iter_ranges() {
-        purported_data.extend_from_slice(&transcript.received_unsafe()[range]);
-    }
-
-    if purported_data != authenticated_data {
-        return Err(InconsistentTranscript {});
-    }
-
-    Ok(())
-}
-
-/// Error for [`verify_transcript`].
-#[derive(Debug, thiserror::Error)]
-#[error("inconsistent transcript")]
-pub struct InconsistentTranscript {}
-
-#[cfg(test)]
-mod tests {
-    use super::TranscriptRefs;
-    use mpz_memory_core::{binary::U8, FromRaw, Slice, Vector};
-    use rangeset::RangeSet;
-    use std::ops::Range;
-    use tlsn_core::transcript::{Direction, Idx};
-
-    // TRANSCRIPT_REFS:
-    //
-    // 48..96 -> 6 slots
-    // 112..176 -> 8 slots
-    // 240..288 -> 6 slots
-    // 352..392 -> 5 slots
-    // 440..480 -> 5 slots
-    const TRANSCRIPT_REFS: &[Range<usize>] = &[48..96, 112..176, 240..288, 352..392, 440..480];
-
-    const IDXS: &[Range<usize>] = &[0..4, 5..10, 14..16, 16..28];
-
-    // 1. Take slots 0..4,   4  slots -> 48..80 (4)
-    // 2. Take slots 5..10,  5  slots -> 88..96 (1) + 112..144 (4)
-    // 3. Take slots 14..16, 2  slots -> 240..256 (2)
-    // 4. Take slots 16..28, 12 slots -> 256..288 (4) + 352..392 (5) + 440..464 (3)
-    //
-    // 5. Merge slots 240..256 and 256..288 => 240..288 and get EXPECTED_REFS
-    const EXPECTED_REFS: &[Range<usize>] =
-        &[48..80, 88..96, 112..144, 240..288, 352..392, 440..464];
-
-    #[test]
-    fn test_transcript_refs_get() {
-        let transcript_refs: Vec<Vector<U8>> = TRANSCRIPT_REFS
-            .iter()
-            .cloned()
-            .map(|range| Vector::from_raw(Slice::from_range_unchecked(range)))
-            .collect();
-
-        let transcript_refs = TranscriptRefs {
-            sent: transcript_refs.clone(),
-            recv: transcript_refs,
-        };
-
-        let vm_refs = transcript_refs
-            .get(Direction::Sent, &idx_fixture())
-            .unwrap();
-
-        let expected_refs: Vec<Vector<U8>> = EXPECTED_REFS
-            .iter()
-            .cloned()
-            .map(|range| Vector::from_raw(Slice::from_range_unchecked(range)))
-            .collect();
-
-        assert_eq!(
-            vm_refs.len(),
-            expected_refs.len(),
-            "Length of actual and expected refs are not equal"
-        );
-
-        for (&expected, actual) in expected_refs.iter().zip(vm_refs) {
-            assert_eq!(expected, actual);
-        }
-    }
-
-    fn idx_fixture() -> Idx {
-        let set = RangeSet::from(IDXS);
-        Idx::builder().union(&set).build()
-    }
-}
--- a/crates/common/src/zk_aes_ctr.rs
+++ b/crates/common/src/zk_aes_ctr.rs
@@ -1,210 +0,0 @@
-//! Zero-knowledge AES-CTR encryption.
-
-use cipher::{
-    aes::{Aes128, AesError},
-    Cipher, CipherError, Keystream,
-};
-use mpz_memory_core::{
-    binary::{Binary, U8},
-    Array, Vector,
-};
-use mpz_vm_core::{prelude::*, Vm};
-
-use crate::Role;
-
-type Nonce = Array<U8, 8>;
-type Ctr = Array<U8, 4>;
-type Block = Array<U8, 16>;
-
-const START_CTR: u32 = 2;
-
-/// ZK AES-CTR encryption.
-#[derive(Debug)]
-pub struct ZkAesCtr {
-    role: Role,
-    aes: Aes128,
-    state: State,
-}
-
-impl ZkAesCtr {
-    /// Creates a new ZK AES-CTR instance.
-    pub fn new(role: Role) -> Self {
-        Self {
-            role,
-            aes: Aes128::default(),
-            state: State::Init,
-        }
-    }
-
-    /// Returns the role.
-    pub fn role(&self) -> &Role {
-        &self.role
-    }
-
-    /// Allocates `len` bytes for encryption.
-    pub fn alloc(&mut self, vm: &mut dyn Vm<Binary>, len: usize) -> Result<(), ZkAesCtrError> {
-        let State::Init = self.state.take() else {
-            Err(ErrorRepr::State {
-                reason: "must be in init state to allocate",
-            })?
-        };
-
-        // Round up to the nearest block size.
-        let len = 16 * len.div_ceil(16);
-
-        let input = vm.alloc_vec::<U8>(len).map_err(ZkAesCtrError::vm)?;
-        let keystream = self.aes.alloc_keystream(vm, len)?;
-
-        match self.role {
-            Role::Prover => vm.mark_private(input).map_err(ZkAesCtrError::vm)?,
-            Role::Verifier => vm.mark_blind(input).map_err(ZkAesCtrError::vm)?,
-        }
-
-        self.state = State::Ready { input, keystream };
-
-        Ok(())
-    }
-
-    /// Sets the key and IV for the cipher.
-    pub fn set_key(&mut self, key: Array<U8, 16>, iv: Array<U8, 4>) {
-        self.aes.set_key(key);
-        self.aes.set_iv(iv);
-    }
-
-    /// Proves the encryption of `len` bytes.
-    ///
-    /// Here we only assign certain values in the VM but the actual proving
-    /// happens later when the plaintext is assigned and the VM is executed.
-    ///
-    /// # Arguments
-    ///
-    /// * `vm` - Virtual machine.
-    /// * `explicit_nonce` - Explicit nonce.
-    /// * `len` - Length of the plaintext in bytes.
-    ///
-    /// # Returns
-    ///
-    /// A VM reference to the plaintext and the ciphertext.
-    pub fn encrypt(
-        &mut self,
-        vm: &mut dyn Vm<Binary>,
-        explicit_nonce: Vec<u8>,
-        len: usize,
-    ) -> Result<(Vector<U8>, Vector<U8>), ZkAesCtrError> {
-        let State::Ready { input, keystream } = &mut self.state else {
-            Err(ErrorRepr::State {
-                reason: "must be in ready state to encrypt",
-            })?
-        };
-
-        let explicit_nonce: [u8; 8] =
-            explicit_nonce
-                .try_into()
-                .map_err(|explicit_nonce: Vec<_>| ErrorRepr::ExplicitNonceLength {
-                    expected: 8,
-                    actual: explicit_nonce.len(),
-                })?;
-
-        let block_count = len.div_ceil(16);
-        let padded_len = block_count * 16;
-        let padding_len = padded_len - len;
-
-        if padded_len > input.len() {
-            Err(ErrorRepr::InsufficientPreprocessing {
-                expected: padded_len,
-                actual: input.len(),
-            })?
-        }
-
-        let mut input = input.split_off(input.len() - padded_len);
-        let keystream = keystream.consume(padded_len)?;
-        let mut output = keystream.apply(vm, input)?;
-
-        // Assign counter block inputs.
-        let mut ctr = START_CTR..;
-        keystream.assign(vm, explicit_nonce, move || {
-            ctr.next().expect("range is unbounded").to_be_bytes()
-        })?;
-
-        // Assign zeroes to the padding.
-        if padding_len > 0 {
-            let padding = input.split_off(input.len() - padding_len);
-            // To simplify the impl, we don't mark the padding as public, that's why only
-            // the prover assigns it.
-            if let Role::Prover = self.role {
-                vm.assign(padding, vec![0; padding_len])
-                    .map_err(ZkAesCtrError::vm)?;
-            }
-            vm.commit(padding).map_err(ZkAesCtrError::vm)?;
-            output.truncate(len);
-        }
-
-        Ok((input, output))
-    }
-}
-
-enum State {
-    Init,
-    Ready {
-        input: Vector<U8>,
-        keystream: Keystream<Nonce, Ctr, Block>,
-    },
-    Error,
-}
-
-impl State {
-    fn take(&mut self) -> Self {
-        std::mem::replace(self, State::Error)
-    }
-}
-
-impl std::fmt::Debug for State {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            State::Init => write!(f, "Init"),
-            State::Ready { .. } => write!(f, "Ready"),
-            State::Error => write!(f, "Error"),
-        }
-    }
-}
-
-/// Error for [`ZkAesCtr`].
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct ZkAesCtrError(#[from] ErrorRepr);
-
-impl ZkAesCtrError {
-    fn vm<E>(err: E) -> Self
-    where
-        E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
-    {
-        Self(ErrorRepr::Vm(err.into()))
-    }
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("zk aes error")]
-enum ErrorRepr {
-    #[error("invalid state: {reason}")]
-    State { reason: &'static str },
-    #[error("cipher error: {0}")]
-    Cipher(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error("vm error: {0}")]
-    Vm(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error("invalid explicit nonce length: expected {expected}, got {actual}")]
-    ExplicitNonceLength { expected: usize, actual: usize },
-    #[error("insufficient preprocessing: expected {expected}, got {actual}")]
-    InsufficientPreprocessing { expected: usize, actual: usize },
-}
-
-impl From<AesError> for ZkAesCtrError {
-    fn from(err: AesError) -> Self {
-        Self(ErrorRepr::Cipher(Box::new(err)))
-    }
-}
-
-impl From<CipherError> for ZkAesCtrError {
-    fn from(err: CipherError) -> Self {
-        Self(ErrorRepr::Cipher(Box::new(err)))
-    }
-}
--- a/crates/components/cipher/Cargo.toml
+++ b/crates/components/cipher/Cargo.toml
@@ -5,7 +5,7 @@ description = "This crate provides implementations of ciphers for two parties"
 keywords = ["tls", "mpc", "2pc", "aes"]
 categories = ["cryptography"]
 license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.12"
+version = "0.1.0-alpha.14-pre"
 edition = "2021"

 [lints]
@@ -15,7 +15,7 @@ workspace = true
 name = "cipher"

 [dependencies]
-mpz-circuits = { workspace = true }
+mpz-circuits = { workspace = true, features = ["aes"] }
 mpz-vm-core = { workspace = true }
 mpz-memory-core = { workspace = true }

@@ -24,11 +24,9 @@ thiserror = { workspace = true }
 aes = { workspace = true }

 [dev-dependencies]
-mpz-garble = { workspace = true }
-mpz-common = { workspace = true }
-mpz-ot = { workspace = true }
+mpz-common = { workspace = true, features = ["test-utils"] }
+mpz-ideal-vm = { workspace = true }

 tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
-rand = { workspace = true }
 ctr = { workspace = true }
 cipher = { workspace = true }
--- a/crates/components/cipher/src/aes/error.rs
+++ b/crates/components/cipher/src/aes/error.rs
@@ -36,7 +36,7 @@ impl Display for AesError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
--- a/crates/components/cipher/src/aes/mod.rs
+++ b/crates/components/cipher/src/aes/mod.rs
@@ -2,7 +2,7 @@

 use crate::{Cipher, CtrBlock, Keystream};
 use async_trait::async_trait;
-use mpz_circuits::circuits::AES128;
+use mpz_circuits::{AES128_KS, AES128_POST_KS};
 use mpz_memory_core::binary::{Binary, U8};
 use mpz_vm_core::{prelude::*, Call, Vm};
 use std::fmt::Debug;
@@ -12,13 +12,35 @@ mod error;
 pub use error::AesError;
 use error::ErrorKind;

+/// AES key schedule: 11 round keys, 16 bytes each.
+type KeySchedule = Array<U8, 176>;
+
 /// Computes AES-128.
 #[derive(Default, Debug)]
 pub struct Aes128 {
    key: Option<Array<U8, 16>>,
+    key_schedule: Option<KeySchedule>,
    iv: Option<Array<U8, 4>>,
 }

+impl Aes128 {
+    // Allocates key schedule.
+    //
+    // Expects the key to be already set.
+    fn alloc_key_schedule(&self, vm: &mut dyn Vm<Binary>) -> Result<KeySchedule, AesError> {
+        let ks: KeySchedule = vm
+            .call(
+                Call::builder(AES128_KS.clone())
+                    .arg(self.key.expect("key is set"))
+                    .build()
+                    .expect("call should be valid"),
+            )
+            .map_err(|err| AesError::new(ErrorKind::Vm, err))?;
+
+        Ok(ks)
+    }
+}
+
 #[async_trait]
 impl Cipher for Aes128 {
    type Error = AesError;
@@ -45,18 +67,22 @@ impl Cipher for Aes128 {
    }

    fn alloc_block(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
        input: Array<U8, 16>,
    ) -> Result<Self::Block, Self::Error> {
-        let key = self
-            .key
+        self.key
            .ok_or_else(|| AesError::new(ErrorKind::Key, "key not set"))?;

+        if self.key_schedule.is_none() {
+            self.key_schedule = Some(self.alloc_key_schedule(vm)?);
+        }
+        let ks = *self.key_schedule.as_ref().expect("key schedule was set");
+
        let output = vm
            .call(
-                Call::builder(AES128.clone())
-                    .arg(key)
+                Call::builder(AES128_POST_KS.clone())
+                    .arg(ks)
                    .arg(input)
                    .build()
                    .expect("call should be valid"),
@@ -67,11 +93,10 @@ impl Cipher for Aes128 {
    }

    fn alloc_ctr_block(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
    ) -> Result<CtrBlock<Self::Nonce, Self::Counter, Self::Block>, Self::Error> {
-        let key = self
-            .key
+        self.key
            .ok_or_else(|| AesError::new(ErrorKind::Key, "key not set"))?;
        let iv = self
            .iv
@@ -89,10 +114,15 @@ impl Cipher for Aes128 {
        vm.mark_public(counter)
            .map_err(|err| AesError::new(ErrorKind::Vm, err))?;

+        if self.key_schedule.is_none() {
+            self.key_schedule = Some(self.alloc_key_schedule(vm)?);
+        }
+        let ks = *self.key_schedule.as_ref().expect("key schedule was set");
+
        let output = vm
            .call(
-                Call::builder(AES128.clone())
-                    .arg(key)
+                Call::builder(AES128_POST_KS.clone())
+                    .arg(ks)
                    .arg(iv)
                    .arg(explicit_nonce)
                    .arg(counter)
@@ -109,12 +139,11 @@ impl Cipher for Aes128 {
    }

    fn alloc_keystream(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
        len: usize,
    ) -> Result<Keystream<Self::Nonce, Self::Counter, Self::Block>, Self::Error> {
-        let key = self
-            .key
+        self.key
            .ok_or_else(|| AesError::new(ErrorKind::Key, "key not set"))?;
        let iv = self
            .iv
@@ -143,10 +172,15 @@ impl Cipher for Aes128 {
        let blocks = inputs
            .into_iter()
            .map(|(explicit_nonce, counter)| {
+                if self.key_schedule.is_none() {
+                    self.key_schedule = Some(self.alloc_key_schedule(vm)?);
+                }
+                let ks = *self.key_schedule.as_ref().expect("key schedule was set");
+
                let output = vm
                    .call(
-                        Call::builder(AES128.clone())
-                            .arg(key)
+                        Call::builder(AES128_POST_KS.clone())
+                            .arg(ks)
                            .arg(iv)
                            .arg(explicit_nonce)
                            .arg(counter)
@@ -172,15 +206,12 @@ mod tests {
    use super::*;
    use crate::Cipher;
    use mpz_common::context::test_st_context;
-    use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
+    use mpz_ideal_vm::IdealVm;
    use mpz_memory_core::{
        binary::{Binary, U8},
-        correlated::Delta,
        Array, MemoryExt, Vector, ViewExt,
    };
-    use mpz_ot::ideal::cot::ideal_cot;
    use mpz_vm_core::{Execute, Vm};
-    use rand::{rngs::StdRng, SeedableRng};

    #[tokio::test]
    async fn test_aes_ctr() {
@@ -190,10 +221,11 @@ mod tests {
        let start_counter = 3u32;

        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut gen, mut ev) = mock_vm();
+        let mut gen = IdealVm::new();
+        let mut ev = IdealVm::new();

-        let aes_gen = setup_ctr(key, iv, &mut gen);
-        let aes_ev = setup_ctr(key, iv, &mut ev);
+        let mut aes_gen = setup_ctr(key, iv, &mut gen);
+        let mut aes_ev = setup_ctr(key, iv, &mut ev);

        let msg = vec![42u8; 128];

@@ -252,10 +284,11 @@ mod tests {
        let input = [5_u8; 16];

        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut gen, mut ev) = mock_vm();
+        let mut gen = IdealVm::new();
+        let mut ev = IdealVm::new();

-        let aes_gen = setup_block(key, &mut gen);
-        let aes_ev = setup_block(key, &mut ev);
+        let mut aes_gen = setup_block(key, &mut gen);
+        let mut aes_ev = setup_block(key, &mut ev);

        let block_ref_gen: Array<U8, 16> = gen.alloc().unwrap();
        gen.mark_public(block_ref_gen).unwrap();
@@ -294,18 +327,6 @@ mod tests {
        assert_eq!(ciphertext_gen, expected);
    }

-    fn mock_vm() -> (impl Vm<Binary>, impl Vm<Binary>) {
-        let mut rng = StdRng::seed_from_u64(0);
-        let delta = Delta::random(&mut rng);
-
-        let (cot_send, cot_recv) = ideal_cot(delta.into_inner());
-
-        let gen = Garbler::new(cot_send, [0u8; 16], delta);
-        let ev = Evaluator::new(cot_recv);
-
-        (gen, ev)
-    }
-
    fn setup_ctr(key: [u8; 16], iv: [u8; 4], vm: &mut dyn Vm<Binary>) -> Aes128 {
        let key_ref: Array<U8, 16> = vm.alloc().unwrap();
        vm.mark_public(key_ref).unwrap();
--- a/crates/components/cipher/src/lib.rs
+++ b/crates/components/cipher/src/lib.rs
@@ -55,7 +55,7 @@ pub trait Cipher {

    /// Allocates a single block in ECB mode.
    fn alloc_block(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
        input: Self::Block,
    ) -> Result<Self::Block, Self::Error>;
@@ -63,7 +63,7 @@ pub trait Cipher {
    /// Allocates a single block in counter mode.
    #[allow(clippy::type_complexity)]
    fn alloc_ctr_block(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
    ) -> Result<CtrBlock<Self::Nonce, Self::Counter, Self::Block>, Self::Error>;

@@ -75,7 +75,7 @@ pub trait Cipher {
    /// * `len` - Length of the stream in bytes.
    #[allow(clippy::type_complexity)]
    fn alloc_keystream(
-        &self,
+        &mut self,
        vm: &mut dyn Vm<Binary>,
        len: usize,
    ) -> Result<Keystream<Self::Nonce, Self::Counter, Self::Block>, Self::Error>;
--- a/crates/components/deap/Cargo.toml
+++ b/crates/components/deap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tlsn-deap"
-version = "0.1.0-alpha.12"
+version = "0.1.0-alpha.14-pre"
 edition = "2021"

 [lints]
@@ -19,11 +19,8 @@ futures = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }

 [dev-dependencies]
-mpz-circuits = { workspace = true }
-mpz-garble = { workspace = true }
-mpz-ot = { workspace = true }
-mpz-zk = { workspace = true }
+mpz-circuits = { workspace = true, features = ["aes"] }
+mpz-common = { workspace = true, features = ["test-utils"] }
+mpz-ideal-vm = { workspace = true }

 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
-rand = { workspace = true }
-rand06-compat = { workspace = true }
--- a/crates/components/deap/src/lib.rs
+++ b/crates/components/deap/src/lib.rs
@@ -15,7 +15,7 @@ use mpz_vm_core::{
    memory::{binary::Binary, DecodeFuture, Memory, Repr, Slice, View},
    Call, Callable, Execute, Vm, VmError,
 };
-use rangeset::{Difference, RangeSet, UnionMut};
+use rangeset::{ops::Set, set::RangeSet};
 use tokio::sync::{Mutex, MutexGuard, OwnedMutexGuard};

 type Error = DeapError;
@@ -210,10 +210,12 @@ where
    }

    fn commit_raw(&mut self, slice: Slice) -> Result<(), VmError> {
+        let slice_range = slice.to_range();
+
        // Follower's private inputs are not committed in the ZK VM until finalization.
-        let input_minus_follower = slice.to_range().difference(&self.follower_input_ranges);
+        let input_minus_follower = slice_range.difference(&self.follower_input_ranges);
        let mut zk = self.zk.try_lock().unwrap();
-        for input in input_minus_follower.iter_ranges() {
+        for input in input_minus_follower {
            zk.commit_raw(
                self.memory_map
                    .try_get(Slice::from_range_unchecked(input))?,
@@ -266,7 +268,7 @@ where
                mpc.mark_private_raw(slice)?;
                // Follower's private inputs will become public during finalization.
                zk.mark_public_raw(self.memory_map.try_get(slice)?)?;
-                self.follower_input_ranges.union_mut(&slice.to_range());
+                self.follower_input_ranges.union_mut(slice.to_range());
                self.follower_inputs.push(slice);
            }
        }
@@ -282,7 +284,7 @@ where
                mpc.mark_blind_raw(slice)?;
                // Follower's private inputs will become public during finalization.
                zk.mark_public_raw(self.memory_map.try_get(slice)?)?;
-                self.follower_input_ranges.union_mut(&slice.to_range());
+                self.follower_input_ranges.union_mut(slice.to_range());
                self.follower_inputs.push(slice);
            }
            Role::Follower => {
@@ -382,37 +384,27 @@ enum ErrorRepr {

 #[cfg(test)]
 mod tests {
-    use mpz_circuits::circuits::AES128;
+    use mpz_circuits::AES128;
    use mpz_common::context::test_st_context;
-    use mpz_core::Block;
-    use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
-    use mpz_ot::ideal::{cot::ideal_cot, rcot::ideal_rcot};
+    use mpz_ideal_vm::IdealVm;
    use mpz_vm_core::{
-        memory::{binary::U8, correlated::Delta, Array},
+        memory::{binary::U8, Array},
        prelude::*,
    };
-    use mpz_zk::{Prover, Verifier};
-    use rand::{rngs::StdRng, SeedableRng};

    use super::*;

    #[tokio::test]
    async fn test_deap() {
-        let mut rng = StdRng::seed_from_u64(0);
-        let delta_mpc = Delta::random(&mut rng);
-        let delta_zk = Delta::random(&mut rng);
-
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (rcot_send, rcot_recv) = ideal_rcot(Block::ZERO, delta_zk.into_inner());
-        let (cot_send, cot_recv) = ideal_cot(delta_mpc.into_inner());

-        let gb = Garbler::new(cot_send, [0u8; 16], delta_mpc);
-        let ev = Evaluator::new(cot_recv);
-        let prover = Prover::new(rcot_recv);
-        let verifier = Verifier::new(delta_zk, rcot_send);
+        let leader_mpc = IdealVm::new();
+        let leader_zk = IdealVm::new();
+        let follower_mpc = IdealVm::new();
+        let follower_zk = IdealVm::new();

-        let mut leader = Deap::new(Role::Leader, gb, prover);
-        let mut follower = Deap::new(Role::Follower, ev, verifier);
+        let mut leader = Deap::new(Role::Leader, leader_mpc, leader_zk);
+        let mut follower = Deap::new(Role::Follower, follower_mpc, follower_zk);

        let (ct_leader, ct_follower) = futures::join!(
            async {
@@ -478,21 +470,15 @@ mod tests {

    #[tokio::test]
    async fn test_deap_desync_memory() {
-        let mut rng = StdRng::seed_from_u64(0);
-        let delta_mpc = Delta::random(&mut rng);
-        let delta_zk = Delta::random(&mut rng);
-
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (rcot_send, rcot_recv) = ideal_rcot(Block::ZERO, delta_zk.into_inner());
-        let (cot_send, cot_recv) = ideal_cot(delta_mpc.into_inner());

-        let gb = Garbler::new(cot_send, [0u8; 16], delta_mpc);
-        let ev = Evaluator::new(cot_recv);
-        let prover = Prover::new(rcot_recv);
-        let verifier = Verifier::new(delta_zk, rcot_send);
+        let leader_mpc = IdealVm::new();
+        let leader_zk = IdealVm::new();
+        let follower_mpc = IdealVm::new();
+        let follower_zk = IdealVm::new();

-        let mut leader = Deap::new(Role::Leader, gb, prover);
-        let mut follower = Deap::new(Role::Follower, ev, verifier);
+        let mut leader = Deap::new(Role::Leader, leader_mpc, leader_zk);
+        let mut follower = Deap::new(Role::Follower, follower_mpc, follower_zk);

        // Desynchronize the memories.
        let _ = leader.zk().alloc_raw(1).unwrap();
@@ -564,21 +550,15 @@ mod tests {
    // detection by the follower.
    #[tokio::test]
    async fn test_malicious() {
-        let mut rng = StdRng::seed_from_u64(0);
-        let delta_mpc = Delta::random(&mut rng);
-        let delta_zk = Delta::random(&mut rng);
-
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (rcot_send, rcot_recv) = ideal_rcot(Block::ZERO, delta_zk.into_inner());
-        let (cot_send, cot_recv) = ideal_cot(delta_mpc.into_inner());

-        let gb = Garbler::new(cot_send, [1u8; 16], delta_mpc);
-        let ev = Evaluator::new(cot_recv);
-        let prover = Prover::new(rcot_recv);
-        let verifier = Verifier::new(delta_zk, rcot_send);
+        let leader_mpc = IdealVm::new();
+        let leader_zk = IdealVm::new();
+        let follower_mpc = IdealVm::new();
+        let follower_zk = IdealVm::new();

-        let mut leader = Deap::new(Role::Leader, gb, prover);
-        let mut follower = Deap::new(Role::Follower, ev, verifier);
+        let mut leader = Deap::new(Role::Leader, leader_mpc, leader_zk);
+        let mut follower = Deap::new(Role::Follower, follower_mpc, follower_zk);

        let (_, follower_res) = futures::join!(
            async {
--- a/crates/components/deap/src/map.rs
+++ b/crates/components/deap/src/map.rs
@@ -1,7 +1,7 @@
 use std::ops::Range;

 use mpz_vm_core::{memory::Slice, VmError};
-use rangeset::Subset;
+use rangeset::ops::Set;

 /// A mapping between the memories of the MPC and ZK VMs.
 #[derive(Debug, Default)]
--- a/crates/components/hmac-sha256/Cargo.toml
+++ b/crates/components/hmac-sha256/Cargo.toml
@@ -5,7 +5,7 @@ description = "A 2PC implementation of TLS HMAC-SHA256 PRF"
 keywords = ["tls", "mpc", "2pc", "hmac", "sha256"]
 categories = ["cryptography"]
 license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.12"
+version = "0.1.0-alpha.14-pre"
 edition = "2021"

 [lints]
@@ -20,14 +20,13 @@ mpz-core = { workspace = true }
 mpz-circuits = { workspace = true }
 mpz-hash = { workspace = true }

+sha2 = { workspace = true, features = ["compress"] }
 thiserror = { workspace = true }
 tracing = { workspace = true }
-sha2 = { workspace = true }

 [dev-dependencies]
-mpz-ot = { workspace = true, features = ["ideal"] }
-mpz-garble = { workspace = true }
 mpz-common = { workspace = true, features = ["test-utils"] }
+mpz-ideal-vm = { workspace = true }

 criterion = { workspace = true, features = ["async_tokio"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
--- a/crates/components/hmac-sha256/benches/prf.rs
+++ b/crates/components/hmac-sha256/benches/prf.rs
@@ -4,14 +4,12 @@ use criterion::{criterion_group, criterion_main, Criterion};

 use hmac_sha256::{Mode, MpcPrf};
 use mpz_common::context::test_mt_context;
-use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
-use mpz_ot::ideal::cot::ideal_cot;
+use mpz_ideal_vm::IdealVm;
 use mpz_vm_core::{
-    memory::{binary::U8, correlated::Delta, Array},
+    memory::{binary::U8, Array},
    prelude::*,
    Execute,
 };
-use rand::{rngs::StdRng, SeedableRng};

 #[allow(clippy::unit_arg)]
 fn criterion_benchmark(c: &mut Criterion) {
@@ -29,8 +27,6 @@ criterion_group!(benches, criterion_benchmark);
 criterion_main!(benches);

 async fn prf(mode: Mode) {
-    let mut rng = StdRng::seed_from_u64(0);
-
    let pms = [42u8; 32];
    let client_random = [69u8; 32];
    let server_random: [u8; 32] = [96u8; 32];
@@ -39,11 +35,8 @@ async fn prf(mode: Mode) {
    let mut leader_ctx = leader_exec.new_context().await.unwrap();
    let mut follower_ctx = follower_exec.new_context().await.unwrap();

-    let delta = Delta::random(&mut rng);
-    let (ot_send, ot_recv) = ideal_cot(delta.into_inner());
-
-    let mut leader_vm = Garbler::new(ot_send, [0u8; 16], delta);
-    let mut follower_vm = Evaluator::new(ot_recv);
+    let mut leader_vm = IdealVm::new();
+    let mut follower_vm = IdealVm::new();

    let leader_pms: Array<U8, 32> = leader_vm.alloc().unwrap();
    leader_vm.mark_public(leader_pms).unwrap();
--- a/crates/components/hmac-sha256/src/error.rs
+++ b/crates/components/hmac-sha256/src/error.rs
@@ -56,7 +56,7 @@ impl fmt::Display for PrfError {
        }

        if let Some(ref source) = self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
--- a/crates/components/hmac-sha256/src/hmac.rs
+++ b/crates/components/hmac-sha256/src/hmac.rs
@@ -54,10 +54,11 @@ mod tests {
    use crate::{
        hmac::hmac_sha256,
        sha256, state_to_bytes,
-        test_utils::{compute_inner_local, compute_outer_partial, mock_vm},
+        test_utils::{compute_inner_local, compute_outer_partial},
    };
    use mpz_common::context::test_st_context;
    use mpz_hash::sha256::Sha256;
+    use mpz_ideal_vm::IdealVm;
    use mpz_vm_core::{
        memory::{
            binary::{U32, U8},
@@ -83,7 +84,8 @@ mod tests {
    #[tokio::test]
    async fn test_hmac_circuit() {
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut leader, mut follower) = mock_vm();
+        let mut leader = IdealVm::new();
+        let mut follower = IdealVm::new();

        let (inputs, references) = test_fixtures();
        for (input, &reference) in inputs.iter().zip(references.iter()) {
--- a/crates/components/hmac-sha256/src/lib.rs
+++ b/crates/components/hmac-sha256/src/lib.rs
@@ -72,10 +72,11 @@ fn state_to_bytes(input: [u32; 8]) -> [u8; 32] {
 #[cfg(test)]
 mod tests {
    use crate::{
-        test_utils::{mock_vm, prf_cf_vd, prf_keys, prf_ms, prf_sf_vd},
+        test_utils::{prf_cf_vd, prf_keys, prf_ms, prf_sf_vd},
        Mode, MpcPrf, SessionKeys,
    };
    use mpz_common::context::test_st_context;
+    use mpz_ideal_vm::IdealVm;
    use mpz_vm_core::{
        memory::{binary::U8, Array, MemoryExt, ViewExt},
        Execute,
@@ -123,7 +124,8 @@ mod tests {

        // Set up vm and prf
        let (mut ctx_a, mut ctx_b) = test_st_context(128);
-        let (mut leader, mut follower) = mock_vm();
+        let mut leader = IdealVm::new();
+        let mut follower = IdealVm::new();

        let leader_pms: Array<U8, 32> = leader.alloc().unwrap();
        leader.mark_public(leader_pms).unwrap();
--- a/crates/components/hmac-sha256/src/prf.rs
+++ b/crates/components/hmac-sha256/src/prf.rs
@@ -339,8 +339,9 @@ fn gen_merge_circ(size: usize) -> Arc<Circuit> {

 #[cfg(test)]
 mod tests {
-    use crate::{prf::merge_outputs, test_utils::mock_vm};
+    use crate::prf::merge_outputs;
    use mpz_common::context::test_st_context;
+    use mpz_ideal_vm::IdealVm;
    use mpz_vm_core::{
        memory::{binary::U8, Array, MemoryExt, ViewExt},
        Execute,
@@ -349,7 +350,8 @@ mod tests {
    #[tokio::test]
    async fn test_merge_outputs() {
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut leader, mut follower) = mock_vm();
+        let mut leader = IdealVm::new();
+        let mut follower = IdealVm::new();

        let input1: [u8; 32] = std::array::from_fn(|i| i as u8);
        let input2: [u8; 32] = std::array::from_fn(|i| i as u8 + 32);
--- a/crates/components/hmac-sha256/src/prf/function.rs
+++ b/crates/components/hmac-sha256/src/prf/function.rs
@@ -137,10 +137,11 @@ impl Prf {
 mod tests {
    use crate::{
        prf::{compute_partial, function::Prf},
-        test_utils::{mock_vm, phash},
+        test_utils::phash,
        Mode,
    };
    use mpz_common::context::test_st_context;
+    use mpz_ideal_vm::IdealVm;
    use mpz_vm_core::{
        memory::{binary::U8, Array, MemoryExt, ViewExt},
        Execute,
@@ -166,7 +167,8 @@ mod tests {
        let mut rng = ThreadRng::default();

        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut leader, mut follower) = mock_vm();
+        let mut leader = IdealVm::new();
+        let mut follower = IdealVm::new();

        let key: [u8; 32] = rng.random();
        let start_seed: Vec<u8> = vec![42; 64];
--- a/crates/components/hmac-sha256/src/prf/function/reduced.rs
+++ b/crates/components/hmac-sha256/src/prf/function/reduced.rs
@@ -40,7 +40,6 @@ enum PrfState {
        inner_partial: [u32; 8],
        a_output: DecodeFutureTyped<BitVec, [u8; 32]>,
    },
-    FinishLastP,
    Done,
 }

@@ -137,16 +136,18 @@ impl PrfFunction {
                assign_inner_local(vm, p.inner_local, *inner_partial, &msg)?;

                if *iter == self.iterations {
-                    self.state = PrfState::FinishLastP;
+                    self.state = PrfState::Done;
                } else {
                    self.state = PrfState::ComputeA {
                        iter: *iter + 1,
                        inner_partial: *inner_partial,
                        msg: output.to_vec(),
-                    }
-                };
+                    };
+                    // We recurse, so that this PHash and the next AHash could
+                    // be computed in a single VM execute call.
+                    self.flush(vm)?;
+                }
            }
-            PrfState::FinishLastP => self.state = PrfState::Done,
            _ => (),
        }

--- a/crates/components/hmac-sha256/src/test_utils.rs
+++ b/crates/components/hmac-sha256/src/test_utils.rs
@@ -1,25 +1,10 @@
 use crate::{sha256, state_to_bytes};
-use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
-use mpz_ot::ideal::cot::{ideal_cot, IdealCOTReceiver, IdealCOTSender};
-use mpz_vm_core::memory::correlated::Delta;
 use rand::{rngs::StdRng, Rng, SeedableRng};

 pub(crate) const SHA256_IV: [u32; 8] = [
    0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
 ];

-pub(crate) fn mock_vm() -> (Garbler<IdealCOTSender>, Evaluator<IdealCOTReceiver>) {
-    let mut rng = StdRng::seed_from_u64(0);
-    let delta = Delta::random(&mut rng);
-
-    let (cot_send, cot_recv) = ideal_cot(delta.into_inner());
-
-    let gen = Garbler::new(cot_send, [0u8; 16], delta);
-    let ev = Evaluator::new(cot_recv);
-
-    (gen, ev)
-}
-
 pub(crate) fn prf_ms(pms: [u8; 32], client_random: [u8; 32], server_random: [u8; 32]) -> [u8; 48] {
    let mut label_start_seed = b"master secret".to_vec();
    label_start_seed.extend_from_slice(&client_random);
--- a/crates/components/key-exchange/Cargo.toml
+++ b/crates/components/key-exchange/Cargo.toml
@@ -5,7 +5,7 @@ description = "Implementation of the 3-party key-exchange protocol"
 keywords = ["tls", "mpc", "2pc", "pms", "key-exchange"]
 categories = ["cryptography"]
 license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.12"
+version = "0.1.0-alpha.14-pre"
 edition = "2021"

 [lints]
@@ -40,6 +40,7 @@ tokio = { workspace = true, features = ["sync"] }
 [dev-dependencies]
 mpz-ot = { workspace = true, features = ["ideal"] }
 mpz-garble = { workspace = true }
+mpz-ideal-vm = { workspace = true }

 rand_core = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
--- a/crates/components/key-exchange/src/exchange.rs
+++ b/crates/components/key-exchange/src/exchange.rs
@@ -459,9 +459,7 @@ mod tests {
    use mpz_common::context::test_st_context;
    use mpz_core::Block;
    use mpz_fields::UniformRand;
-    use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
-    use mpz_memory_core::correlated::Delta;
-    use mpz_ot::ideal::cot::{ideal_cot, IdealCOTReceiver, IdealCOTSender};
+    use mpz_ideal_vm::IdealVm;
    use mpz_share_conversion::ideal::{
        ideal_share_convert, IdealShareConvertReceiver, IdealShareConvertSender,
    };
@@ -484,7 +482,8 @@ mod tests {
    async fn test_key_exchange() {
        let mut rng = StdRng::seed_from_u64(0).compat();
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut gen, mut ev) = mock_vm();
+        let mut gen = IdealVm::new();
+        let mut ev = IdealVm::new();

        let leader_private_key = SecretKey::random(&mut rng);
        let follower_private_key = SecretKey::random(&mut rng);
@@ -625,7 +624,8 @@ mod tests {
    async fn test_malicious_key_exchange(#[case] malicious: Malicious) {
        let mut rng = StdRng::seed_from_u64(0);
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (mut gen, mut ev) = mock_vm();
+        let mut gen = IdealVm::new();
+        let mut ev = IdealVm::new();

        let leader_private_key = SecretKey::random(&mut rng.compat_by_ref());
        let follower_private_key = SecretKey::random(&mut rng.compat_by_ref());
@@ -704,7 +704,8 @@ mod tests {
    #[tokio::test]
    async fn test_circuit() {
        let (mut ctx_a, mut ctx_b) = test_st_context(8);
-        let (gen, ev) = mock_vm();
+        let gen = IdealVm::new();
+        let ev = IdealVm::new();

        let share_a0_bytes = [5_u8; 32];
        let share_a1_bytes = [2_u8; 32];
@@ -834,16 +835,4 @@ mod tests {

        (leader, follower)
    }
-
-    fn mock_vm() -> (Garbler<IdealCOTSender>, Evaluator<IdealCOTReceiver>) {
-        let mut rng = StdRng::seed_from_u64(0);
-        let delta = Delta::random(&mut rng);
-
-        let (cot_send, cot_recv) = ideal_cot(delta.into_inner());
-
-        let gen = Garbler::new(cot_send, [0u8; 16], delta);
-        let ev = Evaluator::new(cot_recv);
-
-        (gen, ev)
-    }
 }
--- a/crates/components/key-exchange/src/lib.rs
+++ b/crates/components/key-exchange/src/lib.rs
@@ -8,7 +8,7 @@
 //! with the server alone and forward all messages from and to the follower.
 //!
 //! A detailed description of this protocol can be found in our documentation
-//! <https://docs.tlsnotary.org/protocol/notarization/key_exchange.html>.
+//! <https://tlsnotary.org/docs/mpc/key_exchange>.

 #![deny(missing_docs, unreachable_pub, unused_must_use)]
 #![deny(clippy::all)]
--- a/crates/components/key-exchange/src/mock.rs
+++ b/crates/components/key-exchange/src/mock.rs
@@ -26,8 +26,7 @@ pub fn create_mock_key_exchange_pair() -> (MockKeyExchange, MockKeyExchange) {

 #[cfg(test)]
 mod tests {
-    use mpz_garble::protocol::semihonest::{Evaluator, Garbler};
-    use mpz_ot::ideal::cot::{IdealCOTReceiver, IdealCOTSender};
+    use mpz_ideal_vm::IdealVm;

    use super::*;
    use crate::KeyExchange;
@@ -40,12 +39,12 @@ mod tests {

        is_key_exchange::<
            MpcKeyExchange<IdealShareConvertSender<P256>, IdealShareConvertReceiver<P256>>,
-            Garbler<IdealCOTSender>,
+            IdealVm,
        >(leader);

        is_key_exchange::<
            MpcKeyExchange<IdealShareConvertSender<P256>, IdealShareConvertReceiver<P256>>,
-            Evaluator<IdealCOTReceiver>,
+            IdealVm,
        >(follower);
    }
 }
--- a/crates/components/key-exchange/src/point_addition.rs
+++ b/crates/components/key-exchange/src/point_addition.rs
@@ -4,7 +4,7 @@
 //! protocol has semi-honest security.
 //!
 //! The protocol is described in
-//! <https://docs.tlsnotary.org/protocol/notarization/key_exchange.html>
+//! <https://tlsnotary.org/docs/mpc/key_exchange>

 use crate::{KeyExchangeError, Role};
 use mpz_common::{Context, Flush};
--- a/crates/core/Cargo.toml
+++ b/crates/core/Cargo.toml
@@ -5,7 +5,7 @@ description = "Core types for TLSNotary"
 keywords = ["tls", "mpc", "2pc", "types"]
 categories = ["cryptography"]
 license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.12"
+version = "0.1.0-alpha.14-pre"
 edition = "2021"

 [lints]
@@ -13,7 +13,14 @@ workspace = true

 [features]
 default = []
-fixtures = ["dep:hex", "dep:tlsn-data-fixtures"]
+mozilla-certs = ["dep:webpki-root-certs", "dep:webpki-roots"]
+fixtures = [
+    "dep:hex",
+    "dep:tlsn-data-fixtures",
+    "dep:aead",
+    "dep:aes-gcm",
+    "dep:generic-array",
+]

 [dependencies]
 tlsn-data-fixtures = { workspace = true, optional = true }
@@ -21,13 +28,13 @@ tlsn-tls-core = { workspace = true, features = ["serde"] }
 tlsn-utils = { workspace = true }
 rangeset = { workspace = true, features = ["serde"] }

-bcs = { workspace = true }
+aead = { workspace = true, features = ["alloc"], optional = true }
+aes-gcm = { workspace = true, optional = true }
+generic-array = { workspace = true, optional = true }
 bimap = { version = "0.6", features = ["serde"] }
 blake3 = { workspace = true }
 hex = { workspace = true, optional = true }
-k256 = { workspace = true }
 opaque-debug = { workspace = true }
-p256 = { workspace = true, features = ["serde"] }
 rand = { workspace = true }
 rand_core = { workspace = true }
 rand_chacha = { workspace = true }
@@ -36,21 +43,23 @@ rstest = { workspace = true, optional = true }
 serde = { workspace = true }
 sha2 = { workspace = true }
 thiserror = { workspace = true }
-tiny-keccak = { version = "2.0", features = ["keccak"] }
+tiny-keccak = { workspace = true, features = ["keccak"] }
 web-time = { workspace = true }
-webpki-roots = { workspace = true }
+webpki-roots = { workspace = true, optional = true }
+webpki-root-certs = { workspace = true, optional = true }
+rustls-webpki = { workspace = true, features = ["ring"] }
+rustls-pki-types = { workspace = true }
 itybity = { workspace = true }
+zeroize = { workspace = true, features = ["zeroize_derive"] }

 [dev-dependencies]
-alloy-primitives = { version = "0.8.22", default-features = false }
-alloy-signer = { version = "0.12", default-features = false }
-alloy-signer-local = { version = "0.12", default-features = false }
+aead = { workspace = true, features = ["alloc"] }
+aes-gcm = { workspace = true }
+generic-array = { workspace = true }
 bincode = { workspace = true }
 hex = { workspace = true }
 rstest = { workspace = true }
+tlsn-core = { workspace = true, features = ["fixtures"] }
+tlsn-attestation = { workspace = true, features = ["fixtures"] }
 tlsn-data-fixtures = { workspace = true }
-rand06-compat = { workspace = true }
-
-[[test]]
-name = "api"
-required-features = ["fixtures"]
+webpki-root-certs = { workspace = true }
--- a/crates/core/src/config.rs
+++ b/crates/core/src/config.rs
@@ -0,0 +1,7 @@
+//! Configuration types.
+
+pub mod prove;
+pub mod prover;
+pub mod tls;
+pub mod tls_commit;
+pub mod verifier;
--- a/crates/core/src/config/prove.rs
+++ b/crates/core/src/config/prove.rs
@@ -0,0 +1,189 @@
+//! Proving configuration.
+
+use rangeset::set::{RangeSet, ToRangeSet};
+use serde::{Deserialize, Serialize};
+
+use crate::transcript::{Direction, Transcript, TranscriptCommitConfig, TranscriptCommitRequest};
+
+/// Configuration to prove information to the verifier.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProveConfig {
+    server_identity: bool,
+    reveal: Option<(RangeSet<usize>, RangeSet<usize>)>,
+    transcript_commit: Option<TranscriptCommitConfig>,
+}
+
+impl ProveConfig {
+    /// Creates a new builder.
+    pub fn builder(transcript: &Transcript) -> ProveConfigBuilder<'_> {
+        ProveConfigBuilder::new(transcript)
+    }
+
+    /// Returns `true` if the server identity is to be proven.
+    pub fn server_identity(&self) -> bool {
+        self.server_identity
+    }
+
+    /// Returns the sent and received ranges of the transcript to be revealed,
+    /// respectively.
+    pub fn reveal(&self) -> Option<&(RangeSet<usize>, RangeSet<usize>)> {
+        self.reveal.as_ref()
+    }
+
+    /// Returns the transcript commitment configuration.
+    pub fn transcript_commit(&self) -> Option<&TranscriptCommitConfig> {
+        self.transcript_commit.as_ref()
+    }
+
+    /// Returns a request.
+    pub fn to_request(&self) -> ProveRequest {
+        ProveRequest {
+            server_identity: self.server_identity,
+            reveal: self.reveal.clone(),
+            transcript_commit: self
+                .transcript_commit
+                .clone()
+                .map(|config| config.to_request()),
+        }
+    }
+}
+
+/// Builder for [`ProveConfig`].
+#[derive(Debug)]
+pub struct ProveConfigBuilder<'a> {
+    transcript: &'a Transcript,
+    server_identity: bool,
+    reveal: Option<(RangeSet<usize>, RangeSet<usize>)>,
+    transcript_commit: Option<TranscriptCommitConfig>,
+}
+
+impl<'a> ProveConfigBuilder<'a> {
+    /// Creates a new builder.
+    pub fn new(transcript: &'a Transcript) -> Self {
+        Self {
+            transcript,
+            server_identity: false,
+            reveal: None,
+            transcript_commit: None,
+        }
+    }
+
+    /// Proves the server identity.
+    pub fn server_identity(&mut self) -> &mut Self {
+        self.server_identity = true;
+        self
+    }
+
+    /// Configures transcript commitments.
+    pub fn transcript_commit(&mut self, transcript_commit: TranscriptCommitConfig) -> &mut Self {
+        self.transcript_commit = Some(transcript_commit);
+        self
+    }
+
+    /// Reveals the given ranges of the transcript.
+    pub fn reveal(
+        &mut self,
+        direction: Direction,
+        ranges: &dyn ToRangeSet<usize>,
+    ) -> Result<&mut Self, ProveConfigError> {
+        let idx = ranges.to_range_set();
+
+        if idx.end().unwrap_or(0) > self.transcript.len_of_direction(direction) {
+            return Err(ProveConfigError(ErrorRepr::IndexOutOfBounds {
+                direction,
+                actual: idx.end().unwrap_or(0),
+                len: self.transcript.len_of_direction(direction),
+            }));
+        }
+
+        let (sent, recv) = self.reveal.get_or_insert_default();
+        match direction {
+            Direction::Sent => sent.union_mut(&idx),
+            Direction::Received => recv.union_mut(&idx),
+        }
+
+        Ok(self)
+    }
+
+    /// Reveals the given ranges of the sent data transcript.
+    pub fn reveal_sent(
+        &mut self,
+        ranges: &dyn ToRangeSet<usize>,
+    ) -> Result<&mut Self, ProveConfigError> {
+        self.reveal(Direction::Sent, ranges)
+    }
+
+    /// Reveals all of the sent data transcript.
+    pub fn reveal_sent_all(&mut self) -> Result<&mut Self, ProveConfigError> {
+        let len = self.transcript.len_of_direction(Direction::Sent);
+        let (sent, _) = self.reveal.get_or_insert_default();
+        sent.union_mut(&(0..len));
+        Ok(self)
+    }
+
+    /// Reveals the given ranges of the received data transcript.
+    pub fn reveal_recv(
+        &mut self,
+        ranges: &dyn ToRangeSet<usize>,
+    ) -> Result<&mut Self, ProveConfigError> {
+        self.reveal(Direction::Received, ranges)
+    }
+
+    /// Reveals all of the received data transcript.
+    pub fn reveal_recv_all(&mut self) -> Result<&mut Self, ProveConfigError> {
+        let len = self.transcript.len_of_direction(Direction::Received);
+        let (_, recv) = self.reveal.get_or_insert_default();
+        recv.union_mut(&(0..len));
+        Ok(self)
+    }
+
+    /// Builds the configuration.
+    pub fn build(self) -> Result<ProveConfig, ProveConfigError> {
+        Ok(ProveConfig {
+            server_identity: self.server_identity,
+            reveal: self.reveal,
+            transcript_commit: self.transcript_commit,
+        })
+    }
+}
+
+/// Request to prove statements about the connection.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProveRequest {
+    server_identity: bool,
+    reveal: Option<(RangeSet<usize>, RangeSet<usize>)>,
+    transcript_commit: Option<TranscriptCommitRequest>,
+}
+
+impl ProveRequest {
+    /// Returns `true` if the server identity is to be proven.
+    pub fn server_identity(&self) -> bool {
+        self.server_identity
+    }
+
+    /// Returns the sent and received ranges of the transcript to be revealed,
+    /// respectively.
+    pub fn reveal(&self) -> Option<&(RangeSet<usize>, RangeSet<usize>)> {
+        self.reveal.as_ref()
+    }
+
+    /// Returns the transcript commitment configuration.
+    pub fn transcript_commit(&self) -> Option<&TranscriptCommitRequest> {
+        self.transcript_commit.as_ref()
+    }
+}
+
+/// Error for [`ProveConfig`].
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct ProveConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {
+    #[error("range is out of bounds of the transcript ({direction}): {actual} > {len}")]
+    IndexOutOfBounds {
+        direction: Direction,
+        actual: usize,
+        len: usize,
+    },
+}
--- a/crates/core/src/config/prover.rs
+++ b/crates/core/src/config/prover.rs
@@ -0,0 +1,33 @@
+//! Prover configuration.
+
+use serde::{Deserialize, Serialize};
+
+/// Prover configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProverConfig {}
+
+impl ProverConfig {
+    /// Creates a new builder.
+    pub fn builder() -> ProverConfigBuilder {
+        ProverConfigBuilder::default()
+    }
+}
+
+/// Builder for [`ProverConfig`].
+#[derive(Debug, Default)]
+pub struct ProverConfigBuilder {}
+
+impl ProverConfigBuilder {
+    /// Builds the configuration.
+    pub fn build(self) -> Result<ProverConfig, ProverConfigError> {
+        Ok(ProverConfig {})
+    }
+}
+
+/// Error for [`ProverConfig`].
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct ProverConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {}
--- a/crates/core/src/config/tls.rs
+++ b/crates/core/src/config/tls.rs
@@ -0,0 +1,111 @@
+//! TLS client configuration.
+
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    connection::ServerName,
+    webpki::{CertificateDer, PrivateKeyDer, RootCertStore},
+};
+
+/// TLS client configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TlsClientConfig {
+    server_name: ServerName,
+    /// Root certificates.
+    root_store: RootCertStore,
+    /// Certificate chain and a matching private key for client
+    /// authentication.
+    client_auth: Option<(Vec<CertificateDer>, PrivateKeyDer)>,
+}
+
+impl TlsClientConfig {
+    /// Creates a new builder.
+    pub fn builder() -> TlsConfigBuilder {
+        TlsConfigBuilder::default()
+    }
+
+    /// Returns the server name.
+    pub fn server_name(&self) -> &ServerName {
+        &self.server_name
+    }
+
+    /// Returns the root certificates.
+    pub fn root_store(&self) -> &RootCertStore {
+        &self.root_store
+    }
+
+    /// Returns a certificate chain and a matching private key for client
+    /// authentication.
+    pub fn client_auth(&self) -> Option<&(Vec<CertificateDer>, PrivateKeyDer)> {
+        self.client_auth.as_ref()
+    }
+}
+
+/// Builder for [`TlsClientConfig`].
+#[derive(Debug, Default)]
+pub struct TlsConfigBuilder {
+    server_name: Option<ServerName>,
+    root_store: Option<RootCertStore>,
+    client_auth: Option<(Vec<CertificateDer>, PrivateKeyDer)>,
+}
+
+impl TlsConfigBuilder {
+    /// Sets the server name.
+    pub fn server_name(mut self, server_name: ServerName) -> Self {
+        self.server_name = Some(server_name);
+        self
+    }
+
+    /// Sets the root certificates to use for verifying the server's
+    /// certificate.
+    pub fn root_store(mut self, store: RootCertStore) -> Self {
+        self.root_store = Some(store);
+        self
+    }
+
+    /// Sets a DER-encoded certificate chain and a matching private key for
+    /// client authentication.
+    ///
+    /// Often the chain will consist of a single end-entity certificate.
+    ///
+    /// # Arguments
+    ///
+    /// * `cert_key` - A tuple containing the certificate chain and the private
+    ///   key.
+    ///
+    ///   - Each certificate in the chain must be in the X.509 format.
+    ///   - The key must be in the ASN.1 format (either PKCS#8 or PKCS#1).
+    pub fn client_auth(mut self, cert_key: (Vec<CertificateDer>, PrivateKeyDer)) -> Self {
+        self.client_auth = Some(cert_key);
+        self
+    }
+
+    /// Builds the TLS configuration.
+    pub fn build(self) -> Result<TlsClientConfig, TlsConfigError> {
+        let server_name = self.server_name.ok_or(ErrorRepr::MissingField {
+            field: "server_name",
+        })?;
+
+        let root_store = self.root_store.ok_or(ErrorRepr::MissingField {
+            field: "root_store",
+        })?;
+
+        Ok(TlsClientConfig {
+            server_name,
+            root_store,
+            client_auth: self.client_auth,
+        })
+    }
+}
+
+/// TLS configuration error.
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct TlsConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+#[error("tls config error")]
+enum ErrorRepr {
+    #[error("missing required field: {field}")]
+    MissingField { field: &'static str },
+}
--- a/crates/core/src/config/tls_commit.rs
+++ b/crates/core/src/config/tls_commit.rs
@@ -0,0 +1,94 @@
+//! TLS commitment configuration.
+
+pub mod mpc;
+
+use serde::{Deserialize, Serialize};
+
+/// TLS commitment configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TlsCommitConfig {
+    protocol: TlsCommitProtocolConfig,
+}
+
+impl TlsCommitConfig {
+    /// Creates a new builder.
+    pub fn builder() -> TlsCommitConfigBuilder {
+        TlsCommitConfigBuilder::default()
+    }
+
+    /// Returns the protocol configuration.
+    pub fn protocol(&self) -> &TlsCommitProtocolConfig {
+        &self.protocol
+    }
+
+    /// Returns a TLS commitment request.
+    pub fn to_request(&self) -> TlsCommitRequest {
+        TlsCommitRequest {
+            config: self.protocol.clone(),
+        }
+    }
+}
+
+/// Builder for [`TlsCommitConfig`].
+#[derive(Debug, Default, Clone, Serialize, Deserialize)]
+pub struct TlsCommitConfigBuilder {
+    protocol: Option<TlsCommitProtocolConfig>,
+}
+
+impl TlsCommitConfigBuilder {
+    /// Sets the protocol configuration.
+    pub fn protocol<C>(mut self, protocol: C) -> Self
+    where
+        C: Into<TlsCommitProtocolConfig>,
+    {
+        self.protocol = Some(protocol.into());
+        self
+    }
+
+    /// Builds the configuration.
+    pub fn build(self) -> Result<TlsCommitConfig, TlsCommitConfigError> {
+        let protocol = self
+            .protocol
+            .ok_or(ErrorRepr::MissingField { name: "protocol" })?;
+
+        Ok(TlsCommitConfig { protocol })
+    }
+}
+
+/// TLS commitment protocol configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum TlsCommitProtocolConfig {
+    /// MPC-TLS configuration.
+    Mpc(mpc::MpcTlsConfig),
+}
+
+impl From<mpc::MpcTlsConfig> for TlsCommitProtocolConfig {
+    fn from(config: mpc::MpcTlsConfig) -> Self {
+        Self::Mpc(config)
+    }
+}
+
+/// TLS commitment request.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TlsCommitRequest {
+    config: TlsCommitProtocolConfig,
+}
+
+impl TlsCommitRequest {
+    /// Returns the protocol configuration.
+    pub fn protocol(&self) -> &TlsCommitProtocolConfig {
+        &self.config
+    }
+}
+
+/// Error for [`TlsCommitConfig`].
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct TlsCommitConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {
+    #[error("missing field: {name}")]
+    MissingField { name: &'static str },
+}
--- a/crates/core/src/config/tls_commit/mpc.rs
+++ b/crates/core/src/config/tls_commit/mpc.rs
@@ -0,0 +1,241 @@
+//! MPC-TLS commitment protocol configuration.
+
+use serde::{Deserialize, Serialize};
+
+// Default is 32 bytes to decrypt the TLS protocol messages.
+const DEFAULT_MAX_RECV_ONLINE: usize = 32;
+
+/// MPC-TLS commitment protocol configuration.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(try_from = "unchecked::MpcTlsConfigUnchecked")]
+pub struct MpcTlsConfig {
+    /// Maximum number of bytes that can be sent.
+    max_sent_data: usize,
+    /// Maximum number of application data records that can be sent.
+    max_sent_records: Option<usize>,
+    /// Maximum number of bytes that can be decrypted online, i.e. while the
+    /// MPC-TLS connection is active.
+    max_recv_data_online: usize,
+    /// Maximum number of bytes that can be received.
+    max_recv_data: usize,
+    /// Maximum number of received application data records that can be
+    /// decrypted online, i.e. while the MPC-TLS connection is active.
+    max_recv_records_online: Option<usize>,
+    /// Whether the `deferred decryption` feature is toggled on from the start
+    /// of the MPC-TLS connection.
+    defer_decryption_from_start: bool,
+    /// Network settings.
+    network: NetworkSetting,
+}
+
+impl MpcTlsConfig {
+    /// Creates a new builder.
+    pub fn builder() -> MpcTlsConfigBuilder {
+        MpcTlsConfigBuilder::default()
+    }
+
+    /// Returns the maximum number of bytes that can be sent.
+    pub fn max_sent_data(&self) -> usize {
+        self.max_sent_data
+    }
+
+    /// Returns the maximum number of application data records that can
+    /// be sent.
+    pub fn max_sent_records(&self) -> Option<usize> {
+        self.max_sent_records
+    }
+
+    /// Returns the maximum number of bytes that can be decrypted online.
+    pub fn max_recv_data_online(&self) -> usize {
+        self.max_recv_data_online
+    }
+
+    /// Returns the maximum number of bytes that can be received.
+    pub fn max_recv_data(&self) -> usize {
+        self.max_recv_data
+    }
+
+    /// Returns the maximum number of received application data records that
+    /// can be decrypted online.
+    pub fn max_recv_records_online(&self) -> Option<usize> {
+        self.max_recv_records_online
+    }
+
+    /// Returns whether the `deferred decryption` feature is toggled on from the
+    /// start of the MPC-TLS connection.
+    pub fn defer_decryption_from_start(&self) -> bool {
+        self.defer_decryption_from_start
+    }
+
+    /// Returns the network settings.
+    pub fn network(&self) -> NetworkSetting {
+        self.network
+    }
+}
+
+fn validate(config: MpcTlsConfig) -> Result<MpcTlsConfig, MpcTlsConfigError> {
+    if config.max_recv_data_online > config.max_recv_data {
+        return Err(ErrorRepr::InvalidValue {
+            name: "max_recv_data_online",
+            reason: format!(
+                "must be <= max_recv_data ({} > {})",
+                config.max_recv_data_online, config.max_recv_data
+            ),
+        }
+        .into());
+    }
+
+    Ok(config)
+}
+
+/// Builder for [`MpcTlsConfig`].
+#[derive(Debug, Default)]
+pub struct MpcTlsConfigBuilder {
+    max_sent_data: Option<usize>,
+    max_sent_records: Option<usize>,
+    max_recv_data_online: Option<usize>,
+    max_recv_data: Option<usize>,
+    max_recv_records_online: Option<usize>,
+    defer_decryption_from_start: Option<bool>,
+    network: Option<NetworkSetting>,
+}
+
+impl MpcTlsConfigBuilder {
+    /// Sets the maximum number of bytes that can be sent.
+    pub fn max_sent_data(mut self, max_sent_data: usize) -> Self {
+        self.max_sent_data = Some(max_sent_data);
+        self
+    }
+
+    /// Sets the maximum number of application data records that can be sent.
+    pub fn max_sent_records(mut self, max_sent_records: usize) -> Self {
+        self.max_sent_records = Some(max_sent_records);
+        self
+    }
+
+    /// Sets the maximum number of bytes that can be decrypted online.
+    pub fn max_recv_data_online(mut self, max_recv_data_online: usize) -> Self {
+        self.max_recv_data_online = Some(max_recv_data_online);
+        self
+    }
+
+    /// Sets the maximum number of bytes that can be received.
+    pub fn max_recv_data(mut self, max_recv_data: usize) -> Self {
+        self.max_recv_data = Some(max_recv_data);
+        self
+    }
+
+    /// Sets the maximum number of received application data records that can
+    /// be decrypted online.
+    pub fn max_recv_records_online(mut self, max_recv_records_online: usize) -> Self {
+        self.max_recv_records_online = Some(max_recv_records_online);
+        self
+    }
+
+    /// Sets whether the `deferred decryption` feature is toggled on from the
+    /// start of the MPC-TLS connection.
+    pub fn defer_decryption_from_start(mut self, defer_decryption_from_start: bool) -> Self {
+        self.defer_decryption_from_start = Some(defer_decryption_from_start);
+        self
+    }
+
+    /// Sets the network settings.
+    pub fn network(mut self, network: NetworkSetting) -> Self {
+        self.network = Some(network);
+        self
+    }
+
+    /// Builds the configuration.
+    pub fn build(self) -> Result<MpcTlsConfig, MpcTlsConfigError> {
+        let Self {
+            max_sent_data,
+            max_sent_records,
+            max_recv_data_online,
+            max_recv_data,
+            max_recv_records_online,
+            defer_decryption_from_start,
+            network,
+        } = self;
+
+        let max_sent_data = max_sent_data.ok_or(ErrorRepr::MissingField {
+            name: "max_sent_data",
+        })?;
+
+        let max_recv_data_online = max_recv_data_online.unwrap_or(DEFAULT_MAX_RECV_ONLINE);
+        let max_recv_data = max_recv_data.ok_or(ErrorRepr::MissingField {
+            name: "max_recv_data",
+        })?;
+
+        let defer_decryption_from_start = defer_decryption_from_start.unwrap_or(true);
+        let network = network.unwrap_or_default();
+
+        validate(MpcTlsConfig {
+            max_sent_data,
+            max_sent_records,
+            max_recv_data_online,
+            max_recv_data,
+            max_recv_records_online,
+            defer_decryption_from_start,
+            network,
+        })
+    }
+}
+
+/// Settings for the network environment.
+///
+/// Provides optimization options to adapt the protocol to different network
+/// situations.
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, Default)]
+pub enum NetworkSetting {
+    /// Reduces network round-trips at the expense of consuming more network
+    /// bandwidth.
+    Bandwidth,
+    /// Reduces network bandwidth utilization at the expense of more network
+    /// round-trips.
+    #[default]
+    Latency,
+}
+
+/// Error for [`MpcTlsConfig`].
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct MpcTlsConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {
+    #[error("missing field: {name}")]
+    MissingField { name: &'static str },
+    #[error("invalid value for field({name}): {reason}")]
+    InvalidValue { name: &'static str, reason: String },
+}
+
+mod unchecked {
+    use super::*;
+
+    #[derive(Deserialize)]
+    pub(super) struct MpcTlsConfigUnchecked {
+        max_sent_data: usize,
+        max_sent_records: Option<usize>,
+        max_recv_data_online: usize,
+        max_recv_data: usize,
+        max_recv_records_online: Option<usize>,
+        defer_decryption_from_start: bool,
+        network: NetworkSetting,
+    }
+
+    impl TryFrom<MpcTlsConfigUnchecked> for MpcTlsConfig {
+        type Error = MpcTlsConfigError;
+
+        fn try_from(value: MpcTlsConfigUnchecked) -> Result<Self, Self::Error> {
+            validate(MpcTlsConfig {
+                max_sent_data: value.max_sent_data,
+                max_sent_records: value.max_sent_records,
+                max_recv_data_online: value.max_recv_data_online,
+                max_recv_data: value.max_recv_data,
+                max_recv_records_online: value.max_recv_records_online,
+                defer_decryption_from_start: value.defer_decryption_from_start,
+                network: value.network,
+            })
+        }
+    }
+}
--- a/crates/core/src/config/verifier.rs
+++ b/crates/core/src/config/verifier.rs
@@ -0,0 +1,56 @@
+//! Verifier configuration.
+
+use serde::{Deserialize, Serialize};
+
+use crate::webpki::RootCertStore;
+
+/// Verifier configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct VerifierConfig {
+    root_store: RootCertStore,
+}
+
+impl VerifierConfig {
+    /// Creates a new builder.
+    pub fn builder() -> VerifierConfigBuilder {
+        VerifierConfigBuilder::default()
+    }
+
+    /// Returns the root certificate store.
+    pub fn root_store(&self) -> &RootCertStore {
+        &self.root_store
+    }
+}
+
+/// Builder for [`VerifierConfig`].
+#[derive(Debug, Default)]
+pub struct VerifierConfigBuilder {
+    root_store: Option<RootCertStore>,
+}
+
+impl VerifierConfigBuilder {
+    /// Sets the root certificate store.
+    pub fn root_store(mut self, root_store: RootCertStore) -> Self {
+        self.root_store = Some(root_store);
+        self
+    }
+
+    /// Builds the configuration.
+    pub fn build(self) -> Result<VerifierConfig, VerifierConfigError> {
+        let root_store = self
+            .root_store
+            .ok_or(ErrorRepr::MissingField { name: "root_store" })?;
+        Ok(VerifierConfig { root_store })
+    }
+}
+
+/// Error for [`VerifierConfig`].
+#[derive(Debug, thiserror::Error)]
+#[error(transparent)]
+pub struct VerifierConfigError(#[from] ErrorRepr);
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {
+    #[error("missing field: {name}")]
+    MissingField { name: &'static str },
+}
--- a/crates/core/src/connection.rs
+++ b/crates/core/src/connection.rs
@@ -1,44 +1,12 @@
 //! TLS connection types.
-//!
-//! ## Commitment
-//!
-//! During the TLS handshake the Notary receives the Server's ephemeral public
-//! key, and this key serves as a binding commitment to the identity of the
-//! Server. The ephemeral key itself does not reveal the Server's identity, but
-//! it is bound to it via a signature created using the Server's
-//! X.509 certificate.
-//!
-//! A Prover can withhold the Server's signature and certificate chain from the
-//! Notary to improve privacy and censorship resistance.
-//!
-//! ## Proving the Server's identity
-//!
-//! A Prover can prove the Server's identity to a Verifier by sending a
-//! [`ServerIdentityProof`]. This proof contains all the information required to
-//! establish the link between the TLS connection and the Server's X.509
-//! certificate. A Verifier checks the Server's certificate against their own
-//! trust anchors, the same way a typical TLS client would.
-
-mod commit;
-mod proof;

 use std::fmt;

+use rustls_pki_types as webpki_types;
 use serde::{Deserialize, Serialize};
-use tls_core::{
-    msgs::{
-        codec::Codec,
-        enums::NamedGroup,
-        handshake::{DigitallySignedStruct, ServerECDHParams},
-    },
-    verify::ServerCertVerifier as _,
-};
-use web_time::{Duration, UNIX_EPOCH};
+use tls_core::msgs::{codec::Codec, enums::NamedGroup, handshake::ServerECDHParams};

-use crate::{hash::impl_domain_separator, CryptoProvider};
-
-pub use commit::{ServerCertCommitment, ServerCertOpening};
-pub use proof::{ServerIdentityProof, ServerIdentityProofError};
+use crate::webpki::{CertificateDer, ServerCertVerifier, ServerCertVerifierError};

 /// TLS version.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -62,40 +30,82 @@ impl TryFrom<tls_core::msgs::enums::ProtocolVersion> for TlsVersion {
    }
 }

-/// Server's name, a.k.a. the DNS name.
+/// Server's name.
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct ServerName(String);
+pub enum ServerName {
+    /// DNS name.
+    Dns(DnsName),
+}

 impl ServerName {
-    /// Creates a new server name.
-    pub fn new(name: String) -> Self {
-        Self(name)
-    }
-
-    /// Returns the name as a string.
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<&str> for ServerName {
-    fn from(name: &str) -> Self {
-        Self(name.to_string())
-    }
-}
-
-impl AsRef<str> for ServerName {
-    fn as_ref(&self) -> &str {
-        &self.0
+    pub(crate) fn to_webpki(&self) -> webpki_types::ServerName<'static> {
+        match self {
+            ServerName::Dns(name) => webpki_types::ServerName::DnsName(
+                webpki_types::DnsName::try_from(name.0.as_str())
+                    .expect("name was validated")
+                    .to_owned(),
+            ),
+        }
    }
 }

 impl fmt::Display for ServerName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ServerName::Dns(name) => write!(f, "{name}"),
+        }
+    }
+}
+
+/// DNS name.
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(try_from = "String")]
+pub struct DnsName(String);
+
+impl DnsName {
+    /// Returns the DNS name as a string.
+    pub fn as_str(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
+impl fmt::Display for DnsName {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "{}", self.0)
    }
 }

+impl AsRef<str> for DnsName {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
+/// Error returned when a DNS name is invalid.
+#[derive(Debug, thiserror::Error)]
+#[error("invalid DNS name")]
+pub struct InvalidDnsNameError {}
+
+impl TryFrom<&str> for DnsName {
+    type Error = InvalidDnsNameError;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        // Borrow validation from rustls
+        match webpki_types::DnsName::try_from_str(value) {
+            Ok(_) => Ok(DnsName(value.to_string())),
+            Err(_) => Err(InvalidDnsNameError {}),
+        }
+    }
+}
+
+impl TryFrom<String> for DnsName {
+    type Error = InvalidDnsNameError;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        Self::try_from(value.as_str())
+    }
+}
+
 /// Type of a public key.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
@@ -106,84 +116,84 @@ pub enum KeyType {
    SECP256R1 = 0x0017,
 }

-/// Signature scheme on the key exchange parameters.
+/// Signature algorithm used on the key exchange parameters.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 #[allow(non_camel_case_types, missing_docs)]
-pub enum SignatureScheme {
-    RSA_PKCS1_SHA1 = 0x0201,
-    ECDSA_SHA1_Legacy = 0x0203,
-    RSA_PKCS1_SHA256 = 0x0401,
-    ECDSA_NISTP256_SHA256 = 0x0403,
-    RSA_PKCS1_SHA384 = 0x0501,
-    ECDSA_NISTP384_SHA384 = 0x0503,
-    RSA_PKCS1_SHA512 = 0x0601,
-    ECDSA_NISTP521_SHA512 = 0x0603,
-    RSA_PSS_SHA256 = 0x0804,
-    RSA_PSS_SHA384 = 0x0805,
-    RSA_PSS_SHA512 = 0x0806,
-    ED25519 = 0x0807,
+pub enum SignatureAlgorithm {
+    ECDSA_NISTP256_SHA256,
+    ECDSA_NISTP256_SHA384,
+    ECDSA_NISTP384_SHA256,
+    ECDSA_NISTP384_SHA384,
+    ED25519,
+    RSA_PKCS1_2048_8192_SHA256,
+    RSA_PKCS1_2048_8192_SHA384,
+    RSA_PKCS1_2048_8192_SHA512,
+    RSA_PSS_2048_8192_SHA256_LEGACY_KEY,
+    RSA_PSS_2048_8192_SHA384_LEGACY_KEY,
+    RSA_PSS_2048_8192_SHA512_LEGACY_KEY,
 }

-impl TryFrom<tls_core::msgs::enums::SignatureScheme> for SignatureScheme {
-    type Error = &'static str;
-
-    fn try_from(value: tls_core::msgs::enums::SignatureScheme) -> Result<Self, Self::Error> {
-        use tls_core::msgs::enums::SignatureScheme as Core;
-        use SignatureScheme::*;
-        Ok(match value {
-            Core::RSA_PKCS1_SHA1 => RSA_PKCS1_SHA1,
-            Core::ECDSA_SHA1_Legacy => ECDSA_SHA1_Legacy,
-            Core::RSA_PKCS1_SHA256 => RSA_PKCS1_SHA256,
-            Core::ECDSA_NISTP256_SHA256 => ECDSA_NISTP256_SHA256,
-            Core::RSA_PKCS1_SHA384 => RSA_PKCS1_SHA384,
-            Core::ECDSA_NISTP384_SHA384 => ECDSA_NISTP384_SHA384,
-            Core::RSA_PKCS1_SHA512 => RSA_PKCS1_SHA512,
-            Core::ECDSA_NISTP521_SHA512 => ECDSA_NISTP521_SHA512,
-            Core::RSA_PSS_SHA256 => RSA_PSS_SHA256,
-            Core::RSA_PSS_SHA384 => RSA_PSS_SHA384,
-            Core::RSA_PSS_SHA512 => RSA_PSS_SHA512,
-            Core::ED25519 => ED25519,
-            _ => return Err("unsupported signature scheme"),
-        })
-    }
-}
-
-impl From<SignatureScheme> for tls_core::msgs::enums::SignatureScheme {
-    fn from(value: SignatureScheme) -> Self {
-        use tls_core::msgs::enums::SignatureScheme::*;
-        match value {
-            SignatureScheme::RSA_PKCS1_SHA1 => RSA_PKCS1_SHA1,
-            SignatureScheme::ECDSA_SHA1_Legacy => ECDSA_SHA1_Legacy,
-            SignatureScheme::RSA_PKCS1_SHA256 => RSA_PKCS1_SHA256,
-            SignatureScheme::ECDSA_NISTP256_SHA256 => ECDSA_NISTP256_SHA256,
-            SignatureScheme::RSA_PKCS1_SHA384 => RSA_PKCS1_SHA384,
-            SignatureScheme::ECDSA_NISTP384_SHA384 => ECDSA_NISTP384_SHA384,
-            SignatureScheme::RSA_PKCS1_SHA512 => RSA_PKCS1_SHA512,
-            SignatureScheme::ECDSA_NISTP521_SHA512 => ECDSA_NISTP521_SHA512,
-            SignatureScheme::RSA_PSS_SHA256 => RSA_PSS_SHA256,
-            SignatureScheme::RSA_PSS_SHA384 => RSA_PSS_SHA384,
-            SignatureScheme::RSA_PSS_SHA512 => RSA_PSS_SHA512,
-            SignatureScheme::ED25519 => ED25519,
+impl fmt::Display for SignatureAlgorithm {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SignatureAlgorithm::ECDSA_NISTP256_SHA256 => write!(f, "ECDSA_NISTP256_SHA256"),
+            SignatureAlgorithm::ECDSA_NISTP256_SHA384 => write!(f, "ECDSA_NISTP256_SHA384"),
+            SignatureAlgorithm::ECDSA_NISTP384_SHA256 => write!(f, "ECDSA_NISTP384_SHA256"),
+            SignatureAlgorithm::ECDSA_NISTP384_SHA384 => write!(f, "ECDSA_NISTP384_SHA384"),
+            SignatureAlgorithm::ED25519 => write!(f, "ED25519"),
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA256 => {
+                write!(f, "RSA_PKCS1_2048_8192_SHA256")
+            }
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA384 => {
+                write!(f, "RSA_PKCS1_2048_8192_SHA384")
+            }
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA512 => {
+                write!(f, "RSA_PKCS1_2048_8192_SHA512")
+            }
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA256_LEGACY_KEY => {
+                write!(f, "RSA_PSS_2048_8192_SHA256_LEGACY_KEY")
+            }
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA384_LEGACY_KEY => {
+                write!(f, "RSA_PSS_2048_8192_SHA384_LEGACY_KEY")
+            }
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA512_LEGACY_KEY => {
+                write!(f, "RSA_PSS_2048_8192_SHA512_LEGACY_KEY")
+            }
        }
    }
 }

-/// X.509 certificate, DER encoded.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Certificate(pub Vec<u8>);
-
-impl From<tls_core::key::Certificate> for Certificate {
-    fn from(cert: tls_core::key::Certificate) -> Self {
-        Self(cert.0)
+impl From<tls_core::verify::SignatureAlgorithm> for SignatureAlgorithm {
+    fn from(value: tls_core::verify::SignatureAlgorithm) -> Self {
+        use tls_core::verify::SignatureAlgorithm as Core;
+        match value {
+            Core::ECDSA_NISTP256_SHA256 => SignatureAlgorithm::ECDSA_NISTP256_SHA256,
+            Core::ECDSA_NISTP256_SHA384 => SignatureAlgorithm::ECDSA_NISTP256_SHA384,
+            Core::ECDSA_NISTP384_SHA256 => SignatureAlgorithm::ECDSA_NISTP384_SHA256,
+            Core::ECDSA_NISTP384_SHA384 => SignatureAlgorithm::ECDSA_NISTP384_SHA384,
+            Core::ED25519 => SignatureAlgorithm::ED25519,
+            Core::RSA_PKCS1_2048_8192_SHA256 => SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA256,
+            Core::RSA_PKCS1_2048_8192_SHA384 => SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA384,
+            Core::RSA_PKCS1_2048_8192_SHA512 => SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA512,
+            Core::RSA_PSS_2048_8192_SHA256_LEGACY_KEY => {
+                SignatureAlgorithm::RSA_PSS_2048_8192_SHA256_LEGACY_KEY
+            }
+            Core::RSA_PSS_2048_8192_SHA384_LEGACY_KEY => {
+                SignatureAlgorithm::RSA_PSS_2048_8192_SHA384_LEGACY_KEY
+            }
+            Core::RSA_PSS_2048_8192_SHA512_LEGACY_KEY => {
+                SignatureAlgorithm::RSA_PSS_2048_8192_SHA512_LEGACY_KEY
+            }
+        }
    }
 }

 /// Server's signature of the key exchange parameters.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ServerSignature {
-    /// Signature scheme.
-    pub scheme: SignatureScheme,
+    /// Signature algorithm.
+    pub alg: SignatureAlgorithm,
    /// Signature data.
    pub sig: Vec<u8>,
 }
@@ -198,8 +208,6 @@ pub struct ServerEphemKey {
    pub key: Vec<u8>,
 }

-impl_domain_separator!(ServerEphemKey);
-
 impl ServerEphemKey {
    /// Encodes the key exchange parameters as in TLS.
    pub(crate) fn kx_params(&self) -> Vec<u8> {
@@ -240,8 +248,6 @@ pub struct ConnectionInfo {
    pub transcript_length: TranscriptLength,
 }

-impl_domain_separator!(ConnectionInfo);
-
 /// Transcript length information.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct TranscriptLength {
@@ -251,9 +257,9 @@ pub struct TranscriptLength {
    pub received: u32,
 }

-/// TLS 1.2 handshake data.
+/// TLS 1.2 certificate binding.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct HandshakeDataV1_2 {
+pub struct CertBindingV1_2 {
    /// Client random.
    pub client_random: [u8; 32],
    /// Server random.
@@ -262,87 +268,80 @@ pub struct HandshakeDataV1_2 {
    pub server_ephemeral_key: ServerEphemKey,
 }

-/// TLS handshake data.
+/// TLS certificate binding.
+///
+/// This is the data that the server signs using its public key in the
+/// certificate it presents during the TLS handshake. This provides a binding
+/// between the server's identity and the ephemeral keys used to authenticate
+/// the TLS session.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[non_exhaustive]
-pub enum HandshakeData {
-    /// TLS 1.2 handshake data.
-    V1_2(HandshakeDataV1_2),
+pub enum CertBinding {
+    /// TLS 1.2 certificate binding.
+    V1_2(CertBindingV1_2),
 }

-impl_domain_separator!(HandshakeData);
-
-/// Server certificate and handshake data.
+/// Verify data from the TLS handshake finished messages.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ServerCertData {
-    /// Certificate chain.
-    pub certs: Vec<Certificate>,
-    /// Server signature of the key exchange parameters.
-    pub sig: ServerSignature,
-    /// TLS handshake data.
-    pub handshake: HandshakeData,
+pub struct VerifyData {
+    /// Client finished verify data.
+    pub client_finished: Vec<u8>,
+    /// Server finished verify data.
+    pub server_finished: Vec<u8>,
 }

-impl ServerCertData {
-    /// Verifies the server certificate data.
+/// TLS handshake data.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct HandshakeData {
+    /// Server certificate chain.
+    pub certs: Vec<CertificateDer>,
+    /// Server certificate signature over the binding message.
+    pub sig: ServerSignature,
+    /// Certificate binding.
+    pub binding: CertBinding,
+}
+
+impl HandshakeData {
+    /// Verifies the handshake data.
    ///
    /// # Arguments
    ///
-    /// * `provider` - The crypto provider to use for verification.
+    /// * `verifier` - Cerificate verifier.
    /// * `time` - The time of the connection.
    /// * `server_ephemeral_key` - The server's ephemeral key.
    /// * `server_name` - The server name.
-    pub fn verify_with_provider(
+    pub fn verify(
        &self,
-        provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        time: u64,
        server_ephemeral_key: &ServerEphemKey,
        server_name: &ServerName,
-    ) -> Result<(), CertificateVerificationError> {
+    ) -> Result<(), HandshakeVerificationError> {
        #[allow(irrefutable_let_patterns)]
-        let HandshakeData::V1_2(HandshakeDataV1_2 {
+        let CertBinding::V1_2(CertBindingV1_2 {
            client_random,
            server_random,
            server_ephemeral_key: expected_server_ephemeral_key,
-        }) = &self.handshake
+        }) = &self.binding
        else {
            unreachable!("only TLS 1.2 is implemented")
        };

        if server_ephemeral_key != expected_server_ephemeral_key {
-            return Err(CertificateVerificationError::InvalidServerEphemeralKey);
+            return Err(HandshakeVerificationError::InvalidServerEphemeralKey);
        }

-        // Verify server name.
-        let server_name = tls_core::dns::ServerName::try_from(server_name.as_ref())
-            .map_err(|_| CertificateVerificationError::InvalidIdentity(server_name.clone()))?;
-
-        // Verify server certificate.
-        let cert_chain = self
+        let (end_entity, intermediates) = self
            .certs
-            .clone()
-            .into_iter()
-            .map(|cert| tls_core::key::Certificate(cert.0))
-            .collect::<Vec<_>>();
-
-        let (end_entity, intermediates) = cert_chain
            .split_first()
-            .ok_or(CertificateVerificationError::MissingCerts)?;
+            .ok_or(HandshakeVerificationError::MissingCerts)?;

        // Verify the end entity cert is valid for the provided server name
        // and that it chains to at least one of the roots we trust.
-        provider
-            .cert
-            .verify_server_cert(
-                end_entity,
-                intermediates,
-                &server_name,
-                &mut [].into_iter(),
-                &[],
-                UNIX_EPOCH + Duration::from_secs(time),
-            )
-            .map_err(|_| CertificateVerificationError::InvalidCert)?;
+        verifier
+            .verify_server_cert(end_entity, intermediates, server_name, time)
+            .map_err(HandshakeVerificationError::ServerCert)?;

        // Verify the signature matches the certificate and key exchange parameters.
        let mut message = Vec::new();
@@ -350,12 +349,34 @@ impl ServerCertData {
        message.extend_from_slice(server_random);
        message.extend_from_slice(&server_ephemeral_key.kx_params());

-        let dss = DigitallySignedStruct::new(self.sig.scheme.into(), self.sig.sig.clone());
+        use webpki::ring as alg;
+        let sig_alg = match self.sig.alg {
+            SignatureAlgorithm::ECDSA_NISTP256_SHA256 => alg::ECDSA_P256_SHA256,
+            SignatureAlgorithm::ECDSA_NISTP256_SHA384 => alg::ECDSA_P256_SHA384,
+            SignatureAlgorithm::ECDSA_NISTP384_SHA256 => alg::ECDSA_P384_SHA256,
+            SignatureAlgorithm::ECDSA_NISTP384_SHA384 => alg::ECDSA_P384_SHA384,
+            SignatureAlgorithm::ED25519 => alg::ED25519,
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA256 => alg::RSA_PKCS1_2048_8192_SHA256,
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA384 => alg::RSA_PKCS1_2048_8192_SHA384,
+            SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA512 => alg::RSA_PKCS1_2048_8192_SHA512,
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA256_LEGACY_KEY => {
+                alg::RSA_PSS_2048_8192_SHA256_LEGACY_KEY
+            }
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA384_LEGACY_KEY => {
+                alg::RSA_PSS_2048_8192_SHA384_LEGACY_KEY
+            }
+            SignatureAlgorithm::RSA_PSS_2048_8192_SHA512_LEGACY_KEY => {
+                alg::RSA_PSS_2048_8192_SHA512_LEGACY_KEY
+            }
+        };

-        provider
-            .cert
-            .verify_tls12_signature(&message, end_entity, &dss)
-            .map_err(|_| CertificateVerificationError::InvalidServerSignature)?;
+        let end_entity = webpki_types::CertificateDer::from(end_entity.0.as_slice());
+        let end_entity = webpki::EndEntityCert::try_from(&end_entity)
+            .map_err(|_| HandshakeVerificationError::InvalidEndEntityCertificate)?;
+
+        end_entity
+            .verify_signature(sig_alg, &message, &self.sig.sig)
+            .map_err(|_| HandshakeVerificationError::InvalidServerSignature)?;

        Ok(())
    }
@@ -364,55 +385,49 @@ impl ServerCertData {
 /// Errors that can occur when verifying a certificate chain or signature.
 #[derive(Debug, thiserror::Error)]
 #[allow(missing_docs)]
-pub enum CertificateVerificationError {
-    #[error("invalid server identity: {0}")]
-    InvalidIdentity(ServerName),
+pub enum HandshakeVerificationError {
+    #[error("invalid end entity certificate")]
+    InvalidEndEntityCertificate,
    #[error("missing server certificates")]
    MissingCerts,
-    #[error("invalid server certificate")]
-    InvalidCert,
    #[error("invalid server signature")]
    InvalidServerSignature,
    #[error("invalid server ephemeral key")]
    InvalidServerEphemeralKey,
+    #[error("server certificate verification failed: {0}")]
+    ServerCert(ServerCertVerifierError),
 }

 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::{
-        fixtures::ConnectionFixture, provider::default_cert_verifier, transcript::Transcript,
-    };
+    use crate::{fixtures::ConnectionFixture, transcript::Transcript, webpki::RootCertStore};

    use hex::FromHex;
    use rstest::*;
-    use tls_core::verify::WebPkiVerifier;
    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};

    #[fixture]
    #[once]
-    fn crypto_provider() -> CryptoProvider {
-        let mut store = default_cert_verifier().root_store().clone();
+    fn verifier() -> ServerCertVerifier {
+        let mut root_store = RootCertStore {
+            roots: webpki_root_certs::TLS_SERVER_ROOT_CERTS
+                .iter()
+                .map(|c| CertificateDer(c.to_vec()))
+                .collect(),
+        };

        // Add a cert which is no longer included in the Mozilla root store.
-        let cert = tls_core::key::Certificate(
+        root_store.roots.push(
            appliedzkp()
                .server_cert_data
                .certs
                .last()
                .expect("chain is valid")
-                .0
                .clone(),
        );

-        store.add(&cert).unwrap();
-
-        CryptoProvider {
-            hash: Default::default(),
-            cert: WebPkiVerifier::new(store, None),
-            signer: Default::default(),
-            signature: Default::default(),
-        }
+        ServerCertVerifier::new(&root_store).unwrap()
    }

    fn tlsnotary() -> ConnectionFixture {
@@ -428,7 +443,7 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_sucess_ca_implicit(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        // Remove the CA cert
@@ -436,11 +451,11 @@ mod tests {

        assert!(data
            .server_cert_data
-            .verify_with_provider(
-                crypto_provider,
+            .verify(
+                verifier,
                data.connection_info.time,
                data.server_ephemeral_key(),
-                &ServerName::from(data.server_name.as_ref()),
+                &data.server_name,
            )
            .is_ok());
    }
@@ -451,16 +466,16 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_success_ca_explicit(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] data: ConnectionFixture,
    ) {
        assert!(data
            .server_cert_data
-            .verify_with_provider(
-                crypto_provider,
+            .verify(
+                verifier,
                data.connection_info.time,
                data.server_ephemeral_key(),
-                &ServerName::from(data.server_name.as_ref()),
+                &data.server_name,
            )
            .is_ok());
    }
@@ -470,22 +485,22 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_fail_bad_time(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] data: ConnectionFixture,
    ) {
        // unix time when the cert chain was NOT valid
        let bad_time: u64 = 1571465711;

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            bad_time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidCert
+            HandshakeVerificationError::ServerCert(_)
        ));
    }

@@ -494,7 +509,7 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_fail_no_interm_cert(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        // Remove the CA cert
@@ -502,16 +517,16 @@ mod tests {
        // Remove the intermediate cert
        data.server_cert_data.certs.pop();

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidCert
+            HandshakeVerificationError::ServerCert(_)
        ));
    }

@@ -521,22 +536,22 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_fail_no_interm_cert_with_ca_cert(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        // Remove the intermediate cert
        data.server_cert_data.certs.remove(1);

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidCert
+            HandshakeVerificationError::ServerCert(_)
        ));
    }

@@ -545,24 +560,24 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_fail_bad_ee_cert(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        let ee: &[u8] = include_bytes!("./fixtures/data/unknown/ee.der");

        // Change the end entity cert
-        data.server_cert_data.certs[0] = Certificate(ee.to_vec());
+        data.server_cert_data.certs[0] = CertificateDer(ee.to_vec());

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidCert
+            HandshakeVerificationError::ServerCert(_)
        ));
    }

@@ -571,23 +586,23 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_sig_ke_params_fail_bad_client_random(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
-        let HandshakeData::V1_2(HandshakeDataV1_2 { client_random, .. }) =
-            &mut data.server_cert_data.handshake;
+        let CertBinding::V1_2(CertBindingV1_2 { client_random, .. }) =
+            &mut data.server_cert_data.binding;
        client_random[31] = client_random[31].wrapping_add(1);

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidServerSignature
+            HandshakeVerificationError::InvalidServerSignature
        ));
    }

@@ -596,21 +611,21 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_sig_ke_params_fail_bad_sig(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        data.server_cert_data.sig.sig[31] = data.server_cert_data.sig.sig[31].wrapping_add(1);

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidServerSignature
+            HandshakeVerificationError::InvalidServerSignature
        ));
    }

@@ -619,13 +634,13 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_check_dns_name_present_in_cert_fail_bad_host(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] data: ConnectionFixture,
    ) {
-        let bad_name = ServerName::from("badhost.com");
+        let bad_name = ServerName::Dns(DnsName::try_from("badhost.com").unwrap());

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
            &bad_name,
@@ -633,7 +648,7 @@ mod tests {

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidCert
+            HandshakeVerificationError::ServerCert(_)
        ));
    }

@@ -641,25 +656,22 @@ mod tests {
    #[rstest]
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
-    fn test_invalid_ephemeral_key(
-        crypto_provider: &CryptoProvider,
-        #[case] data: ConnectionFixture,
-    ) {
+    fn test_invalid_ephemeral_key(verifier: &ServerCertVerifier, #[case] data: ConnectionFixture) {
        let wrong_ephemeral_key = ServerEphemKey {
            typ: KeyType::SECP256R1,
            key: Vec::<u8>::from_hex(include_bytes!("./fixtures/data/unknown/pubkey")).unwrap(),
        };

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            &wrong_ephemeral_key,
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::InvalidServerEphemeralKey
+            HandshakeVerificationError::InvalidServerEphemeralKey
        ));
    }

@@ -668,22 +680,22 @@ mod tests {
    #[case::tlsnotary(tlsnotary())]
    #[case::appliedzkp(appliedzkp())]
    fn test_verify_cert_chain_fail_no_cert(
-        crypto_provider: &CryptoProvider,
+        verifier: &ServerCertVerifier,
        #[case] mut data: ConnectionFixture,
    ) {
        // Empty certs
        data.server_cert_data.certs = Vec::new();

-        let err = data.server_cert_data.verify_with_provider(
-            crypto_provider,
+        let err = data.server_cert_data.verify(
+            verifier,
            data.connection_info.time,
            data.server_ephemeral_key(),
-            &ServerName::from(data.server_name.as_ref()),
+            &data.server_name,
        );

        assert!(matches!(
            err.unwrap_err(),
-            CertificateVerificationError::MissingCerts
+            HandshakeVerificationError::MissingCerts
        ));
    }
 }
--- a/crates/core/src/connection/commit.rs
+++ b/crates/core/src/connection/commit.rs
@@ -1,40 +0,0 @@
-//! Types for committing details of a connection.
-
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    connection::ServerCertData,
-    hash::{impl_domain_separator, Blinded, HashAlgorithm, HashAlgorithmExt, TypedHash},
-};
-
-/// Opens a [`ServerCertCommitment`].
-#[derive(Clone, Serialize, Deserialize)]
-pub struct ServerCertOpening(Blinded<ServerCertData>);
-
-impl_domain_separator!(ServerCertOpening);
-
-opaque_debug::implement!(ServerCertOpening);
-
-impl ServerCertOpening {
-    pub(crate) fn new(data: ServerCertData) -> Self {
-        Self(Blinded::new(data))
-    }
-
-    pub(crate) fn commit(&self, hasher: &dyn HashAlgorithm) -> ServerCertCommitment {
-        ServerCertCommitment(TypedHash {
-            alg: hasher.id(),
-            value: hasher.hash_separated(self),
-        })
-    }
-
-    /// Returns the server identity data.
-    pub fn data(&self) -> &ServerCertData {
-        self.0.data()
-    }
-}
-
-/// Commitment to a server certificate.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct ServerCertCommitment(pub(crate) TypedHash);
-
-impl_domain_separator!(ServerCertCommitment);
--- a/crates/core/src/connection/proof.rs
+++ b/crates/core/src/connection/proof.rs
@@ -1,103 +0,0 @@
-//! Types for proving details of a connection.
-
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    connection::{
-        commit::{ServerCertCommitment, ServerCertOpening},
-        CertificateVerificationError, ServerEphemKey, ServerName,
-    },
-    hash::{HashAlgorithmExt, HashProviderError},
-    CryptoProvider,
-};
-
-/// TLS server identity proof.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ServerIdentityProof {
-    name: ServerName,
-    opening: ServerCertOpening,
-}
-
-impl ServerIdentityProof {
-    pub(crate) fn new(name: ServerName, opening: ServerCertOpening) -> Self {
-        Self { name, opening }
-    }
-
-    /// Verifies the server identity proof.
-    ///
-    /// # Arguments
-    ///
-    /// * `provider` - The crypto provider to use for verification.
-    /// * `time` - The time of the connection.
-    /// * `server_ephemeral_key` - The server's ephemeral key.
-    /// * `commitment` - Commitment to the server certificate.
-    pub fn verify_with_provider(
-        self,
-        provider: &CryptoProvider,
-        time: u64,
-        server_ephemeral_key: &ServerEphemKey,
-        commitment: &ServerCertCommitment,
-    ) -> Result<ServerName, ServerIdentityProofError> {
-        let hasher = provider.hash.get(&commitment.0.alg)?;
-
-        if commitment.0.value != hasher.hash_separated(&self.opening) {
-            return Err(ServerIdentityProofError {
-                kind: ErrorKind::Commitment,
-                message: "certificate opening does not match commitment".to_string(),
-            });
-        }
-
-        // Verify certificate and identity.
-        self.opening.data().verify_with_provider(
-            provider,
-            time,
-            server_ephemeral_key,
-            &self.name,
-        )?;
-
-        Ok(self.name)
-    }
-}
-
-/// Error for [`ServerIdentityProof`].
-#[derive(Debug, thiserror::Error)]
-#[error("server identity proof error: {kind}: {message}")]
-pub struct ServerIdentityProofError {
-    kind: ErrorKind,
-    message: String,
-}
-
-impl From<HashProviderError> for ServerIdentityProofError {
-    fn from(err: HashProviderError) -> Self {
-        Self {
-            kind: ErrorKind::Provider,
-            message: err.to_string(),
-        }
-    }
-}
-
-impl From<CertificateVerificationError> for ServerIdentityProofError {
-    fn from(err: CertificateVerificationError) -> Self {
-        Self {
-            kind: ErrorKind::Certificate,
-            message: err.to_string(),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum ErrorKind {
-    Provider,
-    Commitment,
-    Certificate,
-}
-
-impl std::fmt::Display for ErrorKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ErrorKind::Provider => write!(f, "provider"),
-            ErrorKind::Commitment => write!(f, "commitment"),
-            ErrorKind::Certificate => write!(f, "certificate"),
-        }
-    }
-}
--- a/crates/core/src/display.rs
+++ b/crates/core/src/display.rs
@@ -0,0 +1,16 @@
+use rangeset::set::RangeSet;
+
+pub(crate) struct FmtRangeSet<'a>(pub &'a RangeSet<usize>);
+
+impl<'a> std::fmt::Display for FmtRangeSet<'a> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("{")?;
+        for range in self.0.iter() {
+            write!(f, "{}..{}", range.start, range.end)?;
+            if range.end < self.0.end().unwrap_or(0) {
+                f.write_str(", ")?;
+            }
+        }
+        f.write_str("}")
+    }
+}
--- a/crates/core/src/fixtures.rs
+++ b/crates/core/src/fixtures.rs
@@ -1,26 +1,16 @@
 //! Fixtures for testing

-mod provider;
-
-pub use provider::FixtureEncodingProvider;
+pub mod transcript;

 use hex::FromHex;
-use p256::ecdsa::SigningKey;

 use crate::{
-    attestation::{Attestation, AttestationConfig, Extension},
    connection::{
-        Certificate, ConnectionInfo, HandshakeData, HandshakeDataV1_2, KeyType, ServerCertData,
-        ServerEphemKey, ServerName, ServerSignature, SignatureScheme, TlsVersion, TranscriptLength,
+        CertBinding, CertBindingV1_2, ConnectionInfo, DnsName, HandshakeData, KeyType,
+        ServerEphemKey, ServerName, ServerSignature, SignatureAlgorithm, TlsVersion,
+        TranscriptLength,
    },
-    hash::HashAlgorithm,
-    request::{Request, RequestConfig},
-    signing::SignatureAlgId,
-    transcript::{
-        encoding::{EncoderSecret, EncodingProvider, EncodingTree},
-        Transcript, TranscriptCommitConfigBuilder, TranscriptCommitment,
-    },
-    CryptoProvider,
+    webpki::CertificateDer,
 };

 /// A fixture containing various TLS connection data.
@@ -29,33 +19,35 @@ use crate::{
 pub struct ConnectionFixture {
    pub server_name: ServerName,
    pub connection_info: ConnectionInfo,
-    pub server_cert_data: ServerCertData,
+    pub server_cert_data: HandshakeData,
 }

 impl ConnectionFixture {
    /// Returns a connection fixture for tlsnotary.org.
    pub fn tlsnotary(transcript_length: TranscriptLength) -> Self {
        ConnectionFixture {
-            server_name: ServerName::new("tlsnotary.org".to_string()),
+            server_name: ServerName::Dns(DnsName::try_from("tlsnotary.org").unwrap()),
            connection_info: ConnectionInfo {
                time: 1671637529,
                version: TlsVersion::V1_2,
                transcript_length,
            },
-            server_cert_data: ServerCertData {
+            server_cert_data: HandshakeData {
                certs: vec![
-                    Certificate(include_bytes!("fixtures/data/tlsnotary.org/ee.der").to_vec()),
-                    Certificate(include_bytes!("fixtures/data/tlsnotary.org/inter.der").to_vec()),
-                    Certificate(include_bytes!("fixtures/data/tlsnotary.org/ca.der").to_vec()),
+                    CertificateDer(include_bytes!("fixtures/data/tlsnotary.org/ee.der").to_vec()),
+                    CertificateDer(
+                        include_bytes!("fixtures/data/tlsnotary.org/inter.der").to_vec(),
+                    ),
+                    CertificateDer(include_bytes!("fixtures/data/tlsnotary.org/ca.der").to_vec()),
                ],
                sig: ServerSignature {
-                    scheme: SignatureScheme::RSA_PKCS1_SHA256,
+                    alg: SignatureAlgorithm::RSA_PKCS1_2048_8192_SHA256,
                    sig: Vec::<u8>::from_hex(include_bytes!(
                        "fixtures/data/tlsnotary.org/signature"
                    ))
                    .unwrap(),
                },
-                handshake: HandshakeData::V1_2(HandshakeDataV1_2 {
+                binding: CertBinding::V1_2(CertBindingV1_2 {
                    client_random: <[u8; 32]>::from_hex(include_bytes!(
                        "fixtures/data/tlsnotary.org/client_random"
                    ))
@@ -79,26 +71,28 @@ impl ConnectionFixture {
    /// Returns a connection fixture for appliedzkp.org.
    pub fn appliedzkp(transcript_length: TranscriptLength) -> Self {
        ConnectionFixture {
-            server_name: ServerName::new("appliedzkp.org".to_string()),
+            server_name: ServerName::Dns(DnsName::try_from("appliedzkp.org").unwrap()),
            connection_info: ConnectionInfo {
                time: 1671637529,
                version: TlsVersion::V1_2,
                transcript_length,
            },
-            server_cert_data: ServerCertData {
+            server_cert_data: HandshakeData {
                certs: vec![
-                    Certificate(include_bytes!("fixtures/data/appliedzkp.org/ee.der").to_vec()),
-                    Certificate(include_bytes!("fixtures/data/appliedzkp.org/inter.der").to_vec()),
-                    Certificate(include_bytes!("fixtures/data/appliedzkp.org/ca.der").to_vec()),
+                    CertificateDer(include_bytes!("fixtures/data/appliedzkp.org/ee.der").to_vec()),
+                    CertificateDer(
+                        include_bytes!("fixtures/data/appliedzkp.org/inter.der").to_vec(),
+                    ),
+                    CertificateDer(include_bytes!("fixtures/data/appliedzkp.org/ca.der").to_vec()),
                ],
                sig: ServerSignature {
-                    scheme: SignatureScheme::ECDSA_NISTP256_SHA256,
+                    alg: SignatureAlgorithm::ECDSA_NISTP256_SHA256,
                    sig: Vec::<u8>::from_hex(include_bytes!(
                        "fixtures/data/appliedzkp.org/signature"
                    ))
                    .unwrap(),
                },
-                handshake: HandshakeData::V1_2(HandshakeDataV1_2 {
+                binding: CertBinding::V1_2(CertBindingV1_2 {
                    client_random: <[u8; 32]>::from_hex(include_bytes!(
                        "fixtures/data/appliedzkp.org/client_random"
                    ))
@@ -121,143 +115,10 @@ impl ConnectionFixture {

    /// Returns the server_ephemeral_key fixture.
    pub fn server_ephemeral_key(&self) -> &ServerEphemKey {
-        let HandshakeData::V1_2(HandshakeDataV1_2 {
+        let CertBinding::V1_2(CertBindingV1_2 {
            server_ephemeral_key,
            ..
-        }) = &self.server_cert_data.handshake;
+        }) = &self.server_cert_data.binding;
        server_ephemeral_key
    }
 }
-
-/// Returns an encoding provider fixture.
-pub fn encoding_provider(tx: &[u8], rx: &[u8]) -> impl EncodingProvider {
-    let secret = encoder_secret();
-    FixtureEncodingProvider::new(&secret, Transcript::new(tx, rx))
-}
-
-/// Seed fixture.
-const SEED: [u8; 32] = [0; 32];
-
-/// Delta fixture.
-const DELTA: [u8; 16] = [1; 16];
-
-/// Returns an encoder secret fixture.
-pub fn encoder_secret() -> EncoderSecret {
-    EncoderSecret::new(SEED, DELTA)
-}
-
-/// Returns a tampered encoder secret fixture.
-pub fn encoder_secret_tampered_seed() -> EncoderSecret {
-    let mut seed = SEED;
-    seed[0] += 1;
-    EncoderSecret::new(seed, DELTA)
-}
-
-/// Returns a notary signing key fixture.
-pub fn notary_signing_key() -> SigningKey {
-    SigningKey::from_slice(&[1; 32]).unwrap()
-}
-
-/// A Request fixture used for testing.
-#[allow(missing_docs)]
-pub struct RequestFixture {
-    pub encoding_tree: EncodingTree,
-    pub request: Request,
-}
-
-/// Returns a request fixture for testing.
-pub fn request_fixture(
-    transcript: Transcript,
-    encodings_provider: impl EncodingProvider,
-    connection: ConnectionFixture,
-    encoding_hasher: impl HashAlgorithm,
-    extensions: Vec<Extension>,
-) -> RequestFixture {
-    let provider = CryptoProvider::default();
-    let (sent_len, recv_len) = transcript.len();
-
-    let ConnectionFixture {
-        server_name,
-        server_cert_data,
-        ..
-    } = connection;
-
-    let mut transcript_commitment_builder = TranscriptCommitConfigBuilder::new(&transcript);
-    transcript_commitment_builder
-        .commit_sent(&(0..sent_len))
-        .unwrap()
-        .commit_recv(&(0..recv_len))
-        .unwrap();
-    let transcripts_commitment_config = transcript_commitment_builder.build().unwrap();
-
-    // Prover constructs encoding tree.
-    let encoding_tree = EncodingTree::new(
-        &encoding_hasher,
-        transcripts_commitment_config.iter_encoding(),
-        &encodings_provider,
-    )
-    .unwrap();
-
-    let mut builder = RequestConfig::builder();
-
-    for extension in extensions {
-        builder.extension(extension);
-    }
-
-    let request_config = builder.build().unwrap();
-
-    let mut request_builder = Request::builder(&request_config);
-    request_builder
-        .server_name(server_name)
-        .server_cert_data(server_cert_data)
-        .transcript(transcript);
-
-    let (request, _) = request_builder.build(&provider).unwrap();
-
-    RequestFixture {
-        encoding_tree,
-        request,
-    }
-}
-
-/// Returns an attestation fixture for testing.
-pub fn attestation_fixture(
-    request: Request,
-    connection: ConnectionFixture,
-    signature_alg: SignatureAlgId,
-    transcript_commitments: &[TranscriptCommitment],
-) -> Attestation {
-    let ConnectionFixture {
-        connection_info,
-        server_cert_data,
-        ..
-    } = connection;
-
-    let HandshakeData::V1_2(HandshakeDataV1_2 {
-        server_ephemeral_key,
-        ..
-    }) = server_cert_data.handshake;
-
-    let mut provider = CryptoProvider::default();
-    match signature_alg {
-        SignatureAlgId::SECP256K1 => provider.signer.set_secp256k1(&[42u8; 32]).unwrap(),
-        SignatureAlgId::SECP256R1 => provider.signer.set_secp256r1(&[42u8; 32]).unwrap(),
-        _ => unimplemented!(),
-    };
-
-    let attestation_config = AttestationConfig::builder()
-        .supported_signature_algs([signature_alg])
-        .build()
-        .unwrap();
-
-    let mut attestation_builder = Attestation::builder(&attestation_config)
-        .accept_request(request)
-        .unwrap();
-
-    attestation_builder
-        .connection_info(connection_info)
-        .server_ephemeral_key(server_ephemeral_key)
-        .transcript_commitments(transcript_commitments.to_vec());
-
-    attestation_builder.build(&provider).unwrap()
-}
--- a/crates/core/src/fixtures/provider.rs
+++ b/crates/core/src/fixtures/provider.rs
@@ -1,41 +0,0 @@
-use std::ops::Range;
-
-use crate::transcript::{
-    encoding::{new_encoder, Encoder, EncoderSecret, EncodingProvider, EncodingProviderError},
-    Direction, Transcript,
-};
-
-/// A encoding provider fixture.
-pub struct FixtureEncodingProvider {
-    encoder: Box<dyn Encoder>,
-    transcript: Transcript,
-}
-
-impl FixtureEncodingProvider {
-    /// Creates a new encoding provider fixture.
-    pub(crate) fn new(secret: &EncoderSecret, transcript: Transcript) -> Self {
-        Self {
-            encoder: Box::new(new_encoder(secret)),
-            transcript,
-        }
-    }
-}
-
-impl EncodingProvider for FixtureEncodingProvider {
-    fn provide_encoding(
-        &self,
-        direction: Direction,
-        range: Range<usize>,
-        dest: &mut Vec<u8>,
-    ) -> Result<(), EncodingProviderError> {
-        let transcript = match direction {
-            Direction::Sent => &self.transcript.sent(),
-            Direction::Received => &self.transcript.received(),
-        };
-
-        let data = transcript.get(range.clone()).ok_or(EncodingProviderError)?;
-        self.encoder.encode_data(direction, range, data, dest);
-
-        Ok(())
-    }
-}
--- a/crates/core/src/fixtures/transcript.rs
+++ b/crates/core/src/fixtures/transcript.rs
@@ -0,0 +1,201 @@
+//! Transcript fixtures for testing.
+
+use aead::Payload as AeadPayload;
+use aes_gcm::{aead::Aead, Aes128Gcm, NewAead};
+#[allow(deprecated)]
+use generic_array::GenericArray;
+use rand::{rngs::StdRng, Rng, SeedableRng};
+use tls_core::msgs::{
+    base::Payload,
+    codec::Codec,
+    enums::{HandshakeType, ProtocolVersion},
+    handshake::{HandshakeMessagePayload, HandshakePayload},
+    message::{OpaqueMessage, PlainMessage},
+};
+
+use crate::{
+    connection::{TranscriptLength, VerifyData},
+    fixtures::ConnectionFixture,
+    transcript::{ContentType, Record, TlsTranscript},
+};
+
+/// The key used for encryption of the sent and received transcript.
+pub const KEY: [u8; 16] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+
+/// The iv used for encryption of the sent and received transcript.
+pub const IV: [u8; 4] = [1, 3, 3, 7];
+
+/// The record size in bytes.
+pub const RECORD_SIZE: usize = 512;
+
+/// Creates a transript fixture for testing.
+pub fn transcript_fixture(sent: &[u8], recv: &[u8]) -> TlsTranscript {
+    TranscriptGenerator::new(KEY, IV).generate(sent, recv)
+}
+
+struct TranscriptGenerator {
+    key: [u8; 16],
+    iv: [u8; 4],
+}
+
+impl TranscriptGenerator {
+    fn new(key: [u8; 16], iv: [u8; 4]) -> Self {
+        Self { key, iv }
+    }
+
+    fn generate(&self, sent: &[u8], recv: &[u8]) -> TlsTranscript {
+        let mut rng = StdRng::from_seed([1; 32]);
+
+        let transcript_len = TranscriptLength {
+            sent: sent.len() as u32,
+            received: recv.len() as u32,
+        };
+        let tlsn = ConnectionFixture::tlsnotary(transcript_len);
+
+        let time = tlsn.connection_info.time;
+        let version = tlsn.connection_info.version;
+        let server_cert_chain = tlsn.server_cert_data.certs;
+        let server_signature = tlsn.server_cert_data.sig;
+        let cert_binding = tlsn.server_cert_data.binding;
+
+        let cf_vd: [u8; 12] = rng.random();
+        let sf_vd: [u8; 12] = rng.random();
+
+        let verify_data = VerifyData {
+            client_finished: cf_vd.to_vec(),
+            server_finished: sf_vd.to_vec(),
+        };
+
+        let sent = self.gen_records(cf_vd, sent);
+        let recv = self.gen_records(sf_vd, recv);
+
+        TlsTranscript::new(
+            time,
+            version,
+            Some(server_cert_chain),
+            Some(server_signature),
+            cert_binding,
+            verify_data,
+            sent,
+            recv,
+        )
+        .unwrap()
+    }
+
+    fn gen_records(&self, vd: [u8; 12], plaintext: &[u8]) -> Vec<Record> {
+        let mut records = Vec::new();
+
+        let handshake = self.gen_handshake(vd);
+        records.push(handshake);
+
+        for (seq, msg) in (1_u64..).zip(plaintext.chunks(RECORD_SIZE)) {
+            let record = self.gen_app_data(seq, msg);
+            records.push(record);
+        }
+
+        records
+    }
+
+    fn gen_app_data(&self, seq: u64, plaintext: &[u8]) -> Record {
+        assert!(
+            plaintext.len() <= 1 << 14,
+            "plaintext len per record must be smaller than 2^14 bytes"
+        );
+
+        let explicit_nonce: [u8; 8] = seq.to_be_bytes();
+        let msg = PlainMessage {
+            typ: ContentType::ApplicationData.into(),
+            version: ProtocolVersion::TLSv1_2,
+            payload: Payload::new(plaintext),
+        };
+        let opaque = aes_gcm_encrypt(self.key, self.iv, seq, explicit_nonce, &msg);
+
+        let mut payload = opaque.payload.0;
+        let mut ciphertext = payload.split_off(8);
+        let tag = ciphertext.split_off(ciphertext.len() - 16);
+
+        Record {
+            seq,
+            typ: ContentType::ApplicationData,
+            plaintext: Some(plaintext.to_vec()),
+            explicit_nonce: explicit_nonce.to_vec(),
+            ciphertext,
+            tag: Some(tag),
+        }
+    }
+
+    fn gen_handshake(&self, vd: [u8; 12]) -> Record {
+        let seq = 0_u64;
+        let explicit_nonce = seq.to_be_bytes();
+
+        let mut plaintext = Vec::new();
+
+        let payload = Payload(vd.to_vec());
+        let hs_payload = HandshakePayload::Finished(payload);
+        let handshake_message = HandshakeMessagePayload {
+            typ: HandshakeType::Finished,
+            payload: hs_payload,
+        };
+        handshake_message.encode(&mut plaintext);
+
+        let msg = PlainMessage {
+            typ: ContentType::Handshake.into(),
+            version: ProtocolVersion::TLSv1_2,
+            payload: Payload::new(plaintext.clone()),
+        };
+
+        let opaque = aes_gcm_encrypt(self.key, self.iv, seq, explicit_nonce, &msg);
+        let mut payload = opaque.payload.0;
+        let mut ciphertext = payload.split_off(8);
+        let tag = ciphertext.split_off(ciphertext.len() - 16);
+
+        Record {
+            seq,
+            typ: ContentType::Handshake,
+            plaintext: Some(plaintext),
+            explicit_nonce: explicit_nonce.to_vec(),
+            ciphertext,
+            tag: Some(tag),
+        }
+    }
+}
+
+fn aes_gcm_encrypt(
+    key: [u8; 16],
+    iv: [u8; 4],
+    seq: u64,
+    explicit_nonce: [u8; 8],
+    msg: &PlainMessage,
+) -> OpaqueMessage {
+    let mut aad = [0u8; 13];
+
+    aad[..8].copy_from_slice(&seq.to_be_bytes());
+    aad[8] = msg.typ.get_u8();
+    aad[9..11].copy_from_slice(&msg.version.get_u16().to_be_bytes());
+    aad[11..13].copy_from_slice(&(msg.payload.0.len() as u16).to_be_bytes());
+    let payload = AeadPayload {
+        msg: &msg.payload.0,
+        aad: &aad,
+    };
+
+    let mut nonce = [0u8; 12];
+    nonce[..4].copy_from_slice(&iv);
+    nonce[4..].copy_from_slice(&explicit_nonce);
+    #[allow(deprecated)]
+    let nonce = GenericArray::from_slice(&nonce);
+    let cipher = Aes128Gcm::new_from_slice(&key).unwrap();
+
+    // ciphertext will have the MAC appended
+    let ciphertext = cipher.encrypt(nonce, payload).unwrap();
+
+    // prepend the explicit nonce
+    let mut nonce_ct_mac = vec![0u8; 0];
+    nonce_ct_mac.extend(explicit_nonce.iter());
+    nonce_ct_mac.extend(ciphertext.iter());
+
+    OpaqueMessage {
+        typ: msg.typ,
+        version: msg.version,
+        payload: Payload::new(nonce_ct_mac),
+    }
+}
--- a/crates/core/src/hash.rs
+++ b/crates/core/src/hash.rs
@@ -5,11 +5,6 @@ use std::{collections::HashMap, fmt::Display};
 use rand::{distr::StandardUniform, prelude::Distribution};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};

-use crate::serialize::CanonicalSerialize;
-
-pub(crate) const DEFAULT_SUPPORTED_HASH_ALGS: &[HashAlgId] =
-    &[HashAlgId::SHA256, HashAlgId::BLAKE3, HashAlgId::KECCAK256];
-
 /// Maximum length of a hash value.
 const MAX_LEN: usize = 64;

@@ -196,6 +191,11 @@ impl Hash {
            len: value.len(),
        }
    }
+
+    /// Returns a byte slice of the hash value.
+    pub fn as_bytes(&self) -> &[u8] {
+        &self.value[..self.len]
+    }
 }

 impl rs_merkle::Hash for Hash {
@@ -238,19 +238,6 @@ pub trait HashAlgorithm {
    fn hash_prefixed(&self, prefix: &[u8], data: &[u8]) -> Hash;
 }

-pub(crate) trait HashAlgorithmExt: HashAlgorithm {
-    #[allow(dead_code)]
-    fn hash_canonical<T: CanonicalSerialize>(&self, data: &T) -> Hash {
-        self.hash(&data.serialize())
-    }
-
-    fn hash_separated<T: DomainSeparator + CanonicalSerialize>(&self, data: &T) -> Hash {
-        self.hash_prefixed(data.domain(), &data.serialize())
-    }
-}
-
-impl<T: HashAlgorithm + ?Sized> HashAlgorithmExt for T {}
-
 /// A hash blinder.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct Blinder([u8; 16]);
@@ -274,52 +261,26 @@ impl Distribution<Blinder> for StandardUniform {

 /// A blinded pre-image of a hash.
 #[derive(Debug, Clone, Serialize, Deserialize)]
-pub(crate) struct Blinded<T> {
+pub struct Blinded<T> {
    data: T,
    blinder: Blinder,
 }

 impl<T> Blinded<T> {
    /// Creates a new blinded pre-image.
-    pub(crate) fn new(data: T) -> Self {
+    pub fn new(data: T) -> Self {
        Self {
            data,
            blinder: rand::random(),
        }
    }

-    pub(crate) fn data(&self) -> &T {
+    /// Returns the data.
+    pub fn data(&self) -> &T {
        &self.data
    }
 }

-/// A type with a domain separator which is used during hashing to mitigate type
-/// confusion attacks.
-pub(crate) trait DomainSeparator {
-    /// Returns the domain separator for the type.
-    fn domain(&self) -> &[u8];
-}
-
-macro_rules! impl_domain_separator {
-    ($type:ty) => {
-        impl $crate::hash::DomainSeparator for $type {
-            fn domain(&self) -> &[u8] {
-                use std::sync::LazyLock;
-
-                // Computes a 16 byte hash of the type's name to use as a domain separator.
-                static DOMAIN: LazyLock<[u8; 16]> = LazyLock::new(|| {
-                    let domain: [u8; 32] = blake3::hash(stringify!($type).as_bytes()).into();
-                    domain[..16].try_into().unwrap()
-                });
-
-                &*DOMAIN
-            }
-        }
-    };
-}
-
-pub(crate) use impl_domain_separator;
-
 mod sha2 {
    use ::sha2::Digest;

@@ -335,14 +296,14 @@ mod sha2 {
        fn hash(&self, data: &[u8]) -> super::Hash {
            let mut hasher = ::sha2::Sha256::default();
            hasher.update(data);
-            super::Hash::new(hasher.finalize().as_slice())
+            super::Hash::new(hasher.finalize().as_ref())
        }

        fn hash_prefixed(&self, prefix: &[u8], data: &[u8]) -> super::Hash {
            let mut hasher = ::sha2::Sha256::default();
            hasher.update(prefix);
            hasher.update(data);
-            super::Hash::new(hasher.finalize().as_slice())
+            super::Hash::new(hasher.finalize().as_ref())
        }
    }
 }
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -1,396 +1,29 @@
 //! TLSNotary core library.
-//!
-//! # Introduction
-//!
-//! This library provides core functionality for the TLSNotary **attestation**
-//! protocol, including some more general types which are useful outside
-//! of attestations.
-//!
-//! Once the MPC-TLS protocol has been completed the Prover holds a collection
-//! of commitments pertaining to the TLS connection. Most importantly, the
-//! Prover is committed to the [`ServerName`](crate::connection::ServerName),
-//! and the [`Transcript`](crate::transcript::Transcript) of application data.
-//! Subsequently, the Prover can request an
-//! [`Attestation`](crate::attestation::Attestation) from the Notary who will
-//! include the commitments as well as any additional information which may be
-//! useful to an attestation Verifier.
-//!
-//! Holding an attestation, the Prover can construct a
-//! [`Presentation`](crate::presentation::Presentation) which facilitates
-//! selectively disclosing various aspects of the TLS connection to a Verifier.
-//! If the Verifier trusts the Notary, or more specifically the verifying key of
-//! the attestation, then the Verifier can trust the authenticity of the
-//! information disclosed in the presentation.
-//!
-//! **Be sure to check out the various submodules for more information.**
-//!
-//! # Committing to the transcript
-//!
-//! The MPC-TLS protocol produces commitments to the entire transcript of
-//! application data. However, we may want to disclose only a subset of the data
-//! in a presentation. Prior to attestation, the Prover has the opportunity to
-//! slice and dice the commitments into smaller sections which can be
-//! selectively disclosed. Additionally, the Prover may want to use different
-//! commitment schemes depending on the context they expect to disclose.
-//!
-//! The primary API for this process is the
-//! [`TranscriptCommitConfigBuilder`](crate::transcript::TranscriptCommitConfigBuilder)
-//! which is used to build up a configuration.
-//!
-//! Currently, only the
-//! [`Encoding`](crate::transcript::TranscriptCommitmentKind::Encoding)
-//! commitment kind is supported. In the future you will be able to acquire hash
-//! commitments directly to the transcript data.
-//!
-//! ```no_run
-//! # use tlsn_core::transcript::{TranscriptCommitConfigBuilder, Transcript, Direction};
-//! # use tlsn_core::hash::HashAlgId;
-//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! # let transcript: Transcript = unimplemented!();
-//! let (sent_len, recv_len) = transcript.len();
-//!
-//! // Create a new configuration builder.
-//! let mut builder = TranscriptCommitConfigBuilder::new(&transcript);
-//!
-//! // Specify all the transcript commitments we want to make.
-//! builder
-//!     // Use BLAKE3 for encoding commitments.
-//!     .encoding_hash_alg(HashAlgId::BLAKE3)
-//!     // Commit to all sent data.
-//!     .commit_sent(&(0..sent_len))?
-//!     // Commit to the first 10 bytes of sent data.
-//!     .commit_sent(&(0..10))?
-//!     // Skip some bytes so it can be omitted in the presentation.
-//!     .commit_sent(&(20..sent_len))?
-//!     // Commit to all received data.
-//!     .commit_recv(&(0..recv_len))?;
-//!
-//! let config = builder.build()?;
-//! # Ok(())
-//! # }
-//! ```
-//!
-//! # Requesting an attestation
-//!
-//! The first step in the attestation protocol is for the Prover to make a
-//! [`Request`](crate::request::Request), which can be configured using the
-//! associated [builder](crate::request::RequestConfigBuilder). With it the
-//! Prover can configure some of the details of the attestation, such as which
-//! cryptographic algorithms are used (if the Notary supports them).
-//!
-//! The Prover may also request for extensions to be added to the attestation,
-//! see [here](crate::attestation#extensions) for more information.
-//!
-//! Upon being issued an attestation, the Prover will also hold a corresponding
-//! [`Secrets`] which contains all private information. This pair can be stored
-//! and used later to construct a
-//! [`Presentation`](crate::presentation::Presentation), [see
-//! below](#constructing-a-presentation).
-//!
-//! # Issuing an attestation
-//!
-//! Upon receiving a request, the Notary can issue an
-//! [`Attestation`](crate::attestation::Attestation) which can be configured
-//! using the associated
-//! [builder](crate::attestation::AttestationConfigBuilder).
-//!
-//! The Notary's [`CryptoProvider`] must be configured with an appropriate
-//! signing key for attestations. See
-//! [`SignerProvider`](crate::signing::SignerProvider) for more information.
-//!
-//! # Constructing a presentation
-//!
-//! A Prover can use an [`Attestation`](crate::attestation::Attestation) and the
-//! corresponding [`Secrets`] to construct a verifiable
-//! [`Presentation`](crate::presentation::Presentation).
-//!
-//! ```no_run
-//! # use tlsn_core::presentation::Presentation;
-//! # use tlsn_core::attestation::Attestation;
-//! # use tlsn_core::transcript::{TranscriptCommitmentKind, Direction};
-//! # use tlsn_core::{Secrets, CryptoProvider};
-//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! # let attestation: Attestation = unimplemented!();
-//! # let secrets: Secrets = unimplemented!();
-//! # let crypto_provider: CryptoProvider = unimplemented!();
-//! let (_sent_len, recv_len) = secrets.transcript().len();
-//!
-//! // First, we decide which application data we would like to disclose.
-//! let mut builder = secrets.transcript_proof_builder();
-//!
-//! builder
-//!     // Use transcript encoding commitments.
-//!     .commitment_kinds(&[TranscriptCommitmentKind::Encoding])
-//!     // Disclose the first 10 bytes of the sent data.
-//!     .reveal(&(0..10), Direction::Sent)?
-//!     // Disclose all of the received data.
-//!     .reveal(&(0..recv_len), Direction::Received)?;
-//!
-//! let transcript_proof = builder.build()?;
-//!
-//! // Most cases we will also disclose the server identity.
-//! let identity_proof = secrets.identity_proof();
-//!
-//! // Now we can construct the presentation.
-//! let mut builder = attestation.presentation_builder(&crypto_provider);
-//!
-//! builder
-//!     .identity_proof(identity_proof)
-//!     .transcript_proof(transcript_proof);
-//!
-//! // Finally, we build the presentation. Send it to a verifier!
-//! let presentation: Presentation = builder.build()?;
-//! # Ok(())
-//! # }
-//! ```
-//!
-//! # Verifying a presentation
-//!
-//! Verifying a presentation is as simple as checking the verifier trusts the
-//! verifying key then calling
-//! [`Presentation::verify`](crate::presentation::Presentation::verify).
-//!
-//! ```no_run
-//! # use tlsn_core::presentation::{Presentation, PresentationOutput};
-//! # use tlsn_core::signing::VerifyingKey;
-//! # use tlsn_core::CryptoProvider;
-//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
-//! # let presentation: Presentation = unimplemented!();
-//! # let trusted_key: VerifyingKey = unimplemented!();
-//! # let crypto_provider: CryptoProvider = unimplemented!();
-//! // Assert that we trust the verifying key.
-//! assert_eq!(presentation.verifying_key(), &trusted_key);
-//!
-//! let PresentationOutput {
-//!     attestation,
-//!     server_name,
-//!     connection_info,
-//!     transcript,
-//!     ..
-//! } = presentation.verify(&crypto_provider)?;
-//! # Ok(())
-//! # }
-//! ```

 #![deny(missing_docs, unreachable_pub, unused_must_use)]
 #![deny(clippy::all)]
 #![forbid(unsafe_code)]

-pub mod attestation;
 pub mod connection;
 #[cfg(any(test, feature = "fixtures"))]
 pub mod fixtures;
 pub mod hash;
-pub(crate) mod merkle;
-pub mod presentation;
-mod provider;
-pub mod request;
-mod secrets;
-pub(crate) mod serialize;
-pub mod signing;
+pub mod merkle;
 pub mod transcript;
+pub mod webpki;
+pub use rangeset;
+pub mod config;
+pub(crate) mod display;

-pub use provider::CryptoProvider;
-pub use secrets::Secrets;
-
-use rangeset::ToRangeSet;
 use serde::{Deserialize, Serialize};

 use crate::{
-    connection::{ServerCertData, ServerName},
-    transcript::{
-        Direction, Idx, PartialTranscript, Transcript, TranscriptCommitConfig,
-        TranscriptCommitRequest, TranscriptCommitment, TranscriptSecret,
-    },
+    connection::ServerName,
+    transcript::{PartialTranscript, TranscriptCommitment, TranscriptSecret},
 };

-/// Configuration to prove information to the verifier.
-#[derive(Debug, Clone)]
-pub struct ProveConfig {
-    server_identity: bool,
-    transcript: Option<PartialTranscript>,
-    transcript_commit: Option<TranscriptCommitConfig>,
-}
-
-impl ProveConfig {
-    /// Creates a new builder.
-    pub fn builder(transcript: &Transcript) -> ProveConfigBuilder {
-        ProveConfigBuilder::new(transcript)
-    }
-
-    /// Returns `true` if the server identity is to be proven.
-    pub fn server_identity(&self) -> bool {
-        self.server_identity
-    }
-
-    /// Returns the transcript to be proven.
-    pub fn transcript(&self) -> Option<&PartialTranscript> {
-        self.transcript.as_ref()
-    }
-
-    /// Returns the transcript commitment configuration.
-    pub fn transcript_commit(&self) -> Option<&TranscriptCommitConfig> {
-        self.transcript_commit.as_ref()
-    }
-}
-
-/// Builder for [`ProveConfig`].
-#[derive(Debug)]
-pub struct ProveConfigBuilder<'a> {
-    transcript: &'a Transcript,
-    server_identity: bool,
-    reveal_sent: Idx,
-    reveal_recv: Idx,
-    transcript_commit: Option<TranscriptCommitConfig>,
-}
-
-impl<'a> ProveConfigBuilder<'a> {
-    /// Creates a new builder.
-    pub fn new(transcript: &'a Transcript) -> Self {
-        Self {
-            transcript,
-            server_identity: false,
-            reveal_sent: Idx::default(),
-            reveal_recv: Idx::default(),
-            transcript_commit: None,
-        }
-    }
-
-    /// Proves the server identity.
-    pub fn server_identity(&mut self) -> &mut Self {
-        self.server_identity = true;
-        self
-    }
-
-    /// Configures transcript commitments.
-    pub fn transcript_commit(&mut self, transcript_commit: TranscriptCommitConfig) -> &mut Self {
-        self.transcript_commit = Some(transcript_commit);
-        self
-    }
-
-    /// Reveals the given ranges of the transcript.
-    pub fn reveal(
-        &mut self,
-        direction: Direction,
-        ranges: &dyn ToRangeSet<usize>,
-    ) -> Result<&mut Self, ProveConfigBuilderError> {
-        let idx = Idx::new(ranges.to_range_set());
-
-        if idx.end() > self.transcript.len_of_direction(direction) {
-            return Err(ProveConfigBuilderError(
-                ProveConfigBuilderErrorRepr::IndexOutOfBounds {
-                    direction,
-                    actual: idx.end(),
-                    len: self.transcript.len_of_direction(direction),
-                },
-            ));
-        }
-
-        match direction {
-            Direction::Sent => self.reveal_sent.union_mut(&idx),
-            Direction::Received => self.reveal_recv.union_mut(&idx),
-        }
-        Ok(self)
-    }
-
-    /// Reveals the given ranges of the sent data transcript.
-    pub fn reveal_sent(
-        &mut self,
-        ranges: &dyn ToRangeSet<usize>,
-    ) -> Result<&mut Self, ProveConfigBuilderError> {
-        self.reveal(Direction::Sent, ranges)
-    }
-
-    /// Reveals the given ranges of the received data transcript.
-    pub fn reveal_recv(
-        &mut self,
-        ranges: &dyn ToRangeSet<usize>,
-    ) -> Result<&mut Self, ProveConfigBuilderError> {
-        self.reveal(Direction::Received, ranges)
-    }
-
-    /// Builds the configuration.
-    pub fn build(self) -> Result<ProveConfig, ProveConfigBuilderError> {
-        let transcript = if !self.reveal_sent.is_empty() || !self.reveal_recv.is_empty() {
-            Some(
-                self.transcript
-                    .to_partial(self.reveal_sent, self.reveal_recv),
-            )
-        } else {
-            None
-        };
-
-        Ok(ProveConfig {
-            server_identity: self.server_identity,
-            transcript,
-            transcript_commit: self.transcript_commit,
-        })
-    }
-}
-
-/// Error for [`ProveConfigBuilder`].
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct ProveConfigBuilderError(#[from] ProveConfigBuilderErrorRepr);
-
-#[derive(Debug, thiserror::Error)]
-enum ProveConfigBuilderErrorRepr {
-    #[error("range is out of bounds of the transcript ({direction}): {actual} > {len}")]
-    IndexOutOfBounds {
-        direction: Direction,
-        actual: usize,
-        len: usize,
-    },
-}
-
-/// Configuration to verify information from the prover.
-#[derive(Debug, Default, Clone)]
-pub struct VerifyConfig {}
-
-impl VerifyConfig {
-    /// Creates a new builder.
-    pub fn builder() -> VerifyConfigBuilder {
-        VerifyConfigBuilder::new()
-    }
-}
-
-/// Builder for [`VerifyConfig`].
-#[derive(Debug, Default)]
-pub struct VerifyConfigBuilder {}
-
-impl VerifyConfigBuilder {
-    /// Creates a new builder.
-    pub fn new() -> Self {
-        Self {}
-    }
-
-    /// Builds the configuration.
-    pub fn build(self) -> Result<VerifyConfig, VerifyConfigBuilderError> {
-        Ok(VerifyConfig {})
-    }
-}
-
-/// Error for [`VerifyConfigBuilder`].
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-pub struct VerifyConfigBuilderError(#[from] VerifyConfigBuilderErrorRepr);
-
-#[derive(Debug, thiserror::Error)]
-enum VerifyConfigBuilderErrorRepr {}
-
-/// Payload sent to the verifier.
-#[doc(hidden)]
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProvePayload {
-    /// Server identity data.
-    pub server_identity: Option<(ServerName, ServerCertData)>,
-    /// Transcript data.
-    pub transcript: Option<PartialTranscript>,
-    /// Transcript commitment configuration.
-    pub transcript_commit: Option<TranscriptCommitRequest>,
-}
-
 /// Prover output.
+#[derive(Serialize, Deserialize)]
 pub struct ProverOutput {
    /// Transcript commitments.
    pub transcript_commitments: Vec<TranscriptCommitment>,
@@ -401,6 +34,7 @@ pub struct ProverOutput {
 opaque_debug::implement!(ProverOutput);

 /// Verifier output.
+#[derive(Serialize, Deserialize)]
 pub struct VerifierOutput {
    /// Server identity.
    pub server_name: Option<ServerName>,
--- a/crates/core/src/merkle.rs
+++ b/crates/core/src/merkle.rs
@@ -5,10 +5,10 @@ use utils::iter::DuplicateCheck;

 use crate::hash::{Hash, HashAlgId, HashAlgorithm, TypedHash};

-/// Errors that can occur during operations with Merkle tree and Merkle proof.
+/// Merkle tree error.
 #[derive(Debug, thiserror::Error)]
 #[error("merkle error: {0}")]
-pub(crate) struct MerkleError(String);
+pub struct MerkleError(String);

 impl MerkleError {
    fn new(msg: impl Into<String>) -> Self {
@@ -16,8 +16,9 @@ impl MerkleError {
    }
 }

+/// Merkle proof.
 #[derive(Clone, Serialize, Deserialize)]
-pub(crate) struct MerkleProof {
+pub struct MerkleProof {
    alg: HashAlgId,
    leaf_count: usize,
    proof: rs_merkle::MerkleProof<Hash>,
@@ -33,7 +34,7 @@ impl MerkleProof {
    ///
    /// - If the length of `leaf_indices` and `leaf_hashes` does not match.
    /// - If `leaf_indices` contains duplicates.
-    pub(crate) fn verify(
+    pub fn verify(
        &self,
        hasher: &dyn HashAlgorithm,
        root: &TypedHash,
@@ -62,11 +63,6 @@ impl MerkleProof {

        Ok(())
    }
-
-    /// Returns the leaf count of the Merkle tree associated with the proof.
-    pub(crate) fn leaf_count(&self) -> usize {
-        self.leaf_count
-    }
 }

 #[derive(Clone)]
@@ -80,25 +76,29 @@ impl rs_merkle::Hasher for RsMerkleHasher<'_> {
    }
 }

+/// Merkle tree.
 #[derive(Clone, Serialize, Deserialize)]
-pub(crate) struct MerkleTree {
+pub struct MerkleTree {
    alg: HashAlgId,
    tree: rs_merkle::MerkleTree<Hash>,
 }

 impl MerkleTree {
-    pub(crate) fn new(alg: HashAlgId) -> Self {
+    /// Creates a new Merkle tree.
+    pub fn new(alg: HashAlgId) -> Self {
        Self {
            alg,
            tree: Default::default(),
        }
    }

-    pub(crate) fn algorithm(&self) -> HashAlgId {
+    /// Returns the hash algorithm used to create the tree.
+    pub fn algorithm(&self) -> HashAlgId {
        self.alg
    }

-    pub(crate) fn root(&self) -> TypedHash {
+    /// Returns the root of the tree.
+    pub fn root(&self) -> TypedHash {
        TypedHash {
            alg: self.alg,
            value: self.tree.root().expect("tree should not be empty"),
@@ -111,7 +111,7 @@ impl MerkleTree {
    ///
    /// - If the provided hasher is not the same as the one used to create the
    ///   tree.
-    pub(crate) fn insert(&mut self, hasher: &dyn HashAlgorithm, mut leaves: Vec<Hash>) {
+    pub fn insert(&mut self, hasher: &dyn HashAlgorithm, mut leaves: Vec<Hash>) {
        assert_eq!(self.alg, hasher.id(), "hash algorithm mismatch");

        self.tree.append(&mut leaves);
@@ -124,7 +124,7 @@ impl MerkleTree {
    ///
    /// - If the provided indices are not unique and sorted.
    /// - If the provided indices are out of bounds.
-    pub(crate) fn proof(&self, indices: &[usize]) -> MerkleProof {
+    pub fn proof(&self, indices: &[usize]) -> MerkleProof {
        assert!(
            indices.windows(2).all(|w| w[0] < w[1]),
            "indices must be unique and sorted"
@@ -145,7 +145,7 @@ impl MerkleTree {

 #[cfg(test)]
 mod test {
-    use crate::hash::{impl_domain_separator, Blake3, HashAlgorithmExt, Keccak256, Sha256};
+    use crate::hash::{Blake3, Keccak256, Sha256};

    use super::*;
    use rstest::*;
@@ -153,12 +153,10 @@ mod test {
    #[derive(Serialize)]
    struct T(u64);

-    impl_domain_separator!(T);
-
    fn leaves<H: HashAlgorithm>(hasher: &H, leaves: impl IntoIterator<Item = T>) -> Vec<Hash> {
        leaves
            .into_iter()
-            .map(|x| hasher.hash_canonical(&x))
+            .map(|x| hasher.hash(&x.0.to_be_bytes()))
            .collect()
    }

--- a/crates/core/src/request.rs
+++ b/crates/core/src/request.rs
@@ -1,196 +0,0 @@
-//! Attestation requests.
-//!
-//! After the TLS connection, a Prover can request an attestation from the
-//! Notary which contains various information about the connection. During this
-//! process the Prover has the opportunity to configure certain aspects of the
-//! attestation, such as which signature algorithm the Notary should use to sign
-//! the attestation. Or which hash algorithm the Notary should use to merkelize
-//! the fields.
-//!
-//! A [`Request`] can be created using a [`RequestBuilder`]. The builder will
-//! take both configuration via a [`RequestConfig`] as well as the Prover's
-//! secret data. The [`Secrets`](crate::Secrets) are of course not shared with
-//! the Notary but are used to create commitments which are included in the
-//! attestation.
-
-mod builder;
-mod config;
-
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    attestation::{Attestation, Extension},
-    connection::ServerCertCommitment,
-    hash::HashAlgId,
-    signing::SignatureAlgId,
-};
-
-pub use builder::{RequestBuilder, RequestBuilderError};
-pub use config::{RequestConfig, RequestConfigBuilder, RequestConfigBuilderError};
-
-/// Attestation request.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Request {
-    pub(crate) signature_alg: SignatureAlgId,
-    pub(crate) hash_alg: HashAlgId,
-    pub(crate) server_cert_commitment: ServerCertCommitment,
-    pub(crate) extensions: Vec<Extension>,
-}
-
-impl Request {
-    /// Returns a new request builder.
-    pub fn builder(config: &RequestConfig) -> RequestBuilder {
-        RequestBuilder::new(config)
-    }
-
-    /// Validates the content of the attestation against this request.
-    pub fn validate(&self, attestation: &Attestation) -> Result<(), InconsistentAttestation> {
-        if attestation.signature.alg != self.signature_alg {
-            return Err(InconsistentAttestation(format!(
-                "signature algorithm: expected {:?}, got {:?}",
-                self.signature_alg, attestation.signature.alg
-            )));
-        }
-
-        if attestation.header.root.alg != self.hash_alg {
-            return Err(InconsistentAttestation(format!(
-                "hash algorithm: expected {:?}, got {:?}",
-                self.hash_alg, attestation.header.root.alg
-            )));
-        }
-
-        if attestation.body.cert_commitment() != &self.server_cert_commitment {
-            return Err(InconsistentAttestation(
-                "server certificate commitment does not match".to_string(),
-            ));
-        }
-
-        // TODO: improve the O(M*N) complexity of this check.
-        for extension in &self.extensions {
-            if !attestation.body.extensions().any(|e| e == extension) {
-                return Err(InconsistentAttestation(
-                    "extension is missing from the attestation".to_string(),
-                ));
-            }
-        }
-
-        Ok(())
-    }
-}
-
-/// Error for [`Request::validate`].
-#[derive(Debug, thiserror::Error)]
-#[error("inconsistent attestation: {0}")]
-pub struct InconsistentAttestation(String);
-
-#[cfg(test)]
-mod test {
-    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};
-
-    use crate::{
-        connection::{ServerCertOpening, TranscriptLength},
-        fixtures::{
-            attestation_fixture, encoding_provider, request_fixture, ConnectionFixture,
-            RequestFixture,
-        },
-        hash::{Blake3, HashAlgId},
-        signing::SignatureAlgId,
-        transcript::Transcript,
-        CryptoProvider,
-    };
-
-    #[test]
-    fn test_success() {
-        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
-        let connection = ConnectionFixture::tlsnotary(transcript.length());
-
-        let RequestFixture { request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
-
-        let attestation =
-            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
-
-        assert!(request.validate(&attestation).is_ok())
-    }
-
-    #[test]
-    fn test_wrong_signature_alg() {
-        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
-        let connection = ConnectionFixture::tlsnotary(transcript.length());
-
-        let RequestFixture { mut request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
-
-        let attestation =
-            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
-
-        request.signature_alg = SignatureAlgId::SECP256R1;
-
-        let res = request.validate(&attestation);
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_wrong_hash_alg() {
-        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
-        let connection = ConnectionFixture::tlsnotary(transcript.length());
-
-        let RequestFixture { mut request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
-
-        let attestation =
-            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
-
-        request.hash_alg = HashAlgId::SHA256;
-
-        let res = request.validate(&attestation);
-        assert!(res.is_err())
-    }
-
-    #[test]
-    fn test_wrong_server_commitment() {
-        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
-        let connection = ConnectionFixture::tlsnotary(transcript.length());
-
-        let RequestFixture { mut request, .. } = request_fixture(
-            transcript,
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
-
-        let attestation =
-            attestation_fixture(request.clone(), connection, SignatureAlgId::SECP256K1, &[]);
-
-        let ConnectionFixture {
-            server_cert_data, ..
-        } = ConnectionFixture::appliedzkp(TranscriptLength {
-            sent: 100,
-            received: 100,
-        });
-        let opening = ServerCertOpening::new(server_cert_data);
-
-        let crypto_provider = CryptoProvider::default();
-        request.server_cert_commitment =
-            opening.commit(crypto_provider.hash.get(&HashAlgId::BLAKE3).unwrap());
-
-        let res = request.validate(&attestation);
-        assert!(res.is_err())
-    }
-}
--- a/crates/core/src/serialize.rs
+++ b/crates/core/src/serialize.rs
@@ -1,18 +0,0 @@
-/// Canonical serialization of TLSNotary types.
-///
-/// This trait is used to serialize types into a canonical byte representation.
-pub(crate) trait CanonicalSerialize {
-    /// Serializes the type.
-    fn serialize(&self) -> Vec<u8>;
-}
-
-impl<T> CanonicalSerialize for T
-where
-    T: serde::Serialize,
-{
-    fn serialize(&self) -> Vec<u8> {
-        // For now we use BCS for serialization. In future releases we will want to
-        // consider this further, particularly with respect to EVM compatibility.
-        bcs::to_bytes(self).unwrap()
-    }
-}
--- a/crates/core/src/transcript.rs
+++ b/crates/core/src/transcript.rs
@@ -11,35 +11,25 @@
 //! recovered by parsing the application data and relating it to the bytes
 //! in the transcript.
 //!
-//! ## Commitments
-//!
-//! During the attestation process a Prover can generate multiple commitments to
-//! various parts of the transcript. These commitments are inserted into the
-//! attestation body and can be used by the Verifier to verify transcript proofs
-//! later.
-//!
-//! To configure the transcript commitments, use the
-//! [`TranscriptCommitConfigBuilder`].
-//!
 //! ## Selective Disclosure
 //!
 //! Using a [`TranscriptProof`] a Prover can selectively disclose parts of a
 //! transcript to a Verifier in the form of a [`PartialTranscript`]. A Verifier
 //! always learns the length of the transcript, but sensitive data can be
 //! withheld.
-//!
-//! To create a proof, use the [`TranscriptProofBuilder`] which is returned by
-//! [`Secrets::transcript_proof_builder`](crate::Secrets::transcript_proof_builder).

 mod commit;
-#[doc(hidden)]
-pub mod encoding;
 pub mod hash;
 mod proof;
+mod tls;

 use std::{fmt, ops::Range};

-use rangeset::{Difference, IndexRanges, RangeSet, Subset, ToRangeSet, Union, UnionMut};
+use rangeset::{
+    iter::RangeIterator,
+    ops::{Index, Set},
+    set::RangeSet,
+};
 use serde::{Deserialize, Serialize};

 use crate::connection::TranscriptLength;
@@ -51,6 +41,7 @@ pub use commit::{
 pub use proof::{
    TranscriptProof, TranscriptProofBuilder, TranscriptProofBuilderError, TranscriptProofError,
 };
+pub use tls::{ContentType, Record, TlsTranscript};

 /// A transcript contains the plaintext of all application data communicated
 /// between the Prover and the Server.
@@ -107,19 +98,25 @@ impl Transcript {

    /// Returns the subsequence of the transcript with the provided index,
    /// returning `None` if the index is out of bounds.
-    pub fn get(&self, direction: Direction, idx: &Idx) -> Option<Subsequence> {
+    pub fn get(&self, direction: Direction, idx: &RangeSet<usize>) -> Option<Subsequence> {
        let data = match direction {
            Direction::Sent => &self.sent,
            Direction::Received => &self.received,
        };

-        if idx.end() > data.len() {
+        if idx.end().unwrap_or(0) > data.len() {
            return None;
        }

        Some(
-            Subsequence::new(idx.clone(), data.index_ranges(&idx.0))
-                .expect("data is same length as index"),
+            Subsequence::new(
+                idx.clone(),
+                data.index(idx).fold(Vec::new(), |mut acc, s| {
+                    acc.extend_from_slice(s);
+                    acc
+                }),
+            )
+            .expect("data is same length as index"),
        )
    }

@@ -133,15 +130,19 @@ impl Transcript {
    ///
    /// * `sent_idx` - The indices of the sent data to include.
    /// * `recv_idx` - The indices of the received data to include.
-    pub fn to_partial(&self, sent_idx: Idx, recv_idx: Idx) -> PartialTranscript {
+    pub fn to_partial(
+        &self,
+        sent_idx: RangeSet<usize>,
+        recv_idx: RangeSet<usize>,
+    ) -> PartialTranscript {
        let mut sent = vec![0; self.sent.len()];
        let mut received = vec![0; self.received.len()];

-        for range in sent_idx.iter_ranges() {
+        for range in sent_idx.iter() {
            sent[range.clone()].copy_from_slice(&self.sent[range]);
        }

-        for range in recv_idx.iter_ranges() {
+        for range in recv_idx.iter() {
            received[range.clone()].copy_from_slice(&self.received[range]);
        }

@@ -168,9 +169,9 @@ pub struct PartialTranscript {
    /// Data received by the Prover from the Server.
    received: Vec<u8>,
    /// Index of `sent` which have been authenticated.
-    sent_authed_idx: Idx,
+    sent_authed_idx: RangeSet<usize>,
    /// Index of `received` which have been authenticated.
-    received_authed_idx: Idx,
+    received_authed_idx: RangeSet<usize>,
 }

 /// `PartialTranscript` in a compressed form.
@@ -182,9 +183,9 @@ pub struct CompressedPartialTranscript {
    /// Received data which has been authenticated.
    received_authed: Vec<u8>,
    /// Index of `sent_authed`.
-    sent_idx: Idx,
+    sent_idx: RangeSet<usize>,
    /// Index of `received_authed`.
-    recv_idx: Idx,
+    recv_idx: RangeSet<usize>,
    /// Total bytelength of sent data in the original partial transcript.
    sent_total: usize,
    /// Total bytelength of received data in the original partial transcript.
@@ -194,12 +195,20 @@ pub struct CompressedPartialTranscript {
 impl From<PartialTranscript> for CompressedPartialTranscript {
    fn from(uncompressed: PartialTranscript) -> Self {
        Self {
-            sent_authed: uncompressed
-                .sent
-                .index_ranges(&uncompressed.sent_authed_idx.0),
+            sent_authed: uncompressed.sent.index(&uncompressed.sent_authed_idx).fold(
+                Vec::new(),
+                |mut acc, s| {
+                    acc.extend_from_slice(s);
+                    acc
+                },
+            ),
            received_authed: uncompressed
                .received
-                .index_ranges(&uncompressed.received_authed_idx.0),
+                .index(&uncompressed.received_authed_idx)
+                .fold(Vec::new(), |mut acc, s| {
+                    acc.extend_from_slice(s);
+                    acc
+                }),
            sent_idx: uncompressed.sent_authed_idx,
            recv_idx: uncompressed.received_authed_idx,
            sent_total: uncompressed.sent.len(),
@@ -215,7 +224,7 @@ impl From<CompressedPartialTranscript> for PartialTranscript {

        let mut offset = 0;

-        for range in compressed.sent_idx.iter_ranges() {
+        for range in compressed.sent_idx.iter() {
            sent[range.clone()]
                .copy_from_slice(&compressed.sent_authed[offset..offset + range.len()]);
            offset += range.len();
@@ -223,7 +232,7 @@ impl From<CompressedPartialTranscript> for PartialTranscript {

        let mut offset = 0;

-        for range in compressed.recv_idx.iter_ranges() {
+        for range in compressed.recv_idx.iter() {
            received[range.clone()]
                .copy_from_slice(&compressed.received_authed[offset..offset + range.len()]);
            offset += range.len();
@@ -249,8 +258,8 @@ impl PartialTranscript {
        Self {
            sent: vec![0; sent_len],
            received: vec![0; received_len],
-            sent_authed_idx: Idx::default(),
-            received_authed_idx: Idx::default(),
+            sent_authed_idx: RangeSet::default(),
+            received_authed_idx: RangeSet::default(),
        }
    }

@@ -271,10 +280,10 @@ impl PartialTranscript {
    }

    /// Returns whether the index is in bounds of the transcript.
-    pub fn contains(&self, direction: Direction, idx: &Idx) -> bool {
+    pub fn contains(&self, direction: Direction, idx: &RangeSet<usize>) -> bool {
        match direction {
-            Direction::Sent => idx.end() <= self.sent.len(),
-            Direction::Received => idx.end() <= self.received.len(),
+            Direction::Sent => idx.end().unwrap_or(0) <= self.sent.len(),
+            Direction::Received => idx.end().unwrap_or(0) <= self.received.len(),
        }
    }

@@ -301,23 +310,27 @@ impl PartialTranscript {
    }

    /// Returns the index of sent data which have been authenticated.
-    pub fn sent_authed(&self) -> &Idx {
+    pub fn sent_authed(&self) -> &RangeSet<usize> {
        &self.sent_authed_idx
    }

    /// Returns the index of received data which have been authenticated.
-    pub fn received_authed(&self) -> &Idx {
+    pub fn received_authed(&self) -> &RangeSet<usize> {
        &self.received_authed_idx
    }

    /// Returns the index of sent data which haven't been authenticated.
-    pub fn sent_unauthed(&self) -> Idx {
-        Idx(RangeSet::from(0..self.sent.len()).difference(&self.sent_authed_idx.0))
+    pub fn sent_unauthed(&self) -> RangeSet<usize> {
+        (0..self.sent.len())
+            .difference(&self.sent_authed_idx)
+            .into_set()
    }

    /// Returns the index of received data which haven't been authenticated.
-    pub fn received_unauthed(&self) -> Idx {
-        Idx(RangeSet::from(0..self.received.len()).difference(&self.received_authed_idx.0))
+    pub fn received_unauthed(&self) -> RangeSet<usize> {
+        (0..self.received.len())
+            .difference(&self.received_authed_idx)
+            .into_set()
    }

    /// Returns an iterator over the authenticated data in the transcript.
@@ -327,7 +340,7 @@ impl PartialTranscript {
            Direction::Received => (&self.received, &self.received_authed_idx),
        };

-        authed.0.iter().map(|i| data[i])
+        authed.iter_values().map(move |i| data[i])
    }

    /// Unions the authenticated data of this transcript with another.
@@ -347,26 +360,20 @@ impl PartialTranscript {
            "received data are not the same length"
        );

-        for range in other
-            .sent_authed_idx
-            .0
-            .difference(&self.sent_authed_idx.0)
-            .iter_ranges()
-        {
+        for range in other.sent_authed_idx.difference(&self.sent_authed_idx) {
            self.sent[range.clone()].copy_from_slice(&other.sent[range]);
        }

        for range in other
            .received_authed_idx
-            .0
-            .difference(&self.received_authed_idx.0)
-            .iter_ranges()
+            .difference(&self.received_authed_idx)
        {
            self.received[range.clone()].copy_from_slice(&other.received[range]);
        }

-        self.sent_authed_idx = self.sent_authed_idx.union(&other.sent_authed_idx);
-        self.received_authed_idx = self.received_authed_idx.union(&other.received_authed_idx);
+        self.sent_authed_idx.union_mut(&other.sent_authed_idx);
+        self.received_authed_idx
+            .union_mut(&other.received_authed_idx);
    }

    /// Unions an authenticated subsequence into this transcript.
@@ -378,11 +385,11 @@ impl PartialTranscript {
        match direction {
            Direction::Sent => {
                seq.copy_to(&mut self.sent);
-                self.sent_authed_idx = self.sent_authed_idx.union(&seq.idx);
+                self.sent_authed_idx.union_mut(&seq.idx);
            }
            Direction::Received => {
                seq.copy_to(&mut self.received);
-                self.received_authed_idx = self.received_authed_idx.union(&seq.idx);
+                self.received_authed_idx.union_mut(&seq.idx);
            }
        }
    }
@@ -393,10 +400,10 @@ impl PartialTranscript {
    ///
    /// * `value` - The value to set the unauthenticated bytes to
    pub fn set_unauthed(&mut self, value: u8) {
-        for range in self.sent_unauthed().iter_ranges() {
+        for range in self.sent_unauthed().iter() {
            self.sent[range].fill(value);
        }
-        for range in self.received_unauthed().iter_ranges() {
+        for range in self.received_unauthed().iter() {
            self.received[range].fill(value);
        }
    }
@@ -411,13 +418,13 @@ impl PartialTranscript {
    pub fn set_unauthed_range(&mut self, value: u8, direction: Direction, range: Range<usize>) {
        match direction {
            Direction::Sent => {
-                for range in range.difference(&self.sent_authed_idx.0).iter_ranges() {
-                    self.sent[range].fill(value);
+                for r in range.difference(&self.sent_authed_idx) {
+                    self.sent[r].fill(value);
                }
            }
            Direction::Received => {
-                for range in range.difference(&self.received_authed_idx.0).iter_ranges() {
-                    self.received[range].fill(value);
+                for r in range.difference(&self.received_authed_idx) {
+                    self.received[r].fill(value);
                }
            }
        }
@@ -445,130 +452,19 @@ impl fmt::Display for Direction {
    }
 }

-/// Transcript index.
-#[derive(Debug, Default, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct Idx(RangeSet<usize>);
-
-impl Idx {
-    /// Creates a new index builder.
-    pub fn builder() -> IdxBuilder {
-        IdxBuilder::default()
-    }
-
-    /// Creates an empty index.
-    pub fn empty() -> Self {
-        Self(RangeSet::default())
-    }
-
-    /// Creates a new transcript index.
-    pub fn new(ranges: impl Into<RangeSet<usize>>) -> Self {
-        Self(ranges.into())
-    }
-
-    /// Returns the start of the index.
-    pub fn start(&self) -> usize {
-        self.0.min().unwrap_or_default()
-    }
-
-    /// Returns the end of the index, non-inclusive.
-    pub fn end(&self) -> usize {
-        self.0.end().unwrap_or_default()
-    }
-
-    /// Returns an iterator over the values in the index.
-    pub fn iter(&self) -> impl Iterator<Item = usize> + '_ {
-        self.0.iter()
-    }
-
-    /// Returns an iterator over the ranges of the index.
-    pub fn iter_ranges(&self) -> impl Iterator<Item = Range<usize>> + '_ {
-        self.0.iter_ranges()
-    }
-
-    /// Returns the number of values in the index.
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    /// Returns whether the index is empty.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Returns the number of disjoint ranges in the index.
-    pub fn count(&self) -> usize {
-        self.0.len_ranges()
-    }
-
-    pub(crate) fn as_range_set(&self) -> &RangeSet<usize> {
-        &self.0
-    }
-
-    /// Returns the union of this index with another.
-    pub(crate) fn union(&self, other: &Idx) -> Idx {
-        Idx(self.0.union(&other.0))
-    }
-
-    /// Unions this index with another.
-    pub(crate) fn union_mut(&mut self, other: &Idx) {
-        self.0.union_mut(&other.0);
-    }
-
-    /// Returns the difference between `self` and `other`.
-    pub(crate) fn difference(&self, other: &Idx) -> Idx {
-        Idx(self.0.difference(&other.0))
-    }
-
-    /// Returns `true` if `self` is a subset of `other`.
-    pub(crate) fn is_subset(&self, other: &Idx) -> bool {
-        self.0.is_subset(&other.0)
-    }
-}
-
-impl std::fmt::Display for Idx {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("Idx([")?;
-        let count = self.0.len_ranges();
-        for (i, range) in self.0.iter_ranges().enumerate() {
-            write!(f, "{}..{}", range.start, range.end)?;
-            if i < count - 1 {
-                write!(f, ", ")?;
-            }
-        }
-        f.write_str("])")?;
-        Ok(())
-    }
-}
-
-/// Builder for [`Idx`].
-#[derive(Debug, Default)]
-pub struct IdxBuilder(RangeSet<usize>);
-
-impl IdxBuilder {
-    /// Unions ranges.
-    pub fn union(self, ranges: &dyn ToRangeSet<usize>) -> Self {
-        IdxBuilder(self.0.union(&ranges.to_range_set()))
-    }
-
-    /// Builds the index.
-    pub fn build(self) -> Idx {
-        Idx(self.0)
-    }
-}
-
 /// Transcript subsequence.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(try_from = "validation::SubsequenceUnchecked")]
 pub struct Subsequence {
    /// Index of the subsequence.
-    idx: Idx,
+    idx: RangeSet<usize>,
    /// Data of the subsequence.
    data: Vec<u8>,
 }

 impl Subsequence {
    /// Creates a new subsequence.
-    pub fn new(idx: Idx, data: Vec<u8>) -> Result<Self, InvalidSubsequence> {
+    pub fn new(idx: RangeSet<usize>, data: Vec<u8>) -> Result<Self, InvalidSubsequence> {
        if idx.len() != data.len() {
            return Err(InvalidSubsequence(
                "index length does not match data length",
@@ -579,7 +475,7 @@ impl Subsequence {
    }

    /// Returns the index of the subsequence.
-    pub fn index(&self) -> &Idx {
+    pub fn index(&self) -> &RangeSet<usize> {
        &self.idx
    }

@@ -595,7 +491,7 @@ impl Subsequence {
    }

    /// Returns the inner parts of the subsequence.
-    pub fn into_parts(self) -> (Idx, Vec<u8>) {
+    pub fn into_parts(self) -> (RangeSet<usize>, Vec<u8>) {
        (self.idx, self.data)
    }

@@ -606,7 +502,7 @@ impl Subsequence {
    /// Panics if the subsequence ranges are out of bounds.
    pub(crate) fn copy_to(&self, dest: &mut [u8]) {
        let mut offset = 0;
-        for range in self.idx.iter_ranges() {
+        for range in self.idx.iter() {
            dest[range.clone()].copy_from_slice(&self.data[offset..offset + range.len()]);
            offset += range.len();
        }
@@ -623,7 +519,7 @@ mod validation {

    #[derive(Debug, Deserialize)]
    pub(super) struct SubsequenceUnchecked {
-        idx: Idx,
+        idx: RangeSet<usize>,
        data: Vec<u8>,
    }

@@ -645,8 +541,8 @@ mod validation {
    pub(super) struct CompressedPartialTranscriptUnchecked {
        sent_authed: Vec<u8>,
        received_authed: Vec<u8>,
-        sent_idx: Idx,
-        recv_idx: Idx,
+        sent_idx: RangeSet<usize>,
+        recv_idx: RangeSet<usize>,
        sent_total: usize,
        recv_total: usize,
    }
@@ -663,8 +559,8 @@ mod validation {
                ));
            }

-            if unchecked.sent_idx.end() > unchecked.sent_total
-                || unchecked.recv_idx.end() > unchecked.recv_total
+            if unchecked.sent_idx.end().unwrap_or(0) > unchecked.sent_total
+                || unchecked.recv_idx.end().unwrap_or(0) > unchecked.recv_total
            {
                return Err(InvalidCompressedPartialTranscript(
                    "ranges are not in bounds of the data",
@@ -693,8 +589,8 @@ mod validation {
            CompressedPartialTranscriptUnchecked {
                received_authed: vec![1, 2, 3, 11, 12, 13],
                sent_authed: vec![4, 5, 6, 14, 15, 16],
-                recv_idx: Idx(RangeSet::new(&[1..4, 11..14])),
-                sent_idx: Idx(RangeSet::new(&[4..7, 14..17])),
+                recv_idx: RangeSet::from([1..4, 11..14]),
+                sent_idx: RangeSet::from([4..7, 14..17]),
                sent_total: 20,
                recv_total: 20,
            }
@@ -731,13 +627,7 @@ mod validation {
            mut partial_transcript: CompressedPartialTranscriptUnchecked,
        ) {
            // Change the total to be less than the last range's end bound.
-            let end = partial_transcript
-                .sent_idx
-                .0
-                .iter_ranges()
-                .next_back()
-                .unwrap()
-                .end;
+            let end = partial_transcript.sent_idx.iter().next_back().unwrap().end;

            partial_transcript.sent_total = end - 1;

@@ -765,31 +655,25 @@ mod tests {

    #[fixture]
    fn partial_transcript() -> PartialTranscript {
-        transcript().to_partial(
-            Idx::new(RangeSet::new(&[1..4, 6..9])),
-            Idx::new(RangeSet::new(&[2..5, 7..10])),
-        )
+        transcript().to_partial(RangeSet::from([1..4, 6..9]), RangeSet::from([2..5, 7..10]))
    }

    #[rstest]
    fn test_transcript_get_subsequence(transcript: Transcript) {
        let subseq = transcript
-            .get(Direction::Received, &Idx(RangeSet::from([0..4, 7..10])))
+            .get(Direction::Received, &RangeSet::from([0..4, 7..10]))
            .unwrap();
        assert_eq!(subseq.data, vec![0, 1, 2, 3, 7, 8, 9]);

        let subseq = transcript
-            .get(Direction::Sent, &Idx(RangeSet::from([0..4, 9..12])))
+            .get(Direction::Sent, &RangeSet::from([0..4, 9..12]))
            .unwrap();
        assert_eq!(subseq.data, vec![0, 1, 2, 3, 9, 10, 11]);

-        let subseq = transcript.get(
-            Direction::Received,
-            &Idx(RangeSet::from([0..4, 7..10, 11..13])),
-        );
+        let subseq = transcript.get(Direction::Received, &RangeSet::from([0..4, 7..10, 11..13]));
        assert_eq!(subseq, None);

-        let subseq = transcript.get(Direction::Sent, &Idx(RangeSet::from([0..4, 7..10, 11..13])));
+        let subseq = transcript.get(Direction::Sent, &RangeSet::from([0..4, 7..10, 11..13]));
        assert_eq!(subseq, None);
    }

@@ -802,7 +686,7 @@ mod tests {

    #[rstest]
    fn test_transcript_to_partial_success(transcript: Transcript) {
-        let partial = transcript.to_partial(Idx::new(0..2), Idx::new(3..7));
+        let partial = transcript.to_partial(RangeSet::from(0..2), RangeSet::from(3..7));
        assert_eq!(partial.sent_unsafe(), [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
        assert_eq!(
            partial.received_unsafe(),
@@ -813,29 +697,30 @@ mod tests {
    #[rstest]
    #[should_panic]
    fn test_transcript_to_partial_failure(transcript: Transcript) {
-        let _ = transcript.to_partial(Idx::new(0..14), Idx::new(3..7));
+        let _ = transcript.to_partial(RangeSet::from(0..14), RangeSet::from(3..7));
    }

    #[rstest]
    fn test_partial_transcript_contains(transcript: Transcript) {
-        let partial = transcript.to_partial(Idx::new(0..2), Idx::new(3..7));
-        assert!(partial.contains(Direction::Sent, &Idx::new([0..5, 7..10])));
-        assert!(!partial.contains(Direction::Received, &Idx::new([4..6, 7..13])))
+        let partial = transcript.to_partial(RangeSet::from(0..2), RangeSet::from(3..7));
+        assert!(partial.contains(Direction::Sent, &RangeSet::from([0..5, 7..10])));
+        assert!(!partial.contains(Direction::Received, &RangeSet::from([4..6, 7..13])))
    }

    #[rstest]
    fn test_partial_transcript_unauthed(transcript: Transcript) {
-        let partial = transcript.to_partial(Idx::new(0..2), Idx::new(3..7));
-        assert_eq!(partial.sent_unauthed(), Idx::new(2..12));
-        assert_eq!(partial.received_unauthed(), Idx::new([0..3, 7..12]));
+        let partial = transcript.to_partial(RangeSet::from(0..2), RangeSet::from(3..7));
+        assert_eq!(partial.sent_unauthed(), RangeSet::from(2..12));
+        assert_eq!(partial.received_unauthed(), RangeSet::from([0..3, 7..12]));
    }

    #[rstest]
    fn test_partial_transcript_union_success(transcript: Transcript) {
        // Non overlapping ranges.
-        let mut simple_partial = transcript.to_partial(Idx::new(0..2), Idx::new(3..7));
+        let mut simple_partial = transcript.to_partial(RangeSet::from(0..2), RangeSet::from(3..7));

-        let other_simple_partial = transcript.to_partial(Idx::new(3..5), Idx::new(1..2));
+        let other_simple_partial =
+            transcript.to_partial(RangeSet::from(3..5), RangeSet::from(1..2));

        simple_partial.union_transcript(&other_simple_partial);

@@ -847,12 +732,16 @@ mod tests {
            simple_partial.received_unsafe(),
            [0, 1, 0, 3, 4, 5, 6, 0, 0, 0, 0, 0]
        );
-        assert_eq!(simple_partial.sent_authed(), &Idx::new([0..2, 3..5]));
-        assert_eq!(simple_partial.received_authed(), &Idx::new([1..2, 3..7]));
+        assert_eq!(simple_partial.sent_authed(), &RangeSet::from([0..2, 3..5]));
+        assert_eq!(
+            simple_partial.received_authed(),
+            &RangeSet::from([1..2, 3..7])
+        );

        // Overwrite with another partial transcript.

-        let another_simple_partial = transcript.to_partial(Idx::new(1..4), Idx::new(6..9));
+        let another_simple_partial =
+            transcript.to_partial(RangeSet::from(1..4), RangeSet::from(6..9));

        simple_partial.union_transcript(&another_simple_partial);

@@ -864,13 +753,17 @@ mod tests {
            simple_partial.received_unsafe(),
            [0, 1, 0, 3, 4, 5, 6, 7, 8, 0, 0, 0]
        );
-        assert_eq!(simple_partial.sent_authed(), &Idx::new(0..5));
-        assert_eq!(simple_partial.received_authed(), &Idx::new([1..2, 3..9]));
+        assert_eq!(simple_partial.sent_authed(), &RangeSet::from(0..5));
+        assert_eq!(
+            simple_partial.received_authed(),
+            &RangeSet::from([1..2, 3..9])
+        );

        // Overlapping ranges.
-        let mut overlap_partial = transcript.to_partial(Idx::new(4..6), Idx::new(3..7));
+        let mut overlap_partial = transcript.to_partial(RangeSet::from(4..6), RangeSet::from(3..7));

-        let other_overlap_partial = transcript.to_partial(Idx::new(3..5), Idx::new(5..9));
+        let other_overlap_partial =
+            transcript.to_partial(RangeSet::from(3..5), RangeSet::from(5..9));

        overlap_partial.union_transcript(&other_overlap_partial);

@@ -882,13 +775,16 @@ mod tests {
            overlap_partial.received_unsafe(),
            [0, 0, 0, 3, 4, 5, 6, 7, 8, 0, 0, 0]
        );
-        assert_eq!(overlap_partial.sent_authed(), &Idx::new([3..5, 4..6]));
-        assert_eq!(overlap_partial.received_authed(), &Idx::new([3..7, 5..9]));
+        assert_eq!(overlap_partial.sent_authed(), &RangeSet::from([3..5, 4..6]));
+        assert_eq!(
+            overlap_partial.received_authed(),
+            &RangeSet::from([3..7, 5..9])
+        );

        // Equal ranges.
-        let mut equal_partial = transcript.to_partial(Idx::new(4..6), Idx::new(3..7));
+        let mut equal_partial = transcript.to_partial(RangeSet::from(4..6), RangeSet::from(3..7));

-        let other_equal_partial = transcript.to_partial(Idx::new(4..6), Idx::new(3..7));
+        let other_equal_partial = transcript.to_partial(RangeSet::from(4..6), RangeSet::from(3..7));

        equal_partial.union_transcript(&other_equal_partial);

@@ -900,13 +796,15 @@ mod tests {
            equal_partial.received_unsafe(),
            [0, 0, 0, 3, 4, 5, 6, 0, 0, 0, 0, 0]
        );
-        assert_eq!(equal_partial.sent_authed(), &Idx::new(4..6));
-        assert_eq!(equal_partial.received_authed(), &Idx::new(3..7));
+        assert_eq!(equal_partial.sent_authed(), &RangeSet::from(4..6));
+        assert_eq!(equal_partial.received_authed(), &RangeSet::from(3..7));

        // Subset ranges.
-        let mut subset_partial = transcript.to_partial(Idx::new(4..10), Idx::new(3..11));
+        let mut subset_partial =
+            transcript.to_partial(RangeSet::from(4..10), RangeSet::from(3..11));

-        let other_subset_partial = transcript.to_partial(Idx::new(6..9), Idx::new(5..6));
+        let other_subset_partial =
+            transcript.to_partial(RangeSet::from(6..9), RangeSet::from(5..6));

        subset_partial.union_transcript(&other_subset_partial);

@@ -918,30 +816,32 @@ mod tests {
            subset_partial.received_unsafe(),
            [0, 0, 0, 3, 4, 5, 6, 7, 8, 9, 10, 0]
        );
-        assert_eq!(subset_partial.sent_authed(), &Idx::new(4..10));
-        assert_eq!(subset_partial.received_authed(), &Idx::new(3..11));
+        assert_eq!(subset_partial.sent_authed(), &RangeSet::from(4..10));
+        assert_eq!(subset_partial.received_authed(), &RangeSet::from(3..11));
    }

    #[rstest]
    #[should_panic]
    fn test_partial_transcript_union_failure(transcript: Transcript) {
-        let mut partial = transcript.to_partial(Idx::new(4..10), Idx::new(3..11));
+        let mut partial = transcript.to_partial(RangeSet::from(4..10), RangeSet::from(3..11));

        let other_transcript = Transcript::new(
            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
        );

-        let other_partial = other_transcript.to_partial(Idx::new(6..9), Idx::new(5..6));
+        let other_partial = other_transcript.to_partial(RangeSet::from(6..9), RangeSet::from(5..6));

        partial.union_transcript(&other_partial);
    }

    #[rstest]
    fn test_partial_transcript_union_subseq_success(transcript: Transcript) {
-        let mut partial = transcript.to_partial(Idx::new(4..10), Idx::new(3..11));
-        let sent_seq = Subsequence::new(Idx::new([0..3, 5..7]), [0, 1, 2, 5, 6].into()).unwrap();
-        let recv_seq = Subsequence::new(Idx::new([0..4, 5..7]), [0, 1, 2, 3, 5, 6].into()).unwrap();
+        let mut partial = transcript.to_partial(RangeSet::from(4..10), RangeSet::from(3..11));
+        let sent_seq =
+            Subsequence::new(RangeSet::from([0..3, 5..7]), [0, 1, 2, 5, 6].into()).unwrap();
+        let recv_seq =
+            Subsequence::new(RangeSet::from([0..4, 5..7]), [0, 1, 2, 3, 5, 6].into()).unwrap();

        partial.union_subsequence(Direction::Sent, &sent_seq);
        partial.union_subsequence(Direction::Received, &recv_seq);
@@ -951,30 +851,31 @@ mod tests {
            partial.received_unsafe(),
            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0]
        );
-        assert_eq!(partial.sent_authed(), &Idx::new([0..3, 4..10]));
-        assert_eq!(partial.received_authed(), &Idx::new(0..11));
+        assert_eq!(partial.sent_authed(), &RangeSet::from([0..3, 4..10]));
+        assert_eq!(partial.received_authed(), &RangeSet::from(0..11));

        // Overwrite with another subseq.
-        let other_sent_seq = Subsequence::new(Idx::new(0..3), [3, 2, 1].into()).unwrap();
+        let other_sent_seq = Subsequence::new(RangeSet::from(0..3), [3, 2, 1].into()).unwrap();

        partial.union_subsequence(Direction::Sent, &other_sent_seq);
        assert_eq!(partial.sent_unsafe(), [3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 0, 0]);
-        assert_eq!(partial.sent_authed(), &Idx::new([0..3, 4..10]));
+        assert_eq!(partial.sent_authed(), &RangeSet::from([0..3, 4..10]));
    }

    #[rstest]
    #[should_panic]
    fn test_partial_transcript_union_subseq_failure(transcript: Transcript) {
-        let mut partial = transcript.to_partial(Idx::new(4..10), Idx::new(3..11));
+        let mut partial = transcript.to_partial(RangeSet::from(4..10), RangeSet::from(3..11));

-        let sent_seq = Subsequence::new(Idx::new([0..3, 13..15]), [0, 1, 2, 5, 6].into()).unwrap();
+        let sent_seq =
+            Subsequence::new(RangeSet::from([0..3, 13..15]), [0, 1, 2, 5, 6].into()).unwrap();

        partial.union_subsequence(Direction::Sent, &sent_seq);
    }

    #[rstest]
    fn test_partial_transcript_set_unauthed_range(transcript: Transcript) {
-        let mut partial = transcript.to_partial(Idx::new(4..10), Idx::new(3..7));
+        let mut partial = transcript.to_partial(RangeSet::from(4..10), RangeSet::from(3..7));

        partial.set_unauthed_range(7, Direction::Sent, 2..5);
        partial.set_unauthed_range(5, Direction::Sent, 0..2);
@@ -991,13 +892,13 @@ mod tests {
    #[rstest]
    #[should_panic]
    fn test_subsequence_new_invalid_len() {
-        let _ = Subsequence::new(Idx::new([0..3, 5..8]), [0, 1, 2, 5, 6].into()).unwrap();
+        let _ = Subsequence::new(RangeSet::from([0..3, 5..8]), [0, 1, 2, 5, 6].into()).unwrap();
    }

    #[rstest]
    #[should_panic]
    fn test_subsequence_copy_to_invalid_len() {
-        let seq = Subsequence::new(Idx::new([0..3, 5..7]), [0, 1, 2, 5, 6].into()).unwrap();
+        let seq = Subsequence::new(RangeSet::from([0..3, 5..7]), [0, 1, 2, 5, 6].into()).unwrap();

        let mut data: [u8; 3] = [0, 1, 2];
        seq.copy_to(&mut data);
--- a/crates/core/src/transcript/commit.rs
+++ b/crates/core/src/transcript/commit.rs
@@ -2,33 +2,21 @@

 use std::{collections::HashSet, fmt};

-use rangeset::ToRangeSet;
+use rangeset::set::ToRangeSet;
 use serde::{Deserialize, Serialize};

 use crate::{
-    hash::{impl_domain_separator, HashAlgId},
+    hash::HashAlgId,
    transcript::{
-        encoding::{EncodingCommitment, EncodingTree},
        hash::{PlaintextHash, PlaintextHashSecret},
-        Direction, Idx, Transcript,
+        Direction, RangeSet, Transcript,
    },
 };

-/// The maximum allowed total bytelength of committed data for a single
-/// commitment kind. Used to prevent DoS during verification. (May cause the
-/// verifier to hash up to a max of 1GB * 128 = 128GB of data for certain kinds
-/// of encoding commitments.)
-///
-/// This value must not exceed bcs's MAX_SEQUENCE_LENGTH limit (which is (1 <<
-/// 31) - 1 by default)
-pub(crate) const MAX_TOTAL_COMMITTED_DATA: usize = 1_000_000_000;
-
 /// Kind of transcript commitment.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum TranscriptCommitmentKind {
-    /// A commitment to encodings of the transcript.
-    Encoding,
    /// A hash commitment to plaintext in the transcript.
    Hash {
        /// The hash algorithm used.
@@ -39,7 +27,6 @@ pub enum TranscriptCommitmentKind {
 impl fmt::Display for TranscriptCommitmentKind {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
-            Self::Encoding => f.write_str("encoding"),
            Self::Hash { alg } => write!(f, "hash ({alg})"),
        }
    }
@@ -49,76 +36,47 @@ impl fmt::Display for TranscriptCommitmentKind {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum TranscriptCommitment {
-    /// Encoding commitment.
-    Encoding(EncodingCommitment),
    /// Plaintext hash commitment.
    Hash(PlaintextHash),
 }

-impl_domain_separator!(TranscriptCommitment);
-
 /// Secret for a transcript commitment.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum TranscriptSecret {
-    /// Encoding tree.
-    Encoding(EncodingTree),
    /// Plaintext hash secret.
    Hash(PlaintextHashSecret),
 }

-impl_domain_separator!(TranscriptSecret);
-
 /// Configuration for transcript commitments.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TranscriptCommitConfig {
-    encoding_hash_alg: HashAlgId,
-    has_encoding: bool,
-    has_hash: bool,
-    commits: Vec<((Direction, Idx), TranscriptCommitmentKind)>,
+    commits: Vec<((Direction, RangeSet<usize>), TranscriptCommitmentKind)>,
 }

 impl TranscriptCommitConfig {
    /// Creates a new commit config builder.
-    pub fn builder(transcript: &Transcript) -> TranscriptCommitConfigBuilder {
+    pub fn builder(transcript: &Transcript) -> TranscriptCommitConfigBuilder<'_> {
        TranscriptCommitConfigBuilder::new(transcript)
    }

-    /// Returns the hash algorithm to use for encoding commitments.
-    pub fn encoding_hash_alg(&self) -> &HashAlgId {
-        &self.encoding_hash_alg
-    }
-
-    /// Returns `true` if the configuration has any encoding commitments.
-    pub fn has_encoding(&self) -> bool {
-        self.has_encoding
-    }
-
    /// Returns `true` if the configuration has any hash commitments.
    pub fn has_hash(&self) -> bool {
-        self.has_hash
-    }
-
-    /// Returns an iterator over the encoding commitment indices.
-    pub fn iter_encoding(&self) -> impl Iterator<Item = &(Direction, Idx)> {
-        self.commits.iter().filter_map(|(idx, kind)| match kind {
-            TranscriptCommitmentKind::Encoding => Some(idx),
-            _ => None,
-        })
+        self.commits
+            .iter()
+            .any(|(_, kind)| matches!(kind, TranscriptCommitmentKind::Hash { .. }))
    }

    /// Returns an iterator over the hash commitment indices.
-    pub fn iter_hash(&self) -> impl Iterator<Item = (&(Direction, Idx), &HashAlgId)> {
-        self.commits.iter().filter_map(|(idx, kind)| match kind {
-            TranscriptCommitmentKind::Hash { alg } => Some((idx, alg)),
-            _ => None,
+    pub fn iter_hash(&self) -> impl Iterator<Item = (&(Direction, RangeSet<usize>), &HashAlgId)> {
+        self.commits.iter().map(|(idx, kind)| match kind {
+            TranscriptCommitmentKind::Hash { alg } => (idx, alg),
        })
    }

    /// Returns a request for the transcript commitments.
    pub fn to_request(&self) -> TranscriptCommitRequest {
        TranscriptCommitRequest {
-            encoding: self.has_encoding,
            hash: self
                .iter_hash()
                .map(|((dir, idx), alg)| (*dir, idx.clone(), *alg))
@@ -128,17 +86,11 @@ impl TranscriptCommitConfig {
 }

 /// A builder for [`TranscriptCommitConfig`].
-///
-/// The default hash algorithm is [`HashAlgId::BLAKE3`] and the default kind
-/// is [`TranscriptCommitmentKind::Encoding`].
 #[derive(Debug)]
 pub struct TranscriptCommitConfigBuilder<'a> {
    transcript: &'a Transcript,
-    encoding_hash_alg: HashAlgId,
-    has_encoding: bool,
-    has_hash: bool,
    default_kind: TranscriptCommitmentKind,
-    commits: HashSet<((Direction, Idx), TranscriptCommitmentKind)>,
+    commits: HashSet<((Direction, RangeSet<usize>), TranscriptCommitmentKind)>,
 }

 impl<'a> TranscriptCommitConfigBuilder<'a> {
@@ -146,20 +98,13 @@ impl<'a> TranscriptCommitConfigBuilder<'a> {
    pub fn new(transcript: &'a Transcript) -> Self {
        Self {
            transcript,
-            encoding_hash_alg: HashAlgId::BLAKE3,
-            has_encoding: false,
-            has_hash: false,
-            default_kind: TranscriptCommitmentKind::Encoding,
+            default_kind: TranscriptCommitmentKind::Hash {
+                alg: HashAlgId::BLAKE3,
+            },
            commits: HashSet::default(),
        }
    }

-    /// Sets the hash algorithm to use for encoding commitments.
-    pub fn encoding_hash_alg(&mut self, alg: HashAlgId) -> &mut Self {
-        self.encoding_hash_alg = alg;
-        self
-    }
-
    /// Sets the default kind of commitment to use.
    pub fn default_kind(&mut self, default_kind: TranscriptCommitmentKind) -> &mut Self {
        self.default_kind = default_kind;
@@ -179,25 +124,20 @@ impl<'a> TranscriptCommitConfigBuilder<'a> {
        direction: Direction,
        kind: TranscriptCommitmentKind,
    ) -> Result<&mut Self, TranscriptCommitConfigBuilderError> {
-        let idx = Idx::new(ranges.to_range_set());
+        let idx = ranges.to_range_set();

-        if idx.end() > self.transcript.len_of_direction(direction) {
+        if idx.end().unwrap_or(0) > self.transcript.len_of_direction(direction) {
            return Err(TranscriptCommitConfigBuilderError::new(
                ErrorKind::Index,
                format!(
                    "range is out of bounds of the transcript ({}): {} > {}",
                    direction,
-                    idx.end(),
+                    idx.end().unwrap_or(0),
                    self.transcript.len_of_direction(direction)
                ),
            ));
        }

-        match kind {
-            TranscriptCommitmentKind::Encoding => self.has_encoding = true,
-            TranscriptCommitmentKind::Hash { .. } => self.has_hash = true,
-        }
-
        self.commits.insert(((direction, idx), kind));

        Ok(self)
@@ -244,9 +184,6 @@ impl<'a> TranscriptCommitConfigBuilder<'a> {
    /// Builds the configuration.
    pub fn build(self) -> Result<TranscriptCommitConfig, TranscriptCommitConfigBuilderError> {
        Ok(TranscriptCommitConfig {
-            encoding_hash_alg: self.encoding_hash_alg,
-            has_encoding: self.has_encoding,
-            has_hash: self.has_hash,
            commits: Vec::from_iter(self.commits),
        })
    }
@@ -283,7 +220,7 @@ impl fmt::Display for TranscriptCommitConfigBuilderError {
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
@@ -293,23 +230,17 @@ impl fmt::Display for TranscriptCommitConfigBuilderError {
 /// Request to compute transcript commitments.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TranscriptCommitRequest {
-    encoding: bool,
-    hash: Vec<(Direction, Idx, HashAlgId)>,
+    hash: Vec<(Direction, RangeSet<usize>, HashAlgId)>,
 }

 impl TranscriptCommitRequest {
-    /// Returns `true` if an encoding commitment is requested.
-    pub fn encoding(&self) -> bool {
-        self.encoding
-    }
-
    /// Returns `true` if a hash commitment is requested.
    pub fn has_hash(&self) -> bool {
        !self.hash.is_empty()
    }

    /// Returns an iterator over the hash commitments.
-    pub fn iter_hash(&self) -> impl Iterator<Item = &(Direction, Idx, HashAlgId)> {
+    pub fn iter_hash(&self) -> impl Iterator<Item = &(Direction, RangeSet<usize>, HashAlgId)> {
        self.hash.iter()
    }
 }
--- a/crates/core/src/transcript/encoding.rs
+++ b/crates/core/src/transcript/encoding.rs
@@ -1,29 +0,0 @@
-//! Transcript encoding commitments and proofs.
-//!
-//! This is an internal module that is not intended to be used directly by
-//! users.
-
-mod encoder;
-mod proof;
-mod provider;
-mod tree;
-
-pub use encoder::{new_encoder, Encoder, EncoderSecret};
-pub use proof::{EncodingProof, EncodingProofError};
-pub use provider::{EncodingProvider, EncodingProviderError};
-pub use tree::{EncodingTree, EncodingTreeError};
-
-use serde::{Deserialize, Serialize};
-
-use crate::hash::{impl_domain_separator, TypedHash};
-
-/// Transcript encoding commitment.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct EncodingCommitment {
-    /// Merkle root of the encoding commitments.
-    pub root: TypedHash,
-    /// Seed used to generate the encodings.
-    pub secret: EncoderSecret,
-}
-
-impl_domain_separator!(EncodingCommitment);
--- a/crates/core/src/transcript/encoding/encoder.rs
+++ b/crates/core/src/transcript/encoding/encoder.rs
@@ -1,137 +0,0 @@
-use std::ops::Range;
-
-use crate::transcript::Direction;
-use itybity::ToBits;
-use rand::{RngCore, SeedableRng};
-use rand_chacha::ChaCha12Rng;
-use serde::{Deserialize, Serialize};
-
-/// The size of the encoding for 1 bit, in bytes.
-const BIT_ENCODING_SIZE: usize = 16;
-/// The size of the encoding for 1 byte, in bytes.
-const BYTE_ENCODING_SIZE: usize = 128;
-
-/// Secret used by an encoder to generate encodings.
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct EncoderSecret {
-    seed: [u8; 32],
-    delta: [u8; BIT_ENCODING_SIZE],
-}
-
-opaque_debug::implement!(EncoderSecret);
-
-impl EncoderSecret {
-    /// Creates a new secret.
-    ///
-    /// # Arguments
-    ///
-    /// * `seed` - The seed for the PRG.
-    /// * `delta` - Delta for deriving the one-encodings.
-    pub fn new(seed: [u8; 32], delta: [u8; 16]) -> Self {
-        Self { seed, delta }
-    }
-
-    /// Returns the seed.
-    pub fn seed(&self) -> &[u8; 32] {
-        &self.seed
-    }
-
-    /// Returns the delta.
-    pub fn delta(&self) -> &[u8; 16] {
-        &self.delta
-    }
-}
-
-/// Creates a new encoder.
-pub fn new_encoder(secret: &EncoderSecret) -> impl Encoder {
-    ChaChaEncoder::new(secret)
-}
-
-pub(crate) struct ChaChaEncoder {
-    seed: [u8; 32],
-    delta: [u8; 16],
-}
-
-impl ChaChaEncoder {
-    pub(crate) fn new(secret: &EncoderSecret) -> Self {
-        let seed = *secret.seed();
-        let delta = *secret.delta();
-
-        Self { seed, delta }
-    }
-
-    pub(crate) fn new_prg(&self, stream_id: u64) -> ChaCha12Rng {
-        let mut prg = ChaCha12Rng::from_seed(self.seed);
-        prg.set_stream(stream_id);
-        prg.set_word_pos(0);
-        prg
-    }
-}
-
-/// A transcript encoder.
-///
-/// This is an internal implementation detail that should not be exposed to the
-/// public API.
-pub trait Encoder {
-    /// Writes the zero encoding for the given range of the transcript into the
-    /// destination buffer.
-    fn encode_range(&self, direction: Direction, range: Range<usize>, dest: &mut Vec<u8>);
-
-    /// Writes the encoding for the given data into the destination buffer.
-    fn encode_data(
-        &self,
-        direction: Direction,
-        range: Range<usize>,
-        data: &[u8],
-        dest: &mut Vec<u8>,
-    );
-}
-
-impl Encoder for ChaChaEncoder {
-    fn encode_range(&self, direction: Direction, range: Range<usize>, dest: &mut Vec<u8>) {
-        // ChaCha encoder works with 32-bit words. Each encoded bit is 128 bits long.
-        const WORDS_PER_BYTE: u128 = 8 * 128 / 32;
-
-        let stream_id: u64 = match direction {
-            Direction::Sent => 0,
-            Direction::Received => 1,
-        };
-
-        let mut prg = self.new_prg(stream_id);
-        let len = range.len() * BYTE_ENCODING_SIZE;
-        let pos = dest.len();
-
-        // Write 0s to the destination buffer.
-        dest.resize(pos + len, 0);
-
-        // Fill the destination buffer with the PRG.
-        prg.set_word_pos(range.start as u128 * WORDS_PER_BYTE);
-        prg.fill_bytes(&mut dest[pos..pos + len]);
-    }
-
-    fn encode_data(
-        &self,
-        direction: Direction,
-        range: Range<usize>,
-        data: &[u8],
-        dest: &mut Vec<u8>,
-    ) {
-        const ZERO: [u8; 16] = [0; BIT_ENCODING_SIZE];
-
-        let pos = dest.len();
-
-        // Write the zero encoding for the given range.
-        self.encode_range(direction, range, dest);
-        let dest = &mut dest[pos..];
-
-        for (pos, bit) in data.iter_lsb0().enumerate() {
-            // Add the delta to the encoding whenever the encoded bit is 1,
-            // otherwise add a zero.
-            let summand = if bit { &self.delta } else { &ZERO };
-            dest[pos * BIT_ENCODING_SIZE..(pos + 1) * BIT_ENCODING_SIZE]
-                .iter_mut()
-                .zip(summand)
-                .for_each(|(a, b)| *a ^= *b);
-        }
-    }
-}
--- a/crates/core/src/transcript/encoding/proof.rs
+++ b/crates/core/src/transcript/encoding/proof.rs
@@ -1,358 +0,0 @@
-use std::{collections::HashMap, fmt};
-
-use rangeset::{RangeSet, UnionMut};
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    hash::{Blinder, HashProviderError},
-    merkle::{MerkleError, MerkleProof},
-    transcript::{
-        commit::MAX_TOTAL_COMMITTED_DATA,
-        encoding::{new_encoder, Encoder, EncodingCommitment},
-        Direction, Idx,
-    },
-    CryptoProvider,
-};
-
-/// An opening of a leaf in the encoding tree.
-#[derive(Clone, Serialize, Deserialize)]
-pub(super) struct Opening {
-    pub(super) direction: Direction,
-    pub(super) idx: Idx,
-    pub(super) blinder: Blinder,
-}
-
-opaque_debug::implement!(Opening);
-
-/// An encoding commitment proof.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(try_from = "validation::EncodingProofUnchecked")]
-pub struct EncodingProof {
-    /// The proof of inclusion of the commitment(s) in the Merkle tree of
-    /// commitments.
-    pub(super) inclusion_proof: MerkleProof,
-    pub(super) openings: HashMap<usize, Opening>,
-}
-
-impl EncodingProof {
-    /// Verifies the proof against the commitment.
-    ///
-    /// Returns the authenticated indices of the sent and received data,
-    /// respectively.
-    ///
-    /// # Arguments
-    ///
-    /// * `provider` - Crypto provider.
-    /// * `commitment` - Encoding commitment to verify against.
-    /// * `sent` - Sent data to authenticate.
-    /// * `recv` - Received data to authenticate.
-    pub fn verify_with_provider(
-        &self,
-        provider: &CryptoProvider,
-        commitment: &EncodingCommitment,
-        sent: &[u8],
-        recv: &[u8],
-    ) -> Result<(Idx, Idx), EncodingProofError> {
-        let hasher = provider.hash.get(&commitment.root.alg)?;
-
-        let encoder = new_encoder(&commitment.secret);
-        let Self {
-            inclusion_proof,
-            openings,
-        } = self;
-
-        let mut leaves = Vec::with_capacity(openings.len());
-        let mut expected_leaf = Vec::default();
-        let mut total_opened = 0u128;
-        let mut auth_sent = RangeSet::default();
-        let mut auth_recv = RangeSet::default();
-        for (
-            id,
-            Opening {
-                direction,
-                idx,
-                blinder,
-            },
-        ) in openings
-        {
-            // Make sure the amount of data being proved is bounded.
-            total_opened += idx.len() as u128;
-            if total_opened > MAX_TOTAL_COMMITTED_DATA as u128 {
-                return Err(EncodingProofError::new(
-                    ErrorKind::Proof,
-                    "exceeded maximum allowed data",
-                ))?;
-            }
-
-            let (data, auth) = match direction {
-                Direction::Sent => (sent, &mut auth_sent),
-                Direction::Received => (recv, &mut auth_recv),
-            };
-
-            // Make sure the ranges are within the bounds of the transcript.
-            if idx.end() > data.len() {
-                return Err(EncodingProofError::new(
-                    ErrorKind::Proof,
-                    format!(
-                        "index out of bounds of the transcript ({}): {} > {}",
-                        direction,
-                        idx.end(),
-                        data.len()
-                    ),
-                ));
-            }
-
-            expected_leaf.clear();
-            for range in idx.iter_ranges() {
-                encoder.encode_data(*direction, range.clone(), &data[range], &mut expected_leaf);
-            }
-            expected_leaf.extend_from_slice(blinder.as_bytes());
-
-            // Compute the expected hash of the commitment to make sure it is
-            // present in the merkle tree.
-            leaves.push((*id, hasher.hash(&expected_leaf)));
-
-            auth.union_mut(idx.as_range_set());
-        }
-
-        // Verify that the expected hashes are present in the merkle tree.
-        //
-        // This proves the Prover committed to the purported data prior to the encoder
-        // seed being revealed. Ergo, if the encodings are authentic then the purported
-        // data is authentic.
-        inclusion_proof.verify(hasher, &commitment.root, leaves)?;
-
-        Ok((Idx(auth_sent), Idx(auth_recv)))
-    }
-}
-
-/// Error for [`EncodingProof`].
-#[derive(Debug, thiserror::Error)]
-pub struct EncodingProofError {
-    kind: ErrorKind,
-    source: Option<Box<dyn std::error::Error + Send + Sync>>,
-}
-
-impl EncodingProofError {
-    fn new<E>(kind: ErrorKind, source: E) -> Self
-    where
-        E: Into<Box<dyn std::error::Error + Send + Sync>>,
-    {
-        Self {
-            kind,
-            source: Some(source.into()),
-        }
-    }
-}
-
-#[derive(Debug)]
-enum ErrorKind {
-    Provider,
-    Proof,
-}
-
-impl fmt::Display for EncodingProofError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str("encoding proof error: ")?;
-
-        match self.kind {
-            ErrorKind::Provider => f.write_str("provider error")?,
-            ErrorKind::Proof => f.write_str("proof error")?,
-        }
-
-        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
-        }
-
-        Ok(())
-    }
-}
-
-impl From<HashProviderError> for EncodingProofError {
-    fn from(error: HashProviderError) -> Self {
-        Self::new(ErrorKind::Provider, error)
-    }
-}
-
-impl From<MerkleError> for EncodingProofError {
-    fn from(error: MerkleError) -> Self {
-        Self::new(ErrorKind::Proof, error)
-    }
-}
-
-/// Invalid encoding proof error.
-#[derive(Debug, thiserror::Error)]
-#[error("invalid encoding proof: {0}")]
-pub struct InvalidEncodingProof(&'static str);
-
-mod validation {
-    use super::*;
-
-    /// The maximum allowed height of the Merkle tree of encoding commitments.
-    ///
-    /// The statistical security parameter (SSP) of the encoding commitment
-    /// protocol is calculated as "the number of uniformly random bits in a
-    /// single bit's encoding minus `MAX_HEIGHT`".
-    ///
-    /// For example, a bit encoding used in garbled circuits typically has 127
-    /// uniformly random bits, hence when using it in the encoding
-    /// commitment protocol, the SSP is 127 - 30 = 97 bits.
-    ///
-    /// Leaving this validation here as a fail-safe in case we ever start
-    /// using shorter encodings.
-    const MAX_HEIGHT: usize = 30;
-
-    #[derive(Debug, Deserialize)]
-    pub(super) struct EncodingProofUnchecked {
-        inclusion_proof: MerkleProof,
-        openings: HashMap<usize, Opening>,
-    }
-
-    impl TryFrom<EncodingProofUnchecked> for EncodingProof {
-        type Error = InvalidEncodingProof;
-
-        fn try_from(unchecked: EncodingProofUnchecked) -> Result<Self, Self::Error> {
-            if unchecked.inclusion_proof.leaf_count() > 1 << MAX_HEIGHT {
-                return Err(InvalidEncodingProof(
-                    "the height of the tree exceeds the maximum allowed",
-                ));
-            }
-
-            Ok(Self {
-                inclusion_proof: unchecked.inclusion_proof,
-                openings: unchecked.openings,
-            })
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use tlsn_data_fixtures::http::{request::POST_JSON, response::OK_JSON};
-
-    use crate::{
-        fixtures::{encoder_secret, encoder_secret_tampered_seed, encoding_provider},
-        hash::Blake3,
-        transcript::{
-            encoding::{EncoderSecret, EncodingTree},
-            Idx, Transcript,
-        },
-    };
-
-    use super::*;
-
-    struct EncodingFixture {
-        transcript: Transcript,
-        proof: EncodingProof,
-        commitment: EncodingCommitment,
-    }
-
-    fn new_encoding_fixture(secret: EncoderSecret) -> EncodingFixture {
-        let transcript = Transcript::new(POST_JSON, OK_JSON);
-
-        let idx_0 = (Direction::Sent, Idx::new(0..POST_JSON.len()));
-        let idx_1 = (Direction::Received, Idx::new(0..OK_JSON.len()));
-
-        let provider = encoding_provider(transcript.sent(), transcript.received());
-        let tree = EncodingTree::new(&Blake3::default(), [&idx_0, &idx_1], &provider).unwrap();
-
-        let proof = tree.proof([&idx_0, &idx_1].into_iter()).unwrap();
-
-        let commitment = EncodingCommitment {
-            root: tree.root(),
-            secret,
-        };
-
-        EncodingFixture {
-            transcript,
-            proof,
-            commitment,
-        }
-    }
-
-    #[test]
-    fn test_verify_encoding_proof_tampered_seed() {
-        let EncodingFixture {
-            transcript,
-            proof,
-            commitment,
-        } = new_encoding_fixture(encoder_secret_tampered_seed());
-
-        let err = proof
-            .verify_with_provider(
-                &CryptoProvider::default(),
-                &commitment,
-                transcript.sent(),
-                transcript.received(),
-            )
-            .unwrap_err();
-
-        assert!(matches!(err.kind, ErrorKind::Proof));
-    }
-
-    #[test]
-    fn test_verify_encoding_proof_out_of_range() {
-        let EncodingFixture {
-            transcript,
-            proof,
-            commitment,
-        } = new_encoding_fixture(encoder_secret());
-
-        let sent = &transcript.sent()[transcript.sent().len() - 1..];
-        let recv = &transcript.received()[transcript.received().len() - 2..];
-
-        let err = proof
-            .verify_with_provider(&CryptoProvider::default(), &commitment, sent, recv)
-            .unwrap_err();
-
-        assert!(matches!(err.kind, ErrorKind::Proof));
-    }
-
-    #[test]
-    fn test_verify_encoding_proof_tampered_idx() {
-        let EncodingFixture {
-            transcript,
-            mut proof,
-            commitment,
-        } = new_encoding_fixture(encoder_secret());
-
-        let Opening { idx, .. } = proof.openings.values_mut().next().unwrap();
-
-        *idx = Idx::new([0..3, 13..15]);
-
-        let err = proof
-            .verify_with_provider(
-                &CryptoProvider::default(),
-                &commitment,
-                transcript.sent(),
-                transcript.received(),
-            )
-            .unwrap_err();
-
-        assert!(matches!(err.kind, ErrorKind::Proof));
-    }
-
-    #[test]
-    fn test_verify_encoding_proof_tampered_encoding_blinder() {
-        let EncodingFixture {
-            transcript,
-            mut proof,
-            commitment,
-        } = new_encoding_fixture(encoder_secret());
-
-        let Opening { blinder, .. } = proof.openings.values_mut().next().unwrap();
-
-        *blinder = rand::random();
-
-        let err = proof
-            .verify_with_provider(
-                &CryptoProvider::default(),
-                &commitment,
-                transcript.sent(),
-                transcript.received(),
-            )
-            .unwrap_err();
-
-        assert!(matches!(err.kind, ErrorKind::Proof));
-    }
-}
--- a/crates/core/src/transcript/encoding/provider.rs
+++ b/crates/core/src/transcript/encoding/provider.rs
@@ -1,18 +0,0 @@
-use std::ops::Range;
-
-use crate::transcript::Direction;
-
-/// A provider of plaintext encodings.
-pub trait EncodingProvider {
-    /// Writes the encoding of the given range into the destination buffer.
-    fn provide_encoding(
-        &self,
-        direction: Direction,
-        range: Range<usize>,
-        dest: &mut Vec<u8>,
-    ) -> Result<(), EncodingProviderError>;
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("failed to provide encoding")]
-pub struct EncodingProviderError;
--- a/crates/core/src/transcript/encoding/tree.rs
+++ b/crates/core/src/transcript/encoding/tree.rs
@@ -1,331 +0,0 @@
-use std::collections::HashMap;
-
-use bimap::BiMap;
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    hash::{Blinder, HashAlgId, HashAlgorithm, TypedHash},
-    merkle::MerkleTree,
-    transcript::{
-        encoding::{
-            proof::{EncodingProof, Opening},
-            EncodingProvider,
-        },
-        Direction, Idx,
-    },
-};
-
-/// Encoding tree builder error.
-#[derive(Debug, thiserror::Error)]
-pub enum EncodingTreeError {
-    /// Index is out of bounds of the transcript.
-    #[error("index is out of bounds of the transcript")]
-    OutOfBounds {
-        /// The index.
-        index: Idx,
-        /// The transcript length.
-        transcript_length: usize,
-    },
-    /// Encoding provider is missing an encoding for an index.
-    #[error("encoding provider is missing an encoding for an index")]
-    MissingEncoding {
-        /// The index which is missing.
-        index: Idx,
-    },
-    /// Index is missing from the tree.
-    #[error("index is missing from the tree")]
-    MissingLeaf {
-        /// The index which is missing.
-        index: Idx,
-    },
-}
-
-/// A merkle tree of transcript encodings.
-#[derive(Clone, Serialize, Deserialize)]
-pub struct EncodingTree {
-    /// Merkle tree of the commitments.
-    tree: MerkleTree,
-    /// Nonces used to blind the hashes.
-    blinders: Vec<Blinder>,
-    /// Mapping between the index of a leaf and the transcript index it
-    /// corresponds to.
-    idxs: BiMap<usize, (Direction, Idx)>,
-    /// Union of all transcript indices in the sent direction.
-    sent_idx: Idx,
-    /// Union of all transcript indices in the received direction.
-    received_idx: Idx,
-}
-
-opaque_debug::implement!(EncodingTree);
-
-impl EncodingTree {
-    /// Creates a new encoding tree.
-    ///
-    /// # Arguments
-    ///
-    /// * `hasher` - The hash algorithm to use.
-    /// * `idxs` - The subsequence indices to commit to.
-    /// * `provider` - The encoding provider.
-    pub fn new<'idx>(
-        hasher: &dyn HashAlgorithm,
-        idxs: impl IntoIterator<Item = &'idx (Direction, Idx)>,
-        provider: &dyn EncodingProvider,
-    ) -> Result<Self, EncodingTreeError> {
-        let mut this = Self {
-            tree: MerkleTree::new(hasher.id()),
-            blinders: Vec::new(),
-            idxs: BiMap::new(),
-            sent_idx: Idx::empty(),
-            received_idx: Idx::empty(),
-        };
-
-        let mut leaves = Vec::new();
-        let mut encoding = Vec::new();
-        for dir_idx in idxs {
-            let direction = dir_idx.0;
-            let idx = &dir_idx.1;
-
-            // Ignore empty indices.
-            if idx.is_empty() {
-                continue;
-            }
-
-            if this.idxs.contains_right(dir_idx) {
-                // The subsequence is already in the tree.
-                continue;
-            }
-
-            let blinder: Blinder = rand::random();
-
-            encoding.clear();
-            for range in idx.iter_ranges() {
-                provider
-                    .provide_encoding(direction, range, &mut encoding)
-                    .map_err(|_| EncodingTreeError::MissingEncoding { index: idx.clone() })?;
-            }
-            encoding.extend_from_slice(blinder.as_bytes());
-
-            let leaf = hasher.hash(&encoding);
-
-            leaves.push(leaf);
-            this.blinders.push(blinder);
-            this.idxs.insert(this.idxs.len(), dir_idx.clone());
-            match direction {
-                Direction::Sent => this.sent_idx.union_mut(idx),
-                Direction::Received => this.received_idx.union_mut(idx),
-            }
-        }
-
-        this.tree.insert(hasher, leaves);
-
-        Ok(this)
-    }
-
-    /// Returns the root of the tree.
-    pub fn root(&self) -> TypedHash {
-        self.tree.root()
-    }
-
-    /// Returns the hash algorithm of the tree.
-    pub fn algorithm(&self) -> HashAlgId {
-        self.tree.algorithm()
-    }
-
-    /// Generates a proof for the given indices.
-    ///
-    /// # Arguments
-    ///
-    /// * `idxs` - The transcript indices to prove.
-    pub fn proof<'idx>(
-        &self,
-        idxs: impl Iterator<Item = &'idx (Direction, Idx)>,
-    ) -> Result<EncodingProof, EncodingTreeError> {
-        let mut openings = HashMap::new();
-        for dir_idx in idxs {
-            let direction = dir_idx.0;
-            let idx = &dir_idx.1;
-
-            let leaf_idx = *self
-                .idxs
-                .get_by_right(dir_idx)
-                .ok_or_else(|| EncodingTreeError::MissingLeaf { index: idx.clone() })?;
-            let blinder = self.blinders[leaf_idx].clone();
-
-            openings.insert(
-                leaf_idx,
-                Opening {
-                    direction,
-                    idx: idx.clone(),
-                    blinder,
-                },
-            );
-        }
-
-        let mut indices = openings.keys().copied().collect::<Vec<_>>();
-        indices.sort();
-
-        Ok(EncodingProof {
-            inclusion_proof: self.tree.proof(&indices),
-            openings,
-        })
-    }
-
-    /// Returns whether the tree contains the given transcript index.
-    pub fn contains(&self, idx: &(Direction, Idx)) -> bool {
-        self.idxs.contains_right(idx)
-    }
-
-    pub(crate) fn idx(&self, direction: Direction) -> &Idx {
-        match direction {
-            Direction::Sent => &self.sent_idx,
-            Direction::Received => &self.received_idx,
-        }
-    }
-
-    /// Returns the committed transcript indices.
-    pub(crate) fn transcript_indices(&self) -> impl Iterator<Item = &(Direction, Idx)> {
-        self.idxs.right_values()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{
-        fixtures::{encoder_secret, encoding_provider},
-        hash::Blake3,
-        transcript::{encoding::EncodingCommitment, Transcript},
-        CryptoProvider,
-    };
-    use tlsn_data_fixtures::http::{request::POST_JSON, response::OK_JSON};
-
-    fn new_tree<'seq>(
-        transcript: &Transcript,
-        idxs: impl Iterator<Item = &'seq (Direction, Idx)>,
-    ) -> Result<EncodingTree, EncodingTreeError> {
-        let provider = encoding_provider(transcript.sent(), transcript.received());
-
-        EncodingTree::new(&Blake3::default(), idxs, &provider)
-    }
-
-    #[test]
-    fn test_encoding_tree() {
-        let transcript = Transcript::new(POST_JSON, OK_JSON);
-
-        let idx_0 = (Direction::Sent, Idx::new(0..POST_JSON.len()));
-        let idx_1 = (Direction::Received, Idx::new(0..OK_JSON.len()));
-
-        let tree = new_tree(&transcript, [&idx_0, &idx_1].into_iter()).unwrap();
-
-        assert!(tree.contains(&idx_0));
-        assert!(tree.contains(&idx_1));
-
-        let proof = tree.proof([&idx_0, &idx_1].into_iter()).unwrap();
-
-        let commitment = EncodingCommitment {
-            root: tree.root(),
-            secret: encoder_secret(),
-        };
-
-        let (auth_sent, auth_recv) = proof
-            .verify_with_provider(
-                &CryptoProvider::default(),
-                &commitment,
-                transcript.sent(),
-                transcript.received(),
-            )
-            .unwrap();
-
-        assert_eq!(auth_sent, idx_0.1);
-        assert_eq!(auth_recv, idx_1.1);
-    }
-
-    #[test]
-    fn test_encoding_tree_multiple_ranges() {
-        let transcript = Transcript::new(POST_JSON, OK_JSON);
-
-        let idx_0 = (Direction::Sent, Idx::new(0..1));
-        let idx_1 = (Direction::Sent, Idx::new(1..POST_JSON.len()));
-        let idx_2 = (Direction::Received, Idx::new(0..1));
-        let idx_3 = (Direction::Received, Idx::new(1..OK_JSON.len()));
-
-        let tree = new_tree(&transcript, [&idx_0, &idx_1, &idx_2, &idx_3].into_iter()).unwrap();
-
-        assert!(tree.contains(&idx_0));
-        assert!(tree.contains(&idx_1));
-        assert!(tree.contains(&idx_2));
-        assert!(tree.contains(&idx_3));
-
-        let proof = tree
-            .proof([&idx_0, &idx_1, &idx_2, &idx_3].into_iter())
-            .unwrap();
-
-        let commitment = EncodingCommitment {
-            root: tree.root(),
-            secret: encoder_secret(),
-        };
-
-        let (auth_sent, auth_recv) = proof
-            .verify_with_provider(
-                &CryptoProvider::default(),
-                &commitment,
-                transcript.sent(),
-                transcript.received(),
-            )
-            .unwrap();
-
-        let mut expected_auth_sent = Idx::default();
-        expected_auth_sent.union_mut(&idx_0.1);
-        expected_auth_sent.union_mut(&idx_1.1);
-
-        let mut expected_auth_recv = Idx::default();
-        expected_auth_recv.union_mut(&idx_2.1);
-        expected_auth_recv.union_mut(&idx_3.1);
-
-        assert_eq!(auth_sent, expected_auth_sent);
-        assert_eq!(auth_recv, expected_auth_recv);
-    }
-
-    #[test]
-    fn test_encoding_tree_proof_missing_leaf() {
-        let transcript = Transcript::new(POST_JSON, OK_JSON);
-
-        let idx_0 = (Direction::Sent, Idx::new(0..POST_JSON.len()));
-        let idx_1 = (Direction::Received, Idx::new(0..4));
-        let idx_2 = (Direction::Received, Idx::new(4..OK_JSON.len()));
-
-        let tree = new_tree(&transcript, [&idx_0, &idx_1].into_iter()).unwrap();
-
-        let result = tree
-            .proof([&idx_0, &idx_1, &idx_2].into_iter())
-            .unwrap_err();
-        assert!(matches!(result, EncodingTreeError::MissingLeaf { .. }));
-    }
-
-    #[test]
-    fn test_encoding_tree_out_of_bounds() {
-        let transcript = Transcript::new(POST_JSON, OK_JSON);
-
-        let idx_0 = (Direction::Sent, Idx::new(0..POST_JSON.len() + 1));
-        let idx_1 = (Direction::Received, Idx::new(0..OK_JSON.len() + 1));
-
-        let result = new_tree(&transcript, [&idx_0].into_iter()).unwrap_err();
-        assert!(matches!(result, EncodingTreeError::MissingEncoding { .. }));
-
-        let result = new_tree(&transcript, [&idx_1].into_iter()).unwrap_err();
-        assert!(matches!(result, EncodingTreeError::MissingEncoding { .. }));
-    }
-
-    #[test]
-    fn test_encoding_tree_missing_encoding() {
-        let provider = encoding_provider(&[], &[]);
-
-        let result = EncodingTree::new(
-            &Blake3::default(),
-            [(Direction::Sent, Idx::new(0..8))].iter(),
-            &provider,
-        )
-        .unwrap_err();
-        assert!(matches!(result, EncodingTreeError::MissingEncoding { .. }));
-    }
-}
--- a/crates/core/src/transcript/hash.rs
+++ b/crates/core/src/transcript/hash.rs
@@ -3,8 +3,8 @@
 use serde::{Deserialize, Serialize};

 use crate::{
-    hash::{impl_domain_separator, Blinder, HashAlgId, HashAlgorithm, TypedHash},
-    transcript::{Direction, Idx},
+    hash::{Blinder, HashAlgId, HashAlgorithm, TypedHash},
+    transcript::{Direction, RangeSet},
 };

 /// Hashes plaintext with a blinder.
@@ -23,20 +23,18 @@ pub struct PlaintextHash {
    /// Direction of the plaintext.
    pub direction: Direction,
    /// Index of plaintext.
-    pub idx: Idx,
+    pub idx: RangeSet<usize>,
    /// The hash of the data.
    pub hash: TypedHash,
 }

-impl_domain_separator!(PlaintextHash);
-
 /// Secret component of [`PlaintextHash`].
 #[derive(Clone, Serialize, Deserialize)]
 pub struct PlaintextHashSecret {
    /// Direction of the plaintext.
    pub direction: Direction,
    /// Index of plaintext.
-    pub idx: Idx,
+    pub idx: RangeSet<usize>,
    /// The algorithm of the hash.
    pub alg: HashAlgId,
    /// Blinder for the hash.
--- a/crates/core/src/transcript/proof.rs
+++ b/crates/core/src/transcript/proof.rs
@@ -1,19 +1,22 @@
 //! Transcript proofs.

-use rangeset::{Cover, ToRangeSet};
+use rangeset::{
+    iter::RangeIterator,
+    ops::{Cover, Set},
+    set::ToRangeSet,
+};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashSet, fmt};

 use crate::{
    connection::TranscriptLength,
-    hash::HashAlgId,
+    display::FmtRangeSet,
+    hash::{HashAlgId, HashProvider},
    transcript::{
        commit::{TranscriptCommitment, TranscriptCommitmentKind},
-        encoding::{EncodingProof, EncodingProofError, EncodingTree},
        hash::{hash_plaintext, PlaintextHash, PlaintextHashSecret},
-        Direction, Idx, PartialTranscript, Transcript, TranscriptSecret,
+        Direction, PartialTranscript, RangeSet, Transcript, TranscriptSecret,
    },
-    CryptoProvider,
 };

 /// Default commitment kinds in order of preference for building transcript
@@ -22,14 +25,18 @@ const DEFAULT_COMMITMENT_KINDS: &[TranscriptCommitmentKind] = &[
    TranscriptCommitmentKind::Hash {
        alg: HashAlgId::SHA256,
    },
-    TranscriptCommitmentKind::Encoding,
+    TranscriptCommitmentKind::Hash {
+        alg: HashAlgId::BLAKE3,
+    },
+    TranscriptCommitmentKind::Hash {
+        alg: HashAlgId::KECCAK256,
+    },
 ];

 /// Proof of the contents of a transcript.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct TranscriptProof {
    transcript: PartialTranscript,
-    encoding_proof: Option<EncodingProof>,
    hash_secrets: Vec<PlaintextHashSecret>,
 }

@@ -42,27 +49,19 @@ impl TranscriptProof {
    ///
    /// # Arguments
    ///
-    /// * `provider` - The crypto provider to use for verification.
-    /// * `attestation_body` - The attestation body to verify against.
+    /// * `provider` - The hash provider to use for verification.
+    /// * `length` - The transcript length.
+    /// * `commitments` - The commitments to verify against.
    pub fn verify_with_provider<'a>(
        self,
-        provider: &CryptoProvider,
+        provider: &HashProvider,
        length: &TranscriptLength,
        commitments: impl IntoIterator<Item = &'a TranscriptCommitment>,
    ) -> Result<PartialTranscript, TranscriptProofError> {
-        let mut encoding_commitment = None;
        let mut hash_commitments = HashSet::new();
        // Index commitments.
        for commitment in commitments {
            match commitment {
-                TranscriptCommitment::Encoding(commitment) => {
-                    if encoding_commitment.replace(commitment).is_some() {
-                        return Err(TranscriptProofError::new(
-                            ErrorKind::Encoding,
-                            "multiple encoding commitments are present.",
-                        ));
-                    }
-                }
                TranscriptCommitment::Hash(plaintext_hash) => {
                    hash_commitments.insert(plaintext_hash);
                }
@@ -78,28 +77,8 @@ impl TranscriptProof {
            ));
        }

-        let mut total_auth_sent = Idx::default();
-        let mut total_auth_recv = Idx::default();
-
-        // Verify encoding proof.
-        if let Some(proof) = self.encoding_proof {
-            let commitment = encoding_commitment.ok_or_else(|| {
-                TranscriptProofError::new(
-                    ErrorKind::Encoding,
-                    "contains an encoding proof but missing encoding commitment",
-                )
-            })?;
-
-            let (auth_sent, auth_recv) = proof.verify_with_provider(
-                provider,
-                commitment,
-                self.transcript.sent_unsafe(),
-                self.transcript.received_unsafe(),
-            )?;
-
-            total_auth_sent.union_mut(&auth_sent);
-            total_auth_recv.union_mut(&auth_recv);
-        }
+        let mut total_auth_sent = RangeSet::default();
+        let mut total_auth_recv = RangeSet::default();

        let mut buffer = Vec::new();
        for PlaintextHashSecret {
@@ -109,7 +88,7 @@ impl TranscriptProof {
            blinder,
        } in self.hash_secrets
        {
-            let hasher = provider.hash.get(&alg).map_err(|_| {
+            let hasher = provider.get(&alg).map_err(|_| {
                TranscriptProofError::new(
                    ErrorKind::Hash,
                    format!("hash opening has unknown algorithm: {alg}"),
@@ -121,7 +100,7 @@ impl TranscriptProof {
                Direction::Received => (self.transcript.received_unsafe(), &mut total_auth_recv),
            };

-            if idx.end() > plaintext.len() {
+            if idx.end().unwrap_or(0) > plaintext.len() {
                return Err(TranscriptProofError::new(
                    ErrorKind::Hash,
                    "hash opening index is out of bounds",
@@ -129,7 +108,7 @@ impl TranscriptProof {
            }

            buffer.clear();
-            for range in idx.iter_ranges() {
+            for range in idx.iter() {
                buffer.extend_from_slice(&plaintext[range]);
            }

@@ -184,7 +163,6 @@ impl TranscriptProofError {

 #[derive(Debug)]
 enum ErrorKind {
-    Encoding,
    Hash,
    Proof,
 }
@@ -194,37 +172,30 @@ impl fmt::Display for TranscriptProofError {
        f.write_str("transcript proof error: ")?;

        match self.kind {
-            ErrorKind::Encoding => f.write_str("encoding error")?,
            ErrorKind::Hash => f.write_str("hash error")?,
            ErrorKind::Proof => f.write_str("proof error")?,
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
    }
 }

-impl From<EncodingProofError> for TranscriptProofError {
-    fn from(e: EncodingProofError) -> Self {
-        TranscriptProofError::new(ErrorKind::Encoding, e)
-    }
-}
-
 /// Union of ranges to reveal.
 #[derive(Clone, Debug, PartialEq)]
 struct QueryIdx {
-    sent: Idx,
-    recv: Idx,
+    sent: RangeSet<usize>,
+    recv: RangeSet<usize>,
 }

 impl QueryIdx {
    fn new() -> Self {
        Self {
-            sent: Idx::empty(),
-            recv: Idx::empty(),
+            sent: RangeSet::default(),
+            recv: RangeSet::default(),
        }
    }

@@ -232,7 +203,7 @@ impl QueryIdx {
        self.sent.is_empty() && self.recv.is_empty()
    }

-    fn union(&mut self, direction: &Direction, other: &Idx) {
+    fn union(&mut self, direction: &Direction, other: &RangeSet<usize>) {
        match direction {
            Direction::Sent => self.sent.union_mut(other),
            Direction::Received => self.recv.union_mut(other),
@@ -242,7 +213,12 @@ impl QueryIdx {

 impl std::fmt::Display for QueryIdx {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "sent: {}, received: {}", self.sent, self.recv)
+        write!(
+            f,
+            "sent: {}, received: {}",
+            FmtRangeSet(&self.sent),
+            FmtRangeSet(&self.recv)
+        )
    }
 }

@@ -252,31 +228,24 @@ pub struct TranscriptProofBuilder<'a> {
    /// Commitment kinds in order of preference for building transcript proofs.
    commitment_kinds: Vec<TranscriptCommitmentKind>,
    transcript: &'a Transcript,
-    encoding_tree: Option<&'a EncodingTree>,
    hash_secrets: Vec<&'a PlaintextHashSecret>,
-    committed_sent: Idx,
-    committed_recv: Idx,
+    committed_sent: RangeSet<usize>,
+    committed_recv: RangeSet<usize>,
    query_idx: QueryIdx,
 }

 impl<'a> TranscriptProofBuilder<'a> {
    /// Creates a new proof builder.
-    pub(crate) fn new(
+    pub fn new(
        transcript: &'a Transcript,
        secrets: impl IntoIterator<Item = &'a TranscriptSecret>,
    ) -> Self {
-        let mut committed_sent = Idx::empty();
-        let mut committed_recv = Idx::empty();
+        let mut committed_sent = RangeSet::default();
+        let mut committed_recv = RangeSet::default();

-        let mut encoding_tree = None;
        let mut hash_secrets = Vec::new();
        for secret in secrets {
            match secret {
-                TranscriptSecret::Encoding(tree) => {
-                    committed_sent.union_mut(tree.idx(Direction::Sent));
-                    committed_recv.union_mut(tree.idx(Direction::Received));
-                    encoding_tree = Some(tree);
-                }
                TranscriptSecret::Hash(hash) => {
                    match hash.direction {
                        Direction::Sent => committed_sent.union_mut(&hash.idx),
@@ -290,7 +259,6 @@ impl<'a> TranscriptProofBuilder<'a> {
        Self {
            commitment_kinds: DEFAULT_COMMITMENT_KINDS.to_vec(),
            transcript,
-            encoding_tree,
            hash_secrets,
            committed_sent,
            committed_recv,
@@ -324,15 +292,15 @@ impl<'a> TranscriptProofBuilder<'a> {
        ranges: &dyn ToRangeSet<usize>,
        direction: Direction,
    ) -> Result<&mut Self, TranscriptProofBuilderError> {
-        let idx = Idx::new(ranges.to_range_set());
+        let idx = ranges.to_range_set();

-        if idx.end() > self.transcript.len_of_direction(direction) {
+        if idx.end().unwrap_or(0) > self.transcript.len_of_direction(direction) {
            return Err(TranscriptProofBuilderError::new(
                BuilderErrorKind::Index,
                format!(
                    "range is out of bounds of the transcript ({}): {} > {}",
                    direction,
-                    idx.end(),
+                    idx.end().unwrap_or(0),
                    self.transcript.len_of_direction(direction)
                ),
            ));
@@ -346,10 +314,13 @@ impl<'a> TranscriptProofBuilder<'a> {
        if idx.is_subset(committed) {
            self.query_idx.union(&direction, &idx);
        } else {
-            let missing = idx.difference(committed);
+            let missing = idx.difference(committed).into_set();
            return Err(TranscriptProofBuilderError::new(
                BuilderErrorKind::MissingCommitment,
-                format!("commitment is missing for ranges in {direction} transcript: {missing}"),
+                format!(
+                    "commitment is missing for ranges in {direction} transcript: {}",
+                    FmtRangeSet(&missing)
+                ),
            ));
        }
        Ok(self)
@@ -385,7 +356,6 @@ impl<'a> TranscriptProofBuilder<'a> {
            transcript: self
                .transcript
                .to_partial(self.query_idx.sent.clone(), self.query_idx.recv.clone()),
-            encoding_proof: None,
            hash_secrets: Vec::new(),
        };
        let mut uncovered_query_idx = self.query_idx.clone();
@@ -397,68 +367,24 @@ impl<'a> TranscriptProofBuilder<'a> {
            // self.commitment_kinds.
            if let Some(kind) = commitment_kinds_iter.next() {
                match kind {
-                    TranscriptCommitmentKind::Encoding => {
-                        let Some(encoding_tree) = self.encoding_tree else {
-                            // Proceeds to the next preferred commitment kind if encoding tree is
-                            // not available.
-                            continue;
-                        };
-
-                        let (sent_dir_idxs, sent_uncovered) =
-                            uncovered_query_idx.sent.as_range_set().cover_by(
-                                encoding_tree
-                                    .transcript_indices()
-                                    .filter(|(dir, _)| *dir == Direction::Sent),
-                                |(_, idx)| &idx.0,
-                            );
-                        // Uncovered ranges will be checked with ranges of the next
-                        // preferred commitment kind.
-                        uncovered_query_idx.sent = Idx(sent_uncovered);
-
-                        let (recv_dir_idxs, recv_uncovered) =
-                            uncovered_query_idx.recv.as_range_set().cover_by(
-                                encoding_tree
-                                    .transcript_indices()
-                                    .filter(|(dir, _)| *dir == Direction::Received),
-                                |(_, idx)| &idx.0,
-                            );
-                        uncovered_query_idx.recv = Idx(recv_uncovered);
-
-                        let dir_idxs = sent_dir_idxs
-                            .into_iter()
-                            .chain(recv_dir_idxs)
-                            .collect::<Vec<_>>();
-
-                        // Skip proof generation if there are no committed ranges that can cover the
-                        // query ranges.
-                        if !dir_idxs.is_empty() {
-                            transcript_proof.encoding_proof = Some(
-                                encoding_tree
-                                    .proof(dir_idxs.into_iter())
-                                    .expect("subsequences were checked to be in tree"),
-                            );
-                        }
-                    }
                    TranscriptCommitmentKind::Hash { alg } => {
-                        let (sent_hashes, sent_uncovered) =
-                            uncovered_query_idx.sent.as_range_set().cover_by(
-                                self.hash_secrets.iter().filter(|hash| {
-                                    hash.direction == Direction::Sent && &hash.alg == alg
-                                }),
-                                |hash| &hash.idx.0,
-                            );
+                        let (sent_hashes, sent_uncovered) = uncovered_query_idx.sent.cover_by(
+                            self.hash_secrets.iter().filter(|hash| {
+                                hash.direction == Direction::Sent && &hash.alg == alg
+                            }),
+                            |hash| &hash.idx,
+                        );
                        // Uncovered ranges will be checked with ranges of the next
                        // preferred commitment kind.
-                        uncovered_query_idx.sent = Idx(sent_uncovered);
+                        uncovered_query_idx.sent = sent_uncovered;

-                        let (recv_hashes, recv_uncovered) =
-                            uncovered_query_idx.recv.as_range_set().cover_by(
-                                self.hash_secrets.iter().filter(|hash| {
-                                    hash.direction == Direction::Received && &hash.alg == alg
-                                }),
-                                |hash| &hash.idx.0,
-                            );
-                        uncovered_query_idx.recv = Idx(recv_uncovered);
+                        let (recv_hashes, recv_uncovered) = uncovered_query_idx.recv.cover_by(
+                            self.hash_secrets.iter().filter(|hash| {
+                                hash.direction == Direction::Received && &hash.alg == alg
+                            }),
+                            |hash| &hash.idx,
+                        );
+                        uncovered_query_idx.recv = recv_uncovered;

                        transcript_proof.hash_secrets.extend(
                            sent_hashes
@@ -546,14 +472,13 @@ impl fmt::Display for TranscriptProofBuilderError {
            BuilderErrorKind::Index => f.write_str("index error")?,
            BuilderErrorKind::MissingCommitment => f.write_str("commitment error")?,
            BuilderErrorKind::Cover { uncovered, kinds } => f.write_str(&format!(
-                "unable to cover the following ranges in transcript using available {:?} commitments: {uncovered}",
-                kinds
+                "unable to cover the following ranges in transcript using available {kinds:?} commitments: {uncovered}"
            ))?,
            BuilderErrorKind::NotSupported => f.write_str("not supported")?,
        }

        if let Some(source) = &self.source {
-            write!(f, " caused by: {}", source)?;
+            write!(f, " caused by: {source}")?;
        }

        Ok(())
@@ -564,47 +489,14 @@ impl fmt::Display for TranscriptProofBuilderError {
 #[cfg(test)]
 mod tests {
    use rand::{Rng, SeedableRng};
-    use rangeset::RangeSet;
+    use rangeset::prelude::*;
    use rstest::rstest;
    use tlsn_data_fixtures::http::{request::GET_WITH_HEADER, response::OK_JSON};

-    use crate::{
-        fixtures::{encoding_provider, request_fixture, ConnectionFixture, RequestFixture},
-        hash::{Blake3, Blinder, HashAlgId},
-        transcript::TranscriptCommitConfigBuilder,
-    };
+    use crate::hash::{Blinder, HashAlgId};

    use super::*;

-    #[rstest]
-    fn test_verify_missing_encoding_commitment_root() {
-        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);
-        let connection = ConnectionFixture::tlsnotary(transcript.length());
-
-        let RequestFixture { encoding_tree, .. } = request_fixture(
-            transcript.clone(),
-            encoding_provider(GET_WITH_HEADER, OK_JSON),
-            connection.clone(),
-            Blake3::default(),
-            Vec::new(),
-        );
-
-        let secrets = vec![TranscriptSecret::Encoding(encoding_tree)];
-        let mut builder = TranscriptProofBuilder::new(&transcript, &secrets);
-
-        builder.reveal_recv(&(0..transcript.len().1)).unwrap();
-
-        let transcript_proof = builder.build().unwrap();
-
-        let provider = CryptoProvider::default();
-        let err = transcript_proof
-            .verify_with_provider(&provider, &transcript.length(), &[])
-            .err()
-            .unwrap();
-
-        assert!(matches!(err.kind, ErrorKind::Encoding));
-    }
-
    #[rstest]
    fn test_reveal_range_out_of_bounds() {
        let transcript = Transcript::new(
@@ -624,7 +516,7 @@ mod tests {
    }

    #[rstest]
-    fn test_reveal_missing_encoding_tree() {
+    fn test_reveal_missing_commitment() {
        let transcript = Transcript::new(
            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
            [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11],
@@ -636,16 +528,18 @@ mod tests {
    }

    #[rstest]
-    fn test_reveal_with_hash_commitment() {
+    #[case::sha256(HashAlgId::SHA256)]
+    #[case::blake3(HashAlgId::BLAKE3)]
+    #[case::keccak256(HashAlgId::KECCAK256)]
+    fn test_reveal_with_hash_commitment(#[case] alg: HashAlgId) {
        let mut rng = rand::rngs::StdRng::seed_from_u64(0);
-        let provider = CryptoProvider::default();
+        let provider = HashProvider::default();
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);

        let direction = Direction::Sent;
-        let idx = Idx::new(0..10);
+        let idx = RangeSet::from(0..10);
        let blinder: Blinder = rng.random();
-        let alg = HashAlgId::SHA256;
-        let hasher = provider.hash.get(&alg).unwrap();
+        let hasher = provider.get(&alg).unwrap();

        let commitment = PlaintextHash {
            direction,
@@ -682,16 +576,18 @@ mod tests {
    }

    #[rstest]
-    fn test_reveal_with_inconsistent_hash_commitment() {
+    #[case::sha256(HashAlgId::SHA256)]
+    #[case::blake3(HashAlgId::BLAKE3)]
+    #[case::keccak256(HashAlgId::KECCAK256)]
+    fn test_reveal_with_inconsistent_hash_commitment(#[case] alg: HashAlgId) {
        let mut rng = rand::rngs::StdRng::seed_from_u64(0);
-        let provider = CryptoProvider::default();
+        let provider = HashProvider::default();
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);

        let direction = Direction::Sent;
-        let idx = Idx::new(0..10);
+        let idx = RangeSet::from(0..10);
        let blinder: Blinder = rng.random();
-        let alg = HashAlgId::SHA256;
-        let hasher = provider.hash.get(&alg).unwrap();
+        let hasher = provider.get(&alg).unwrap();

        let commitment = PlaintextHash {
            direction,
@@ -733,24 +629,19 @@ mod tests {
            TranscriptCommitmentKind::Hash {
                alg: HashAlgId::SHA256,
            },
-            TranscriptCommitmentKind::Encoding,
            TranscriptCommitmentKind::Hash {
                alg: HashAlgId::SHA256,
            },
            TranscriptCommitmentKind::Hash {
                alg: HashAlgId::SHA256,
            },
-            TranscriptCommitmentKind::Encoding,
        ]);

        assert_eq!(
            builder.commitment_kinds,
-            vec![
-                TranscriptCommitmentKind::Hash {
-                    alg: HashAlgId::SHA256
-                },
-                TranscriptCommitmentKind::Encoding
-            ]
+            vec![TranscriptCommitmentKind::Hash {
+                alg: HashAlgId::SHA256
+            },]
        );
    }

@@ -760,7 +651,7 @@ mod tests {
        RangeSet::from([0..10, 12..30]),
        true,
    )]
-    #[case::reveal_all_rangesets_with_superset_ranges(
+    #[case::reveal_all_rangesets_with_single_superset_range(
        vec![RangeSet::from([0..1]), RangeSet::from([1..2, 8..9]), RangeSet::from([2..4, 6..8]), RangeSet::from([2..3, 6..7]), RangeSet::from([9..12])],
        RangeSet::from([0..4, 6..9]),
        true,
@@ -791,29 +682,30 @@ mod tests {
        false,
    )]
    #[allow(clippy::single_range_in_vec_init)]
-    fn test_reveal_mutliple_rangesets_with_one_rangeset(
+    fn test_reveal_multiple_rangesets_with_one_rangeset(
        #[case] commit_recv_rangesets: Vec<RangeSet<usize>>,
        #[case] reveal_recv_rangeset: RangeSet<usize>,
        #[case] success: bool,
    ) {
+        use rand::{Rng, SeedableRng};
+
+        let mut rng = rand::rngs::StdRng::seed_from_u64(0);
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);

-        // Encoding commitment kind
-        let mut transcript_commitment_builder = TranscriptCommitConfigBuilder::new(&transcript);
+        // Create hash commitments for each rangeset
+        let mut secrets = Vec::new();
        for rangeset in commit_recv_rangesets.iter() {
-            transcript_commitment_builder.commit_recv(rangeset).unwrap();
+            let blinder: crate::hash::Blinder = rng.random();
+
+            let secret = PlaintextHashSecret {
+                direction: Direction::Received,
+                idx: rangeset.clone(),
+                alg: HashAlgId::BLAKE3,
+                blinder,
+            };
+            secrets.push(TranscriptSecret::Hash(secret));
        }

-        let transcripts_commitment_config = transcript_commitment_builder.build().unwrap();
-
-        let encoding_tree = EncodingTree::new(
-            &Blake3::default(),
-            transcripts_commitment_config.iter_encoding(),
-            &encoding_provider(GET_WITH_HEADER, OK_JSON),
-        )
-        .unwrap();
-
-        let secrets = vec![TranscriptSecret::Encoding(encoding_tree)];
        let mut builder = TranscriptProofBuilder::new(&transcript, &secrets);

        if success {
@@ -866,27 +758,34 @@ mod tests {
        #[case] uncovered_sent_rangeset: RangeSet<usize>,
        #[case] uncovered_recv_rangeset: RangeSet<usize>,
    ) {
+        use rand::{Rng, SeedableRng};
+
+        let mut rng = rand::rngs::StdRng::seed_from_u64(0);
        let transcript = Transcript::new(GET_WITH_HEADER, OK_JSON);

-        // Encoding commitment kind
-        let mut transcript_commitment_builder = TranscriptCommitConfigBuilder::new(&transcript);
+        // Create hash commitments for each rangeset
+        let mut secrets = Vec::new();
        for rangeset in commit_sent_rangesets.iter() {
-            transcript_commitment_builder.commit_sent(rangeset).unwrap();
+            let blinder: crate::hash::Blinder = rng.random();
+            let secret = PlaintextHashSecret {
+                direction: Direction::Sent,
+                idx: rangeset.clone(),
+                alg: HashAlgId::BLAKE3,
+                blinder,
+            };
+            secrets.push(TranscriptSecret::Hash(secret));
        }
        for rangeset in commit_recv_rangesets.iter() {
-            transcript_commitment_builder.commit_recv(rangeset).unwrap();
+            let blinder: crate::hash::Blinder = rng.random();
+            let secret = PlaintextHashSecret {
+                direction: Direction::Received,
+                idx: rangeset.clone(),
+                alg: HashAlgId::BLAKE3,
+                blinder,
+            };
+            secrets.push(TranscriptSecret::Hash(secret));
        }

-        let transcripts_commitment_config = transcript_commitment_builder.build().unwrap();
-
-        let encoding_tree = EncodingTree::new(
-            &Blake3::default(),
-            transcripts_commitment_config.iter_encoding(),
-            &encoding_provider(GET_WITH_HEADER, OK_JSON),
-        )
-        .unwrap();
-
-        let secrets = vec![TranscriptSecret::Encoding(encoding_tree)];
        let mut builder = TranscriptProofBuilder::new(&transcript, &secrets);
        builder.reveal_sent(&reveal_sent_rangeset).unwrap();
        builder.reveal_recv(&reveal_recv_rangeset).unwrap();
@@ -898,13 +797,13 @@ mod tests {
            match kind {
                BuilderErrorKind::Cover { uncovered, .. } => {
                    if !uncovered_sent_rangeset.is_empty() {
-                        assert_eq!(uncovered.sent, Idx(uncovered_sent_rangeset));
+                        assert_eq!(uncovered.sent, uncovered_sent_rangeset);
                    }
                    if !uncovered_recv_rangeset.is_empty() {
-                        assert_eq!(uncovered.recv, Idx(uncovered_recv_rangeset));
+                        assert_eq!(uncovered.recv, uncovered_recv_rangeset);
                    }
                }
-                _ => panic!("unexpected error kind: {:?}", kind),
+                _ => panic!("unexpected error kind: {kind:?}"),
            }
        }
    }
--- a/crates/core/src/transcript/tls.rs
+++ b/crates/core/src/transcript/tls.rs
@@ -0,0 +1,371 @@
+//! TLS transcript.
+
+use crate::{
+    connection::{
+        CertBinding, CertBindingV1_2, ServerEphemKey, ServerSignature, TlsVersion, VerifyData,
+    },
+    transcript::{Direction, Transcript},
+    webpki::CertificateDer,
+};
+use tls_core::msgs::{
+    alert::AlertMessagePayload,
+    codec::{Codec, Reader},
+    enums::{AlertDescription, ProtocolVersion},
+    handshake::{HandshakeMessagePayload, HandshakePayload},
+};
+
+/// TLS record content type.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub enum ContentType {
+    /// Change cipher spec protocol.
+    ChangeCipherSpec,
+    /// Alert protocol.
+    Alert,
+    /// Handshake protocol.
+    Handshake,
+    /// Application data protocol.
+    ApplicationData,
+    /// Heartbeat protocol.
+    Heartbeat,
+    /// Unknown protocol.
+    Unknown(u8),
+}
+
+impl From<ContentType> for tls_core::msgs::enums::ContentType {
+    fn from(content_type: ContentType) -> Self {
+        match content_type {
+            ContentType::ChangeCipherSpec => tls_core::msgs::enums::ContentType::ChangeCipherSpec,
+            ContentType::Alert => tls_core::msgs::enums::ContentType::Alert,
+            ContentType::Handshake => tls_core::msgs::enums::ContentType::Handshake,
+            ContentType::ApplicationData => tls_core::msgs::enums::ContentType::ApplicationData,
+            ContentType::Heartbeat => tls_core::msgs::enums::ContentType::Heartbeat,
+            ContentType::Unknown(id) => tls_core::msgs::enums::ContentType::Unknown(id),
+        }
+    }
+}
+
+impl From<tls_core::msgs::enums::ContentType> for ContentType {
+    fn from(content_type: tls_core::msgs::enums::ContentType) -> Self {
+        match content_type {
+            tls_core::msgs::enums::ContentType::ChangeCipherSpec => ContentType::ChangeCipherSpec,
+            tls_core::msgs::enums::ContentType::Alert => ContentType::Alert,
+            tls_core::msgs::enums::ContentType::Handshake => ContentType::Handshake,
+            tls_core::msgs::enums::ContentType::ApplicationData => ContentType::ApplicationData,
+            tls_core::msgs::enums::ContentType::Heartbeat => ContentType::Heartbeat,
+            tls_core::msgs::enums::ContentType::Unknown(id) => ContentType::Unknown(id),
+        }
+    }
+}
+
+/// A transcript of TLS records sent and received by the prover.
+#[derive(Debug, Clone)]
+pub struct TlsTranscript {
+    time: u64,
+    version: TlsVersion,
+    server_cert_chain: Option<Vec<CertificateDer>>,
+    server_signature: Option<ServerSignature>,
+    certificate_binding: CertBinding,
+    sent: Vec<Record>,
+    recv: Vec<Record>,
+}
+
+impl TlsTranscript {
+    /// Creates a new TLS transcript.
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        time: u64,
+        version: TlsVersion,
+        server_cert_chain: Option<Vec<CertificateDer>>,
+        server_signature: Option<ServerSignature>,
+        certificate_binding: CertBinding,
+        verify_data: VerifyData,
+        sent: Vec<Record>,
+        recv: Vec<Record>,
+    ) -> Result<Self, TlsTranscriptError> {
+        let mut sent_iter = sent.iter();
+        let mut recv_iter = recv.iter();
+
+        // Make sure the client finished verify data message was sent first.
+        if let Some(record) = sent_iter.next() {
+            let payload = record
+                .plaintext
+                .as_ref()
+                .ok_or(TlsTranscriptError::validation(
+                    "client finished message was hidden from the follower",
+                ))?;
+
+            let mut reader = Reader::init(payload);
+            let payload =
+                HandshakeMessagePayload::read_version(&mut reader, ProtocolVersion::TLSv1_2)
+                    .ok_or(TlsTranscriptError::validation(
+                        "first record sent was not a handshake message",
+                    ))?;
+
+            let HandshakePayload::Finished(vd) = payload.payload else {
+                return Err(TlsTranscriptError::validation(
+                    "first record sent was not a client finished message",
+                ));
+            };
+
+            if vd.0 != verify_data.client_finished {
+                return Err(TlsTranscriptError::validation(
+                    "inconsistent client finished verify data",
+                ));
+            }
+        } else {
+            return Err(TlsTranscriptError::validation(
+                "client finished was not sent",
+            ));
+        }
+
+        // Make sure the server finished verify data message was received first.
+        if let Some(record) = recv_iter.next() {
+            let payload = record
+                .plaintext
+                .as_ref()
+                .ok_or(TlsTranscriptError::validation(
+                    "server finished message was hidden from the follower",
+                ))?;
+
+            let mut reader = Reader::init(payload);
+            let payload =
+                HandshakeMessagePayload::read_version(&mut reader, ProtocolVersion::TLSv1_2)
+                    .ok_or(TlsTranscriptError::validation(
+                        "first record received was not a handshake message",
+                    ))?;
+
+            let HandshakePayload::Finished(vd) = payload.payload else {
+                return Err(TlsTranscriptError::validation(
+                    "first record received was not a server finished message",
+                ));
+            };
+
+            if vd.0 != verify_data.server_finished {
+                return Err(TlsTranscriptError::validation(
+                    "inconsistent server finished verify data",
+                ));
+            }
+        } else {
+            return Err(TlsTranscriptError::validation(
+                "server finished was not received",
+            ));
+        }
+
+        // Verify last record sent was either application data or close notify.
+        if let Some(record) = sent_iter.next_back() {
+            match record.typ {
+                ContentType::ApplicationData => {}
+                ContentType::Alert => {
+                    // Ensure the alert is a close notify.
+                    let payload =
+                        record
+                            .plaintext
+                            .as_ref()
+                            .ok_or(TlsTranscriptError::validation(
+                                "alert content was hidden from the follower",
+                            ))?;
+
+                    let mut reader = Reader::init(payload);
+                    let payload = AlertMessagePayload::read(&mut reader).ok_or(
+                        TlsTranscriptError::validation("alert message was malformed"),
+                    )?;
+
+                    let AlertDescription::CloseNotify = payload.description else {
+                        return Err(TlsTranscriptError::validation(
+                            "sent alert that is not close notify",
+                        ));
+                    };
+                }
+                typ => {
+                    return Err(TlsTranscriptError::validation(format!(
+                        "sent unexpected record content type: {typ:?}"
+                    )))
+                }
+            }
+        }
+
+        // Verify last record received was either application data or close notify.
+        if let Some(record) = recv_iter.next_back() {
+            match record.typ {
+                ContentType::ApplicationData => {}
+                ContentType::Alert => {
+                    // Ensure the alert is a close notify.
+                    let payload =
+                        record
+                            .plaintext
+                            .as_ref()
+                            .ok_or(TlsTranscriptError::validation(
+                                "alert content was hidden from the follower",
+                            ))?;
+
+                    let mut reader = Reader::init(payload);
+                    let payload = AlertMessagePayload::read(&mut reader).ok_or(
+                        TlsTranscriptError::validation("alert message was malformed"),
+                    )?;
+
+                    let AlertDescription::CloseNotify = payload.description else {
+                        return Err(TlsTranscriptError::validation(
+                            "received alert that is not close notify",
+                        ));
+                    };
+                }
+                typ => {
+                    return Err(TlsTranscriptError::validation(format!(
+                        "received unexpected record content type: {typ:?}"
+                    )))
+                }
+            }
+        }
+
+        // Ensure all other records were application data.
+        for record in sent_iter {
+            if record.typ != ContentType::ApplicationData {
+                return Err(TlsTranscriptError::validation(format!(
+                    "sent unexpected record content type: {:?}",
+                    record.typ
+                )));
+            }
+        }
+
+        for record in recv_iter {
+            if record.typ != ContentType::ApplicationData {
+                return Err(TlsTranscriptError::validation(format!(
+                    "received unexpected record content type: {:?}",
+                    record.typ
+                )));
+            }
+        }
+
+        Ok(Self {
+            time,
+            version,
+            server_cert_chain,
+            server_signature,
+            certificate_binding,
+            sent,
+            recv,
+        })
+    }
+
+    /// Returns the start time of the connection.
+    pub fn time(&self) -> u64 {
+        self.time
+    }
+
+    /// Returns the TLS protocol version.
+    pub fn version(&self) -> &TlsVersion {
+        &self.version
+    }
+
+    /// Returns the server certificate chain.
+    pub fn server_cert_chain(&self) -> Option<&[CertificateDer]> {
+        self.server_cert_chain.as_deref()
+    }
+
+    /// Returns the server signature.
+    pub fn server_signature(&self) -> Option<&ServerSignature> {
+        self.server_signature.as_ref()
+    }
+
+    /// Returns the server ephemeral key used in the TLS handshake.
+    pub fn server_ephemeral_key(&self) -> &ServerEphemKey {
+        match &self.certificate_binding {
+            CertBinding::V1_2(CertBindingV1_2 {
+                server_ephemeral_key,
+                ..
+            }) => server_ephemeral_key,
+        }
+    }
+
+    /// Returns the certificate binding data.
+    pub fn certificate_binding(&self) -> &CertBinding {
+        &self.certificate_binding
+    }
+
+    /// Returns the sent records.
+    pub fn sent(&self) -> &[Record] {
+        &self.sent
+    }
+
+    /// Returns the received records.
+    pub fn recv(&self) -> &[Record] {
+        &self.recv
+    }
+
+    /// Returns the application data transcript.
+    pub fn to_transcript(&self) -> Result<Transcript, TlsTranscriptError> {
+        let mut sent = Vec::new();
+        let mut recv = Vec::new();
+
+        for record in self
+            .sent
+            .iter()
+            .filter(|record| record.typ == ContentType::ApplicationData)
+        {
+            let plaintext = record
+                .plaintext
+                .as_ref()
+                .ok_or(ErrorRepr::Incomplete {
+                    direction: Direction::Sent,
+                    seq: record.seq,
+                })?
+                .clone();
+            sent.extend_from_slice(&plaintext);
+        }
+
+        for record in self
+            .recv
+            .iter()
+            .filter(|record| record.typ == ContentType::ApplicationData)
+        {
+            let plaintext = record
+                .plaintext
+                .as_ref()
+                .ok_or(ErrorRepr::Incomplete {
+                    direction: Direction::Received,
+                    seq: record.seq,
+                })?
+                .clone();
+            recv.extend_from_slice(&plaintext);
+        }
+
+        Ok(Transcript::new(sent, recv))
+    }
+}
+
+/// A TLS record.
+#[derive(Clone)]
+pub struct Record {
+    /// Sequence number.
+    pub seq: u64,
+    /// Content type.
+    pub typ: ContentType,
+    /// Plaintext.
+    pub plaintext: Option<Vec<u8>>,
+    /// Explicit nonce.
+    pub explicit_nonce: Vec<u8>,
+    /// Ciphertext.
+    pub ciphertext: Vec<u8>,
+    /// Tag.
+    pub tag: Option<Vec<u8>>,
+}
+
+opaque_debug::implement!(Record);
+
+#[derive(Debug, thiserror::Error)]
+#[error("TLS transcript error: {0}")]
+pub struct TlsTranscriptError(#[from] ErrorRepr);
+
+impl TlsTranscriptError {
+    fn validation(msg: impl Into<String>) -> Self {
+        Self(ErrorRepr::Validation(msg.into()))
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+enum ErrorRepr {
+    #[error("validation error: {0}")]
+    Validation(String),
+    #[error("incomplete transcript ({direction}): seq {seq}")]
+    Incomplete { direction: Direction, seq: u64 },
+}
--- a/crates/core/src/webpki.rs
+++ b/crates/core/src/webpki.rs
@@ -0,0 +1,187 @@
+//! Web PKI types.
+
+use std::time::Duration;
+
+use rustls_pki_types::{self as webpki_types, pem::PemObject};
+use serde::{Deserialize, Serialize};
+
+use crate::connection::ServerName;
+
+/// X.509 certificate, DER encoded.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CertificateDer(pub Vec<u8>);
+
+impl CertificateDer {
+    /// Creates a DER-encoded certificate from a PEM-encoded certificate.
+    pub fn from_pem_slice(pem: &[u8]) -> Result<Self, PemError> {
+        let der = webpki_types::CertificateDer::from_pem_slice(pem).map_err(|_| PemError {})?;
+
+        Ok(Self(der.to_vec()))
+    }
+}
+
+/// Private key, DER encoded.
+#[derive(Debug, Clone, zeroize::ZeroizeOnDrop, Serialize, Deserialize)]
+pub struct PrivateKeyDer(pub Vec<u8>);
+
+impl PrivateKeyDer {
+    /// Creates a DER-encoded private key from a PEM-encoded private key.
+    pub fn from_pem_slice(pem: &[u8]) -> Result<Self, PemError> {
+        let der = webpki_types::PrivateKeyDer::from_pem_slice(pem).map_err(|_| PemError {})?;
+
+        Ok(Self(der.secret_der().to_vec()))
+    }
+}
+
+/// PEM parsing error.
+#[derive(Debug, thiserror::Error)]
+#[error("failed to parse PEM object")]
+pub struct PemError {}
+
+/// Root certificate store.
+///
+/// This stores root certificates which are used to verify end-entity
+/// certificates presented by a TLS server.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RootCertStore {
+    /// Unvalidated DER-encoded X.509 root certificates.
+    pub roots: Vec<CertificateDer>,
+}
+
+impl RootCertStore {
+    /// Creates an empty root certificate store.
+    pub fn empty() -> Self {
+        Self { roots: Vec::new() }
+    }
+
+    /// Creates a root certificate store with Mozilla root certificates.
+    ///
+    /// These certificates are sourced from [`webpki-root-certs`](https://docs.rs/webpki-root-certs/latest/webpki_root_certs/). It is not recommended to use these unless the
+    /// application binary can be recompiled and deployed on-demand in the case
+    /// that the root certificates need to be updated.
+    #[cfg(feature = "mozilla-certs")]
+    pub fn mozilla() -> Self {
+        Self {
+            roots: webpki_root_certs::TLS_SERVER_ROOT_CERTS
+                .iter()
+                .map(|cert| CertificateDer(cert.to_vec()))
+                .collect(),
+        }
+    }
+}
+
+/// Server certificate verifier.
+#[derive(Debug)]
+pub struct ServerCertVerifier {
+    roots: Vec<webpki_types::TrustAnchor<'static>>,
+}
+
+impl ServerCertVerifier {
+    /// Creates a new server certificate verifier.
+    pub fn new(roots: &RootCertStore) -> Result<Self, ServerCertVerifierError> {
+        let roots = roots
+            .roots
+            .iter()
+            .map(|cert| {
+                webpki::anchor_from_trusted_cert(&webpki_types::CertificateDer::from(
+                    cert.0.as_slice(),
+                ))
+                .map(|anchor| anchor.to_owned())
+                .map_err(|err| ServerCertVerifierError::InvalidRootCertificate {
+                    cert: cert.clone(),
+                    reason: err.to_string(),
+                })
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok(Self { roots })
+    }
+
+    /// Creates a server certificate verifier with Mozilla root certificates.
+    ///
+    /// These certificates are sourced from [`webpki-root-certs`](https://docs.rs/webpki-root-certs/latest/webpki_root_certs/). It is not recommended to use these unless the
+    /// application binary can be recompiled and deployed on-demand in the case
+    /// that the root certificates need to be updated.
+    #[cfg(feature = "mozilla-certs")]
+    pub fn mozilla() -> Self {
+        Self {
+            roots: webpki_roots::TLS_SERVER_ROOTS.to_vec(),
+        }
+    }
+
+    /// Verifies the server certificate was valid at the given time of
+    /// presentation.
+    ///
+    /// # Arguments
+    ///
+    /// * `end_entity` - End-entity certificate to verify.
+    /// * `intermediates` - Intermediate certificates to a trust anchor.
+    /// * `server_name` - Server DNS name.
+    /// * `time` - Unix time the certificate was presented.
+    pub fn verify_server_cert(
+        &self,
+        end_entity: &CertificateDer,
+        intermediates: &[CertificateDer],
+        server_name: &ServerName,
+        time: u64,
+    ) -> Result<(), ServerCertVerifierError> {
+        let cert = webpki_types::CertificateDer::from(end_entity.0.as_slice());
+        let cert = webpki::EndEntityCert::try_from(&cert).map_err(|e| {
+            ServerCertVerifierError::InvalidEndEntityCertificate {
+                cert: end_entity.clone(),
+                reason: e.to_string(),
+            }
+        })?;
+        let intermediates = intermediates
+            .iter()
+            .map(|c| webpki_types::CertificateDer::from(c.0.as_slice()))
+            .collect::<Vec<_>>();
+        let server_name = server_name.to_webpki();
+        let time = webpki_types::UnixTime::since_unix_epoch(Duration::from_secs(time));
+
+        cert.verify_for_usage(
+            webpki::ALL_VERIFICATION_ALGS,
+            &self.roots,
+            &intermediates,
+            time,
+            webpki::KeyUsage::server_auth(),
+            None,
+            None,
+        )
+        .map(|_| ())
+        .map_err(|_| ServerCertVerifierError::InvalidPath)?;
+
+        cert.verify_is_valid_for_subject_name(&server_name)
+            .map_err(|_| ServerCertVerifierError::InvalidServerName)?;
+
+        Ok(())
+    }
+}
+
+/// Error for [`ServerCertVerifier`].
+#[derive(Debug, thiserror::Error)]
+#[error("server certificate verification failed: {0}")]
+pub enum ServerCertVerifierError {
+    /// Root certificate store contains invalid certificate.
+    #[error("root certificate store contains invalid certificate: {reason}")]
+    InvalidRootCertificate {
+        /// Invalid certificate.
+        cert: CertificateDer,
+        /// Reason for invalidity.
+        reason: String,
+    },
+    /// End-entity certificate is invalid.
+    #[error("end-entity certificate is invalid: {reason}")]
+    InvalidEndEntityCertificate {
+        /// Invalid certificate.
+        cert: CertificateDer,
+        /// Reason for invalidity.
+        reason: String,
+    },
+    /// Failed to verify certificate path to provided trust anchors.
+    #[error("failed to verify certificate path to provided trust anchors")]
+    InvalidPath,
+    /// Failed to verify certificate is valid for provided server name.
+    #[error("failed to verify certificate is valid for provided server name")]
+    InvalidServerName,
+}
--- a/crates/examples/.gitignore
+++ b/crates/examples/.gitignore
@@ -1,3 +1,2 @@
 // Ignore files from examples.
-*.tlsn
-*.sh
+*.tlsn
--- a/crates/examples/Cargo.toml
+++ b/crates/examples/Cargo.toml
@@ -8,31 +8,24 @@ version = "0.0.0"
 workspace = true

 [dependencies]
-notary-client = { workspace = true }
-notary-common = { workspace = true }
-tlsn-common = { workspace = true }
-tlsn-core = { workspace = true }
-tlsn-prover = { workspace = true }
-tlsn-verifier = { workspace = true }
+tlsn = { workspace = true }
 tlsn-formats = { workspace = true }
-tlsn-tls-core = { workspace = true }
 tls-server-fixture = { workspace = true }
 tlsn-server-fixture = { workspace = true }
 tlsn-server-fixture-certs = { workspace = true }
 spansy = { workspace = true }

-async-tungstenite = { workspace = true, features = ["tokio-runtime"] }
+anyhow = { workspace = true }
 bincode = { workspace = true }
 chrono = { workspace = true }
 clap = { version = "4.5", features = ["derive"] }
-dotenv = { version = "0.15.0" }
 futures = { workspace = true }
 http-body-util = { workspace = true }
 hex = { workspace = true }
 hyper = { workspace = true, features = ["client", "http1"] }
 hyper-util = { workspace = true, features = ["full"] }
 k256 = { workspace = true, features = ["ecdsa"] }
-rangeset = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tokio = { workspace = true, features = [
  "rt",
@@ -45,8 +38,17 @@ tokio = { workspace = true, features = [
 tokio-util = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-uuid = { workspace = true, features = ["v4", "fast-rng"] }
-ws_stream_tungstenite = { workspace = true, features = ["tokio_io"] }
+noir = { git = "https://github.com/zkmopro/noir-rs", tag = "v1.0.0-beta.8", features = [
+  "barretenberg",
+] }
+
+[[example]]
+name = "interactive"
+path = "interactive/interactive.rs"
+
+[[example]]
+name = "interactive_zk"
+path = "interactive_zk/interactive_zk.rs"

 [[example]]
 name = "attestation_prove"
@@ -59,11 +61,3 @@ path = "attestation/present.rs"
 [[example]]
 name = "attestation_verify"
 path = "attestation/verify.rs"
-
-[[example]]
-name = "interactive"
-path = "interactive/interactive.rs"
-
-[[example]]
-name = "plugin"
-path = "plugin/plugin.rs"
--- a/crates/examples/README.md
+++ b/crates/examples/README.md
@@ -4,5 +4,7 @@ This folder contains examples demonstrating how to use the TLSNotary protocol.

 * [Interactive](./interactive/README.md): Interactive Prover and Verifier session without a trusted notary.
 * [Attestation](./attestation/README.md): Performing a simple notarization with a trusted notary.
+* [Interactive_zk](./interactive_zk/README.md): Interactive Prover and Verifier session demonstrating zero-knowledge age verification using Noir.

-Refer to <https://docs.tlsnotary.org/quick_start/index.html> for a quick start guide to using TLSNotary with these examples.
+
+Refer to <https://tlsnotary.org/docs/quick_start> for a quick start guide to using TLSNotary with these examples.
--- a/crates/examples/attestation/README.md
+++ b/crates/examples/attestation/README.md
@@ -1,75 +1,81 @@
-## Simple Attestation Example: Notarize Public Data from example.com (Rust) <a name="rust-simple"></a>
+# Attestation Example

-This example demonstrates the simplest possible use case for TLSNotary. A Prover notarizes data from a local test server with a local Notary.

-**Overview**:
-1. Notarize a request and response from the test server and acquire an attestation of its content.
-2. Create a redacted, verifiable presentation using the attestation.
-3. Verify the presentation.
+This example demonstrates a **TLSNotary attestation workflow**: notarizing data from a server with a trusted third party (Notary), then creating verifiable presentations with selective disclosure of sensitive information to a Verifier.

-### 1. Notarize
+## 🔍 How It Works

-Before starting the notarization, set up the local test server and local notary.
-Run the following commands from the root of this repository (not from this example's folder):
+```mermaid
+sequenceDiagram
+    participant P as Prover
+    participant N as MPC-TLS<br/>Verifier
+    participant S as Server<br/>Fixture
+    participant V as Attestation<br/>Verifier

-1. Run the test server:
-    ```shell
-    RUST_LOG=info PORT=4000 cargo run --bin tlsn-server-fixture
-    ```
-2. Run the notary server:
-    ```shell
-    cargo run --release --bin notary-server
-    ```
-3. Run the prove example:
-    ```shell
-    SERVER_PORT=4000 cargo run --release --example attestation_prove
-    ```
+    Note over P,S: 1. Notarization Phase
+    P->>N: Establish MPC-TLS connection
+    P->>S: Request (MPC-TLS)
+    S->>P: Response (MPC-TLS)
+    N->>P: Issue signed attestation

-To see more details, run with additional debug information:
-```shell
-RUST_LOG=debug,yamux=info,uid_mux=info SERVER_PORT=4000 cargo run --release --example attestation_prove
+    Note over P: 2. Presentation Phase
+    P->>P: Create redacted presentation
+
+    Note over P,V: 3. Verification Phase
+    P->>V: Share presentation
+    V->>V: Verify attestation signature
 ```

-If notarization is successful, you should see the following output in the console:
-```log
-Starting an MPC TLS connection with the server
-Got a response from the server: 200 OK
-Notarization complete!
+### The Three-Step Process
+
+1. **🔐 Notarize**: Prover collaborates with Notary to create an authenticated TLS session and obtain a signed attestation
+2. **✂️ Present**: Prover creates a selective presentation, choosing which data to reveal or redact
+3. **✅ Verify**: Anyone can verify the presentation's authenticity using the Notary's public key
+
+## 🚀 Quick Start
+
+### Step 1: Notarize Data
+
+**Start the test server** (from repository root):
+```bash
+RUST_LOG=info PORT=4000 cargo run --bin tlsn-server-fixture
+```
+
+**Run the notarization** (in a new terminal):
+```bash
+RUST_LOG=info SERVER_PORT=4000 cargo run --release --example attestation_prove
+```
+
+**Expected output:**
+```
 Notarization completed successfully!
 The attestation has been written to `example-json.attestation.tlsn` and the corresponding secrets to `example-json.secrets.tlsn`.
 ```

-⚠️ Note: In this example, we run a local Notary server for demonstration purposes. In real-world applications, the Notary should be operated by a trusted third party. Refer to the [Notary Server Documentation](https://docs.tlsnotary.org/developers/notary_server.html) for more details on running a Notary server.
+### Step 2: Create Verifiable Presentation

-### 2. Build a Verifiable Presentation
-
-This step creates a verifiable presentation with optional redactions, which can be shared with any verifier.
-
-Run the present example:
-```shell
+**Generate a redacted presentation:**
+```bash
 cargo run --release --example attestation_present
 ```

-If successful, you’ll see this output in the console:
-
-```log
+**Expected output:**
+```
 Presentation built successfully!
 The presentation has been written to `example-json.presentation.tlsn`.
 ```

-You can create multiple presentations from the attestation and secrets in the notarization step, each with customized data redactions. You are invited to experiment!
+> 💡 **Tip**: You can create multiple presentations from the same attestation, each with different redactions!

-### 3. Verify the Presentation
+### Step 3: Verify the Presentation

-This step reads the presentation created above, verifies it, and prints the disclosed data to the console.
-
-Run the verify binary:
-```shell
+**Verify the presentation:**
+```bash
 cargo run --release --example attestation_verify
 ```

-Upon success, you should see output similar to:
-```log
+**Expected output:**
+```
 Verifying presentation with {key algorithm} key: { hex encoded key }

 **Ask yourself, do you trust this key?**
@@ -79,33 +85,80 @@ Successfully verified that the data below came from a session with test-server.i
 Note that the data which the Prover chose not to disclose are shown as X.

 Data sent:
-...
+
+GET /formats/json HTTP/1.1
+host: test-server.io
+accept: */*
+accept-encoding: identity
+connection: close
+user-agent: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+Data received:
+
+HTTP/1.1 200 OK
+content-type: application/json
+content-length: 722
+connection: close
+date: Mon, 08 Sep 2025 09:18:29 GMT
+
+XXXXXX1234567890XXXXXXXXXXXXXXXXXXXXXXXXJohn DoeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX1.2XX
 ```

-⚠️ The presentation includes a “verifying key,” which the Notary used when issuing the attestation. If you trust this key, you can trust the authenticity of the presented data.
+## 🎯 Use Cases & Examples

-### HTML
+### JSON Data (Default)
+Perfect for API responses, configuration data, or structured information:
+```bash
+# All three steps use JSON by default
+SERVER_PORT=4000 cargo run --release --example attestation_prove
+cargo run --release --example attestation_present
+cargo run --release --example attestation_verify
+```

-In the example above, we notarized a JSON response. TLSNotary also supports notarizing HTML content. To run an HTML example, use:
-
-```shell
-# notarize
+### HTML Content
+Ideal for web pages, forms, or any HTML-based data:
+```bash
+# Notarize HTML content
 SERVER_PORT=4000 cargo run --release --example attestation_prove -- html
-# present
 cargo run --release --example attestation_present -- html
-# verify
 cargo run --release --example attestation_verify -- html
 ```

-### Private Data
-
-The examples above demonstrate how to use TLSNotary with publicly accessible data. TLSNotary can also be utilized for private data that requires authentication. To access this data, you can add the necessary headers (such as an authentication token) or cookies to your request. To run an example that uses an authentication token, execute the following command:
-
-```shell
-# notarize
+### Authenticated/Private Data
+For APIs requiring authentication tokens, cookies, or private access:
+```bash
+# Notarize private data with authentication
 SERVER_PORT=4000 cargo run --release --example attestation_prove -- authenticated
-# present
 cargo run --release --example attestation_present -- authenticated
-# verify
 cargo run --release --example attestation_verify -- authenticated
-```
+```
+
+### Debug Mode
+
+For detailed logging and troubleshooting:
+```bash
+RUST_LOG=debug,yamux=info,uid_mux=info SERVER_PORT=4000 cargo run --release --example attestation_prove
+```
+
+### Generated Files
+
+After running the examples, you'll find:
+- **`*.attestation.tlsn`**: The cryptographically signed attestation from the Notary
+- **`*.secrets.tlsn`**: Cryptographic secrets needed to create presentations
+- **`*.presentation.tlsn`**: The verifiable presentation with your chosen redactions
+
+## 🔐 Security Considerations
+
+### Trust Model
+- ✅ **Notary Key**: The presentation includes the Notary's verifying key - The verifier must trust this key
+- ✅ **Data Authenticity**: Cryptographically guaranteed that data came from the specified server
+- ✅ **Tamper Evidence**: Any modification to the presentation will fail verification
+- ⚠️ **Notary Trust**: The verifier must trust the Notary not to collude with the Prover
+
+### Production Deployment
+- 🏭 **Independent Notary**: Use a trusted third-party Notary service (not a local one)
+- 🔒 **Key Management**: Implement proper Notary key distribution and verification
+- 📋 **Audit Trail**: Maintain logs of notarization and verification events
+- 🔄 **Key Rotation**: Plan for Notary key updates and migration
+
+> ⚠️ **Demo Notice**: This example uses a local test server and local Notary for demonstration. In production, use trusted third-party Notary services and real server endpoints.
--- a/crates/examples/attestation/present.rs
+++ b/crates/examples/attestation/present.rs
@@ -5,7 +5,7 @@
 use clap::Parser;
 use hyper::header;

-use tlsn_core::{attestation::Attestation, presentation::Presentation, CryptoProvider, Secrets};
+use tlsn::attestation::{presentation::Presentation, Attestation, CryptoProvider, Secrets};
 use tlsn_examples::ExampleType;
 use tlsn_formats::http::HttpTranscript;

--- a/crates/examples/attestation/prove.rs
+++ b/crates/examples/attestation/prove.rs
@@ -1,27 +1,45 @@
 // This example demonstrates how to use the Prover to acquire an attestation for
-// an HTTP request sent to example.com. The attestation and secrets are saved to
-// disk.
+// an HTTP request sent to a server fixture. The attestation and secrets are
+// saved to disk.

 use std::env;

+use anyhow::{anyhow, Result};
 use clap::Parser;
 use http_body_util::Empty;
 use hyper::{body::Bytes, Request, StatusCode};
 use hyper_util::rt::TokioIo;
 use spansy::Spanned;
+use tokio::{
+    io::{AsyncRead, AsyncWrite},
+    sync::oneshot::{self, Receiver, Sender},
+};
 use tokio_util::compat::{FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt};
-use tracing::debug;
+use tracing::info;

-use notary_client::{Accepted, NotarizationRequest, NotaryClient};
-use tls_core::verify::WebPkiVerifier;
-use tls_server_fixture::{CA_CERT_DER, SERVER_DOMAIN};
-use tlsn_common::config::ProtocolConfig;
-use tlsn_core::{request::RequestConfig, transcript::TranscriptCommitConfig, CryptoProvider};
+use tlsn::{
+    attestation::{
+        request::{Request as AttestationRequest, RequestConfig},
+        signing::Secp256k1Signer,
+        Attestation, AttestationConfig, CryptoProvider, Secrets,
+    },
+    config::{
+        prove::ProveConfig,
+        prover::ProverConfig,
+        tls::TlsClientConfig,
+        tls_commit::{mpc::MpcTlsConfig, TlsCommitConfig},
+        verifier::VerifierConfig,
+    },
+    connection::{ConnectionInfo, HandshakeData, ServerName, TranscriptLength},
+    prover::{state::Committed, Prover, ProverOutput},
+    transcript::{ContentType, TranscriptCommitConfig},
+    verifier::{Verifier, VerifierOutput},
+    webpki::{CertificateDer, PrivateKeyDer, RootCertStore},
+};
 use tlsn_examples::ExampleType;
 use tlsn_formats::http::{DefaultHttpCommitter, HttpCommit, HttpTranscript};
-use tlsn_prover::{Prover, ProverConfig, TlsConfig};
 use tlsn_server_fixture::DEFAULT_FIXTURE_PORT;
-use tlsn_server_fixture_certs::{CLIENT_CERT, CLIENT_KEY};
+use tlsn_server_fixture_certs::{CA_CERT_DER, CLIENT_CERT_DER, CLIENT_KEY_DER, SERVER_DOMAIN};

 // Setting of the application server.
 const USER_AGENT: &str = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36";
@@ -35,122 +53,103 @@ struct Args {
 }

 #[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args = Args::parse();
+async fn main() -> Result<()> {
+    tracing_subscriber::fmt::init();

+    let args = Args::parse();
    let (uri, extra_headers) = match args.example_type {
        ExampleType::Json => ("/formats/json", vec![]),
        ExampleType::Html => ("/formats/html", vec![]),
        ExampleType::Authenticated => ("/protected", vec![("Authorization", "random_auth_token")]),
    };

-    notarize(uri, extra_headers, &args.example_type).await
+    let (notary_socket, prover_socket) = tokio::io::duplex(1 << 23);
+    let (request_tx, request_rx) = oneshot::channel();
+    let (attestation_tx, attestation_rx) = oneshot::channel();
+
+    tokio::spawn(async move {
+        notary(notary_socket, request_rx, attestation_tx)
+            .await
+            .unwrap()
+    });
+
+    prover(
+        prover_socket,
+        request_tx,
+        attestation_rx,
+        uri,
+        extra_headers,
+        &args.example_type,
+    )
+    .await?;
+
+    Ok(())
 }

-async fn notarize(
+async fn prover<S: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
+    socket: S,
+    req_tx: Sender<AttestationRequest>,
+    resp_rx: Receiver<Attestation>,
    uri: &str,
    extra_headers: Vec<(&str, &str)>,
    example_type: &ExampleType,
-) -> Result<(), Box<dyn std::error::Error>> {
-    tracing_subscriber::fmt::init();
-
-    let notary_host: String = env::var("NOTARY_HOST").unwrap_or("127.0.0.1".into());
-    let notary_port: u16 = env::var("NOTARY_PORT")
-        .map(|port| port.parse().expect("port should be valid integer"))
-        .unwrap_or(7047);
+) -> Result<()> {
    let server_host: String = env::var("SERVER_HOST").unwrap_or("127.0.0.1".into());
    let server_port: u16 = env::var("SERVER_PORT")
        .map(|port| port.parse().expect("port should be valid integer"))
        .unwrap_or(DEFAULT_FIXTURE_PORT);

-    // Build a client to connect to the notary server.
-    let notary_client = NotaryClient::builder()
-        .host(notary_host)
-        .port(notary_port)
-        // WARNING: Always use TLS to connect to notary server, except if notary is running locally
-        // e.g. this example, hence `enable_tls` is set to False (else it always defaults to True).
-        .enable_tls(false)
-        .build()
-        .unwrap();
-
-    // Send requests for configuration and notarization to the notary server.
-    let notarization_request = NotarizationRequest::builder()
-        // We must configure the amount of data we expect to exchange beforehand, which will
-        // be preprocessed prior to the connection. Reducing these limits will improve
-        // performance.
-        .max_sent_data(tlsn_examples::MAX_SENT_DATA)
-        .max_recv_data(tlsn_examples::MAX_RECV_DATA)
-        .build()?;
-
-    let Accepted {
-        io: notary_connection,
-        id: _session_id,
-        ..
-    } = notary_client
-        .request_notarization(notarization_request)
-        .await
-        .expect("Could not connect to notary. Make sure it is running.");
-
-    // Create a crypto provider accepting the server-fixture's self-signed
-    // root certificate.
-    //
-    // This is only required for offline testing with the server-fixture. In
-    // production, use `CryptoProvider::default()` instead.
-    let mut root_store = tls_core::anchors::RootCertStore::empty();
-    root_store
-        .add(&tls_core::key::Certificate(CA_CERT_DER.to_vec()))
-        .unwrap();
-    let crypto_provider = CryptoProvider {
-        cert: WebPkiVerifier::new(root_store, None),
-        ..Default::default()
-    };
-
-    // Set up protocol configuration for prover.
-    let mut prover_config_builder = ProverConfig::builder();
-    prover_config_builder
-        .server_name(SERVER_DOMAIN)
-        .protocol_config(
-            ProtocolConfig::builder()
-                // We must configure the amount of data we expect to exchange beforehand, which will
-                // be preprocessed prior to the connection. Reducing these limits will improve
-                // performance.
-                .max_sent_data(tlsn_examples::MAX_SENT_DATA)
-                .max_recv_data(tlsn_examples::MAX_RECV_DATA)
-                .build()?,
-        )
-        .crypto_provider(crypto_provider);
-
-    // (Optional) Set up TLS client authentication if required by the server.
-    prover_config_builder.tls_config(
-        TlsConfig::builder()
-            .client_auth_pem((vec![CLIENT_CERT.to_vec()], CLIENT_KEY.to_vec()))
-            .unwrap()
-            .build()?,
-    );
-
-    let prover_config = prover_config_builder.build()?;
-
    // Create a new prover and perform necessary setup.
-    let prover = Prover::new(prover_config)
-        .setup(notary_connection.compat())
+    let prover = Prover::new(ProverConfig::builder().build()?)
+        .commit(
+            TlsCommitConfig::builder()
+                // Select the TLS commitment protocol.
+                .protocol(
+                    MpcTlsConfig::builder()
+                        // We must configure the amount of data we expect to exchange beforehand,
+                        // which will be preprocessed prior to the
+                        // connection. Reducing these limits will improve
+                        // performance.
+                        .max_sent_data(tlsn_examples::MAX_SENT_DATA)
+                        .max_recv_data(tlsn_examples::MAX_RECV_DATA)
+                        .build()?,
+                )
+                .build()?,
+            socket.compat(),
+        )
        .await?;

    // Open a TCP connection to the server.
    let client_socket = tokio::net::TcpStream::connect((server_host, server_port)).await?;

    // Bind the prover to the server connection.
-    // The returned `mpc_tls_connection` is an MPC TLS connection to the server: all
-    // data written to/read from it will be encrypted/decrypted using MPC with
-    // the notary.
-    let (mpc_tls_connection, prover_fut) = prover.connect(client_socket.compat()).await?;
-    let mpc_tls_connection = TokioIo::new(mpc_tls_connection.compat());
+    let (tls_connection, prover_fut) = prover
+        .connect(
+            TlsClientConfig::builder()
+                .server_name(ServerName::Dns(SERVER_DOMAIN.try_into()?))
+                // Create a root certificate store with the server-fixture's self-signed
+                // certificate. This is only required for offline testing with the
+                // server-fixture.
+                .root_store(RootCertStore {
+                    roots: vec![CertificateDer(CA_CERT_DER.to_vec())],
+                })
+                // (Optional) Set up TLS client authentication if required by the server.
+                .client_auth((
+                    vec![CertificateDer(CLIENT_CERT_DER.to_vec())],
+                    PrivateKeyDer(CLIENT_KEY_DER.to_vec()),
+                ))
+                .build()?,
+            client_socket.compat(),
+        )
+        .await?;
+    let tls_connection = TokioIo::new(tls_connection.compat());

    // Spawn the prover task to be run concurrently in the background.
    let prover_task = tokio::spawn(prover_fut);

    // Attach the hyper HTTP client to the connection.
    let (mut request_sender, connection) =
-        hyper::client::conn::http1::handshake(mpc_tls_connection).await?;
+        hyper::client::conn::http1::handshake(tls_connection).await?;

    // Spawn the HTTP task to be run concurrently in the background.
    tokio::spawn(connection);
@@ -171,17 +170,17 @@ async fn notarize(
    }
    let request = request_builder.body(Empty::<Bytes>::new())?;

-    println!("Starting an MPC TLS connection with the server");
+    info!("Starting connection with the server");

    // Send the request to the server and wait for the response.
    let response = request_sender.send_request(request).await?;

-    println!("Got a response from the server: {}", response.status());
+    info!("Got a response from the server: {}", response.status());

    assert!(response.status() == StatusCode::OK);

    // The prover task should be done now, so we can await it.
-    let mut prover = prover_task.await??;
+    let prover = prover_task.await??;

    // Parse the HTTP transcript.
    let transcript = HttpTranscript::parse(prover.transcript())?;
@@ -192,10 +191,10 @@ async fn notarize(
    match body_content {
        tlsn_formats::http::BodyContent::Json(_json) => {
            let parsed = serde_json::from_str::<serde_json::Value>(&body)?;
-            debug!("{}", serde_json::to_string_pretty(&parsed)?);
+            info!("{}", serde_json::to_string_pretty(&parsed)?);
        }
        tlsn_formats::http::BodyContent::Unknown(_span) => {
-            debug!("{}", &body);
+            info!("{}", &body);
        }
        _ => {}
    }
@@ -223,10 +222,7 @@ async fn notarize(

    let request_config = builder.build()?;

-    #[allow(deprecated)]
-    let (attestation, secrets) = prover.notarize(&request_config).await?;
-
-    println!("Notarization complete!");
+    let (attestation, secrets) = notarize(prover, &request_config, req_tx, resp_rx).await?;

    // Write the attestation to disk.
    let attestation_path = tlsn_examples::get_file_path(example_type, "attestation");
@@ -245,3 +241,163 @@ async fn notarize(

    Ok(())
 }
+
+async fn notarize(
+    mut prover: Prover<Committed>,
+    config: &RequestConfig,
+    request_tx: Sender<AttestationRequest>,
+    attestation_rx: Receiver<Attestation>,
+) -> Result<(Attestation, Secrets)> {
+    let mut builder = ProveConfig::builder(prover.transcript());
+
+    if let Some(config) = config.transcript_commit() {
+        builder.transcript_commit(config.clone());
+    }
+
+    let disclosure_config = builder.build()?;
+
+    let ProverOutput {
+        transcript_commitments,
+        transcript_secrets,
+        ..
+    } = prover.prove(&disclosure_config).await?;
+
+    let transcript = prover.transcript().clone();
+    let tls_transcript = prover.tls_transcript().clone();
+    prover.close().await?;
+
+    // Build an attestation request.
+    let mut builder = AttestationRequest::builder(config);
+
+    builder
+        .server_name(ServerName::Dns(SERVER_DOMAIN.try_into().unwrap()))
+        .handshake_data(HandshakeData {
+            certs: tls_transcript
+                .server_cert_chain()
+                .expect("server cert chain is present")
+                .to_vec(),
+            sig: tls_transcript
+                .server_signature()
+                .expect("server signature is present")
+                .clone(),
+            binding: tls_transcript.certificate_binding().clone(),
+        })
+        .transcript(transcript)
+        .transcript_commitments(transcript_secrets, transcript_commitments);
+
+    let (request, secrets) = builder.build(&CryptoProvider::default())?;
+
+    // Send attestation request to notary.
+    request_tx
+        .send(request.clone())
+        .map_err(|_| anyhow!("notary is not receiving attestation request"))?;
+
+    // Receive attestation from notary.
+    let attestation = attestation_rx
+        .await
+        .map_err(|err| anyhow!("notary did not respond with attestation: {err}"))?;
+
+    // Signature verifier for the signature algorithm in the request.
+    let provider = CryptoProvider::default();
+
+    // Check the attestation is consistent with the Prover's view.
+    request.validate(&attestation, &provider)?;
+
+    Ok((attestation, secrets))
+}
+
+async fn notary<S: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
+    socket: S,
+    request_rx: Receiver<AttestationRequest>,
+    attestation_tx: Sender<Attestation>,
+) -> Result<()> {
+    // Create a root certificate store with the server-fixture's self-signed
+    // certificate. This is only required for offline testing with the
+    // server-fixture.
+    let verifier_config = VerifierConfig::builder()
+        .root_store(RootCertStore {
+            roots: vec![CertificateDer(CA_CERT_DER.to_vec())],
+        })
+        .build()
+        .unwrap();
+
+    let verifier = Verifier::new(verifier_config)
+        .commit(socket.compat())
+        .await?
+        .accept()
+        .await?
+        .run()
+        .await?;
+
+    let (
+        VerifierOutput {
+            transcript_commitments,
+            ..
+        },
+        verifier,
+    ) = verifier.verify().await?.accept().await?;
+
+    let tls_transcript = verifier.tls_transcript().clone();
+
+    verifier.close().await?;
+
+    let sent_len = tls_transcript
+        .sent()
+        .iter()
+        .filter_map(|record| {
+            if let ContentType::ApplicationData = record.typ {
+                Some(record.ciphertext.len())
+            } else {
+                None
+            }
+        })
+        .sum::<usize>();
+
+    let recv_len = tls_transcript
+        .recv()
+        .iter()
+        .filter_map(|record| {
+            if let ContentType::ApplicationData = record.typ {
+                Some(record.ciphertext.len())
+            } else {
+                None
+            }
+        })
+        .sum::<usize>();
+
+    // Receive attestation request from prover.
+    let request = request_rx.await?;
+
+    // Load a dummy signing key.
+    let signing_key = k256::ecdsa::SigningKey::from_bytes(&[1u8; 32].into())?;
+    let signer = Box::new(Secp256k1Signer::new(&signing_key.to_bytes())?);
+    let mut provider = CryptoProvider::default();
+    provider.signer.set_signer(signer);
+
+    // Build an attestation.
+    let mut att_config_builder = AttestationConfig::builder();
+    att_config_builder.supported_signature_algs(Vec::from_iter(provider.signer.supported_algs()));
+    let att_config = att_config_builder.build()?;
+
+    let mut builder = Attestation::builder(&att_config).accept_request(request)?;
+    builder
+        .connection_info(ConnectionInfo {
+            time: tls_transcript.time(),
+            version: (*tls_transcript.version()),
+            transcript_length: TranscriptLength {
+                sent: sent_len as u32,
+                received: recv_len as u32,
+            },
+        })
+        .server_ephemeral_key(tls_transcript.server_ephemeral_key().clone())
+        .transcript_commitments(transcript_commitments);
+
+    let attestation = builder.build(&provider)?;
+
+    // Send attestation to prover.
+    attestation_tx
+        .send(attestation)
+        .map_err(|_| anyhow!("prover is not receiving attestation"))?;
+
+    Ok(())
+}
--- a/crates/examples/attestation/verify.rs
+++ b/crates/examples/attestation/verify.rs
@@ -6,14 +6,17 @@ use std::time::Duration;

 use clap::Parser;

-use tls_core::verify::WebPkiVerifier;
-use tls_server_fixture::CA_CERT_DER;
-use tlsn_core::{
-    presentation::{Presentation, PresentationOutput},
-    signing::VerifyingKey,
-    CryptoProvider,
+use tlsn::{
+    attestation::{
+        presentation::{Presentation, PresentationOutput},
+        signing::VerifyingKey,
+        CryptoProvider,
+    },
+    verifier::ServerCertVerifier,
+    webpki::{CertificateDer, RootCertStore},
 };
 use tlsn_examples::ExampleType;
+use tlsn_server_fixture_certs::CA_CERT_DER;

 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
@@ -41,12 +44,11 @@ async fn verify_presentation(example_type: &ExampleType) -> Result<(), Box<dyn s
    //
    // This is only required for offline testing with the server-fixture. In
    // production, use `CryptoProvider::default()` instead.
-    let mut root_store = tls_core::anchors::RootCertStore::empty();
-    root_store
-        .add(&tls_core::key::Certificate(CA_CERT_DER.to_vec()))
-        .unwrap();
+    let root_cert_store = RootCertStore {
+        roots: vec![CertificateDer(CA_CERT_DER.to_vec())],
+    };
    let crypto_provider = CryptoProvider {
-        cert: WebPkiVerifier::new(root_store, None),
+        cert: ServerCertVerifier::new(&root_cert_store)?,
        ..Default::default()
    };

@@ -85,9 +87,9 @@ async fn verify_presentation(example_type: &ExampleType) -> Result<(), Box<dyn s
    );
    println!("Note that the data which the Prover chose not to disclose are shown as X.\n");
    println!("Data sent:\n");
-    println!("{}\n", sent);
+    println!("{sent}\n");
    println!("Data received:\n");
-    println!("{}\n", recv);
+    println!("{recv}\n");
    println!("-------------------------------------------------------------------");

    Ok(())
--- a/crates/examples/interactive/interactive.rs
+++ b/crates/examples/interactive/interactive.rs
@@ -3,6 +3,7 @@ use std::{
    net::{IpAddr, SocketAddr},
 };

+use anyhow::Result;
 use http_body_util::Empty;
 use hyper::{body::Bytes, Request, StatusCode, Uri};
 use hyper_util::rt::TokioIo;
@@ -10,16 +11,22 @@ use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_util::compat::{FuturesAsyncReadCompatExt, TokioAsyncReadCompatExt};
 use tracing::instrument;

-use tls_core::verify::WebPkiVerifier;
-use tls_server_fixture::CA_CERT_DER;
-use tlsn_common::config::{ProtocolConfig, ProtocolConfigValidator};
-use tlsn_core::{
-    transcript::PartialTranscript, CryptoProvider, ProveConfig, VerifierOutput, VerifyConfig,
+use tlsn::{
+    config::{
+        prove::ProveConfig,
+        prover::ProverConfig,
+        tls::TlsClientConfig,
+        tls_commit::{mpc::MpcTlsConfig, TlsCommitConfig, TlsCommitProtocolConfig},
+        verifier::VerifierConfig,
+    },
+    connection::ServerName,
+    prover::Prover,
+    transcript::PartialTranscript,
+    verifier::{Verifier, VerifierOutput},
+    webpki::{CertificateDer, RootCertStore},
 };
-use tlsn_prover::{Prover, ProverConfig, TlsConfig};
 use tlsn_server_fixture::DEFAULT_FIXTURE_PORT;
-use tlsn_server_fixture_certs::{CLIENT_CERT, CLIENT_KEY, SERVER_DOMAIN};
-use tlsn_verifier::{Verifier, VerifierConfig};
+use tlsn_server_fixture_certs::{CA_CERT_DER, SERVER_DOMAIN};

 const SECRET: &str = "TLSNotary's private key 🤡";

@@ -47,7 +54,7 @@ async fn main() {
    let (prover_socket, verifier_socket) = tokio::io::duplex(1 << 23);
    let prover = prover(prover_socket, &server_addr, &uri);
    let verifier = verifier(verifier_socket);
-    let (_, transcript) = tokio::join!(prover, verifier);
+    let (_, transcript) = tokio::try_join!(prover, verifier).unwrap();

    println!("Successfully verified {}", &uri);
    println!(
@@ -65,75 +72,57 @@ async fn prover<T: AsyncWrite + AsyncRead + Send + Unpin + 'static>(
    verifier_socket: T,
    server_addr: &SocketAddr,
    uri: &str,
-) {
+) -> Result<()> {
    let uri = uri.parse::<Uri>().unwrap();
    assert_eq!(uri.scheme().unwrap().as_str(), "https");
    let server_domain = uri.authority().unwrap().host();

-    // Create a crypto provider accepting the server-fixture's self-signed
-    // root certificate.
-    //
-    // This is only required for offline testing with the server-fixture. In
-    // production, use `CryptoProvider::default()` instead.
-    let mut root_store = tls_core::anchors::RootCertStore::empty();
-    root_store
-        .add(&tls_core::key::Certificate(CA_CERT_DER.to_vec()))
-        .unwrap();
-    let crypto_provider = CryptoProvider {
-        cert: WebPkiVerifier::new(root_store, None),
-        ..Default::default()
-    };
-
-    // Set up protocol configuration for prover.
-    let mut prover_config_builder = ProverConfig::builder();
-    prover_config_builder
-        .server_name(server_domain)
-        .protocol_config(
-            ProtocolConfig::builder()
-                .max_sent_data(MAX_SENT_DATA)
-                .max_recv_data(MAX_RECV_DATA)
-                .build()
-                .unwrap(),
+    // Create a new prover and perform necessary setup.
+    let prover = Prover::new(ProverConfig::builder().build()?)
+        .commit(
+            TlsCommitConfig::builder()
+                // Select the TLS commitment protocol.
+                .protocol(
+                    MpcTlsConfig::builder()
+                        // We must configure the amount of data we expect to exchange beforehand,
+                        // which will be preprocessed prior to the
+                        // connection. Reducing these limits will improve
+                        // performance.
+                        .max_sent_data(tlsn_examples::MAX_SENT_DATA)
+                        .max_recv_data(tlsn_examples::MAX_RECV_DATA)
+                        .build()?,
+                )
+                .build()?,
+            verifier_socket.compat(),
        )
-        .crypto_provider(crypto_provider);
+        .await?;

-    // (Optional) Set up TLS client authentication if required by the server.
-    prover_config_builder.tls_config(
-        TlsConfig::builder()
-            .client_auth_pem((vec![CLIENT_CERT.to_vec()], CLIENT_KEY.to_vec()))
-            .unwrap()
-            .build()
-            .unwrap(),
-    );
+    // Open a TCP connection to the server.
+    let client_socket = tokio::net::TcpStream::connect(server_addr).await?;

-    let prover_config = prover_config_builder.build().unwrap();
-
-    // Create prover and connect to verifier.
-    //
-    // Perform the setup phase with the verifier.
-    let prover = Prover::new(prover_config)
-        .setup(verifier_socket.compat())
-        .await
-        .unwrap();
-
-    // Connect to TLS Server.
-    let tls_client_socket = tokio::net::TcpStream::connect(server_addr).await.unwrap();
-
-    // Pass server connection into the prover.
-    let (mpc_tls_connection, prover_fut) =
-        prover.connect(tls_client_socket.compat()).await.unwrap();
-
-    // Wrap the connection in a TokioIo compatibility layer to use it with hyper.
-    let mpc_tls_connection = TokioIo::new(mpc_tls_connection.compat());
+    // Bind the prover to the server connection.
+    let (tls_connection, prover_fut) = prover
+        .connect(
+            TlsClientConfig::builder()
+                .server_name(ServerName::Dns(SERVER_DOMAIN.try_into()?))
+                // Create a root certificate store with the server-fixture's self-signed
+                // certificate. This is only required for offline testing with the
+                // server-fixture.
+                .root_store(RootCertStore {
+                    roots: vec![CertificateDer(CA_CERT_DER.to_vec())],
+                })
+                .build()?,
+            client_socket.compat(),
+        )
+        .await?;
+    let tls_connection = TokioIo::new(tls_connection.compat());

    // Spawn the Prover to run in the background.
    let prover_task = tokio::spawn(prover_fut);

    // MPC-TLS Handshake.
    let (mut request_sender, connection) =
-        hyper::client::conn::http1::handshake(mpc_tls_connection)
-            .await
-            .unwrap();
+        hyper::client::conn::http1::handshake(tls_connection).await?;

    // Spawn the connection to run in the background.
    tokio::spawn(connection);
@@ -145,14 +134,13 @@ async fn prover<T: AsyncWrite + AsyncRead + Send + Unpin + 'static>(
        .header("Connection", "close")
        .header("Secret", SECRET)
        .method("GET")
-        .body(Empty::<Bytes>::new())
-        .unwrap();
-    let response = request_sender.send_request(request).await.unwrap();
+        .body(Empty::<Bytes>::new())?;
+    let response = request_sender.send_request(request).await?;

    assert!(response.status() == StatusCode::OK);

    // Create proof for the Verifier.
-    let mut prover = prover_task.await.unwrap().unwrap();
+    let mut prover = prover_task.await??;

    let mut builder = ProveConfig::builder(prover.transcript());

@@ -168,10 +156,8 @@ async fn prover<T: AsyncWrite + AsyncRead + Send + Unpin + 'static>(
        .expect("the secret should be in the sent data");

    // Reveal everything except for the secret.
-    builder.reveal_sent(&(0..pos)).unwrap();
-    builder
-        .reveal_sent(&(pos + SECRET.len()..prover.transcript().sent().len()))
-        .unwrap();
+    builder.reveal_sent(&(0..pos))?;
+    builder.reveal_sent(&(pos + SECRET.len()..prover.transcript().sent().len()))?;

    // Find the substring "Dick".
    let pos = prover
@@ -182,58 +168,78 @@ async fn prover<T: AsyncWrite + AsyncRead + Send + Unpin + 'static>(
        .expect("the substring 'Dick' should be in the received data");

    // Reveal everything except for the substring.
-    builder.reveal_recv(&(0..pos)).unwrap();
-    builder
-        .reveal_recv(&(pos + 4..prover.transcript().received().len()))
-        .unwrap();
+    builder.reveal_recv(&(0..pos))?;
+    builder.reveal_recv(&(pos + 4..prover.transcript().received().len()))?;

-    let config = builder.build().unwrap();
+    let config = builder.build()?;

-    prover.prove(&config).await.unwrap();
-    prover.close().await.unwrap();
+    prover.prove(&config).await?;
+    prover.close().await?;
+
+    Ok(())
 }

 #[instrument(skip(socket))]
 async fn verifier<T: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
    socket: T,
-) -> PartialTranscript {
-    // Set up Verifier.
-    let config_validator = ProtocolConfigValidator::builder()
-        .max_sent_data(MAX_SENT_DATA)
-        .max_recv_data(MAX_RECV_DATA)
-        .build()
-        .unwrap();
-
-    // Create a crypto provider accepting the server-fixture's self-signed
-    // root certificate.
-    //
-    // This is only required for offline testing with the server-fixture. In
-    // production, use `CryptoProvider::default()` instead.
-    let mut root_store = tls_core::anchors::RootCertStore::empty();
-    root_store
-        .add(&tls_core::key::Certificate(CA_CERT_DER.to_vec()))
-        .unwrap();
-    let crypto_provider = CryptoProvider {
-        cert: WebPkiVerifier::new(root_store, None),
-        ..Default::default()
-    };
-
+) -> Result<PartialTranscript> {
+    // Create a root certificate store with the server-fixture's self-signed
+    // certificate. This is only required for offline testing with the
+    // server-fixture.
    let verifier_config = VerifierConfig::builder()
-        .protocol_config_validator(config_validator)
-        .crypto_provider(crypto_provider)
-        .build()
-        .unwrap();
+        .root_store(RootCertStore {
+            roots: vec![CertificateDer(CA_CERT_DER.to_vec())],
+        })
+        .build()?;
    let verifier = Verifier::new(verifier_config);

-    // Receive authenticated data.
-    let VerifierOutput {
-        server_name,
-        transcript,
-        ..
-    } = verifier
-        .verify(socket.compat(), &VerifyConfig::default())
-        .await
-        .unwrap();
+    // Validate the proposed configuration and then run the TLS commitment protocol.
+    let verifier = verifier.commit(socket.compat()).await?;
+
+    // This is the opportunity to ensure the prover does not attempt to overload the
+    // verifier.
+    let reject = if let TlsCommitProtocolConfig::Mpc(mpc_tls_config) = verifier.request().protocol()
+    {
+        if mpc_tls_config.max_sent_data() > MAX_SENT_DATA {
+            Some("max_sent_data is too large")
+        } else if mpc_tls_config.max_recv_data() > MAX_RECV_DATA {
+            Some("max_recv_data is too large")
+        } else {
+            None
+        }
+    } else {
+        Some("expecting to use MPC-TLS")
+    };
+
+    if reject.is_some() {
+        verifier.reject(reject).await?;
+        return Err(anyhow::anyhow!("protocol configuration rejected"));
+    }
+
+    // Runs the TLS commitment protocol to completion.
+    let verifier = verifier.accept().await?.run().await?;
+
+    // Validate the proving request and then verify.
+    let verifier = verifier.verify().await?;
+
+    if !verifier.request().server_identity() {
+        let verifier = verifier
+            .reject(Some("expecting to verify the server name"))
+            .await?;
+        verifier.close().await?;
+        return Err(anyhow::anyhow!("prover did not reveal the server name"));
+    }
+
+    let (
+        VerifierOutput {
+            server_name,
+            transcript,
+            ..
+        },
+        verifier,
+    ) = verifier.accept().await?;
+
+    verifier.close().await?;

    let server_name = server_name.expect("prover should have revealed server name");
    let transcript = transcript.expect("prover should have revealed transcript data");
@@ -243,19 +249,20 @@ async fn verifier<T: AsyncWrite + AsyncRead + Send + Sync + Unpin + 'static>(
    let sent_data = String::from_utf8(sent.clone()).expect("Verifier expected sent data");
    sent_data
        .find(SERVER_DOMAIN)
-        .unwrap_or_else(|| panic!("Verification failed: Expected host {}", SERVER_DOMAIN));
+        .unwrap_or_else(|| panic!("Verification failed: Expected host {SERVER_DOMAIN}"));

    // Check received data.
    let received = transcript.received_unsafe().to_vec();
    let response = String::from_utf8(received.clone()).expect("Verifier expected received data");
    response
        .find("Herman Melville")
-        .unwrap_or_else(|| panic!("Expected valid data from {}", SERVER_DOMAIN));
+        .unwrap_or_else(|| panic!("Expected valid data from {SERVER_DOMAIN}"));

    // Check Session info: server name.
+    let ServerName::Dns(server_name) = server_name;
    assert_eq!(server_name.as_str(), SERVER_DOMAIN);

-    transcript
+    Ok(transcript)
 }

 /// Render redacted bytes as `🙈`.
--- a/crates/examples/interactive_zk/.gitignore
+++ b/crates/examples/interactive_zk/.gitignore
@@ -0,0 +1,5 @@
+!noir/target/
+# Ignore everything inside noir/target
+noir/target/*
+# Except noir.json
+!noir/target/noir.json
--- a/crates/examples/interactive_zk/README.md
+++ b/crates/examples/interactive_zk/README.md
@@ -0,0 +1,167 @@
+# Interactive Zero-Knowledge Age Verification with TLSNotary
+
+This example demonstrates **privacy-preserving age verification** using TLSNotary and zero-knowledge proofs. It allows a prover to demonstrate they are 18+ years old without revealing their actual birth date or any other personal information.
+
+## 🔍 How It Works (simplified overview)
+
+```mermaid
+sequenceDiagram
+    participant S as Tax Server<br/>(fixture)
+    participant P as Prover
+    participant V as Verifier
+
+    P->>S: Request tax data (with auth token) (MPC-TLS)
+    S->>P: Tax data including `date_of_birth` (MPC-TLS)
+    P->>V: Share transcript with redactions
+    P->>V: Commit to blinded hash of birth date
+    P->>P: Generate ZK proof of age ≥ 18
+    P->>V: Send ZK proof
+    V->>V: Verify transcript & ZK proof
+    V->>V: ✅ Confirm: Prover is 18+ (no birth date revealed)
+```
+
+### The Process
+
+1. **MPC-TLS Session**: The Prover fetches tax information containing their birth date, while the Verifier jointly verifies the TLS session to ensure the data comes from the authentic server.
+2. **Selective Disclosure**:
+   * The authorization token is **redacted**: the Verifier sees the plaintext request but not the token.
+   * The birth date is **committed** as a blinded hash: the Verifier cannot see the date, but the Prover is cryptographically bound to it.  
+   (Depending on the use case more data can be redacted or revealed)
+3. **Zero-Knowledge Proof**: The Prover generates a ZK proof that the committed birth date corresponds to an age ≥ 18.
+4. **Verification**: The Verifier checks both the TLS transcript and the ZK proof, confirming age ≥ 18 without learning the actual date of birth.
+
+
+### Example Data
+
+The tax server returns data like this:
+```json
+{
+    "tax_year": 2024,
+    "taxpayer": {
+        "idnr": "12345678901",
+        "first_name": "Max",
+        "last_name": "Mustermann",
+        "date_of_birth": "1985-03-12",
+        // ...
+    }
+}
+```
+
+## 🔐 Zero-Knowledge Proof Details
+
+The ZK circuit proves: **"I know a birth date that hashes to the committed value AND indicates I am 18+ years old"**
+
+**Public Inputs:**
+- ✅ Verification date
+- ✅ Committed blinded hash of birth date
+
+**Private Inputs (Hidden):**
+- 🔒 Actual birth date plaintext
+- 🔒 Random blinder used in hash commitment
+
+**What the Verifier Learns:**
+- ✅ The prover is 18+ years old
+- ✅ The birth date is authentic (from the MPC-TLS session)
+
+Everything else remains private.
+
+## 🏃 Run the Example
+
+1. **Start the test server** (from repository root):
+   ```bash
+   RUST_LOG=info PORT=4000 cargo run --bin tlsn-server-fixture
+   ```
+
+2. **Run the age verification** (in a new terminal):
+   ```bash
+   SERVER_PORT=4000 cargo run --release --example interactive_zk
+   ```
+
+3. **For detailed logs**:
+   ```bash
+   RUST_LOG=debug,yamux=info,uid_mux=info SERVER_PORT=4000 cargo run --release --example interactive_zk
+   ```
+
+### Expected Output
+
+```
+Successfully verified https://test-server.io:4000/elster
+Age verified in ZK: 18+ ✅
+
+Verified sent data:
+GET https://test-server.io:4000/elster HTTP/1.1
+host: test-server.io
+connection: close
+authorization: 🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈🙈
+
+Verified received data:
+🙈🙈🙈🙈🙈🙈🙈🙈[truncated for brevity]...🙈🙈🙈🙈🙈"tax_year":2024🙈🙈🙈🙈🙈...
+```
+
+> 💡 **Note**: In this demo, both Prover and Verifier run on the same machine. In production, they would operate on separate systems.
+> 💡 **Note**: This demo assumes that the tax server serves correct data, and that only the submitter of the tax data has access to the specified page.
+
+## 🛠 Development
+
+### Project Structure
+
+```
+interactive_zk/
+├── prover.rs                   # Prover implementation
+├── verifier.rs                 # Verifier implementation  
+├── types.rs                    # Shared types
+└── interactive_zk.rs           # Main example runner
+├── noir/                       # Zero-knowledge circuit
+│   ├── src/main.n              # Noir circuit code
+│   ├── target/                 # Compiled circuit artifacts
+│   └── Nargo.toml              # Noir project config
+│   └── Prover.toml             # Example input for `nargo execute`
+│   └── generate_test_data.rs   # Rust script to generate Noir test data
+└── README.md
+```
+
+### Noir Circuit Commands
+
+We use [Mopro's `noir_rs`](https://zkmopro.org/docs/crates/noir-rs/) for ZK proof generation.  The **circuit is pre-compiled and ready to use**. You don't need to install Noir tools to run the example. But if you want to change or test the circuit in isolation, you can use the following instructions.
+
+Before you proceed, we recommend to double check that your Noir tooling matches the versions used in Mopro's `noir_rs`:
+```sh
+# Install correct Noir and BB versions (important for compatibility!)
+noirup --version 1.0.0-beta.8
+bbup -v 1.0.0-nightly.20250723
+```
+
+If you don't have `noirup` and `bbup` installed yet, check [Noir's Quick Start](https://noir-lang.org/docs/getting_started/quick_start).
+
+To compile the circuit, go to the `noir` folder and run `nargo compile`.
+
+To check and experiment with the Noir circuit, you can use these commands:
+
+* Execute Circuit: Compile the circuit and run it with sample data from `Prover.toml`:
+    ```sh
+    nargo execute
+    ```
+* Generate Verification Key: Create the verification key needed to verify proofs
+    ```sh
+    bb write_vk -b ./target/noir.json -o ./target
+    ```
+* Generate Proof: Create a zero-knowledge proof using the circuit and witness data.
+    ```sh
+    bb prove --bytecode_path ./target/noir.json --witness_path ./target/noir.gz -o ./target
+    ```
+* Verify Proof: Verify that a proof is valid using the verification key.
+    ```sh
+    bb verify -k ./target/vk -p ./target/proof
+    ```
+* Run the Noir tests:
+    ```sh
+    nargo test --show-output
+    ```
+  To create extra tests, you can use `./generate_test_data.rs` to help with generating correct blinders and hashes.
+
+## 📚 Learn More
+
+- [TLSNotary Documentation](https://docs.tlsnotary.org/)
+- [Noir Language Guide](https://noir-lang.org/)
+- [Zero-Knowledge Proofs Explained](https://ethereum.org/en/zero-knowledge-proofs/)
+- [Mopro ZK Toolkit](https://zkmopro.org/)
--- a/crates/examples/interactive_zk/interactive_zk.rs
+++ b/crates/examples/interactive_zk/interactive_zk.rs
@@ -0,0 +1,60 @@
+mod prover;
+mod types;
+mod verifier;
+
+use anyhow::Result;
+use prover::prover;
+use std::{
+    env,
+    net::{IpAddr, SocketAddr},
+};
+use tlsn_server_fixture::DEFAULT_FIXTURE_PORT;
+use tlsn_server_fixture_certs::SERVER_DOMAIN;
+use verifier::verifier;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    tracing_subscriber::fmt::init();
+
+    let server_host: String = env::var("SERVER_HOST").unwrap_or("127.0.0.1".into());
+    let server_port: u16 = env::var("SERVER_PORT")
+        .map(|port| port.parse().expect("port should be valid integer"))
+        .unwrap_or(DEFAULT_FIXTURE_PORT);
+
+    // We use SERVER_DOMAIN here to make sure it matches the domain in the test
+    // server's certificate.
+    let uri = format!("https://{SERVER_DOMAIN}:{server_port}/elster");
+    let server_ip: IpAddr = server_host
+        .parse()
+        .map_err(|e| anyhow::anyhow!("Invalid IP address '{server_host}': {e}"))?;
+    let server_addr = SocketAddr::from((server_ip, server_port));
+
+    // Connect prover and verifier.
+    let (prover_socket, verifier_socket) = tokio::io::duplex(1 << 23);
+    let (prover_extra_socket, verifier_extra_socket) = tokio::io::duplex(1 << 23);
+
+    let (_, transcript) = tokio::try_join!(
+        prover(prover_socket, prover_extra_socket, &server_addr, &uri),
+        verifier(verifier_socket, verifier_extra_socket)
+    )?;
+
+    println!("---");
+    println!("Successfully verified {}", &uri);
+    println!("Age verified in ZK: 18+ ✅\n");
+
+    println!(
+        "Verified sent data:\n{}",
+        bytes_to_redacted_string(transcript.sent_unsafe())
+    );
+    println!(
+        "Verified received data:\n{}",
+        bytes_to_redacted_string(transcript.received_unsafe())
+    );
+
+    Ok(())
+}
+
+/// Render redacted bytes as `🙈`.
+pub fn bytes_to_redacted_string(bytes: &[u8]) -> String {
+    String::from_utf8_lossy(bytes).replace('\0', "🙈")
+}
--- a/crates/examples/interactive_zk/noir/Nargo.toml
+++ b/crates/examples/interactive_zk/noir/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "noir"
+type = "bin"
+authors = [""]
+
+[dependencies]
+sha256 = { tag = "v0.1.5", git = "https://github.com/noir-lang/sha256" }
+date = { tag = "v0.5.4", git = "https://github.com/madztheo/noir-date.git" }
--- a/crates/examples/interactive_zk/noir/Prover.toml
+++ b/crates/examples/interactive_zk/noir/Prover.toml
@@ -0,0 +1,8 @@
+blinder = [108, 93, 120, 205, 15, 35, 159, 124, 243, 96, 22, 128, 16, 149, 219, 216]
+committed_hash = [186, 158, 101, 39, 49, 48, 26, 83, 242, 96, 10, 221, 121, 174, 62, 50, 136, 132, 232, 58, 25, 32, 66, 196, 99, 85, 66, 85, 255, 1, 202, 254]
+date_of_birth = "1985-03-12"
+
+[proof_date]
+day = "29"
+month = "08"
+year = "2025"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sinu.eth	1897f0d1e6	refactor: remove encoding commitment (#1071 ) * refactor: remove encoding commitment * remove unused field * clippy	2026-01-08 07:55:03 -08:00
dan	2101285f7f	chore(bench): dont bench large payloads (#1074 )	2026-01-05 09:55:35 +00:00
dan	98210e4059	chore(bench): added headed mode for debugging (#1073 )	2026-01-05 09:38:31 +00:00
dan	9dfac850d5	chore(harness): improve UX with progress bar, separate sweep benches (#1068 )	2025-12-23 13:59:14 +00:00
Hendrik Eeckhaut	b41d678829	build: update Rust to version 1.92.0	2025-12-16 09:36:11 +01:00
sinu.eth	1ebefa27d8	perf(core): fold instead of flatten (#1064 )	2025-12-11 06:41:26 -08:00
dan	4fe5c1defd	feat(harness): add reveal_all config (#1063 )	2025-12-09 12:01:39 +00:00
dan	0e8e547300	chore: adapt for rangeset 0.4 (#1058 )	2025-12-09 11:36:13 +00:00
dan	22cc88907a	chore: bump mpz (#1057 )	2025-12-04 10:27:43 +00:00
Hendrik Eeckhaut	cec4756e0e	ci: set GITHUB_TOKEN env	2025-11-28 14:33:19 +01:00
Hendrik Eeckhaut	0919e1f2b3	clippy: allow deprecated aead::generic_array	2025-11-28 14:33:19 +01:00
Hendrik Eeckhaut	43b9f57e1f	build: update Rust to version 1.91.1	2025-11-26 16:53:08 +01:00
dan	c51331d63d	test: use ideal vm for testing (#1049 )	2025-11-07 12:56:09 +00:00
dan	3905d9351c	chore: clean up deps (#1048 )	2025-11-07 10:36:41 +00:00
dan	f8a67bc8e7	feat(core): support proving keccak256 commitments (#1046 )	2025-11-07 09:18:44 +00:00
dan	952a7011bf	feat(cipher): use AES pre/post key schedule circuits (#1042 )	2025-11-07 09:08:08 +00:00
Ram	0673818e4e	chore: fix links to key exchange doc page (#1045 )	2025-11-04 23:07:58 +01:00
dan	a5749d81f1	fix(attestation): verify sig during validation (#1037 )	2025-10-30 07:59:57 +00:00
sinu.eth	f2e119bb66	refactor: move and rewrite configuration (#1034 ) * refactor: move and rewrite configuration * fix wasm	2025-10-27 11:47:42 -07:00
Hendrik Eeckhaut	271ac3771e	Fix example (#1033 ) * fix: provide encoder secret to attestation * Add missing entry in example's README file	2025-10-24 10:33:32 +02:00
Benjamin Martinez Picech	f69dd7a239	refactor(tlsn-core): redeclaration of content type into core (#1026 ) * redeclaration of content type into core * fix compilation error * comment removal * Lint and format fixes * fix wasm build * Unknown content type * format fix	2025-10-23 15:47:53 +02:00
sinu.eth	79f5160cae	feat(tlsn): insecure mode (#1031 )	2025-10-22 10:18:11 -07:00
sinu.eth	5fef2af698	fix(example): close prover (#1025 )	2025-10-17 10:39:08 -07:00
sinu.eth	5b2083e211	refactor(tlsn): invert control of config validation (#1023 ) * refactor(tlsn): invert control of config validation * clippy	2025-10-17 10:19:02 -07:00
sinu.eth	d26bb02d2e	chore: update to alpha.14-pre (#1022 )	2025-10-15 11:11:43 -07:00
sinu	a766b64184	ci: add manual trigger to main update	2025-10-15 10:11:01 -07:00
sinu.eth	0885d40ddf	chore: release v0.1.0-alpha.13 (#1019 )	2025-10-15 09:38:52 -07:00
sinu.eth	610411aae4	ci: relax clippy (#1020 )	2025-10-15 09:27:55 -07:00
sinu.eth	37df1baed7	feat(core): proof config builder reveal all methods (#1017 ) Co-authored-by: Hendrik Eeckhaut <hendrik@eeckhaut.org>	2025-10-14 08:56:28 -07:00
dan	aeaebc5c60	chore(harness): expose debug flag in dockerfile (#1018 )	2025-10-14 11:19:30 +00:00
sinu.eth	2e7e3db11d	fix: fully identify signature algorithm (#1015 )	2025-10-13 09:57:34 +02:00
sinu.eth	0a68837d0a	fix: empty auth ranges (#1016 )	2025-10-10 15:44:38 -07:00
sinu.eth	0ec2392716	chore(tlsn): add transcript auth tests (#1014 ) * chore(tlsn): add transcript auth tests * clippy	2025-10-10 14:10:17 -07:00
sinu.eth	f99fce5b5a	fix(tlsn): do not implicitly reveal encoder secret (#1011 )	2025-10-10 08:39:24 -07:00
sinu.eth	6b9f44e7e5	feat(tlsn): disclose encryption key (#1010 ) Co-authored-by: th4s <th4s@metavoid.xyz>	2025-10-10 08:32:50 -07:00
dan	bf1cf2302a	fix(harness): add harness debug feature (#1012 )	2025-10-10 14:20:42 +00:00
sinu.eth	2884be17e0	feat(tlsn): partial plaintext auth (#1006 ) Co-authored-by: th4s <th4s@metavoid.xyz>	2025-10-09 11:22:23 -07:00
sinu.eth	df8d79c152	fix(wasm): explicitly enable link args for wasm (#1007 )	2025-10-09 08:34:11 -07:00
yuroitaki	82d509266b	feat: add blake3 transcript commitment (#1000 ) * Add blake3. * Update mpz version. --------- Co-authored-by: yuroitaki <>	2025-10-08 10:13:07 +08:00
dan	d5ad768e7c	chore: improve error msg (#1003 )	2025-10-03 05:43:58 +00:00
Hendrik Eeckhaut	d25fb320d4	build: update Rust to version 1.90.0	2025-09-24 09:32:56 +02:00
Hendrik Eeckhaut	0539268da7	Interactive noir example (#981 ) demo for interactive zk age proof Co-authored-by: th4s <th4s@metavoid.xyz>	2025-09-19 16:55:10 +02:00
dan	427b2896b5	allow root_store to be None (#995 )	2025-09-19 15:15:04 +02:00
Hendrik Eeckhaut	89d1e594d1	privacy-scaling-explorations -> privacy-ethereum (#993 )	2025-09-11 16:48:01 +02:00
sinu.eth	b4380f021e	refactor: decouple ProveConfig from PartialTranscript (#991 )	2025-09-11 09:13:52 +02:00
sinu.eth	8a823d18ec	refactor(core): replace Idx with RangeSet (#988 ) * refactor(core): replace Idx with RangeSet * clippy	2025-09-10 15:44:40 -07:00
sinu.eth	7bcfc56bd8	fix(tls-core): remove deprecated webpki error variants (#992 ) * fix(tls-core): remove deprecated webpki error variants * clippy	2025-09-10 15:24:07 -07:00
sinu.eth	2909d5ebaa	chore: bump mpz to 3d90b6c (#990 )	2025-09-10 14:38:48 -07:00
sinu.eth	7918494ccc	fix(core): fix dev dependencies (#989 )	2025-09-10 14:25:04 -07:00
sinu.eth	92dd47b376	fix(core): enable zeroize derive (#987 )	2025-09-10 14:11:41 -07:00
th4s	5474a748ce	feat(core): Add transcript fixture (#983 ) * feat(core): add transcript fixture for testing * add feedback * remove packages from dev dependencies	2025-09-10 22:58:10 +02:00
yuroitaki	92da5adc24	chore: update attestation example (#966 ) * Add attestation example. * Apply fmt. * Apply clippy fix. * Rebase. * Improved readme + more default loggging in prove example * Removed wrong AI generated "learn more" links * re-export ContentType in tlsn-core * remove unnecessary checks from example --------- Co-authored-by: yuroitaki <> Co-authored-by: Hendrik Eeckhaut <hendrik@eeckhaut.org> Co-authored-by: sinu <65924192+sinui0@users.noreply.github.com>	2025-09-10 09:37:17 -07:00
Hendrik Eeckhaut	e0ce1ad31a	build:Update to unpatched ws_stream_wasm crate (#975 )	2025-09-01 16:33:00 +02:00
Hendrik Eeckhaut	3b76877920	build: reduce wasm size (#977 )	2025-09-01 11:28:12 +02:00
Hendrik Eeckhaut	783355772a	docs: corrected commands in docker.md of the harness (#976 )	2025-08-28 17:00:18 +02:00
dan	e5c59da90b	chore: fix tests (#974 )	2025-08-26 08:42:48 +00:00
dan	f059c53c2d	use zk config; bump mpz (#973 )	2025-08-26 08:23:24 +00:00
sinu.eth	a1367b5428	refactor(tlsn): change network setting default to reduce data transfer (#971 )	2025-08-22 14:00:23 -07:00
sinu.eth	9d8124ac9d	chore: bump mpz to 1b00912 (#970 )	2025-08-21 09:46:29 -07:00
dan	5034366c72	fix(hmac-sha256): compute PHash and AHash concurrently (#969 ) --------- Co-authored-by: th4s <th4s@metavoid.xyz>	2025-08-21 06:41:59 +00:00
sinu.eth	afd8f44261	feat(tlsn): serializable config (#968 )	2025-08-18 09:03:04 -07:00
sinu.eth	21086d2883	refactor: clean up web pki (#967 ) * refactor: clean up web pki * fix time import * clippy * fix wasm	2025-08-18 08:36:04 -07:00
dan	cca9a318a4	fix(harness): improve harness stability (#962 )	2025-08-15 09:17:20 +00:00
dan	cb804a6025	fix(harness): disable tracing events (#961 )	2025-08-15 07:13:12 +00:00
th4s	9f849e7c18	fix(encoding): set correct frame limit (#963 ) * fix(encoding): set correct frame limit * bugfix for `TranscriptRefs::len` * use current frame limit as cushion room	2025-08-13 09:57:00 +02:00
th4s	389bceddef	chore: bump rust version, fix lints and satisfy clippy (#964 ) * chore(lints): fix lints and satisfy clippy * bump rust version in ci	2025-08-12 10:50:31 -07:00
th4s	657838671a	chore: remove notarize methods for prover and verifier (#952 ) * feat: remove notarize methods for prover and verifier * clean up imports * remove remaining notarize methods * clean up imports * remove wasm attestation bindings --------- Co-authored-by: sinu <65924192+sinui0@users.noreply.github.com>	2025-08-06 09:38:43 -07:00
yuroitaki	2f072b2578	chore: remove notary crates (#953 ) Co-authored-by: Hendrik Eeckhaut <hendrik@eeckhaut.org>	2025-08-04 10:41:45 +02:00
sinu.eth	33153d1124	refactor: move web-spawn under web feature (#949 ) * refactor: move web-spawn under web feature * add arch conditional	2025-07-29 07:11:16 -07:00
Hendrik Eeckhaut	2d399d5e24	chore: Update latency/bandwidth plots for new harness (#923 ) * Updated latency/bandwidth plots for new harness * Fix harness Docker build	2025-07-23 10:58:46 +02:00
dan	b6d7249b6d	fix(harness): restore multithreading for browser benches (#943 )	2025-07-23 05:40:58 +00:00
dan	2a8c1c3382	fix(harness): add custom wasm-pack to build script (#940 )	2025-07-22 06:29:12 +00:00
dan	7c27162875	fix(harness): pull latest docker images (#941 )	2025-07-21 06:07:48 +00:00
sinu.eth	eef813712d	refactor: extract attestation functionality into dedicated crate (#936 ) * refactor: extract attestation functionality into dedicated crate * commit lock * fix integration test * clippy * fix docs * fix import * fix wasm types * fix doctest * verifier config default rootstore * fix integration test * fix notary integration tests	2025-07-09 09:54:11 -07:00
sinu.eth	2e94e08fa6	build(wasm): enable simd128 feature (#937 )	2025-07-04 11:22:56 -07:00
dan	97d9475335	fix(harness): do not close connection too early (#935 )	2025-07-02 09:40:52 -07:00
sinu.eth	38820d6a3f	refactor: consolidate into tlsn crate (#934 ) * refactor: consolidate into tlsn crate * clean up dead code * bump lock file * rustfmt * fix examples * fix docs script * clippy * clippy	2025-07-02 09:40:28 -07:00
sinu.eth	af85fa100f	build(wasm): add wasm profile and optimize for perf (#933 )	2025-07-02 08:52:47 -07:00
Hendrik Eeckhaut	008b901913	ci: docker image for new harness * update Docker for new harness * disable shm in Chrome	2025-06-27 17:58:12 +01:00
Hendrik Eeckhaut	db85f68328	build: update Rust to version 1.88.0	2025-06-27 16:40:29 +01:00
Hendrik Eeckhaut	fb80aa4cc9	chore: Set version number to 0.1.0-alpha.13-pre (#931 )	2025-06-20 14:41:33 +02:00
Hendrik Eeckhaut	8dae57d6a7	ci: fix problem with multiple `tlsn-wasm` build artefacts (#930 )	2025-06-20 10:57:35 +02:00