diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 415c2b96859..59bbd6ce598 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,8 +59,20 @@ jobs:
       - name: Setup just
         uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Install Node.js dependencies
+        run: pnpm install
+
       - name: Run unit tests
-        run: just test-unit --verbose
+        run: just test-unit
 
   runner-tests:
     name: Subgraph Runner integration tests
@@ -113,7 +125,7 @@ jobs:
         run: pnpm install
 
       - name: Run runner tests
-        run: just test-runner --verbose
+        run: just test-runner
 
   integration-tests:
     name: Run integration tests
@@ -171,13 +183,15 @@ jobs:
         run: pnpm install
 
       - name: Start anvil
-        run: anvil --gas-limit 100000000000 --base-fee 1 --block-time 2 --timestamp 1743944919 --port 3021 &
+        run: anvil --gas-limit 100000000000 --base-fee 1 --timestamp 1743944919 --port 3021 &
 
       - name: Build graph-node
         run: just build --test integration_tests
 
       - name: Run integration tests
-        run: just test-integration --verbose
+        run: |
+          export PATH="${{ github.workspace }}/node_modules/.bin:$PATH"
+          just test-integration
 
       - name: Cat graph-node.log
         if: always()
diff --git a/.github/workflows/gnd-binary-build.yml b/.github/workflows/gnd-binary-build.yml
index 753388733d2..237de3342b5 100644
--- a/.github/workflows/gnd-binary-build.yml
+++ b/.github/workflows/gnd-binary-build.yml
@@ -1,7 +1,18 @@
 name: Build gnd Binaries
 
 on:
+  release:
+    types: [published]
   workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Existing release tag to upload binaries to and publish as on npm (e.g. v0.44.0). Leave empty to only build artifacts.'
+        type: string
+        default: ''
+      dry_run:
+        description: 'Dry-run npm publish (no actual publish)'
+        type: boolean
+        default: false
 
 jobs:
   build:
@@ -18,7 +29,7 @@ jobs:
             runner: ubuntu-22.04
             asset_name: gnd-linux-aarch64
           - target: x86_64-apple-darwin
-            runner: macos-13
+            runner: macos-14
             asset_name: gnd-macos-x86_64
           - target: aarch64-apple-darwin
             runner: macos-latest
@@ -29,45 +40,60 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Cache built binary
+        id: bin-cache
+        uses: actions/cache@v5
+        with:
+          path: |
+            ${{ matrix.asset_name }}.gz
+            ${{ matrix.asset_name }}.zip
+          key: gnd-${{ matrix.target }}-${{ hashFiles('Cargo.lock', '**/Cargo.toml', '**/*.rs') }}
 
       - name: Install Rust toolchain
+        if: steps.bin-cache.outputs.cache-hit != 'true'
         run: |
           rustup toolchain install stable
           rustup target add ${{ matrix.target }}
           rustup default stable
 
       - name: Rust Cache
+        if: steps.bin-cache.outputs.cache-hit != 'true'
         uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.target }}
 
       - name: Install dependencies (Ubuntu)
-        if: startsWith(matrix.runner, 'ubuntu')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'ubuntu')
         run: |
           sudo apt-get update
           sudo apt-get install -y protobuf-compiler musl-tools
+          if [ "${{ matrix.target }}" = "aarch64-unknown-linux-gnu" ]; then
+            sudo apt-get install -y gcc-aarch64-linux-gnu
+          fi
 
       - name: Install dependencies (macOS)
-        if: startsWith(matrix.runner, 'macos')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'macos')
         run: |
           brew install protobuf
 
       - name: Install protobuf (Windows)
-        if: startsWith(matrix.runner, 'windows')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'windows')
         run: choco install protoc
 
-
       - name: Build gnd binary (Unix/Mac)
-        if: ${{ !startsWith(matrix.runner, 'windows') }}
+        if: steps.bin-cache.outputs.cache-hit != 'true' && !startsWith(matrix.runner, 'windows')
         run: cargo build --bin gnd --release --target ${{ matrix.target }}
+        env:
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
 
       - name: Build gnd binary (Windows)
-        if: startsWith(matrix.runner, 'windows')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'windows')
         run: cargo build --bin gnd --release --target ${{ matrix.target }}
 
       - name: Sign macOS binary
-        if: startsWith(matrix.runner, 'macos')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'macos')
         uses: lando/code-sign-action@v3
         with:
           file: target/${{ matrix.target }}/release/gnd
@@ -77,7 +103,7 @@ jobs:
           options: --options runtime --entitlements entitlements.plist
 
       - name: Notarize macOS binary
-        if: startsWith(matrix.runner, 'macos')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'macos')
         uses: lando/notarize-action@v2
         with:
           product-path: target/${{ matrix.target }}/release/gnd
@@ -86,20 +112,20 @@ jobs:
           appstore-connect-team-id: ${{ secrets.APPLE_TEAM_ID }}
 
       - name: Prepare binary (Unix)
-        if: ${{ !startsWith(matrix.runner, 'windows') }}
+        if: steps.bin-cache.outputs.cache-hit != 'true' && !startsWith(matrix.runner, 'windows')
         run: |
           cp target/${{ matrix.target }}/release/gnd ${{ matrix.asset_name }}
           chmod +x ${{ matrix.asset_name }}
           gzip ${{ matrix.asset_name }}
 
       - name: Prepare binary (Windows)
-        if: startsWith(matrix.runner, 'windows')
+        if: steps.bin-cache.outputs.cache-hit != 'true' && startsWith(matrix.runner, 'windows')
         run: |
           copy target\${{ matrix.target }}\release\gnd.exe ${{ matrix.asset_name }}
           7z a -tzip ${{ matrix.asset_name }}.zip ${{ matrix.asset_name }}
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.asset_name }}
           path: |
@@ -110,11 +136,11 @@ jobs:
   release:
     name: Create Release
     needs: build
-    if: startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/') || inputs.release_tag != ''
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup GitHub CLI
         run: |
@@ -124,7 +150,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: artifacts
 
@@ -133,22 +159,197 @@ jobs:
 
       - name: Upload Assets to Release
         run: |
-          # Extract version from ref (remove refs/tags/ prefix)
-          VERSION=${GITHUB_REF#refs/tags/}
-          
-          # Upload Linux x86_64 asset
-          gh release upload $VERSION artifacts/gnd-linux-x86_64/gnd-linux-x86_64.gz --repo $GITHUB_REPOSITORY
-          
-          # Upload Linux ARM64 asset
-          gh release upload $VERSION artifacts/gnd-linux-aarch64/gnd-linux-aarch64.gz --repo $GITHUB_REPOSITORY
-          
-          # Upload macOS x86_64 asset
-          gh release upload $VERSION artifacts/gnd-macos-x86_64/gnd-macos-x86_64.gz --repo $GITHUB_REPOSITORY
-          
-          # Upload macOS ARM64 asset
-          gh release upload $VERSION artifacts/gnd-macos-aarch64/gnd-macos-aarch64.gz --repo $GITHUB_REPOSITORY
-          
-          # Upload Windows x86_64 asset
-          gh release upload $VERSION artifacts/gnd-windows-x86_64.exe/gnd-windows-x86_64.exe.zip --repo $GITHUB_REPOSITORY
+          VERSION="${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}"
+
+          gh release upload $VERSION --clobber --repo $GITHUB_REPOSITORY \
+            artifacts/gnd-linux-x86_64/gnd-linux-x86_64.gz \
+            artifacts/gnd-linux-aarch64/gnd-linux-aarch64.gz \
+            artifacts/gnd-macos-x86_64/gnd-macos-x86_64.gz \
+            artifacts/gnd-macos-aarch64/gnd-macos-aarch64.gz \
+            artifacts/gnd-windows-x86_64.exe/gnd-windows-x86_64.exe.zip
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-npm:
+    name: Publish npm package for ${{ matrix.platform }}
+    needs: release
+    if: startsWith(github.ref, 'refs/tags/') || inputs.release_tag != ''
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: linux-x64
+            asset: gnd-linux-x86_64.gz
+            os_field: linux
+            cpu_field: x64
+            extract: gunzip
+          - platform: linux-arm64
+            asset: gnd-linux-aarch64.gz
+            os_field: linux
+            cpu_field: arm64
+            extract: gunzip
+          - platform: darwin-x64
+            asset: gnd-macos-x86_64.gz
+            os_field: darwin
+            cpu_field: x64
+            extract: gunzip
+          - platform: darwin-arm64
+            asset: gnd-macos-aarch64.gz
+            os_field: darwin
+            cpu_field: arm64
+            extract: gunzip
+          - platform: win32-x64
+            asset: gnd-windows-x86_64.exe.zip
+            os_field: win32
+            cpu_field: x64
+            extract: unzip
+    steps:
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Download gnd binary
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download "${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}" \
+            --repo "${{ github.repository }}" \
+            --pattern "${{ matrix.asset }}" \
+            --output ./binary-archive
+
+      - name: Extract binary
+        run: |
+          mkdir -p pkg/bin
+          if [ "${{ matrix.extract }}" = "gunzip" ]; then
+            gunzip -c ./binary-archive > pkg/bin/gnd
+            chmod +x pkg/bin/gnd
+          else
+            unzip ./binary-archive -d pkg/bin
+            mv pkg/bin/*.exe pkg/bin/gnd.exe
+          fi
+
+      - name: Determine version and npm tag
+        id: version
+        shell: bash
+        run: |
+          VERSION="${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}"
+          VERSION="${VERSION#v}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          # Prerelease versions (e.g. 0.42.2-dev.1) need an explicit --tag
+          if [[ "$VERSION" == *-* ]]; then
+            # Extract prerelease identifier (e.g. "dev" from "0.42.2-dev.1")
+            PRE="${VERSION#*-}"
+            TAG="${PRE%%.*}"
+            echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create package.json
+        shell: bash
+        run: |
+          if [ "${{ matrix.os_field }}" = "win32" ]; then
+            BIN_PATH="./bin/gnd.exe"
+          else
+            BIN_PATH="./bin/gnd"
+          fi
+
+          cat > pkg/package.json << EOF
+          {
+            "name": "@graphprotocol/gnd-${{ matrix.platform }}",
+            "version": "${{ steps.version.outputs.version }}",
+            "description": "gnd binary for ${{ matrix.platform }}",
+            "os": ["${{ matrix.os_field }}"],
+            "cpu": ["${{ matrix.cpu_field }}"],
+            "bin": {
+              "gnd": "${BIN_PATH}"
+            },
+            "publishConfig": {
+              "access": "public",
+              "provenance": true
+            },
+            "license": "(Apache-2.0 OR MIT)",
+            "repository": {
+              "type": "git",
+              "url": "https://github.com/graphprotocol/graph-node.git"
+            }
+          }
+          EOF
+
+      - name: Publish
+        run: npm publish --provenance --access public --tag ${{ steps.version.outputs.tag }} ${{ inputs.dry_run && '--dry-run' || '' }}
+        working-directory: pkg
+
+  publish-npm-wrapper:
+    name: Publish @graphprotocol/gnd wrapper
+    needs: publish-npm
+    if: startsWith(github.ref, 'refs/tags/') || inputs.release_tag != ''
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Determine version and npm tag
+        id: version
+        shell: bash
+        run: |
+          VERSION="${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}"
+          VERSION="${VERSION#v}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          if [[ "$VERSION" == *-* ]]; then
+            PRE="${VERSION#*-}"
+            TAG="${PRE%%.*}"
+            echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create wrapper package
+        shell: bash
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+
+          mkdir -p pkg/bin
+          cp gnd/npm/bin/gnd.js pkg/bin/gnd.js
+          cp gnd/npm/README.md pkg/README.md
+
+          cat > pkg/package.json << EOF
+          {
+            "name": "@graphprotocol/gnd",
+            "version": "${VERSION}",
+            "description": "Graph Node Development CLI",
+            "bin": {
+              "gnd": "./bin/gnd.js"
+            },
+            "optionalDependencies": {
+              "@graphprotocol/gnd-darwin-arm64": "${VERSION}",
+              "@graphprotocol/gnd-darwin-x64": "${VERSION}",
+              "@graphprotocol/gnd-linux-arm64": "${VERSION}",
+              "@graphprotocol/gnd-linux-x64": "${VERSION}",
+              "@graphprotocol/gnd-win32-x64": "${VERSION}"
+            },
+            "publishConfig": {
+              "access": "public",
+              "provenance": true
+            },
+            "license": "(Apache-2.0 OR MIT)",
+            "repository": {
+              "type": "git",
+              "url": "https://github.com/graphprotocol/graph-node.git"
+            }
+          }
+          EOF
+
+      - name: Publish
+        run: npm publish --provenance --access public --tag ${{ steps.version.outputs.tag }} ${{ inputs.dry_run && '--dry-run' || '' }}
+        working-directory: pkg
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 038afe1d530..0480ebcf19b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ lcov.info
 
 # Node dependencies
 node_modules/
+.pnpm-store/
 
 # Docker volumes and debug logs
 .postgres
@@ -37,3 +38,4 @@ logfile
 
 # Local claude settings
 .claude/settings.local.json
+.claude/ralph-loop.local.md
diff --git a/CLAUDE.md b/CLAUDE.md
index 52c08a65342..b8ec983428b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -84,21 +84,23 @@ When filtering for specific tests, ensure the intended test name(s) appear in th
 3. Anvil running on localhost:3021
 4. PNPM
 5. Foundry (for smart contract compilation)
-6. **Built graph-node binary** (integration tests require the compiled binary)
 
 The environment dependencies and environment setup are operated by the human.
 
 **Running Integration Tests:**
 
 ```bash
-# REQUIRED: Build graph-node binary before running integration tests
-just build
-
-# Run all integration tests
+# Run all integration tests (automatically builds graph-node and gnd)
 just test-integration
 
 # Run a specific integration test case (e.g., "grafted" test case)
 TEST_CASE=grafted just test-integration
+
+# (Optional) Use graph-cli instead of gnd for compatibility testing
+GRAPH_CLI=node_modules/.bin/graph just test-integration
+
+# Override ports if using different service ports (e.g., for local development)
+POSTGRES_TEST_PORT=5432 ETHEREUM_TEST_PORT=8545 IPFS_TEST_PORT=5001 just test-integration
 ```
 
 **⚠️ Test Verification Requirements:**
@@ -112,6 +114,8 @@ TEST_CASE=grafted just test-integration
 - Integration tests take significant time (several minutes)
 - Tests automatically reset the database between runs
 - Logs are written to `tests/integration-tests/graph-node.log`
+- **If a test hangs for >10 minutes**, it's likely stuck - kill with `pkill -9 integration_tests` and check logs
+- CI uses the default ports (3011, 3021, 3001) - local development can override with environment variables
 
 ### Code Quality
 
@@ -258,10 +262,7 @@ just test-runner
 # PostgreSQL: localhost:3011, IPFS: localhost:3001, Anvil: localhost:3021
 nix run .#integration
 
-# Claude: Build graph-node binary before running integration tests
-just build
-
-# Claude: Run integration tests
+# Claude: Run integration tests (automatically builds graph-node and gnd)
 just test-integration
 ```
 
diff --git a/Cargo.lock b/Cargo.lock
index a0c04723ed1..5e204e6ad4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,18 +14,18 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.25.1"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+checksum = "59317f77929f0e679d39364702289274de2f0f0b22cbf50b2b8cff2169a0b27a"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -33,7 +33,7 @@ version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "const-random",
  "getrandom 0.3.1",
  "once_cell",
@@ -50,6 +50,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -58,9 +73,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf23ee5a0d40c75ade22bf33f117058461fc30a95e84d48b01c845c28f4ea7c5"
+checksum = "5e1e915a830ea2ee123c9d3886bfec3302a7ddcd73a973ab165ed45aca2e42c3"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -91,14 +106,14 @@ checksum = "ef3a72a2247c34a8545ee99e562b1b9b69168e5000567257ae51e91b4e6b1193"
 dependencies = [
  "alloy-primitives",
  "num_enum",
- "strum",
+ "strum 0.27.2",
 ]
 
 [[package]]
 name = "alloy-consensus"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e46a465e50a339a817070ec23f06eb3fc9fbb8af71612868367b875a9d49e3"
+checksum = "83447eeb17816e172f1dfc0db1f9dc0b7c5d069bd1f7cecbecceb382bf931015"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -110,11 +125,11 @@ dependencies = [
  "auto_impl",
  "borsh",
  "c-kzg",
- "derive_more 2.1.1",
+ "derive_more",
  "either",
  "k256",
  "once_cell",
- "rand 0.8.5",
+ "rand 0.8.6",
  "secp256k1 0.30.0",
  "serde",
  "serde_json",
@@ -124,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07001b1693af794c7526aab400b42e38075f986ef8fef78841e5ebc745473e56"
+checksum = "5406343e306856dc2be762700e98a16904de45dee14a07f233e742ce68daff2f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -139,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef1b07c3ff5bf4fab5b8e6c46190cd40b2f2fd2cd72b5b02527a38125d0bff4"
+checksum = "3ae8b60d71b92824e095b4003ff01fd2bc923017b7568997c5f459240e83499c"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -158,13 +173,14 @@ dependencies = [
  "futures-util",
  "serde_json",
  "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
 name = "alloy-core"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a651e1d9e50e6d0a78bd23cd08facb70459a94501c4036c7799a093e569a310"
+checksum = "62ddde5968de6044d67af107ad835bc0069a7ca245870b94c5958a7d8712b184"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -175,9 +191,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d48a9101f4a67c22fae57489f1ddf3057b8ab4a368d8eac3be088b6e9d9c9d9"
+checksum = "a475bb02d9cef2dbb99065c1664ab3fe1f9352e21d6d5ed3f02cdbfc06ed1abc"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -188,7 +204,7 @@ dependencies = [
  "proptest",
  "serde",
  "serde_json",
- "winnow 0.7.13",
+ "winnow 1.0.0",
 ]
 
 [[package]]
@@ -201,7 +217,7 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "crc",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "thiserror 2.0.18",
 ]
@@ -216,7 +232,7 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "borsh",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
 ]
 
@@ -231,20 +247,34 @@ dependencies = [
  "arbitrary",
  "borsh",
  "k256",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "alloy-eip7928"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3231de68d5d6e75332b7489cfcc7f4dfabeba94d990a10e4b923af0e6623540"
+dependencies = [
+ "alloy-primitives",
+ "alloy-rlp",
+ "arbitrary",
+ "borsh",
+ "serde",
+]
+
 [[package]]
 name = "alloy-eips"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707337efeb051ddbaece17a73eaec5150945a5a5541112f4146508248edc2e40"
+checksum = "0dca4c89ace90684b4b77366d00631ed498c9af962079af2a5dbc593a0618a77"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
  "alloy-eip7702",
+ "alloy-eip7928",
  "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
@@ -252,19 +282,18 @@ dependencies = [
  "auto_impl",
  "borsh",
  "c-kzg",
- "derive_more 2.1.1",
+ "derive_more",
  "either",
  "serde",
  "serde_with",
- "sha2",
- "thiserror 2.0.18",
+ "sha2 0.10.9",
 ]
 
 [[package]]
 name = "alloy-genesis"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ba7afffa225272cf50c62ff04ac574adc7bfa73af2370db556340f26fcff5c"
+checksum = "ab0e0fe9e6d1120ad7bb9254c3fc2b9bc80a8df42a033fb626be6559c13d5153"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -277,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9914c147bb9b25f440eca68a31dc29f5c22298bfa7754aa802965695384122b0"
+checksum = "7c36c9d7f9021601b04bfef14a4b64849f6d73116a4e91e071d7fbfe10247901"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -289,13 +318,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b626409c98ba43aaaa558361bca21440c88fd30df7542c7484b9c7a1489cdb"
+checksum = "ec0a82e56b1843bce483942d54fcadea92e676f1bde162e93c7d3b621fabc4e1"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
- "http 1.4.0",
+ "http 1.4.2",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -304,9 +333,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "364a5eaa598437d7a57bcbcb4b7fcb0518e192cf809a19b09b2b5cf73b9ba1cd"
+checksum = "a7db7b095b0b1db1d18ce7e91dcd2e82007f2d52bfb8125e6b64633a74a06bc3"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -321,7 +350,7 @@ dependencies = [
  "alloy-sol-types",
  "async-trait",
  "auto_impl",
- "derive_more 2.1.1",
+ "derive_more",
  "futures-utils-wasm",
  "serde",
  "serde_json",
@@ -330,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21af5255bd276e528ee625d97033884916e879a1c6edcd5b70a043bd440c0710"
+checksum = "cd28d9bfd11729037d194f2b1d43db8642eb3f342032691f4ca96bb745479c3c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -343,39 +372,39 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db950a29746be9e2f2c6288c8bd7a6202a81f999ce109a2933d2379970ec0fa"
+checksum = "4885c1409b6936c4898e646ef58baf6ec54edaf6d8179f79df805a7b85b7cf3e"
 dependencies = [
  "alloy-rlp",
  "arbitrary",
  "bytes",
- "cfg-if 1.0.0",
+ "cfg-if",
  "const-hex",
- "derive_more 2.1.1",
+ "derive_more",
  "foldhash 0.2.0",
- "hashbrown 0.16.1",
- "indexmap 2.11.4",
+ "hashbrown 0.17.0",
+ "indexmap 2.14.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
- "proptest-derive 0.6.0",
- "rand 0.9.2",
+ "proptest-derive 0.8.0",
+ "rand 0.9.3",
  "rapidhash",
  "ruint",
- "rustc-hash 2.1.1",
+ "rustc-hash",
+ "secp256k1 0.31.1",
  "serde",
  "sha3",
- "tiny-keccak 2.0.2",
 ]
 
 [[package]]
 name = "alloy-provider"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc919fe241f9dd28c4c7f7dcff9e66e550c280bafe3545e1019622e1239db38"
+checksum = "8955ab30418343de57b356de2ea60200f9fb8016a7ea3bc7f5c6176f01a8b1cf"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -407,7 +436,7 @@ dependencies = [
  "lru",
  "parking_lot",
  "pin-project",
- "reqwest",
+ "reqwest 0.13.2",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -419,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94813abbd7baa30c700ea02e7f92319dbcb03bff77aeea92a3a9af7ba19c5c70"
+checksum = "7cd85cfea1fa8ebd20d3475e961fe3a3624c0eb4659ea137715c0c83c8aeaff0"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -446,7 +475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4"
 dependencies = [
  "alloy-rlp-derive",
- "arrayvec 0.7.4",
+ "arrayvec",
  "bytes",
 ]
 
@@ -458,14 +487,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff01723afc25ec4c5b04de399155bef7b6a96dfde2475492b1b7b4e7a4f46445"
+checksum = "24f461f091dc8f657e73b5dea18fd63d5c7049720cd252f1eade4a7ebed6a7e1"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -476,7 +505,7 @@ dependencies = [
  "alloy-transport-ws",
  "futures 0.3.31",
  "pin-project",
- "reqwest",
+ "reqwest 0.13.2",
  "serde",
  "serde_json",
  "tokio",
@@ -489,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3000edc72a300048cf461df94bfa29fc5d7760ddd88ca7d56ea6fc8b28729"
+checksum = "052c031d1f7c5611997056bbcb8814e5cbf20f7efeee8c3de690555172038cf2"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -506,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1207e852f30297d6918f91df3e76f758fa7b519ea1e49fbd7d961ce796663f9"
+checksum = "2ff111a54268dc0bbd3b17f98571a7e27cc661dc081ad2999d91888647eb2e11"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -518,32 +547,37 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ebc96cf29095c10a183fb7106a097fe12ca8dd46733895582da255407f54b29"
+checksum = "0a6561ed4759c974d9c144500a59e3fb8c1d87327a12900d5ce455c0cae6dcb6"
 dependencies = [
  "alloy-consensus-any",
+ "alloy-network-primitives",
+ "alloy-primitives",
  "alloy-rpc-types-eth",
  "alloy-serde",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab1ebed118b701c497e6541d2d11dfa6f3c6ae31a3c52999daa802fcdcc16b7"
+checksum = "48b9ad6eee93dd35a9ec0a6c1c6b180892a900ee17a6ed6500921552dd71e846"
 dependencies = [
  "alloy-primitives",
- "derive_more 2.1.1",
+ "alloy-rlp",
+ "derive_more",
  "serde",
  "serde_with",
 ]
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f35af673cc14e89813ab33671d79b6e73fe38788c5f3a8ec3a75476b58225f53"
+checksum = "7eba59e1c069f168a01982f42a57797736923b76aa854194df4930be17867e1c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -551,17 +585,17 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde",
  "arbitrary",
- "derive_more 2.1.1",
- "rand 0.8.5",
+ "derive_more",
+ "rand 0.8.6",
  "serde",
- "strum",
+ "strum 0.27.2",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cc3f354a5079480acca0a6533d1d3838177a03ea494ef0ae8d1679efea88274"
+checksum = "175a2a5b6017d7f61b5e4b800d21215fe8e94fe729d00828e13bb6d93dcf3492"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -572,7 +606,7 @@ dependencies = [
  "alloy-serde",
  "alloy-sol-types",
  "arbitrary",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -581,9 +615,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d782d80221dfaa5a2f8a7bf277370bdec10e4e8119f5a60d2e2b1adb2e806ca"
+checksum = "514b4b1ce3354f65067b4fc7eb75358e0f2ec8be3340c96dea65d6894f9ca435"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -595,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-txpool"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3076c226bb4365f9c3ac0cd4082ba86208aaa1485cbf664383a90aba7c36b26"
+checksum = "76e34a42ebb4a71ab0bfdebc6d2f3c7bf809f01edf154d08fed159d10d1ef1d4"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -607,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a438ce4cd49ec4bc213868c1fe94f2fe103d4c3f22f6a42073db974f9c0962da"
+checksum = "cc21a8772af7d78bba286726aa245bd2ff81cd9abe230afea2e91578996831c9"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -619,9 +653,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb10ccd49d0248df51063fce6b716f68a315dd912d55b32178c883fd48b4021d"
+checksum = "8ffbce94c50dd9d4d1f83e044c5595bbd3ada981bd3057ce28b3a5470e77385d"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -634,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69c260e78b9c104c444f8a202f283d5e8c6637e6fa52a83f649ad6aaa0b91fd0"
+checksum = "e48366d2c42b8d95ef951101bafa28486590f21b7a1e68b6b2d069746557bbe3"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -644,48 +678,48 @@ dependencies = [
  "alloy-signer",
  "async-trait",
  "k256",
- "rand 0.8.5",
+ "rand 0.8.6",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "alloy-sol-macro"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b96d5f5890605ba9907ce1e2158e2701587631dc005bfa582cf92dd6f21147"
+checksum = "840128ed2b2971d6d4668a553fe403a82683d3acc646c73e75887e7157408033"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8247b7cca5cde556e93f8b3882b01dbd272f527836049083d240c57bf7b4c15"
+checksum = "63ec265e5d65d725175f6ca7711c970824c90ef9c0d1f1973711d4150ee612dd"
 dependencies = [
  "alloy-json-abi",
  "alloy-sol-macro-input",
  "const-hex",
  "heck 0.5.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "sha3",
+ "syn 2.0.118",
  "syn-solidity",
- "tiny-keccak 2.0.2",
 ]
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd54f38512ac7bae10bbc38480eefb1b9b398ca2ce25db9cc0c048c6411c4f1"
+checksum = "89bf01077f18650876cfa682eb1f949967b5cde03f1a51c955c469d2c9b4aa67"
 dependencies = [
  "alloy-json-abi",
  "const-hex",
@@ -695,25 +729,25 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.114",
+ "syn 2.0.118",
  "syn-solidity",
 ]
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af67a0b0dcebe14244fc92002cd8d96ecbf65db4639d479f5fcd5805755a4c27"
+checksum = "857b470ecdd2ed38beaf82ad1a38c516a8ff75266750f38b9eeed001d575241b"
 dependencies = [
  "serde",
- "winnow 0.7.13",
+ "winnow 1.0.0",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1038284171df8bfd48befc0c7b78f667a7e2be162f45f07bd1c378078ebe58"
+checksum = "384cf252de0db2dec52821eac037a7f57e2aa33fe5b900ce6fe39973402341f1"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -723,14 +757,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f50a9516736d22dd834cc2240e5bf264f338667cc1d9e514b55ec5a78b987ca"
+checksum = "86052fdcec72d37ca4aa4b66254601e7453c45a6e1c70aa4561033d002fb80cc"
 dependencies = [
  "alloy-json-rpc",
  "auto_impl",
- "base64 0.22.1",
- "derive_more 2.1.1",
+ "base64",
+ "derive_more",
  "futures 0.3.31",
  "futures-utils-wasm",
  "parking_lot",
@@ -746,13 +780,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a18b541a6197cf9a084481498a766fdf32fefda0c35ea6096df7d511025e9f1"
+checksum = "b273587487921274f4f5d0ef2c7ef36944dcbb75a4e2318e69eae822bd263f91"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
- "reqwest",
+ "itertools 0.13.0",
+ "reqwest 0.13.2",
  "serde_json",
  "tower 0.5.2",
  "tracing",
@@ -761,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8075911680ebc537578cacf9453464fd394822a0f68614884a9c63f9fbaf5e89"
+checksum = "bfb89df168b24773ef603af14f2449c05a7d3f27d05d3eceaea6bf96cccae168"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -775,24 +810,26 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.4.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921d37a57e2975e5215f7dd0f28873ed5407c7af630d4831a4b5c737de4b0b8b"
+checksum = "33e32e0b47d3b3bf5770b7c132090c614b008d307c5e1544f1925f5b7e9e9af6"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
  "futures 0.3.31",
- "http 1.4.0",
+ "http 1.4.2",
+ "rustls",
  "serde_json",
  "tokio",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite 0.28.0",
  "tracing",
+ "url",
  "ws_stream_wasm",
 ]
 
@@ -805,9 +842,9 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arbitrary",
- "arrayvec 0.7.4",
+ "arrayvec",
  "derive_arbitrary",
- "derive_more 2.1.1",
+ "derive_more",
  "nybbles",
  "proptest",
  "proptest-derive 0.5.1",
@@ -818,14 +855,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.3.0"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99dac443033e83b14f68fac56e8c27e76421f1253729574197ceccd06598f3ef"
+checksum = "01a0035943b75fe1e249f52e688492d7a1b1826bc2d19b8e1d5d3c24a2ad8f50"
 dependencies = [
- "darling 0.21.3",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -839,12 +876,27 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse 0.2.4",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstream"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
- "anstyle-parse",
+ "anstyle-parse 1.0.0",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
@@ -854,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
@@ -867,6 +919,15 @@ dependencies = [
  "utf8parse",
 ]
 
+[[package]]
+name = "anstyle-parse"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
+dependencies = [
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle-query"
 version = "1.1.0"
@@ -878,19 +939,20 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "arbitrary"
@@ -903,9 +965,12 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.7.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "arcstr"
@@ -961,7 +1026,7 @@ dependencies = [
  "ark-ff-macros 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
- "arrayvec 0.7.4",
+ "arrayvec",
  "digest 0.10.7",
  "educe",
  "itertools 0.13.0",
@@ -998,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1036,7 +1101,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1067,7 +1132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
  "ark-std 0.5.0",
- "arrayvec 0.7.4",
+ "arrayvec",
  "digest 0.10.7",
  "num-bigint 0.4.6",
 ]
@@ -1079,7 +1144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -1089,7 +1154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
 [[package]]
@@ -1099,21 +1164,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
 ]
 
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -1125,9 +1178,9 @@ dependencies = [
 
 [[package]]
 name = "arrow"
-version = "57.0.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df8bb5b0bd64c0b9bc61317fcc480bad0f00e56d3bc32c69a4c8dada4786bae"
+checksum = "ffaaa3e009861fd829d0a24dd6f115aa8e4634324bb092147d43baafe69ca4a7"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -1146,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-arith"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288015089e7931843c80ed4032c5274f02b37bcb720c4a42096d50b390e70372"
+checksum = "3ac95125e1d71c4a252b5a9c729aef111e80418f08aaa6dbabd1ba66918247fc"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1160,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-array"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ca404ea6191e06bf30956394173337fa9c35f445bd447fe6c21ab944e1a23c"
+checksum = "0c60c79628e9a97cb90d7a0dc3e944f216a902f837d4ecabc14d524bddbbc137"
 dependencies = [
  "ahash",
  "arrow-buffer",
@@ -1170,7 +1223,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "num-complex",
  "num-integer",
  "num-traits",
@@ -1178,9 +1231,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-buffer"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36356383099be0151dacc4245309895f16ba7917d79bdb71a7148659c9206c56"
+checksum = "6026f638c400e9878c1b1cc05c3cfd46fbf381285916ab408678701c1df46c1a"
 dependencies = [
  "bytes",
  "half",
@@ -1190,9 +1243,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-cast"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8e372ed52bd4ee88cc1e6c3859aa7ecea204158ac640b10e187936e7e87074"
+checksum = "c82c236c3caf8df5664284f3f1fbe89938852163998c3fdbf37e84ac220445e9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1201,7 +1254,7 @@ dependencies = [
  "arrow-schema",
  "arrow-select",
  "atoi",
- "base64 0.22.1",
+ "base64",
  "chrono",
  "half",
  "lexical-core",
@@ -1211,9 +1264,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-csv"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e4100b729fe656f2e4fb32bc5884f14acf9118d4ad532b7b33c1132e4dce896"
+checksum = "12714e5fb7954159af1e26d4e0d37108bcf1a2ad5ee5c5bf02a944d564d588b7"
 dependencies = [
  "arrow-array",
  "arrow-cast",
@@ -1226,9 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-data"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf87f4ff5fc13290aa47e499a8b669a82c5977c6a1fedce22c7f542c1fd5a597"
+checksum = "7bd568aa70c4ec5947027b0d5caee94877433b661a0bb9e8ddceeeb5f0c9b1ab"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
@@ -1239,9 +1292,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-flight"
-version = "57.0.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f70bb56412a007b0cfc116d15f24dda6adeed9611a213852a004cda20085a3b9"
+checksum = "68365401e834743d708094927e2ca727a32d639fe900df04b936e07a36701b74"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -1254,7 +1307,7 @@ dependencies = [
  "arrow-schema",
  "arrow-select",
  "arrow-string",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures 0.3.31",
  "once_cell",
@@ -1267,9 +1320,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ipc"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3ca63edd2073fcb42ba112f8ae165df1de935627ead6e203d07c99445f2081"
+checksum = "e57ee4d470eab1a021bc4b63fa2b2c15d572892bf227b0a982d3b755a6c662b5"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1281,18 +1334,19 @@ dependencies = [
 
 [[package]]
 name = "arrow-json"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a36b2332559d3310ebe3e173f75b29989b4412df4029a26a30cc3f7da0869297"
+checksum = "38f47e0e7a284e1f3707a780dc8cd5451b1614e9e398ea2d9ca03c7a2fe9a9ed"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
  "arrow-cast",
- "arrow-data",
+ "arrow-ord",
  "arrow-schema",
+ "arrow-select",
  "chrono",
  "half",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "lexical-core",
  "memchr",
@@ -1305,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ord"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c4e0530272ca755d6814218dffd04425c5b7854b87fa741d5ff848bf50aa39"
+checksum = "a79cf73ad2eba8686ec2aa9bbf8671208e509025f166afc040cedbd94ffe4983"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1318,9 +1372,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-row"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07f52788744cc71c4628567ad834cadbaeb9f09026ff1d7a4120f69edf7abd3"
+checksum = "cea0f7d8ed6182f14952761e2c0f989852d5aa334fcbc49f73a9f2247c25b879"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1331,15 +1385,15 @@ dependencies = [
 
 [[package]]
 name = "arrow-schema"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb63203e8e0e54b288d0d8043ca8fa1013820822a27692ef1b78a977d879f2c"
+checksum = "80b3e786a0dd9103acd583a6fb486dbf2f3268466cc0bd571dcf34cef231c1f1"
 
 [[package]]
 name = "arrow-select"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c96d8a1c180b44ecf2e66c9a2f2bbcb8b1b6f14e165ce46ac8bde211a363411b"
+checksum = "067a67e0361f6c31f4a7248759f36ca4ca71b187a941ed4d49da1c7d3d4db624"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -1351,9 +1405,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-string"
-version = "57.2.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8ad6a81add9d3ea30bf8374ee8329992c7fd246ffd8b7e2f48a3cea5aa0cc9a"
+checksum = "99bc95847f3ff62a2b03d6f8ce2e3e78f01362060549a2a311898dd442f6256d"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1382,6 +1436,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "async-compression"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
+dependencies = [
+ "brotli",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "async-graphql"
 version = "7.2.1"
@@ -1394,15 +1462,15 @@ dependencies = [
  "async-io",
  "async-trait",
  "asynk-strim",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "chrono",
  "fast_chemail",
  "fnv",
  "futures-util",
  "handlebars",
- "http 1.4.0",
- "indexmap 2.11.4",
+ "http 1.4.2",
+ "indexmap 2.14.0",
  "mime",
  "multer",
  "num-traits",
@@ -1429,7 +1497,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1445,8 +1513,8 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "strum",
- "syn 2.0.114",
+ "strum 0.27.2",
+ "syn 2.0.118",
  "thiserror 2.0.18",
 ]
 
@@ -1469,7 +1537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e3ef112905abea9dea592fc868a6873b10ebd3f983e83308f995d6284e9ba41"
 dependencies = [
  "bytes",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
  "serde_json",
 ]
@@ -1481,15 +1549,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.0.7",
+ "rustix 1.1.4",
  "slab",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1500,7 +1579,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1522,18 +1601,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1574,20 +1653,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atomic_refcell"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
+checksum = "21e4227379beff4205943696e6c3e0cd809bacdf3f0edd6e3dd153e2269571a4"
 
 [[package]]
 name = "auto_impl"
@@ -1597,7 +1665,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1606,21 +1674,43 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "axum"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
  "axum-core",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "form_urlencoded",
  "futures-util",
- "http 1.4.0",
- "http-body 1.0.0",
+ "http 1.4.2",
+ "http-body",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-util",
  "itoa",
  "matchit",
@@ -1632,10 +1722,10 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sha1",
+ "sha1 0.10.6",
  "sync_wrapper",
  "tokio",
- "tokio-tungstenite 0.28.0",
+ "tokio-tungstenite 0.29.0",
  "tower 0.5.2",
  "tower-layer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1650,8 +1740,8 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.4.0",
- "http-body 1.0.0",
+ "http 1.4.2",
+ "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -1682,18 +1772,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -1706,15 +1784,6 @@ version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d809780667f4410e7c41b07f52439b94d2bdf8528eeedc287fa38d3b7f95d82"
 
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.1.2"
@@ -1727,17 +1796,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bigdecimal"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
-dependencies = [
- "num-bigint 0.4.6",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "bimap"
 version = "0.6.3"
@@ -1783,9 +1841,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bitvec"
@@ -1801,48 +1859,33 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "cc",
- "cfg-if 0.1.10",
- "constant_time_eq 0.1.5",
- "crypto-mac",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "blake3"
-version = "1.8.2"
+version = "1.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+checksum = "6d9e454fc11f76977dc803893aff6304ed33d6a26efae8696573bea74baa27ae"
 dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "cc",
- "cfg-if 1.0.0",
- "constant_time_eq 0.3.1",
+ "cfg-if",
+ "constant_time_eq",
+ "cpufeatures 0.3.0",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.9.0"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.10.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
 dependencies = [
- "generic-array",
+ "hybrid-array",
 ]
 
 [[package]]
@@ -1877,7 +1920,28 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "brotli"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
 ]
 
 [[package]]
@@ -1907,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 dependencies = [
  "allocator-api2",
 ]
@@ -1928,9 +1992,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 dependencies = [
  "serde",
 ]
@@ -1953,9 +2017,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.43"
+version = "1.2.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739eb0f94557554b3ca9a86d2d37bebd49c5e6d0c1d2bda35ba5bdac830befc2"
+checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1964,10 +2028,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "cfg-if"
-version = "0.1.10"
+name = "cesu8"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
@@ -1981,30 +2045,40 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.0",
+]
+
 [[package]]
 name = "chrono"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
 name = "cid"
-version = "0.11.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a"
+checksum = "21a304f95f84d169a6f31c4d0a30d784643aaa0bbc9c1e449a2c23e963ec4971"
 dependencies = [
- "core2",
  "multibase",
  "multihash",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -2023,13 +2097,22 @@ version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
- "anstream",
+ "anstream 0.6.21",
  "anstyle",
  "clap_lex",
  "strsim",
  "terminal_size",
 ]
 
+[[package]]
+name = "clap_complete"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae"
+dependencies = [
+ "clap",
+]
+
 [[package]]
 name = "clap_derive"
 version = "4.5.8"
@@ -2039,7 +2122,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2048,11 +2131,23 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
+[[package]]
+name = "cmake"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "cobs"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.18",
+]
 
 [[package]]
 name = "colorchoice"
@@ -2071,7 +2166,7 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
 ]
 
 [[package]]
@@ -2096,14 +2191,26 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "console"
+version = "0.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "const-hex"
 version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735"
 dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
+ "cfg-if",
+ "cpufeatures 0.2.12",
  "proptest",
  "serde_core",
 ]
@@ -2114,6 +2221,12 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
 [[package]]
 name = "const-random"
 version = "0.1.18"
@@ -2131,26 +2244,14 @@ checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
  "getrandom 0.2.15",
  "once_cell",
- "tiny-keccak 2.0.2",
+ "tiny-keccak",
 ]
 
 [[package]]
 name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 
 [[package]]
 name = "convert_case"
@@ -2187,22 +2288,13 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "core2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "cpp_demangle"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2214,48 +2306,59 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "cranelift-assembler-x64"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57cc4ac031157d0206cf6a8faa48284034721cd367a45e004c4e06329f51e106"
+checksum = "e06aeba2c965fc446d13c56a6ccb2631b78445d7544543dd9a25289977630914"
 dependencies = [
  "cranelift-assembler-x64-meta",
 ]
 
 [[package]]
 name = "cranelift-assembler-x64-meta"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a121c08faeeca04c85280dbddb19521e3ed7169430fd6abc34496e656c18b20"
+checksum = "ee2d2dde4ec1352715595b5cfa6fe2e5b8ebb9da3457b3ee8db0aa2808c069aa"
 dependencies = [
  "cranelift-srcgen",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f2b2cd8224147b4e193c2de68cf0085b693b242bb766c594828db3907151cb"
+checksum = "03b4982ef9fa54ec9eee841e891e7ddc5434be1250e88de31572e000c888f30b"
 dependencies = [
  "cranelift-entity",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7468865d7cf72637a30d5fb97c4fc38b6ea82ab54ca913c81e7403274802be"
+checksum = "529143118c4eeb58c39ecb02319557d512be6c61348486422974ab8e3906b8a8"
 dependencies = [
  "serde",
  "serde_derive",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96c94a373ec1a35fb889730525f3fd220e66b1cf222b3426f5eb6e0404718e5"
+checksum = "b7780677247ad3577e3a6a3ebf43f39b325a11d6393db72b2c9968a910d4d13d"
 dependencies = [
  "bumpalo",
  "cranelift-assembler-x64",
@@ -2267,22 +2370,26 @@ dependencies = [
  "cranelift-entity",
  "cranelift-isle",
  "gimli",
- "hashbrown 0.15.2",
+ "hashbrown 0.17.0",
+ "libm",
  "log",
+ "postcard",
  "pulley-interpreter",
  "regalloc2",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "serde",
+ "serde_derive",
+ "sha2 0.10.9",
  "smallvec",
  "target-lexicon",
- "wasmtime-internal-math",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5904cbc4e8d4f8a69129a365da30d6f9f0e6ca024c4e0728d5da615e8db3c44"
+checksum = "ac9645250416cbf92454fe61160e17e026e0ce405906a54500b114f923ddffc9"
 dependencies = [
  "cranelift-assembler-x64-meta",
  "cranelift-codegen-shared",
@@ -2293,37 +2400,39 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1009f9e206d5fba4add039539f3e16378815a53b8477bd2d1fc8e3bde6ea93a"
+checksum = "20ee8d222ff0fd3681791979afbf88586ac9f49010d3db96b3cbe4c96759aee3"
 
 [[package]]
 name = "cranelift-control"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c5e3cc40402febecdba0a9e45999b1ab9aef8b120833182b08830b7be292fb"
+checksum = "591abe6f5312bd2c4220f1b3bead56c2ad00257c52668015ba013b85dcf2a17a"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58a1de9bdab836734c42902ce948a5cdcc923ae8ce30b29a24dbe76098df659"
+checksum = "a5300c49cf940526fe771517b3b3eabd5d0ff164ee61698579cf403fe8d3af3c"
 dependencies = [
  "cranelift-bitset",
  "serde",
  "serde_derive",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3423b326097e627a378c106eb57d5ddb3f303d4deb87d29bf8b982dd1d6afc"
+checksum = "da4adbf760207fdbbe130f1191cce01cdef66831a9f648b1f39ff2800d126d45"
 dependencies = [
  "cranelift-codegen",
+ "hashbrown 0.17.0",
  "log",
  "smallvec",
  "target-lexicon",
@@ -2331,15 +2440,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56f0e7abec391b94314ab2e9a1002c5a0aed6e29e4709318a7e33315767bed7"
+checksum = "8315b21ff018226a42a60a4702c2dd75f6447cac26e9bca622e14c22088c2ff5"
 
 [[package]]
 name = "cranelift-native"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e528d9c791306c55c3bef6c70a77cc9712ca9a32b12bae86924224e65604cb69"
+checksum = "d506ef23a60715bde451b06620b14402166ded3b648454fccbf04f3e46a4aa70"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -2348,9 +2457,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-srcgen"
-version = "0.123.5"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8558dda6bd86b48c7b31b46555b5eed24b55c839e554a42765c23bf98de62997"
+checksum = "48ed47e602652e3410f9387fc0db70fefadcee4d78a78881421aabcab4e26b89"
 
 [[package]]
 name = "crc"
@@ -2373,7 +2482,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2432,6 +2541,33 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "crossterm"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
+dependencies = [
+ "bitflags 2.11.1",
+ "crossterm_winapi",
+ "derive_more",
+ "document-features",
+ "mio",
+ "parking_lot",
+ "rustix 1.1.4",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -2461,13 +2597,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "crypto-mac"
-version = "0.8.0"
+name = "crypto-common"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
 dependencies = [
- "generic-array",
- "subtle",
+ "hybrid-array",
 ]
 
 [[package]]
@@ -2532,7 +2667,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2545,9 +2680,8 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "serde",
  "strsim",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2559,8 +2693,9 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
+ "serde",
  "strsim",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2571,7 +2706,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2582,7 +2717,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2593,7 +2728,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2602,7 +2737,7 @@ version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "hashbrown 0.14.5",
  "lock_api",
@@ -2642,17 +2777,34 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b"
 dependencies = [
- "deadpool-runtime",
+ "deadpool-runtime 0.1.4",
  "lazy_static",
  "num_cpus",
  "tokio",
 ]
 
+[[package]]
+name = "deadpool"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883466cb8db62725aee5f4a6011e8a5d42912b42632df32aad57fc91127c6e04"
+dependencies = [
+ "deadpool-runtime 0.3.1",
+ "num_cpus",
+ "tokio",
+]
+
 [[package]]
 name = "deadpool-runtime"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
+
+[[package]]
+name = "deadpool-runtime"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2657f61fb1dd8bf37a8d51093cc7cee4e77125b22f7753f49b289f831bec2bae"
 dependencies = [
  "tokio",
 ]
@@ -2678,18 +2830,18 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
- "const-oid",
+ "const-oid 0.9.6",
  "zeroize",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2711,7 +2863,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2732,7 +2884,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2742,20 +2894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
-dependencies = [
- "convert_case 0.4.0",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2773,28 +2912,28 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
- "convert_case 0.10.0",
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version 0.4.0",
- "syn 2.0.114",
+ "syn 2.0.118",
  "unicode-xid",
 ]
 
 [[package]]
 name = "diesel"
-version = "2.3.2"
+version = "2.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
+checksum = "9940fb8467a0a06312218ed384185cb8536aa10d8ec017d0ce7fad2c1bd882d5"
 dependencies = [
- "bigdecimal 0.3.1",
- "bitflags 2.9.0",
+ "bigdecimal",
+ "bitflags 2.11.1",
  "byteorder",
  "chrono",
  "diesel_derives",
  "downcast-rs",
  "itoa",
- "num-bigint 0.4.6",
+ "num-bigint 0.2.6",
  "num-integer",
  "num-traits",
  "pq-sys",
@@ -2804,15 +2943,15 @@ dependencies = [
 
 [[package]]
 name = "diesel-async"
-version = "0.7.4"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13096fb8dae53f2d411c4b523bec85f45552ed3044a2ab4d85fb2092d9cb4f34"
+checksum = "dd39af30158d444884f166fe4c58f35dc40ad71ad017bb59408a3448526ff4bd"
 dependencies = [
- "deadpool",
+ "deadpool 0.13.0",
  "diesel",
  "futures-core",
  "futures-util",
- "scoped-futures",
+ "pin-project-lite",
  "tokio",
  "tokio-postgres",
 ]
@@ -2826,7 +2965,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2840,22 +2979,22 @@ dependencies = [
 
 [[package]]
 name = "diesel_derives"
-version = "2.3.6"
+version = "2.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c30b2969f923fa1f73744b92bb7df60b858df8832742d9a3aceb79236c0be1d2"
+checksum = "d1817b7f4279b947fc4cafddec12b0e5f8727141706561ce3ac94a60bddd1cf5"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "diesel_migrations"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745fd255645f0f1135f9ec55c7b00e0882192af9683ab4731e4bba3da82b8f9c"
+checksum = "28d0f4a98124ba6d4ca75da535f65984badec16a003b6e2f94a01e31a79490b8"
 dependencies = [
  "diesel",
  "migrations_internals",
@@ -2868,7 +3007,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2899,18 +3038,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
- "const-oid",
- "crypto-common",
+ "const-oid 0.9.6",
+ "crypto-common 0.1.6",
  "subtle",
 ]
 
+[[package]]
+name = "digest"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c"
+dependencies = [
+ "block-buffer 0.12.0",
+ "const-oid 0.10.2",
+ "crypto-common 0.2.1",
+]
+
 [[package]]
 name = "directories-next"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -2929,7 +3079,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -2964,7 +3114,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2973,6 +3123,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
 
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "downcast-rs"
 version = "2.0.2"
@@ -2990,7 +3149,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2999,6 +3158,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -3023,7 +3188,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3079,7 +3244,7 @@ version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -3099,14 +3264,14 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217"
 dependencies = [
  "log",
  "regex",
@@ -3114,11 +3279,11 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.8"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6"
 dependencies = [
- "anstream",
+ "anstream 1.0.0",
  "anstyle",
  "env_filter",
  "jiff",
@@ -3142,7 +3307,7 @@ checksum = "452c458dfb890a2fea64e4c894f83daad61689fb9bbe84c382e1ce6d7536710b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3171,47 +3336,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "ethabi"
-version = "17.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4966fba78396ff92db3b817ee71143eccd98acf0f876b8d600e585a670c5d1b"
-dependencies = [
- "ethereum-types",
- "hex",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "sha3",
- "thiserror 1.0.61",
- "uint 0.9.5",
-]
-
-[[package]]
-name = "ethbloom"
-version = "0.12.1"
+name = "event-listener"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
- "crunchy",
- "fixed-hash 0.7.0",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak 2.0.2",
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
 ]
 
 [[package]]
-name = "ethereum-types"
-version = "0.13.1"
+name = "event-listener-strategy"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "ethbloom",
- "fixed-hash 0.7.0",
- "impl-rlp",
- "impl-serde",
- "primitive-types 0.11.1",
- "uint 0.9.5",
+ "event-listener",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -3237,9 +3379,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fastrlp"
@@ -3247,7 +3389,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "auto_impl",
  "bytes",
 ]
@@ -3258,7 +3400,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "auto_impl",
  "bytes",
 ]
@@ -3275,9 +3417,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.4"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "firestorm"
@@ -3293,27 +3435,21 @@ checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98"
 
 [[package]]
 name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand 0.8.6",
  "rustc-hex",
  "static_assertions",
 ]
 
 [[package]]
-name = "fixed-hash"
-version = "0.8.0"
+name = "fixedbitset"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
-dependencies = [
- "byteorder",
- "rand 0.8.5",
- "rustc-hex",
- "static_assertions",
-]
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "fixedbitset"
@@ -3327,18 +3463,19 @@ version = "25.12.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "rustc_version 0.4.0",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
+ "zlib-rs",
 ]
 
 [[package]]
@@ -3383,6 +3520,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -3470,7 +3613,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3485,12 +3628,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -3517,24 +3654,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9"
 
 [[package]]
-name = "fxhash"
-version = "0.2.1"
+name = "fuzzy-matcher"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
 dependencies = [
- "byteorder",
+ "thread_local",
 ]
 
 [[package]]
 name = "fxprof-processed-profile"
-version = "0.6.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd"
+checksum = "25234f20a3ec0a962a61770cfe39ecf03cb529a6e474ad8cff025ed497eda557"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "debugid",
- "fxhash",
+ "rustc-hash",
  "serde",
+ "serde_derive",
  "serde_json",
 ]
 
@@ -3555,9 +3693,11 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3566,20 +3706,37 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.13.3+wasi-0.2.2",
+ "wasm-bindgen",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "rand_core 0.10.0",
+ "wasip2",
+ "wasip3",
+]
+
 [[package]]
 name = "gimli"
-version = "0.32.3"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+checksum = "0bf7f043f89559805f8c7cacc432749b2fa0d0a0a9ee46ce47164ed5ba7f126c"
 dependencies = [
- "fallible-iterator 0.3.0",
- "indexmap 2.11.4",
+ "fnv",
+ "hashbrown 0.16.1",
+ "indexmap 2.14.0",
  "stable_deref_trait",
 ]
 
@@ -3601,7 +3758,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "time",
 ]
 
@@ -3626,27 +3783,53 @@ dependencies = [
 
 [[package]]
 name = "gnd"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
+ "Inflector",
  "anyhow",
+ "async-trait",
  "clap",
+ "clap_complete",
+ "console 0.16.4",
  "env_logger",
  "git-testament",
  "globset",
  "graph",
+ "graph-chain-ethereum",
  "graph-core",
+ "graph-graphql",
  "graph-node",
+ "graph-store-postgres",
+ "graphql-tools",
+ "hex",
+ "indicatif",
+ "inquire",
  "lazy_static",
  "notify",
+ "open",
  "pgtemp",
  "pq-sys",
+ "regex",
+ "reqwest 0.12.23",
+ "semver 1.0.28",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "sha1 0.11.0",
+ "similar",
+ "tempfile",
+ "thiserror 2.0.18",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
+ "tower 0.5.2",
+ "url",
+ "walkdir",
+ "wasmparser 0.118.2",
 ]
 
 [[package]]
 name = "graph"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "Inflector",
  "ahash",
@@ -3657,9 +3840,8 @@ dependencies = [
  "async-stream",
  "async-trait",
  "atomic_refcell",
- "atty",
- "base64 0.21.7",
- "bigdecimal 0.1.2",
+ "base64",
+ "bigdecimal",
  "bs58 0.5.1",
  "bytes",
  "chrono",
@@ -3667,11 +3849,10 @@ dependencies = [
  "clap",
  "csv",
  "defer",
- "derivative",
+ "derive_more",
  "diesel",
  "diesel_derives",
  "envconfig",
- "ethabi",
  "futures 0.1.31",
  "futures 0.3.31",
  "graph_derive",
@@ -3680,12 +3861,12 @@ dependencies = [
  "hex",
  "hex-literal",
  "http 0.2.12",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-util",
  "indoc",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "lazy-regex",
  "lazy_static",
  "lru_time_cache",
@@ -3695,40 +3876,41 @@ dependencies = [
  "num-traits",
  "object_store",
  "parking_lot",
- "petgraph",
+ "petgraph 0.8.3",
  "portable-atomic",
  "priority-queue",
  "prometheus",
  "prost",
  "prost-types",
- "rand 0.9.2",
+ "rand 0.9.3",
  "redis",
  "regex",
- "reqwest",
- "semver 1.0.27",
+ "reqwest 0.12.23",
+ "rustls",
+ "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "serde_plain",
  "serde_regex",
  "serde_yaml",
- "sha2",
+ "sha2 0.11.0",
  "slog",
  "slog-async",
  "slog-envlogger",
  "slog-term",
  "sqlparser 0.57.0",
- "sqlparser 0.60.0",
+ "sqlparser 0.62.0",
  "stable-hash 0.3.4",
  "stable-hash 0.4.4",
- "strum_macros",
+ "strum_macros 0.28.0",
+ "tempfile",
  "thiserror 2.0.18",
- "tiny-keccak 1.5.0",
  "tokio",
  "tokio-retry",
  "tokio-stream",
- "tokio-util 0.7.18",
- "toml 0.9.11+spec-1.1.0",
+ "tokio-util",
+ "toml 1.1.2+spec-1.1.0",
  "tonic",
  "tonic-prost",
  "tonic-prost-build",
@@ -3739,7 +3921,7 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-common"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
@@ -3749,24 +3931,24 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-ethereum"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64 0.22.1",
+ "base64",
  "envconfig",
+ "futures 0.3.31",
  "graph",
  "graph-runtime-derive",
  "graph-runtime-wasm",
  "hex",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "jsonrpc-core",
  "prost",
  "prost-types",
- "semver 1.0.27",
+ "semver 1.0.28",
  "serde",
  "thiserror 2.0.18",
- "tiny-keccak 1.5.0",
  "tokio",
  "tokio-stream",
  "tonic-prost-build",
@@ -3775,7 +3957,7 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-near"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3792,7 +3974,7 @@ dependencies = [
 
 [[package]]
 name = "graph-core"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "alloy",
  "anyhow",
@@ -3806,16 +3988,16 @@ dependencies = [
  "graph-chain-near",
  "graph-runtime-wasm",
  "indoc",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "parking_lot",
  "prometheus",
  "serde_yaml",
  "slog",
- "strum",
+ "strum 0.28.0",
  "thiserror 2.0.18",
  "tokio",
  "tokio-retry",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tower 0.5.3",
  "tower-test",
  "wiremock",
@@ -3823,7 +4005,7 @@ dependencies = [
 
 [[package]]
 name = "graph-graphql"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -3839,10 +4021,11 @@ dependencies = [
 
 [[package]]
 name = "graph-node"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "clap",
+ "console 0.16.4",
  "diesel",
  "diesel-async",
  "env_logger",
@@ -3859,7 +4042,8 @@ dependencies = [
  "graph-store-postgres",
  "graphman",
  "graphman-server",
- "itertools 0.14.0",
+ "indicatif",
+ "itertools 0.15.0",
  "json-structural-diff",
  "lazy_static",
  "prometheus",
@@ -3867,35 +4051,35 @@ dependencies = [
  "shellexpand",
  "termcolor",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "url",
 ]
 
 [[package]]
 name = "graph-runtime-derive"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "graph-runtime-test"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "graph",
  "graph-chain-ethereum",
  "graph-runtime-wasm",
- "rand 0.9.2",
- "semver 1.0.27",
+ "rand 0.9.3",
+ "semver 1.0.28",
  "test-store",
  "wasmtime",
 ]
 
 [[package]]
 name = "graph-runtime-wasm"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3905,7 +4089,7 @@ dependencies = [
  "hex",
  "never",
  "parity-wasm",
- "semver 1.0.27",
+ "semver 1.0.28",
  "serde_yaml",
  "wasm-instrument",
  "wasmtime",
@@ -3913,7 +4097,7 @@ dependencies = [
 
 [[package]]
 name = "graph-server-http"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "graph",
@@ -3924,10 +4108,10 @@ dependencies = [
 
 [[package]]
 name = "graph-server-index-node"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "async-trait",
- "blake3 1.8.2",
+ "blake3",
  "git-testament",
  "graph",
  "graph-chain-ethereum",
@@ -3937,32 +4121,37 @@ dependencies = [
 
 [[package]]
 name = "graph-server-json-rpc"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
+ "axum",
  "graph",
- "jsonrpsee",
  "serde",
+ "serde_json",
+ "slog",
+ "thiserror 2.0.18",
+ "tokio",
 ]
 
 [[package]]
 name = "graph-server-metrics"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "graph",
 ]
 
 [[package]]
 name = "graph-store-postgres"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "Inflector",
  "anyhow",
+ "arrow",
  "async-trait",
- "blake3 1.8.2",
+ "blake3",
  "chrono",
  "clap",
- "deadpool",
- "derive_more 2.1.1",
+ "deadpool 0.13.0",
+ "derive_more",
  "diesel",
  "diesel-async",
  "diesel-derive-enum",
@@ -3974,18 +4163,19 @@ dependencies = [
  "graph",
  "graphman-store",
  "hex",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "lazy_static",
  "lru_time_cache",
  "openssl",
+ "parquet",
  "postgres",
  "postgres-openssl",
  "pretty_assertions",
- "rand 0.9.2",
+ "rand 0.9.3",
  "serde",
  "serde_json",
  "serde_yaml",
- "sqlparser 0.60.0",
+ "sqlparser 0.62.0",
  "stable-hash 0.3.4",
  "thiserror 2.0.18",
  "tokio",
@@ -3994,7 +4184,7 @@ dependencies = [
 
 [[package]]
 name = "graph-tests"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -4008,29 +4198,29 @@ dependencies = [
  "graph-runtime-wasm",
  "graph-server-index-node",
  "graph-store-postgres",
- "secp256k1 0.21.3",
  "serde",
  "serde_yaml",
  "slog",
+ "slog-async",
+ "slog-term",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.18",
- "web3",
+ "tokio-util",
 ]
 
 [[package]]
 name = "graph_derive"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "proc-macro-utils",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "graphman"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "diesel",
@@ -4038,14 +4228,14 @@ dependencies = [
  "graph",
  "graph-store-postgres",
  "graphman-store",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "thiserror 2.0.18",
  "tokio",
 ]
 
 [[package]]
 name = "graphman-server"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-graphql",
@@ -4059,32 +4249,32 @@ dependencies = [
  "graphman",
  "graphman-store",
  "lazy_static",
- "reqwest",
+ "reqwest 0.12.23",
  "serde",
  "serde_json",
  "slog",
  "test-store",
  "thiserror 2.0.18",
  "tokio",
- "tower-http",
+ "tower-http 0.7.0",
 ]
 
 [[package]]
 name = "graphman-store"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
  "diesel",
- "strum",
+ "strum 0.28.0",
 ]
 
 [[package]]
 name = "graphql-tools"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a378ccbe227983c1f4aeaafd088d0de9c5e3d5b6cd8e7aa9b0c682582a6c067"
+checksum = "9b1ae57fa544e67a661c97805be3e36b97e7d15d65d67bb34beac24d940f987e"
 dependencies = [
  "combine",
  "itoa",
@@ -4109,39 +4299,20 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.11.4",
- "slab",
- "tokio",
- "tokio-util 0.7.18",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.4.0",
- "indexmap 2.11.4",
+ "http 1.4.2",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tracing",
 ]
 
@@ -4151,7 +4322,7 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crunchy",
  "num-traits",
  "zerocopy",
@@ -4191,10 +4362,7 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "allocator-api2",
- "equivalent",
  "foldhash 0.1.5",
- "serde",
 ]
 
 [[package]]
@@ -4202,6 +4370,17 @@ name = "hashbrown"
 version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 dependencies = [
  "foldhash 0.2.0",
  "serde",
@@ -4218,30 +4397,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "headers"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "headers-core",
- "http 1.4.0",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
-dependencies = [
- "http 1.4.0",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -4254,15 +4409,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -4287,7 +4433,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
 ]
 
 [[package]]
@@ -4327,25 +4473,14 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
  "itoa",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
 [[package]]
 name = "http-body"
 version = "1.0.0"
@@ -4353,7 +4488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.4.0",
+ "http 1.4.2",
 ]
 
 [[package]]
@@ -4364,8 +4499,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.4.0",
- "http-body 1.0.0",
+ "http 1.4.2",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -4388,47 +4523,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
 [[package]]
-name = "hyper"
-version = "0.14.29"
+name = "hybrid-array"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "1a79f2aff40c18ab8615ddc5caa9eb5b96314aef18fe5823090f204ad988e813"
 dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.7",
- "tokio",
- "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing",
- "want",
+ "typenum",
 ]
 
 [[package]]
 name = "hyper"
-version = "1.8.1"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
  "atomic-waker",
  "bytes",
  "futures-channel",
  "futures-core",
- "h2 0.4.5",
- "http 1.4.0",
- "http-body 1.0.0",
+ "h2",
+ "http 1.4.2",
+ "http-body",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -4441,16 +4560,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
- "http 1.4.0",
- "hyper 1.8.1",
+ "http 1.4.2",
+ "hyper",
  "hyper-util",
  "rustls",
- "rustls-native-certs 0.7.1",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -4459,7 +4576,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
- "hyper 1.8.1",
+ "hyper",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -4474,7 +4591,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -4484,23 +4601,22 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
- "http 1.4.0",
- "http-body 1.0.0",
- "hyper 1.8.1",
+ "http 1.4.2",
+ "http-body",
+ "hyper",
  "ipnet",
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2",
  "system-configuration",
  "tokio",
  "tower-layer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4538,9 +4654,9 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1fcc7f316b2c079dde77564a1360639c1a956a23fa96122732e416cb10717bb"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
  "static_assertions",
 ]
 
@@ -4659,14 +4775,14 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "id-arena"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "ident_case"
@@ -4674,17 +4790,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -4715,24 +4820,6 @@ dependencies = [
  "parity-scale-codec",
 ]
 
-[[package]]
-name = "impl-rlp"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
-dependencies = [
- "rlp",
-]
-
-[[package]]
-name = "impl-serde"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "impl-trait-for-tuples"
 version = "0.2.2"
@@ -4757,17 +4844,30 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.11.4"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "arbitrary",
  "equivalent",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "serde",
  "serde_core",
 ]
 
+[[package]]
+name = "indicatif"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993f007684f2e9727160da8b960ec161264703bfd1af084fd2e34d040c9a0dd4"
+dependencies = [
+ "console 0.16.4",
+ "portable-atomic",
+ "unicode-width",
+ "unit-prefix",
+ "web-time",
+]
+
 [[package]]
 name = "indoc"
 version = "2.0.7"
@@ -4783,7 +4883,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "inotify-sys",
  "libc",
 ]
@@ -4797,6 +4897,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "inquire"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6654738b8024300cf062d04a1c13c10c8e2cea598ec1c47dc9b6641159429756"
+dependencies = [
+ "bitflags 2.11.1",
+ "crossterm",
+ "dyn-clone",
+ "fuzzy-matcher",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
 [[package]]
 name = "interprocess"
 version = "2.2.3"
@@ -4819,13 +4933,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
-name = "iri-string"
-version = "0.7.8"
+name = "is-docker"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
 dependencies = [
- "memchr",
- "serde",
+ "once_cell",
 ]
 
 [[package]]
@@ -4839,6 +4952,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -4872,6 +4995,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.17"
@@ -4900,143 +5032,117 @@ dependencies = [
 
 [[package]]
 name = "jiff"
-version = "0.2.15"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
 dependencies = [
  "jiff-static",
  "log",
  "portable-atomic",
  "portable-atomic-util",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.15"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
-name = "jobserver"
-version = "0.1.31"
+name = "jni"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
- "libc",
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.61",
+ "walkdir",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
-name = "js-sys"
-version = "0.3.77"
+name = "jni-sys"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
 dependencies = [
- "once_cell",
- "wasm-bindgen",
+ "jni-sys 0.4.1",
 ]
 
 [[package]]
-name = "json-structural-diff"
-version = "0.2.0"
+name = "jni-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e878e36a8a44c158505c2c818abdc1350413ad83dcb774a0459f6a7ef2b65cbf"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
 dependencies = [
- "console",
- "difflib",
- "regex",
- "serde_json",
+ "jni-sys-macros",
 ]
 
 [[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
+name = "jni-sys-macros"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
 dependencies = [
- "futures 0.3.31",
- "futures-executor",
- "futures-util",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
-name = "jsonrpsee"
-version = "0.15.1"
+name = "jobserver"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
- "jsonrpsee-core",
- "jsonrpsee-http-server",
- "jsonrpsee-types",
+ "libc",
 ]
 
 [[package]]
-name = "jsonrpsee-core"
-version = "0.15.1"
+name = "js-sys"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
- "anyhow",
- "arrayvec 0.7.4",
- "async-trait",
- "beef",
- "futures-channel",
+ "cfg-if",
  "futures-util",
- "globset",
- "http 0.2.12",
- "hyper 0.14.29",
- "jsonrpsee-types",
- "lazy_static",
- "parking_lot",
- "rand 0.8.5",
- "rustc-hash 1.1.0",
- "serde",
- "serde_json",
- "thiserror 1.0.61",
- "tokio",
- "tracing",
- "unicase",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "jsonrpsee-http-server"
-version = "0.15.1"
+name = "json-structural-diff"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
+checksum = "e878e36a8a44c158505c2c818abdc1350413ad83dcb774a0459f6a7ef2b65cbf"
 dependencies = [
- "futures-channel",
- "futures-util",
- "hyper 0.14.29",
- "jsonrpsee-core",
- "jsonrpsee-types",
- "serde",
+ "console 0.15.11",
+ "difflib",
+ "regex",
  "serde_json",
- "tokio",
- "tracing",
- "tracing-futures",
 ]
 
 [[package]]
-name = "jsonrpsee-types"
-version = "0.15.1"
+name = "jsonrpc-core"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
+checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "anyhow",
- "beef",
+ "futures 0.3.31",
+ "futures-executor",
+ "futures-util",
+ "log",
  "serde",
+ "serde_derive",
  "serde_json",
- "thiserror 1.0.61",
- "tracing",
 ]
 
 [[package]]
@@ -5045,28 +5151,29 @@ version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "ecdsa",
  "elliptic-curve",
  "once_cell",
  "serdect",
- "sha2",
+ "sha2 0.10.9",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa"
 dependencies = [
- "cpufeatures",
+ "cfg-if",
+ "cpufeatures 0.3.0",
 ]
 
 [[package]]
 name = "keccak-asm"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6"
+checksum = "1766b89733097006f3a1388a02849865d6bc98c89273cb622e29fdd209922183"
 dependencies = [
  "digest 0.10.7",
  "sha3-asm",
@@ -5094,9 +5201,9 @@ dependencies = [
 
 [[package]]
 name = "lazy-regex"
-version = "3.5.1"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5c13b6857ade4c8ee05c3c3dc97d2ab5415d691213825b90d3211c425c1f907"
+checksum = "6bae91019476d3ec7147de9aa291cadb6d870abf2f3015d2da73a90325ac1496"
 dependencies = [
  "lazy-regex-proc_macros",
  "once_cell",
@@ -5105,14 +5212,14 @@ dependencies = [
 
 [[package]]
 name = "lazy-regex-proc_macros"
-version = "3.5.1"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a95c68db5d41694cea563c86a4ba4dc02141c16ef64814108cb23def4d5438"
+checksum = "4de9c1e1439d8b7b3061b2d209809f447ca33241733d9a3c01eabf2dc8d94358"
 dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5192,15 +5299,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
@@ -5208,7 +5315,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "libc",
 ]
 
@@ -5220,9 +5327,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
@@ -5230,6 +5337,12 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
 [[package]]
 name = "lock_api"
 version = "0.4.14"
@@ -5247,13 +5360,19 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lru"
-version = "0.13.0"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
+checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.16.1",
 ]
 
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "lru_time_cache"
 version = "0.11.11"
@@ -5261,23 +5380,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
 
 [[package]]
-name = "mach2"
-version = "0.4.2"
+name = "lz4_flex"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a"
 dependencies = [
- "libc",
+ "twox-hash",
 ]
 
 [[package]]
-name = "macro-string"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
+name = "mach2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
+
+[[package]]
+name = "macro-string"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5286,12 +5411,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -5304,7 +5423,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest 0.10.7",
 ]
 
@@ -5316,11 +5435,11 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memfd"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
+checksum = "ad38eb12aea514a0466ea40a80fd8cc83637065948eb4a426e4aa46261175227"
 dependencies = [
- "rustix 0.38.34",
+ "rustix 1.1.4",
 ]
 
 [[package]]
@@ -5330,7 +5449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36c791ecdf977c99f45f23280405d7723727470f6689a5e6dbf513ac547ae10d"
 dependencies = [
  "serde",
- "toml 0.9.11+spec-1.1.0",
+ "toml 0.9.12+spec-1.1.0",
 ]
 
 [[package]]
@@ -5362,11 +5481,12 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
- "adler",
+ "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -5390,7 +5510,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http 1.4.0",
+ "http 1.4.2",
  "httparse",
  "memchr",
  "mime",
@@ -5411,12 +5531,11 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.19.1"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
+checksum = "577c63b00ad74d57e8c9aa870b5fccebf2fd64a308a5aee9f1bb88e4aea19447"
 dependencies = [
- "core2",
- "unsigned-varint 0.7.2",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -5448,13 +5567,25 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91"
 
+[[package]]
+name = "nix"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
+dependencies = [
+ "bitflags 2.11.1",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "notify"
 version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -5505,9 +5636,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-integer"
@@ -5571,7 +5702,7 @@ checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5582,7 +5713,7 @@ checksum = "7b5676b5c379cf5b03da1df2b3061c4a4e2aa691086a56ac923e08c143f53f59"
 dependencies = [
  "alloy-rlp",
  "arbitrary",
- "cfg-if 1.0.0",
+ "cfg-if",
  "proptest",
  "ruint",
  "serde",
@@ -5591,40 +5722,43 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.37.3"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b"
 dependencies = [
  "crc32fast",
- "hashbrown 0.15.2",
- "indexmap 2.11.4",
+ "hashbrown 0.17.0",
+ "indexmap 2.14.0",
  "memchr",
 ]
 
 [[package]]
 name = "object_store"
-version = "0.12.4"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1be0c6c22ec0817cdc77d3842f721a17fd30ab6965001415b5402a74e6b740"
+checksum = "765784b4390c6bcf80316e5a22f4e3661b639c9d8c83246856643c27d8ce9dbe"
 dependencies = [
  "async-trait",
- "base64 0.22.1",
+ "aws-lc-rs",
+ "base64",
  "bytes",
  "chrono",
  "form_urlencoded",
- "futures 0.3.31",
- "http 1.4.0",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 1.4.2",
  "http-body-util",
  "humantime",
- "hyper 1.8.1",
- "itertools 0.14.0",
+ "hyper",
+ "itertools 0.15.0",
+ "nix",
  "parking_lot",
  "percent-encoding",
  "quick-xml",
- "rand 0.9.2",
- "reqwest",
- "ring",
- "rustls-pemfile",
+ "rand 0.10.1",
+ "reqwest 0.13.2",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -5635,6 +5769,7 @@ dependencies = [
  "walkdir",
  "wasm-bindgen-futures",
  "web-time",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5644,22 +5779,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
-name = "opaque-debug"
-version = "0.3.1"
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
+[[package]]
+name = "open"
+version = "5.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a"
+dependencies = [
+ "is-wsl",
+ "libc",
+]
 
 [[package]]
 name = "openssl"
-version = "0.10.75"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
+checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.9.0",
- "cfg-if 1.0.0",
+ "bitflags 2.11.1",
+ "cfg-if",
  "foreign-types",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -5672,7 +5816,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5692,9 +5836,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.111"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
@@ -5715,7 +5859,7 @@ version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec",
  "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
@@ -5763,11 +5907,43 @@ version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall 0.5.2",
  "smallvec",
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "parquet"
+version = "59.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970dff83e97d953c827ae8176f6bf4e9f77bf62daacc01ec5df348ec5eacd913"
+dependencies = [
+ "ahash",
+ "arrow-array",
+ "arrow-buffer",
+ "arrow-data",
+ "arrow-ipc",
+ "arrow-schema",
+ "arrow-select",
+ "base64",
+ "brotli",
+ "bytes",
+ "chrono",
+ "flate2",
+ "half",
+ "hashbrown 0.17.0",
+ "lz4_flex",
+ "num-bigint 0.4.6",
+ "num-integer",
+ "num-traits",
+ "paste",
+ "seq-macro",
+ "simdutf8",
+ "snap",
+ "twox-hash",
+ "zstd",
 ]
 
 [[package]]
@@ -5813,7 +5989,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5824,7 +6000,17 @@ checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
 dependencies = [
  "once_cell",
  "pest",
- "sha2",
+ "sha2 0.10.9",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset 0.4.2",
+ "indexmap 2.14.0",
 ]
 
 [[package]]
@@ -5833,9 +6019,9 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.5.7",
  "hashbrown 0.15.2",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
 ]
 
@@ -5896,14 +6082,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -5933,19 +6119,19 @@ version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "hermit-abi 0.5.2",
  "pin-project-lite",
- "rustix 1.0.7",
- "windows-sys 0.61.1",
+ "rustix 1.1.4",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
@@ -5958,9 +6144,9 @@ dependencies = [
 
 [[package]]
 name = "postcard"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "170a2601f67cc9dba8edd8c4870b15f71a6a2dc196daec8c83f72b59dff628a8"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
 dependencies = [
  "cobs",
  "embedded-io 0.4.0",
@@ -5984,9 +6170,9 @@ dependencies = [
 
 [[package]]
 name = "postgres-openssl"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f86f073ad570f76e9e278ce6f05775fc723eed7daa6b4f9c2aa078080a564a0"
+checksum = "06743eefaa1a5c0ef2ccb6d9abf6528790a229eabd62ddcabf9b2a3aeff09fa4"
 dependencies = [
  "openssl",
  "tokio",
@@ -6000,15 +6186,15 @@ version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "byteorder",
  "bytes",
  "fallible-iterator 0.2.0",
  "hmac",
  "md-5",
  "memchr",
- "rand 0.9.2",
- "sha2",
+ "rand 0.9.3",
+ "sha2 0.10.9",
  "stringprep",
 ]
 
@@ -6074,20 +6260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "primitive-types"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
-dependencies = [
- "fixed-hash 0.7.0",
- "impl-codec",
- "impl-rlp",
- "impl-serde",
- "uint 0.9.5",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6096,7 +6269,7 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
- "fixed-hash 0.8.0",
+ "fixed-hash",
  "impl-codec",
  "uint 0.9.5",
 ]
@@ -6108,7 +6281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93980406f12d9f8140ed5abe7155acb10bb1e69ea55c88960b9c2f117445ef96"
 dependencies = [
  "equivalent",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde",
 ]
 
@@ -6118,7 +6291,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
@@ -6140,7 +6313,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6156,9 +6329,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.105"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -6169,14 +6342,14 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fnv",
  "lazy_static",
  "libc",
  "memchr",
  "parking_lot",
  "protobuf",
- "reqwest",
+ "reqwest 0.12.23",
  "thiserror 2.0.18",
 ]
 
@@ -6188,9 +6361,9 @@ checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "num-traits",
- "rand 0.9.2",
+ "rand 0.9.3",
  "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax",
@@ -6207,25 +6380,25 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "proptest-derive"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
+checksum = "c57924a81864dddafba92e1bf92f9bf82f97096c44489548a60e888e1547549b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "prost"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -6238,38 +6411,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
 dependencies = [
  "heck 0.5.0",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "log",
  "multimap",
- "petgraph",
+ "petgraph 0.8.3",
  "prettyplease",
  "prost",
  "prost-types",
  "pulldown-cmark",
  "pulldown-cmark-to-cmark",
  "regex",
- "syn 2.0.114",
+ "syn 2.0.118",
  "tempfile",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a"
 dependencies = [
  "prost",
 ]
@@ -6292,7 +6465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973"
 dependencies = [
  "anyhow",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "protobuf",
  "protobuf-support",
@@ -6325,7 +6498,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "memchr",
  "unicase",
 ]
@@ -6341,25 +6514,25 @@ dependencies = [
 
 [[package]]
 name = "pulley-interpreter"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a1abe1fcec21c32b62000af24b8b6db11b87609b64fd1c9a9e17c42422225"
+checksum = "38b92604caae1a1899b6a5b54967289dd538177c626004c91accf9d0ec7e4a12"
 dependencies = [
  "cranelift-bitset",
  "log",
  "pulley-macros",
- "wasmtime-internal-math",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "pulley-macros"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d56dac306fbee0e990d4bac359c86d58f60f058e1e2d1aee1b7928689f08d3"
+checksum = "5a7ac85c0bb3fb351f10d531230aaa5e366b46d7c4e5328e5f02801d6dac1165"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6370,9 +6543,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-xml"
-version = "0.38.2"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d200a41a7797e6461bd04e4e95c3347053a731c32c87f066f2f0dda22dbdbba8"
+checksum = "2474bd2e5029e7ccb6abb2ba48cf2383a333851dedf495901544281590c7da7f"
 dependencies = [
  "memchr",
  "serde",
@@ -6380,60 +6553,75 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.2"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
+ "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 1.1.0",
+ "rustc-hash",
  "rustls",
- "thiserror 1.0.61",
+ "socket2",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
+ "aws-lc-rs",
  "bytes",
- "rand 0.8.5",
+ "getrandom 0.3.1",
+ "lru-slab",
+ "rand 0.9.3",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "rustls",
+ "rustls-pki-types",
  "slab",
- "thiserror 1.0.61",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.2"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.7",
+ "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "r2d2"
 version = "0.8.10"
@@ -6453,9 +6641,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -6465,15 +6653,26 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "7ec095654a25171c2124e9e3393a930bddbffdc939556c914957a4c3e0a87166"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
  "serde",
 ]
 
+[[package]]
+name = "rand"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.0",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -6513,6 +6712,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+
 [[package]]
 name = "rand_xorshift"
 version = "0.4.0"
@@ -6568,7 +6773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6579,15 +6784,16 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redis"
-version = "1.0.2"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfe20977fe93830c0e9817a16fbf1ed1cfd8d4bba366087a1841d2c6033c251"
+checksum = "a12e6b5f4d8ef33944e833e2b1859ad478deab6e431d7337b30ee2efe21f7543"
 dependencies = [
  "arc-swap",
  "arcstr",
+ "async-lock",
  "backon",
  "bytes",
- "cfg-if 1.0.0",
+ "cfg-if",
  "combine",
  "futures-channel",
  "futures-util",
@@ -6597,9 +6803,9 @@ dependencies = [
  "pin-project-lite",
  "ryu",
  "sha1_smol",
- "socket2 0.6.0",
+ "socket2",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "url",
  "xxhash-rust",
 ]
@@ -6619,7 +6825,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -6633,25 +6839,46 @@ dependencies = [
  "thiserror 1.0.61",
 ]
 
+[[package]]
+name = "ref-cast"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+]
+
 [[package]]
 name = "regalloc2"
-version = "0.12.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5216b1837de2149f8bc8e6d5f88a9326b63b8c836ed58ce4a0a29ec736a59734"
+checksum = "de2c52737737f8609e94f975dee22854a2d5c125772d4b1cf292120f4d45c186"
 dependencies = [
  "allocator-api2",
  "bumpalo",
- "hashbrown 0.15.2",
+ "hashbrown 0.17.0",
  "log",
- "rustc-hash 2.1.1",
+ "rustc-hash",
+ "serde",
  "smallvec",
 ]
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6672,9 +6899,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reqwest"
@@ -6682,17 +6909,18 @@ version = "0.12.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
- "base64 0.22.1",
+ "async-compression",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.5",
- "http 1.4.0",
- "http-body 1.0.0",
+ "h2",
+ "http 1.4.2",
+ "http-body",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
@@ -6703,9 +6931,6 @@ dependencies = [
  "native-tls",
  "percent-encoding",
  "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -6713,17 +6938,56 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-native-tls",
+ "tokio-util",
+ "tower 0.5.2",
+ "tower-http 0.6.11",
+ "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams 0.4.0",
+ "web-sys",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 1.4.2",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "serde",
+ "serde_json",
+ "sync_wrapper",
+ "tokio",
  "tokio-rustls",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tower 0.5.2",
- "tower-http",
+ "tower-http 0.6.11",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams",
+ "wasm-streams 0.5.0",
  "web-sys",
- "webpki-roots 1.0.5",
 ]
 
 [[package]]
@@ -6743,7 +7007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom 0.2.15",
  "libc",
  "untrusted",
@@ -6778,10 +7042,10 @@ dependencies = [
  "num-integer",
  "num-traits",
  "parity-scale-codec",
- "primitive-types 0.12.2",
+ "primitive-types",
  "proptest",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.6",
+ "rand 0.9.3",
  "rlp",
  "ruint-macro",
  "serde_core",
@@ -6801,12 +7065,6 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -6834,7 +7092,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.27",
+ "semver 1.0.28",
 ]
 
 [[package]]
@@ -6843,7 +7101,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -6852,26 +7110,26 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "linux-raw-sys 0.12.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.28"
+version = "0.23.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
+checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f"
 dependencies = [
+ "aws-lc-rs",
  "log",
  "once_cell",
- "ring",
  "rustls-pki-types",
  "rustls-webpki",
  "subtle",
@@ -6880,51 +7138,60 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.1"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
  "rustls-pki-types",
  "schannel",
- "security-framework 2.11.0",
+ "security-framework 3.7.0",
 ]
 
 [[package]]
-name = "rustls-native-certs"
-version = "0.8.1"
+name = "rustls-pki-types"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
- "openssl-probe",
- "rustls-pki-types",
- "schannel",
- "security-framework 3.2.0",
+ "web-time",
+ "zeroize",
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.1.2"
+name = "rustls-platform-verifier"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
 dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
+ "core-foundation 0.10.0",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework 3.7.0",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "rustls-pki-types"
-version = "1.11.0"
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -6982,12 +7249,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "scoped-futures"
-version = "0.1.4"
+name = "schemars"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b24aae2d0636530f359e9d5ef0c04669d11c5e756699b27a6a6d845d8329091"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
 dependencies = [
- "pin-project-lite",
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -7013,39 +7295,41 @@ dependencies = [
 
 [[package]]
 name = "secp256k1"
-version = "0.21.3"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260"
+checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
- "secp256k1-sys 0.4.2",
+ "bitcoin_hashes",
+ "rand 0.8.6",
+ "secp256k1-sys 0.10.1",
+ "serde",
 ]
 
 [[package]]
 name = "secp256k1"
-version = "0.30.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
+checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
- "secp256k1-sys 0.10.1",
- "serde",
+ "rand 0.9.3",
+ "secp256k1-sys 0.11.0",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
 dependencies = [
  "cc",
 ]
@@ -7056,7 +7340,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -7065,11 +7349,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "3.2.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
@@ -7078,9 +7362,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -7097,9 +7381,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 dependencies = [
  "serde",
  "serde_core",
@@ -7120,11 +7404,17 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
+[[package]]
+name = "seq-macro"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
+
 [[package]]
 name = "serde"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -7132,33 +7422,35 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.226"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "itoa",
- "ryu",
+ "memchr",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -7182,9 +7474,9 @@ dependencies = [
 
 [[package]]
 name = "serde_regex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf"
+checksum = "bafc8d0c5330cecff10f16b459b479fd9acaa5b4acd7167301414e21b0057012"
 dependencies = [
  "regex",
  "serde",
@@ -7192,20 +7484,11 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
-dependencies = [
- "serde_core",
+ "serde_core",
 ]
 
 [[package]]
@@ -7222,17 +7505,19 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.12.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
- "base64 0.22.1",
+ "base64",
+ "bs58 0.5.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.11.4",
- "serde",
- "serde_derive",
+ "indexmap 2.14.0",
+ "schemars 0.9.0",
+ "schemars 1.2.1",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -7240,14 +7525,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.12.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
- "darling 0.20.10",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7256,7 +7541,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
  "serde",
@@ -7274,27 +7559,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha-1"
-version = "0.9.8"
+name = "sha1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
+ "cfg-if",
+ "cpufeatures 0.2.12",
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "sha1"
-version = "0.10.6"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
 dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.7",
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.2",
 ]
 
 [[package]]
@@ -7309,36 +7592,47 @@ version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
+ "cfg-if",
+ "cpufeatures 0.2.12",
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "digest 0.11.2",
+]
+
 [[package]]
 name = "sha3"
-version = "0.10.8"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "be176f1a57ce4e3d31c1a166222d9768de5954f811601fb7ca06fc8203905ce1"
 dependencies = [
- "digest 0.10.7",
+ "digest 0.11.2",
  "keccak",
 ]
 
 [[package]]
 name = "sha3-asm"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46"
+checksum = "9f3f15d4e239ebe08413eed880e0f9b5af4b40ee0472543320efa91d488e96a7"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "shellexpand"
-version = "3.1.1"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
+checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8"
 dependencies = [
  "dirs",
 ]
@@ -7349,6 +7643,27 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "signal-hook"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -7368,12 +7683,27 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+
 [[package]]
 name = "simdutf8"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "similar"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6505efef05804732ed8a3f2d4f279429eb485bd69d5b0cc6b19cc02005cda16"
+dependencies = [
+ "bstr",
+]
+
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -7465,23 +7795,19 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 dependencies = [
  "arbitrary",
  "serde",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.5.7"
+name = "snap"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
+checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
 [[package]]
 name = "socket2"
@@ -7493,21 +7819,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "soketto"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
-dependencies = [
- "base64 0.13.1",
- "bytes",
- "futures 0.3.31",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha-1",
-]
-
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -7537,13 +7848,13 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.60.0"
+version = "0.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "505aa16b045c4c1375bf5f125cce3813d0176325bfe9ffc4a903f423de7774ff"
+checksum = "13c6d1b651dc4edf07eead2a0c6c78016ce971bc2c10da5266861b13f25e7cec"
 dependencies = [
  "log",
  "recursive",
- "sqlparser_derive 0.4.0",
+ "sqlparser_derive 0.5.0",
 ]
 
 [[package]]
@@ -7554,26 +7865,26 @@ checksum = "da5fc6819faabb412da764b99d3b713bb55083c11e7e0c00144d386cd6a1939c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "sqlparser_derive"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028e551d5e270b31b9f3ea271778d9d827148d4287a5d96167b6bb9787f5cc38"
+checksum = "a6dd45d8fc1c79299bfbb7190e42ccbbdf6a5f52e4a6ad98d92357ea965bd289"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "stable-hash"
 version = "0.3.4"
-source = "git+https://github.com/graphprotocol/stable-hash?branch=old#7af76261e8098c58bfadd5b7c31810e1c0fdeccb"
+source = "git+https://github.com/graphprotocol/stable-hash?rev=42b85d936c6b9f1b7a4b8385d2f081d5564daa69#42b85d936c6b9f1b7a4b8385d2f081d5564daa69"
 dependencies = [
- "blake3 0.3.8",
+ "blake3",
  "firestorm 0.4.6",
  "ibig",
  "lazy_static",
@@ -7584,15 +7895,15 @@ dependencies = [
 [[package]]
 name = "stable-hash"
 version = "0.4.4"
-source = "git+https://github.com/graphprotocol/stable-hash?branch=main#e50aabef55b8c4de581ca5c4ffa7ed8beed7e998"
+source = "git+https://github.com/graphprotocol/stable-hash?rev=70300f974e61529675aef3f20803f26a23f0e0ea#70300f974e61529675aef3f20803f26a23f0e0ea"
 dependencies = [
- "blake3 0.3.8",
+ "blake3",
  "firestorm 0.5.1",
  "ibig",
  "lazy_static",
  "leb128",
  "num-traits",
- "uint 0.8.5",
+ "uint 0.10.1",
  "xxhash-rust",
 ]
 
@@ -7609,7 +7920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1f8b29fb42aafcea4edeeb6b2f2d7ecd0d969c48b4cf0d2e64aafc471dd6e59"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "psm",
  "windows-sys 0.59.0",
@@ -7650,7 +7961,16 @@ version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.27.2",
+]
+
+[[package]]
+name = "strum"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
+dependencies = [
+ "strum_macros 0.28.0",
 ]
 
 [[package]]
@@ -7662,7 +7982,19 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7684,9 +8016,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7695,14 +8027,14 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f92d01b5de07eaf324f7fca61cc6bd3d82bbc1de5b6c963e6fe79e86f36580d"
+checksum = "ec005042c7d952febc1a3ef5b0f6674e9054aa836877a31c90b20e25b3d31744"
 dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7722,16 +8054,16 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "system-configuration"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -7760,19 +8092,20 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
- "cfg-if 1.0.0",
  "fastrand",
- "rustix 0.38.34",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix 1.1.4",
  "windows-sys 0.52.0",
 ]
 
@@ -7808,7 +8141,7 @@ dependencies = [
 
 [[package]]
 name = "test-store"
-version = "0.36.0"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "diesel",
@@ -7853,7 +8186,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7864,7 +8197,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7873,7 +8206,7 @@ version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -7888,44 +8221,35 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
  "num-conv",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -7962,9 +8286,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d"
 dependencies = [
  "bytes",
  "libc",
@@ -7972,9 +8296,9 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.0",
+ "socket2",
  "tokio-macros",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -7985,7 +8309,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8029,21 +8353,21 @@ dependencies = [
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand 0.9.2",
- "socket2 0.6.0",
+ "rand 0.9.3",
+ "socket2",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "whoami",
 ]
 
 [[package]]
 name = "tokio-retry"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+checksum = "4a129d95275ebf4c493ec53bf0f8cd95f5ac161bc4f381700809a54f595d4470"
 dependencies = [
- "pin-project",
- "rand 0.8.5",
+ "pin-project-lite",
+ "rand 0.10.1",
  "tokio",
 ]
 
@@ -8066,7 +8390,7 @@ dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
 ]
 
 [[package]]
@@ -8084,9 +8408,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.26.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
+checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
 dependencies = [
  "futures-util",
  "log",
@@ -8094,35 +8418,20 @@ dependencies = [
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
- "tungstenite 0.26.2",
+ "tungstenite 0.28.0",
  "webpki-roots 0.26.11",
 ]
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
+checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c"
 dependencies = [
  "futures-util",
  "log",
  "tokio",
- "tungstenite 0.28.0",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
+ "tungstenite 0.29.0",
 ]
 
 [[package]]
@@ -8141,29 +8450,32 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.15"
+version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
- "serde",
- "serde_spanned 0.6.6",
- "toml_datetime 0.6.6",
- "toml_edit 0.22.16",
+ "indexmap 2.14.0",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.13",
 ]
 
 [[package]]
 name = "toml"
-version = "0.9.11+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.0.4",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "serde_spanned",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.13",
+ "winnow 1.0.0",
 ]
 
 [[package]]
@@ -8171,9 +8483,6 @@ name = "toml_datetime"
 version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "toml_datetime"
@@ -8185,66 +8494,62 @@ dependencies = [
 ]
 
 [[package]]
-name = "toml_edit"
-version = "0.21.1"
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
- "indexmap 2.11.4",
- "toml_datetime 0.6.6",
- "winnow 0.5.40",
+ "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.16"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.11.4",
- "serde",
- "serde_spanned 0.6.6",
+ "indexmap 2.14.0",
  "toml_datetime 0.6.6",
- "winnow 0.6.13",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 0.7.13",
+ "winnow 1.0.0",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.6+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tonic"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a286e33f82f8a1ee2df63f4fa35c0becf4a85a0cb03091a15fd7bf0b402dc94a"
+checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef"
 dependencies = [
  "async-trait",
  "axum",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "flate2",
- "h2 0.4.5",
- "http 1.4.0",
- "http-body 1.0.0",
+ "h2",
+ "http 1.4.2",
+ "http-body",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-timeout",
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "rustls-native-certs 0.8.1",
- "socket2 0.6.0",
+ "rustls-native-certs",
+ "socket2",
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
@@ -8257,21 +8562,21 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27aac809edf60b741e2d7db6367214d078856b8a5bff0087e94ff330fb97b6fc"
+checksum = "c68f61875ac5293cf72e6c8cf0158086428c82c37229e98c840878f1706b0322"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "tonic-prost"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c55a2d6a14174563de34409c9f92ff981d006f56da9c6ecd40d9d4a31500b0"
+checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0"
 dependencies = [
  "bytes",
  "prost",
@@ -8280,16 +8585,16 @@ dependencies = [
 
 [[package]]
 name = "tonic-prost-build"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4556786613791cfef4ed134aa670b61a85cfcacf71543ef33e8d801abae988f"
+checksum = "654e5643eff75d7f8c99197ce1440ed19a3474eada74c12bbac488b2cafdae27"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "tempfile",
  "tonic-build",
 ]
@@ -8303,12 +8608,12 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tower-layer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tracing",
@@ -8317,17 +8622,17 @@ dependencies = [
 [[package]]
 name = "tower"
 version = "0.5.3"
-source = "git+https://github.com/tower-rs/tower.git#c1e28af2a9af852f0261883531bbc182121a35fd"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
  "tokio",
- "tokio-util 0.7.18",
+ "tokio-util",
  "tower-layer 0.3.3 (git+https://github.com/tower-rs/tower.git)",
  "tower-service 0.3.3 (git+https://github.com/tower-rs/tower.git)",
  "tracing",
@@ -8335,20 +8640,35 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "bytes",
  "futures-util",
- "http 1.4.0",
- "http-body 1.0.0",
- "iri-string",
+ "http 1.4.2",
+ "http-body",
  "pin-project-lite",
  "tower 0.5.2",
  "tower-layer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b11f75e912b0c2be01b63d8cf8057b8c3f97cf34abb3d431a3a4c8675498e233"
+dependencies = [
+ "bitflags 2.11.1",
+ "bytes",
+ "http 1.4.2",
+ "percent-encoding",
+ "pin-project-lite",
+ "tower-layer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -8360,7 +8680,7 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
-source = "git+https://github.com/tower-rs/tower.git#c1e28af2a9af852f0261883531bbc182121a35fd"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 
 [[package]]
 name = "tower-service"
@@ -8371,12 +8691,12 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 [[package]]
 name = "tower-service"
 version = "0.3.3"
-source = "git+https://github.com/tower-rs/tower.git#c1e28af2a9af852f0261883531bbc182121a35fd"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 
 [[package]]
 name = "tower-test"
 version = "0.4.1"
-source = "git+https://github.com/tower-rs/tower.git#c1e28af2a9af852f0261883531bbc182121a35fd"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -8405,7 +8725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8417,16 +8737,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -8435,40 +8745,45 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tungstenite"
-version = "0.26.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
+checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.4.0",
+ "http 1.4.2",
  "httparse",
  "log",
- "rand 0.9.2",
+ "rand 0.9.3",
  "rustls",
  "rustls-pki-types",
- "sha1",
+ "sha1 0.10.6",
  "thiserror 2.0.18",
  "utf-8",
 ]
 
 [[package]]
 name = "tungstenite"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
+checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.4.0",
+ "http 1.4.2",
  "httparse",
  "log",
- "rand 0.9.2",
- "sha1",
+ "rand 0.9.3",
+ "sha1 0.10.6",
  "thiserror 2.0.18",
- "utf-8",
 ]
 
+[[package]]
+name = "twox-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -8483,21 +8798,21 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
-version = "0.8.5"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
  "byteorder",
  "crunchy",
- "rustc-hex",
+ "hex",
  "static_assertions",
 ]
 
 [[package]]
 name = "uint"
-version = "0.9.5"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+checksum = "6f9227a75a5a540a464c832ad4a4195dbdbecd8787610a56262721fde6f04f90"
 dependencies = [
  "byteorder",
  "crunchy",
@@ -8566,16 +8881,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
+name = "unit-prefix"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
 
 [[package]]
-name = "unsigned-varint"
-version = "0.7.2"
+name = "unsafe-libyaml"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "unsigned-varint"
@@ -8596,9 +8911,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
- "idna 1.1.0",
+ "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -8692,6 +9008,24 @@ dependencies = [
  "wit-bindgen-rt",
 ]
 
+[[package]]
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasite"
 version = "0.1.0"
@@ -8700,47 +9034,32 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
- "cfg-if 1.0.0",
  "js-sys",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -8748,34 +9067,41 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
- "wasm-bindgen-backend",
+ "syn 2.0.118",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
-name = "wasm-encoder"
-version = "0.236.1"
+name = "wasm-compose"
+version = "0.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "724fccfd4f3c24b7e589d333fc0429c68042897a7e8a5f8694f31792471841e7"
+checksum = "b089037d7eb453ed57b560fe7833de0707411c8b9fdc429745ced77e2a1bacb9"
 dependencies = [
- "leb128fmt",
- "wasmparser 0.236.1",
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap 2.14.0",
+ "log",
+ "petgraph 0.6.5",
+ "smallvec",
+ "wasm-encoder 0.251.0",
+ "wasmparser 0.251.0",
+ "wat",
 ]
 
 [[package]]
@@ -8788,15 +9114,47 @@ dependencies = [
  "wasmparser 0.244.0",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.251.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.251.0",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.252.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8185ae345fa5687c054626ff9a50e7089797a343d9904d1dc9820eb4c4d3196f"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.252.0",
+]
+
 [[package]]
 name = "wasm-instrument"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bca81f5279342b38b17d9acbf007a46ddeb73144e2bd5f0a21bfa9fc5d4ab3e"
+checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc"
 dependencies = [
  "parity-wasm",
 ]
 
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap 2.14.0",
+ "wasm-encoder 0.244.0",
+ "wasmparser 0.244.0",
+]
+
 [[package]]
 name = "wasm-streams"
 version = "0.4.0"
@@ -8810,69 +9168,92 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.118.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c"
 dependencies = [
- "indexmap 2.11.4",
- "semver 1.0.27",
+ "indexmap 2.14.0",
+ "semver 1.0.28",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.236.1"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "hashbrown 0.15.2",
- "indexmap 2.11.4",
- "semver 1.0.27",
+ "indexmap 2.14.0",
+ "semver 1.0.28",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.251.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff"
+dependencies = [
+ "bitflags 2.11.1",
+ "hashbrown 0.17.0",
+ "indexmap 2.14.0",
+ "semver 1.0.28",
  "serde",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.244.0"
+version = "0.252.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c"
 dependencies = [
- "bitflags 2.9.0",
- "indexmap 2.11.4",
- "semver 1.0.27",
+ "bitflags 2.11.1",
+ "indexmap 2.14.0",
+ "semver 1.0.28",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.236.1"
+version = "0.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2df225df06a6df15b46e3f73ca066ff92c2e023670969f7d50ce7d5e695abbb1"
+checksum = "8798c1a699bd25648b6708eefe94d97c6f9891febb94b42cca1f7a4b086ea64e"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser 0.236.1",
+ "wasmparser 0.251.0",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901adbcfe03e3ad9db86f5665d6e00d54c904d4b81235c375635991596dfef3b"
+checksum = "c4213d2f019a5e44aa8a61d8826dd33a505bff79f749b14a8bafd67321cb9351"
 dependencies = [
  "addr2line",
- "anyhow",
  "async-trait",
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "bumpalo",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "encoding_rs",
+ "futures 0.3.31",
  "fxprof-processed-profile",
  "gimli",
- "hashbrown 0.15.2",
- "indexmap 2.11.4",
  "ittapi",
  "libc",
  "log",
@@ -8883,118 +9264,124 @@ dependencies = [
  "postcard",
  "pulley-interpreter",
  "rayon",
- "rustix 1.0.7",
- "semver 1.0.27",
+ "rustix 1.1.4",
+ "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "smallvec",
  "target-lexicon",
- "wasm-encoder 0.236.1",
- "wasmparser 0.236.1",
+ "tempfile",
+ "wasm-compose",
+ "wasm-encoder 0.251.0",
+ "wasmparser 0.251.0",
  "wasmtime-environ",
- "wasmtime-internal-asm-macros",
  "wasmtime-internal-cache",
  "wasmtime-internal-component-macro",
  "wasmtime-internal-component-util",
+ "wasmtime-internal-core",
  "wasmtime-internal-cranelift",
  "wasmtime-internal-fiber",
  "wasmtime-internal-jit-debug",
  "wasmtime-internal-jit-icache-coherence",
- "wasmtime-internal-math",
- "wasmtime-internal-slab",
  "wasmtime-internal-unwinder",
  "wasmtime-internal-versioned-export-macros",
- "wasmtime-internal-winch",
  "wat",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
+ "wit-parser 0.251.0",
 ]
 
 [[package]]
 name = "wasmtime-environ"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00984333e84fa259b72b5bc113e1699d04f20c3ac191bf3e268e32bd93e493fd"
+checksum = "d45863de41977ec6453e859cf843d456fa3fcb45a659b66d16e794f90ec4f5b7"
 dependencies = [
  "anyhow",
  "cpp_demangle",
+ "cranelift-bforest",
  "cranelift-bitset",
  "cranelift-entity",
  "gimli",
- "indexmap 2.11.4",
+ "hashbrown 0.17.0",
+ "indexmap 2.14.0",
  "log",
  "object",
  "postcard",
  "rustc-demangle",
- "semver 1.0.27",
+ "semver 1.0.28",
  "serde",
  "serde_derive",
+ "sha2 0.10.9",
  "smallvec",
  "target-lexicon",
- "wasm-encoder 0.236.1",
- "wasmparser 0.236.1",
+ "wasm-encoder 0.251.0",
+ "wasmparser 0.251.0",
  "wasmprinter",
  "wasmtime-internal-component-util",
-]
-
-[[package]]
-name = "wasmtime-internal-asm-macros"
-version = "36.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f42078a2603132bb5d7f2d5114ce57992e0fa344a9521385dc159c63472a9a"
-dependencies = [
- "cfg-if 1.0.0",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "wasmtime-internal-cache"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ae7355594563bec11af97afb429ea8576f497960a78d59684ffabd11a862b8"
+checksum = "438bc7dc45fb75297d75f79a9a0ce852345d13ebc6a6863f6f688f013836a9dd"
 dependencies = [
- "anyhow",
- "base64 0.22.1",
+ "base64",
  "directories-next",
  "log",
  "postcard",
- "rustix 1.0.7",
+ "rustix 1.1.4",
  "serde",
  "serde_derive",
- "sha2",
- "toml 0.8.15",
- "windows-sys 0.60.2",
+ "sha2 0.10.9",
+ "toml 0.9.12+spec-1.1.0",
+ "wasmtime-environ",
+ "windows-sys 0.61.2",
  "zstd",
 ]
 
 [[package]]
 name = "wasmtime-internal-component-macro"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c271bbe00cf374564ee37bee4fe298f8ad10e267aba07b2ec598d376677f062"
+checksum = "f1e48f8d4966d62a10b6d70722bc432c1e163890be2801d3b5784589ad36ffc3"
 dependencies = [
  "anyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "wasmtime-internal-component-util",
  "wasmtime-internal-wit-bindgen",
- "wit-parser",
+ "wit-parser 0.251.0",
 ]
 
 [[package]]
 name = "wasmtime-internal-component-util"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a61fa3310d28256440f4bad63bd9462f364ee9faca7c3dcfccc7c2a48db46005"
+checksum = "819ad5abd5822a22dbf4014475cdfd1fe790707761cd732d74aaa3ba4d5ba489"
 
 [[package]]
-name = "wasmtime-internal-cranelift"
-version = "36.0.5"
+name = "wasmtime-internal-core"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6401e096bfbb50e75a00bd83162fee68b1800d65937364463a4ad43da3f140f8"
+checksum = "3fc28372e36eaf8cf70faa83b5779137f7e99c8d18569a125d1580e735cc9e4d"
 dependencies = [
  "anyhow",
- "cfg-if 1.0.0",
+ "hashbrown 0.17.0",
+ "libm",
+ "serde",
+]
+
+[[package]]
+name = "wasmtime-internal-cranelift"
+version = "46.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a433efc6e35112a5457e1dc8bc4d8d39820ac7722267e89bc04e5df641f32124"
+dependencies = [
+ "cfg-if",
  "cranelift-codegen",
  "cranelift-control",
  "cranelift-entity",
@@ -9008,119 +9395,87 @@ dependencies = [
  "smallvec",
  "target-lexicon",
  "thiserror 2.0.18",
- "wasmparser 0.236.1",
+ "wasmparser 0.251.0",
  "wasmtime-environ",
- "wasmtime-internal-math",
+ "wasmtime-internal-core",
+ "wasmtime-internal-unwinder",
  "wasmtime-internal-versioned-export-macros",
 ]
 
 [[package]]
 name = "wasmtime-internal-fiber"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd592465c4fffd866fc6f50db2cc7ae0c73d2742699e351b3680b5f84f21ede"
+checksum = "18a1d3a39d0d210f6b8574ee96a4315e0a14c67f3a1fc3cd5372cb10d2fb4422"
 dependencies = [
- "anyhow",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "rustix 1.0.7",
- "wasmtime-internal-asm-macros",
+ "rustix 1.1.4",
+ "wasmtime-environ",
  "wasmtime-internal-versioned-export-macros",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "wasmtime-internal-jit-debug"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6c60a180c90eea53266a6627c353a8101090f1e084f59e1bd4666f5c55e405"
+checksum = "9f667288cb4dfa68a4639ffac4d5628535dda64ebdc2b990526efb12b30ba803"
 dependencies = [
  "cc",
  "object",
- "rustix 1.0.7",
+ "rustix 1.1.4",
  "wasmtime-internal-versioned-export-macros",
 ]
 
 [[package]]
 name = "wasmtime-internal-jit-icache-coherence"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efe8de0903b246b59b112f2a7116f3d2315c41a9252ab78de90dae93b9cab50e"
+checksum = "eba651d44ab0faad4c58106b3adb45068189fb65ef50f0c404b6d9e3bf81a357"
 dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "windows-sys 0.60.2",
+ "wasmtime-internal-core",
+ "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "wasmtime-internal-math"
-version = "36.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d143a7388e4adfae7c1d6c6ceb44325b4b45b2e393e39b25ddaf563e7e587"
-dependencies = [
- "libm",
-]
-
-[[package]]
-name = "wasmtime-internal-slab"
-version = "36.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de954a96e144df5b22805367f91a1754237f6bf99918f087d0ea1970be3b6365"
-
 [[package]]
 name = "wasmtime-internal-unwinder"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9923ac3d2b967e8ecbfefddaf19909b6a9a03b5b969b2a71af52300e3e404419"
+checksum = "2ecc52563b0558af2a7487eb710de07cc4532564b55528876129238e83118cb1"
 dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cranelift-codegen",
  "log",
  "object",
+ "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-internal-versioned-export-macros"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2c0062b75377b8d0a20239436b06df2e01a3521e9f14af6ea9b438c60fc030"
+checksum = "e747f4a074699ba1b4e4d841fb263f9b7df5bd1555181c4752bf5990d21ba676"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "wasmtime-internal-winch"
-version = "36.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8542e7cfd5b77ad33ac4cab866cb2b2eca350c7c34ac73e13fe78e83871ad3d7"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli",
- "object",
- "target-lexicon",
- "wasmparser 0.236.1",
- "wasmtime-environ",
- "wasmtime-internal-cranelift",
- "winch-codegen",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "wasmtime-internal-wit-bindgen"
-version = "36.0.5"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c8be7f99d674c7af47ceba83ee4dc4e36132798c920a7bfd7ca44ce7733f99"
+checksum = "80009f46991622814196d96fac6fc0a938f46b5cba737a8f4e21e24e5a03856f"
 dependencies = [
  "anyhow",
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "heck 0.5.0",
- "indexmap 2.11.4",
- "wit-parser",
+ "indexmap 2.14.0",
+ "wit-parser 0.251.0",
 ]
 
 [[package]]
@@ -9139,31 +9494,31 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "244.0.0"
+version = "252.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e7b9f9e23311275920e3d6b56d64137c160cf8af4f84a7283b36cfecbf4acb"
+checksum = "942a3449d6a593fccc111a6241c8df52bda168af30e40bf9580d4394d7374c65"
 dependencies = [
  "bumpalo",
  "leb128fmt",
  "memchr",
  "unicode-width",
- "wasm-encoder 0.244.0",
+ "wasm-encoder 0.252.0",
 ]
 
 [[package]]
 name = "wat"
-version = "1.244.0"
+version = "1.252.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf35b87ed352f9ab6cd0732abde5a67dd6153dfd02c493e61459218b19456fa"
+checksum = "c72a4ba7088f7bac94cf516e49882bdf97068904a563768cf249efc839ec42cb"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -9180,50 +9535,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "web3"
-version = "0.19.0-graph"
-source = "git+https://github.com/graphprotocol/rust-web3?branch=graph-patches-onto-0.18#f9f27f45ce23bf489d8bd010b50b2b207eb316cb"
-dependencies = [
- "arrayvec 0.7.4",
- "base64 0.13.1",
- "bytes",
- "derive_more 0.99.19",
- "ethabi",
- "ethereum-types",
- "futures 0.3.31",
- "futures-timer",
- "headers",
- "hex",
- "idna 0.2.3",
- "jsonrpc-core",
- "log",
- "once_cell",
- "parking_lot",
- "pin-project",
- "reqwest",
- "rlp",
- "secp256k1 0.21.3",
- "serde",
- "serde_json",
- "soketto",
- "tiny-keccak 2.0.2",
- "tokio",
- "tokio-stream",
- "tokio-util 0.6.10",
- "url",
- "web3-async-native-tls",
-]
-
-[[package]]
-name = "web3-async-native-tls"
-version = "0.4.0"
+name = "webpki-root-certs"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
 dependencies = [
- "native-tls",
- "thiserror 1.0.61",
- "tokio",
- "url",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -9304,26 +9621,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winch-codegen"
-version = "36.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ce0c15cfd084585ed8f5519d4f405de98ff530f6afe31b88a5560688879c85e"
-dependencies = [
- "anyhow",
- "cranelift-assembler-x64",
- "cranelift-codegen",
- "gimli",
- "regalloc2",
- "smallvec",
- "target-lexicon",
- "thiserror 2.0.18",
- "wasmparser 0.236.1",
- "wasmtime-environ",
- "wasmtime-internal-cranelift",
- "wasmtime-internal-math",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -9341,9 +9638,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
 [[package]]
 name = "windows-link"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-registry"
@@ -9374,6 +9671,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -9412,11 +9718,26 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.61.1"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
@@ -9467,6 +9788,12 @@ dependencies = [
  "windows_x86_64_msvc 0.53.0",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9485,6 +9812,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -9503,6 +9836,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -9533,6 +9872,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -9551,6 +9896,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -9569,6 +9920,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -9587,6 +9944,12 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -9616,18 +9979,15 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
 dependencies = [
  "memchr",
 ]
@@ -9639,12 +9999,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031"
 dependencies = [
  "assert-json-diff",
- "base64 0.22.1",
- "deadpool",
+ "base64",
+ "deadpool 0.12.3",
  "futures 0.3.31",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body-util",
- "hyper 1.8.1",
+ "hyper",
  "hyper-util",
  "log",
  "once_cell",
@@ -9655,31 +10015,120 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "wit-parser 0.244.0",
+]
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap 2.14.0",
+ "prettyplease",
+ "syn 2.0.118",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.1",
+ "indexmap 2.14.0",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder 0.244.0",
+ "wasm-metadata",
+ "wasmparser 0.244.0",
+ "wit-parser 0.244.0",
 ]
 
 [[package]]
 name = "wit-parser"
-version = "0.236.1"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e4833a20cd6e85d6abfea0e63a399472d6f88c6262957c17f546879a80ba15"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
- "semver 1.0.27",
+ "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.236.1",
+ "wasmparser 0.244.0",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.251.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e960732e824fab95099971a09e638979347c94ca48568d3c854c945729196947"
+dependencies = [
+ "anyhow",
+ "hashbrown 0.17.0",
+ "id-arena",
+ "indexmap 2.14.0",
+ "log",
+ "semver 1.0.28",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser 0.251.0",
 ]
 
 [[package]]
@@ -9754,7 +10203,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "synstructure",
 ]
 
@@ -9775,7 +10224,7 @@ checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -9795,7 +10244,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "synstructure",
 ]
 
@@ -9816,7 +10265,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -9838,9 +10287,21 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
+[[package]]
+name = "zlib-rs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c745c48e1007337ed136dc99df34128b9faa6ed542d80a1c673cf55a6d7236c8"
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
diff --git a/Cargo.toml b/Cargo.toml
index bd9808622a9..a956a514a95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@ members = [
 ]
 
 [workspace.package]
-version = "0.36.0"
-edition = "2021"
+version = "0.45.0"
+edition = "2024"
 authors = ["The Graph core developers & contributors"]
 readme = "README.md"
 homepage = "https://thegraph.com"
@@ -35,17 +35,24 @@ repository = "https://github.com/graphprotocol/graph-node"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
-alloy = { version = "1.0.33", features = ["dyn-abi", "json-abi", "full", "arbitrary", "json-rpc", "serde"] }
-alloy-rpc-types = "1.0.33"
+alloy = { version = "2.0.5", features = ["dyn-abi", "json-abi", "full", "arbitrary", "json-rpc", "serde"] }
+alloy-rpc-types = "2.0.0"
+# rustls is pulled in transitively by alloy (aws_lc_rs) and object_store via
+# reqwest (ring). With both providers linked, rustls 0.23 requires an explicit
+# default provider to be installed before any TLS use. We install aws_lc_rs
+# explicitly in each binary/test entry point.
+rustls = { version = "0.23", default-features = false, features = ["aws_lc_rs"] }
 anyhow = "1.0"
 async-graphql = { version = "7.2.1", features = ["chrono"] }
 async-graphql-axum = "7.2.1"
 async-trait = "0.1.74"
-axum = "0.8.8"
-chrono = "0.4.43"
+axum = "0.8.9"
+chrono = "0.4.44"
 bs58 = "0.5.1"
 clap = { version = "4.5.4", features = ["derive", "env", "wrap_help"] }
-derivative = "2.2.0"
+clap_complete = "4"
+console = "0.16"
+derive_more = { version = "2.1.1", default-features = false }
 diesel = { version = "2.2.7", features = [
     "postgres",
     "serde_json",
@@ -54,64 +61,73 @@ diesel = { version = "2.2.7", features = [
     "chrono",
     "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ] }
-diesel-async = { version = "0.7.4", features = ["deadpool", "async-connection-wrapper", "tokio", "postgres"] }
+diesel-async = { version = "0.9.0", features = ["deadpool", "async-connection-wrapper", "tokio", "postgres"] }
 diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
 diesel-dynamic-schema = { version = "0.2.3", features = ["postgres"] }
-diesel_derives = "2.3.6"
-diesel_migrations = "2.3.1"
+diesel_derives = "2.3.9"
+diesel_migrations = "2.3.2"
+env_logger = "0.11.10"
 envconfig = "0.11.1"
+git-testament = "0.2"
 graph = { path = "./graph" }
 graph-core = { path = "./core" }
 graph-store-postgres = { path = "./store/postgres" }
 graphman-server = { path = "./server/graphman" }
 graphman = { path = "./core/graphman" }
 graphman-store = { path = "./core/graphman_store" }
-graphql-tools = "0.5.0"
-itertools = "0.14.0"
+graphql-tools = "0.5.1"
+indicatif = "0.18"
+Inflector = "0.11.3"
+itertools = "0.15.0"
 lazy_static = "1.5.0"
 prost = "0.14"
 prost-types = "0.14"
-redis = { version = "1.0.2", features = [
+redis = { version = "1.2.2", features = [
     "aio",
     "connection-manager",
     "tokio-comp",
 ] }
 regex = "1.5.4"
 reqwest = "0.12.23"
+semver = { version = "1", features = ["serde"] }
 serde = { version = "1.0.126", features = ["rc"] }
 serde_derive = "1.0.125"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 serde_regex = "1.1.0"
 serde_yaml = "0.9.21"
 slog = { version = "2.8.2", features = ["release_max_level_trace", "max_level_trace"] }
-sqlparser = { version = "0.60.0", features = ["visitor"] }
-strum = { version = "0.27", features = ["derive"] }
-syn = { version = "2.0.114", features = ["full"] }
+slog-async = "2.5.0"
+slog-term = "2.7.0"
+sqlparser = { version = "0.62.0", features = ["visitor"] }
+strum = { version = "0.28", features = ["derive"] }
+syn = { version = "2.0.117", features = ["full"] }
 test-store = { path = "./store/test-store" }
 thiserror = "2.0.18"
-deadpool = { version = "0.12", features = ["rt_tokio_1", "managed"] }
-tokio = { version = "1.49.0", features = ["full"] }
+deadpool = { version = "0.13", features = ["rt_tokio_1", "managed"] }
+tokio = { version = "1.50.0", features = ["full"] }
 tokio-stream = { version = "0.1.18", features = ["sync"] }
 tokio-retry = "0.3.0"
 
 tonic = { version = "0.14", features = ["tls-native-roots", "gzip"] }
 tonic-prost = "0.14"
 tonic-prost-build = "0.14"
-tower-http = { version = "0.6.8", features = ["cors"] }
+tower-http = { version = "0.7.0", features = ["cors"] }
 tower = { version = "0.5.1", features = ["full"] }
 wasmparser = "0.118.1"
-wasmtime = { version = "36.0.5", features = ["async"] }
+wasmtime = { version = "46.0.0", features = ["async"] }
 rand = { version = "0.9.2", features = ["os_rng"] }
 prometheus = "0.14.0"
+url = "2.5.8"
 
 # Dependencies related to Amp subgraphs
 ahash = "0.8.11"
-arrow = { version = "=57.0.0" }
-arrow-flight = { version = "=57.0.0", features = ["flight-sql-experimental"] }
+arrow = { version = "=59.0.0" }
+arrow-flight = { version = "=59.0.0", features = ["flight-sql-experimental"] }
+parquet = { version = "=59.0.0" }
 futures = "0.3.31"
 half = "2.7.1"
 indoc = "2.0.7"
-lazy-regex = "3.4.1"
+lazy-regex = "3.6.0"
 parking_lot = "0.12.4"
 sqlparser-latest = { version = "0.57.0", package = "sqlparser", features = ["visitor"] }
 tokio-util = "0.7.15"
diff --git a/NEWS.md b/NEWS.md
index 719d2f12e49..8068ecbc9fa 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,320 @@
 # NEWS
 
+## v0.45.0
+
+```
+$ docker pull graphprotocol/graph-node:v0.45.0
+```
+
+### Breaking Changes
+
+- **`GRAPH_GETH_ETH_CALL_ERRORS` renamed to `GRAPH_RPC_ETH_CALL_ERRORS`.** The env var (and internal config field) controlling which `eth_call` error messages are treated as reverts is renamed for provider-neutral naming. Update it before upgrading, or the setting is silently ignored and defaults apply. ([#6487](https://github.com/graphprotocol/graph-node/pull/6487))
+
+### What's New
+
+- **Postponed attribute index creation re-enabled, now built in the background.** `GRAPH_POSTPONE_ATTRIBUTE_INDEX_CREATION` (introduced in v0.44.0 but inert — hardcoded off) now actually defers non-critical attribute indexes until a new deployment nears chain head (`GRAPH_POSTPONE_INDEXES_CREATION_THRESHOLD`, default 10000 blocks from head). Index creation now runs in a background task instead of blocking block processing, and interrupted `CREATE INDEX CONCURRENTLY` runs are detected and rebuilt on retry instead of being silently skipped. ([#6608](https://github.com/graphprotocol/graph-node/pull/6608))
+- **`ethereum.decodeParams` host function.** Decodes calldata/event data whose top-level type is a dynamic tuple (e.g. Gnosis Safe's `execTransaction`), which `ethereum.decode` cannot handle since it expects a single ABI value with a leading offset word. Gated behind apiVersion 0.0.10; `ethereum.decode` itself is unchanged. ([#6649](https://github.com/graphprotocol/graph-node/pull/6649))
+
+### Bug Fixes
+
+- Fixed `EthereumLogFilter` merging per-handler `receipt` flags with overwrite instead of OR semantics, so a handler declaring `receipt: true` could silently run with `event.receipt == null` if another handler on the same filter key declared `receipt: false`. ([#6558](https://github.com/graphprotocol/graph-node/pull/6558))
+- Fixed grafts silently succeeding when the graft block was below the base deployment's earliest available block, leaving the destination missing pre-graft entity versions and producing `unexpected null in handler` errors on every event; `Graft::validate` now rejects these upfront. ([#6610](https://github.com/graphprotocol/graph-node/pull/6610))
+- Fixed `_logs` queries returning an empty result (indistinguishable from a subgraph producing no logs) when no log store is configured; now returns a `NotSupported` error. ([#6637](https://github.com/graphprotocol/graph-node/pull/6637))
+- Fixed startup panicking when a shard is configured with `pool_size = 0`; such shards' chains are now skipped instead of erroring. ([#6648](https://github.com/graphprotocol/graph-node/pull/6648))
+- Fixed the Firehose extended-blocks check matching on `optimism-mainnet` instead of the `optimism` chain ID used by Firehose endpoints, so Optimism's extended block data went undetected. ([#6662](https://github.com/graphprotocol/graph-node/pull/6662))
+- Fixed fulltext (`tsvector`) search columns being silently dropped when copying or grafting a subgraph, leaving the destination's fulltext index empty. ([#6687](https://github.com/graphprotocol/graph-node/pull/6687))
+- Fixed Reth `StackUnderflow`/`StackOverflow`/`OpcodeNotFound` EVM halts being misclassified as non-deterministic — Reth surfaces them via its `Debug` format (e.g. `EVM error: StackUnderflow`), which didn't match graph-node's space-separated deterministic-error patterns, so subgraphs indexing via Reth-backed RPC providers stalled and retried instead of recording a deterministic revert. ([#6645](https://github.com/graphprotocol/graph-node/pull/6645))
+
+### Graphman
+
+- Fixed `graphman dump` panicking on tables with more than ~2 GiB in a single string/binary column; batches are now split into byte-bounded slices before conversion to Arrow. ([#6646](https://github.com/graphprotocol/graph-node/pull/6646))
+
+### gnd (Graph Node Dev)
+
+- Fixed `gnd add` producing a subgraph that failed `codegen`/`build` because it never wrote new event entities to `schema.graphql`; unified `add` and `init` onto one scaffolding path, which also fixes event-name collisions across data sources, overloaded-event disambiguation, small-integer type mapping, and reserved-word parameter names. ([#6660](https://github.com/graphprotocol/graph-node/pull/6660))
+
+### Upgrade Notes
+
+- If you set `GRAPH_GETH_ETH_CALL_ERRORS`, rename it to `GRAPH_RPC_ETH_CALL_ERRORS` before upgrading. ([#6487](https://github.com/graphprotocol/graph-node/pull/6487))
+- `GRAPH_POSTPONE_ATTRIBUTE_INDEX_CREATION` now actually takes effect (it was a no-op in v0.44.0). If you already set it expecting no behavior change, be aware new deployments will now defer some attribute indexes until near chain head. ([#6608](https://github.com/graphprotocol/graph-node/pull/6608))
+- If a subgraph was grafted from a base block below the base deployment's earliest available block before this release, it may be missing pre-graft entity versions; re-create the graft from a valid earliest block. ([#6610](https://github.com/graphprotocol/graph-node/pull/6610))
+
+### Contributors
+
+Thanks to all contributors for this release: @cargopete, @dimitrovmaksim, @fordN, @incrypto32, @lutter, @YaroShkvorets
+
+**Full Changelog**: https://github.com/graphprotocol/graph-node/compare/v0.44.0...v0.45.0
+
+## v0.44.0
+
+```
+$ docker pull graphprotocol/graph-node:v0.44.0
+```
+
+### Critical Fix
+
+- **`EntityCache::load_related` returned wrong derived-collection membership on same-block parent reassignment.** Membership was decided against intermediate cache layers rather than the entity's final state, so entities reassigned to a new parent within the same block could be left in the old collection, omitted from the new one, or wrongly retained after a cross-handler revert. See Upgrade Notes. ([#6548](https://github.com/graphprotocol/graph-node/pull/6548))
+
+### Breaking Changes
+
+- **Elasticsearch CLI flags removed.** `--elasticsearch-url`, `--elasticsearch-user`, `--elasticsearch-password` (and the matching `ELASTICSEARCH_*` env vars) are gone. Configure Elasticsearch under the new `[log_store]` section in `graph-node.toml`. See Upgrade Notes. ([#6278](https://github.com/graphprotocol/graph-node/pull/6278))
+
+### What's New
+
+- **Query subgraph logs over GraphQL.** A new `_logs` field exposes subgraph-emitted logs (mapping `log.*` calls, runtime, system) with filters for level, timestamp range, and text search, plus pagination and `orderDirection`. The old Elasticsearch sink for subgraph logs is replaced by a unified `LogStore` abstraction with three backends configured under a new `[log_store]` section in `graph-node.toml`: File (JSON Lines), Loki, or Elasticsearch. Omit `[log_store]` to disable; logs still go to stdout/stderr. ([#6278](https://github.com/graphprotocol/graph-node/pull/6278))
+
+<!--
+TODO(next release): re-add the postponed-index-creation entry once #6608 is verified in the hosted service.
+The implementation (#6434, #6583) is in this release but disabled via `graph: Disable postponed index creation`
+(`postpone_attribute_index_creation` hardcoded to false). Suggested bullet:
+
+- **Postponed index creation extended to syncing subgraphs.** `GRAPH_POSTPONE_ATTRIBUTE_INDEX_CREATION` previously only deferred indexes during copies. It now also postpones indexes during the initial sync of any subgraph, with a new `GRAPH_POSTPONE_INDEXES_CREATION_THRESHOLD` (default 10000) controlling how close to chain head the deployment must get before they're created. Tracked per-deployment so creation runs at most once, even if indexes are manually dropped later. ([#6434](https://github.com/graphprotocol/graph-node/pull/6434) [#6583](https://github.com/graphprotocol/graph-node/pull/6583))
+-->
+
+
+### Improvements
+
+- Revert entity versions during copy instead of in a separate post-copy pass, speeding up subgraph copy and graft. ([#6472](https://github.com/graphprotocol/graph-node/pull/6472))
+
+### Bug Fixes
+
+- Fixed `trace_filter` deserialization failing on providers that omit `result.output` (notably Sonic), which caused repeated trace ingestion retries. Fixed upstream in alloy 2.0.5 ([alloy#3931](https://github.com/alloy-rs/alloy/pull/3931)) and picked up via the bump in this release. ([#6576](https://github.com/graphprotocol/graph-node/pull/6576))
+- Fixed runner panics on out-of-range `BigInt` values: `to_signed_u256` replaced by fallible `to_i256`, and `to_unsigned_u256` now errors on values `>= 2^256` instead of panicking. ([#6560](https://github.com/graphprotocol/graph-node/pull/6560))
+- Fixed `graphman chain change-shard` failing with a duplicate-key error on revert to the original shard. Backups now use unique names and revert reuses the existing `<chain>-old`. ([#6199](https://github.com/graphprotocol/graph-node/pull/6199))
+
+### Upgrade Notes
+
+- v0.44.0 changes `EntityCache::load_related` results for same-block parent-reassignment edge cases ([#6548](https://github.com/graphprotocol/graph-node/pull/6548)). Subgraphs that read derived fields within handlers may diverge in POI from v0.43.0 on blocks exhibiting this pattern; resync from before the affected blocks if affected. The v0.44.0 result is canonical.
+- If you set `--elasticsearch-*` flags or `ELASTICSEARCH_*` env vars, migrate to a `[log_store]` section in `graph-node.toml` before upgrading. See `docs/log-store.md`. ([#6278](https://github.com/graphprotocol/graph-node/pull/6278))
+
+### Contributors
+
+Thanks to all contributors for this release: @erayack, @fordN, @incrypto32, @lutter
+
+**Full Changelog**: https://github.com/graphprotocol/graph-node/compare/v0.43.0...v0.44.0
+
+## v0.43.0
+
+### What's New
+
+- **`skipDuplicates` for immutable entities.** A new `skipDuplicates` parameter on the `@entity` directive (`@entity(immutable: true, skipDuplicates: true)`) silently skips duplicate inserts instead of failing the subgraph. This unblocks subgraph composition on Amp-powered subgraphs where SQL queries can produce the same entities across block ranges. ([#6458](https://github.com/graphprotocol/graph-node/pull/6458))
+- **Per-chain RPC settings via TOML config.** Chain-specific tuning parameters (`json_rpc_timeout`, `request_retries`, `max_block_range_size`, `polling_interval`, `block_batch_size`, etc.) can now be set per chain in `config.toml` instead of relying on global environment variables. Fully backwards compatible — env vars remain the fallback. ([#6459](https://github.com/graphprotocol/graph-node/pull/6459))
+- **RPC provider failover for block ingestor.** When the current RPC provider becomes unreachable during block ingestion polling, graph-node now automatically switches to a healthy alternative provider. ([#6430](https://github.com/graphprotocol/graph-node/pull/6430))
+- Warn on startup when running a debug build, with `[DEBUG-BUILD]` prefix on all log lines. ([#6488](https://github.com/graphprotocol/graph-node/pull/6488))
+
+### Improvements
+
+- **Call cache eviction rewrite.** Replaced the old per-contract iteration approach with ctid-based join deletes against the `call_meta` table, significantly faster on large `call_cache` tables. The old `--ttl-max-contracts` flag has been replaced by `--max-contracts`, which computes an effective TTL cutoff instead of limiting per-invocation iteration. Eviction now also returns stats on the number of contracts and entries removed. ([#6476](https://github.com/graphprotocol/graph-node/pull/6476)) ([#6477](https://github.com/graphprotocol/graph-node/pull/6477))
+- Reduced unnecessary `eth_getBlockByHash` and `eth_getBlockByNumber` RPC calls by checking the block cache first in `block_pointer_from_number` and `fetch_full_block_with_rpc`. ([#6491](https://github.com/graphprotocol/graph-node/pull/6491), partially reverted by [#6537](https://github.com/graphprotocol/graph-node/pull/6537))
+- Header-only `ChainStore` query methods (`ancestor_block_ptr`, `block_parent_ptr`) skip deserializing the full block `data` JSONB column when only hash/number/parent are needed. ([#6456](https://github.com/graphprotocol/graph-node/pull/6456))
+- Batch checking for update attempts on immutable entities, reducing per-entity overhead.
+- Node name is now used as the PostgreSQL `application_name` when `PGAPPNAME` is not set, making it easier to identify graph-node connections in `pg_stat_activity`.
+
+### Bug Fixes
+
+- Fixed dropped block trigger when `once` and `polling` filters match the same block — only one trigger type was firing. ([#6530](https://github.com/graphprotocol/graph-node/pull/6530))
+- Fixed block stream ignoring configured `endBlock` in two cases: the block-skip optimization bypassing the `max_end_block` check, and `max_end_block` being set to `None` when multiple data sources share the same `endBlock`. ([#6474](https://github.com/graphprotocol/graph-node/pull/6474))
+- Fixed GraphQL introspection not returning `isDeprecated: false` for `__InputValue`, which caused some client libraries to fail. ([#6475](https://github.com/graphprotocol/graph-node/pull/6475))
+- Fixed IPC provider connections failing when configured with `ipc://` or `file://` URLs — the URL was passed directly to the transport instead of extracting the file path. ([#6443](https://github.com/graphprotocol/graph-node/pull/6443))
+- Fixed `graphman config pools` not working due to hardcoded pool size override. ([#6444](https://github.com/graphprotocol/graph-node/pull/6444))
+- Fixed unfail retry mechanism stopping after the first attempt when the deployment head was still behind the error block. ([#6529](https://github.com/graphprotocol/graph-node/pull/6529))
+
+### Note on `ethereum.decode()` whitespace handling
+
+The migration from `ethabi` to `alloy` in v0.42.0 ([#6063](https://github.com/graphprotocol/graph-node/pull/6063)) incidentally fixed a long-standing parsing bug in `ethabi` where type strings containing whitespace before a type name (e.g. `" address"` with a leading space) were silently decoded as `Uint(8)` instead of the intended type. `alloy` parses these correctly.
+
+Subgraphs that relied on the incorrect `Uint(8)` decoding to subsequently call `.toBigInt()` on what is actually an `Address` value will abort on v0.42.0+ with:
+
+```
+Mapping aborted ... Ethereum value is not an int or uint.
+```
+
+This is not a graph-node regression. Recompile the subgraph with the correct accessor (`.toAddress()` for addresses) to fix. See [#6461](https://github.com/graphprotocol/graph-node/issues/6461) for details.
+
+### gnd (Graph Node Dev)
+
+- `gnd indexer` command that delegates to `graph-indexer`, allowing indexer management (allocations, rules, cost models, status) directly through gnd. ([#6492](https://github.com/graphprotocol/graph-node/pull/6492))
+- `gnd deploy` now prompts for `--version-label` in interactive mode and requires it in non-interactive mode. ([#6532](https://github.com/graphprotocol/graph-node/pull/6532))
+- Test framework improvements: partial receipt.logs support, mock IPFS/Arweave clients for file data source testing. ([#6442](https://github.com/graphprotocol/graph-node/pull/6442))
+
+### Contributors
+
+Thanks to all contributors for this release: @aayushbaluni, @dimitrovmaksim, @incrypto32, @isum, @lutter, @suntzu
+
+**Full Changelog**: https://github.com/graphprotocol/graph-node/compare/v0.42.1...v0.43.0
+
+## v0.42.1
+
+### Bug Fixes
+
+- Fixed multi-shard deployments becoming unresponsive due to `mirror_primary_tables` holding locks indefinitely, exhausting the connection pool. Added `statement_timeout` and `lock_timeout` to prevent stuck queries from cascading into a full lockup. ([#6446](https://github.com/graphprotocol/graph-node/pull/6446))
+- Fixed the `ingestor` setting in `[chains.*]` config sections having no effect — block ingestion ran regardless of its value. ([#6447](https://github.com/graphprotocol/graph-node/pull/6447))
+
+## v0.42.0
+
+### Breaking Changes
+
+- **Substreams support removed.** Substreams have been unsupported on the network for some time. All substreams-related code has been removed, simplifying the codebase significantly. Substreams-based subgraphs will no longer work. ([#6261](https://github.com/graphprotocol/graph-node/pull/6261))
+- **Migrated from rust-web3 to alloy.** The Ethereum RPC layer now uses the alloy crate instead of rust-web3. This should be transparent to most users, but chains that do not return EIP-2718 typed transaction fields may need the `no_eip2718` provider feature flag. ([#6063](https://github.com/graphprotocol/graph-node/pull/6063)) ([#6317](https://github.com/graphprotocol/graph-node/pull/6317))
+
+### What's New
+
+- **Amp-powered subgraphs (experimental).** A new kind of subgraph powered by [Amp](https://github.com/edgeandnode/amp), the blockchain native database. Amp-powered subgraphs index data directly from Amp servers instead of processing blocks individually, reducing indexing time from days/weeks to minutes/hours. See `docs/amp-powered-subgraphs.md` for details. ([#6218](https://github.com/graphprotocol/graph-node/pull/6218)) ([#6293](https://github.com/graphprotocol/graph-node/pull/6293)) ([#6369](https://github.com/graphprotocol/graph-node/pull/6369))
+- **SQL query interface (experimental).** A new experimental SQL query interface allows querying subgraph data using SQL syntax via GraphQL. Documentation in `docs/implementation/sql-interface.md`. ([#6172](https://github.com/graphprotocol/graph-node/pull/6172))
+- **Async store.** All store and database interactions are now fully async using `diesel_async`, eliminating blocking database calls from tokio tasks. This improves throughput and reduces the risk of thread starvation under heavy load. ([#6194](https://github.com/graphprotocol/graph-node/pull/6194)) ([#6185](https://github.com/graphprotocol/graph-node/pull/6185))
+- **RPC request compression.** Configurable compression for outgoing JSON-RPC requests to upstream providers, supporting gzip, brotli, and deflate. Configured via provider `features` in the config file. ([#6084](https://github.com/graphprotocol/graph-node/pull/6084))
+- Query the current (partially filled) aggregation bucket with `current: include` in GraphQL requests. ([#6293](https://github.com/graphprotocol/graph-node/pull/6293))
+- Extended `first` and `last` aggregation support to `String`, `Bytes`, and entity reference types. ([#6225](https://github.com/graphprotocol/graph-node/pull/6225))
+- Automated account-like table optimization — an optional background job that detects and marks tables with high entity update ratios as account-like. Enabled via `GRAPH_STORE_ACCOUNT_LIKE_SCAN_INTERVAL_HOURS`, `GRAPH_STORE_ACCOUNT_LIKE_MIN_VERSIONS_COUNT`, and `GRAPH_STORE_ACCOUNT_LIKE_MAX_UNIQUE_RATIO`. ([#6209](https://github.com/graphprotocol/graph-node/pull/6209))
+- Subgraph table sizes and row counts are now exposed in `SubgraphIndexingStatus` via the index-node API. ([#6201](https://github.com/graphprotocol/graph-node/pull/6201))
+- Configurable database setup timeout via `GRAPH_STORE_SETUP_TIMEOUT`.
+- Option to disable the store call cache via `GRAPH_STORE_DISABLE_CALL_CACHE`, useful for indexers with locally hosted RPC nodes. ([#6214](https://github.com/graphprotocol/graph-node/pull/6214))
+- Docker: added profiling support to the `graph-node-debug` image with frame pointers and `linux-perf`. ([#6418](https://github.com/graphprotocol/graph-node/pull/6418))
+
+### Improvements
+
+- Optimized WASM trigger instantiation by caching linker and compilation artifacts, reducing per-trigger overhead. ([#6364](https://github.com/graphprotocol/graph-node/pull/6364))
+- Optimized log filter matching and trigger allocation, reducing CPU usage during block processing. ([#6419](https://github.com/graphprotocol/graph-node/pull/6419))
+- Reduced unnecessary entity clones during block processing. ([#6362](https://github.com/graphprotocol/graph-node/pull/6362))
+- Replaced `std::sync::RwLock` with `parking_lot::RwLock` across multiple components for better performance under contention.
+- Deadlock prevention under heavy load, especially during index node startup — connection pool and store semaphore improvements. ([#6224](https://github.com/graphprotocol/graph-node/pull/6224))
+- Raw subgraph manifests are now loaded from the store cache during startup, reducing IPFS dependency. ([#6223](https://github.com/graphprotocol/graph-node/pull/6223))
+- Deployment hashes are now logged when removing a subgraph. ([#6405](https://github.com/graphprotocol/graph-node/pull/6405))
+
+### Bug Fixes
+
+- Fixed duplicate VID when multiple offchain triggers (file/IPFS data sources) fire in the same block, causing unique constraint violations. Also fixed in `ipfs.map()` callbacks. ([#6336](https://github.com/graphprotocol/graph-node/pull/6336)) ([#6416](https://github.com/graphprotocol/graph-node/pull/6416))
+- Fixed incorrect `nocase` filter generation for non-String types (e.g., `Bytes`), which caused SQL errors like `operator does not exist: bytea ~~* bytea`. ([#6351](https://github.com/graphprotocol/graph-node/pull/6351))
+- Fixed `can_copy_from` failures not fully rolling back deployment creation, leaving orphaned records. ([#6228](https://github.com/graphprotocol/graph-node/pull/6228))
+- Fixed multi-column index validation bug where column order mismatch caused valid indexes to be silently dropped during subgraph copy/graft. ([#6341](https://github.com/graphprotocol/graph-node/pull/6341))
+- Fixed grafting failure ("Unexpected null for non-null column") when source tables have too few rows for PostgreSQL to generate `histogram_bounds` statistics. ([#6275](https://github.com/graphprotocol/graph-node/pull/6275))
+- Fixed panic when converting a negative number to `U256` in the runtime — now returns an error instead. ([#6219](https://github.com/graphprotocol/graph-node/pull/6219))
+- Fixed `graphman copy` copying pruned `earliest_block_number` from source, which could leave the destination deployment in an invalid state. ([#6384](https://github.com/graphprotocol/graph-node/pull/6384))
+- Fixed calls returning `0x` being incorrectly cached in the call cache, preventing stale empty results from persisting. ([#6187](https://github.com/graphprotocol/graph-node/pull/6187))
+
+### Graphman
+
+- **`graphman dump` and `graphman restore` (experimental).** New commands for exporting and importing subgraph data in Parquet format, enabling backup and migration of deployment data across shards. Supports incremental dumps and progress reporting. See `docs/dump.md` for details. ([#6397](https://github.com/graphprotocol/graph-node/pull/6397))
+- `graphman chain call-cache remove` now supports `--ttl-days` to remove stale call cache entries that haven't been accessed within a specified number of days. ([#6186](https://github.com/graphprotocol/graph-node/pull/6186))
+
+### gnd (Graph Node Dev)
+
+- **[experimental]** Major expansion of `gnd` as a drop-in replacement for `graph-cli`: `init`, `add`, `codegen`, `build`, `publish`, `deploy`, `create`, `remove`, `auth`, `clean`, and `test` commands. ([#6282](https://github.com/graphprotocol/graph-node/pull/6282))
+
+### Contributors
+
+Thanks to all contributors for this release: @DaMandal0rian, @dimitrovmaksim, @fubhy, @hudsonhrh, @incrypto32, @isum, @lutter, @shiyasmohd
+
+**Full Changelog**: https://github.com/graphprotocol/graph-node/compare/v0.41.2...v0.42.0
+
+## v0.41.2
+
+### Bug Fixes
+
+- Fixed entity corruption after rewinding pruned subgraphs — rewinding a subgraph with `history_blocks` (pruning) enabled could leave frequently-updated entities with no open version, causing deterministic `unexpected null` errors and making the subgraph unrecoverable without a full re-index ([#6340](https://github.com/graphprotocol/graph-node/pull/6340))
+- Fixed `graphman rewind` and `graphman truncate` targeting the wrong deployment when multiple instances of the same subgraph exist ([#6299](https://github.com/graphprotocol/graph-node/pull/6299))
+- Fixed batch write memoization bug where entity lookups could incorrectly return `None`, causing missed entity updates during indexing ([#6314](https://github.com/graphprotocol/graph-node/pull/6314))
+- Expanded deterministic RPC error handling for Reth and Erigon — added `vm execution error`, `invalidjump`, `notactivated`, and `invalidfeopcode` to recognized deterministic errors. Indexers using these clients no longer need to set `GRAPH_GETH_ETH_CALL_ERRORS` manually for these cases ([#6355](https://github.com/graphprotocol/graph-node/pull/6355))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.41.1...v0.41.2>
+
+## v0.41.1
+
+### Bug Fixes
+
+- Fixed a regression in v0.41.0 where the indexing status endpoint would return an empty list when querying all subgraphs without specific deployment filters ([#6210](https://github.com/graphprotocol/graph-node/pull/6210))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.41.0...v0.41.1>
+
+## v0.41.0
+
+### Bug Fixes
+
+- Fix non-deterministic handling of transaction receipts in event handlers; receipts are only processed when explicitly declared ([#6200](https://github.com/graphprotocol/graph-node/pull/6200))
+
+### New Features
+
+- Added support for struct field access in declarative calls — enables accessing nested struct fields by field name using dot notation in manifest call declarations ([#6099](https://github.com/graphprotocol/graph-node/pull/6099))
+- New standalone `gnd` (Graph Node Dev) crate — a graph-node binary optimized for local development with minimal setup required ([#6167](https://github.com/graphprotocol/graph-node/pull/6167))
+- Extended IPFS usage metrics and logging capabilities ([#6058](https://github.com/graphprotocol/graph-node/pull/6058))
+- Extended support for additional IPFS content path formats ([#6058](https://github.com/graphprotocol/graph-node/pull/6058))
+
+### Improvements
+
+- Deferred IPFS manifest fetching when starting subgraphs — fixes issue where slow IPFS responses could block assignment event processing ([#6170](https://github.com/graphprotocol/graph-node/pull/6170))
+- Added Content Identifier (CID) to IPFS retry logs for better debugging ([#6144](https://github.com/graphprotocol/graph-node/pull/6144))
+- Fixed handling of empty arrays in indexing status queries ([#6143](https://github.com/graphprotocol/graph-node/pull/6143))
+- Fixed case-insensitive array inputs in queries ([#6075](https://github.com/graphprotocol/graph-node/pull/6075))
+- Fixed panic when handling empty lists in `list_values` ([#6100](https://github.com/graphprotocol/graph-node/pull/6100))
+- Enhanced logging for subgraph assignment processing ([#6169](https://github.com/graphprotocol/graph-node/pull/6169))
+- Added logging for `MAX_BLOCKING_THREADS` configuration setting ([#6161](https://github.com/graphprotocol/graph-node/pull/6161))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.40.1...v0.41.0>
+
+## v0.40.1
+
+### Improvements
+
+- Enhanced IPFS logging to include Content Identifiers (CIDs) in operation names for better debugging
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.40.0...v0.40.1>
+
+## v0.40.0
+
+### Critical Bugfix
+
+- Fixed GraphQL query panic with empty arrays: Resolved a critical bug where GraphQL queries using `_in` filters with empty arrays would cause the graph-node to panic ([#6100](https://github.com/graphprotocol/graph-node/pull/6100))
+
+### New Features
+
+- IPFS files can now be cached to disk using `GRAPH_IPFS_CACHE_LOCATION` — reduces IPFS requests after restarts ([#6031](https://github.com/graphprotocol/graph-node/pull/6031))
+
+### Improvements
+
+- Speed up appending changes to batch operations ([#6025](https://github.com/graphprotocol/graph-node/pull/6025))
+- Improved backoff strategy for offchain data sources, configurable via `GRAPH_FDS_MAX_BACKOFF` ([#6043](https://github.com/graphprotocol/graph-node/pull/6043))
+- Better error messages for OR operator usage with column filters ([#6078](https://github.com/graphprotocol/graph-node/pull/6078))
+- Update Wasmtime version for improved WebAssembly performance ([#6050](https://github.com/graphprotocol/graph-node/pull/6050))
+
+### Bug Fixes
+
+- Fixed subgraph composition sync failures with different ID types ([#6080](https://github.com/graphprotocol/graph-node/pull/6080))
+- Fixed pruning status reporting accuracy ([#6062](https://github.com/graphprotocol/graph-node/pull/6062))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.39.1...v0.40.0>
+
+## v0.39.1
+
+### Critical Fix
+
+- Reverted `event.transactionLogIndex` behavior change from v0.38.0 that caused subgraph failures with duplicate ID errors and POI divergence between indexers ([#6042](https://github.com/graphprotocol/graph-node/pull/6042))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.39.0...v0.39.1>
+
+## v0.39.0
+
+### Breaking Changes
+
+- **Database schema migration**: `subgraphs.subgraph_deployment` table split into `subgraphs.head` and `subgraphs.deployment`. External tools accessing this table will need updates. See [documentation](https://github.com/graphprotocol/graph-node/blob/master/docs/implementation/metadata.md#subgraphshead) ([#6003](https://github.com/graphprotocol/graph-node/pull/6003))
+- **Arweave blockchain support removed** — Arweave subgraphs are no longer supported (file data sources remain unaffected) ([#5951](https://github.com/graphprotocol/graph-node/pull/5951))
+- **`graphman drop` removed** — Use `graphman remove` followed by `graphman unused record && graphman unused remove` ([#5974](https://github.com/graphprotocol/graph-node/pull/5974))
+- **Failed subgraphs are now paused instead of unassigned** ([#5971](https://github.com/graphprotocol/graph-node/pull/5971))
+
+### New Features
+
+- Pruning status tracking with new graphman commands: `prune status`, `prune run`, `prune set` ([#5949](https://github.com/graphprotocol/graph-node/pull/5949))
+- Pruning timeout protection via `GRAPH_STORE_BATCH_TIMEOUT` ([#6002](https://github.com/graphprotocol/graph-node/pull/6002))
+- `graphman chain ingest` for manually ingesting specific blocks ([#5945](https://github.com/graphprotocol/graph-node/pull/5945))
+- Configurable IPFS retry limits via `GRAPH_IPFS_MAX_ATTEMPTS` and `GRAPH_IPFS_REQUEST_TIMEOUT` ([#5998](https://github.com/graphprotocol/graph-node/pull/5998))
+
+### Bug Fixes
+
+- Fixed VID sequence naming to comply with PostgreSQL 63-character limit
+- Fixed pruning of tables with VID sequences using CASCADE drops ([#5968](https://github.com/graphprotocol/graph-node/pull/5968))
+- Fixed numerical precision issues with large VID values ([#5970](https://github.com/graphprotocol/graph-node/pull/5970))
+
+**Full changelog:** <https://github.com/graphprotocol/graph-node/compare/v0.38.0...v0.39.0>
+
 ## v0.38.0
 
 ### What's new
diff --git a/README.md b/README.md
index 118a7c8a846..667c606a045 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Graph Node
 
 [![Build Status](https://github.com/graphprotocol/graph-node/actions/workflows/ci.yml/badge.svg)](https://github.com/graphprotocol/graph-node/actions/workflows/ci.yml?query=branch%3Amaster)
-[![Getting Started Docs](https://img.shields.io/badge/docs-getting--started-brightgreen.svg)](docs/getting-started.md)
+[![Docs](https://img.shields.io/badge/docs-graph--node-green.svg)](docs/)
+[![Subgraphs](https://img.shields.io/badge/docs-subgraphs-green.svg)](https://thegraph.com/docs/en/subgraphs/quick-start/)
 
 ## Overview
 
@@ -29,7 +30,7 @@ This is usually only needed for developers who want to contribute to `graph-node
 To build and run this project, you need to have the following installed on your system:
 
 - Rust (latest stable): Follow [How to install
-  Rust](https://www.rust-lang.org/en-US/install.html). Run `rustup install
+  Rust](https://rust-lang.org/tools/install/). Run `rustup install
 stable` in _this directory_ to make sure all required components are
   installed. The `graph-node` code assumes that the latest available
   `stable` compiler is used.
@@ -114,6 +115,44 @@ Very large `graph-node` instances can also be configured using a
 the `graph-node` needs to connect to multiple chains or if the work of
 indexing and querying needs to be split across [multiple databases](./docs/config.md).
 
+#### Log Storage
+
+`graph-node` supports storing and querying subgraph logs through multiple backends:
+
+- **File**: Local JSON Lines files (recommended for local development)
+- **Elasticsearch**: Enterprise-grade search and analytics (for production)
+- **Loki**: Grafana's log aggregation system (for production)
+- **Disabled**: No log storage (default)
+
+**Quick example (file-based logs for local development):**
+```bash
+mkdir -p ./graph-logs
+
+cargo run -p graph-node --release -- \
+  --postgres-url $POSTGRES_URL \
+  --ethereum-rpc mainnet:archive:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend file \
+  --log-store-file-dir ./graph-logs
+```
+
+Logs are queried via GraphQL at `http://localhost:8000/graphql`:
+```graphql
+query {
+  _logs(subgraphId: "QmYourSubgraphHash", level: ERROR, first: 10) {
+    timestamp
+    level
+    text
+  }
+}
+```
+
+**For complete documentation**, see the **[Log Store Guide](./docs/log-store.md)**, which covers:
+- How to configure each backend (Elasticsearch, Loki, File)
+- Complete GraphQL query examples
+- Choosing the right backend for your use case
+- Performance considerations and best practices
+
 ## Contributing
 
 Please check [CONTRIBUTING.md](CONTRIBUTING.md) for development flow and conventions we use.
diff --git a/chain/common/src/lib.rs b/chain/common/src/lib.rs
index b8f2ae47eb4..395dd440c84 100644
--- a/chain/common/src/lib.rs
+++ b/chain/common/src/lib.rs
@@ -2,13 +2,13 @@ use std::collections::HashMap;
 use std::fmt::Debug;
 
 use anyhow::Error;
-use protobuf::descriptor::field_descriptor_proto::Label;
-use protobuf::descriptor::field_descriptor_proto::Type;
+use protobuf::Message;
+use protobuf::UnknownValueRef;
 use protobuf::descriptor::DescriptorProto;
 use protobuf::descriptor::FieldDescriptorProto;
 use protobuf::descriptor::OneofDescriptorProto;
-use protobuf::Message;
-use protobuf::UnknownValueRef;
+use protobuf::descriptor::field_descriptor_proto::Label;
+use protobuf::descriptor::field_descriptor_proto::Type;
 use std::convert::From;
 use std::path::Path;
 
diff --git a/chain/common/tests/test-acme.rs b/chain/common/tests/test-acme.rs
index cd0b32b8582..2945fea337e 100644
--- a/chain/common/tests/test-acme.rs
+++ b/chain/common/tests/test-acme.rs
@@ -7,8 +7,8 @@ fn check_repeated_type_ok() {
     let types = parse_proto_file(PROTO_FILE).expect("Unable to read proto file!");
 
     let array_types = types
-        .iter()
-        .flat_map(|(_, t)| t.fields.iter())
+        .values()
+        .flat_map(|t| t.fields.iter())
         .filter(|t| t.is_array)
         .map(|t| t.type_name.clone())
         .collect::<std::collections::HashSet<_>>();
diff --git a/chain/ethereum/Cargo.toml b/chain/ethereum/Cargo.toml
index 4caaef9b668..a9c9d42a124 100644
--- a/chain/ethereum/Cargo.toml
+++ b/chain/ethereum/Cargo.toml
@@ -12,15 +12,15 @@ serde = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 anyhow = "1.0"
-tiny-keccak = "1.5.0"
 hex = "0.4.3"
-semver = "1.0.27"
+semver = { workspace = true }
 thiserror = { workspace = true }
+futures = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tower = { workspace = true }
 
-itertools = "0.14.0"
+itertools = "0.15.0"
 
 graph-runtime-wasm = { path = "../../runtime/wasm" }
 graph-runtime-derive = { path = "../../runtime/derive" }
diff --git a/chain/ethereum/examples/firehose.rs b/chain/ethereum/examples/firehose.rs
index 45199a0ec89..3dd21859653 100644
--- a/chain/ethereum/examples/firehose.rs
+++ b/chain/ethereum/examples/firehose.rs
@@ -4,7 +4,7 @@ use graph::{
     env::env_var,
     firehose::{self, FirehoseEndpoint, SubgraphLimit},
     log::logger,
-    prelude::{prost, tokio, tonic, MetricsRegistry},
+    prelude::{MetricsRegistry, prost, tokio, tonic},
 };
 use graph_chain_ethereum::codec;
 use hex::ToHex;
diff --git a/chain/ethereum/src/adapter.rs b/chain/ethereum/src/adapter.rs
index d161462b933..d37d5ba81f7 100644
--- a/chain/ethereum/src/adapter.rs
+++ b/chain/ethereum/src/adapter.rs
@@ -9,6 +9,7 @@ use graph::data_source::common::ContractCall;
 use graph::firehose::CallToFilter;
 use graph::firehose::CombinedFilter;
 use graph::firehose::LogFilter;
+use graph::prelude::alloy::primitives::keccak256;
 use graph::prelude::alloy::primitives::{Address, B256};
 use graph::prelude::alloy::rpc::types::Log;
 use graph::prelude::alloy::transports::{RpcError, TransportErrorKind};
@@ -18,8 +19,8 @@ use prost_types::Any;
 use std::cmp;
 use std::collections::{HashMap, HashSet};
 use std::fmt;
+use std::hash::Hash;
 use thiserror::Error;
-use tiny_keccak::keccak256;
 
 use graph::prelude::*;
 use graph::{
@@ -35,7 +36,7 @@ const COMBINED_FILTER_TYPE_URL: &str =
 
 use crate::capabilities::NodeCapabilities;
 use crate::data_source::{BlockHandlerFilter, DataSource};
-use crate::{Chain, Mapping, ENV_VARS};
+use crate::{Chain, ENV_VARS, Mapping};
 
 pub type EventSignature = B256;
 pub type FunctionSelector = [u8; 4];
@@ -351,20 +352,118 @@ pub struct EthereumLogFilter {
     /// Log filters can be represented as a bipartite graph between contracts and events. An edge
     /// exists between a contract and an event if a data source for the contract has a trigger for
     /// the event.
-    /// Edges are of `bool` type and indicates when a trigger requires a transaction receipt.
-    contracts_and_events_graph: GraphMap<LogFilterNode, bool, petgraph::Undirected>,
+    /// Edge weights are booleans indicating whether the trigger requires a transaction receipt.
+    contracts_and_events_graph: MergeGraph,
 
     /// Event sigs with no associated address, matching on all addresses.
-    /// Maps to a boolean representing if a trigger requires a transaction receipt.
-    wildcard_events: HashMap<EventSignature, bool>,
-    /// Events with any of the topic filters set
-    /// Maps to a boolean representing if a trigger requires a transaction receipt.
-    events_with_topic_filters: HashMap<EventSignatureWithTopics, bool>,
+    /// Values are booleans indicating whether the trigger requires a transaction receipt.
+    wildcard_events: MergeMap<EventSignature>,
+    /// Events with any of the topic filters set.
+    /// Values are booleans indicating whether the trigger requires a transaction receipt.
+    events_with_topic_filters: MergeMap<EventSignatureWithTopics>,
+}
+
+/// `HashMap<K, bool>` wrapper whose values are OR-merged on every write.
+///
+/// The only mutator that writes values is [`MergeMap::or_insert`] — the inner
+/// `HashMap` is private so callers cannot bypass the merge via
+/// `HashMap::insert`. Used by `EthereumLogFilter` to track per-key receipt
+/// requirements where any handler asking for a receipt at a given key forces
+/// receipt fetching.
+#[derive(Clone, Debug)]
+struct MergeMap<K: Eq + Hash>(HashMap<K, bool>);
+
+impl<K: Eq + Hash> Default for MergeMap<K> {
+    fn default() -> Self {
+        Self(HashMap::new())
+    }
+}
+
+impl<K: Eq + Hash> MergeMap<K> {
+    fn or_insert(&mut self, k: K, v: bool) {
+        self.0.entry(k).and_modify(|e| *e |= v).or_insert(v);
+    }
+
+    fn get(&self, k: &K) -> Option<&bool> {
+        self.0.get(k)
+    }
+
+    fn contains_key(&self, k: &K) -> bool {
+        self.0.contains_key(k)
+    }
+
+    fn iter(&self) -> impl Iterator<Item = (&K, &bool)> + '_ {
+        self.0.iter()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+}
+
+impl<K: Eq + Hash> IntoIterator for MergeMap<K> {
+    type Item = (K, bool);
+    type IntoIter = std::collections::hash_map::IntoIter<K, bool>;
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+/// `GraphMap<LogFilterNode, bool, _>` wrapper that OR-merges edge weights on
+/// every write.
+///
+/// The only mutator that writes edge weights is [`MergeGraph::or_add_edge`] —
+/// the inner `GraphMap` is private so callers cannot bypass the merge via
+/// `GraphMap::add_edge`.
+#[derive(Clone, Debug)]
+struct MergeGraph(GraphMap<LogFilterNode, bool, petgraph::Undirected>);
+
+impl Default for MergeGraph {
+    fn default() -> Self {
+        Self(GraphMap::new())
+    }
+}
+
+impl MergeGraph {
+    fn or_add_edge(&mut self, a: LogFilterNode, b: LogFilterNode, v: bool) {
+        // Short-circuit on `v == true`: a `true` weight always wins over any
+        // prior weight, so we can skip the edge_weight lookup entirely.
+        let merged = v || self.0.edge_weight(a, b).copied().unwrap_or(false);
+        self.0.add_edge(a, b, merged);
+    }
+
+    fn edge_weight(&self, a: LogFilterNode, b: LogFilterNode) -> Option<&bool> {
+        self.0.edge_weight(a, b)
+    }
+
+    fn contains_edge(&self, a: LogFilterNode, b: LogFilterNode) -> bool {
+        self.0.contains_edge(a, b)
+    }
+
+    fn edge_count(&self) -> usize {
+        self.0.edge_count()
+    }
+
+    fn nodes(&self) -> impl Iterator<Item = LogFilterNode> + '_ {
+        self.0.nodes()
+    }
+
+    fn neighbors(&self, n: LogFilterNode) -> impl Iterator<Item = LogFilterNode> + '_ {
+        self.0.neighbors(n)
+    }
+
+    fn remove_node(&mut self, n: LogFilterNode) -> bool {
+        self.0.remove_node(n)
+    }
+
+    fn all_edges(&self) -> impl Iterator<Item = (LogFilterNode, LogFilterNode, &bool)> {
+        self.0.all_edges()
+    }
 }
 
 impl From<EthereumLogFilter> for Vec<LogFilter> {
     fn from(val: EthereumLogFilter) -> Self {
-        val.eth_get_logs_filters()
+        val.eth_get_logs_filters(ENV_VARS.get_logs_max_contracts)
             .map(
                 |EthGetLogsFilter {
                      contracts,
@@ -399,8 +498,7 @@ impl EthereumLogFilter {
                 let contract = LogFilterNode::Contract(log.address());
                 let event = LogFilterNode::Event(*sig);
                 self.contracts_and_events_graph
-                    .all_edges()
-                    .any(|(s, t, _)| (s == contract && t == event) || (t == contract && s == event))
+                    .contains_edge(contract, event)
                     || self.wildcard_events.contains_key(sig)
                     || self
                         .events_with_topic_filters
@@ -439,13 +537,12 @@ impl EthereumLogFilter {
             let contract_node = LogFilterNode::Contract(*address);
             let event_node = LogFilterNode::Event(*event_signature);
 
-            // Directly iterate over all edges and return true if a matching edge that requires a receipt is found.
-            for (s, t, &r) in self.contracts_and_events_graph.all_edges() {
-                if r && ((s == contract_node && t == event_node)
-                    || (t == contract_node && s == event_node))
-                {
-                    return true;
-                }
+            if self
+                .contracts_and_events_graph
+                .edge_weight(contract_node, event_node)
+                == Some(&true)
+            {
+                return true;
             }
         }
 
@@ -460,14 +557,14 @@ impl EthereumLogFilter {
                 let event_sig = event_handler.topic0();
                 match ds.address {
                     Some(contract) if !event_handler.has_additional_topics() => {
-                        this.contracts_and_events_graph.add_edge(
+                        this.contracts_and_events_graph.or_add_edge(
                             LogFilterNode::Contract(contract),
                             LogFilterNode::Event(event_sig),
                             event_handler.receipt,
                         );
                     }
                     Some(contract) => {
-                        this.events_with_topic_filters.insert(
+                        this.events_with_topic_filters.or_insert(
                             EventSignatureWithTopics::new(
                                 Some(contract),
                                 event_sig,
@@ -481,11 +578,11 @@ impl EthereumLogFilter {
 
                     None if (!event_handler.has_additional_topics()) => {
                         this.wildcard_events
-                            .insert(event_sig, event_handler.receipt);
+                            .or_insert(event_sig, event_handler.receipt);
                     }
 
                     None => {
-                        this.events_with_topic_filters.insert(
+                        this.events_with_topic_filters.or_insert(
                             EventSignatureWithTopics::new(
                                 ds.address,
                                 event_sig,
@@ -507,12 +604,18 @@ impl EthereumLogFilter {
         for event_handler in &mapping.event_handlers {
             let signature = event_handler.topic0();
             this.wildcard_events
-                .insert(signature, event_handler.receipt);
+                .or_insert(signature, event_handler.receipt);
         }
         this
     }
 
     /// Extends this log filter with another one.
+    ///
+    /// The `receipt` flag stored at each filter key is OR-combined across the
+    /// two filters: a key whose receipt requirement is `true` in either filter
+    /// stays `true` in the merged result. Overwriting with the incoming value
+    /// would drop a prior `true` and silently downgrade receipt fetching for
+    /// any handler that declared `receipt: true` at that key.
     pub fn extend(&mut self, other: EthereumLogFilter) {
         if other.is_empty() {
             return;
@@ -525,11 +628,14 @@ impl EthereumLogFilter {
             events_with_topic_filters,
         } = other;
         for (s, t, e) in contracts_and_events_graph.all_edges() {
-            self.contracts_and_events_graph.add_edge(s, t, *e);
+            self.contracts_and_events_graph.or_add_edge(s, t, *e);
+        }
+        for (k, v) in wildcard_events {
+            self.wildcard_events.or_insert(k, v);
+        }
+        for (k, v) in events_with_topic_filters {
+            self.events_with_topic_filters.or_insert(k, v);
         }
-        self.wildcard_events.extend(wildcard_events);
-        self.events_with_topic_filters
-            .extend(events_with_topic_filters);
     }
 
     /// An empty filter is one that never matches.
@@ -548,21 +654,24 @@ impl EthereumLogFilter {
     /// Filters for `eth_getLogs` calls. The filters will not return false positives. This attempts
     /// to balance between having granular filters but too many calls and having few calls but too
     /// broad filters causing the Ethereum endpoint to timeout.
-    pub fn eth_get_logs_filters(self) -> impl Iterator<Item = EthGetLogsFilter> {
+    pub fn eth_get_logs_filters(
+        self,
+        get_logs_max_contracts: usize,
+    ) -> impl Iterator<Item = EthGetLogsFilter> {
         let mut filters = Vec::new();
 
         // Start with the wildcard event filters.
         filters.extend(
             self.wildcard_events
-                .into_keys()
-                .map(EthGetLogsFilter::from_event),
+                .into_iter()
+                .map(|(k, _)| EthGetLogsFilter::from_event(k)),
         );
 
         // Handle events with topic filters.
         filters.extend(
             self.events_with_topic_filters
-                .into_keys()
-                .map(EthGetLogsFilter::from_event_with_topics),
+                .into_iter()
+                .map(|(k, _)| EthGetLogsFilter::from_event_with_topics(k)),
         );
 
         // The current algorithm is to repeatedly find the maximum cardinality vertex and turn all
@@ -598,7 +707,7 @@ impl EthereumLogFilter {
             for neighbor in g.neighbors(max_vertex) {
                 match neighbor {
                     LogFilterNode::Contract(address) => {
-                        if filter.contracts.len() == ENV_VARS.get_logs_max_contracts {
+                        if filter.contracts.len() == get_logs_max_contracts {
                             // The batch size was reached, register the filter and start a new one.
                             let event = filter.event_signatures[0];
                             push_filter(filter);
@@ -1176,11 +1285,16 @@ pub trait EthereumAdapter: Send + Sync + 'static {
         address: Address,
         block_ptr: BlockPtr,
     ) -> Result<alloy::primitives::Bytes, EthereumRpcError>;
+
+    /// Returns a boolean indicating whether the adapter can reach
+    /// the RPC provider it is configured to use.
+    /// This is used to determine if a provider should be considered healthy.
+    async fn is_reachable(&self) -> bool;
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::adapter::{FunctionSelector, COMBINED_FILTER_TYPE_URL};
+    use crate::adapter::{COMBINED_FILTER_TYPE_URL, FunctionSelector};
 
     use super::{EthereumBlockFilter, LogFilterNode};
     use super::{EthereumCallFilter, EthereumLogFilter, TriggerFilter};
@@ -1188,9 +1302,8 @@ mod tests {
     use base64::prelude::*;
     use graph::blockchain::TriggerFilter as _;
     use graph::firehose::{CallToFilter, CombinedFilter, LogFilter, MultiLogFilter};
-    use graph::petgraph::graphmap::GraphMap;
-    use graph::prelude::alloy::primitives::{Address, Bytes, B256, U256};
     use graph::prelude::EthereumCall;
+    use graph::prelude::alloy::primitives::{Address, B256, Bytes, U256};
     use hex::ToHex;
     use itertools::Itertools;
     use prost::Message;
@@ -1258,9 +1371,11 @@ mod tests {
         assert_eq!(sig, actual_sig);
 
         let filter = LogFilter {
-            addresses: vec![Address::from_str(hex_addr)
-                .expect("failed to parse address")
-                .to_vec()],
+            addresses: vec![
+                Address::from_str(hex_addr)
+                    .expect("failed to parse address")
+                    .to_vec(),
+            ],
             event_signatures: vec![fs.to_vec()],
         };
 
@@ -1276,11 +1391,7 @@ mod tests {
     fn ethereum_trigger_filter_to_firehose() {
         let sig = |value: u64| B256::from(U256::from(value));
         let mut filter = TriggerFilter {
-            log: EthereumLogFilter {
-                contracts_and_events_graph: GraphMap::new(),
-                wildcard_events: HashMap::new(),
-                events_with_topic_filters: HashMap::new(),
-            },
+            log: EthereumLogFilter::default(),
             call: EthereumCallFilter {
                 contract_addresses_function_signatures: HashMap::from_iter(vec![
                     (address(0), (0, HashSet::from_iter(vec![[0u8; 4]]))),
@@ -1329,17 +1440,17 @@ mod tests {
             },
         ];
 
-        filter.log.contracts_and_events_graph.add_edge(
+        filter.log.contracts_and_events_graph.or_add_edge(
             LogFilterNode::Contract(address(10)),
             LogFilterNode::Event(sig(100)),
             false,
         );
-        filter.log.contracts_and_events_graph.add_edge(
+        filter.log.contracts_and_events_graph.or_add_edge(
             LogFilterNode::Contract(address(10)),
             LogFilterNode::Event(sig(101)),
             false,
         );
-        filter.log.contracts_and_events_graph.add_edge(
+        filter.log.contracts_and_events_graph.or_add_edge(
             LogFilterNode::Contract(address(20)),
             LogFilterNode::Event(sig(100)),
             false,
@@ -1399,11 +1510,7 @@ mod tests {
         let address = |value: u64| Address::left_padding_from(&value.to_le_bytes());
         let sig = |value: u64| B256::left_padding_from(&value.to_le_bytes());
         let mut filter = TriggerFilter {
-            log: EthereumLogFilter {
-                contracts_and_events_graph: GraphMap::new(),
-                wildcard_events: HashMap::new(),
-                events_with_topic_filters: HashMap::new(),
-            },
+            log: EthereumLogFilter::default(),
             call: EthereumCallFilter {
                 contract_addresses_function_signatures: HashMap::new(),
                 wildcard_signatures: HashSet::new(),
@@ -1415,7 +1522,7 @@ mod tests {
             },
         };
 
-        filter.log.contracts_and_events_graph.add_edge(
+        filter.log.contracts_and_events_graph.or_add_edge(
             LogFilterNode::Contract(address(10)),
             LogFilterNode::Event(sig(101)),
             false,
@@ -1645,8 +1752,8 @@ mod tests {
     }
 
     #[test]
-    fn extending_ethereum_block_filter_every_block_in_base_and_merge_contract_addresses_and_polling_intervals(
-    ) {
+    fn extending_ethereum_block_filter_every_block_in_base_and_merge_contract_addresses_and_polling_intervals()
+     {
         let mut base = EthereumBlockFilter {
             polling_intervals: HashSet::from_iter(vec![(10, 3)]),
             contract_addresses: HashSet::from_iter(vec![(10, address(2))]),
@@ -1751,10 +1858,10 @@ fn complete_log_filter() {
             let contracts: BTreeSet<_> = (0..j).map(|n| Address::from([n as u8; 20])).collect();
 
             // Construct the complete bipartite graph with i events and j contracts.
-            let mut contracts_and_events_graph = GraphMap::new();
+            let mut filter = EthereumLogFilter::default();
             for &contract in &contracts {
                 for &event in &events {
-                    contracts_and_events_graph.add_edge(
+                    filter.contracts_and_events_graph.or_add_edge(
                         LogFilterNode::Contract(contract),
                         LogFilterNode::Event(event),
                         false,
@@ -1763,13 +1870,9 @@ fn complete_log_filter() {
             }
 
             // Run `eth_get_logs_filters`, which is what we want to test.
-            let logs_filters: Vec<_> = EthereumLogFilter {
-                contracts_and_events_graph,
-                wildcard_events: HashMap::new(),
-                events_with_topic_filters: HashMap::new(),
-            }
-            .eth_get_logs_filters()
-            .collect();
+            let logs_filters: Vec<_> = filter
+                .eth_get_logs_filters(ENV_VARS.get_logs_max_contracts)
+                .collect();
 
             // Assert that a contract or event is filtered on iff it was present in the graph.
             assert_eq!(
@@ -1834,14 +1937,6 @@ fn log_filter_require_transacion_receipt_method() {
 
     let wildcard_event_with_receipt = b256(6);
     let wildcard_event_without_receipt = b256(7);
-    let wildcard_events = [
-        (wildcard_event_with_receipt, true),
-        (wildcard_event_without_receipt, false),
-    ]
-    .into_iter()
-    .collect();
-
-    let events_with_topic_filters = HashMap::new(); // TODO(krishna): Test events with topic filters
 
     let alien_event_signature = b256(8); // those will not be inserted in the graph
     let alien_contract_address = address(9);
@@ -1869,25 +1964,28 @@ fn log_filter_require_transacion_receipt_method() {
     //     event_b -- contract_a [ receipt=false ]
     // }
     // ```
-    let mut contracts_and_events_graph = GraphMap::new();
-
-    let event_a_id = contracts_and_events_graph.add_node(event_a_node);
-    let event_b_id = contracts_and_events_graph.add_node(event_b_node);
-    let event_c_id = contracts_and_events_graph.add_node(event_c_node);
-    let contract_a_id = contracts_and_events_graph.add_node(contract_a_node);
-    let contract_b_id = contracts_and_events_graph.add_node(contract_b_node);
-    let contract_c_id = contracts_and_events_graph.add_node(contract_c_node);
-    contracts_and_events_graph.add_edge(event_a_id, contract_a_id, true);
-    contracts_and_events_graph.add_edge(event_b_id, contract_b_id, true);
-    contracts_and_events_graph.add_edge(event_a_id, contract_b_id, false);
-    contracts_and_events_graph.add_edge(event_b_id, contract_a_id, false);
-    contracts_and_events_graph.add_edge(event_c_id, contract_c_id, true);
-
-    let filter = EthereumLogFilter {
-        contracts_and_events_graph,
-        wildcard_events,
-        events_with_topic_filters,
-    };
+    let mut filter = EthereumLogFilter::default();
+    filter
+        .contracts_and_events_graph
+        .or_add_edge(event_a_node, contract_a_node, true);
+    filter
+        .contracts_and_events_graph
+        .or_add_edge(event_b_node, contract_b_node, true);
+    filter
+        .contracts_and_events_graph
+        .or_add_edge(event_a_node, contract_b_node, false);
+    filter
+        .contracts_and_events_graph
+        .or_add_edge(event_b_node, contract_a_node, false);
+    filter
+        .contracts_and_events_graph
+        .or_add_edge(event_c_node, contract_c_node, true);
+    filter
+        .wildcard_events
+        .or_insert(wildcard_event_with_receipt, true);
+    filter
+        .wildcard_events
+        .or_insert(wildcard_event_without_receipt, false);
 
     let empty_vec: Vec<B256> = vec![];
 
@@ -1974,3 +2072,268 @@ fn log_filter_require_transacion_receipt_method() {
         &empty_vec
     ));
 }
+
+// Tests that `EthereumLogFilter` OR-merges per-handler `receipt` flags across
+// every insertion site (`from_data_sources`, `from_mapping`, `extend`).
+
+#[cfg(test)]
+fn receipt_merge_test_addr(n: u64) -> Address {
+    Address::left_padding_from(&n.to_be_bytes())
+}
+
+#[cfg(test)]
+fn receipt_merge_test_sig(n: u64) -> B256 {
+    B256::left_padding_from(&n.to_be_bytes())
+}
+
+#[cfg(test)]
+fn receipt_merge_test_mock_abi() -> std::sync::Arc<graph::data_source::common::MappingABI> {
+    std::sync::Arc::new(graph::data_source::common::MappingABI {
+        name: "mock_abi".to_string(),
+        contract: abi::JsonAbi::new(),
+    })
+}
+
+#[cfg(test)]
+fn receipt_merge_test_event_handler(
+    sig: B256,
+    topic1: Option<Vec<B256>>,
+    topic2: Option<Vec<B256>>,
+    topic3: Option<Vec<B256>>,
+    receipt: bool,
+) -> crate::data_source::MappingEventHandler {
+    crate::data_source::MappingEventHandler {
+        event: "Event()".to_string(),
+        topic0: Some(sig),
+        topic1,
+        topic2,
+        topic3,
+        handler: "handleEvent".to_string(),
+        receipt,
+        calls: graph::data_source::common::CallDecls::default(),
+    }
+}
+
+#[cfg(test)]
+fn receipt_merge_test_mapping(
+    handlers: Vec<crate::data_source::MappingEventHandler>,
+) -> crate::Mapping {
+    crate::Mapping {
+        kind: "ethereum/events".to_string(),
+        api_version: semver::Version::new(0, 0, 7),
+        language: "wasm/assemblyscript".to_string(),
+        entities: vec![],
+        abis: vec![receipt_merge_test_mock_abi()],
+        block_handlers: vec![],
+        call_handlers: vec![],
+        event_handlers: handlers,
+        runtime: std::sync::Arc::new(vec![]),
+        link: graph::prelude::Link {
+            link: "test".to_string(),
+        },
+    }
+}
+
+#[cfg(test)]
+fn receipt_merge_test_data_source(
+    address: Option<Address>,
+    handlers: Vec<crate::data_source::MappingEventHandler>,
+) -> crate::data_source::DataSource {
+    crate::data_source::DataSource {
+        kind: "ethereum/contract".to_string(),
+        network: Some("test".to_string()),
+        name: "Test".to_string(),
+        manifest_idx: 0,
+        address,
+        start_block: 0,
+        end_block: None,
+        mapping: receipt_merge_test_mapping(handlers),
+        context: std::sync::Arc::new(None),
+        creation_block: None,
+        contract_abi: receipt_merge_test_mock_abi(),
+    }
+}
+
+/// Run two data sources with `receipt: true` and `receipt: false` at the
+/// same effective filter key through `from_data_sources` and assert the
+/// merged filter still requires a transaction receipt. Runs both
+/// declaration orders so order-independence is verified per variant.
+#[cfg(test)]
+fn assert_from_data_sources_or_merges(
+    label: &str,
+    address: Option<Address>,
+    topic1: Option<Vec<B256>>,
+    log_topics: &[B256],
+) {
+    let event_sig = receipt_merge_test_sig(100);
+    let ds_yes = receipt_merge_test_data_source(
+        address,
+        vec![receipt_merge_test_event_handler(
+            event_sig,
+            topic1.clone(),
+            None,
+            None,
+            true,
+        )],
+    );
+    let ds_no = receipt_merge_test_data_source(
+        address,
+        vec![receipt_merge_test_event_handler(
+            event_sig,
+            topic1.clone(),
+            None,
+            None,
+            false,
+        )],
+    );
+
+    for (order, dss) in [("yes,no", [&ds_yes, &ds_no]), ("no,yes", [&ds_no, &ds_yes])] {
+        let filter = EthereumLogFilter::from_data_sources(dss);
+        assert!(
+            filter.requires_transaction_receipt(&event_sig, address.as_ref(), log_topics),
+            "{label} ({order}): receipt:true must survive a later receipt:false",
+        );
+    }
+}
+
+/// Build two filters via `from_data_sources`, each with one handler at the
+/// same effective key but with opposite receipt flags, then merge them via
+/// `extend` and assert the merged filter still requires a transaction
+/// receipt. Runs both extend directions so order-independence is verified
+/// per variant.
+#[cfg(test)]
+fn assert_extend_or_merges(
+    label: &str,
+    address: Option<Address>,
+    topic1: Option<Vec<B256>>,
+    log_topics: &[B256],
+) {
+    let event_sig = receipt_merge_test_sig(105);
+    let ds_yes = receipt_merge_test_data_source(
+        address,
+        vec![receipt_merge_test_event_handler(
+            event_sig,
+            topic1.clone(),
+            None,
+            None,
+            true,
+        )],
+    );
+    let ds_no = receipt_merge_test_data_source(
+        address,
+        vec![receipt_merge_test_event_handler(
+            event_sig,
+            topic1.clone(),
+            None,
+            None,
+            false,
+        )],
+    );
+
+    for (order, base, ext) in [
+        ("yes.extend(no)", &ds_yes, &ds_no),
+        ("no.extend(yes)", &ds_no, &ds_yes),
+    ] {
+        let mut filter = EthereumLogFilter::from_data_sources([base]);
+        filter.extend(EthereumLogFilter::from_data_sources([ext]));
+        assert!(
+            filter.requires_transaction_receipt(&event_sig, address.as_ref(), log_topics),
+            "{label} ({order}): extend must OR-merge",
+        );
+    }
+}
+
+#[test]
+fn from_data_sources_or_merges_at_every_insertion_site() {
+    let contract = receipt_merge_test_addr(1);
+    let event_sig = receipt_merge_test_sig(100);
+    let topic = receipt_merge_test_sig(200);
+    let with_topic = vec![event_sig, topic];
+
+    // Each case maps to one arm of the `match ds.address` in `from_data_sources`.
+    assert_from_data_sources_or_merges("graph edge", Some(contract), None, &[]);
+    assert_from_data_sources_or_merges(
+        "addressed topics",
+        Some(contract),
+        Some(vec![topic]),
+        &with_topic,
+    );
+    assert_from_data_sources_or_merges("wildcard", None, None, &[]);
+    assert_from_data_sources_or_merges("wildcard topics", None, Some(vec![topic]), &with_topic);
+}
+
+#[test]
+fn from_mapping_or_merges_via_extend() {
+    // Two templates handling the same event signature with different receipt
+    // flags merged via `from_mapping` + `extend`.
+    let event_sig = receipt_merge_test_sig(104);
+
+    let mapping_yes = receipt_merge_test_mapping(vec![receipt_merge_test_event_handler(
+        event_sig, None, None, None, true,
+    )]);
+    let mapping_no = receipt_merge_test_mapping(vec![receipt_merge_test_event_handler(
+        event_sig, None, None, None, false,
+    )]);
+
+    let mut filter = EthereumLogFilter::from_mapping(&mapping_yes);
+    filter.extend(EthereumLogFilter::from_mapping(&mapping_no));
+
+    assert!(filter.requires_transaction_receipt(&event_sig, None, &[]));
+}
+
+#[test]
+fn extend_or_merges_at_every_collection() {
+    let contract = receipt_merge_test_addr(5);
+    let event_sig = receipt_merge_test_sig(105);
+    let topic = receipt_merge_test_sig(203);
+    let with_topic = vec![event_sig, topic];
+
+    assert_extend_or_merges("graph edge", Some(contract), None, &[]);
+    assert_extend_or_merges(
+        "addressed topics",
+        Some(contract),
+        Some(vec![topic]),
+        &with_topic,
+    );
+    assert_extend_or_merges("wildcard", None, None, &[]);
+    assert_extend_or_merges("wildcard topics", None, Some(vec![topic]), &with_topic);
+}
+
+#[test]
+fn requires_transaction_receipt_has_or_semantics_across_handlers() {
+    // `requires_transaction_receipt` must return true iff at least one handler
+    // at the key declared `receipt: true`, regardless of declaration order.
+    let event_sig = receipt_merge_test_sig(108);
+
+    for flags in [
+        vec![false],
+        vec![true],
+        vec![true, false],
+        vec![false, true],
+        vec![false, false, true],
+        vec![true, false, false],
+        vec![false, true, false],
+        vec![true, true, false],
+        vec![false, false, false],
+    ] {
+        let dss: Vec<_> = flags
+            .iter()
+            .map(|&r| {
+                receipt_merge_test_data_source(
+                    None,
+                    vec![receipt_merge_test_event_handler(
+                        event_sig, None, None, None, r,
+                    )],
+                )
+            })
+            .collect();
+        let filter = EthereumLogFilter::from_data_sources(dss.iter());
+
+        let any_requires_receipt = flags.iter().any(|&r| r);
+        assert_eq!(
+            filter.requires_transaction_receipt(&event_sig, None, &[]),
+            any_requires_receipt,
+            "flag sequence {flags:?}",
+        );
+    }
+}
diff --git a/chain/ethereum/src/buffered_call_cache.rs b/chain/ethereum/src/buffered_call_cache.rs
index 2ec0bfa40e7..29aa84e90ab 100644
--- a/chain/ethereum/src/buffered_call_cache.rs
+++ b/chain/ethereum/src/buffered_call_cache.rs
@@ -9,7 +9,7 @@ use graph::{
     components::store::EthereumCallCache,
     data::store::ethereum::call,
     prelude::{BlockPtr, CachedEthereumCall},
-    slog::{error, Logger},
+    slog::{Logger, error},
 };
 
 /// A wrapper around an Ethereum call cache that buffers call results in
diff --git a/chain/ethereum/src/call_helper.rs b/chain/ethereum/src/call_helper.rs
index 5fc6ed80fd0..8a1216b58c5 100644
--- a/chain/ethereum/src/call_helper.rs
+++ b/chain/ethereum/src/call_helper.rs
@@ -3,8 +3,9 @@ use graph::{
     abi,
     data::store::ethereum::call,
     prelude::{
+        Logger,
         alloy::transports::{RpcError, TransportErrorKind},
-        serde_json, Logger,
+        serde_json,
     },
     slog::info,
 };
@@ -36,10 +37,10 @@ const PARITY_REVERT_PREFIX: &str = "revert";
 
 const XDAI_REVERT: &str = "revert";
 
-// Deterministic Geth execution errors. We might need to expand this as
+// Deterministic RPC execution errors. We might need to expand this as
 // subgraphs come across other errors. See
 // https://github.com/ethereum/go-ethereum/blob/cd57d5cd38ef692de8fbedaa56598b4e9fbfbabc/core/vm/errors.go
-const GETH_EXECUTION_ERRORS: &[&str] = &[
+const RPC_EXECUTION_ERRORS: &[&str] = &[
     // The "revert" substring covers a few known error messages, including:
     // Hardhat: "error: transaction reverted",
     // Ganache and Moonbeam: "vm exception while processing transaction: revert",
@@ -53,21 +54,36 @@ const GETH_EXECUTION_ERRORS: &[&str] = &[
     // See f0af4ab0-6b7c-4b68-9141-5b79346a5f61 for why the gas limit is considered deterministic.
     "out of gas",
     "stack underflow",
+    "vm execution error",
+    "invalidjump",
+    "notactivated",
+    "invalidfeopcode",
+    // Reth surfaces EVM halts via `EvmHalt(HaltReason)`, formatted with the
+    // reason's `Debug` repr (`"EVM error: {0:?}"`). revm's `HaltReason`
+    // variants are CamelCase with no spaces, so e.g. a stack underflow arrives
+    // as "EVM error: StackUnderflow", which the space-separated "stack
+    // underflow" above does not match. "invalidjump"/"invalidfeopcode" already
+    // cover the matching variants; these add the rest. Reth's OutOfGas is
+    // handled before EvmHalt and rendered as "out of gas: ...", so it is
+    // already covered above. See https://github.com/streamingfast/eth-go/pull/10.
+    "stackunderflow",
+    "stackoverflow",
+    "opcodenotfound",
 ];
 
-/// Helper that checks if a geth style RPC error message corresponds to a revert.
-fn is_geth_revert_message(message: &str) -> bool {
-    let env_geth_call_errors = ENV_VARS.geth_eth_call_errors.iter();
-    let mut execution_errors = GETH_EXECUTION_ERRORS
+/// Helper that checks if a RPC error message corresponds to a revert.
+fn is_rpc_revert_message(message: &str) -> bool {
+    let env_rpc_call_errors = ENV_VARS.rpc_eth_call_errors.iter();
+    let mut execution_errors = RPC_EXECUTION_ERRORS
         .iter()
         .copied()
-        .chain(env_geth_call_errors.map(|s| s.as_str()));
+        .chain(env_rpc_call_errors.map(|s| s.as_str()));
     execution_errors.any(|e| message.to_lowercase().contains(e))
 }
 
 /// Decode a Solidity revert(reason) payload, returning the reason string when possible.
 fn as_solidity_revert_reason(bytes: &[u8]) -> Option<String> {
-    let selector = &tiny_keccak::keccak256(b"Error(string)")[..4];
+    let selector = &graph::prelude::alloy::primitives::keccak256(b"Error(string)")[..4];
     if bytes.len() >= 4 && &bytes[..4] == selector {
         abi::DynSolType::String
             .abi_decode(&bytes[4..])
@@ -89,10 +105,10 @@ pub fn interpret_eth_call_error(
         Ok(call::Retval::Null)
     }
 
-    if let RpcError::ErrorResp(rpc_error) = &err {
-        if is_geth_revert_message(&rpc_error.message) {
-            return reverted(logger, &rpc_error.message);
-        }
+    if let RpcError::ErrorResp(rpc_error) = &err
+        && is_rpc_revert_message(&rpc_error.message)
+    {
+        return reverted(logger, &rpc_error.message);
     }
 
     if let RpcError::ErrorResp(rpc_error) = &err {
@@ -102,12 +118,11 @@ pub fn interpret_eth_call_error(
             .as_ref()
             .and_then(|d| serde_json::from_str(d.get()).ok());
 
-        if code == PARITY_VM_EXECUTION_ERROR {
-            if let Some(data) = data {
-                if is_parity_revert(&data) {
-                    return reverted(logger, &parity_revert_reason(&data));
-                }
-            }
+        if code == PARITY_VM_EXECUTION_ERROR
+            && let Some(data) = data
+            && is_parity_revert(&data)
+        {
+            return reverted(logger, &parity_revert_reason(&data));
         }
     }
 
diff --git a/chain/ethereum/src/chain.rs b/chain/ethereum/src/chain.rs
index 85103cc5498..405c3123bdc 100644
--- a/chain/ethereum/src/chain.rs
+++ b/chain/ethereum/src/chain.rs
@@ -1,5 +1,5 @@
-use anyhow::{anyhow, bail, Result};
 use anyhow::{Context, Error};
+use anyhow::{Result, anyhow, bail};
 use async_trait::async_trait;
 use graph::blockchain::client::ChainClient;
 use graph::blockchain::firehose_block_ingestor::{FirehoseBlockIngestor, Transforms};
@@ -13,26 +13,27 @@ use graph::data::subgraph::UnifiedMappingApiVersion;
 use graph::firehose::{FirehoseEndpoint, FirehoseEndpoints, ForkStep};
 use graph::futures03::TryStreamExt;
 use graph::prelude::{
-    retry, BlockHash, ComponentLoggerConfig, ElasticComponentLoggerConfig, EthereumBlock,
+    BlockHash, ComponentLoggerConfig, ElasticComponentLoggerConfig, EthereumBlock,
     EthereumCallCache, LightEthereumBlock, LightEthereumBlockExt, MetricsRegistry, StoreError,
+    retry,
 };
 use graph::slog::{debug, error, trace, warn};
 use graph::{
     blockchain::{
+        Block, BlockPtr, Blockchain, ChainHeadUpdateListener, IngestorError,
+        RuntimeAdapter as RuntimeAdapterTrait, TriggerFilter as _,
         block_stream::{
             BlockRefetcher, BlockStreamEvent, BlockWithTriggers, FirehoseError,
             FirehoseMapper as FirehoseMapperTrait, TriggersAdapter as TriggersAdapterTrait,
         },
         firehose_block_stream::FirehoseBlockStream,
-        Block, BlockPtr, Blockchain, ChainHeadUpdateListener, IngestorError,
-        RuntimeAdapter as RuntimeAdapterTrait, TriggerFilter as _,
     },
     cheap_clone::CheapClone,
     components::store::DeploymentLocator,
     firehose,
     prelude::{
-        o, serde_json as json, BlockNumber, ChainStore, EthereumBlockWithCalls, Logger,
-        LoggerFactory,
+        BlockNumber, ChainStore, EthereumBlockWithCalls, Logger, LoggerFactory, o,
+        serde_json as json,
     },
 };
 use prost::Message;
@@ -49,7 +50,9 @@ use crate::ingestor::PollingBlockIngestor;
 use crate::network::EthereumNetworkAdapters;
 use crate::polling_block_stream::PollingBlockStream;
 use crate::runtime::runtime_adapter::eth_call_gas;
+use crate::{BufferedCallCache, NodeCapabilities};
 use crate::{
+    ENV_VARS, SubgraphEthRpcMetrics, TriggerFilter,
     adapter::EthereumAdapter as _,
     codec,
     data_source::{DataSource, UnresolvedDataSource},
@@ -57,18 +60,53 @@ use crate::{
         blocks_with_triggers, get_calls, parse_block_triggers, parse_call_triggers,
         parse_log_triggers,
     },
-    SubgraphEthRpcMetrics, TriggerFilter, ENV_VARS,
 };
-use crate::{BufferedCallCache, NodeCapabilities};
 use crate::{EthereumAdapter, RuntimeAdapter};
 use graph::blockchain::block_stream::{
     BlockStream, BlockStreamBuilder, BlockStreamError, BlockStreamMapper, FirehoseCursor,
     TriggersAdapterWrapper,
 };
-
 /// Celo Mainnet: 42220, Testnet Alfajores: 44787, Testnet Baklava: 62320
 const CELO_CHAIN_IDS: [u64; 3] = [42220, 44787, 62320];
 
+/// Resolved per-chain settings. Populated at chain initialisation from the config file (with
+/// ENV_VAR fallbacks) and stored on [`Chain`] and [`crate::EthereumAdapter`].
+#[derive(Clone, Debug)]
+pub struct ChainSettings {
+    pub polling_interval: Duration,
+    pub json_rpc_timeout: Duration,
+    pub request_retries: usize,
+    pub max_block_range_size: BlockNumber,
+    pub block_batch_size: usize,
+    pub block_ptr_batch_size: usize,
+    pub max_event_only_range: BlockNumber,
+    pub target_triggers_per_block_range: u64,
+    pub get_logs_max_contracts: usize,
+    pub block_ingestor_max_concurrent_json_rpc_calls: usize,
+    pub genesis_block_number: u64,
+}
+
+impl ChainSettings {
+    /// Constructs a [`ChainSettings`] from environment variable defaults.
+    /// Used in tests and for firehose-only chains that have no RPC config.
+    pub fn from_env_defaults() -> Self {
+        ChainSettings {
+            polling_interval: graph::env::ENV_VARS.ingestor_polling_interval,
+            json_rpc_timeout: ENV_VARS.json_rpc_timeout,
+            request_retries: ENV_VARS.request_retries,
+            max_block_range_size: ENV_VARS.max_block_range_size,
+            block_batch_size: ENV_VARS.block_batch_size,
+            block_ptr_batch_size: ENV_VARS.block_ptr_batch_size,
+            max_event_only_range: ENV_VARS.max_event_only_range,
+            target_triggers_per_block_range: ENV_VARS.target_triggers_per_block_range,
+            get_logs_max_contracts: ENV_VARS.get_logs_max_contracts,
+            block_ingestor_max_concurrent_json_rpc_calls: ENV_VARS
+                .block_ingestor_max_concurrent_json_rpc_calls,
+            genesis_block_number: ENV_VARS.genesis_block_number,
+        }
+    }
+}
+
 pub struct EthereumStreamBuilder {}
 
 #[async_trait]
@@ -193,9 +231,9 @@ impl BlockStreamBuilder<Chain> for EthereumStreamBuilder {
         };
 
         let max_block_range_size = if is_using_subgraph_composition {
-            ENV_VARS.max_block_range_size * 10
+            chain.settings.max_block_range_size * 10
         } else {
-            ENV_VARS.max_block_range_size
+            chain.settings.max_block_range_size
         };
 
         Ok(Box::new(PollingBlockStream::new(
@@ -207,7 +245,7 @@ impl BlockStreamBuilder<Chain> for EthereumStreamBuilder {
             reorg_threshold,
             logger,
             max_block_range_size,
-            ENV_VARS.target_triggers_per_block_range,
+            chain.settings.target_triggers_per_block_range,
             unified_api_version,
             subgraph_current_block,
         )))
@@ -326,13 +364,13 @@ pub struct Chain {
     call_cache: Arc<dyn EthereumCallCache>,
     chain_head_update_listener: Arc<dyn ChainHeadUpdateListener>,
     reorg_threshold: BlockNumber,
-    polling_ingestor_interval: Duration,
     pub is_ingestible: bool,
     block_stream_builder: Arc<dyn BlockStreamBuilder<Self>>,
     block_refetcher: Arc<dyn BlockRefetcher<Self>>,
     adapter_selector: Arc<dyn TriggersAdapterSelector<Self>>,
     runtime_adapter_builder: Arc<dyn RuntimeAdapterBuilder>,
     eth_adapters: Arc<EthereumNetworkAdapters>,
+    pub settings: Arc<ChainSettings>,
 }
 
 impl std::fmt::Debug for Chain {
@@ -359,10 +397,10 @@ where
     for _ in 0..offset {
         match parent_getter(current_ptr.clone()).await? {
             Some(parent) => {
-                if let Some(root_hash) = &root {
-                    if parent.hash == *root_hash {
-                        break;
-                    }
+                if let Some(root_hash) = &root
+                    && parent.hash == *root_hash
+                {
+                    break;
                 }
                 current_ptr = parent;
             }
@@ -389,8 +427,8 @@ impl Chain {
         runtime_adapter_builder: Arc<dyn RuntimeAdapterBuilder>,
         eth_adapters: Arc<EthereumNetworkAdapters>,
         reorg_threshold: BlockNumber,
-        polling_ingestor_interval: Duration,
         is_ingestible: bool,
+        settings: Arc<ChainSettings>,
     ) -> Self {
         Chain {
             logger_factory,
@@ -407,7 +445,7 @@ impl Chain {
             eth_adapters,
             reorg_threshold,
             is_ingestible,
-            polling_ingestor_interval,
+            settings,
         }
     }
 
@@ -544,6 +582,18 @@ impl Blockchain for Chain {
                 .await
                 .map_err(IngestorError::Unknown),
             ChainClient::Rpc(adapters) => {
+                let cached = self
+                    .chain_store
+                    .cheap_clone()
+                    .block_ptrs_by_numbers(vec![number])
+                    .await
+                    .unwrap_or_default();
+                if let Some(ptrs) = cached.get(&number)
+                    && ptrs.len() == 1
+                {
+                    return Ok(BlockPtr::new(ptrs[0].hash.clone(), ptrs[0].number));
+                }
+
                 let adapter = adapters
                     .cheapest()
                     .await
@@ -638,7 +688,7 @@ impl Blockchain for Chain {
                     graph::env::ENV_VARS.reorg_threshold(),
                     self.chain_client(),
                     self.chain_store.cheap_clone(),
-                    self.polling_ingestor_interval,
+                    self.settings.polling_interval,
                     self.name.clone(),
                 )?)
             }
@@ -778,8 +828,8 @@ async fn fetch_unique_blocks_from_cache(
 
     // Collect blocks and filter out ones with multiple entries
     let blocks: Vec<Arc<ExtendedBlockPtr>> = blocks_map
-        .into_iter()
-        .filter_map(|(_, values)| {
+        .into_values()
+        .filter_map(|values| {
             if values.len() == 1 {
                 Some(Arc::new(values[0].clone()))
             } else {
@@ -1025,6 +1075,12 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
     }
 
     async fn is_on_main_chain(&self, ptr: BlockPtr) -> Result<bool, Error> {
+        // It is tempting to use the block cache here; but that can go wrong
+        // when graph-node gets shut down and some of its nonfinal blocks
+        // then are reorged; when graph-node gets started again when those
+        // block numbers have become final, it might consider a reorged
+        // block as canonical; allowing the use of the block cache here
+        // would require us to also track the finality of blocks.
         match &*self.chain_client {
             ChainClient::Firehose(endpoints) => {
                 let endpoint = endpoints.endpoint().await?;
@@ -1075,45 +1131,26 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
             .ancestor_block(ptr.clone(), offset, root.clone())
             .await?;
 
-        // First check if we have the ancestor in cache and can deserialize it.
-        // recent_blocks_cache can have full format {"block": {...}, "transaction_receipts": [...]}
-        // or light format (just block fields). We need full format with receipts for
-        // ancestor_block since it's used for trigger processing.
+        // Use full blocks (with receipts) directly from cache.
+        // Light blocks (no receipts) need to be fetched from Firehose/RPC.
         let block_ptr = match cached {
-            Some((json, ptr)) => {
-                if json.get("block").is_none() {
-                    warn!(
+            Some((cached_block, ptr)) => match cached_block.into_full_block() {
+                Some(block) => {
+                    return Ok(Some(BlockFinality::NonFinal(EthereumBlockWithCalls {
+                        ethereum_block: block,
+                        calls: None,
+                    })));
+                }
+                None => {
+                    trace!(
                         self.logger,
-                        "Cached ancestor block #{} {} has light format without receipts. \
-                         Falling back to Firehose/RPC.",
+                        "Cached block #{} {} is light (no receipts). Falling back to Firehose/RPC.",
                         ptr.number,
                         ptr.hash_hex(),
                     );
                     ptr
-                } else {
-                    match json::from_value::<EthereumBlock>(json.clone()) {
-                        Ok(block) => {
-                            return Ok(Some(BlockFinality::NonFinal(EthereumBlockWithCalls {
-                                ethereum_block: block,
-                                calls: None,
-                            })));
-                        }
-                        Err(e) => {
-                            warn!(
-                                self.logger,
-                                "Failed to deserialize cached ancestor block #{} {} (offset {} from #{}): {}. \
-                                 Falling back to Firehose/RPC.",
-                                ptr.number,
-                                ptr.hash_hex(),
-                                offset,
-                                ptr_for_log.number,
-                                e
-                            );
-                            ptr
-                        }
-                    }
                 }
-            }
+            },
             None => {
                 // Cache miss - fall back to walking the chain via parent_ptr() calls.
                 // This provides resilience when the block cache is empty (e.g., after truncation).
@@ -1168,28 +1205,9 @@ impl TriggersAdapterTrait<Chain> for TriggersAdapter {
         let block = match self.chain_client.as_ref() {
             ChainClient::Firehose(endpoints) => {
                 let chain_store = self.chain_store.cheap_clone();
-                // First try to get the block from the store
-                if let Ok(blocks) = chain_store.blocks(vec![block.hash.clone()]).await {
-                    if let Some(cached_json) = blocks.first() {
-                        // recent_blocks_cache can contain full format {"block": {...}, "transaction_receipts": [...]}
-                        // or light format (just block fields). Extract block data for deserialization.
-                        let inner = cached_json.get("block").unwrap_or(cached_json);
-                        match json::from_value::<LightEthereumBlock>(inner.clone()) {
-                            Ok(light_block) => {
-                                return Ok(light_block.parent_ptr());
-                            }
-                            Err(e) => {
-                                warn!(
-                                    self.logger,
-                                    "Failed to deserialize cached block #{} {}: {}. \
-                                     Falling back to Firehose.",
-                                    block.number,
-                                    block.hash_hex(),
-                                    e
-                                );
-                            }
-                        }
-                    }
+                // First try to get the parent pointer from the store header columns
+                if let Ok(Some(parent)) = chain_store.block_parent_ptr(&block.hash).await {
+                    return Ok(Some(parent));
                 }
 
                 // If not in store, fetch from Firehose
@@ -1261,16 +1279,14 @@ impl TriggersAdapter {
         adapters: &EthereumNetworkAdapters,
         block_ptr: &BlockPtr,
     ) -> Result<Option<EthereumBlock>, Error> {
-        let adapter = adapters.cheapest_with(&self.capabilities).await?;
-
-        let block = adapter
-            .block_by_hash(&self.logger, block_ptr.hash.as_b256())
-            .await?;
-
-        match block {
-            Some(block) => {
+        // Use the cache-aware light block fetch first; it checks recent_blocks_cache
+        // and the DB before falling back to eth_getBlockByHash.
+        let light_block = self.fetch_light_block_with_rpc(adapters, block_ptr).await?;
+        match light_block {
+            Some(light_block) => {
+                let adapter = adapters.cheapest_with(&self.capabilities).await?;
                 let ethereum_block = adapter
-                    .load_full_block(&self.logger, block)
+                    .load_full_block(&self.logger, light_block.inner().clone())
                     .await
                     .map_err(|e| anyhow!("Failed to load full block: {}", e))?;
                 Ok(Some(ethereum_block))
@@ -1373,7 +1389,9 @@ impl FirehoseMapperTrait<Chain> for FirehoseMapper {
             }
 
             StepFinal => {
-                unreachable!("irreversible step is not handled and should not be requested in the Firehose request")
+                unreachable!(
+                    "irreversible step is not handled and should not be requested in the Firehose request"
+                )
             }
 
             StepUnset => {
diff --git a/chain/ethereum/src/codec.rs b/chain/ethereum/src/codec.rs
index a3bfb75ad49..b40bcd11910 100644
--- a/chain/ethereum/src/codec.rs
+++ b/chain/ethereum/src/codec.rs
@@ -8,18 +8,19 @@ use graph::{
     blockchain::{
         self, Block as BlockchainBlock, BlockPtr, BlockTime, ChainStoreBlock, ChainStoreData,
     },
-    components::ethereum::{AnyBlock, AnyHeader, AnyRpcHeader, AnyRpcTransaction, AnyTxEnvelope},
+    components::ethereum::{
+        AnyBlock, AnyHeader, AnyRpcHeader, AnyTransactionReceiptBare, AnyTxEnvelope,
+    },
     prelude::{
+        BlockNumber, Error, EthereumBlock, EthereumBlockWithCalls, EthereumCall,
+        LightEthereumBlock,
         alloy::{
             self,
             consensus::{ReceiptWithBloom, TxEnvelope, TxType},
             network::AnyReceiptEnvelope,
-            primitives::{aliases::B2048, Address, Bloom, Bytes, LogData, B256, U256},
+            primitives::{Address, B256, Bloom, Bytes, LogData, U256, aliases::B2048},
             rpc::types::{self as alloy_rpc_types, AccessList, AccessListItem, Transaction},
-            serde::WithOtherFields,
         },
-        BlockNumber, Error, EthereumBlock, EthereumBlockWithCalls, EthereumCall,
-        LightEthereumBlock,
     },
 };
 use std::sync::Arc;
@@ -161,6 +162,11 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
         // Extract data from trace and block
         let block_hash = self.block.hash.try_decode_proto("transaction block hash")?;
         let block_number = self.block.number;
+        let block_timestamp = self
+            .block
+            .header
+            .as_ref()
+            .and_then(|h| h.timestamp.as_ref().map(|t| t.seconds as u64));
         let transaction_index = Some(self.trace.index as u64);
         let from_address = self
             .trace
@@ -240,6 +246,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
                 inner: recovered,
                 block_hash: Some(block_hash),
                 block_number: Some(block_number),
+                block_timestamp,
                 transaction_index,
                 effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None },
             });
@@ -450,6 +457,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
             inner: recovered,
             block_hash: Some(block_hash),
             block_number: Some(block_number),
+            block_timestamp,
             transaction_index,
             effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None }, // gas_price already contains effective gas price per protobuf spec
         })
@@ -527,6 +535,8 @@ impl TryInto<AnyBlock> for &Block {
             } else {
                 Some(header.requests_hash.try_decode_proto("requests hash")?)
             },
+            block_access_list_hash: None,
+            slot_number: None,
         };
 
         let rpc_header = alloy::rpc::types::Header {
@@ -556,19 +566,12 @@ impl TryInto<AnyBlock> for &Block {
 
         let any_header: AnyRpcHeader = rpc_header.map(AnyHeader::from);
 
-        let any_transactions: Vec<AnyRpcTransaction> = transactions
-            .into_iter()
-            .map(|tx| AnyRpcTransaction::new(WithOtherFields::new(tx)))
-            .collect();
-
-        let any_block = Block {
+        Ok(Block {
             header: any_header,
-            transactions: alloy::rpc::types::BlockTransactions::Full(any_transactions),
+            transactions: alloy::rpc::types::BlockTransactions::Full(transactions),
             uncles,
             withdrawals: None,
-        };
-
-        Ok(AnyBlock::new(WithOtherFields::new(any_block)))
+        })
     }
 }
 
@@ -619,7 +622,7 @@ impl TryInto<EthereumBlockWithCalls> for &Block {
 fn transaction_trace_to_alloy_txn_reciept(
     t: &TransactionTrace,
     block: &Block,
-) -> Result<Option<alloy::network::AnyTransactionReceipt>, Error> {
+) -> Result<Option<AnyTransactionReceiptBare>, Error> {
     use alloy::consensus::{Eip658Value, Receipt};
     let r = t.receipt.as_ref();
 
@@ -656,7 +659,7 @@ fn transaction_trace_to_alloy_txn_reciept(
         TransactionTraceStatus::Unknown => {
             return Err(format_err!(
                 "Transaction trace has UNKNOWN status; datasource is broken"
-            ))
+            ));
         }
         TransactionTraceStatus::Succeeded => true,
         TransactionTraceStatus::Failed | TransactionTraceStatus::Reverted => false,
@@ -719,7 +722,7 @@ fn transaction_trace_to_alloy_txn_reciept(
         inner: any_envelope,
     };
 
-    Ok(Some(WithOtherFields::new(receipt)))
+    Ok(Some(receipt))
 }
 
 impl BlockHeader {
@@ -1014,7 +1017,7 @@ mod test {
 
         let receipt = receipt_opt.unwrap();
 
-        assert_eq!(receipt.inner.inner.r#type, 126);
+        assert_eq!(receipt.inner.r#type, 126);
         assert_eq!(receipt.gas_used, 21000);
         assert_eq!(receipt.transaction_index, Some(0));
     }
diff --git a/chain/ethereum/src/data_source.rs b/chain/ethereum/src/data_source.rs
index cd945d00c62..709884496e8 100644
--- a/chain/ethereum/src/data_source.rs
+++ b/chain/ethereum/src/data_source.rs
@@ -1,5 +1,5 @@
-use anyhow::{anyhow, Error};
-use anyhow::{ensure, Context};
+use anyhow::{Context, ensure};
+use anyhow::{Error, anyhow};
 use async_trait::async_trait;
 use graph::abi;
 use graph::abi::EventExt;
@@ -18,16 +18,17 @@ use graph::data_source::common::{
 };
 use graph::data_source::{CausalityRegion, MappingTrigger as MappingTriggerType};
 use graph::env::ENV_VARS;
+use graph::futures03::TryStreamExt;
 use graph::futures03::future::try_join;
 use graph::futures03::stream::FuturesOrdered;
-use graph::futures03::TryStreamExt;
+use graph::prelude::alloy::primitives::keccak256;
 use graph::prelude::alloy::{
     consensus::{TxEnvelope, TxLegacy},
     network::TransactionResponse,
     primitives::{Address, B256, U256},
     rpc::types::Log,
 };
-use graph::prelude::{alloy, Link, SubgraphManifestValidationError};
+use graph::prelude::{Link, SubgraphManifestValidationError, alloy};
 use graph::slog::{debug, error, o, trace};
 use itertools::Itertools;
 use serde::de::Error as ErrorD;
@@ -37,26 +38,25 @@ use std::num::NonZeroU32;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
-use tiny_keccak::{keccak256, Keccak};
 
 use graph::{
     blockchain::{self, Blockchain},
     prelude::{
-        serde_json, warn, BlockNumber, CheapClone, EthereumCall, LightEthereumBlock,
-        LightEthereumBlockExt, LinkResolver, Logger,
+        BlockNumber, CheapClone, EthereumCall, LightEthereumBlock, LightEthereumBlockExt,
+        LinkResolver, Logger, serde_json, warn,
     },
 };
 
 use graph::data::subgraph::{
-    calls_host_fn, DataSourceContext, Source, MIN_SPEC_VERSION, SPEC_VERSION_0_0_8,
-    SPEC_VERSION_1_2_0,
+    DataSourceContext, MIN_SPEC_VERSION, SPEC_VERSION_0_0_8, SPEC_VERSION_1_2_0, Source,
+    calls_host_fn,
 };
 
+use crate::NodeCapabilities;
 use crate::adapter::EthereumAdapter as _;
 use crate::chain::Chain;
 use crate::network::EthereumNetworkAdapters;
 use crate::trigger::{EthereumBlockTriggerType, EthereumTrigger, MappingTrigger};
-use crate::NodeCapabilities;
 
 // The recommended kind is `ethereum`, `ethereum/contract` is accepted for backwards compatibility.
 const ETHEREUM_KINDS: &[&str] = &["ethereum/contract", "ethereum"];
@@ -444,10 +444,9 @@ fn create_dummy_transaction(
     transaction_index: Option<u64>,
     transaction_hash: Option<B256>,
 ) -> Result<AnyTransaction, anyhow::Error> {
-    use alloy::serde::WithOtherFields;
     use graph::components::ethereum::AnyTxEnvelope;
     use graph::prelude::alloy::{
-        consensus::transaction::Recovered, consensus::Signed, primitives::Signature,
+        consensus::Signed, consensus::transaction::Recovered, primitives::Signature,
         rpc::types::Transaction,
     };
 
@@ -465,15 +464,14 @@ fn create_dummy_transaction(
 
     let recovered = Recovered::new_unchecked(any_envelope, Address::ZERO);
 
-    let inner_tx = Transaction {
+    Ok(Transaction {
         inner: recovered,
         block_hash: Some(block_hash),
         block_number: Some(block_number),
+        block_timestamp: None,
         transaction_index,
         effective_gas_price: None,
-    };
-
-    Ok(AnyTransaction::new(WithOtherFields::new(inner_tx)))
+    })
 }
 
 impl DataSource {
@@ -812,7 +810,7 @@ impl DataSource {
                 let logging_extras = Arc::new(o! {
                     "signature" => event_handler.event.to_string(),
                     "address" => format!("{}", &log.address()),
-                    "transaction" => format!("{}", &transaction.inner.tx_hash()),
+                    "transaction" => format!("{}", &transaction.tx_hash()),
                 });
                 let handler = event_handler.handler.clone();
                 let calls = DeclaredCall::from_log_trigger_with_event(
@@ -921,7 +919,7 @@ impl DataSource {
                 let logging_extras = Arc::new(o! {
                     "function" => handler.function.to_string(),
                     "to" => format!("{}", &call.to),
-                    "transaction" => format!("{}", &transaction.inner.tx_hash()),
+                    "transaction" => format!("{}", &transaction.tx_hash()),
                 });
                 Ok(Some(TriggerWithHandler::<Chain>::new_with_logging_extras(
                     MappingTrigger::Call {
@@ -1592,13 +1590,7 @@ impl MappingEventHandler {
 
 /// Hashes a string to a B256 hash.
 fn string_to_b256(s: &str) -> B256 {
-    let mut result = [0u8; 32];
-    let data = s.replace(' ', "").into_bytes();
-    let mut sponge = Keccak::new_keccak256();
-    sponge.update(&data);
-    sponge.finalize(&mut result);
-
-    B256::from_slice(&result)
+    keccak256(s.replace(' ', "").as_bytes())
 }
 
 #[derive(Clone, Debug, Default, Hash, Eq, PartialEq, Deserialize)]
diff --git a/chain/ethereum/src/env.rs b/chain/ethereum/src/env.rs
index 027a26b623f..b15ee0ee018 100644
--- a/chain/ethereum/src/env.rs
+++ b/chain/ethereum/src/env.rs
@@ -1,6 +1,6 @@
 use envconfig::Envconfig;
 use graph::env::EnvVarBoolean;
-use graph::prelude::{envconfig, lazy_static, BlockNumber};
+use graph::prelude::{BlockNumber, envconfig, lazy_static};
 use std::fmt;
 use std::time::Duration;
 
@@ -13,9 +13,9 @@ lazy_static! {
 pub struct EnvVars {
     /// Additional deterministic errors that have not yet been hardcoded.
     ///
-    /// Set by the environment variable `GRAPH_GETH_ETH_CALL_ERRORS`, separated
+    /// Set by the environment variable `GRAPH_RPC_ETH_CALL_ERRORS`, separated
     /// by `;`.
-    pub geth_eth_call_errors: Vec<String>,
+    pub rpc_eth_call_errors: Vec<String>,
     /// Set by the environment variable `GRAPH_ETH_GET_LOGS_MAX_CONTRACTS`. The
     /// default value is 2000.
     pub get_logs_max_contracts: usize,
@@ -114,8 +114,8 @@ impl From<Inner> for EnvVars {
     fn from(x: Inner) -> Self {
         Self {
             get_logs_max_contracts: x.get_logs_max_contracts,
-            geth_eth_call_errors: x
-                .geth_eth_call_errors
+            rpc_eth_call_errors: x
+                .rpc_eth_call_errors
                 .split(';')
                 .filter(|s| !s.is_empty())
                 .map(str::to_string)
@@ -158,8 +158,8 @@ impl Default for EnvVars {
 
 #[derive(Clone, Debug, Envconfig)]
 struct Inner {
-    #[envconfig(from = "GRAPH_GETH_ETH_CALL_ERRORS", default = "")]
-    geth_eth_call_errors: String,
+    #[envconfig(from = "GRAPH_RPC_ETH_CALL_ERRORS", default = "")]
+    rpc_eth_call_errors: String,
     #[envconfig(from = "GRAPH_ETH_GET_LOGS_MAX_CONTRACTS", default = "2000")]
     get_logs_max_contracts: usize,
 
diff --git a/chain/ethereum/src/ethereum_adapter.rs b/chain/ethereum/src/ethereum_adapter.rs
index 64affbeec0b..9c85f0ac551 100644
--- a/chain/ethereum/src/ethereum_adapter.rs
+++ b/chain/ethereum/src/ethereum_adapter.rs
@@ -3,39 +3,40 @@ use futures03::{future::BoxFuture, stream::FuturesUnordered};
 use graph::abi;
 use graph::abi::DynSolValueExt;
 use graph::abi::FunctionExt;
-use graph::blockchain::client::ChainClient;
 use graph::blockchain::BlockHash;
 use graph::blockchain::ChainIdentifier;
 use graph::blockchain::ExtendedBlockPtr;
+use graph::blockchain::client::ChainClient;
 use graph::components::ethereum::*;
 use graph::components::transaction_receipt::LightTransactionReceipt;
 use graph::data::store::ethereum::call;
 use graph::data::store::scalar;
-use graph::data::subgraph::UnifiedMappingApiVersion;
 use graph::data::subgraph::API_VERSION_0_0_7;
+use graph::data::subgraph::UnifiedMappingApiVersion;
 use graph::data_source::common::ContractCall;
-use graph::futures01::stream;
+use graph::derive::CheapClone;
 use graph::futures01::Future;
 use graph::futures01::Stream;
+use graph::futures01::stream;
 use graph::futures03::future::try_join_all;
 use graph::futures03::{
-    self, compat::Future01CompatExt, FutureExt, StreamExt, TryFutureExt, TryStreamExt,
+    self, FutureExt, StreamExt, TryFutureExt, TryStreamExt, compat::Future01CompatExt,
 };
 use graph::prelude::{
     alloy::{
         self,
-        network::{AnyNetwork, TransactionResponse},
+        network::TransactionResponse,
         primitives::{Address, B256},
         providers::{
+            Identity, Provider, RootProvider,
             ext::TraceApi,
             fillers::{
                 BlobGasFiller, ChainIdFiller, FillProvider, GasFiller, JoinFill, NonceFiller,
             },
-            Identity, Provider, RootProvider,
         },
         rpc::types::{
-            trace::{filter::TraceFilter as AlloyTraceFilter, parity::LocalizedTransactionTrace},
             TransactionInput, TransactionRequest,
+            trace::{filter::TraceFilter as AlloyTraceFilter, parity::LocalizedTransactionTrace},
         },
         transports::{RpcError, TransportErrorKind},
     },
@@ -43,11 +44,12 @@ use graph::prelude::{
 };
 use graph::slog::o;
 use graph::{
-    blockchain::{block_stream::BlockWithTriggers, BlockPtr, IngestorError},
+    blockchain::{BlockPtr, IngestorError, block_stream::BlockWithTriggers},
     prelude::{
-        anyhow::{self, anyhow, bail, ensure, Context},
-        debug, error, hex, info, retry, serde_json as json, trace, warn, BlockNumber, ChainStore,
-        CheapClone, DynTryFuture, Error, EthereumCallCache, Logger, TimeoutError,
+        BlockNumber, ChainStore, CheapClone, DynTryFuture, Error, EthereumCallCache, Logger,
+        TimeoutError,
+        anyhow::{self, Context, anyhow, bail, ensure},
+        debug, error, hex, info, retry, trace, warn,
     },
 };
 use itertools::Itertools;
@@ -56,27 +58,28 @@ use std::convert::TryFrom;
 use std::iter::FromIterator;
 use std::pin::Pin;
 use std::sync::Arc;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 use tokio::sync::RwLock;
 use tokio::time::timeout;
 
+use crate::Chain;
+use crate::NodeCapabilities;
+use crate::TriggerFilter;
 use crate::adapter::EthGetLogsFilter;
 use crate::adapter::EthereumRpcError;
 use crate::adapter::ProviderStatus;
 use crate::call_helper::interpret_eth_call_error;
 use crate::chain::BlockFinality;
+use crate::chain::ChainSettings;
 use crate::trigger::{LogPosition, LogRef};
-use crate::Chain;
-use crate::NodeCapabilities;
-use crate::TriggerFilter;
 use crate::{
+    ENV_VARS,
     adapter::{
         ContractCallError, EthereumAdapter as EthereumAdapterTrait, EthereumBlockFilter,
         EthereumCallFilter, EthereumLogFilter, ProviderEthRpcMetrics, SubgraphEthRpcMetrics,
     },
     transport::Transport,
     trigger::{EthereumBlockTriggerType, EthereumTrigger},
-    ENV_VARS,
 };
 
 type AlloyProvider = FillProvider<
@@ -84,8 +87,8 @@ type AlloyProvider = FillProvider<
         Identity,
         JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
     >,
-    RootProvider<AnyNetwork>,
-    AnyNetwork,
+    RootProvider<AnyNetworkBare>,
+    AnyNetworkBare,
 >;
 
 #[derive(Clone)]
@@ -97,6 +100,7 @@ pub struct EthereumAdapter {
     supports_eip_1898: bool,
     call_only: bool,
     supports_block_receipts: Arc<RwLock<Option<bool>>>,
+    pub(crate) settings: Arc<ChainSettings>,
 }
 
 impl std::fmt::Debug for EthereumAdapter {
@@ -109,6 +113,7 @@ impl std::fmt::Debug for EthereumAdapter {
             .field("supports_eip_1898", &self.supports_eip_1898)
             .field("call_only", &self.call_only)
             .field("supports_block_receipts", &self.supports_block_receipts)
+            .field("settings", &self.settings)
             .finish()
     }
 }
@@ -123,15 +128,39 @@ impl CheapClone for EthereumAdapter {
             supports_eip_1898: self.supports_eip_1898,
             call_only: self.call_only,
             supports_block_receipts: self.supports_block_receipts.cheap_clone(),
+            settings: self.settings.clone(),
         }
     }
 }
 
+/// Logger with provider context. Internal methods should take this type
+/// to ensure provider info is always included in logs.
+#[derive(Clone, CheapClone)]
+struct ProviderLogger(Logger);
+
+impl ProviderLogger {
+    fn new(logger: &Logger, provider: &str) -> Self {
+        Self(Logger::new(logger, o!("provider" => provider.to_string())))
+    }
+}
+
+impl std::ops::Deref for ProviderLogger {
+    type Target = Logger;
+    fn deref(&self) -> &Logger {
+        &self.0
+    }
+}
+
 impl EthereumAdapter {
     pub fn is_call_only(&self) -> bool {
         self.call_only
     }
 
+    /// Returns a logger with provider context added
+    fn provider_logger(&self, logger: &Logger) -> ProviderLogger {
+        ProviderLogger::new(logger, &self.provider)
+    }
+
     pub async fn new(
         logger: Logger,
         provider: String,
@@ -139,26 +168,24 @@ impl EthereumAdapter {
         provider_metrics: Arc<ProviderEthRpcMetrics>,
         supports_eip_1898: bool,
         call_only: bool,
+        settings: Arc<ChainSettings>,
     ) -> Self {
         let alloy = match &transport {
             Transport::RPC(client) => Arc::new(
-                alloy::providers::ProviderBuilder::<_, _, AnyNetwork>::default()
-                    .network::<AnyNetwork>()
-                    .with_recommended_fillers()
+                alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
+                    .network::<AnyNetworkBare>()
                     .connect_client(client.clone()),
             ),
             Transport::IPC(ipc_connect) => Arc::new(
-                alloy::providers::ProviderBuilder::<_, _, AnyNetwork>::default()
-                    .network::<AnyNetwork>()
-                    .with_recommended_fillers()
+                alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
+                    .network::<AnyNetworkBare>()
                     .connect_ipc(ipc_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum IPC"),
             ),
             Transport::WS(ws_connect) => Arc::new(
-                alloy::providers::ProviderBuilder::<_, _, AnyNetwork>::default()
-                    .network::<AnyNetwork>()
-                    .with_recommended_fillers()
+                alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
+                    .network::<AnyNetworkBare>()
                     .connect_ws(ws_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum WS"),
@@ -173,12 +200,13 @@ impl EthereumAdapter {
             supports_eip_1898,
             call_only,
             supports_block_receipts: Arc::new(RwLock::new(None)),
+            settings,
         }
     }
 
     async fn traces(
         self,
-        logger: Logger,
+        logger: ProviderLogger,
         subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
         from: BlockNumber,
         to: BlockNumber,
@@ -192,8 +220,8 @@ impl EthereumAdapter {
 
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let eth = eth.clone();
                 let logger = logger.clone();
@@ -219,7 +247,7 @@ impl EthereumAdapter {
 
     async fn execute_trace_filter_request(
         &self,
-        logger: Logger,
+        logger: ProviderLogger,
         subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
         from: BlockNumber,
         to: BlockNumber,
@@ -264,7 +292,7 @@ impl EthereumAdapter {
 
     fn log_trace_results(
         &self,
-        logger: &Logger,
+        logger: &ProviderLogger,
         from: BlockNumber,
         to: BlockNumber,
         trace_len: usize,
@@ -288,7 +316,7 @@ impl EthereumAdapter {
         result: &Result<Vec<LocalizedTransactionTrace>, RpcError<TransportErrorKind>>,
         from: BlockNumber,
         to: BlockNumber,
-        logger: &Logger,
+        logger: &ProviderLogger,
     ) {
         self.metrics
             .observe_request(elapsed, "trace_filter", &self.provider);
@@ -312,7 +340,7 @@ impl EthereumAdapter {
         block_hash: B256,
         supports_eip_1898: bool,
         call_only: bool,
-        logger: Logger,
+        logger: ProviderLogger,
     ) -> bool {
         // This is the lazy part. If the result is already in `supports_block_receipts`, we don't need
         // to check again.
@@ -362,7 +390,7 @@ impl EthereumAdapter {
     /// Alloy-exclusive version of logs_with_sigs using alloy types and methods
     async fn logs_with_sigs(
         &self,
-        logger: Logger,
+        logger: ProviderLogger,
         subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
         from: BlockNumber,
         to: BlockNumber,
@@ -386,8 +414,8 @@ impl EthereumAdapter {
                         .any(|f| e.to_string().contains(f)),
                 },
             )
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let eth_adapter = eth_adapter.cheap_clone();
                 let subgraph_metrics = subgraph_metrics.clone();
@@ -416,7 +444,7 @@ impl EthereumAdapter {
 
     fn trace_stream(
         self,
-        logger: &Logger,
+        logger: ProviderLogger,
         subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
         from: BlockNumber,
         to: BlockNumber,
@@ -446,8 +474,8 @@ impl EthereumAdapter {
             ranges
         };
 
+        let block_batch_size = self.settings.block_batch_size;
         let eth = self;
-        let logger = logger.clone();
 
         futures03::stream::iter(ranges.into_iter().map(move |(start, end)| {
             let eth = eth.clone();
@@ -466,14 +494,14 @@ impl EthereumAdapter {
                     .await
             }
         }))
-        .buffered(ENV_VARS.block_batch_size)
+        .buffered(block_batch_size)
         .map_ok(|traces| futures03::stream::iter(traces.into_iter().map(Ok)))
         .try_flatten()
     }
 
     fn log_stream(
         &self,
-        logger: Logger,
+        logger: ProviderLogger,
         subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
         from: BlockNumber,
         to: BlockNumber,
@@ -502,7 +530,7 @@ impl EthereumAdapter {
         let step = match filter.contracts.is_empty() {
             // `to - from + 1`  blocks will be scanned.
             false => to - from,
-            true => (to - from).min(ENV_VARS.max_event_only_range - 1),
+            true => (to - from).min(self.settings.max_event_only_range - 1),
         };
 
         // Typically this will loop only once and fetch the entire range in one request. But if the
@@ -575,12 +603,11 @@ impl EthereumAdapter {
 
     async fn code(
         &self,
-        logger: &Logger,
+        logger: ProviderLogger,
         address: Address,
         block_ptr: BlockPtr,
     ) -> Result<alloy::primitives::Bytes, EthereumRpcError> {
         let alloy = self.alloy.clone();
-        let logger = Logger::new(logger, o!("provider" => self.provider.clone()));
 
         let block_id = self.block_ptr_to_id(&block_ptr);
         let retry_log_message = format!("eth_getCode RPC call for block {}", block_ptr);
@@ -588,8 +615,8 @@ impl EthereumAdapter {
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
             .when(|result| result.is_err())
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.cheap_clone();
                 async move {
@@ -606,12 +633,11 @@ impl EthereumAdapter {
 
     async fn balance(
         &self,
-        logger: &Logger,
+        logger: ProviderLogger,
         address: Address,
         block_ptr: BlockPtr,
     ) -> Result<alloy::primitives::U256, EthereumRpcError> {
         let alloy = self.alloy.clone();
-        let logger = Logger::new(logger, o!("provider" => self.provider.clone()));
 
         let block_id = self.block_ptr_to_id(&block_ptr);
         let retry_log_message = format!("eth_getBalance RPC call for block {}", block_ptr);
@@ -619,8 +645,8 @@ impl EthereumAdapter {
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
             .when(|result| result.is_err())
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.cheap_clone();
                 async move {
@@ -637,20 +663,19 @@ impl EthereumAdapter {
 
     async fn call(
         &self,
-        logger: Logger,
+        logger: ProviderLogger,
         call_data: call::Request,
         block_ptr: BlockPtr,
         gas: Option<u32>,
     ) -> Result<call::Retval, ContractCallError> {
         let alloy = self.alloy.clone();
-        let logger = Logger::new(&logger, o!("provider" => self.provider.clone()));
 
         let alloy_block_id = self.block_ptr_to_id(&block_ptr);
         let retry_log_message = format!("eth_call RPC call for block {}", block_ptr);
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let call_data = call_data.clone();
                 let alloy = alloy.cheap_clone();
@@ -680,7 +705,7 @@ impl EthereumAdapter {
 
     async fn call_and_cache(
         &self,
-        logger: &Logger,
+        logger: &ProviderLogger,
         call: &ContractCall,
         req: call::Request,
         cache: Arc<dyn EthereumCallCache>,
@@ -716,6 +741,8 @@ impl EthereumAdapter {
         ids: Vec<B256>,
     ) -> impl futures03::Stream<Item = Result<Arc<LightEthereumBlock>, Error>> + Send {
         let alloy = self.alloy.clone();
+        let request_retries = self.settings.request_retries;
+        let json_rpc_timeout_secs = self.settings.json_rpc_timeout.as_secs();
 
         futures03::stream::iter(ids.into_iter().map(move |hash| {
             let alloy = alloy.clone();
@@ -724,8 +751,8 @@ impl EthereumAdapter {
             async move {
                 retry(format!("load block {}", hash), &logger)
                     .redact_log_urls(true)
-                    .limit(ENV_VARS.request_retries)
-                    .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+                    .limit(request_retries)
+                    .timeout_secs(json_rpc_timeout_secs)
                     .run(move || {
                         let alloy = alloy.cheap_clone();
                         async move {
@@ -754,7 +781,7 @@ impl EthereumAdapter {
                     })
             }
         }))
-        .buffered(ENV_VARS.block_batch_size)
+        .buffered(self.settings.block_batch_size)
     }
 
     /// Request blocks by number through JSON-RPC.
@@ -764,6 +791,8 @@ impl EthereumAdapter {
         numbers: Vec<BlockNumber>,
     ) -> impl futures03::Stream<Item = Result<Arc<ExtendedBlockPtr>, Error>> + Send {
         let alloy = self.alloy.clone();
+        let request_retries = self.settings.request_retries;
+        let json_rpc_timeout_secs = self.settings.json_rpc_timeout.as_secs();
 
         futures03::stream::iter(numbers.into_iter().map(move |number| {
             let alloy = alloy.clone();
@@ -772,8 +801,8 @@ impl EthereumAdapter {
             async move {
                 retry(format!("load block {}", number), &logger)
                     .redact_log_urls(true)
-                    .limit(ENV_VARS.request_retries)
-                    .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+                    .limit(request_retries)
+                    .timeout_secs(json_rpc_timeout_secs)
                     .run(move || {
                         let alloy = alloy.cheap_clone();
 
@@ -814,7 +843,7 @@ impl EthereumAdapter {
                     })
             }
         }))
-        .buffered(ENV_VARS.block_ptr_batch_size)
+        .buffered(self.settings.block_ptr_batch_size)
     }
 
     /// Request blocks ptrs for numbers through JSON-RPC.
@@ -826,6 +855,7 @@ impl EthereumAdapter {
         block_nums: Vec<BlockNumber>,
     ) -> impl Stream<Item = BlockPtr, Error = Error> + Send {
         let alloy = self.alloy.clone();
+        let json_rpc_timeout_secs = self.settings.json_rpc_timeout.as_secs();
 
         stream::iter_ok::<_, Error>(block_nums.into_iter().map(move |block_num| {
             let alloy = alloy.clone();
@@ -833,7 +863,7 @@ impl EthereumAdapter {
                 .redact_log_urls(true)
                 .when(|res| !res.is_ok() && !detect_null_block(res))
                 .no_limit()
-                .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+                .timeout_secs(json_rpc_timeout_secs)
                 .run(move || {
                     let alloy = alloy.cheap_clone();
                     async move {
@@ -859,7 +889,7 @@ impl EthereumAdapter {
                     }
                 })
         }))
-        .buffered(ENV_VARS.block_batch_size)
+        .buffered(self.settings.block_batch_size)
         .filter_map(|b| b)
         .map(|b| BlockPtr::from((b.header.hash, b.header.number)))
     }
@@ -896,19 +926,24 @@ impl EthereumAdapter {
         log_filter: EthereumLogFilter,
     ) -> DynTryFuture<'static, Vec<alloy::rpc::types::Log>, Error> {
         let eth: Self = self.cheap_clone();
-        let logger = logger.clone();
-
-        futures03::stream::iter(log_filter.eth_get_logs_filters().map(move |filter| {
-            eth.cheap_clone().log_stream(
-                logger.cheap_clone(),
-                subgraph_metrics.cheap_clone(),
-                from,
-                to,
-                filter,
-            )
-        }))
+        let logger = self.provider_logger(logger);
+
+        let max_contracts = eth.settings.get_logs_max_contracts;
+        futures03::stream::iter(
+            log_filter
+                .eth_get_logs_filters(max_contracts)
+                .map(move |filter| {
+                    eth.cheap_clone().log_stream(
+                        logger.cheap_clone(),
+                        subgraph_metrics.cheap_clone(),
+                        from,
+                        to,
+                        filter,
+                    )
+                }),
+        )
         // Real limits on the number of parallel requests are imposed within the adapter.
-        .buffered(ENV_VARS.block_ingestor_max_concurrent_json_rpc_calls)
+        .buffered(self.settings.block_ingestor_max_concurrent_json_rpc_calls)
         .try_concat()
         .boxed()
     }
@@ -922,6 +957,7 @@ impl EthereumAdapter {
         call_filter: &'a EthereumCallFilter,
     ) -> Box<dyn Stream<Item = EthereumCall, Error = Error> + Send + 'a> {
         let eth = self.clone();
+        let logger = self.provider_logger(logger);
 
         let EthereumCallFilter {
             contract_addresses_function_signatures,
@@ -976,34 +1012,20 @@ impl EthereumAdapter {
     ) -> Pin<
         Box<
             dyn std::future::Future<Output = Result<Vec<EthereumTrigger>, anyhow::Error>>
-                + std::marker::Send,
+                + std::marker::Send
+                + '_,
         >,
     > {
-        // Create a HashMap of block numbers to Vec<EthereumBlockTriggerType>
+        // Create a HashMap of block numbers to Vec<EthereumBlockTriggerType>.
         let matching_blocks = (from..=to)
             .filter_map(|block_number| {
-                filter
-                    .polling_intervals
-                    .iter()
-                    .find_map(|(start_block, interval)| {
-                        let has_once_trigger = (*interval == 0) && (block_number == *start_block);
-                        let has_polling_trigger = block_number >= *start_block
-                            && *interval > 0
-                            && ((block_number - start_block) % *interval) == 0;
-
-                        if has_once_trigger || has_polling_trigger {
-                            let mut triggers = Vec::new();
-                            if has_once_trigger {
-                                triggers.push(EthereumBlockTriggerType::Start);
-                            }
-                            if has_polling_trigger {
-                                triggers.push(EthereumBlockTriggerType::End);
-                            }
-                            Some((block_number, triggers))
-                        } else {
-                            None
-                        }
-                    })
+                let triggers =
+                    block_trigger_types_from_intervals(block_number, &filter.polling_intervals);
+                if triggers.is_empty() {
+                    None
+                } else {
+                    Some((block_number, triggers))
+                }
             })
             .collect::<HashMap<_, _>>();
 
@@ -1015,15 +1037,13 @@ impl EthereumAdapter {
         let block_futures = blocks_matching_polling_filter.map(move |ptrs| {
             ptrs.into_iter()
                 .flat_map(|ptr| {
-                    let triggers = matching_blocks
+                    matching_blocks
                         .get(&ptr.number)
                         // Safe to unwrap since we are iterating over ptrs which was created from
                         // the keys of matching_blocks
                         .unwrap()
                         .iter()
-                        .map(move |trigger| EthereumTrigger::Block(ptr.clone(), trigger.clone()));
-
-                    triggers
+                        .map(move |trigger| EthereumTrigger::Block(ptr.clone(), trigger.clone()))
                 })
                 .collect::<Vec<_>>()
         });
@@ -1039,6 +1059,7 @@ impl EthereumAdapter {
         block_hash: alloy::primitives::B256,
     ) -> Result<Vec<EthereumCall>, Error> {
         let eth = self.clone();
+        let logger = self.provider_logger(logger);
         let addresses = Vec::new();
         let traces: Vec<LocalizedTransactionTrace> = eth
             .trace_stream(
@@ -1087,7 +1108,7 @@ impl EthereumAdapter {
         logger: Logger,
         from: BlockNumber,
         to: BlockNumber,
-    ) -> Box<dyn Future<Item = Vec<BlockPtr>, Error = Error> + Send> {
+    ) -> Box<dyn Future<Item = Vec<BlockPtr>, Error = Error> + Send + '_> {
         // Currently we can't go to the DB for this because there might be duplicate entries for
         // the same block number.
         debug!(&logger, "Requesting hashes for blocks [{}, {}]", from, to);
@@ -1101,7 +1122,7 @@ impl EthereumAdapter {
         &self,
         logger: Logger,
         blocks: Vec<BlockNumber>,
-    ) -> Box<dyn Future<Item = Vec<BlockPtr>, Error = Error> + Send> {
+    ) -> Box<dyn Future<Item = Vec<BlockPtr>, Error = Error> + Send + '_> {
         // Currently we can't go to the DB for this because there might be duplicate entries for
         // the same block number.
         debug!(&logger, "Requesting hashes for blocks {:?}", blocks);
@@ -1114,7 +1135,7 @@ impl EthereumAdapter {
         retry("chain_id RPC call", &logger)
             .redact_log_urls(true)
             .no_limit()
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.cheap_clone();
                 async move { alloy.get_chain_id().await.map_err(Error::from) }
@@ -1171,9 +1192,10 @@ impl EthereumAdapterTrait for EthereumAdapter {
         let alloy_provider = self.alloy.clone();
         let metrics = self.metrics.clone();
         let provider = self.provider().to_string();
+        let genesis_block_number = self.settings.genesis_block_number;
         let retry_log_message = format!(
             "eth_getBlockByNumber({}, false) RPC call",
-            ENV_VARS.genesis_block_number
+            genesis_block_number
         );
         let gen_block_hash_future = retry(retry_log_message, &logger)
             .redact_log_urls(true)
@@ -1186,7 +1208,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
                 async move {
                     alloy_genesis
                         .get_block_by_number(alloy::rpc::types::BlockNumberOrTag::Number(
-                            ENV_VARS.genesis_block_number,
+                            genesis_block_number,
                         ))
                         .await
                         .inspect_err(|_| {
@@ -1224,8 +1246,8 @@ impl EthereumAdapterTrait for EthereumAdapter {
         let alloy = self.alloy.clone();
         retry("eth_getBlockByNumber(latest) no txs RPC call", logger)
             .redact_log_urls(true)
-            .no_limit()
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(ENV_VARS.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.cheap_clone();
                 async move {
@@ -1248,6 +1270,14 @@ impl EthereumAdapterTrait for EthereumAdapter {
             .await
     }
 
+    async fn is_reachable(&self) -> bool {
+        let alloy = self.alloy.clone();
+        tokio::time::timeout(Duration::from_secs(10), alloy.get_block_number())
+            .await
+            .map(|r| r.is_ok())
+            .unwrap_or(false)
+    }
+
     async fn block_by_hash(
         &self,
         logger: &Logger,
@@ -1262,8 +1292,8 @@ impl EthereumAdapterTrait for EthereumAdapter {
 
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
-            .limit(ENV_VARS.request_retries)
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .limit(self.settings.request_retries)
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.cheap_clone();
                 async move {
@@ -1296,7 +1326,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         retry(retry_log_message, &logger)
             .redact_log_urls(true)
             .no_limit()
-            .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+            .timeout_secs(self.settings.json_rpc_timeout.as_secs())
             .run(move || {
                 let alloy = alloy.clone();
                 async move {
@@ -1326,7 +1356,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         block: AnyBlock,
     ) -> Result<EthereumBlock, IngestorError> {
         let alloy = self.alloy.clone();
-        let logger = logger.clone();
+        let logger = self.provider_logger(logger);
         let block_hash = block.header.hash;
 
         // The early return is necessary for correctness, otherwise we'll
@@ -1350,12 +1380,19 @@ impl EthereumAdapterTrait for EthereumAdapter {
             )
             .await;
 
-        fetch_receipts_with_retry(alloy, hashes, block_hash, logger, supports_block_receipts)
-            .await
-            .map(|transaction_receipts| EthereumBlock {
-                block: Arc::new(LightEthereumBlock::new(block)),
-                transaction_receipts,
-            })
+        fetch_receipts_with_retry(
+            alloy,
+            hashes,
+            block_hash,
+            logger,
+            supports_block_receipts,
+            &self.settings,
+        )
+        .await
+        .map(|transaction_receipts| EthereumBlock {
+            block: Arc::new(LightEthereumBlock::new(block)),
+            transaction_receipts,
+        })
     }
 
     async fn get_balance(
@@ -1364,6 +1401,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         address: Address,
         block_ptr: BlockPtr,
     ) -> Result<alloy::primitives::U256, EthereumRpcError> {
+        let logger = self.provider_logger(logger);
         debug!(
             logger, "eth_getBalance";
             "address" => format!("{}", address),
@@ -1378,6 +1416,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         address: Address,
         block_ptr: BlockPtr,
     ) -> Result<alloy::primitives::Bytes, EthereumRpcError> {
+        let logger = self.provider_logger(logger);
         debug!(
             logger, "eth_getCode";
             "address" => format!("{}", address),
@@ -1403,7 +1442,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
                 .redact_log_urls(true)
                 .when(|res| !res.is_ok() && !detect_null_block(res))
                 .no_limit()
-                .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+                .timeout_secs(self.settings.json_rpc_timeout.as_secs())
                 .run(move || {
                     let alloy = alloy.cheap_clone();
                     async move {
@@ -1457,7 +1496,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         cache: Arc<dyn EthereumCallCache>,
     ) -> Result<Vec<(Option<Vec<abi::DynSolValue>>, call::Source)>, ContractCallError> {
         fn as_req(
-            logger: &Logger,
+            logger: &ProviderLogger,
             call: &ContractCall,
             index: u32,
         ) -> Result<call::Request, ContractCallError> {
@@ -1498,7 +1537,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         }
 
         fn decode(
-            logger: &Logger,
+            logger: &ProviderLogger,
             resp: call::Response,
             call: &ContractCall,
         ) -> (Option<Vec<abi::DynSolValue>>, call::Source) {
@@ -1528,20 +1567,33 @@ impl EthereumAdapterTrait for EthereumAdapter {
             }
         }
 
-        fn log_call_error(logger: &Logger, e: &ContractCallError, call: &ContractCall) {
+        fn log_call_error(logger: &ProviderLogger, e: &ContractCallError, call: &ContractCall) {
             match e {
-                ContractCallError::AlloyError(e) => error!(logger,
+                ContractCallError::AlloyError(e) => error!(
+                    logger,
                     "Ethereum node returned an error when calling function \"{}\" of contract \"{}\": {}",
-                    call.function.name, call.contract_name, e),
-                ContractCallError::Timeout => error!(logger,
+                    call.function.name,
+                    call.contract_name,
+                    e
+                ),
+                ContractCallError::Timeout => error!(
+                    logger,
                     "Ethereum node did not respond when calling function \"{}\" of contract \"{}\"",
-                    call.function.name, call.contract_name),
-                _ => error!(logger,
+                    call.function.name,
+                    call.contract_name
+                ),
+                _ => error!(
+                    logger,
                     "Failed to call function \"{}\" of contract \"{}\": {}",
-                    call.function.name, call.contract_name, e),
+                    call.function.name,
+                    call.contract_name,
+                    e
+                ),
             }
         }
 
+        let logger = self.provider_logger(logger);
+
         if calls.is_empty() {
             return Ok(Vec::new());
         }
@@ -1556,7 +1608,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
         let reqs: Vec<_> = calls
             .iter()
             .enumerate()
-            .map(|(index, call)| as_req(logger, call, index as u32))
+            .map(|(index, call)| as_req(&logger, call, index as u32))
             .collect::<Result<_, _>>()?;
 
         let (mut resps, missing) = cache
@@ -1567,12 +1619,13 @@ impl EthereumAdapterTrait for EthereumAdapter {
 
         let futs = missing.into_iter().map(|req| {
             let cache = cache.clone();
+            let logger = logger.clone();
             async move {
                 let call = calls[req.index as usize];
-                match self.call_and_cache(logger, call, req, cache.clone()).await {
+                match self.call_and_cache(&logger, call, req, cache.clone()).await {
                     Ok(resp) => Ok(resp),
                     Err(e) => {
-                        log_call_error(logger, &e, call);
+                        log_call_error(&logger, &e, call);
                         Err(e)
                     }
                 }
@@ -1590,7 +1643,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
             .into_iter()
             .map(|res| {
                 let call = &calls[res.req.index as usize];
-                decode(logger, res, call)
+                decode(&logger, res, call)
             })
             .collect();
 
@@ -1612,27 +1665,8 @@ impl EthereumAdapterTrait for EthereumAdapter {
             .await
             .map_err(|e| error!(&logger, "Error accessing block cache {}", e))
             .unwrap_or_default()
-            .into_iter()
-            .filter_map(|value| {
-                // recent_blocks_cache can contain full format {"block": {...}, "transaction_receipts": [...]}
-                // or light format (just block fields). Extract block data for deserialization.
-                let inner = value.get("block").unwrap_or(&value);
-                json::from_value(inner.clone())
-                    .map_err(|e| {
-                        let block_num = inner.get("number").and_then(|n| n.as_str());
-                        let block_hash = inner.get("hash").and_then(|h| h.as_str());
-                        warn!(
-                            &logger,
-                            "Failed to deserialize cached block #{:?} {:?}: {}. \
-                         Block will be re-fetched from RPC.",
-                            block_num,
-                            block_hash,
-                            e
-                        );
-                    })
-                    .ok()
-            })
-            .map(|b| Arc::new(LightEthereumBlock::new(b)))
+            .iter()
+            .map(|b| b.to_light_block())
             .collect();
 
         let missing_blocks = Vec::from_iter(
@@ -1693,6 +1727,7 @@ pub(crate) async fn blocks_with_triggers(
     // while searching for a trigger type, the entire operation fails.
     let eth = adapter.clone();
     let call_filter = EthereumCallFilter::from(&filter.block);
+    let logger = ProviderLogger::new(&logger, eth.provider());
 
     // Scan the block range to find relevant triggers
     let trigger_futs: FuturesUnordered<BoxFuture<Result<Vec<EthereumTrigger>, anyhow::Error>>> =
@@ -1708,8 +1743,9 @@ pub(crate) async fn blocks_with_triggers(
     // This is for `start` triggers which can be initialization handlers which needs to be run
     // before all other triggers
     if filter.block.trigger_every_block {
+        let logger = logger.clone();
         let block_future = eth
-            .block_range_to_ptrs(logger.clone(), from, to)
+            .block_range_to_ptrs((*logger).clone(), from, to)
             .map(move |ptrs| {
                 ptrs.into_iter()
                     .flat_map(|ptr| {
@@ -1725,7 +1761,7 @@ pub(crate) async fn blocks_with_triggers(
         trigger_futs.push(block_future)
     } else if !filter.block.polling_intervals.is_empty() {
         let block_futures_matching_once_filter =
-            eth.blocks_matching_polling_intervals(logger.clone(), from, to, &filter.block);
+            eth.blocks_matching_polling_intervals((*logger).clone(), from, to, &filter.block);
         trigger_futs.push(block_futures_matching_once_filter);
     }
 
@@ -1733,7 +1769,7 @@ pub(crate) async fn blocks_with_triggers(
     if !filter.log.is_empty() {
         let logs_future = get_logs_and_transactions(
             &eth,
-            &logger,
+            logger.clone(),
             subgraph_metrics.clone(),
             from,
             to,
@@ -1798,7 +1834,7 @@ pub(crate) async fn blocks_with_triggers(
     let logger2 = logger.cheap_clone();
 
     let blocks: Vec<_> = eth
-        .load_blocks(logger.cheap_clone(), chain_store.clone(), block_hashes)
+        .load_blocks((*logger).cheap_clone(), chain_store.clone(), block_hashes)
         .await?
         .into_iter()
         .map(
@@ -1901,31 +1937,36 @@ pub(crate) fn parse_log_triggers(
         return vec![];
     }
 
-    block
+    let total_logs: usize = block
         .transaction_receipts
         .iter()
-        .flat_map(move |receipt| {
-            receipt.logs().iter().enumerate().map(move |(index, log)| {
-                let requires_transaction_receipt = log
-                    .topics()
-                    .first()
-                    .map(|signature| {
-                        log_filter.requires_transaction_receipt(
-                            signature,
-                            Some(&log.address()),
-                            log.topics(),
-                        )
-                    })
-                    .unwrap_or(false);
+        .map(|r| r.logs().len())
+        .sum();
+    let mut triggers = Vec::with_capacity(total_logs);
+
+    for receipt in &block.transaction_receipts {
+        for (index, log) in receipt.logs().iter().enumerate() {
+            let requires_transaction_receipt = log
+                .topics()
+                .first()
+                .map(|signature| {
+                    log_filter.requires_transaction_receipt(
+                        signature,
+                        Some(&log.address()),
+                        log.topics(),
+                    )
+                })
+                .unwrap_or(false);
 
-                EthereumTrigger::Log(LogRef::LogPosition(LogPosition {
-                    index,
-                    receipt: receipt.cheap_clone(),
-                    requires_transaction_receipt,
-                }))
-            })
-        })
-        .collect()
+            triggers.push(EthereumTrigger::Log(LogRef::LogPosition(LogPosition {
+                index,
+                receipt: receipt.cheap_clone(),
+                requires_transaction_receipt,
+            })));
+        }
+    }
+
+    triggers
 }
 
 pub(crate) fn parse_call_triggers(
@@ -1953,6 +1994,36 @@ pub(crate) fn parse_call_triggers(
     }
 }
 
+/// For a given `block_number`, return the block trigger types that fire
+/// based on the rules in `polling_intervals`. Each entry is `(start_block,
+/// interval)` where `interval == 0` encodes a `once` rule and `interval > 0`
+/// encodes a `polling every interval` rule. Both rule kinds can fire at the
+/// same block (e.g. a once and polling rule sharing a `start_block`), so the
+/// returned Vec may contain `Start`, `End`, both, or neither.
+pub(crate) fn block_trigger_types_from_intervals(
+    block_number: i32,
+    polling_intervals: &HashSet<(i32, i32)>,
+) -> Vec<EthereumBlockTriggerType> {
+    let has_once_trigger = polling_intervals
+        .iter()
+        .any(|(start_block, interval)| *interval == 0 && block_number == *start_block);
+
+    let has_polling_trigger = polling_intervals.iter().any(|(start_block, interval)| {
+        *interval > 0
+            && block_number >= *start_block
+            && (block_number - start_block) % *interval == 0
+    });
+
+    let mut triggers = Vec::new();
+    if has_once_trigger {
+        triggers.push(EthereumBlockTriggerType::Start);
+    }
+    if has_polling_trigger {
+        triggers.push(EthereumBlockTriggerType::End);
+    }
+    triggers
+}
+
 /// This method does not parse block triggers with `once` filters.
 /// This is because it is to be run before any other triggers are run.
 /// So we have `parse_initialization_triggers` for that.
@@ -1994,38 +2065,12 @@ pub(crate) fn parse_block_triggers(
             EthereumBlockTriggerType::End,
         ));
     } else if !block_filter.polling_intervals.is_empty() {
-        let has_polling_trigger =
-            &block_filter
-                .polling_intervals
-                .iter()
-                .any(|(start_block, interval)| match interval {
-                    0 => false,
-                    _ => {
-                        block_number >= *start_block
-                            && (block_number - *start_block) % *interval == 0
-                    }
-                });
-
-        let has_once_trigger =
-            &block_filter
-                .polling_intervals
-                .iter()
-                .any(|(start_block, interval)| match interval {
-                    0 => block_number == *start_block,
-                    _ => false,
-                });
-
-        if *has_once_trigger {
-            triggers.push(EthereumTrigger::Block(
-                block_ptr3.clone(),
-                EthereumBlockTriggerType::Start,
-            ));
-        }
-
-        if *has_polling_trigger {
+        for trigger_type in
+            block_trigger_types_from_intervals(block_number, &block_filter.polling_intervals)
+        {
             triggers.push(EthereumTrigger::Block(
-                block_ptr3,
-                EthereumBlockTriggerType::End,
+                block_ptr3.cheap_clone(),
+                trigger_type,
             ));
         }
     }
@@ -2035,7 +2080,7 @@ pub(crate) fn parse_block_triggers(
 async fn fetch_receipt_from_ethereum_client(
     eth: &EthereumAdapter,
     transaction_hash: B256,
-) -> anyhow::Result<alloy::network::AnyTransactionReceipt> {
+) -> anyhow::Result<AnyTransactionReceiptBare> {
     match eth.alloy.get_transaction_receipt(transaction_hash).await {
         Ok(Some(receipt)) => Ok(receipt),
         Ok(None) => bail!("Could not find transaction receipt"),
@@ -2047,7 +2092,7 @@ async fn filter_call_triggers_from_unsuccessful_transactions(
     mut block: BlockWithTriggers<crate::Chain>,
     eth: &EthereumAdapter,
     chain_store: &Arc<dyn ChainStore>,
-    logger: &Logger,
+    logger: &ProviderLogger,
 ) -> anyhow::Result<BlockWithTriggers<crate::Chain>> {
     // Return early if there is no trigger data
     if block.trigger_data.is_empty() {
@@ -2077,7 +2122,7 @@ async fn filter_call_triggers_from_unsuccessful_transactions(
     // And obtain all Transaction values for the calls in this block.
     let transactions: Vec<&AnyTransaction> = {
         match &block.block {
-            BlockFinality::Final(ref block) => block
+            BlockFinality::Final(block) => block
                 .transactions()
                 .ok_or_else(|| anyhow!("Block transactions not available"))?
                 .iter()
@@ -2187,17 +2232,18 @@ async fn fetch_transaction_receipts_in_batch_with_retry(
     alloy: Arc<AlloyProvider>,
     hashes: Vec<B256>,
     block_hash: B256,
-    logger: Logger,
-) -> Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError> {
+    logger: ProviderLogger,
+    settings: &ChainSettings,
+) -> Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError> {
     let retry_log_message = format!(
         "batch eth_getTransactionReceipt RPC call for block {:?}",
         block_hash
     );
     retry(retry_log_message, &logger)
         .redact_log_urls(true)
-        .limit(ENV_VARS.request_retries)
+        .limit(settings.request_retries)
         .no_logging()
-        .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+        .timeout_secs(settings.json_rpc_timeout.as_secs())
         .run(move || {
             let alloy = alloy.cheap_clone();
             let hashes = hashes.clone();
@@ -2213,8 +2259,8 @@ async fn fetch_transaction_receipts_in_batch(
     alloy: Arc<AlloyProvider>,
     hashes: Vec<B256>,
     block_hash: B256,
-    logger: Logger,
-) -> Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError> {
+    logger: ProviderLogger,
+) -> Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError> {
     // Use the batch method to get all receipts at once
     let receipts = batch_get_transaction_receipts(alloy, hashes.clone())
         .await
@@ -2243,17 +2289,16 @@ async fn fetch_transaction_receipts_in_batch(
 async fn batch_get_transaction_receipts(
     provider: Arc<AlloyProvider>,
     tx_hashes: Vec<B256>,
-) -> Result<Vec<Option<alloy::network::AnyTransactionReceipt>>, Box<dyn std::error::Error>> {
+) -> Result<Vec<Option<AnyTransactionReceiptBare>>, Box<dyn std::error::Error>> {
     let mut batch = alloy::rpc::client::BatchRequest::new(provider.client());
     let mut receipt_futures = Vec::new();
 
     // Add all receipt requests to batch
     for tx_hash in &tx_hashes {
-        let receipt_future = batch
-            .add_call::<(B256,), Option<alloy::network::AnyTransactionReceipt>>(
-                "eth_getTransactionReceipt",
-                &(*tx_hash,),
-            )?;
+        let receipt_future = batch.add_call::<(B256,), Option<AnyTransactionReceiptBare>>(
+            "eth_getTransactionReceipt",
+            &(*tx_hash,),
+        )?;
         receipt_futures.push(receipt_future);
     }
 
@@ -2303,13 +2348,14 @@ async fn fetch_receipts_with_retry(
     alloy: Arc<AlloyProvider>,
     hashes: Vec<B256>,
     block_hash: B256,
-    logger: Logger,
+    logger: ProviderLogger,
     supports_block_receipts: bool,
-) -> Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError> {
+    settings: &ChainSettings,
+) -> Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError> {
     if supports_block_receipts {
-        return fetch_block_receipts_with_retry(alloy, hashes, block_hash, logger).await;
+        return fetch_block_receipts_with_retry(alloy, hashes, block_hash, logger, settings).await;
     }
-    fetch_individual_receipts_with_retry(alloy, hashes, block_hash, logger).await
+    fetch_individual_receipts_with_retry(alloy, hashes, block_hash, logger, settings).await
 }
 
 // Fetches receipts for each transaction in the block individually.
@@ -2317,13 +2363,20 @@ async fn fetch_individual_receipts_with_retry(
     alloy: Arc<AlloyProvider>,
     hashes: Vec<B256>,
     block_hash: B256,
-    logger: Logger,
-) -> Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError> {
+    logger: ProviderLogger,
+    settings: &ChainSettings,
+) -> Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError> {
     if ENV_VARS.fetch_receipts_in_batches {
-        return fetch_transaction_receipts_in_batch_with_retry(alloy, hashes, block_hash, logger)
-            .await;
+        return fetch_transaction_receipts_in_batch_with_retry(
+            alloy, hashes, block_hash, logger, settings,
+        )
+        .await;
     }
 
+    let request_retries = settings.request_retries;
+    let json_rpc_timeout = settings.json_rpc_timeout;
+    let concurrent_requests = settings.block_ingestor_max_concurrent_json_rpc_calls;
+
     // Use a stream to fetch receipts individually
     let hash_stream = tokio_stream::iter(hashes);
     let receipt_stream = hash_stream
@@ -2333,13 +2386,15 @@ async fn fetch_individual_receipts_with_retry(
                 tx_hash,
                 block_hash,
                 logger.cheap_clone(),
+                request_retries,
+                json_rpc_timeout,
             )
         })
-        .buffered(ENV_VARS.block_ingestor_max_concurrent_json_rpc_calls);
+        .buffered(concurrent_requests);
 
-    tokio_stream::StreamExt::collect::<
-        Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError>,
-    >(receipt_stream)
+    tokio_stream::StreamExt::collect::<Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError>>(
+        receipt_stream,
+    )
     .await
 }
 
@@ -2348,17 +2403,17 @@ async fn fetch_block_receipts_with_retry(
     alloy: Arc<AlloyProvider>,
     hashes: Vec<B256>,
     block_hash: B256,
-    logger: Logger,
-) -> Result<Vec<Arc<alloy::network::AnyTransactionReceipt>>, IngestorError> {
+    logger: ProviderLogger,
+    settings: &ChainSettings,
+) -> Result<Vec<Arc<AnyTransactionReceiptBare>>, IngestorError> {
     use graph::prelude::alloy::rpc::types::BlockId;
-    let logger = logger.cheap_clone();
     let retry_log_message = format!("eth_getBlockReceipts RPC call for block {:?}", block_hash);
 
     // Perform the retry operation
     let receipts_option = retry(retry_log_message, &logger)
         .redact_log_urls(true)
-        .limit(ENV_VARS.request_retries)
-        .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+        .limit(settings.request_retries)
+        .timeout_secs(settings.json_rpc_timeout.as_secs())
         .run(move || alloy.get_block_receipts(BlockId::from(block_hash)).boxed())
         .await
         .map_err(|_timeout| -> IngestorError { anyhow!(block_hash).into() })?;
@@ -2393,9 +2448,10 @@ async fn fetch_transaction_receipt_with_retry(
     alloy: Arc<AlloyProvider>,
     transaction_hash: B256,
     block_hash: B256,
-    logger: Logger,
-) -> Result<Arc<alloy::network::AnyTransactionReceipt>, IngestorError> {
-    let logger = logger.cheap_clone();
+    logger: ProviderLogger,
+    request_retries: usize,
+    json_rpc_timeout: Duration,
+) -> Result<Arc<AnyTransactionReceiptBare>, IngestorError> {
     let retry_log_message = format!(
         "eth_getTransactionReceipt RPC call for transaction {:?}",
         transaction_hash
@@ -2403,8 +2459,8 @@ async fn fetch_transaction_receipt_with_retry(
 
     retry(retry_log_message, &logger)
         .redact_log_urls(true)
-        .limit(ENV_VARS.request_retries)
-        .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
+        .limit(request_retries)
+        .timeout_secs(json_rpc_timeout.as_secs())
         .run(move || {
             let alloy_clone = alloy.clone();
             async move { alloy_clone.get_transaction_receipt(transaction_hash).await }.boxed()
@@ -2418,11 +2474,11 @@ async fn fetch_transaction_receipt_with_retry(
 }
 
 fn resolve_transaction_receipt(
-    transaction_receipt: Option<alloy::network::AnyTransactionReceipt>,
+    transaction_receipt: Option<AnyTransactionReceiptBare>,
     transaction_hash: B256,
     block_hash: B256,
-    logger: Logger,
-) -> Result<alloy::network::AnyTransactionReceipt, IngestorError> {
+    logger: ProviderLogger,
+) -> Result<AnyTransactionReceiptBare, IngestorError> {
     match transaction_receipt {
         // A receipt might be missing because the block was uncled, and the transaction never
         // made it back into the main chain.
@@ -2475,7 +2531,7 @@ fn resolve_transaction_receipt(
 /// Retrieves logs and the associated transaction receipts, if required by the [`EthereumLogFilter`].
 async fn get_logs_and_transactions(
     adapter: &Arc<EthereumAdapter>,
-    logger: &Logger,
+    logger: ProviderLogger,
     subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
     from: BlockNumber,
     to: BlockNumber,
@@ -2485,7 +2541,7 @@ async fn get_logs_and_transactions(
     // Obtain logs externally
     let logs = adapter
         .logs_in_block_range(
-            logger,
+            &logger,
             subgraph_metrics.cheap_clone(),
             from,
             to,
@@ -2554,12 +2610,11 @@ async fn get_transaction_receipts_for_transaction_hashes(
     adapter: &EthereumAdapter,
     transaction_hashes_by_block: &HashMap<B256, HashSet<B256>>,
     subgraph_metrics: Arc<SubgraphEthRpcMetrics>,
-    logger: Logger,
-) -> Result<HashMap<B256, Arc<alloy::network::AnyTransactionReceipt>>, anyhow::Error> {
+    logger: ProviderLogger,
+) -> Result<HashMap<B256, Arc<AnyTransactionReceiptBare>>, anyhow::Error> {
     use std::collections::hash_map::Entry::Vacant;
 
-    let mut receipts_by_hash: HashMap<B256, Arc<alloy::network::AnyTransactionReceipt>> =
-        HashMap::new();
+    let mut receipts_by_hash: HashMap<B256, Arc<AnyTransactionReceiptBare>> = HashMap::new();
 
     // Return early if input set is empty
     if transaction_hashes_by_block.is_empty() {
@@ -2582,6 +2637,8 @@ async fn get_transaction_receipts_for_transaction_hashes(
                 *transaction_hash,
                 *block_hash,
                 logger.cheap_clone(),
+                adapter.settings.request_retries,
+                adapter.settings.json_rpc_timeout,
             );
             receipt_futures.push(receipt_future)
         }
@@ -2636,16 +2693,15 @@ mod tests {
     use crate::trigger::{EthereumBlockTriggerType, EthereumTrigger};
 
     use super::{
-        check_block_receipt_support, parse_block_triggers, EthereumBlock, EthereumBlockFilter,
-        EthereumBlockWithCalls,
+        EthereumBlock, EthereumBlockFilter, EthereumBlockWithCalls,
+        block_trigger_types_from_intervals, check_block_receipt_support, parse_block_triggers,
     };
     use graph::blockchain::BlockPtr;
-    use graph::components::ethereum::AnyBlock;
-    use graph::prelude::alloy::network::AnyNetwork;
-    use graph::prelude::alloy::primitives::{Address, Bytes, B256};
-    use graph::prelude::alloy::providers::mock::Asserter;
+    use graph::components::ethereum::AnyNetworkBare;
+    use graph::prelude::alloy::primitives::{Address, B256, Bytes};
     use graph::prelude::alloy::providers::ProviderBuilder;
-    use graph::prelude::{create_minimal_block_for_test, EthereumCall, LightEthereumBlock};
+    use graph::prelude::alloy::providers::mock::Asserter;
+    use graph::prelude::{EthereumCall, LightEthereumBlock, create_minimal_block_for_test};
     use jsonrpc_core::serde_json::{self, Value};
     use std::collections::HashSet;
     use std::iter::FromIterator;
@@ -2657,7 +2713,7 @@ mod tests {
 
         let block = EthereumBlockWithCalls {
             ethereum_block: EthereumBlock {
-                block: Arc::new(LightEthereumBlock::new(AnyBlock::from(block))),
+                block: Arc::new(LightEthereumBlock::new(block)),
                 ..Default::default()
             },
             calls: Some(vec![EthereumCall {
@@ -2718,9 +2774,8 @@ mod tests {
             let json_value: Value = serde_json::from_str(json_response).unwrap();
 
             let asserter = Asserter::new();
-            let provider = ProviderBuilder::<_, _, AnyNetwork>::default()
-                .network::<AnyNetwork>()
-                .with_recommended_fillers()
+            let provider = ProviderBuilder::<_, _, AnyNetworkBare>::default()
+                .network::<AnyNetworkBare>()
                 .connect_mocked_client(asserter.clone());
 
             asserter.push_success(&json_value);
@@ -2802,7 +2857,7 @@ mod tests {
         #[allow(unreachable_code)]
         let block = EthereumBlockWithCalls {
             ethereum_block: EthereumBlock {
-                block: Arc::new(LightEthereumBlock::new(AnyBlock::from(block))),
+                block: Arc::new(LightEthereumBlock::new(block)),
                 ..Default::default()
             },
             calls: Some(vec![EthereumCall {
@@ -2833,7 +2888,7 @@ mod tests {
         #[allow(unreachable_code)]
         let block = EthereumBlockWithCalls {
             ethereum_block: EthereumBlock {
-                block: Arc::new(LightEthereumBlock::new(AnyBlock::from(block))),
+                block: Arc::new(LightEthereumBlock::new(block)),
                 ..Default::default()
             },
             calls: Some(vec![EthereumCall {
@@ -2860,6 +2915,115 @@ mod tests {
         );
     }
 
+    #[test]
+    fn block_trigger_types_once_only() {
+        let intervals = HashSet::from_iter(vec![(100, 0)]);
+
+        assert_eq!(
+            vec![EthereumBlockTriggerType::Start],
+            block_trigger_types_from_intervals(100, &intervals),
+            "once rule fires Start at start_block"
+        );
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(99, &intervals),
+            "once rule does not fire before start_block"
+        );
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(101, &intervals),
+            "once rule does not fire after start_block"
+        );
+    }
+
+    #[test]
+    fn block_trigger_types_polling_only() {
+        let intervals = HashSet::from_iter(vec![(100, 10)]);
+
+        assert_eq!(
+            vec![EthereumBlockTriggerType::End],
+            block_trigger_types_from_intervals(100, &intervals),
+            "polling rule fires End at start_block"
+        );
+        assert_eq!(
+            vec![EthereumBlockTriggerType::End],
+            block_trigger_types_from_intervals(110, &intervals),
+            "polling rule fires End at start_block + interval"
+        );
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(105, &intervals),
+            "polling rule does not fire off-interval"
+        );
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(90, &intervals),
+            "polling rule does not fire before start_block"
+        );
+    }
+
+    #[test]
+    fn block_trigger_types_once_and_polling_same_start_block() {
+        // A single data source with both a `once` handler and a `polling` handler
+        // contributes both entries at its start_block. Both must fire at start_block.
+        let intervals = HashSet::from_iter(vec![(100, 0), (100, 10)]);
+
+        assert_eq!(
+            vec![
+                EthereumBlockTriggerType::Start,
+                EthereumBlockTriggerType::End,
+            ],
+            block_trigger_types_from_intervals(100, &intervals),
+            "both Start and End should fire when once and polling rules share start_block"
+        );
+        assert_eq!(
+            vec![EthereumBlockTriggerType::End],
+            block_trigger_types_from_intervals(110, &intervals),
+            "only polling fires at later interval matches"
+        );
+    }
+
+    #[test]
+    fn block_trigger_types_cross_datasource_collision() {
+        // Two data sources: DS-A with once at 100, DS-B with polling every 10 from 50.
+        // Block 100 satisfies DS-A's once rule and also (100-50) % 10 == 0, so both fire.
+        let intervals = HashSet::from_iter(vec![(100, 0), (50, 10)]);
+
+        assert_eq!(
+            vec![
+                EthereumBlockTriggerType::Start,
+                EthereumBlockTriggerType::End,
+            ],
+            block_trigger_types_from_intervals(100, &intervals),
+            "both triggers fire when a once rule and an unrelated polling rule collide"
+        );
+        assert_eq!(
+            vec![EthereumBlockTriggerType::End],
+            block_trigger_types_from_intervals(60, &intervals),
+            "only polling fires at a block where only the polling rule matches"
+        );
+    }
+
+    #[test]
+    fn block_trigger_types_no_match() {
+        let intervals = HashSet::from_iter(vec![(100, 0), (100, 10)]);
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(99, &intervals),
+            "no triggers when block matches neither rule"
+        );
+    }
+
+    #[test]
+    fn block_trigger_types_empty_intervals() {
+        let intervals: HashSet<(i32, i32)> = HashSet::new();
+        assert_eq!(
+            Vec::<EthereumBlockTriggerType>::new(),
+            block_trigger_types_from_intervals(100, &intervals),
+            "empty intervals yields no triggers"
+        );
+    }
+
     fn address(id: u64) -> Address {
         Address::left_padding_from(&id.to_be_bytes())
     }
diff --git a/chain/ethereum/src/ingestor.rs b/chain/ethereum/src/ingestor.rs
index 9e7a8c01725..dcbcc42c6f8 100644
--- a/chain/ethereum/src/ingestor.rs
+++ b/chain/ethereum/src/ingestor.rs
@@ -1,8 +1,9 @@
-use crate::{chain::BlockFinality, ENV_VARS};
+use crate::{ENV_VARS, chain::BlockFinality};
 use crate::{EthereumAdapter, EthereumAdapterTrait as _};
 use async_trait::async_trait;
-use graph::blockchain::client::ChainClient;
+use futures::future::select_ok;
 use graph::blockchain::BlockchainKind;
+use graph::blockchain::client::ChainClient;
 use graph::components::network_provider::ChainName;
 use graph::prelude::alloy::primitives::B256;
 use graph::slog::o;
@@ -11,7 +12,8 @@ use graph::{
     blockchain::{BlockHash, BlockIngestor, BlockPtr, IngestorError},
     cheap_clone::CheapClone,
     prelude::{
-        error, info, tokio, trace, warn, ChainStore, Error, EthereumBlockWithCalls, LogCode, Logger,
+        ChainStore, Error, EthereumBlockWithCalls, LogCode, Logger, debug, error, info, tokio,
+        trace, warn,
     },
 };
 use std::{sync::Arc, time::Duration};
@@ -213,12 +215,111 @@ impl PollingBlockIngestor {
         eth_adapter.latest_block_ptr(logger).await
     }
 
-    async fn eth_adapter(&self) -> anyhow::Result<Arc<EthereumAdapter>> {
-        self.chain_client
-            .rpc()?
-            .cheapest()
-            .await
-            .ok_or_else(|| graph::anyhow::anyhow!("unable to get eth adapter"))
+    /// Executes one polling iteration. On failure delegates to `on_poll_failure` for
+    /// probe+switch logic.
+    async fn poll_once(
+        &self,
+        providers: &[Arc<EthereumAdapter>],
+        current_provider: &mut Option<String>,
+    ) {
+        // Resolve by name; resets to first provider if the tracked one left the list.
+        let eth_adapter = resolve_provider(providers, current_provider, &self.logger).clone();
+        // Pin the name so the next iteration knows which provider is active.
+        let provider_name = eth_adapter.provider().to_string();
+        let logger = self.logger.new(o!("provider" => provider_name.clone()));
+        *current_provider = Some(provider_name);
+
+        if let Err(err) = self.do_poll(&logger, eth_adapter).await {
+            error!(logger, "Trying again after block polling failed: {}", err);
+            on_poll_failure(providers, current_provider, &self.logger).await;
+        }
+    }
+}
+
+/// Returns the currently-tracked provider from `providers`.
+///
+/// If the tracked provider is no longer in the list (it became invalid and was removed by
+/// `ProviderManager`), logs a warning, resets the state, and returns the first available
+/// provider.
+fn resolve_provider<'a, A: crate::EthereumAdapterTrait>(
+    providers: &'a [Arc<A>],
+    current_provider: &mut Option<String>,
+    logger: &Logger,
+) -> &'a Arc<A> {
+    if let Some(name) = current_provider.as_ref() {
+        if let Some(found) = providers.iter().find(|p| p.provider() == name) {
+            return found;
+        }
+        warn!(
+            logger,
+            "Current RPC provider is no longer available, resetting to first provider";
+            "provider" => name,
+        );
+        *current_provider = None;
+    }
+    &providers[0]
+}
+
+async fn on_poll_failure<A: crate::EthereumAdapterTrait>(
+    providers: &[Arc<A>],
+    current_provider: &mut Option<String>,
+    logger: &Logger,
+) {
+    if providers.len() <= 1 {
+        return;
+    }
+
+    let current_name = match current_provider.as_ref() {
+        Some(name) => name.clone(),
+        None => return,
+    };
+
+    // Probe the current provider before trying alternatives. do_poll() can fail for
+    // reasons unrelated to RPC availability (e.g. DB errors from chain_head_ptr or
+    // attempt_chain_head_update, or a BlockUnavailable from a chain reorg). All of
+    // these surface as IngestorError::Unknown, indistinguishable from an RPC failure
+    // at the match level. If the current provider responds to eth_blockNumber, the
+    // failure was not caused by provider unavailability — switching cannot help.
+    let current = providers.iter().find(|p| p.provider() == current_name);
+    if let Some(current) = current
+        && current.is_reachable().await
+    {
+        return;
+    }
+
+    // Probe all alternatives in parallel; switch to the first that responds.
+    let futs = providers
+        .iter()
+        .filter(|p| p.provider() != current_name)
+        .map(|p| {
+            let name = p.provider().to_string();
+            debug!(logger, "Trying RPC provider"; "provider" => &name);
+            Box::pin(async move {
+                if p.is_reachable().await {
+                    Ok(name)
+                } else {
+                    Err(())
+                }
+            })
+        });
+
+    match select_ok(futs).await {
+        Ok((next_name, _)) => {
+            warn!(
+                logger,
+                "Switching RPC provider for block ingestor";
+                "from" => &current_name,
+                "to" => &next_name,
+            );
+            *current_provider = Some(next_name);
+        }
+        Err(_) => {
+            warn!(
+                logger,
+                "All RPC providers unreachable, continuing on current provider";
+                "provider" => &current_name,
+            );
+        }
     }
 }
 
@@ -227,33 +328,28 @@ impl BlockIngestor for PollingBlockIngestor {
     async fn run(self: Box<Self>) {
         let mut backoff =
             ExponentialBackoff::new(Duration::from_millis(250), Duration::from_secs(30));
+        // Name of the provider currently in use. `None` until the first poll.
+        let mut current_provider: Option<String> = None;
 
         loop {
-            let eth_adapter = match self.eth_adapter().await {
-                Ok(adapter) => {
-                    backoff.reset();
-                    adapter
-                }
-                Err(err) => {
-                    error!(
-                        &self.logger,
-                        "unable to get ethereum adapter, backing off... error: {}",
-                        err.to_string()
-                    );
-                    backoff.sleep_async().await;
-                    continue;
-                }
-            };
-            let logger = self
-                .logger
-                .new(o!("provider" => eth_adapter.provider().to_string()));
+            let providers = self
+                .chain_client
+                .rpc()
+                .expect("PollingBlockIngestor is only created for RPC chains")
+                .all_cheapest()
+                .await;
 
-            if let Err(err) = self.do_poll(&logger, eth_adapter).await {
-                error!(logger, "Trying again after block polling failed: {}", err);
+            if providers.is_empty() {
+                error!(self.logger, "No RPC providers available for block ingestor");
+                backoff.sleep_async().await;
+                continue;
             }
+            backoff.reset();
+
+            self.poll_once(&providers, &mut current_provider).await;
 
             if ENV_VARS.cleanup_blocks {
-                self.cleanup_cached_blocks().await
+                self.cleanup_cached_blocks().await;
             }
 
             tokio::time::sleep(self.polling_interval).await;
@@ -268,3 +364,266 @@ impl BlockIngestor for PollingBlockIngestor {
         BlockchainKind::Ethereum
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::on_poll_failure;
+    use super::*;
+    use crate::adapter::{
+        ContractCallError, EthereumAdapter as EthereumAdapterTrait, EthereumRpcError,
+    };
+    use async_trait::async_trait;
+    use graph::blockchain::{BlockPtr, ChainIdentifier};
+    use graph::components::ethereum::AnyBlock;
+    use graph::components::ethereum::LightEthereumBlock;
+    use graph::data::store::ethereum::call;
+    use graph::data_source::common::ContractCall;
+    use graph::prelude::alloy::primitives::{Address, B256, Bytes, U256};
+    use graph::prelude::{BlockNumber, Error, EthereumCallCache, Logger};
+    use graph::slog::Discard;
+    use std::collections::HashSet;
+    use std::sync::Arc;
+
+    struct MockEthAdapter {
+        provider_name: String,
+        reachable: bool,
+    }
+
+    impl MockEthAdapter {
+        fn new(name: &str, reachable: bool) -> Arc<Self> {
+            Arc::new(Self {
+                provider_name: name.to_string(),
+                reachable,
+            })
+        }
+    }
+
+    #[async_trait]
+    impl EthereumAdapterTrait for MockEthAdapter {
+        fn provider(&self) -> &str {
+            &self.provider_name
+        }
+
+        async fn is_reachable(&self) -> bool {
+            self.reachable
+        }
+
+        async fn net_identifiers(&self) -> Result<ChainIdentifier, Error> {
+            unimplemented!()
+        }
+        async fn latest_block_ptr(
+            &self,
+            _: &Logger,
+        ) -> Result<BlockPtr, graph::blockchain::IngestorError> {
+            unimplemented!()
+        }
+        async fn load_blocks(
+            &self,
+            _: Logger,
+            _: Arc<dyn graph::prelude::ChainStore>,
+            _: HashSet<B256>,
+        ) -> Result<Vec<Arc<LightEthereumBlock>>, Error> {
+            unimplemented!()
+        }
+        async fn block_by_hash(&self, _: &Logger, _: B256) -> Result<Option<AnyBlock>, Error> {
+            unimplemented!()
+        }
+        async fn block_by_number(
+            &self,
+            _: &Logger,
+            _: BlockNumber,
+        ) -> Result<Option<AnyBlock>, Error> {
+            unimplemented!()
+        }
+        async fn load_full_block(
+            &self,
+            _: &Logger,
+            _: AnyBlock,
+        ) -> Result<graph::prelude::EthereumBlock, graph::blockchain::IngestorError> {
+            unimplemented!()
+        }
+        async fn next_existing_ptr_to_number(
+            &self,
+            _: &Logger,
+            _: BlockNumber,
+        ) -> Result<BlockPtr, Error> {
+            unimplemented!()
+        }
+        async fn contract_call(
+            &self,
+            _: &Logger,
+            _: &ContractCall,
+            _: Arc<dyn EthereumCallCache>,
+        ) -> Result<(Option<Vec<graph::abi::DynSolValue>>, call::Source), ContractCallError>
+        {
+            unimplemented!()
+        }
+        async fn contract_calls(
+            &self,
+            _: &Logger,
+            _: &[&ContractCall],
+            _: Arc<dyn EthereumCallCache>,
+        ) -> Result<Vec<(Option<Vec<graph::abi::DynSolValue>>, call::Source)>, ContractCallError>
+        {
+            unimplemented!()
+        }
+        async fn get_balance(
+            &self,
+            _: &Logger,
+            _: Address,
+            _: BlockPtr,
+        ) -> Result<U256, EthereumRpcError> {
+            unimplemented!()
+        }
+        async fn get_code(
+            &self,
+            _: &Logger,
+            _: Address,
+            _: BlockPtr,
+        ) -> Result<Bytes, EthereumRpcError> {
+            unimplemented!()
+        }
+    }
+
+    fn discard_logger() -> Logger {
+        Logger::root(Discard, o!())
+    }
+
+    #[test]
+    fn test_current_provider_unavailable_resets_to_first() {
+        // p0 left the validated list; only p1 and p2 remain (p1 is now at index 0).
+        let providers: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p1", true),
+            MockEthAdapter::new("p2", true),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        let resolved = resolve_provider(&providers, &mut current_provider, &discard_logger());
+        assert_eq!(resolved.provider(), "p1");
+        assert_eq!(current_provider, None);
+    }
+
+    #[tokio::test]
+    async fn test_current_reachable_no_switch() {
+        // Current provider is reachable: on_poll_failure should return early without
+        // switching, even if alternatives are also reachable.
+        let providers: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", true),
+            MockEthAdapter::new("p1", true),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers, &mut current_provider, &discard_logger()).await;
+        assert_eq!(current_provider, Some("p0".to_string()));
+    }
+
+    #[tokio::test]
+    async fn test_successful_probe_switches_provider() {
+        let providers: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", false),
+            MockEthAdapter::new("p1", true),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers, &mut current_provider, &discard_logger()).await;
+        assert_eq!(current_provider, Some("p1".to_string()));
+    }
+
+    #[tokio::test]
+    async fn test_all_unreachable_stays_on_current() {
+        let providers: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", false),
+            MockEthAdapter::new("p1", false),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers, &mut current_provider, &discard_logger()).await;
+        assert_eq!(current_provider, Some("p0".to_string()));
+    }
+
+    #[tokio::test]
+    async fn test_single_provider_no_switch() {
+        let providers: Vec<Arc<MockEthAdapter>> = vec![MockEthAdapter::new("p0", true)];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers, &mut current_provider, &discard_logger()).await;
+        assert_eq!(current_provider, Some("p0".to_string()));
+    }
+
+    // --- Provider-list churn tests ---
+    //
+    // These tests simulate the state carried across loop iterations where
+    // all_cheapest() returns a different subset each time.
+
+    /// Current provider survives a list shrink; its index shifts but identity is preserved.
+    ///
+    /// Before: [p0, p1, p2], active = p1 (index 1)
+    /// After:  [p1, p2],     active = p1 (index 0)
+    ///
+    /// With index-based tracking this would silently move to p2. Name-based tracking
+    /// must keep us on p1.
+    #[test]
+    fn test_list_shrinks_current_provider_index_remaps() {
+        let providers: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p1", true),
+            MockEthAdapter::new("p2", true),
+        ];
+        let mut current_provider = Some("p1".to_string());
+        let resolved = resolve_provider(&providers, &mut current_provider, &discard_logger());
+        // p1 is now at index 0 — must not drift to p2
+        assert_eq!(resolved.provider(), "p1");
+        assert_eq!(current_provider, Some("p1".to_string()));
+    }
+
+    /// After failing over to p1, p1 itself disappears from the validated list in the
+    /// next iteration. The ingestor must fall back to the first available provider (p0).
+    ///
+    /// Iteration 1: [p0(unreachable), p1(reachable)] — p0 fails, switch to p1
+    /// Iteration 2: [p0(reachable), p2(reachable)]   — p1 gone, reset to p0
+    #[tokio::test]
+    async fn test_failover_target_then_disappears_resets_to_first() {
+        let logger = discard_logger();
+
+        // Iteration 1: p0 fails, switch to p1.
+        let providers_iter1: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", false),
+            MockEthAdapter::new("p1", true),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers_iter1, &mut current_provider, &logger).await;
+        assert_eq!(current_provider, Some("p1".to_string()));
+
+        // Iteration 2: p1 has dropped from the validated list.
+        let providers_iter2: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", true),
+            MockEthAdapter::new("p2", true),
+        ];
+        let resolved = resolve_provider(&providers_iter2, &mut current_provider, &logger);
+        assert_eq!(resolved.provider(), "p0"); // reset to first
+        assert_eq!(current_provider, None);
+    }
+
+    /// After failing over to p1, the original provider p0 reappears in the list.
+    /// The ingestor must stay on p1 — there is no proactive return to p0.
+    ///
+    /// Iteration 1: [p0(unreachable), p1(reachable)] — switch to p1
+    /// Iteration 2: [p0(reachable), p1(reachable)]   — p0 is back; must stay on p1
+    #[tokio::test]
+    async fn test_original_provider_reappears_no_involuntary_return() {
+        let logger = discard_logger();
+
+        // Iteration 1: switch to p1.
+        let providers_iter1: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", false),
+            MockEthAdapter::new("p1", true),
+        ];
+        let mut current_provider = Some("p0".to_string());
+        on_poll_failure(&providers_iter1, &mut current_provider, &logger).await;
+        assert_eq!(current_provider, Some("p1".to_string()));
+
+        // Iteration 2: p0 is back in the validated list alongside p1.
+        let providers_iter2: Vec<Arc<MockEthAdapter>> = vec![
+            MockEthAdapter::new("p0", true),
+            MockEthAdapter::new("p1", true),
+        ];
+        let resolved = resolve_provider(&providers_iter2, &mut current_provider, &logger);
+        // Must resolve to p1, not drift back to p0.
+        assert_eq!(resolved.provider(), "p1");
+        assert_eq!(current_provider, Some("p1".to_string()));
+    }
+}
diff --git a/chain/ethereum/src/lib.rs b/chain/ethereum/src/lib.rs
index 8850764d63b..b21eb4717ae 100644
--- a/chain/ethereum/src/lib.rs
+++ b/chain/ethereum/src/lib.rs
@@ -14,14 +14,16 @@ mod transport;
 pub use self::capabilities::NodeCapabilities;
 pub use self::ethereum_adapter::EthereumAdapter;
 pub use self::runtime::RuntimeAdapter;
-pub use self::transport::Transport;
+pub use self::transport::{Compression, Transport};
 pub use env::ENV_VARS;
 
 pub use buffered_call_cache::BufferedCallCache;
 
 // ETHDEP: These concrete types should probably not be exposed.
 pub use data_source::{
-    BlockHandlerFilter, DataSource, DataSourceTemplate, Mapping, TemplateSource,
+    BlockHandlerFilter, DataSource, DataSourceTemplate, Mapping, MappingBlockHandler,
+    MappingCallHandler, TemplateSource, UnresolvedDataSource, UnresolvedDataSourceTemplate,
+    UnresolvedMapping, UnresolvedMappingEventHandler,
 };
 
 pub mod chain;
diff --git a/chain/ethereum/src/network.rs b/chain/ethereum/src/network.rs
index 536f7a8a54d..ad9cd0a83c0 100644
--- a/chain/ethereum/src/network.rs
+++ b/chain/ethereum/src/network.rs
@@ -15,9 +15,9 @@ use std::sync::Arc;
 pub use graph::impl_slog_value;
 use graph::prelude::Error;
 
+use crate::EthereumAdapter;
 use crate::adapter::EthereumAdapter as _;
 use crate::capabilities::NodeCapabilities;
-use crate::EthereumAdapter;
 
 pub const DEFAULT_ADAPTER_ERROR_RETEST_PERCENT: f64 = 0.2;
 
@@ -107,7 +107,7 @@ impl EthereumNetworkAdapters {
         use std::cmp::Ordering;
 
         use graph::components::network_provider::ProviderCheckStrategy;
-        use graph::slog::{o, Discard, Logger};
+        use graph::slog::{Discard, Logger, o};
 
         let chain_id: ChainName = "testing".into();
         adapters.sort_by(|a, b| {
@@ -118,7 +118,7 @@ impl EthereumNetworkAdapters {
 
         let provider = ProviderManager::new(
             Logger::root(Discard, o!()),
-            vec![(chain_id.clone(), adapters)].into_iter(),
+            vec![(chain_id.clone(), adapters)],
             ProviderCheckStrategy::MarkAsValid,
         );
 
@@ -249,6 +249,15 @@ impl EthereumNetworkAdapters {
         Self::cheapest_from(cheapest, required_capabilities, self.retest_percent)
     }
 
+    /// Returns all validated providers. Unvalidated providers are excluded.
+    pub async fn all_cheapest(&self) -> Vec<Arc<EthereumAdapter>> {
+        self.manager
+            .providers(&self.chain_id)
+            .await
+            .map(|adapters| adapters.map(|a| a.adapter.clone()).collect())
+            .unwrap_or_default()
+    }
+
     pub async fn cheapest(&self) -> Option<Arc<EthereumAdapter>> {
         // EthereumAdapters are sorted by their NodeCapabilities when the EthereumNetworks
         // struct is instantiated so they do not need to be sorted here
@@ -314,17 +323,21 @@ mod tests {
     use graph::components::network_provider::ProviderManager;
     use graph::components::network_provider::ProviderName;
     use graph::data::value::Word;
+
     use graph::http::HeaderMap;
     use graph::{
         endpoint::EndpointMetrics,
         firehose::SubgraphLimit,
         prelude::MetricsRegistry,
-        slog::{o, Discard, Logger},
+        slog::{Discard, Logger, o},
         url::Url,
     };
     use std::sync::Arc;
 
-    use crate::{EthereumAdapter, EthereumAdapterTrait, ProviderEthRpcMetrics, Transport};
+    use crate::{
+        Compression, EthereumAdapter, EthereumAdapterTrait, ProviderEthRpcMetrics, Transport,
+        chain::ChainSettings,
+    };
 
     use super::{EthereumNetworkAdapter, EthereumNetworkAdapters, NodeCapabilities};
 
@@ -394,6 +407,8 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
+            false,
+            Compression::None,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -405,6 +420,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 true,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -417,6 +433,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 false,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -448,13 +465,15 @@ mod tests {
 
         {
             // Not Found
-            assert!(adapters
-                .cheapest_with(&NodeCapabilities {
-                    archive: false,
-                    traces: true,
-                })
-                .await
-                .is_err());
+            assert!(
+                adapters
+                    .cheapest_with(&NodeCapabilities {
+                        archive: false,
+                        traces: true,
+                    })
+                    .await
+                    .is_err()
+            );
 
             // Check cheapest is not call only
             let adapter = adapters
@@ -497,6 +516,8 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
+            false,
+            Compression::None,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -508,6 +529,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 true,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -520,6 +542,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 false,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -568,6 +591,8 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
+            false,
+            Compression::None,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -579,6 +604,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 true,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -591,6 +617,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 false,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -632,6 +659,8 @@ mod tests {
             HeaderMap::new(),
             metrics.clone(),
             "",
+            false,
+            Compression::None,
         );
         let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
 
@@ -643,6 +672,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 false,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         );
@@ -919,6 +949,8 @@ mod tests {
             HeaderMap::new(),
             endpoint_metrics.clone(),
             "",
+            false,
+            Compression::None,
         );
 
         Arc::new(
@@ -929,6 +961,7 @@ mod tests {
                 provider_metrics.clone(),
                 true,
                 call_only,
+                Arc::new(ChainSettings::from_env_defaults()),
             )
             .await,
         )
diff --git a/chain/ethereum/src/polling_block_stream.rs b/chain/ethereum/src/polling_block_stream.rs
index 705fdaaaf7f..339386207f1 100644
--- a/chain/ethereum/src/polling_block_stream.rs
+++ b/chain/ethereum/src/polling_block_stream.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use std::cmp;
 use std::collections::VecDeque;
 use std::pin::Pin;
@@ -7,13 +7,13 @@ use std::task::{Context, Poll};
 use std::time::Duration;
 
 use graph::blockchain::block_stream::{
-    BlockStream, BlockStreamError, BlockStreamEvent, BlockWithTriggers, ChainHeadUpdateStream,
-    FirehoseCursor, TriggersAdapterWrapper, BUFFERED_BLOCK_STREAM_SIZE,
+    BUFFERED_BLOCK_STREAM_SIZE, BlockStream, BlockStreamError, BlockStreamEvent, BlockWithTriggers,
+    ChainHeadUpdateStream, FirehoseCursor, TriggersAdapterWrapper,
 };
 use graph::blockchain::{Block, BlockPtr, TriggerFilterWrapper};
-use graph::futures03::{stream::Stream, Future, FutureExt};
-use graph::prelude::{DeploymentHash, BLOCK_NUMBER_MAX};
-use graph::slog::{info, trace, warn, Logger};
+use graph::futures03::{Future, FutureExt, stream::Stream};
+use graph::prelude::{BLOCK_NUMBER_MAX, DeploymentHash};
+use graph::slog::{Logger, info, trace, warn};
 
 use graph::components::store::BlockNumber;
 use graph::data::subgraph::UnifiedMappingApiVersion;
@@ -182,7 +182,7 @@ impl PollingBlockStreamContext {
                     return Ok(NextBlocks::Done);
                 }
                 ReconciliationStep::Revert(parent_ptr) => {
-                    return Ok(NextBlocks::Revert(parent_ptr))
+                    return Ok(NextBlocks::Revert(parent_ptr));
                 }
             }
         }
@@ -224,10 +224,10 @@ impl PollingBlockStreamContext {
 
         // Only continue if the subgraph block ptr is behind the head block ptr.
         // subgraph_ptr > head_ptr shouldn't happen, but if it does, it's safest to just stop.
-        if let Some(ptr) = &subgraph_ptr {
-            if ptr.number >= head_ptr.number {
-                return Ok(ReconciliationStep::Done);
-            }
+        if let Some(ptr) = &subgraph_ptr
+            && ptr.number >= head_ptr.number
+        {
+            return Ok(ReconciliationStep::Done);
         }
 
         // Subgraph ptr is behind head ptr.
@@ -370,10 +370,6 @@ impl PollingBlockStreamContext {
                 return Ok(ReconciliationStep::Retry);
             }
 
-            if to > head_ptr.number - reorg_threshold {
-                return Ok(ReconciliationStep::Retry);
-            }
-
             info!(
                 ctx.logger,
                 "Scanned blocks [{}, {}]", from, to;
@@ -573,7 +569,7 @@ impl Stream for PollingBlockStream {
                 }
 
                 // Yielding blocks from reconciliation process
-                BlockStreamState::YieldingBlocks(ref mut next_blocks) => {
+                BlockStreamState::YieldingBlocks(next_blocks) => {
                     match next_blocks.pop_front() {
                         // Yield one block
                         Some(next_block) => {
@@ -593,7 +589,7 @@ impl Stream for PollingBlockStream {
                 }
 
                 // Pausing after an error, before looking for more blocks
-                BlockStreamState::RetryAfterDelay(ref mut delay) => match delay.as_mut().poll(cx) {
+                BlockStreamState::RetryAfterDelay(delay) => match delay.as_mut().poll(cx) {
                     Poll::Ready(Ok(..)) | Poll::Ready(Err(_)) => {
                         self.state = BlockStreamState::BeginReconciliation;
                     }
diff --git a/chain/ethereum/src/runtime/abi.rs b/chain/ethereum/src/runtime/abi.rs
index 7ac13752671..4311fed3c48 100644
--- a/chain/ethereum/src/runtime/abi.rs
+++ b/chain/ethereum/src/runtime/abi.rs
@@ -9,12 +9,11 @@ use graph::prelude::alloy;
 use graph::prelude::alloy::consensus::TxReceipt;
 use graph::prelude::alloy::network::ReceiptResponse;
 use graph::prelude::alloy::rpc::types::{Log, TransactionReceipt};
-use graph::prelude::alloy::serde::WithOtherFields;
 use graph::{
     prelude::BigInt,
     runtime::{
-        asc_get, asc_new, asc_new_or_null, gas::GasCounter, AscHeap, AscIndexId, AscPtr, AscType,
-        DeterministicHostError, FromAscObj, HostExportError, IndexForAscTypeId, ToAscObj,
+        AscHeap, AscIndexId, AscPtr, AscType, DeterministicHostError, FromAscObj, HostExportError,
+        IndexForAscTypeId, ToAscObj, asc_get, asc_new, asc_new_or_null, gas::GasCounter,
     },
 };
 use graph_runtime_derive::AscType;
@@ -587,10 +586,7 @@ where
 
 #[async_trait]
 impl<'a, T, B, Inner> ToAscObj<AscEthereumEvent_0_0_7<T, B>>
-    for (
-        EthereumEventData<'a>,
-        Option<&WithOtherFields<TransactionReceipt<Inner>>>,
-    )
+    for (EthereumEventData<'a>, Option<&TransactionReceipt<Inner>>)
 where
     T: AscType + AscIndexId + Send,
     B: AscType + AscIndexId + Send,
@@ -615,7 +611,7 @@ where
             params,
         } = event_data.to_asc_obj(heap, gas).await?;
         let receipt = if let Some(receipt_data) = optional_receipt {
-            asc_new(heap, &receipt_data.inner(), gas).await?
+            asc_new(heap, receipt_data, gas).await?
         } else {
             AscPtr::null()
         };
diff --git a/chain/ethereum/src/runtime/runtime_adapter.rs b/chain/ethereum/src/runtime/runtime_adapter.rs
index a5597efcd4d..a5d68a761a7 100644
--- a/chain/ethereum/src/runtime/runtime_adapter.rs
+++ b/chain/ethereum/src/runtime/runtime_adapter.rs
@@ -2,10 +2,10 @@ use std::{sync::Arc, time::Instant};
 
 use crate::adapter::EthereumRpcError;
 use crate::{
-    capabilities::NodeCapabilities, network::EthereumNetworkAdapters, Chain, ContractCallError,
-    EthereumAdapter, EthereumAdapterTrait, ENV_VARS,
+    Chain, ContractCallError, ENV_VARS, EthereumAdapter, EthereumAdapterTrait,
+    capabilities::NodeCapabilities, network::EthereumNetworkAdapters,
 };
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use blockchain::HostFn;
 use graph::abi;
 use graph::abi::DynSolValueExt;
@@ -23,8 +23,8 @@ use graph::{
     blockchain::{self, BlockPtr, HostFnCtx},
     cheap_clone::CheapClone,
     futures03::FutureExt,
-    prelude::{alloy::primitives::Address, EthereumCallCache},
-    runtime::{asc_get, asc_new, AscPtr, HostExportError},
+    prelude::{EthereumCallCache, alloy::primitives::Address},
+    runtime::{AscPtr, HostExportError, asc_get, asc_new},
     slog::Logger,
 };
 use graph_runtime_wasm::asc_abi::class::{AscBigInt, AscEnumArray, AscWrapped, EthereumValueKind};
@@ -346,32 +346,34 @@ async fn eth_call(
         Err(e) => (Err(e), call::Source::Rpc),
     };
     let result = match result {
-            Ok(res) => Ok(res),
+        Ok(res) => Ok(res),
 
-            // Any error reported by the Ethereum node could be due to the block no longer being on
-            // the main chain. This is very unespecific but we don't want to risk failing a
-            // subgraph due to a transient error such as a reorg.
-            Err(ContractCallError::AlloyError(e)) => Err(HostExportError::PossibleReorg(anyhow::anyhow!(
+        // Any error reported by the Ethereum node could be due to the block no longer being on
+        // the main chain. This is very unespecific but we don't want to risk failing a
+        // subgraph due to a transient error such as a reorg.
+        Err(ContractCallError::AlloyError(e)) => {
+            Err(HostExportError::PossibleReorg(anyhow::anyhow!(
                 "Ethereum node returned an error when calling function \"{}\" of contract \"{}\": {}",
                 unresolved_call.function_name,
                 unresolved_call.contract_name,
                 e
-            ))),
-
-            // Also retry on timeouts.
-            Err(ContractCallError::Timeout) => Err(HostExportError::PossibleReorg(anyhow::anyhow!(
-                "Ethereum node did not respond when calling function \"{}\" of contract \"{}\"",
-                unresolved_call.function_name,
-                unresolved_call.contract_name,
-            ))),
+            )))
+        }
 
-            Err(e) => Err(HostExportError::Unknown(anyhow::anyhow!(
-                "Failed to call function \"{}\" of contract \"{}\": {}",
-                unresolved_call.function_name,
-                unresolved_call.contract_name,
-                e
-            ))),
-        };
+        // Also retry on timeouts.
+        Err(ContractCallError::Timeout) => Err(HostExportError::PossibleReorg(anyhow::anyhow!(
+            "Ethereum node did not respond when calling function \"{}\" of contract \"{}\"",
+            unresolved_call.function_name,
+            unresolved_call.contract_name,
+        ))),
+
+        Err(e) => Err(HostExportError::Unknown(anyhow::anyhow!(
+            "Failed to call function \"{}\" of contract \"{}\": {}",
+            unresolved_call.function_name,
+            unresolved_call.contract_name,
+            e
+        ))),
+    };
 
     let elapsed = start_time.elapsed();
 
diff --git a/chain/ethereum/src/tests.rs b/chain/ethereum/src/tests.rs
index 5fa236323a4..a5f0a17bff0 100644
--- a/chain/ethereum/src/tests.rs
+++ b/chain/ethereum/src/tests.rs
@@ -1,17 +1,17 @@
 use std::sync::Arc;
 
 use graph::{
-    blockchain::{block_stream::BlockWithTriggers, BlockPtr, Trigger},
+    blockchain::{BlockPtr, Trigger, block_stream::BlockWithTriggers},
     prelude::{
+        EthereumCall, LightEthereumBlock,
         alloy::{
             self,
-            primitives::{Address, Bytes, LogData, B256},
+            primitives::{Address, B256, Bytes, LogData},
             rpc::types::{Block, Log},
         },
         rand::{self, Rng},
-        EthereumCall, LightEthereumBlock,
     },
-    slog::{self, o, Logger},
+    slog::{self, Logger, o},
 };
 
 use crate::{
diff --git a/chain/ethereum/src/transport.rs b/chain/ethereum/src/transport.rs
index d5fac8523bb..5b5414c4a5d 100644
--- a/chain/ethereum/src/transport.rs
+++ b/chain/ethereum/src/transport.rs
@@ -1,15 +1,36 @@
+use alloy::transports::{TransportError, TransportErrorKind, TransportFut};
+use graph::components::ethereum::json_patch;
 use graph::components::network_provider::ProviderName;
 use graph::endpoint::{ConnectionType, EndpointMetrics, RequestLabels};
 use graph::prelude::alloy::rpc::json_rpc::{RequestPacket, ResponsePacket};
+use graph::prelude::alloy::transports::{ipc::IpcConnect, ws::WsConnect};
 use graph::prelude::*;
 use graph::url::Url;
+use serde_json::Value;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use tower::Service;
 
-use alloy::transports::{TransportError, TransportFut};
+/// Compression method for RPC requests.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum Compression {
+    #[default]
+    None,
+    Gzip,
+    Brotli,
+    Deflate,
+}
 
-use graph::prelude::alloy::transports::{http::Http, ipc::IpcConnect, ws::WsConnect};
+impl std::fmt::Display for Compression {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Compression::None => write!(f, "none"),
+            Compression::Gzip => write!(f, "gzip"),
+            Compression::Brotli => write!(f, "brotli"),
+            Compression::Deflate => write!(f, "deflate"),
+        }
+    }
+}
 
 /// Abstraction over different transport types for Alloy providers.
 #[derive(Clone, Debug)]
@@ -21,9 +42,17 @@ pub enum Transport {
 
 impl Transport {
     /// Creates an IPC transport.
+    ///
+    /// Accepts both a raw file path (`/tmp/geth.ipc`) and an `ipc://` URL
+    /// (`ipc:///tmp/geth.ipc`). When a URL is provided the file path is
+    /// extracted so that the underlying IPC connector receives a plain path.
     #[cfg(unix)]
     pub async fn new_ipc(ipc: &str) -> Self {
-        let transport = IpcConnect::new(ipc.to_string());
+        let path = Url::parse(ipc)
+            .ok()
+            .map(|u| u.path().to_string())
+            .unwrap_or_else(|| ipc.to_string());
+        let transport = IpcConnect::new(path);
 
         Transport::IPC(transport)
     }
@@ -41,19 +70,37 @@ impl Transport {
     }
 
     /// Creates a JSON-RPC over HTTP transport.
+    ///
+    /// Set `no_eip2718` to true for chains that don't return the `type` field
+    /// in transaction receipts (pre-EIP-2718 chains). Use provider feature `no_eip2718`.
     pub fn new_rpc(
         rpc: Url,
         headers: graph::http::HeaderMap,
         metrics: Arc<EndpointMetrics>,
         provider: impl AsRef<str>,
+        no_eip2718: bool,
+        compression: Compression,
     ) -> Self {
-        let client = reqwest::Client::builder()
-            .default_headers(headers)
-            .build()
-            .expect("Failed to build HTTP client");
+        let mut client_builder = reqwest::Client::builder().default_headers(headers);
 
-        let http_transport = Http::with_client(client, rpc);
-        let metrics_transport = MetricsHttp::new(http_transport, metrics, provider.as_ref().into());
+        match compression {
+            Compression::None => {}
+            Compression::Gzip => {
+                client_builder = client_builder.gzip(true);
+            }
+            Compression::Brotli => {
+                client_builder = client_builder.brotli(true);
+            }
+            Compression::Deflate => {
+                client_builder = client_builder.deflate(true);
+            }
+        }
+
+        let client = client_builder.build().expect("Failed to build HTTP client");
+
+        let patching_transport = PatchingHttp::new(client, rpc, no_eip2718);
+        let metrics_transport =
+            MetricsHttp::new(patching_transport, metrics, provider.as_ref().into());
         let rpc_client = alloy::rpc::client::RpcClient::new(metrics_transport, false);
 
         Transport::RPC(rpc_client)
@@ -63,17 +110,13 @@ impl Transport {
 /// Custom HTTP transport wrapper that collects metrics
 #[derive(Clone)]
 pub struct MetricsHttp {
-    inner: Http<reqwest::Client>,
+    inner: PatchingHttp,
     metrics: Arc<EndpointMetrics>,
     provider: ProviderName,
 }
 
 impl MetricsHttp {
-    pub fn new(
-        inner: Http<reqwest::Client>,
-        metrics: Arc<EndpointMetrics>,
-        provider: ProviderName,
-    ) -> Self {
+    pub fn new(inner: PatchingHttp, metrics: Arc<EndpointMetrics>, provider: ProviderName) -> Self {
         Self {
             inner,
             metrics,
@@ -125,3 +168,138 @@ impl Service<RequestPacket> for MetricsHttp {
         })
     }
 }
+
+/// HTTP transport that patches receipts for chains that don't support EIP-2718 (typed transactions).
+/// When `no_eip2718` is set, adds missing `type` field to receipts.
+#[derive(Clone)]
+pub struct PatchingHttp {
+    client: reqwest::Client,
+    url: Url,
+    no_eip2718: bool,
+}
+
+impl PatchingHttp {
+    pub fn new(client: reqwest::Client, url: Url, no_eip2718: bool) -> Self {
+        Self {
+            client,
+            url,
+            no_eip2718,
+        }
+    }
+
+    fn is_receipt_method(method: &str) -> bool {
+        method == "eth_getTransactionReceipt" || method == "eth_getBlockReceipts"
+    }
+
+    fn patch_rpc_response(response: &mut Value) -> bool {
+        response
+            .get_mut("result")
+            .map(json_patch::patch_receipts)
+            .unwrap_or(false)
+    }
+
+    fn patch_response(body: &[u8]) -> Option<Vec<u8>> {
+        let mut json: Value = serde_json::from_slice(body).ok()?;
+
+        let patched = match &mut json {
+            Value::Object(_) => Self::patch_rpc_response(&mut json),
+            Value::Array(batch) => {
+                let mut patched = false;
+                for r in batch {
+                    patched |= Self::patch_rpc_response(r);
+                }
+                patched
+            }
+            _ => false,
+        };
+
+        if patched {
+            serde_json::to_vec(&json).ok()
+        } else {
+            None
+        }
+    }
+}
+
+impl Service<RequestPacket> for PatchingHttp {
+    type Response = ResponsePacket;
+    type Error = TransportError;
+    type Future = TransportFut<'static>;
+
+    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, request: RequestPacket) -> Self::Future {
+        let client = self.client.clone();
+        let url = self.url.clone();
+        let no_eip2718 = self.no_eip2718;
+
+        let should_patch = if no_eip2718 {
+            match &request {
+                RequestPacket::Single(req) => Self::is_receipt_method(req.method()),
+                RequestPacket::Batch(reqs) => {
+                    reqs.iter().any(|r| Self::is_receipt_method(r.method()))
+                }
+            }
+        } else {
+            false
+        };
+
+        Box::pin(async move {
+            let resp = client
+                .post(url)
+                .json(&request)
+                .headers(request.headers())
+                .send()
+                .await
+                .map_err(TransportErrorKind::custom)?;
+
+            let status = resp.status();
+            let body = resp.bytes().await.map_err(TransportErrorKind::custom)?;
+
+            if !status.is_success() {
+                return Err(TransportErrorKind::http_error(
+                    status.as_u16(),
+                    String::from_utf8_lossy(&body).into_owned(),
+                ));
+            }
+
+            if should_patch && let Some(patched) = Self::patch_response(&body) {
+                return serde_json::from_slice(&patched).map_err(|err| {
+                    TransportError::deser_err(err, String::from_utf8_lossy(&patched))
+                });
+            }
+            serde_json::from_slice(&body)
+                .map_err(|err| TransportError::deser_err(err, String::from_utf8_lossy(&body)))
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn patch_response_single() {
+        let body = br#"{"jsonrpc":"2.0","id":1,"result":{"status":"0x1"}}"#;
+        let patched = PatchingHttp::patch_response(body).unwrap();
+        let json: Value = serde_json::from_slice(&patched).unwrap();
+        assert_eq!(json["result"]["type"], "0x0");
+    }
+
+    #[test]
+    fn patch_response_returns_none_when_type_exists() {
+        let body = br#"{"jsonrpc":"2.0","id":1,"result":{"status":"0x1","type":"0x2"}}"#;
+        assert!(PatchingHttp::patch_response(body).is_none());
+    }
+
+    #[test]
+    fn patch_response_batch() {
+        let body = br#"[{"jsonrpc":"2.0","id":1,"result":{"status":"0x1"}},{"jsonrpc":"2.0","id":2,"result":{"status":"0x1"}}]"#;
+        let patched = PatchingHttp::patch_response(body).unwrap();
+        let json: Value = serde_json::from_slice(&patched).unwrap();
+        assert_eq!(json[0]["result"]["type"], "0x0");
+        assert_eq!(json[1]["result"]["type"], "0x0");
+    }
+}
diff --git a/chain/ethereum/src/trigger.rs b/chain/ethereum/src/trigger.rs
index f969fa7063c..b5d51d9a379 100644
--- a/chain/ethereum/src/trigger.rs
+++ b/chain/ethereum/src/trigger.rs
@@ -3,24 +3,24 @@ use graph::abi;
 use graph::blockchain::MappingTriggerTrait;
 use graph::blockchain::TriggerData;
 use graph::components::ethereum::AnyTransaction;
+use graph::components::ethereum::AnyTransactionReceiptBare as AlloyTransactionReceipt;
 use graph::data::subgraph::API_VERSION_0_0_2;
 use graph::data::subgraph::API_VERSION_0_0_6;
 use graph::data::subgraph::API_VERSION_0_0_7;
 use graph::data_source::common::DeclaredCall;
+use graph::prelude::BlockNumber;
+use graph::prelude::BlockPtr;
+use graph::prelude::LightEthereumBlock;
 use graph::prelude::alloy::consensus::Transaction as TransactionTrait;
-use graph::prelude::alloy::network::AnyTransactionReceipt as AlloyTransactionReceipt;
 use graph::prelude::alloy::network::TransactionResponse;
 use graph::prelude::alloy::primitives::{Address, B256, U256};
 use graph::prelude::alloy::rpc::types::Log;
-use graph::prelude::BlockNumber;
-use graph::prelude::BlockPtr;
-use graph::prelude::LightEthereumBlock;
 use graph::prelude::{CheapClone, EthereumCall};
-use graph::runtime::asc_new;
-use graph::runtime::gas::GasCounter;
 use graph::runtime::AscHeap;
 use graph::runtime::AscPtr;
 use graph::runtime::HostExportError;
+use graph::runtime::asc_new;
+use graph::runtime::gas::GasCounter;
 use graph::semver::Version;
 use graph_runtime_wasm::module::ToAscPtr;
 use std::{cmp::Ordering, sync::Arc};
diff --git a/chain/near/src/adapter.rs b/chain/near/src/adapter.rs
index 8a9de408bad..31c7dca7c97 100644
--- a/chain/near/src/adapter.rs
+++ b/chain/near/src/adapter.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use crate::data_source::PartialAccounts;
-use crate::{data_source::DataSource, Chain};
+use crate::{Chain, data_source::DataSource};
 use graph::blockchain as bc;
 use graph::firehose::{BasicReceiptFilter, PrefixSuffixPair};
 use graph::itertools::Itertools;
@@ -251,7 +251,7 @@ mod test {
     use std::collections::HashSet;
 
     use super::NearBlockFilter;
-    use crate::adapter::{TriggerFilter, BASIC_RECEIPT_FILTER_TYPE_URL};
+    use crate::adapter::{BASIC_RECEIPT_FILTER_TYPE_URL, TriggerFilter};
     use graph::{
         blockchain::TriggerFilter as _,
         firehose::{BasicReceiptFilter, PrefixSuffixPair},
diff --git a/chain/near/src/chain.rs b/chain/near/src/chain.rs
index 6dae3c3a1f0..5698301b5e8 100644
--- a/chain/near/src/chain.rs
+++ b/chain/near/src/chain.rs
@@ -14,17 +14,17 @@ use graph::prelude::MetricsRegistry;
 use graph::{
     anyhow::Result,
     blockchain::{
+        BlockHash, BlockPtr, Blockchain, EmptyNodeCapabilities, IngestorError,
+        RuntimeAdapter as RuntimeAdapterTrait,
         block_stream::{
             BlockStreamEvent, BlockWithTriggers, FirehoseError,
             FirehoseMapper as FirehoseMapperTrait, TriggersAdapter as TriggersAdapterTrait,
         },
         firehose_block_stream::FirehoseBlockStream,
-        BlockHash, BlockPtr, Blockchain, EmptyNodeCapabilities, IngestorError,
-        RuntimeAdapter as RuntimeAdapterTrait,
     },
     components::store::DeploymentLocator,
     firehose::{self as firehose, ForkStep},
-    prelude::{o, BlockNumber, Error, Logger, LoggerFactory},
+    prelude::{BlockNumber, Error, Logger, LoggerFactory, o},
 };
 use prost::Message;
 use std::collections::BTreeSet;
@@ -197,7 +197,9 @@ impl Blockchain for Chain {
         _logger: &Logger,
         _cursor: FirehoseCursor,
     ) -> Result<codec::Block, Error> {
-        unimplemented!("This chain does not support Dynamic Data Sources. is_refetch_block_required always returns false, this shouldn't be called.")
+        unimplemented!(
+            "This chain does not support Dynamic Data Sources. is_refetch_block_required always returns false, this shouldn't be called."
+        )
     }
 
     async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
@@ -367,7 +369,7 @@ impl BlockStreamMapper<Chain> for FirehoseMapper {
                 return Err(anyhow::anyhow!(
                     "near mapper is expected to always have a block"
                 ))
-                .map_err(BlockStreamError::from)
+                .map_err(BlockStreamError::from);
             }
         };
 
@@ -439,7 +441,9 @@ impl FirehoseMapperTrait<Chain> for FirehoseMapper {
             }
 
             StepFinal => {
-                panic!("irreversible step is not handled and should not be requested in the Firehose request")
+                panic!(
+                    "irreversible step is not handled and should not be requested in the Firehose request"
+                )
             }
 
             StepUnset => {
@@ -477,23 +481,23 @@ mod test {
     use std::{collections::HashSet, sync::Arc, vec};
 
     use graph::{
-        blockchain::{block_stream::BlockWithTriggers, DataSource as _, TriggersAdapter as _},
+        blockchain::{DataSource as _, TriggersAdapter as _, block_stream::BlockWithTriggers},
         data::subgraph::LATEST_VERSION,
         prelude::Link,
         semver::Version,
-        slog::{self, o, Logger},
+        slog::{self, Logger, o},
     };
 
     use crate::{
+        Chain,
         adapter::{NearReceiptFilter, TriggerFilter},
         codec::{
-            self, execution_outcome, receipt, Block, BlockHeader, DataReceiver, ExecutionOutcome,
-            ExecutionOutcomeWithId, IndexerExecutionOutcomeWithReceipt, IndexerShard,
-            ReceiptAction, SuccessValueExecutionStatus,
+            self, Block, BlockHeader, DataReceiver, ExecutionOutcome, ExecutionOutcomeWithId,
+            IndexerExecutionOutcomeWithReceipt, IndexerShard, ReceiptAction,
+            SuccessValueExecutionStatus, execution_outcome, receipt,
         },
-        data_source::{DataSource, Mapping, PartialAccounts, ReceiptHandler, NEAR_KIND},
+        data_source::{DataSource, Mapping, NEAR_KIND, PartialAccounts, ReceiptHandler},
         trigger::{NearTrigger, ReceiptWithOutcome},
-        Chain,
     };
 
     use super::TriggersAdapter;
diff --git a/chain/near/src/codec.rs b/chain/near/src/codec.rs
index fca0a4f4c9e..569e8cf5243 100644
--- a/chain/near/src/codec.rs
+++ b/chain/near/src/codec.rs
@@ -4,7 +4,7 @@ pub mod pbcodec;
 
 use graph::{
     blockchain::{Block as BlockchainBlock, BlockPtr, BlockTime},
-    prelude::{alloy::primitives::B256, hex, BlockNumber},
+    prelude::{BlockNumber, alloy::primitives::B256, hex},
 };
 use std::convert::TryFrom;
 use std::fmt::LowerHex;
diff --git a/chain/near/src/data_source.rs b/chain/near/src/data_source.rs
index e64197eeb0d..01484905a58 100644
--- a/chain/near/src/data_source.rs
+++ b/chain/near/src/data_source.rs
@@ -7,7 +7,7 @@ use graph::components::subgraph::InstanceDSTemplateInfo;
 use graph::data::subgraph::{DataSourceContext, DeploymentHash};
 use graph::prelude::SubgraphManifestValidationError;
 use graph::{
-    anyhow::{anyhow, Error},
+    anyhow::{Error, anyhow},
     blockchain::{self, Blockchain},
     prelude::{BlockNumber, CheapClone, Deserialize, Link, LinkResolver, Logger},
     semver,
diff --git a/chain/near/src/runtime/abi.rs b/chain/near/src/runtime/abi.rs
index 87e224dc4d0..b74d8f5f7ff 100644
--- a/chain/near/src/runtime/abi.rs
+++ b/chain/near/src/runtime/abi.rs
@@ -3,7 +3,7 @@ use crate::trigger::ReceiptWithOutcome;
 use async_trait::async_trait;
 use graph::anyhow::anyhow;
 use graph::runtime::gas::GasCounter;
-use graph::runtime::{asc_new, AscHeap, AscPtr, DeterministicHostError, HostExportError, ToAscObj};
+use graph::runtime::{AscHeap, AscPtr, DeterministicHostError, HostExportError, ToAscObj, asc_new};
 use graph_runtime_wasm::asc_abi::class::{Array, AscEnum, EnumPayload, Uint8Array};
 
 pub(crate) use super::generated::*;
@@ -517,7 +517,7 @@ impl ToAscObj<AscMerklePathItem> for codec::MerklePathItem {
                         "Invalid direction value {}",
                         x
                     ))
-                    .into())
+                    .into());
                 }
             },
         })
@@ -557,7 +557,7 @@ impl ToAscObj<AscSignature> for codec::Signature {
                         "Invalid signature type {}",
                         value,
                     ))
-                    .into())
+                    .into());
                 }
             },
             bytes: asc_new(heap, self.bytes.as_slice(), gas).await?,
@@ -596,7 +596,7 @@ impl ToAscObj<AscPublicKey> for codec::PublicKey {
                         "Invalid public key type {}",
                         value,
                     ))
-                    .into())
+                    .into());
                 }
             },
             bytes: asc_new(heap, self.bytes.as_slice(), gas).await?,
diff --git a/chain/near/src/trigger.rs b/chain/near/src/trigger.rs
index ab68ab71beb..bf9794d2b20 100644
--- a/chain/near/src/trigger.rs
+++ b/chain/near/src/trigger.rs
@@ -3,11 +3,11 @@ use graph::blockchain::Block;
 use graph::blockchain::MappingTriggerTrait;
 use graph::blockchain::TriggerData;
 use graph::derive::CheapClone;
+use graph::prelude::BlockNumber;
 use graph::prelude::alloy::primitives::B256;
 use graph::prelude::hex;
-use graph::prelude::BlockNumber;
 use graph::runtime::HostExportError;
-use graph::runtime::{asc_new, gas::GasCounter, AscHeap, AscPtr};
+use graph::runtime::{AscHeap, AscPtr, asc_new, gas::GasCounter};
 use graph_runtime_wasm::module::ToAscPtr;
 use std::{cmp::Ordering, sync::Arc};
 
@@ -158,8 +158,8 @@ mod tests {
         anyhow::anyhow,
         components::metrics::gas::GasMetrics,
         data::subgraph::API_VERSION_0_0_5,
-        prelude::{hex, BigInt},
-        runtime::{gas::GasCounter, DeterministicHostError, HostExportError},
+        prelude::{BigInt, hex},
+        runtime::{DeterministicHostError, HostExportError, gas::GasCounter},
         util::mem::init_slice,
     };
 
diff --git a/core/graphman/src/commands/deployment/info.rs b/core/graphman/src/commands/deployment/info.rs
index 55e00e917ca..155a821d715 100644
--- a/core/graphman/src/commands/deployment/info.rs
+++ b/core/graphman/src/commands/deployment/info.rs
@@ -11,10 +11,10 @@ use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::Store;
 use itertools::Itertools;
 
+use crate::GraphmanError;
 use crate::deployment::Deployment;
 use crate::deployment::DeploymentSelector;
 use crate::deployment::DeploymentVersionSelector;
-use crate::GraphmanError;
 
 #[derive(Clone, Debug)]
 pub struct DeploymentStatus {
diff --git a/core/graphman/src/commands/deployment/pause.rs b/core/graphman/src/commands/deployment/pause.rs
index 0257768a03b..e2405b5f68b 100644
--- a/core/graphman/src/commands/deployment/pause.rs
+++ b/core/graphman/src/commands/deployment/pause.rs
@@ -3,15 +3,15 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use graph::components::store::DeploymentLocator;
 use graph::components::store::StoreEvent;
-use graph_store_postgres::command_support::catalog;
-use graph_store_postgres::command_support::catalog::Site;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
+use graph_store_postgres::command_support::catalog;
+use graph_store_postgres::command_support::catalog::Site;
 use thiserror::Error;
 
+use crate::GraphmanError;
 use crate::deployment::DeploymentSelector;
 use crate::deployment::DeploymentVersionSelector;
-use crate::GraphmanError;
 
 pub struct ActiveDeployment {
     locator: DeploymentLocator,
diff --git a/core/graphman/src/commands/deployment/reassign.rs b/core/graphman/src/commands/deployment/reassign.rs
index b1ead37cd12..f4279946917 100644
--- a/core/graphman/src/commands/deployment/reassign.rs
+++ b/core/graphman/src/commands/deployment/reassign.rs
@@ -5,15 +5,15 @@ use graph::components::store::DeploymentLocator;
 use graph::components::store::StoreEvent;
 use graph::prelude::AssignmentChange;
 use graph::prelude::NodeId;
-use graph_store_postgres::command_support::catalog;
-use graph_store_postgres::command_support::catalog::Site;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
+use graph_store_postgres::command_support::catalog;
+use graph_store_postgres::command_support::catalog::Site;
 use thiserror::Error;
 
+use crate::GraphmanError;
 use crate::deployment::DeploymentSelector;
 use crate::deployment::DeploymentVersionSelector;
-use crate::GraphmanError;
 
 pub struct Deployment {
     locator: DeploymentLocator,
@@ -134,7 +134,10 @@ pub async fn reassign_deployment(
         .map_err(GraphmanError::from)?
         .len();
     if count == 1 {
-        let warning_msg = format!("This is the only deployment assigned to '{}'. Please make sure that the node ID is spelled correctly.",node.as_str());
+        let warning_msg = format!(
+            "This is the only deployment assigned to '{}'. Please make sure that the node ID is spelled correctly.",
+            node.as_str()
+        );
         Ok(ReassignResult::CompletedWithWarnings(vec![warning_msg]))
     } else {
         Ok(ReassignResult::Ok)
diff --git a/core/graphman/src/commands/deployment/resume.rs b/core/graphman/src/commands/deployment/resume.rs
index a8f9f4769e7..4fa0162f83e 100644
--- a/core/graphman/src/commands/deployment/resume.rs
+++ b/core/graphman/src/commands/deployment/resume.rs
@@ -3,15 +3,15 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use graph::components::store::DeploymentLocator;
 use graph::prelude::StoreEvent;
-use graph_store_postgres::command_support::catalog;
-use graph_store_postgres::command_support::catalog::Site;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
+use graph_store_postgres::command_support::catalog;
+use graph_store_postgres::command_support::catalog::Site;
 use thiserror::Error;
 
+use crate::GraphmanError;
 use crate::deployment::DeploymentSelector;
 use crate::deployment::DeploymentVersionSelector;
-use crate::GraphmanError;
 
 pub struct PausedDeployment {
     locator: DeploymentLocator,
diff --git a/core/graphman/src/commands/deployment/unassign.rs b/core/graphman/src/commands/deployment/unassign.rs
index 474358c297e..cef72e947f1 100644
--- a/core/graphman/src/commands/deployment/unassign.rs
+++ b/core/graphman/src/commands/deployment/unassign.rs
@@ -3,15 +3,15 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use graph::components::store::DeploymentLocator;
 use graph::components::store::StoreEvent;
-use graph_store_postgres::command_support::catalog;
-use graph_store_postgres::command_support::catalog::Site;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
+use graph_store_postgres::command_support::catalog;
+use graph_store_postgres::command_support::catalog::Site;
 use thiserror::Error;
 
+use crate::GraphmanError;
 use crate::deployment::DeploymentSelector;
 use crate::deployment::DeploymentVersionSelector;
-use crate::GraphmanError;
 
 pub struct AssignedDeployment {
     locator: DeploymentLocator,
diff --git a/core/graphman/src/deployment.rs b/core/graphman/src/deployment.rs
index 0a38f175586..6538017edaa 100644
--- a/core/graphman/src/deployment.rs
+++ b/core/graphman/src/deployment.rs
@@ -1,6 +1,4 @@
 use anyhow::anyhow;
-use diesel::dsl::sql;
-use diesel::sql_types::Text;
 use diesel::BoolExpressionMethods;
 use diesel::ExpressionMethods;
 use diesel::JoinOnDsl;
@@ -8,12 +6,14 @@ use diesel::NullableExpressionMethods;
 use diesel::PgTextExpressionMethods;
 use diesel::QueryDsl;
 use diesel::Queryable;
+use diesel::dsl::sql;
+use diesel::sql_types::Text;
 use diesel_async::RunQueryDsl;
 use graph::components::store::DeploymentId;
 use graph::components::store::DeploymentLocator;
 use graph::data::subgraph::DeploymentHash;
-use graph_store_postgres::command_support::catalog;
 use graph_store_postgres::AsyncPgConnection;
+use graph_store_postgres::command_support::catalog;
 use itertools::Itertools;
 
 use crate::GraphmanError;
diff --git a/core/graphman_store/src/lib.rs b/core/graphman_store/src/lib.rs
index f986d6484c0..8b1965df7cd 100644
--- a/core/graphman_store/src/lib.rs
+++ b/core/graphman_store/src/lib.rs
@@ -7,6 +7,9 @@ use anyhow::Result;
 use async_trait::async_trait;
 use chrono::DateTime;
 use chrono::Utc;
+use diesel::AsExpression;
+use diesel::FromSqlRow;
+use diesel::Queryable;
 use diesel::deserialize::FromSql;
 use diesel::pg::Pg;
 use diesel::pg::PgValue;
@@ -14,9 +17,6 @@ use diesel::serialize::Output;
 use diesel::serialize::ToSql;
 use diesel::sql_types::BigSerial;
 use diesel::sql_types::Varchar;
-use diesel::AsExpression;
-use diesel::FromSqlRow;
-use diesel::Queryable;
 use strum::Display;
 use strum::EnumString;
 use strum::IntoStaticStr;
diff --git a/core/src/amp_subgraph/manager.rs b/core/src/amp_subgraph/manager.rs
index ae272830880..61ec421ca17 100644
--- a/core/src/amp_subgraph/manager.rs
+++ b/core/src/amp_subgraph/manager.rs
@@ -18,7 +18,7 @@ use graph::{
 use slog::{debug, error};
 use tokio_util::sync::CancellationToken;
 
-use super::{runner, Metrics, Monitor};
+use super::{Metrics, Monitor, runner};
 
 /// Manages Amp subgraph runner futures.
 ///
diff --git a/core/src/amp_subgraph/metrics.rs b/core/src/amp_subgraph/metrics.rs
index e54b07c1a6a..7088cf9a48f 100644
--- a/core/src/amp_subgraph/metrics.rs
+++ b/core/src/amp_subgraph/metrics.rs
@@ -4,7 +4,7 @@ use alloy::primitives::BlockNumber;
 use graph::{
     cheap_clone::CheapClone,
     components::{
-        metrics::{stopwatch::StopwatchMetrics, MetricsRegistry},
+        metrics::{MetricsRegistry, stopwatch::StopwatchMetrics},
         store::WritableStore,
     },
     prelude::DeploymentHash,
diff --git a/core/src/amp_subgraph/monitor.rs b/core/src/amp_subgraph/monitor.rs
index 2bdd32ab504..314f464c0d1 100644
--- a/core/src/amp_subgraph/monitor.rs
+++ b/core/src/amp_subgraph/monitor.rs
@@ -7,11 +7,11 @@
 //! `subgraph instance` - A background task that executes the subgraph runner future.
 
 use std::{
-    collections::{hash_map::Entry, HashMap},
+    collections::{HashMap, hash_map::Entry},
     fmt,
     sync::{
-        atomic::{AtomicU32, Ordering::SeqCst},
         Arc,
+        atomic::{AtomicU32, Ordering::SeqCst},
     },
     time::Duration,
 };
@@ -21,8 +21,12 @@ use futures::future::BoxFuture;
 use graph::{
     cheap_clone::CheapClone, components::store::DeploymentLocator, log::factory::LoggerFactory,
 };
-use slog::{debug, error, info, warn, Logger};
-use tokio::{sync::mpsc, task::JoinHandle, time::timeout};
+use slog::{Logger, debug, error, info, warn};
+use tokio::{
+    sync::mpsc::{self, error::SendError},
+    task::JoinHandle,
+    time::timeout,
+};
 use tokio_util::sync::CancellationToken;
 
 /// Represents the maximum amount of time a subgraph instance is allowed to run
@@ -137,7 +141,7 @@ impl Monitor {
             .new(slog::o!("method" => "start"));
 
         info!(logger, "Starting subgraph");
-        handle_send_result(
+        log_send_error(
             &logger,
             self.command_tx.send(Command::Start {
                 id: self.subgraph_instance_id.fetch_add(1, SeqCst),
@@ -164,7 +168,7 @@ impl Monitor {
             .new(slog::o!("method" => "stop"));
 
         info!(logger, "Stopping subgraph");
-        handle_send_result(&logger, self.command_tx.send(Command::Stop { deployment }));
+        log_send_error(&logger, self.command_tx.send(Command::Stop { deployment }));
     }
 
     /// Processes commands sent through the command channel.
@@ -184,10 +188,6 @@ impl Monitor {
         loop {
             tokio::select! {
                 Some(command) = command_rx.recv() => {
-                    debug!(logger, "Processing a new command";
-                        "command" => ?command
-                    );
-
                     match &command {
                         Command::Start { .. } => {
                             Self::process_start_command(
@@ -390,7 +390,7 @@ impl Monitor {
 
         if let Some(pending_start_command) = pending_start_commands.remove(&deployment) {
             debug!(logger, "Resending a pending start command");
-            handle_send_result(&logger, command_tx.send(pending_start_command));
+            log_send_error(&logger, command_tx.send(pending_start_command));
         }
     }
 
@@ -476,7 +476,7 @@ impl Monitor {
                 }
 
                 debug!(logger, "Sending clear command");
-                handle_send_result(&logger, command_tx.send(Command::Clear { id, deployment }));
+                log_send_error(&logger, command_tx.send(Command::Clear { id, deployment }));
             }
         });
 
@@ -546,13 +546,10 @@ impl fmt::Debug for Command {
     }
 }
 
-fn handle_send_result(
-    logger: &Logger,
-    result: Result<(), tokio::sync::mpsc::error::SendError<Command>>,
-) {
+fn log_send_error(logger: &Logger, result: Result<(), SendError<Command>>) {
     match result {
         Ok(()) => {
-            debug!(logger, "Command was sent successfully");
+            // No need to log anything
         }
 
         // This should only happen if the parent cancel token of the subgraph monitor was cancelled
diff --git a/core/src/amp_subgraph/runner/context.rs b/core/src/amp_subgraph/runner/context.rs
index 32e96148acf..d8b5b7b638e 100644
--- a/core/src/amp_subgraph/runner/context.rs
+++ b/core/src/amp_subgraph/runner/context.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use alloy::primitives::{BlockHash, BlockNumber};
 use graph::{
-    amp::{log::Logger as _, Codec, Manifest},
+    amp::{Codec, Manifest, log::Logger as _},
     cheap_clone::CheapClone,
     components::store::WritableStore,
     data::subgraph::DeploymentHash,
@@ -18,8 +18,8 @@ pub(in super::super) struct Context<AC> {
     pub(super) logger: Logger,
     pub(super) client: Arc<AC>,
     pub(super) store: Arc<dyn WritableStore>,
-    pub(super) max_buffer_size: usize,
-    pub(super) max_block_range: usize,
+    pub(super) buffer_size: usize,
+    pub(super) block_range: usize,
     pub(super) backoff: ExponentialBackoff,
     pub(super) deployment: DeploymentHash,
     pub(super) manifest: Manifest,
@@ -45,8 +45,8 @@ impl<AC> Context<AC> {
             logger,
             client,
             store,
-            max_buffer_size: env.max_buffer_size,
-            max_block_range: env.max_block_range,
+            buffer_size: env.buffer_size,
+            block_range: env.block_range,
             backoff,
             deployment,
             manifest,
@@ -77,15 +77,7 @@ impl<AC> Context<AC> {
             .map(|block_ptr| (block_ptr.number.compat(), block_ptr.hash.compat()))
     }
 
-    pub(super) fn total_queries(&self) -> usize {
-        self.manifest
-            .data_sources
-            .iter()
-            .map(|data_source| data_source.transformer.tables.len())
-            .sum()
-    }
-
-    pub(super) fn min_start_block(&self) -> BlockNumber {
+    pub(super) fn start_block(&self) -> BlockNumber {
         self.manifest
             .data_sources
             .iter()
@@ -94,7 +86,7 @@ impl<AC> Context<AC> {
             .unwrap()
     }
 
-    pub(super) fn max_end_block(&self) -> BlockNumber {
+    pub(super) fn end_block(&self) -> BlockNumber {
         self.manifest
             .data_sources
             .iter()
diff --git a/core/src/amp_subgraph/runner/data_processing.rs b/core/src/amp_subgraph/runner/data_processing.rs
index 8c403de2b7f..d5bf991d505 100644
--- a/core/src/amp_subgraph/runner/data_processing.rs
+++ b/core/src/amp_subgraph/runner/data_processing.rs
@@ -6,27 +6,27 @@ use arrow::array::RecordBatch;
 use chrono::{DateTime, Utc};
 use graph::{
     amp::{
-        codec::{utils::auto_block_timestamp_decoder, DecodeOutput, DecodedEntity, Decoder},
+        codec::{DecodeOutput, DecodedEntity, Decoder, utils::auto_block_timestamp_decoder},
         stream_aggregator::{RecordBatchGroup, RecordBatchGroups, StreamRecordBatch},
     },
     blockchain::block_stream::FirehoseCursor,
     cheap_clone::CheapClone,
-    components::store::{EntityCache, ModificationsAndCache},
+    components::store::{EntityCache, EntityLfuCache, ModificationsAndCache, SeqGenerator},
 };
 use slog::{debug, trace};
 
-use super::{data_stream::TablePtr, Compat, Context, Error};
+use super::{Compat, Context, Error, data_stream::TablePtr};
 
 pub(super) async fn process_record_batch_groups<AC>(
     cx: &mut Context<AC>,
-    mut entity_cache: EntityCache,
+    mut entity_lfu_cache: EntityLfuCache,
     record_batch_groups: RecordBatchGroups,
     stream_table_ptr: Arc<[TablePtr]>,
     latest_block: BlockNumber,
-) -> Result<EntityCache, Error> {
+) -> Result<EntityLfuCache, Error> {
     if record_batch_groups.is_empty() {
         debug!(cx.logger, "Received no record batch groups");
-        return Ok(entity_cache);
+        return Ok(entity_lfu_cache);
     }
 
     let from_block = record_batch_groups
@@ -50,9 +50,9 @@ pub(super) async fn process_record_batch_groups<AC>(
             "record_batches_count" => record_batch_group.record_batches.len()
         );
 
-        entity_cache = process_record_batch_group(
+        entity_lfu_cache = process_record_batch_group(
             cx,
-            entity_cache,
+            entity_lfu_cache,
             block_number,
             block_hash,
             record_batch_group,
@@ -79,18 +79,18 @@ pub(super) async fn process_record_batch_groups<AC>(
         "to_block" => to_block
     );
 
-    Ok(entity_cache)
+    Ok(entity_lfu_cache)
 }
 
 async fn process_record_batch_group<AC>(
     cx: &mut Context<AC>,
-    mut entity_cache: EntityCache,
+    entity_lfu_cache: EntityLfuCache,
     block_number: BlockNumber,
     block_hash: BlockHash,
     record_batch_group: RecordBatchGroup,
     stream_table_ptr: &[TablePtr],
     latest_block: BlockNumber,
-) -> Result<EntityCache, Error> {
+) -> Result<EntityLfuCache, Error> {
     let _section = cx
         .metrics
         .stopwatch
@@ -100,9 +100,15 @@ async fn process_record_batch_group<AC>(
 
     if record_batches.is_empty() {
         debug!(cx.logger, "Record batch group is empty");
-        return Ok(entity_cache);
+        return Ok(entity_lfu_cache);
     }
 
+    let mut entity_cache = EntityCache::with_current(
+        cx.store.cheap_clone(),
+        entity_lfu_cache,
+        SeqGenerator::new(block_number.compat()),
+    );
+
     let block_timestamp = if cx.manifest.schema.has_aggregations() {
         decode_block_timestamp(&record_batches)
             .map_err(|e| e.context("failed to decode block timestamp"))?
@@ -121,7 +127,6 @@ async fn process_record_batch_group<AC>(
         process_record_batch(
             cx,
             &mut entity_cache,
-            block_number,
             record_batch,
             stream_table_ptr[stream_index],
         )
@@ -139,7 +144,7 @@ async fn process_record_batch_group<AC>(
         entity_lfu_cache,
         evict_stats: _,
     } = entity_cache
-        .as_modifications(block_number.compat())
+        .as_modifications(block_number.compat(), &cx.metrics.stopwatch)
         .await
         .map_err(Error::from)
         .map_err(|e| e.context("failed to extract entity modifications from the state"))?;
@@ -169,16 +174,12 @@ async fn process_record_batch_group<AC>(
         cx.metrics.deployment_synced.record(true);
     }
 
-    Ok(EntityCache::with_current(
-        cx.store.cheap_clone(),
-        entity_lfu_cache,
-    ))
+    Ok(entity_lfu_cache)
 }
 
 async fn process_record_batch<AC>(
     cx: &mut Context<AC>,
     entity_cache: &mut EntityCache,
-    block_number: BlockNumber,
     record_batch: RecordBatch,
     (i, j): TablePtr,
 ) -> Result<(), Error> {
@@ -209,13 +210,11 @@ async fn process_record_batch<AC>(
         let key = match key {
             Some(key) => key,
             None => {
-                let entity_id = entity_cache
-                    .generate_id(id_type, block_number.compat())
-                    .map_err(|e| {
-                        Error::Deterministic(e.context(format!(
-                            "failed to generate a new id for an entity of type '{entity_name}'"
-                        )))
-                    })?;
+                let entity_id = entity_cache.seq_gen.id(id_type).map_err(|e| {
+                    Error::Deterministic(e.context(format!(
+                        "failed to generate a new id for an entity of type '{entity_name}'"
+                    )))
+                })?;
 
                 entity_data.push(("id".into(), entity_id.clone().into()));
                 entity_type.key(entity_id)
@@ -229,14 +228,11 @@ async fn process_record_batch<AC>(
             )))
         })?;
 
-        entity_cache
-            .set(key, entity, block_number.compat(), None)
-            .await
-            .map_err(|e| {
-                Error::Deterministic(e.context(format!(
-                    "failed to store a new entity of type '{entity_name}' with id '{entity_id}'"
-                )))
-            })?;
+        entity_cache.set(key, entity, None).await.map_err(|e| {
+            Error::Deterministic(e.context(format!(
+                "failed to store a new entity of type '{entity_name}' with id '{entity_id}'"
+            )))
+        })?;
     }
 
     Ok(())
diff --git a/core/src/amp_subgraph/runner/data_stream.rs b/core/src/amp_subgraph/runner/data_stream.rs
index ad6d6d471f8..693ae9384a7 100644
--- a/core/src/amp_subgraph/runner/data_stream.rs
+++ b/core/src/amp_subgraph/runner/data_stream.rs
@@ -3,16 +3,19 @@ use std::{collections::HashMap, ops::RangeInclusive, sync::Arc};
 use alloy::primitives::BlockNumber;
 use anyhow::anyhow;
 use futures::{
-    stream::{empty, BoxStream},
     StreamExt, TryStreamExt,
+    stream::{self, BoxStream},
 };
 use graph::{
     amp::{
+        Client,
+        client::ResponseBatch,
+        error::IsDeterministic,
         manifest::DataSource,
         stream_aggregator::{RecordBatchGroups, StreamAggregator},
-        Client,
     },
     cheap_clone::CheapClone,
+    prelude::StopwatchMetrics,
 };
 use slog::{debug, warn};
 
@@ -25,135 +28,158 @@ pub(super) fn new_data_stream<AC>(
     latest_block: BlockNumber,
 ) -> BoxStream<'static, Result<(RecordBatchGroups, Arc<[TablePtr]>), Error>>
 where
-    AC: Client,
+    AC: Client + Send + Sync + 'static,
 {
     let logger = cx.logger.new(slog::o!("process" => "new_data_stream"));
-
-    let total_queries = cx.total_queries();
-    let mut total_queries_to_execute = 0;
-    let mut data_streams = Vec::new();
-    let mut latest_queried_block = cx.latest_synced_block();
-    let mut max_end_block = BlockNumber::MIN;
+    let client = cx.client.cheap_clone();
+    let manifest = cx.manifest.clone();
+    let buffer_size = cx.buffer_size;
+    let block_range = cx.block_range;
+    let stopwatch = cx.metrics.stopwatch.cheap_clone();
 
     debug!(logger, "Creating data stream";
-        "from_block" => latest_queried_block.unwrap_or(BlockNumber::MIN),
+        "from_block" => cx.latest_synced_block().unwrap_or(BlockNumber::MIN),
         "to_block" => latest_block,
-        "min_start_block" => cx.min_start_block(),
-        "max_block_range" => cx.max_block_range,
+        "start_block" => cx.start_block(),
+        "block_range" => block_range,
     );
 
-    loop {
-        let next_block_ranges = next_block_ranges(cx, latest_queried_block, latest_block);
-
-        if next_block_ranges.is_empty() {
-            if data_streams.is_empty() {
-                warn!(logger, "There are no unprocessed block ranges");
-            }
-            break;
-        }
-
-        let mut query_streams = Vec::with_capacity(total_queries);
-        let mut query_streams_table_ptr = Vec::with_capacity(total_queries);
-        let mut min_start_block = BlockNumber::MAX;
-
-        for (i, data_source) in cx.manifest.data_sources.iter().enumerate() {
-            let Some(block_range) = next_block_ranges.get(&i) else {
-                continue;
-            };
-
-            if *block_range.start() < min_start_block {
-                min_start_block = *block_range.start();
+    // State: (latest_queried_block, end_block, is_first)
+    let initial_state = (cx.latest_synced_block(), BlockNumber::MIN, true);
+
+    stream::unfold(
+        initial_state,
+        move |(latest_queried_block, mut end_block, is_first)| {
+            let block_ranges = next_block_ranges(
+                &manifest.data_sources,
+                block_range,
+                latest_queried_block,
+                latest_block,
+            );
+
+            if block_ranges.is_empty() {
+                if is_first {
+                    warn!(logger, "There are no unprocessed block ranges");
+                }
+                return futures::future::ready(None);
             }
 
-            if *block_range.end() > max_end_block {
-                max_end_block = *block_range.end();
-            }
+            let start_block = block_ranges.values().map(|r| *r.start()).min().unwrap();
+            end_block = end_block.max(block_ranges.values().map(|r| *r.end()).max().unwrap());
+
+            let (query_streams, table_ptrs) =
+                build_query_streams(&*client, &logger, &manifest.data_sources, &block_ranges);
+
+            let data_stream = build_data_stream(
+                &logger,
+                query_streams,
+                table_ptrs,
+                buffer_size,
+                &stopwatch,
+                start_block,
+            );
+
+            debug!(logger, "Created a new data stream";
+                "latest_queried_block" => latest_queried_block,
+                "start_block" => start_block,
+                "end_block" => end_block,
+            );
+            futures::future::ready(Some((data_stream, (Some(end_block), end_block, false))))
+        },
+    )
+    .flatten()
+    .boxed()
+}
 
-            for (j, table) in data_source.transformer.tables.iter().enumerate() {
-                let query = table.query.build_with_block_range(block_range);
-                let stream = cx.client.query(&cx.logger, query, None);
-                let stream_name = format!("{}.{}", data_source.name, table.name);
+fn build_query_streams<AC: Client>(
+    client: &AC,
+    logger: &slog::Logger,
+    data_sources: &[DataSource],
+    block_ranges: &HashMap<usize, RangeInclusive<BlockNumber>>,
+) -> (
+    Vec<(String, BoxStream<'static, Result<ResponseBatch, AC::Error>>)>,
+    Arc<[TablePtr]>,
+) {
+    let total_queries: usize = data_sources
+        .iter()
+        .map(|ds| ds.transformer.tables.len())
+        .sum();
 
-                query_streams.push((stream_name, stream));
-                query_streams_table_ptr.push((i, j));
-            }
-        }
+    let mut query_streams = Vec::with_capacity(total_queries);
+    let mut table_ptrs = Vec::with_capacity(total_queries);
 
-        let query_streams_table_ptr: Arc<[TablePtr]> = query_streams_table_ptr.into();
-        total_queries_to_execute += query_streams.len();
-
-        let mut min_start_block_checked = false;
-        let mut load_first_record_batch_group_section = Some(
-            cx.metrics
-                .stopwatch
-                .start_section("load_first_record_batch_group"),
-        );
-
-        data_streams.push(
-            StreamAggregator::new(&cx.logger, query_streams, cx.max_buffer_size)
-                .map_ok(move |response| (response, query_streams_table_ptr.cheap_clone()))
-                .map_err(Error::from)
-                .map(move |result| {
-                    if load_first_record_batch_group_section.is_some() {
-                        let _section = load_first_record_batch_group_section.take();
-                    }
+    for (i, data_source) in data_sources.iter().enumerate() {
+        let Some(block_range) = block_ranges.get(&i) else {
+            continue;
+        };
 
-                    match result {
-                        Ok(response) => {
-                            if !min_start_block_checked {
-                                if let Some(((first_block, _), _)) = response.0.first_key_value() {
-                                    if *first_block < min_start_block {
-                                        return Err(Error::NonDeterministic(anyhow!(
-                                            "chain reorg"
-                                        )));
-                                    }
-                                }
-
-                                min_start_block_checked = true;
-                            }
-
-                            Ok(response)
-                        }
-                        Err(e) => Err(e),
-                    }
-                })
-                .boxed(),
-        );
+        for (j, table) in data_source.transformer.tables.iter().enumerate() {
+            let query = table.query.build_with_block_range(block_range);
+            let stream = client.query(logger, query, None);
+            let stream_name = format!("{}.{}", data_source.name, table.name);
 
-        if max_end_block >= latest_block {
-            break;
+            query_streams.push((stream_name, stream));
+            table_ptrs.push((i, j));
         }
-
-        latest_queried_block = Some(max_end_block);
     }
 
-    debug!(logger, "Created aggregated data streams";
-        "total_data_streams" => data_streams.len(),
-        "total_queries_to_execute" => total_queries_to_execute
-    );
+    (query_streams, table_ptrs.into())
+}
+
+fn build_data_stream<E>(
+    logger: &slog::Logger,
+    query_streams: Vec<(String, BoxStream<'static, Result<ResponseBatch, E>>)>,
+    table_ptrs: Arc<[TablePtr]>,
+    buffer_size: usize,
+    stopwatch: &StopwatchMetrics,
+    start_block: BlockNumber,
+) -> BoxStream<'static, Result<(RecordBatchGroups, Arc<[TablePtr]>), Error>>
+where
+    E: std::error::Error + IsDeterministic + Send + Sync + 'static,
+{
+    let mut start_block_checked = false;
+    let mut load_first_record_batch_group_section =
+        Some(stopwatch.start_section("load_first_record_batch_group"));
+
+    StreamAggregator::new(logger, query_streams, buffer_size)
+        .map_ok(move |response| (response, table_ptrs.cheap_clone()))
+        .map_err(Error::from)
+        .map(move |result| {
+            if load_first_record_batch_group_section.is_some() {
+                let _section = load_first_record_batch_group_section.take();
+            }
 
-    let mut iter = data_streams.into_iter();
-    let mut merged_data_stream = iter.next().unwrap_or_else(|| empty().boxed());
+            match result {
+                Ok(response) => {
+                    if !start_block_checked {
+                        if let Some(((first_block, _), _)) = response.0.first_key_value()
+                            && *first_block < start_block
+                        {
+                            return Err(Error::NonDeterministic(anyhow!("chain reorg")));
+                        }
 
-    for data_stream in iter {
-        merged_data_stream = merged_data_stream.chain(data_stream).boxed();
-    }
+                        start_block_checked = true;
+                    }
 
-    merged_data_stream
+                    Ok(response)
+                }
+                Err(e) => Err(e),
+            }
+        })
+        .boxed()
 }
 
-fn next_block_ranges<AC>(
-    cx: &Context<AC>,
+fn next_block_ranges(
+    data_sources: &[DataSource],
+    block_range: usize,
     latest_queried_block: Option<BlockNumber>,
     latest_block: BlockNumber,
 ) -> HashMap<usize, RangeInclusive<BlockNumber>> {
-    let block_ranges = cx
-        .manifest
-        .data_sources
+    let block_ranges = data_sources
         .iter()
         .enumerate()
         .filter_map(|(i, data_source)| {
-            next_block_range(cx, data_source, latest_queried_block, latest_block)
+            next_block_range(block_range, data_source, latest_queried_block, latest_block)
                 .map(|block_range| (i, block_range))
         })
         .collect::<HashMap<_, _>>();
@@ -172,8 +198,8 @@ fn next_block_ranges<AC>(
         .collect()
 }
 
-fn next_block_range<AC>(
-    cx: &Context<AC>,
+fn next_block_range(
+    block_range: usize,
     data_source: &DataSource,
     latest_queried_block: Option<BlockNumber>,
     latest_block: BlockNumber,
@@ -190,7 +216,7 @@ fn next_block_range<AC>(
     };
 
     let end_block = [
-        start_block.saturating_add(cx.max_block_range as BlockNumber),
+        start_block.saturating_add(block_range as BlockNumber),
         data_source.source.end_block,
         latest_block,
     ]
diff --git a/core/src/amp_subgraph/runner/latest_blocks.rs b/core/src/amp_subgraph/runner/latest_blocks.rs
index cb62f2e3a42..17bdc23dd29 100644
--- a/core/src/amp_subgraph/runner/latest_blocks.rs
+++ b/core/src/amp_subgraph/runner/latest_blocks.rs
@@ -1,13 +1,13 @@
 use alloy::primitives::BlockNumber;
 use anyhow::anyhow;
 use arrow::array::RecordBatch;
-use futures::{future::try_join_all, stream::BoxStream, StreamExt, TryFutureExt};
+use futures::{StreamExt, TryFutureExt, future::try_join_all, stream::BoxStream};
 use graph::amp::{
+    Client,
     client::ResponseBatch,
-    codec::{utils::block_number_decoder, Decoder},
+    codec::{Decoder, utils::block_number_decoder},
     error::IsDeterministic,
     manifest::DataSource,
-    Client,
 };
 use itertools::Itertools;
 use slog::debug;
@@ -152,7 +152,9 @@ async fn latest_block_changed<AC>(
 where
     AC: Client,
 {
-    let query = format!("SELECT _block_num FROM {dataset}.{table} WHERE _block_num > {latest_block} SETTINGS stream = true");
+    let query = format!(
+        "SELECT _block_num FROM {dataset}.{table} WHERE _block_num > {latest_block} SETTINGS stream = true"
+    );
     let stream = cx.client.query(&cx.logger, query, None);
     let _record_batch = read_once(stream).await?;
 
diff --git a/core/src/amp_subgraph/runner/mod.rs b/core/src/amp_subgraph/runner/mod.rs
index a74cf3871de..4e0e85294b6 100644
--- a/core/src/amp_subgraph/runner/mod.rs
+++ b/core/src/amp_subgraph/runner/mod.rs
@@ -11,8 +11,8 @@ use std::time::{Duration, Instant};
 use anyhow::Result;
 use futures::StreamExt;
 use graph::{
-    amp::Client, cheap_clone::CheapClone, components::store::EntityCache,
-    data::subgraph::schema::SubgraphError,
+    amp::Client, cheap_clone::CheapClone, components::store::EntityLfuCache,
+    data::subgraph::schema::SubgraphError, util::lfu_cache::LfuCache,
 };
 use slog::{debug, error, warn};
 use tokio_util::sync::CancellationToken;
@@ -67,7 +67,7 @@ where
 
 async fn run_indexing<AC>(cx: &mut Context<AC>) -> Result<(), Error>
 where
-    AC: Client,
+    AC: Client + Send + Sync + 'static,
 {
     cx.metrics.deployment_status.starting();
 
@@ -101,32 +101,44 @@ where
 
         cx.metrics
             .deployment_target
-            .update(latest_block.min(cx.max_end_block()));
+            .update(latest_block.min(cx.end_block()));
 
         let mut deployment_is_failed = cx.store.health().await?.is_failed();
-        let mut entity_cache = EntityCache::new(cx.store.cheap_clone());
+        let mut entity_lfu_cache: EntityLfuCache = LfuCache::new();
         let mut stream = new_data_stream(cx, latest_block);
 
         while let Some(result) = stream.next().await {
             let (record_batch_groups, stream_table_ptr) = result?;
 
-            entity_cache = process_record_batch_groups(
+            entity_lfu_cache = process_record_batch_groups(
                 cx,
-                entity_cache,
+                entity_lfu_cache,
                 record_batch_groups,
                 stream_table_ptr,
                 latest_block,
             )
             .await?;
 
-            if deployment_is_failed {
-                if let Some(block_ptr) = cx.store.block_ptr() {
-                    cx.store.unfail_non_deterministic_error(&block_ptr).await?;
-                    deployment_is_failed = false;
-                }
+            if deployment_is_failed && let Some(block_ptr) = cx.store.block_ptr() {
+                cx.store.unfail_non_deterministic_error(&block_ptr).await?;
+                deployment_is_failed = false;
             }
         }
 
+        // Check if the Amp Flight server has data covering through every data
+        // source's endBlock. This handles the case where endBlock has no entity
+        // data — the persisted block pointer never advances to endBlock, but the
+        // server's latest block confirms all queries have been served.
+        if latest_block >= cx.end_block() {
+            cx.metrics.deployment_synced.record(true);
+
+            debug!(cx.logger, "Indexing completed; endBlock reached via server latest block";
+                "latest_block" => latest_block,
+                "end_block" => cx.end_block()
+            );
+            return Ok(());
+        }
+
         debug!(cx.logger, "Completed indexing iteration";
             "latest_synced_block_ptr" => ?cx.latest_synced_block_ptr()
         );
@@ -138,7 +150,7 @@ where
 
 async fn run_indexing_with_retries<AC>(cx: &mut Context<AC>) -> Result<()>
 where
-    AC: Client,
+    AC: Client + Send + Sync + 'static,
 {
     loop {
         match run_indexing(cx).await {
diff --git a/core/src/amp_subgraph/runner/reorg_handler.rs b/core/src/amp_subgraph/runner/reorg_handler.rs
index 03130b19625..8f59169304b 100644
--- a/core/src/amp_subgraph/runner/reorg_handler.rs
+++ b/core/src/amp_subgraph/runner/reorg_handler.rs
@@ -1,10 +1,10 @@
 use alloy::primitives::{BlockHash, BlockNumber};
 use anyhow::anyhow;
-use futures::{future::try_join_all, StreamExt, TryFutureExt};
+use futures::{StreamExt, TryFutureExt, future::try_join_all};
 use graph::{
     amp::{
-        client::{LatestBlockBeforeReorg, RequestMetadata, ResponseBatch, ResumeStreamingQuery},
         Client,
+        client::{LatestBlockBeforeReorg, RequestMetadata, ResponseBatch, ResumeStreamingQuery},
     },
     blockchain::block_stream::FirehoseCursor,
 };
diff --git a/core/src/polling_monitor/arweave_service.rs b/core/src/polling_monitor/arweave_service.rs
index 51249324df7..cc42f7af5ea 100644
--- a/core/src/polling_monitor/arweave_service.rs
+++ b/core/src/polling_monitor/arweave_service.rs
@@ -2,18 +2,18 @@ use anyhow::Error;
 use bytes::Bytes;
 use graph::futures03::future::BoxFuture;
 use graph::{
-    components::link_resolver::{ArweaveClient, ArweaveResolver, FileSizeLimit},
+    components::link_resolver::{ArweaveResolver, FileSizeLimit},
     data_source::offchain::Base64,
     derive::CheapClone,
     prelude::CheapClone,
 };
 use std::{sync::Arc, time::Duration};
-use tower::{buffer::Buffer, ServiceBuilder, ServiceExt};
+use tower::{ServiceBuilder, ServiceExt, buffer::Buffer};
 
 pub type ArweaveService = Buffer<Base64, BoxFuture<'static, Result<Option<Bytes>, Error>>>;
 
 pub fn arweave_service(
-    client: Arc<ArweaveClient>,
+    client: Arc<dyn ArweaveResolver>,
     rate_limit: u16,
     max_file_size: FileSizeLimit,
 ) -> ArweaveService {
@@ -34,7 +34,7 @@ pub fn arweave_service(
 
 #[derive(Clone, CheapClone)]
 struct ArweaveServiceInner {
-    client: Arc<ArweaveClient>,
+    client: Arc<dyn ArweaveResolver>,
     max_file_size: FileSizeLimit,
 }
 
diff --git a/core/src/polling_monitor/ipfs_service.rs b/core/src/polling_monitor/ipfs_service.rs
index e35fcf30d30..6847bb82acd 100644
--- a/core/src/polling_monitor/ipfs_service.rs
+++ b/core/src/polling_monitor/ipfs_service.rs
@@ -1,13 +1,13 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::anyhow;
 use anyhow::Error;
+use anyhow::anyhow;
 use bytes::Bytes;
 use graph::futures03::future::BoxFuture;
 use graph::ipfs::{ContentPath, IpfsClient, IpfsContext, RetryPolicy};
 use graph::{derive::CheapClone, prelude::CheapClone};
-use tower::{buffer::Buffer, ServiceBuilder, ServiceExt};
+use tower::{ServiceBuilder, ServiceExt, buffer::Buffer};
 
 pub type IpfsService = Buffer<IpfsRequest, BoxFuture<'static, Result<Option<Bytes>, Error>>>;
 
@@ -104,16 +104,15 @@ mod test {
     use std::time::Duration;
 
     use graph::components::link_resolver::ArweaveClient;
-    use graph::components::link_resolver::ArweaveResolver;
     use graph::data::value::Word;
     use graph::ipfs::test_utils::add_files_to_local_ipfs_node_for_testing;
     use graph::ipfs::{IpfsContext, IpfsMetrics, IpfsRpcClient, ServerAddress};
     use graph::log::discard;
     use tower::ServiceExt;
-    use wiremock::matchers as m;
     use wiremock::Mock;
     use wiremock::MockServer;
     use wiremock::ResponseTemplate;
+    use wiremock::matchers as m;
 
     use super::*;
 
@@ -133,7 +132,7 @@ mod test {
         let dir_cid = add_resp.into_iter().find(|x| x.name == "dir").unwrap().hash;
 
         let client = IpfsRpcClient::new_unchecked(
-            ServerAddress::local_rpc_api(),
+            ServerAddress::test_rpc_api(),
             IpfsMetrics::test(),
             &graph::log::discard(),
         )
@@ -154,12 +153,15 @@ mod test {
         assert_eq!(content.to_vec(), random_bytes);
     }
 
+    // Ignored because arweave.net is unreliable right now
     #[graph::test]
+    #[ignore]
     async fn arweave_get() {
         const ID: &str = "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8";
 
-        let cl = ArweaveClient::default();
-        let body = cl.get(&Word::from(ID)).await.unwrap();
+        let Some(body) = ArweaveClient::get_test(&Word::from(ID)).await else {
+            return;
+        };
         let body = String::from_utf8(body).unwrap();
 
         let expected = r#"
diff --git a/core/src/polling_monitor/mod.rs b/core/src/polling_monitor/mod.rs
index fa0b433f4de..f8a24db97d7 100644
--- a/core/src/polling_monitor/mod.rs
+++ b/core/src/polling_monitor/mod.rs
@@ -14,11 +14,11 @@ use graph::cheap_clone::CheapClone;
 use graph::env::ENV_VARS;
 use graph::futures03::future::BoxFuture;
 use graph::futures03::stream::StreamExt;
-use graph::futures03::{stream, Future, FutureExt, TryFutureExt};
+use graph::futures03::{Future, FutureExt, TryFutureExt, stream};
 use graph::parking_lot::Mutex;
 use graph::prelude::tokio;
 use graph::prometheus::{Counter, Gauge};
-use graph::slog::{debug, Logger};
+use graph::slog::{Logger, debug};
 use graph::util::monitored::MonitoredVecDeque as VecDeque;
 use tokio::sync::{mpsc, watch};
 use tower::retry::backoff::{Backoff, ExponentialBackoff, ExponentialBackoffMaker, MakeBackoff};
@@ -28,8 +28,8 @@ use tower::{Service, ServiceExt};
 use self::request::RequestId;
 
 pub use self::metrics::PollingMonitorMetrics;
-pub use arweave_service::{arweave_service, ArweaveService};
-pub use ipfs_service::{ipfs_service, IpfsRequest, IpfsService};
+pub use arweave_service::{ArweaveService, arweave_service};
+pub use ipfs_service::{IpfsRequest, IpfsService, ipfs_service};
 
 const MIN_BACKOFF: Duration = Duration::from_secs(5);
 
@@ -53,7 +53,7 @@ impl<ID: Eq + Hash> Backoffs<ID> {
         }
     }
 
-    fn next_backoff(&mut self, id: ID) -> impl Future<Output = ()> {
+    fn next_backoff(&mut self, id: ID) -> impl Future<Output = ()> + Send + use<ID> {
         self.backoffs
             .entry(id)
             .or_insert_with(|| self.backoff_maker.make_backoff())
diff --git a/core/src/subgraph/context/instance/mod.rs b/core/src/subgraph/context/instance/mod.rs
index e9c311420e6..494ae227e97 100644
--- a/core/src/subgraph/context/instance/mod.rs
+++ b/core/src/subgraph/context/instance/mod.rs
@@ -5,8 +5,8 @@ use graph::futures01::sync::mpsc::Sender;
 use graph::{
     blockchain::{Blockchain, TriggerData as _},
     data_source::{
-        causality_region::CausalityRegionSeq, offchain, CausalityRegion, DataSource,
-        DataSourceTemplate, TriggerData,
+        CausalityRegion, DataSource, DataSourceTemplate, TriggerData,
+        causality_region::CausalityRegionSeq, offchain,
     },
     prelude::*,
 };
@@ -100,11 +100,11 @@ where
     ) -> Result<Option<Arc<T::Host>>, Error> {
         let module_bytes = match &data_source.runtime() {
             None => return Ok(None),
-            Some(ref module_bytes) => module_bytes.cheap_clone(),
+            Some(module_bytes) => module_bytes.cheap_clone(),
         };
 
         let mapping_request_sender = {
-            let module_hash = tiny_keccak::keccak256(module_bytes.as_ref());
+            let module_hash = alloy::primitives::keccak256(module_bytes.as_ref()).0;
             if let Some(sender) = self.module_cache.get(&module_hash) {
                 sender.clone()
             } else {
diff --git a/core/src/subgraph/context/mod.rs b/core/src/subgraph/context/mod.rs
index 2b7d560dfc1..affbc09aa0f 100644
--- a/core/src/subgraph/context/mod.rs
+++ b/core/src/subgraph/context/mod.rs
@@ -1,18 +1,18 @@
 mod instance;
 
 use crate::polling_monitor::{
-    spawn_monitor, ArweaveService, IpfsRequest, IpfsService, PollingMonitor, PollingMonitorMetrics,
+    ArweaveService, IpfsRequest, IpfsService, PollingMonitor, PollingMonitorMetrics, spawn_monitor,
 };
 use anyhow::{self, Error};
 use bytes::Bytes;
 use graph::{
-    blockchain::{Blockchain, TriggerFilterWrapper},
+    blockchain::Blockchain,
     components::{store::DeploymentId, subgraph::HostMetrics},
     data::subgraph::SubgraphManifest,
     data_source::{
+        CausalityRegion, DataSource, DataSourceTemplate,
         causality_region::CausalityRegionSeq,
         offchain::{self, Base64},
-        CausalityRegion, DataSource, DataSourceTemplate,
     },
     derive::CheapClone,
     ipfs::IpfsContext,
@@ -74,7 +74,6 @@ where
     pub(crate) instance: SubgraphInstance<C, T>,
     pub instances: SubgraphKeepAlive,
     pub offchain_monitor: OffchainMonitor,
-    pub filter: Option<TriggerFilterWrapper<C>>,
     pub(crate) trigger_processor: Box<dyn TriggerProcessor<C, T>>,
     pub(crate) decoder: Box<Decoder<C, T>>,
 }
@@ -101,7 +100,6 @@ impl<C: Blockchain, T: RuntimeHostBuilder<C>> IndexingContext<C, T> {
             instance,
             instances,
             offchain_monitor,
-            filter: None,
             trigger_processor,
             decoder,
         }
@@ -116,12 +114,12 @@ impl<C: Blockchain, T: RuntimeHostBuilder<C>> IndexingContext<C, T> {
     /// `process_trigger`.
     ///
     /// File data sources that have been marked not done during this process will get re-queued
-    pub fn revert_data_sources(&mut self, reverted_block: BlockNumber) -> Result<(), Error> {
+    pub fn revert_data_sources(&mut self, reverted_block: BlockNumber) {
         let removed = self.instance.revert_data_sources(reverted_block);
 
         removed
             .into_iter()
-            .try_for_each(|source| self.offchain_monitor.add_source(source))
+            .for_each(|source| self.offchain_monitor.add_source(source))
     }
 
     pub fn add_dynamic_data_source(
@@ -134,12 +132,12 @@ impl<C: Blockchain, T: RuntimeHostBuilder<C>> IndexingContext<C, T> {
             .map(|ds| (ds.source.clone(), ds.is_processed()));
         let host = self.instance.add_dynamic_data_source(logger, data_source)?;
 
-        if host.is_some() {
-            if let Some((source, is_processed)) = offchain_fields {
-                // monitor data source only if it has not yet been processed.
-                if !is_processed {
-                    self.offchain_monitor.add_source(source)?;
-                }
+        if host.is_some()
+            && let Some((source, is_processed)) = offchain_fields
+        {
+            // monitor data source only if it has not yet been processed.
+            if !is_processed {
+                self.offchain_monitor.add_source(source);
             }
         }
 
@@ -214,7 +212,7 @@ impl OffchainMonitor {
         }
     }
 
-    fn add_source(&mut self, source: offchain::Source) -> Result<(), Error> {
+    fn add_source(&mut self, source: offchain::Source) {
         match source {
             offchain::Source::Ipfs(path) => self.ipfs_monitor.monitor(IpfsRequest {
                 ctx: IpfsContext::new(&self.deployment_hash, &self.logger),
@@ -222,7 +220,6 @@ impl OffchainMonitor {
             }),
             offchain::Source::Arweave(base64) => self.arweave_monitor.monitor(base64),
         };
-        Ok(())
     }
 
     pub fn ready_offchain_events(&mut self) -> Result<Vec<offchain::TriggerData>, Error> {
diff --git a/core/src/subgraph/error.rs b/core/src/subgraph/error.rs
index 502a28dbc66..00413acb258 100644
--- a/core/src/subgraph/error.rs
+++ b/core/src/subgraph/error.rs
@@ -1,6 +1,6 @@
 use graph::data::subgraph::schema::SubgraphError;
 use graph::env::ENV_VARS;
-use graph::prelude::{anyhow, thiserror, Error, StoreError};
+use graph::prelude::{Error, StoreError, anyhow, thiserror};
 
 pub trait DeterministicError: std::fmt::Debug + std::fmt::Display + Send + Sync + 'static {}
 
@@ -10,6 +10,37 @@ impl DeterministicError for StoreError {}
 
 impl DeterministicError for anyhow::Error {}
 
+/// Classification of processing errors for unified error handling.
+///
+/// This enum provides a consistent way to categorize errors and determine
+/// the appropriate response. The error handling invariants are:
+///
+/// - **Deterministic**: Stop processing the current block, persist PoI only.
+///   The subgraph will be marked as failed. These errors are reproducible
+///   and indicate a bug in the subgraph or a permanent data issue.
+///
+/// - **NonDeterministic**: Retry with exponential backoff. These errors are
+///   transient (network issues, temporary database problems) and may succeed
+///   on retry.
+///
+/// - **PossibleReorg**: Restart the block stream cleanly without persisting.
+///   The block stream needs to be restarted to detect and handle a potential
+///   blockchain reorganization.
+///
+/// - **Canceled**: The subgraph was canceled (unassigned or shut down).
+///   No error should be recorded; this is a clean shutdown.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ProcessingErrorKind {
+    /// Error is deterministic - stop processing, persist PoI only
+    Deterministic,
+    /// Error is non-deterministic - retry with backoff
+    NonDeterministic,
+    /// Possible blockchain reorg detected - restart block stream cleanly
+    PossibleReorg,
+    /// Processing was canceled - clean shutdown
+    Canceled,
+}
+
 /// An error happened during processing and we need to classify errors into
 /// deterministic and non-deterministic errors. This struct holds the result
 /// of that classification
@@ -23,13 +54,72 @@ pub enum ProcessingError {
     #[error("{0}")]
     Deterministic(Box<dyn DeterministicError>),
 
+    /// A possible blockchain reorganization was detected.
+    /// The block stream should be restarted to detect and handle the reorg.
+    #[error("possible reorg detected: {0:#}")]
+    PossibleReorg(Error),
+
     #[error("subgraph stopped while processing triggers")]
     Canceled,
 }
 
 impl ProcessingError {
+    /// Classify the error into one of the defined error kinds.
+    ///
+    /// This method provides a unified way to determine how to handle an error:
+    /// - `Deterministic`: Stop processing, persist PoI only
+    /// - `NonDeterministic`: Retry with backoff
+    /// - `PossibleReorg`: Restart block stream cleanly
+    /// - `Canceled`: Clean shutdown, no error recording
+    pub fn kind(&self) -> ProcessingErrorKind {
+        match self {
+            ProcessingError::Unknown(_) => ProcessingErrorKind::NonDeterministic,
+            ProcessingError::Deterministic(_) => ProcessingErrorKind::Deterministic,
+            ProcessingError::PossibleReorg(_) => ProcessingErrorKind::PossibleReorg,
+            ProcessingError::Canceled => ProcessingErrorKind::Canceled,
+        }
+    }
+
+    #[allow(dead_code)]
     pub fn is_deterministic(&self) -> bool {
-        matches!(self, ProcessingError::Deterministic(_))
+        matches!(self.kind(), ProcessingErrorKind::Deterministic)
+    }
+
+    /// Returns true if this error should stop processing the current block.
+    ///
+    /// Deterministic errors stop processing because continuing would produce
+    /// incorrect results. The PoI is still persisted for debugging purposes.
+    #[allow(dead_code)]
+    pub fn should_stop_processing(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::Deterministic)
+    }
+
+    /// Returns true if this error requires a clean restart of the block stream.
+    ///
+    /// Possible reorgs require restarting to allow the block stream to detect
+    /// and properly handle the reorganization. No state should be persisted
+    /// in this case.
+    #[allow(dead_code)]
+    pub fn should_restart(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::PossibleReorg)
+    }
+
+    /// Returns true if this error is retryable with exponential backoff.
+    ///
+    /// Non-deterministic errors (network issues, temporary failures) may
+    /// succeed on retry and should not immediately fail the subgraph.
+    #[allow(dead_code)]
+    pub fn is_retryable(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::NonDeterministic)
+    }
+
+    /// Returns true if processing was canceled (clean shutdown).
+    ///
+    /// Canceled errors indicate the subgraph was unassigned or shut down
+    /// intentionally and should not be treated as failures.
+    #[allow(dead_code)]
+    pub fn is_canceled(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::Canceled)
     }
 
     pub fn detail(self, ctx: &str) -> ProcessingError {
@@ -41,6 +131,9 @@ impl ProcessingError {
             ProcessingError::Deterministic(e) => {
                 ProcessingError::Deterministic(Box::new(anyhow!("{e}").context(ctx.to_string())))
             }
+            ProcessingError::PossibleReorg(e) => {
+                ProcessingError::PossibleReorg(e.context(ctx.to_string()))
+            }
             ProcessingError::Canceled => ProcessingError::Canceled,
         }
     }
diff --git a/core/src/subgraph/inputs.rs b/core/src/subgraph/inputs.rs
index 88e89de4ff4..03a8cec29bc 100644
--- a/core/src/subgraph/inputs.rs
+++ b/core/src/subgraph/inputs.rs
@@ -1,5 +1,5 @@
 use graph::{
-    blockchain::{block_stream::TriggersAdapterWrapper, Blockchain},
+    blockchain::{Blockchain, block_stream::TriggersAdapterWrapper},
     components::{
         store::{DeploymentLocator, SourceableStore, SubgraphFork, WritableStore},
         subgraph::ProofOfIndexingVersion,
diff --git a/core/src/subgraph/instance_manager.rs b/core/src/subgraph/instance_manager.rs
index 5d0c89ae171..ea301ffc723 100644
--- a/core/src/subgraph/instance_manager.rs
+++ b/core/src/subgraph/instance_manager.rs
@@ -2,10 +2,10 @@ use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
 
 use crate::polling_monitor::{ArweaveService, IpfsService};
+use crate::subgraph::Decoder;
 use crate::subgraph::context::{IndexingContext, SubgraphKeepAlive};
 use crate::subgraph::inputs::IndexingInputs;
 use crate::subgraph::loader::load_dynamic_data_sources;
-use crate::subgraph::Decoder;
 use std::collections::BTreeSet;
 
 use crate::subgraph::runner::SubgraphRunner;
@@ -17,18 +17,18 @@ use graph::components::metrics::gas::GasMetrics;
 use graph::components::metrics::subgraph::DeploymentStatusMetric;
 use graph::components::store::SourceableStore;
 use graph::components::subgraph::ProofOfIndexingVersion;
-use graph::data::subgraph::{UnresolvedSubgraphManifest, SPEC_VERSION_0_0_6};
+use graph::data::subgraph::{SPEC_VERSION_0_0_6, UnresolvedSubgraphManifest};
 use graph::data::value::Word;
 use graph::data_source::causality_region::CausalityRegionSeq;
 use graph::env::EnvVars;
 use graph::prelude::{SubgraphInstanceManager as SubgraphInstanceManagerTrait, *};
 use graph::{blockchain::BlockchainMap, components::store::DeploymentLocator};
-use graph_runtime_wasm::module::ToAscPtr;
 use graph_runtime_wasm::RuntimeHostBuilder;
+use graph_runtime_wasm::module::ToAscPtr;
 use tokio::task;
 
-use super::context::OffchainMonitor;
 use super::SubgraphTriggerProcessor;
+use super::context::OffchainMonitor;
 use crate::{subgraph::runner::SubgraphRunnerError, subgraph_manifest};
 
 #[derive(Clone)]
@@ -278,17 +278,17 @@ impl<S: SubgraphStore, AC: amp::Client> SubgraphInstanceManager<S, AC> {
                 .with_retries(),
         );
 
-        if let Some(graft) = &manifest.graft {
-            if self.subgraph_store.is_deployed(&graft.base).await? {
-                // Makes sure the raw manifest is cached in the subgraph store
-                let _raw_manifest = subgraph_manifest::load_raw_subgraph_manifest(
-                    &logger,
-                    &*self.subgraph_store,
-                    &*self.link_resolver,
-                    &graft.base,
-                )
-                .await?;
-            }
+        if let Some(graft) = &manifest.graft
+            && self.subgraph_store.is_deployed(&graft.base).await?
+        {
+            // Makes sure the raw manifest is cached in the subgraph store
+            let _raw_manifest = subgraph_manifest::load_raw_subgraph_manifest(
+                &logger,
+                &*self.subgraph_store,
+                &*self.link_resolver,
+                &graft.base,
+            )
+            .await?;
         }
 
         info!(logger, "Resolve subgraph files using IPFS";
@@ -399,7 +399,15 @@ impl<S: SubgraphStore, AC: amp::Client> SubgraphInstanceManager<S, AC> {
         //   when to stop processing them.
         // - Offchain data sources might require processing beyond the end block of
         //   onchain data sources, so the subgraph needs to continue.
-        let max_end_block: Option<BlockNumber> = if data_sources.len() == end_blocks.len() {
+        //
+        // Note: we explicitly check each data source rather than comparing lengths, because
+        // `end_blocks` is a BTreeSet and deduplicates equal values, which would cause the
+        // length comparison to fail when multiple data sources share the same `end_block`.
+        let max_end_block: Option<BlockNumber> = if data_sources.iter().all(|d| {
+            d.as_onchain()
+                .and_then(|d: &C::DataSource| d.end_block())
+                .is_some()
+        }) {
             end_blocks.iter().max().cloned()
         } else {
             None
diff --git a/core/src/subgraph/registrar.rs b/core/src/subgraph/registrar.rs
index a60f2b01b03..e9422671e25 100644
--- a/core/src/subgraph/registrar.rs
+++ b/core/src/subgraph/registrar.rs
@@ -5,16 +5,17 @@ use graph::amp;
 use graph::blockchain::{Blockchain, BlockchainKind, BlockchainMap};
 use graph::components::{
     link_resolver::LinkResolverContext,
+    network_provider::AmpChainNames,
     store::{DeploymentId, DeploymentLocator, SubscriptionManager},
     subgraph::Settings,
 };
 use graph::data::{
-    subgraph::{schema::DeploymentCreate, Graft},
+    subgraph::{Graft, schema::DeploymentCreate},
     value::Word,
 };
-use graph::futures03::{self, future::TryFutureExt, Stream, StreamExt};
+use graph::futures03::{self, Stream, StreamExt, future::TryFutureExt};
 use graph::prelude::{CreateSubgraphResult, SubgraphRegistrar as SubgraphRegistrarTrait, *};
-use graph::util::futures::{retry_strategy, RETRY_DEFAULT_LIMIT};
+use graph::util::futures::{RETRY_DEFAULT_LIMIT, retry_strategy};
 use tokio_retry::Retry;
 
 pub struct SubgraphRegistrar<P, S, SM, AC> {
@@ -30,6 +31,7 @@ pub struct SubgraphRegistrar<P, S, SM, AC> {
     version_switching_mode: SubgraphVersionSwitchingMode,
     assignment_event_stream_cancel_guard: CancelGuard, // cancels on drop
     settings: Arc<Settings>,
+    amp_chain_names: Arc<AmpChainNames>,
 }
 
 impl<P, S, SM, AC> SubgraphRegistrar<P, S, SM, AC>
@@ -50,6 +52,7 @@ where
         node_id: NodeId,
         version_switching_mode: SubgraphVersionSwitchingMode,
         settings: Arc<Settings>,
+        amp_chain_names: Arc<AmpChainNames>,
     ) -> Self {
         let logger = logger_factory.component_logger("SubgraphRegistrar", None);
         let logger_factory = logger_factory.with_parent(logger.clone());
@@ -69,6 +72,7 @@ where
             version_switching_mode,
             assignment_event_stream_cancel_guard: CancelGuard::new(),
             settings,
+            amp_chain_names,
         }
     }
 
@@ -314,6 +318,7 @@ where
                     &resolver,
                     self.amp_client.cheap_clone(),
                     history_blocks,
+                    &self.amp_chain_names,
                 )
                 .await?
             }
@@ -333,6 +338,7 @@ where
                     &resolver,
                     self.amp_client.cheap_clone(),
                     history_blocks,
+                    &self.amp_chain_names,
                 )
                 .await?
             }
@@ -349,9 +355,12 @@ where
     }
 
     async fn remove_subgraph(&self, name: SubgraphName) -> Result<(), SubgraphRegistrarError> {
-        self.store.clone().remove_subgraph(name.clone()).await?;
+        use itertools::Itertools;
 
-        debug!(self.logger, "Removed subgraph"; "subgraph_name" => name.to_string());
+        let hashes = self.store.clone().remove_subgraph(name.clone()).await?;
+        let hashes = hashes.into_iter().join(", ");
+
+        debug!(self.logger, "Removed subgraph"; "subgraph_name" => name.to_string(), "deployments" => format!("[{}]", hashes));
 
         Ok(())
     }
@@ -411,7 +420,7 @@ async fn resolve_start_block(
         .expect("cannot identify minimum start block because there are no data sources")
     {
         0 => Ok(None),
-        min_start_block => Retry::spawn(retry_strategy(Some(2), RETRY_DEFAULT_LIMIT), move || {
+        min_start_block => Retry::start(retry_strategy(Some(2), RETRY_DEFAULT_LIMIT), move || {
             chain
                 .block_pointer_from_number(logger, min_start_block - 1)
                 .inspect_err(move |e| warn!(&logger, "Failed to get block number: {}", e))
@@ -460,6 +469,7 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore, AC: amp::Clien
     resolver: &Arc<dyn LinkResolver>,
     amp_client: Option<Arc<AC>>,
     history_blocks_override: Option<i32>,
+    amp_chain_names: &AmpChainNames,
 ) -> Result<DeploymentLocator, SubgraphRegistrarError> {
     let raw_string = serde_yaml::to_string(&raw).unwrap();
 
@@ -488,9 +498,10 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore, AC: amp::Clien
         .map_err(SubgraphRegistrarError::ManifestValidationError)?;
 
     let network_name: Word = manifest.network_name().into();
+    let resolved_name = amp_chain_names.resolve(&network_name);
 
     let chain = chains
-        .get::<C>(network_name.clone())
+        .get::<C>(resolved_name.clone())
         .map_err(SubgraphRegistrarError::NetworkNotSupported)?
         .cheap_clone();
 
@@ -570,7 +581,7 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore, AC: amp::Clien
             &manifest.schema,
             deployment,
             node_id,
-            network_name.into(),
+            resolved_name.into(),
             version_switching_mode,
         )
         .await
diff --git a/core/src/subgraph/runner.rs b/core/src/subgraph/runner/mod.rs
similarity index 59%
rename from core/src/subgraph/runner.rs
rename to core/src/subgraph/runner/mod.rs
index 81db925a092..026be3dfc27 100644
--- a/core/src/subgraph/runner.rs
+++ b/core/src/subgraph/runner/mod.rs
@@ -1,19 +1,25 @@
+mod state;
+mod trigger_runner;
+
 use crate::subgraph::context::IndexingContext;
 use crate::subgraph::error::{
     ClassifyErrorHelper as _, DetailHelper as _, NonDeterministicErrorHelper as _, ProcessingError,
+    ProcessingErrorKind,
 };
 use crate::subgraph::inputs::IndexingInputs;
 use crate::subgraph::state::IndexingState;
 use crate::subgraph::stream::new_block_stream;
 use anyhow::Context as _;
 use graph::blockchain::block_stream::{
-    BlockStream, BlockStreamError, BlockStreamEvent, BlockWithTriggers, FirehoseCursor,
+    BlockStream, BlockStreamEvent, BlockWithTriggers, FirehoseCursor,
 };
 use graph::blockchain::{
     Block, BlockTime, Blockchain, DataSource as _, SubgraphFilter, Trigger, TriggerFilter as _,
     TriggerFilterWrapper,
 };
-use graph::components::store::{EmptyStore, GetScope, ReadStore, StoredDynamicDataSource};
+use graph::components::store::{
+    EmptyStore, GetScope, ReadStore, SeqGenerator, StoredDynamicDataSource,
+};
 use graph::components::subgraph::InstanceDSTemplate;
 use graph::components::trigger_processor::RunnableTriggers;
 use graph::components::{
@@ -21,27 +27,30 @@ use graph::components::{
     subgraph::{MappingError, PoICausalityRegion, ProofOfIndexing, SharedProofOfIndexing},
 };
 use graph::data::store::scalar::Bytes;
-use graph::data::subgraph::schema::{SubgraphError, SubgraphHealth};
+use graph::data::subgraph::schema::SubgraphError;
 use graph::data_source::{
-    offchain, CausalityRegion, DataSource, DataSourceCreationError, TriggerData,
+    CausalityRegion, DataSource, DataSourceCreationError, TriggerData, offchain,
 };
 use graph::env::EnvVars;
 use graph::ext::futures::Cancelable;
 use graph::futures03::stream::StreamExt;
 use graph::prelude::{
-    anyhow, hex, retry, thiserror, BlockNumber, BlockPtr, BlockState, CancelGuard, CancelHandle,
-    CancelToken as _, CancelableError, CheapClone as _, EntityCache, EntityModification, Error,
-    InstanceDSTemplateInfo, LogCode, RunnerMetrics, RuntimeHostBuilder, StopwatchMetrics,
-    StoreError, StreamExtension, UnfailOutcome, Value, ENV_VARS,
+    BlockNumber, BlockPtr, BlockState, CancelGuard, CancelHandle, CancelToken as _,
+    CheapClone as _, ENV_VARS, EntityCache, EntityModification, Error, InstanceDSTemplateInfo,
+    LogCode, RunnerMetrics, RuntimeHostBuilder, StopwatchMetrics, StoreError, StreamExtension,
+    UnfailOutcome, Value, anyhow, hex, retry, thiserror,
 };
 use graph::schema::EntityKey;
-use graph::slog::{debug, error, info, o, trace, warn, Logger};
+use graph::slog::{Logger, debug, error, info, o, trace, warn};
 use graph::util::lfu_cache::EvictStats;
 use graph::util::{backoff::ExponentialBackoff, lfu_cache::LfuCache};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::vec;
 
+use self::state::{RestartReason, RunnerState, StopReason};
+use self::trigger_runner::TriggerRunner;
+
 const MINUTE: Duration = Duration::from_secs(60);
 
 const SKIP_PTR_UPDATES_THRESHOLD: Duration = Duration::from_secs(60 * 5);
@@ -61,6 +70,9 @@ where
     logger: Logger,
     pub metrics: RunnerMetrics,
     cancel_handle: Option<CancelHandle>,
+    /// The current state in the runner's state machine.
+    /// This field drives the main loop of the runner.
+    runner_state: RunnerState<C>,
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -97,10 +109,12 @@ where
                 ),
                 entity_lfu_cache: LfuCache::new(),
                 cached_head_ptr: None,
+                postponed_indexes_created: false,
             },
             logger,
             metrics,
             cancel_handle: None,
+            runner_state: RunnerState::Initializing,
         }
     }
 
@@ -113,14 +127,13 @@ where
     /// be removed. The same thing also applies to the block cache.
     /// This function must be called before continuing to process in order to avoid
     /// duplicated host insertion and POI issues with dirty entity changes.
-    fn revert_state_to(&mut self, block_number: BlockNumber) -> Result<(), Error> {
+    fn revert_state_to(&mut self, block_number: BlockNumber) {
         self.state.entity_lfu_cache = LfuCache::new();
 
         // 1. Revert all hosts(created by DDS) at a block higher than `block_number`.
         // 2. Unmark any offchain data sources that were marked done on the blocks being removed.
         // When no offchain datasources are present, 2. should be a noop.
-        self.ctx.revert_data_sources(block_number + 1)?;
-        Ok(())
+        self.ctx.revert_data_sources(block_number + 1);
     }
 
     #[cfg(debug_assertions)]
@@ -212,15 +225,11 @@ where
         let block_stream_canceler = CancelGuard::new();
         let block_stream_cancel_handle = block_stream_canceler.handle();
         // TriggerFilter needs to be rebuilt eveytime the blockstream is restarted
-        self.ctx.filter = Some(self.build_filter());
+        let filter = self.build_filter();
 
-        let block_stream = new_block_stream(
-            &self.inputs,
-            self.ctx.filter.clone().unwrap(), // Safe to unwrap as we just called `build_filter` in the previous line
-            &self.metrics.subgraph,
-        )
-        .await?
-        .cancelable(&block_stream_canceler);
+        let block_stream = new_block_stream(&self.inputs, filter, &self.metrics.subgraph)
+            .await?
+            .cancelable(&block_stream_canceler);
 
         self.cancel_handle = Some(block_stream_cancel_handle);
 
@@ -241,11 +250,17 @@ where
         }
     }
 
-    pub async fn run(self) -> Result<(), SubgraphRunnerError> {
-        self.run_inner(false).await.map(|_| ())
-    }
-
-    async fn run_inner(mut self, break_on_restart: bool) -> Result<Self, SubgraphRunnerError> {
+    /// Initialize the runner by performing pre-loop setup.
+    ///
+    /// This method handles:
+    /// - Updating the deployment synced metric
+    /// - Attempting to unfail deterministic errors from the previous run
+    /// - Checking if the subgraph has already reached its max end block
+    ///
+    /// Returns the next state to transition to:
+    /// - `Restarting` to start the block stream (normal case)
+    /// - `Stopped` if the max end block was already reached
+    async fn initialize(&self) -> Result<RunnerState<C>, SubgraphRunnerError> {
         self.update_deployment_synced_metric();
 
         // If a subgraph failed for deterministic reasons, before start indexing, we first
@@ -276,93 +291,345 @@ where
             }
 
             // Stop subgraph when we reach maximum endblock.
-            if let Some(max_end_block) = self.inputs.max_end_block {
-                if max_end_block <= current_ptr.block_number() {
-                    info!(self.logger, "Stopping subgraph as we reached maximum endBlock";
+            if let Some(max_end_block) = self.inputs.max_end_block
+                && max_end_block <= current_ptr.block_number()
+            {
+                info!(self.logger, "Stopping subgraph as we reached maximum endBlock";
                                 "max_end_block" => max_end_block,
                                 "current_block" => current_ptr.block_number());
-                    self.inputs.store.flush().await?;
-                    return Ok(self);
-                }
+                self.inputs.store.flush().await?;
+                return Ok(RunnerState::Stopped {
+                    reason: StopReason::MaxEndBlockReached,
+                });
             }
         }
 
-        loop {
-            debug!(self.logger, "Starting or restarting subgraph");
+        // Normal case: proceed to start the block stream
+        Ok(RunnerState::Restarting {
+            reason: RestartReason::StoreError, // Initial start uses the same path as restart
+        })
+    }
 
-            let mut block_stream = self.start_block_stream().await?;
+    /// Await the next block stream event and transition to the appropriate state.
+    ///
+    /// This method waits for the next event from the block stream and determines
+    /// which state the runner should transition to:
+    /// - `ProcessingBlock` for new blocks to process
+    /// - `Reverting` for revert events
+    /// - `Stopped` when the stream ends or is canceled
+    /// - Returns back to `AwaitingBlock` for non-fatal errors that allow continuation
+    async fn await_block(
+        &mut self,
+        mut block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+    ) -> Result<RunnerState<C>, SubgraphRunnerError> {
+        let event = {
+            let _section = self.metrics.stream.stopwatch.start_section("scan_blocks");
+            block_stream.next().await
+        };
 
-            debug!(self.logger, "Started block stream");
+        if self.is_canceled() {
+            return self.cancel();
+        }
 
-            self.metrics.subgraph.deployment_status.running();
+        match event {
+            Some(Ok(BlockStreamEvent::ProcessBlock(block, cursor))) => {
+                Ok(RunnerState::ProcessingBlock {
+                    block_stream,
+                    block,
+                    cursor,
+                })
+            }
+            Some(Ok(BlockStreamEvent::Revert(to_ptr, cursor))) => Ok(RunnerState::Reverting {
+                block_stream,
+                to_ptr,
+                cursor,
+            }),
+            // Log and drop the errors from the block_stream
+            // The block stream will continue attempting to produce blocks
+            Some(Err(e)) => {
+                // Log error and continue waiting for blocks
+                debug!(
+                    &self.logger,
+                    "Block stream produced a non-fatal error";
+                    "error" => format!("{}", e),
+                );
+                Ok(RunnerState::AwaitingBlock { block_stream })
+            }
+            // If the block stream ends, that means that there is no more indexing to do.
+            None => Ok(RunnerState::Stopped {
+                reason: StopReason::StreamEnded,
+            }),
+        }
+    }
 
-            // Process events from the stream as long as no restart is needed
-            loop {
-                let event = {
-                    let _section = self.metrics.stream.stopwatch.start_section("scan_blocks");
+    fn cancel(&mut self) -> Result<RunnerState<C>, SubgraphRunnerError> {
+        if self.ctx.instances.contains(&self.inputs.deployment.id) {
+            warn!(
+                self.logger,
+                "Terminating the subgraph runner because a newer one is active. \
+                     Possible reassignment detected while the runner was in a non-cancellable pending state",
+            );
+            return Err(SubgraphRunnerError::Duplicate);
+        }
+        warn!(
+            self.logger,
+            "Terminating the subgraph runner because subgraph was unassigned",
+        );
+        Ok(RunnerState::Stopped {
+            reason: StopReason::Unassigned,
+        })
+    }
 
-                    block_stream.next().await
-                };
+    /// Construct a SubgraphError and mark the subgraph as failed in the store.
+    async fn fail_subgraph(
+        &mut self,
+        message: String,
+        block_ptr: Option<BlockPtr>,
+        deterministic: bool,
+    ) -> Result<(), SubgraphRunnerError> {
+        let error = SubgraphError {
+            subgraph_id: self.inputs.deployment.hash.clone(),
+            message,
+            block_ptr,
+            handler: None,
+            deterministic,
+        };
+        self.inputs
+            .store
+            .fail_subgraph(error)
+            .await
+            .context("Failed to set subgraph status to `failed`")?;
+        Ok(())
+    }
 
-                // TODO: move cancel handle to the Context
-                // This will require some code refactor in how the BlockStream is created
-                let block_start = Instant::now();
-
-                let action = self.handle_stream_event(event).await.inspect(|res| {
-                    self.metrics
-                        .subgraph
-                        .observe_block_processed(block_start.elapsed(), res.block_finished());
-                })?;
-
-                self.update_deployment_synced_metric();
-
-                // It is possible that the subgraph was unassigned, but the runner was in
-                // a retry delay state and did not observe the cancel signal.
-                if self.is_canceled() {
-                    // It is also possible that the runner was in a retry delay state while
-                    // the subgraph was reassigned and a new runner was started.
-                    if self.ctx.instances.contains(&self.inputs.deployment.id) {
-                        warn!(
-                            self.logger,
-                            "Terminating the subgraph runner because a newer one is active. \
-                             Possible reassignment detected while the runner was in a non-cancellable pending state",
-                        );
-                        return Err(SubgraphRunnerError::Duplicate);
-                    }
+    /// Handle a restart by potentially restarting the store and starting a new block stream.
+    ///
+    /// This method handles:
+    /// - Restarting the store if there were errors (to clear error state)
+    /// - Reverting state to the last good block if the store was restarted
+    /// - Starting a new block stream with updated filters
+    ///
+    /// Returns the next state to transition to:
+    /// - `AwaitingBlock` with the new block stream (normal case)
+    async fn restart(
+        &mut self,
+        reason: RestartReason,
+    ) -> Result<RunnerState<C>, SubgraphRunnerError> {
+        debug!(self.logger, "Starting or restarting subgraph"; "reason" => ?reason);
+
+        // If restarting due to store error, try to restart the store
+        if matches!(reason, RestartReason::StoreError) {
+            let store = self.inputs.store.cheap_clone();
+            if let Some(store) = store.restart().await? {
+                let last_good_block = store.block_ptr().map(|ptr| ptr.number).unwrap_or(0);
+                self.revert_state_to(last_good_block);
+                self.inputs = Arc::new(self.inputs.with_store(store));
+            }
+        }
 
-                    warn!(
-                        self.logger,
-                        "Terminating the subgraph runner because subgraph was unassigned",
-                    );
-                    return Ok(self);
-                }
+        let block_stream = self.start_block_stream().await?;
 
-                match action {
-                    Action::Continue => continue,
-                    Action::Stop => {
-                        info!(self.logger, "Stopping subgraph");
-                        self.inputs.store.flush().await?;
-                        return Ok(self);
-                    }
-                    Action::Restart if break_on_restart => {
+        debug!(self.logger, "Started block stream");
+        self.metrics.subgraph.deployment_status.running();
+        self.update_deployment_synced_metric();
+
+        Ok(RunnerState::AwaitingBlock { block_stream })
+    }
+
+    /// Finalize the runner when it reaches a terminal state.
+    ///
+    /// This method handles cleanup tasks when the runner stops:
+    /// - Flushing the store to ensure all changes are persisted
+    /// - Logging the stop reason
+    async fn finalize(self, reason: StopReason) -> Result<Self, SubgraphRunnerError> {
+        match reason {
+            StopReason::MaxEndBlockReached => {
+                info!(self.logger, "Stopping subgraph - max end block reached");
+            }
+            StopReason::Canceled => {
+                info!(self.logger, "Stopping subgraph - canceled");
+            }
+            StopReason::Unassigned => {
+                info!(self.logger, "Stopping subgraph - unassigned");
+            }
+            StopReason::StreamEnded => {
+                info!(self.logger, "Stopping subgraph - stream ended");
+            }
+        }
+
+        self.inputs.store.flush().await?;
+        Ok(self)
+    }
+
+    pub async fn run(self) -> Result<(), SubgraphRunnerError> {
+        self.run_inner(false).await.map(|_| ())
+    }
+
+    /// Main state machine loop for the subgraph runner.
+    ///
+    /// This method drives the runner through its state machine, transitioning
+    /// between states based on events and actions. The state machine replaces
+    /// the previous nested loop structure with explicit state transitions.
+    ///
+    /// ## State Machine
+    ///
+    /// The runner starts in `Initializing` and transitions through states:
+    /// - `Initializing` → `Restarting` (or `Stopped` if max end block reached)
+    /// - `Restarting` → `AwaitingBlock`
+    /// - `AwaitingBlock` → `ProcessingBlock`, `Reverting`, or `Stopped`
+    /// - `ProcessingBlock` → `AwaitingBlock` or `Restarting`
+    /// - `Reverting` → `AwaitingBlock` or `Restarting`
+    /// - `Stopped` → terminal (returns)
+    async fn run_inner(mut self, break_on_restart: bool) -> Result<Self, SubgraphRunnerError> {
+        // Start in Initializing state
+        self.runner_state = RunnerState::Initializing;
+
+        // Track whether we've started processing blocks (not just initialized).
+        // This is used for break_on_restart logic - we should only stop on restart
+        // after we've actually started processing, not on the initial "restart"
+        // which is really the first start of the block stream.
+        let mut has_processed_blocks = false;
+
+        loop {
+            self.runner_state = match std::mem::take(&mut self.runner_state) {
+                RunnerState::Initializing => self.initialize().await?,
+
+                RunnerState::Restarting { reason } => {
+                    if break_on_restart && has_processed_blocks {
+                        // In test mode, stop on restart after first block processing
                         info!(self.logger, "Stopping subgraph on break");
-                        self.inputs.store.flush().await?;
-                        return Ok(self);
-                    }
-                    Action::Restart => {
-                        // Restart the store to clear any errors that it
-                        // might have encountered and use that from now on
-                        let store = self.inputs.store.cheap_clone();
-                        if let Some(store) = store.restart().await? {
-                            let last_good_block =
-                                store.block_ptr().map(|ptr| ptr.number).unwrap_or(0);
-                            self.revert_state_to(last_good_block)?;
-                            self.inputs = Arc::new(self.inputs.with_store(store));
+                        RunnerState::Stopped {
+                            reason: StopReason::Canceled,
                         }
-                        break;
+                    } else {
+                        self.restart(reason).await?
                     }
-                };
-            }
+                }
+
+                RunnerState::AwaitingBlock { block_stream } => {
+                    self.await_block(block_stream).await?
+                }
+
+                RunnerState::ProcessingBlock {
+                    block_stream,
+                    block,
+                    cursor,
+                } => {
+                    has_processed_blocks = true;
+                    self.process_block_state(block_stream, block, cursor)
+                        .await?
+                }
+
+                RunnerState::Reverting {
+                    block_stream,
+                    to_ptr,
+                    cursor,
+                } => self.handle_revert_state(block_stream, to_ptr, cursor).await,
+
+                RunnerState::Stopped { reason } => {
+                    return self.finalize(reason).await;
+                }
+            };
+        }
+    }
+
+    /// Process a block and determine the next state.
+    ///
+    /// This is the state machine wrapper around `process_block` that handles
+    /// the block processing action and determines state transitions.
+    async fn process_block_state(
+        &mut self,
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+        block: BlockWithTriggers<C>,
+        cursor: FirehoseCursor,
+    ) -> Result<RunnerState<C>, SubgraphRunnerError> {
+        let block_ptr = block.ptr();
+        self.metrics
+            .stream
+            .deployment_head
+            .set(block_ptr.number as f64);
+
+        if block.trigger_count() > 0 {
+            self.metrics
+                .subgraph
+                .block_trigger_count
+                .observe(block.trigger_count() as f64);
+        }
+
+        // Check if we should skip this block (optimization for blocks without triggers).
+        // Do not skip if max_end_block has been reached — fall through to process_block so the
+        // block pointer is persisted and the existing max_end_block check in handle_action fires.
+        let max_end_block_reached = self
+            .inputs
+            .max_end_block
+            .is_some_and(|max| block_ptr.number >= max);
+        if block.trigger_count() == 0
+            && self.state.skip_ptr_updates_timer.elapsed() <= SKIP_PTR_UPDATES_THRESHOLD
+            && !self.inputs.store.is_deployment_synced()
+            && !close_to_chain_head(&block_ptr, &self.inputs.chain.chain_head_ptr().await?, 1000)
+            && !max_end_block_reached
+        {
+            // Skip this block and continue with the same stream
+            return Ok(RunnerState::AwaitingBlock { block_stream });
+        } else {
+            self.state.skip_ptr_updates_timer = Instant::now();
+        }
+
+        let block_start = Instant::now();
+
+        let action = {
+            let stopwatch = &self.metrics.stream.stopwatch;
+            let _section = stopwatch.start_section(PROCESS_BLOCK_SECTION_NAME);
+            self.process_block(block, cursor).await
+        };
+
+        let action = self.handle_action(block_start, block_ptr, action).await?;
+
+        self.update_deployment_synced_metric();
+
+        if self.is_canceled() {
+            return self.cancel();
+        }
+
+        self.metrics
+            .subgraph
+            .observe_block_processed(block_start.elapsed(), action.block_finished());
+
+        // Convert Action to RunnerState
+        match action {
+            Action::Continue => Ok(RunnerState::AwaitingBlock { block_stream }),
+            Action::Restart => Ok(RunnerState::Restarting {
+                reason: RestartReason::DynamicDataSourceCreated,
+            }),
+            Action::Stop => Ok(RunnerState::Stopped {
+                reason: StopReason::MaxEndBlockReached,
+            }),
+        }
+    }
+
+    /// Handle a revert event and determine the next state.
+    ///
+    /// This is the state machine wrapper around `handle_revert` that handles
+    /// the revert action and determines state transitions.
+    async fn handle_revert_state(
+        &mut self,
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+        revert_to_ptr: BlockPtr,
+        cursor: FirehoseCursor,
+    ) -> RunnerState<C> {
+        let stopwatch = &self.metrics.stream.stopwatch;
+        let _section = stopwatch.start_section(HANDLE_REVERT_SECTION_NAME);
+
+        let action = self.handle_revert(revert_to_ptr, cursor).await;
+
+        match action {
+            Action::Continue => RunnerState::AwaitingBlock { block_stream },
+            Action::Restart => RunnerState::Restarting {
+                reason: RestartReason::StoreError,
+            },
+            Action::Stop => RunnerState::Stopped {
+                reason: StopReason::Canceled,
+            },
         }
     }
 
@@ -425,7 +692,7 @@ where
             entity_lfu_cache: cache,
             evict_stats,
         } = entity_cache
-            .as_modifications(block_ptr.number)
+            .as_modifications(block_ptr.number, &self.metrics.host.stopwatch)
             .await
             .classify()?;
         section.end();
@@ -470,6 +737,21 @@ where
 
         let is_caught_up = self.is_caught_up(&block_ptr).await.non_deterministic()?;
 
+        if !self.state.postponed_indexes_created
+            && close_to_chain_head(
+                &block_ptr,
+                &self.state.cached_head_ptr,
+                ENV_VARS.postpone_indexes_creation_threshold,
+            )
+        {
+            self.state.postponed_indexes_created = true;
+            self.inputs
+                .store
+                .create_postponed_indexes()
+                .await
+                .non_deterministic()?;
+        }
+
         self.inputs
             .store
             .transact_block_operations(
@@ -569,13 +851,85 @@ where
             .await
     }
 
-    /// Processes a block and returns the updated context and a boolean flag indicating
-    /// whether new dynamic data sources have been added to the subgraph.
-    async fn process_block(
+    // =========================================================================
+    // Pipeline Stage Methods
+    // =========================================================================
+    //
+    // The following methods implement the block processing pipeline stages.
+    // Each stage handles a specific phase of block processing:
+    //
+    // 1. match_triggers: Match and decode triggers against hosts
+    // 2. execute_triggers: Execute the matched triggers
+    // 3. process_dynamic_data_sources: Handle dynamically created data sources
+    // 4. (process_offchain_triggers): Existing handle_offchain_triggers method
+    // 5. (persist_block_state): Existing transact_block_state method
+    //
+    // =========================================================================
+
+    /// Pipeline Stage 1: Match triggers to hosts and decode them.
+    ///
+    /// Takes raw triggers from a block and matches them against all registered
+    /// hosts, returning runnable triggers ready for execution.
+    async fn match_triggers<'a>(
+        &'a self,
+        logger: &Logger,
+        block: &Arc<C::Block>,
+        triggers: Vec<Trigger<C>>,
+    ) -> Result<Vec<RunnableTriggers<'a, C>>, MappingError> {
+        let hosts_filter = |trigger: &TriggerData<C>| self.ctx.instance.hosts_for_trigger(trigger);
+        self.match_and_decode_many(logger, block, triggers, hosts_filter)
+            .await
+    }
+
+    /// Pipeline Stage 2: Execute matched triggers.
+    ///
+    /// Takes runnable triggers and executes them using the TriggerRunner,
+    /// accumulating state changes in the block state.
+    async fn execute_triggers(
+        &self,
+        block: &Arc<C::Block>,
+        runnables: Vec<RunnableTriggers<'_, C>>,
+        block_state: BlockState,
+        proof_of_indexing: &SharedProofOfIndexing,
+        causality_region: &str,
+    ) -> Result<BlockState, MappingError> {
+        let trigger_runner = TriggerRunner::new(
+            self.ctx.trigger_processor.as_ref(),
+            &self.logger,
+            &self.metrics.subgraph,
+            &self.inputs.debug_fork,
+            self.inputs.instrument,
+        );
+        trigger_runner
+            .execute(
+                block,
+                runnables,
+                block_state,
+                proof_of_indexing,
+                causality_region,
+            )
+            .await
+    }
+
+    /// Pipeline Stage 3: Process dynamically created data sources.
+    ///
+    /// This loop processes data sources created during trigger execution:
+    /// 1. Instantiate the created data sources
+    /// 2. Reprocess triggers from this block that match the new data sources
+    /// 3. Repeat until no more data sources are created
+    ///
+    /// Note: This algorithm processes data sources spawned on the same block
+    /// _breadth first_ on the tree implied by the parent-child relationship
+    /// between data sources.
+    async fn process_dynamic_data_sources(
         &mut self,
-        block: BlockWithTriggers<C>,
-        firehose_cursor: FirehoseCursor,
-    ) -> Result<Action, ProcessingError> {
+        logger: &Logger,
+        block: &Arc<C::Block>,
+        firehose_cursor: &FirehoseCursor,
+        mut block_state: BlockState,
+        proof_of_indexing: &SharedProofOfIndexing,
+        causality_region: &str,
+    ) -> Result<BlockState, ProcessingError> {
         fn log_triggers_found<C: Blockchain>(logger: &Logger, triggers: &[Trigger<C>]) {
             if triggers.len() == 1 {
                 info!(logger, "1 trigger found in this block");
@@ -584,6 +938,141 @@ where
             }
         }
 
+        let _section = self
+            .metrics
+            .stream
+            .stopwatch
+            .start_section(HANDLE_CREATED_DS_SECTION_NAME);
+
+        while block_state.has_created_data_sources() {
+            // Instantiate dynamic data sources, removing them from the block state.
+            let (data_sources, runtime_hosts) =
+                self.create_dynamic_data_sources(block_state.drain_created_data_sources())?;
+
+            let filter = &Arc::new(TriggerFilterWrapper::new(
+                C::TriggerFilter::from_data_sources(
+                    data_sources.iter().filter_map(DataSource::as_onchain),
+                ),
+                vec![],
+            ));
+
+            // TODO: We have to pass a reference to `block` to
+            // `refetch_block`, otherwise the call to
+            // handle_offchain_triggers below gets an error that `block`
+            // has moved. That is extremely fishy since it means that
+            // `handle_offchain_triggers` uses the non-refetched block
+            //
+            // It's also not clear why refetching needs to happen inside
+            // the loop; will firehose really return something diffrent
+            // each time even though the cursor doesn't change?
+            let block = self.refetch_block(logger, block, firehose_cursor).await?;
+
+            // Reprocess the triggers from this block that match the new data sources
+            let block_with_triggers = self
+                .inputs
+                .triggers_adapter
+                .triggers_in_block(logger, block.as_ref().clone(), filter)
+                .await
+                .non_deterministic()?;
+
+            let triggers = block_with_triggers.trigger_data;
+            log_triggers_found::<C>(logger, &triggers);
+
+            // Add entity operations for the new data sources to the block state
+            // and add runtimes for the data sources to the subgraph instance.
+            self.persist_dynamic_data_sources(&mut block_state, data_sources);
+
+            // Process the triggers in each host in the same order the
+            // corresponding data sources have been created.
+            let hosts_filter = |_: &'_ TriggerData<C>| -> Box<dyn Iterator<Item = _> + Send> {
+                Box::new(runtime_hosts.iter().map(Arc::as_ref))
+            };
+            let runnables = self
+                .match_and_decode_many(logger, &block, triggers, hosts_filter)
+                .await;
+
+            let trigger_runner = TriggerRunner::new(
+                self.ctx.trigger_processor.as_ref(),
+                &self.logger,
+                &self.metrics.subgraph,
+                &self.inputs.debug_fork,
+                self.inputs.instrument,
+            );
+            let res = match runnables {
+                Ok(runnables) => {
+                    trigger_runner
+                        .execute(
+                            &block,
+                            runnables,
+                            block_state,
+                            proof_of_indexing,
+                            causality_region,
+                        )
+                        .await
+                }
+                Err(e) => Err(e),
+            };
+
+            block_state = res.map_err(|e| {
+                // This treats a `PossibleReorg` as an ordinary error which will fail the subgraph.
+                // This can cause an unnecessary subgraph failure, to fix it we need to figure out a
+                // way to revert the effect of `create_dynamic_data_sources` so we may return a
+                // clean context as in b21fa73b-6453-4340-99fb-1a78ec62efb1.
+                match e {
+                    MappingError::PossibleReorg(e) | MappingError::Unknown(e) => {
+                        ProcessingError::Unknown(e)
+                    }
+                }
+            })?;
+        }
+
+        Ok(block_state)
+    }
+
+    /// Pipeline Stage 4: Process offchain triggers.
+    ///
+    /// Retrieves ready offchain events and processes them, returning entity
+    /// modifications and processed data sources to be included in the transaction.
+    async fn process_offchain_triggers(
+        &mut self,
+        block: &Arc<C::Block>,
+        block_state: &mut BlockState,
+    ) -> Result<(Vec<EntityModification>, Vec<StoredDynamicDataSource>), ProcessingError> {
+        let offchain_events = self
+            .ctx
+            .offchain_monitor
+            .ready_offchain_events()
+            .non_deterministic()?;
+
+        let vid_gen = block_state.seq_gen();
+        let (offchain_mods, processed_offchain_data_sources, persisted_off_chain_data_sources) =
+            self.handle_offchain_triggers(offchain_events, block, vid_gen)
+                .await
+                .non_deterministic()?;
+
+        block_state
+            .persisted_data_sources
+            .extend(persisted_off_chain_data_sources);
+
+        Ok((offchain_mods, processed_offchain_data_sources))
+    }
+
+    /// Processes a block and returns the updated context and a boolean flag indicating
+    /// whether new dynamic data sources have been added to the subgraph.
+    ///
+    /// ## Pipeline Stages
+    ///
+    /// Block processing follows a pipeline of stages:
+    /// 1. **match_triggers**: Match and decode triggers against hosts
+    /// 2. **execute_triggers**: Execute the matched triggers via TriggerRunner
+    /// 3. **process_dynamic_data_sources**: Handle dynamically created data sources
+    /// 4. **process_offchain_triggers**: Process offchain events
+    /// 5. **persist_block**: Persist block state to the store
+    async fn process_block(
+        &mut self,
+        block: BlockWithTriggers<C>,
+        firehose_cursor: FirehoseCursor,
+    ) -> Result<Action, ProcessingError> {
         let triggers = block.trigger_data;
         let block = Arc::new(block.block);
         let block_ptr = block.ptr();
@@ -602,9 +1091,11 @@ where
         // Causality region for onchain triggers.
         let causality_region = PoICausalityRegion::from_network(&self.inputs.network);
 
+        let vid_gen = SeqGenerator::new(block_ptr.number);
         let mut block_state = BlockState::new(
             self.inputs.store.clone(),
             std::mem::take(&mut self.state.entity_lfu_cache),
+            vid_gen,
         );
 
         let _section = self
@@ -613,46 +1104,22 @@ where
             .stopwatch
             .start_section(PROCESS_TRIGGERS_SECTION_NAME);
 
-        // Match and decode all triggers in the block
-        let hosts_filter = |trigger: &TriggerData<C>| self.ctx.instance.hosts_for_trigger(trigger);
-        let match_res = self
-            .match_and_decode_many(&logger, &block, triggers, hosts_filter)
-            .await;
-
-        // Process events one after the other, passing in entity operations
-        // collected previously to every new event being processed
-        let mut res = Ok(block_state);
-        match match_res {
+        // Stage 1: Match triggers to hosts and decode
+        let runnables = self.match_triggers(&logger, &block, triggers).await;
+
+        // Stage 2: Execute triggers
+        let res = match runnables {
             Ok(runnables) => {
-                for runnable in runnables {
-                    let process_res = self
-                        .ctx
-                        .trigger_processor
-                        .process_trigger(
-                            &self.logger,
-                            runnable.hosted_triggers,
-                            &block,
-                            res.unwrap(),
-                            &proof_of_indexing,
-                            &causality_region,
-                            &self.inputs.debug_fork,
-                            &self.metrics.subgraph,
-                            self.inputs.instrument,
-                        )
-                        .await
-                        .map_err(|e| e.add_trigger_context(&runnable.trigger));
-                    match process_res {
-                        Ok(state) => res = Ok(state),
-                        Err(e) => {
-                            res = Err(e);
-                            break;
-                        }
-                    }
-                }
-            }
-            Err(e) => {
-                res = Err(e);
+                self.execute_triggers(
+                    &block,
+                    runnables,
+                    block_state,
+                    &proof_of_indexing,
+                    &causality_region,
+                )
+                .await
             }
+            Err(e) => Err(e),
         };
 
         match res {
@@ -661,21 +1128,10 @@ where
 
             // Some form of unknown or non-deterministic error ocurred.
             Err(MappingError::Unknown(e)) => return Err(ProcessingError::Unknown(e)),
-            Err(MappingError::PossibleReorg(e)) => {
-                info!(logger,
-                    "Possible reorg detected, retrying";
-                    "error" => format!("{:#}", e),
-                );
 
-                // In case of a possible reorg, we want this function to do nothing and restart the
-                // block stream so it has a chance to detect the reorg.
-                //
-                // The state is unchanged at this point, except for having cleared the entity cache.
-                // Losing the cache is a bit annoying but not an issue for correctness.
-                //
-                // See also b21fa73b-6453-4340-99fb-1a78ec62efb1.
-                return Ok(Action::Restart);
-            }
+            // Possible blockchain reorg detected - signal restart via ProcessingError::PossibleReorg.
+            // See also b21fa73b-6453-4340-99fb-1a78ec62efb1.
+            Err(MappingError::PossibleReorg(e)) => return Err(ProcessingError::PossibleReorg(e)),
         }
 
         // Check if there are any datasources that have expired in this block. ie: the end_block
@@ -691,137 +1147,33 @@ where
         // or data sources that have reached their end block.
         let needs_restart = created_data_sources_needs_restart || has_expired_data_sources;
 
-        {
-            let _section = self
-                .metrics
-                .stream
-                .stopwatch
-                .start_section(HANDLE_CREATED_DS_SECTION_NAME);
-
-            // This loop will:
-            // 1. Instantiate created data sources.
-            // 2. Process those data sources for the current block.
-            // Until no data sources are created or MAX_DATA_SOURCES is hit.
-
-            // Note that this algorithm processes data sources spawned on the same block _breadth
-            // first_ on the tree implied by the parent-child relationship between data sources. Only a
-            // very contrived subgraph would be able to observe this.
-            while block_state.has_created_data_sources() {
-                // Instantiate dynamic data sources, removing them from the block state.
-                let (data_sources, runtime_hosts) =
-                    self.create_dynamic_data_sources(block_state.drain_created_data_sources())?;
-
-                let filter = &Arc::new(TriggerFilterWrapper::new(
-                    C::TriggerFilter::from_data_sources(
-                        data_sources.iter().filter_map(DataSource::as_onchain),
-                    ),
-                    vec![],
-                ));
-
-                // TODO: We have to pass a reference to `block` to
-                // `refetch_block`, otherwise the call to
-                // handle_offchain_triggers below gets an error that `block`
-                // has moved. That is extremely fishy since it means that
-                // `handle_offchain_triggers` uses the non-refetched block
-                //
-                // It's also not clear why refetching needs to happen inside
-                // the loop; will firehose really return something diffrent
-                // each time even though the cursor doesn't change?
-                let block = self
-                    .refetch_block(&logger, &block, &firehose_cursor)
-                    .await?;
-
-                // Reprocess the triggers from this block that match the new data sources
-                let block_with_triggers = self
-                    .inputs
-                    .triggers_adapter
-                    .triggers_in_block(&logger, block.as_ref().clone(), filter)
-                    .await
-                    .non_deterministic()?;
-
-                let triggers = block_with_triggers.trigger_data;
-                log_triggers_found(&logger, &triggers);
-
-                // Add entity operations for the new data sources to the block state
-                // and add runtimes for the data sources to the subgraph instance.
-                self.persist_dynamic_data_sources(&mut block_state, data_sources);
-
-                // Process the triggers in each host in the same order the
-                // corresponding data sources have been created.
-                let hosts_filter = |_: &'_ TriggerData<C>| -> Box<dyn Iterator<Item = _> + Send> {
-                    Box::new(runtime_hosts.iter().map(Arc::as_ref))
-                };
-                let match_res: Result<Vec<_>, _> = self
-                    .match_and_decode_many(&logger, &block, triggers, hosts_filter)
-                    .await;
-
-                let mut res = Ok(block_state);
-                match match_res {
-                    Ok(runnables) => {
-                        for runnable in runnables {
-                            let process_res = self
-                                .ctx
-                                .trigger_processor
-                                .process_trigger(
-                                    &self.logger,
-                                    runnable.hosted_triggers,
-                                    &block,
-                                    res.unwrap(),
-                                    &proof_of_indexing,
-                                    &causality_region,
-                                    &self.inputs.debug_fork,
-                                    &self.metrics.subgraph,
-                                    self.inputs.instrument,
-                                )
-                                .await
-                                .map_err(|e| e.add_trigger_context(&runnable.trigger));
-                            match process_res {
-                                Ok(state) => res = Ok(state),
-                                Err(e) => {
-                                    res = Err(e);
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        res = Err(e);
-                    }
-                }
-
-                block_state = res.map_err(|e| {
-                    // This treats a `PossibleReorg` as an ordinary error which will fail the subgraph.
-                    // This can cause an unnecessary subgraph failure, to fix it we need to figure out a
-                    // way to revert the effect of `create_dynamic_data_sources` so we may return a
-                    // clean context as in b21fa73b-6453-4340-99fb-1a78ec62efb1.
-                    match e {
-                        MappingError::PossibleReorg(e) | MappingError::Unknown(e) => {
-                            ProcessingError::Unknown(e)
-                        }
-                    }
-                })?;
-            }
-        }
+        // Checkpoint before dynamic DS processing for potential rollback scenarios.
+        // This captures the current state so it can be restored if dynamic data source
+        // processing fails in a way that requires partial rollback.
+        let _checkpoint = block_state.checkpoint();
+
+        // Stage 3: Process dynamic data sources
+        block_state = self
+            .process_dynamic_data_sources(
+                &logger,
+                &block,
+                &firehose_cursor,
+                block_state,
+                &proof_of_indexing,
+                &causality_region,
+            )
+            .await?;
 
-        // Check for offchain events and process them, including their entity modifications in the
-        // set to be transacted.
-        let offchain_events = self
-            .ctx
-            .offchain_monitor
-            .ready_offchain_events()
-            .non_deterministic()?;
-        let (offchain_mods, processed_offchain_data_sources, persisted_off_chain_data_sources) =
-            self.handle_offchain_triggers(offchain_events, &block)
-                .await
-                .non_deterministic()?;
-        block_state
-            .persisted_data_sources
-            .extend(persisted_off_chain_data_sources);
+        // Stage 4: Process offchain triggers
+        let (offchain_mods, processed_offchain_data_sources) = self
+            .process_offchain_triggers(&block, &mut block_state)
+            .await?;
 
+        // Stage 5: Persist block state
         self.transact_block_state(
             &logger,
-            block_ptr.clone(),
-            firehose_cursor.clone(),
+            block_ptr,
+            firehose_cursor,
             block.timestamp(),
             block_state,
             proof_of_indexing,
@@ -967,114 +1319,126 @@ where
                         .unfail_non_deterministic_error(&block_ptr)
                         .await?;
 
-                    // Stop trying to unfail.
-                    self.state.should_try_unfail_non_deterministic = false;
+                    // Stop trying unless we're still behind the error block.
+                    if outcome != UnfailOutcome::BehindErrorBlock {
+                        self.state.should_try_unfail_non_deterministic = false;
 
-                    if let UnfailOutcome::Unfailed = outcome {
-                        self.metrics.subgraph.deployment_status.running();
-                        self.state.backoff.reset();
+                        if outcome == UnfailOutcome::Unfailed {
+                            self.metrics.subgraph.deployment_status.running();
+                            self.state.backoff.reset();
+                        }
                     }
                 }
 
-                if let Some(stop_block) = self.inputs.stop_block {
-                    if block_ptr.number >= stop_block {
-                        info!(self.logger, "Stop block reached for subgraph");
-                        return Ok(Action::Stop);
-                    }
+                if let Some(stop_block) = self.inputs.stop_block
+                    && block_ptr.number >= stop_block
+                {
+                    info!(self.logger, "Stop block reached for subgraph");
+                    return Ok(Action::Stop);
                 }
 
-                if let Some(max_end_block) = self.inputs.max_end_block {
-                    if block_ptr.number >= max_end_block {
-                        info!(
-                            self.logger,
-                            "Stopping subgraph as maximum endBlock reached";
-                            "max_end_block" => max_end_block,
-                            "current_block" => block_ptr.number
-                        );
-                        return Ok(Action::Stop);
-                    }
+                if let Some(max_end_block) = self.inputs.max_end_block
+                    && block_ptr.number >= max_end_block
+                {
+                    info!(
+                        self.logger,
+                        "Stopping subgraph as maximum endBlock reached";
+                        "max_end_block" => max_end_block,
+                        "current_block" => block_ptr.number
+                    );
+                    return Ok(Action::Stop);
                 }
 
                 Ok(action)
             }
-            Err(ProcessingError::Canceled) => {
-                debug!(self.logger, "Subgraph block stream shut down cleanly");
-                Ok(Action::Stop)
-            }
+            // Handle errors based on their kind using the unified error classification.
+            //
+            // Error handling invariants:
+            // - Deterministic: Stop processing, persist PoI only, fail subgraph
+            // - NonDeterministic: Retry with backoff, may succeed on retry
+            // - PossibleReorg: Restart cleanly without persisting (don't fail subgraph)
+            // - Canceled: Clean shutdown, no error recording
+            Err(e) => match e.kind() {
+                ProcessingErrorKind::Canceled => {
+                    debug!(self.logger, "Subgraph block stream shut down cleanly");
+                    Ok(Action::Stop)
+                }
 
-            // Handle unexpected stream errors by marking the subgraph as failed.
-            Err(e) => {
-                self.metrics.subgraph.deployment_status.failed();
-                let last_good_block = self
-                    .inputs
-                    .store
-                    .block_ptr()
-                    .map(|ptr| ptr.number)
-                    .unwrap_or(0);
-                self.revert_state_to(last_good_block)?;
-
-                let message = format!("{:#}", e).replace('\n', "\t");
-                let err = anyhow!("{}, code: {}", message, LogCode::SubgraphSyncingFailure);
-                let deterministic = e.is_deterministic();
-
-                let error = SubgraphError {
-                    subgraph_id: self.inputs.deployment.hash.clone(),
-                    message,
-                    block_ptr: Some(block_ptr),
-                    handler: None,
-                    deterministic,
-                };
+                ProcessingErrorKind::PossibleReorg => {
+                    // Possible reorg detected - restart the block stream cleanly.
+                    // Don't persist anything and don't mark subgraph as failed.
+                    // The block stream restart will allow detection of the actual reorg.
+                    info!(self.logger,
+                        "Possible reorg detected, restarting block stream";
+                        "error" => format!("{:#}", e),
+                    );
 
-                match deterministic {
-                    true => {
-                        // Fail subgraph:
-                        // - Change status/health.
-                        // - Save the error to the database.
-                        self.inputs
-                            .store
-                            .fail_subgraph(error)
-                            .await
-                            .context("Failed to set subgraph status to `failed`")?;
+                    // Revert in-memory state to last good block but don't touch the store
+                    let last_good_block = self
+                        .inputs
+                        .store
+                        .block_ptr()
+                        .map(|ptr| ptr.number)
+                        .unwrap_or(0);
+                    self.revert_state_to(last_good_block);
 
-                        Err(err)
-                    }
-                    false => {
-                        // Shouldn't fail subgraph if it's already failed for non-deterministic
-                        // reasons.
-                        //
-                        // If we don't do this check we would keep adding the same error to the
-                        // database.
-                        let should_fail_subgraph =
-                            self.inputs.store.health().await? != SubgraphHealth::Failed;
-
-                        if should_fail_subgraph {
-                            // Fail subgraph:
-                            // - Change status/health.
-                            // - Save the error to the database.
-                            self.inputs
-                                .store
-                                .fail_subgraph(error)
-                                .await
-                                .context("Failed to set subgraph status to `failed`")?;
-                        }
+                    Ok(Action::Restart)
+                }
 
-                        // Retry logic below:
+                ProcessingErrorKind::Deterministic => {
+                    // Deterministic error - fail the subgraph permanently.
+                    self.metrics.subgraph.deployment_status.failed();
+                    let last_good_block = self
+                        .inputs
+                        .store
+                        .block_ptr()
+                        .map(|ptr| ptr.number)
+                        .unwrap_or(0);
+                    self.revert_state_to(last_good_block);
 
-                        let message = format!("{:#}", e).replace('\n', "\t");
-                        error!(self.logger, "Subgraph failed with non-deterministic error: {}", message;
-                            "attempt" => self.state.backoff.attempt,
-                            "retry_delay_s" => self.state.backoff.delay().as_secs());
+                    let message = format!("{:#}", e).replace('\n', "\t");
+                    let err = anyhow!("{}, code: {}", message, LogCode::SubgraphSyncingFailure);
 
-                        // Sleep before restarting.
-                        self.state.backoff.sleep_async().await;
+                    self.fail_subgraph(message, Some(block_ptr), true).await?;
 
-                        self.state.should_try_unfail_non_deterministic = true;
+                    Err(err)
+                }
 
-                        // And restart the subgraph.
-                        Ok(Action::Restart)
+                ProcessingErrorKind::NonDeterministic => {
+                    // Non-deterministic error - retry with backoff.
+                    self.metrics.subgraph.deployment_status.failed();
+                    let last_good_block = self
+                        .inputs
+                        .store
+                        .block_ptr()
+                        .map(|ptr| ptr.number)
+                        .unwrap_or(0);
+                    self.revert_state_to(last_good_block);
+
+                    let message = format!("{:#}", e).replace('\n', "\t");
+
+                    error!(self.logger, "Subgraph failed with non-deterministic error: {}", message;
+                        "attempt" => self.state.backoff.attempt,
+                        "retry_delay_s" => self.state.backoff.delay().as_secs());
+
+                    // Shouldn't fail subgraph if it's already failed for non-deterministic
+                    // reasons.
+                    //
+                    // If we don't do this check we would keep adding the same error to the
+                    // database.
+                    if !self.inputs.store.health().await?.is_failed() {
+                        self.fail_subgraph(message, Some(block_ptr), false).await?;
                     }
+
+                    // Sleep before restarting.
+                    self.state.backoff.sleep_async().await;
+
+                    self.state.should_try_unfail_non_deterministic = true;
+
+                    // And restart the subgraph.
+                    Ok(Action::Restart)
                 }
-            }
+            },
         }
     }
 
@@ -1132,35 +1496,11 @@ where
     C: Blockchain,
     T: RuntimeHostBuilder<C>,
 {
-    async fn handle_stream_event(
-        &mut self,
-        event: Option<Result<BlockStreamEvent<C>, CancelableError<BlockStreamError>>>,
-    ) -> Result<Action, Error> {
-        let stopwatch = &self.metrics.stream.stopwatch;
-        let action = match event {
-            Some(Ok(BlockStreamEvent::ProcessBlock(block, cursor))) => {
-                let _section = stopwatch.start_section(PROCESS_BLOCK_SECTION_NAME);
-                self.handle_process_block(block, cursor).await?
-            }
-            Some(Ok(BlockStreamEvent::Revert(revert_to_ptr, cursor))) => {
-                let _section = stopwatch.start_section(HANDLE_REVERT_SECTION_NAME);
-                self.handle_revert(revert_to_ptr, cursor).await?
-            }
-            // Log and drop the errors from the block_stream
-            // The block stream will continue attempting to produce blocks
-            Some(Err(e)) => self.handle_err(e).await?,
-            // If the block stream ends, that means that there is no more indexing to do.
-            // Typically block streams produce indefinitely, but tests are an example of finite block streams.
-            None => Action::Stop,
-        };
-
-        Ok(action)
-    }
-
     async fn handle_offchain_triggers(
         &mut self,
         triggers: Vec<offchain::TriggerData>,
         block: &Arc<C::Block>,
+        vid_gen: SeqGenerator,
     ) -> Result<
         (
             Vec<EntityModification>,
@@ -1177,7 +1517,11 @@ where
             // Using an `EmptyStore` and clearing the cache for each trigger is a makeshift way to
             // get causality region isolation.
             let schema = ReadStore::input_schema(&self.inputs.store);
-            let mut block_state = BlockState::new(EmptyStore::new(schema), LfuCache::new());
+            let mut block_state = BlockState::new(
+                EmptyStore::new(schema),
+                LfuCache::new(),
+                vid_gen.cheap_clone(),
+            );
 
             // PoI ignores offchain events.
             // See also: poi-ignores-offchain
@@ -1247,7 +1591,7 @@ where
             mods.extend(
                 block_state
                     .entity_cache
-                    .as_modifications(block.number())
+                    .as_modifications(block.number(), &self.metrics.subgraph.stopwatch)
                     .await?
                     .modifications,
             );
@@ -1288,52 +1632,7 @@ where
     C: Blockchain,
     T: RuntimeHostBuilder<C>,
 {
-    async fn handle_process_block(
-        &mut self,
-        block: BlockWithTriggers<C>,
-        cursor: FirehoseCursor,
-    ) -> Result<Action, Error> {
-        let block_ptr = block.ptr();
-        self.metrics
-            .stream
-            .deployment_head
-            .set(block_ptr.number as f64);
-
-        if block.trigger_count() > 0 {
-            self.metrics
-                .subgraph
-                .block_trigger_count
-                .observe(block.trigger_count() as f64);
-        }
-
-        if block.trigger_count() == 0
-            && self.state.skip_ptr_updates_timer.elapsed() <= SKIP_PTR_UPDATES_THRESHOLD
-            && !self.inputs.store.is_deployment_synced()
-            && !close_to_chain_head(
-                &block_ptr,
-                &self.inputs.chain.chain_head_ptr().await?,
-                // The "skip ptr updates timer" is ignored when a subgraph is at most 1000 blocks
-                // behind the chain head.
-                1000,
-            )
-        {
-            return Ok(Action::Continue);
-        } else {
-            self.state.skip_ptr_updates_timer = Instant::now();
-        }
-
-        let start = Instant::now();
-
-        let res = self.process_block(block, cursor).await;
-
-        self.handle_action(start, block_ptr, res).await
-    }
-
-    async fn handle_revert(
-        &mut self,
-        revert_to_ptr: BlockPtr,
-        cursor: FirehoseCursor,
-    ) -> Result<Action, Error> {
+    async fn handle_revert(&mut self, revert_to_ptr: BlockPtr, cursor: FirehoseCursor) -> Action {
         // Current deployment head in the database / WritableAgent Mutex cache.
         //
         // Safe unwrap because in a Revert event we're sure the subgraph has
@@ -1341,7 +1640,7 @@ where
         let subgraph_ptr = self.inputs.store.block_ptr().unwrap();
         if revert_to_ptr.number >= subgraph_ptr.number {
             info!(&self.logger, "Block to revert is higher than subgraph pointer, nothing to do"; "subgraph_ptr" => &subgraph_ptr, "revert_to_ptr" => &revert_to_ptr);
-            return Ok(Action::Continue);
+            return Action::Continue;
         }
 
         info!(&self.logger, "Reverting block to get back to main chain"; "subgraph_ptr" => &subgraph_ptr, "revert_to_ptr" => &revert_to_ptr);
@@ -1355,7 +1654,7 @@ where
             error!(&self.logger, "Could not revert block. Retrying"; "error" => %e);
 
             // Exit inner block stream consumption loop and go up to loop that restarts subgraph
-            return Ok(Action::Restart);
+            return Action::Restart;
         }
 
         self.metrics
@@ -1367,62 +1666,15 @@ where
             .deployment_head
             .set(subgraph_ptr.number as f64);
 
-        self.revert_state_to(revert_to_ptr.number)?;
+        self.revert_state_to(revert_to_ptr.number);
 
         let needs_restart: bool = self.needs_restart(revert_to_ptr, subgraph_ptr);
 
-        let action = if needs_restart {
+        if needs_restart {
             Action::Restart
         } else {
             Action::Continue
-        };
-
-        Ok(action)
-    }
-
-    async fn handle_err(
-        &mut self,
-        err: CancelableError<BlockStreamError>,
-    ) -> Result<Action, Error> {
-        if self.is_canceled() {
-            debug!(&self.logger, "Subgraph block stream shut down cleanly");
-            return Ok(Action::Stop);
         }
-
-        let err = match err {
-            CancelableError::Error(BlockStreamError::Fatal(msg)) => {
-                error!(
-                    &self.logger,
-                    "The block stream encountered a substreams fatal error and will not retry: {}",
-                    msg
-                );
-
-                // If substreams returns a deterministic error we may not necessarily have a specific block
-                // but we should not retry since it will keep failing.
-                self.inputs
-                    .store
-                    .fail_subgraph(SubgraphError {
-                        subgraph_id: self.inputs.deployment.hash.clone(),
-                        message: msg,
-                        block_ptr: None,
-                        handler: None,
-                        deterministic: true,
-                    })
-                    .await
-                    .context("Failed to set subgraph status to `failed`")?;
-
-                return Ok(Action::Stop);
-            }
-            e => e,
-        };
-
-        debug!(
-            &self.logger,
-            "Block stream produced a non-fatal error";
-            "error" => format!("{}", err),
-        );
-
-        Ok(Action::Continue)
     }
 
     /// Determines if the subgraph needs to be restarted.
@@ -1457,7 +1709,6 @@ async fn update_proof_of_indexing(
         key: EntityKey,
         digest: Bytes,
         block_time: BlockTime,
-        block: BlockNumber,
     ) -> Result<(), Error> {
         let digest_name = entity_cache.schema.poi_digest();
         let mut data = vec![
@@ -1472,12 +1723,11 @@ async fn update_proof_of_indexing(
             data.push((entity_cache.schema.poi_block_time(), block_time));
         }
         let poi = entity_cache.make_entity(data)?;
-        entity_cache.set(key, poi, block, None).await
+        entity_cache.set(key, poi, None).await
     }
 
     let _section_guard = stopwatch.start_section("update_proof_of_indexing");
 
-    let block_number = proof_of_indexing.get_block();
     let mut proof_of_indexing = proof_of_indexing.take();
 
     for (causality_region, stream) in proof_of_indexing.drain() {
@@ -1514,7 +1764,6 @@ async fn update_proof_of_indexing(
             entity_key,
             updated_proof_of_indexing,
             block_time,
-            block_number,
         )
         .await?;
     }
diff --git a/core/src/subgraph/runner/state.rs b/core/src/subgraph/runner/state.rs
new file mode 100644
index 00000000000..d6401842522
--- /dev/null
+++ b/core/src/subgraph/runner/state.rs
@@ -0,0 +1,96 @@
+//! State machine types for SubgraphRunner.
+//!
+//! This module defines the explicit state machine that controls the runner's lifecycle,
+//! replacing the previous nested loop structure with clear state transitions.
+
+use graph::blockchain::Blockchain;
+use graph::blockchain::block_stream::{BlockStream, BlockWithTriggers, FirehoseCursor};
+use graph::ext::futures::Cancelable;
+use graph::prelude::BlockPtr;
+
+/// The current state of the SubgraphRunner's lifecycle.
+///
+/// The runner transitions through these states as it processes blocks,
+/// handles reverts, and responds to errors or cancellation signals.
+///
+/// ## State Transitions
+///
+/// ```text
+/// Initializing ───────────────────────────────────┐
+///      │                                          │
+///      v                                          │
+///  AwaitingBlock ◄────────────────────────────────┤
+///      │                                          │
+///      ├── ProcessBlock event ──► ProcessingBlock │
+///      │                              │           │
+///      │                              ├── success ┼──► AwaitingBlock
+///      │                              │           │
+///      │                              └── restart ┼──► Restarting
+///      │                                          │
+///      ├── Revert event ──────────► Reverting ────┤
+///      │                                          │
+///      ├── Error ─────────────────► Restarting ───┤
+///      │                                          │
+///      └── Cancel/MaxBlock ───────► Stopped       │
+///                                                 │
+/// Restarting ─────────────────────────────────────┘
+/// ```
+#[derive(Default)]
+pub enum RunnerState<C: Blockchain> {
+    /// Initial state, ready to start block stream.
+    #[default]
+    Initializing,
+
+    /// Block stream active, waiting for next event.
+    AwaitingBlock {
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+    },
+
+    /// Processing a block through the pipeline.
+    /// The block stream is kept alive to continue processing after this block.
+    ProcessingBlock {
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+        block: BlockWithTriggers<C>,
+        cursor: FirehoseCursor,
+    },
+
+    /// Handling a revert event.
+    /// The block stream is kept alive to continue processing after the revert.
+    Reverting {
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+        to_ptr: BlockPtr,
+        cursor: FirehoseCursor,
+    },
+
+    /// Restarting block stream (new filters, store restart, etc.).
+    Restarting { reason: RestartReason },
+
+    /// Terminal state.
+    Stopped { reason: StopReason },
+}
+
+/// Reasons for restarting the block stream.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum RestartReason {
+    /// New dynamic data source was created that requires filter updates.
+    DynamicDataSourceCreated,
+    /// Store error occurred and store needs to be restarted.
+    StoreError,
+    /// Possible reorg detected, need to restart to detect it.
+    /// NOTE: Currently unused but reserved for future error handling consolidation (Phase 5).
+    #[allow(dead_code)]
+    PossibleReorg,
+}
+
+/// Reasons for stopping the runner.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum StopReason {
+    /// The maximum end block was reached.
+    MaxEndBlockReached,
+    /// The runner was canceled (unassigned or shutdown).
+    Canceled,
+    /// The subgraph was unassigned while this runner was active.
+    Unassigned,
+    /// The block stream ended (typically in tests).
+    StreamEnded,
+}
diff --git a/core/src/subgraph/runner/trigger_runner.rs b/core/src/subgraph/runner/trigger_runner.rs
new file mode 100644
index 00000000000..6c89052e5dc
--- /dev/null
+++ b/core/src/subgraph/runner/trigger_runner.rs
@@ -0,0 +1,79 @@
+use std::sync::Arc;
+
+use graph::blockchain::Blockchain;
+use graph::components::store::SubgraphFork;
+use graph::components::subgraph::{MappingError, SharedProofOfIndexing};
+use graph::components::trigger_processor::RunnableTriggers;
+use graph::prelude::{BlockState, RuntimeHostBuilder, SubgraphInstanceMetrics, TriggerProcessor};
+use graph::slog::Logger;
+
+/// Handles the execution of triggers against runtime hosts, accumulating state.
+///
+/// This component unifies the trigger processing loop that was previously duplicated
+/// for initial triggers and dynamically created data source triggers.
+pub struct TriggerRunner<'a, C: Blockchain, T: RuntimeHostBuilder<C>> {
+    processor: &'a dyn TriggerProcessor<C, T>,
+    logger: &'a Logger,
+    metrics: &'a Arc<SubgraphInstanceMetrics>,
+    debug_fork: &'a Option<Arc<dyn SubgraphFork>>,
+    instrument: bool,
+}
+
+impl<'a, C, T> TriggerRunner<'a, C, T>
+where
+    C: Blockchain,
+    T: RuntimeHostBuilder<C>,
+{
+    /// Create a new TriggerRunner with the given dependencies.
+    pub fn new(
+        processor: &'a dyn TriggerProcessor<C, T>,
+        logger: &'a Logger,
+        metrics: &'a Arc<SubgraphInstanceMetrics>,
+        debug_fork: &'a Option<Arc<dyn SubgraphFork>>,
+        instrument: bool,
+    ) -> Self {
+        Self {
+            processor,
+            logger,
+            metrics,
+            debug_fork,
+            instrument,
+        }
+    }
+
+    /// Execute a sequence of runnable triggers, accumulating state changes.
+    ///
+    /// Processes each trigger in order. If any trigger fails with a non-deterministic
+    /// error, processing stops and the error is returned. Deterministic errors are
+    /// accumulated in the block state.
+    pub async fn execute(
+        &self,
+        block: &Arc<C::Block>,
+        runnables: Vec<RunnableTriggers<'a, C>>,
+        block_state: BlockState,
+        proof_of_indexing: &SharedProofOfIndexing,
+        causality_region: &str,
+    ) -> Result<BlockState, MappingError> {
+        let mut state = block_state;
+
+        for runnable in runnables {
+            state = self
+                .processor
+                .process_trigger(
+                    self.logger,
+                    runnable.hosted_triggers,
+                    block,
+                    state,
+                    proof_of_indexing,
+                    causality_region,
+                    self.debug_fork,
+                    self.metrics,
+                    self.instrument,
+                )
+                .await
+                .map_err(|e| e.add_trigger_context(&runnable.trigger))?;
+        }
+
+        Ok(state)
+    }
+}
diff --git a/core/src/subgraph/state.rs b/core/src/subgraph/state.rs
index 0ce6ab48b15..c1da4b43199 100644
--- a/core/src/subgraph/state.rs
+++ b/core/src/subgraph/state.rs
@@ -16,4 +16,7 @@ pub struct IndexingState {
     pub skip_ptr_updates_timer: Instant,
     pub entity_lfu_cache: EntityLfuCache,
     pub cached_head_ptr: Option<BlockPtr>,
+    /// Set to `true` once postponed indexes have been created. This
+    /// ensures we only trigger index creation once per subgraph run.
+    pub postponed_indexes_created: bool,
 }
diff --git a/core/src/subgraph_manifest.rs b/core/src/subgraph_manifest.rs
index c02497c10c5..ddc01e0bc69 100644
--- a/core/src/subgraph_manifest.rs
+++ b/core/src/subgraph_manifest.rs
@@ -6,7 +6,7 @@ use graph::{
     },
     data::subgraph::DeploymentHash,
 };
-use slog::{debug, Logger};
+use slog::{Logger, debug};
 
 pub(super) async fn load_raw_subgraph_manifest(
     logger: &Logger,
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ecbe905d54..29d8e142db0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,20 +22,18 @@ ARG TAG_NAME=unknown
 
 ADD . /graph-node
 
-RUN apt-get update \
-    && apt-get install -y cmake protobuf-compiler && \
-    cd /graph-node && \
-    RUSTFLAGS="-g" cargo build --release --package graph-node \
+RUN apt-get update && apt-get install -y cmake protobuf-compiler
+
+RUN cd /graph-node \
+    && RUSTFLAGS="-g -C force-frame-pointers=yes" cargo build --release --package graph-node \
     && cp target/release/graph-node /usr/local/bin/graph-node \
     && cp target/release/graphman /usr/local/bin/graphman \
-    # Reduce the size of the layer by removing unnecessary files.
     && cargo clean \
-    && objcopy --only-keep-debug /usr/local/bin/graph-node /usr/local/bin/graph-node.debug \
-    && strip -g /usr/local/bin/graph-node \
-    && strip -g /usr/local/bin/graphman \
-    && cd /usr/local/bin \
-    && objcopy --add-gnu-debuglink=graph-node.debug graph-node \
-    && echo "REPO_NAME='$REPO_NAME'" > /etc/image-info \
+    && cp /usr/local/bin/graph-node /usr/local/bin/graph-node-debug \
+    && cp /usr/local/bin/graphman /usr/local/bin/graphman-debug \
+    && strip -g /usr/local/bin/graph-node /usr/local/bin/graphman
+
+RUN echo "REPO_NAME='$REPO_NAME'" > /etc/image-info \
     && echo "TAG_NAME='$TAG_NAME'" >> /etc/image-info \
     && echo "BRANCH_NAME='$BRANCH_NAME'" >> /etc/image-info \
     && echo "COMMIT_SHA='$COMMIT_SHA'" >> /etc/image-info \
@@ -43,14 +41,6 @@ RUN apt-get update \
     && echo "RUST_VERSION='$(rustc --version)'" >> /etc/image-info \
     && echo "CARGO_DEV_BUILD='$CARGO_DEV_BUILD'" >> /etc/image-info
 
-# Debug image to access core dumps
-FROM graph-node-build AS graph-node-debug
-RUN apt-get update \
-    && apt-get install -y curl gdb postgresql-client
-
-COPY docker/Dockerfile /Dockerfile
-COPY docker/bin/* /usr/local/bin/
-
 # The graph-node runtime image with only the executable
 FROM debian:bookworm-20241111-slim AS graph-node
 ENV RUST_LOG=""
@@ -97,8 +87,7 @@ EXPOSE 8020
 EXPOSE 8030
 
 RUN apt-get update \
-    && apt-get install -y libpq-dev ca-certificates \
-    netcat-openbsd
+    && apt-get install -y libpq-dev ca-certificates netcat-openbsd
 
 ADD docker/wait_for docker/start /usr/local/bin/
 COPY --from=graph-node-build /usr/local/bin/graph-node /usr/local/bin/graphman /usr/local/bin/
@@ -107,3 +96,12 @@ COPY --from=envsubst /go/bin/envsubst /usr/local/bin/
 COPY docker/Dockerfile /Dockerfile
 CMD ["start"]
 
+# Debug and profiling image
+# Build with: docker build --target graph-node-debug -f docker/Dockerfile .
+FROM graph-node AS graph-node-debug
+COPY --from=graph-node-build /usr/local/bin/graph-node-debug /usr/local/bin/graph-node
+COPY --from=graph-node-build /usr/local/bin/graphman-debug /usr/local/bin/graphman
+RUN apt-get update \
+    && apt-get install -y curl gdb postgresql-client linux-perf procps binutils
+COPY docker/Dockerfile /Dockerfile
+COPY docker/bin/* /usr/local/bin/
diff --git a/docs/aggregations.md b/docs/aggregations.md
index fafbd4d3305..3e90d7ee62f 100644
--- a/docs/aggregations.md
+++ b/docs/aggregations.md
@@ -178,8 +178,8 @@ accepts the following arguments:
   dimension
 - A mandatory `interval`
 - An optional `current` to indicate whether to include the current,
-  partially filled bucket in the response. Can be either `ignore` (the
-  default) or `include` (still **TODO** and not implemented)
+  partially filled bucket in the response. Can be either `exclude` (the
+  default) or `include`
 - Optional `timestamp_{gte|gt|lt|lte|eq|in}` filters to restrict the range
   of timestamps to return. The timestamp to filter by must be a string
   containing microseconds since the epoch. The value `"1704164640000000"`
@@ -189,7 +189,7 @@ accepts the following arguments:
 
 ```graphql
 token_stats(interval: "hour",
-      current: ignore,
+      current: exclude,
       where: {
         token: "0x1234",
         timestamp_gte: 1234567890,
@@ -201,3 +201,53 @@ token_stats(interval: "hour",
   avgVolume
 }
 ```
+
+### Current Bucket
+
+By default, aggregation queries return only completed, rolled-up buckets
+(`current: exclude`). These are buckets whose time interval has ended and
+whose data has been fully aggregated by `graph-node`'s rollup process.
+
+Setting `current: include` adds an additional, partially filled bucket that
+is computed on-the-fly from the unrolled timeseries data that has been
+inserted since the last rollup. This current bucket aggregates raw data
+points from the source timeseries table that have not yet been rolled up
+into the aggregation table. It covers the time period from the end of the
+last completed bucket up to the most recent data point.
+
+- `current: exclude` (default) — return only completed, rolled-up buckets
+- `current: include` — also return the in-progress bucket computed from
+  unrolled source data
+
+The current bucket is useful when you need near-real-time aggregation data
+without waiting for the next rollup cycle to complete.
+
+#### Nested Aggregation Queries
+
+The `current` argument also works on nested aggregation fields accessed
+through a parent entity. For example, if a `Token` entity has a derived
+aggregation field `tokenStats`, you can query the current bucket for each
+token:
+
+```graphql
+{
+  tokens {
+    id
+    name
+    tokenStats(interval: "hour", current: include) {
+      timestamp
+      totalVolume
+    }
+  }
+}
+```
+
+This returns both the completed rolled-up hourly buckets and the current
+in-progress bucket for each token's stats.
+
+#### Limitations
+
+Current bucket support for nested aggregation fields is only available when
+the field references a single aggregation type. It is not supported when the
+aggregation field is accessed through an interface with multiple
+implementations.
diff --git a/docs/amp-powered-subgraphs.md b/docs/amp-powered-subgraphs.md
index abec0123e88..60bccdde449 100644
--- a/docs/amp-powered-subgraphs.md
+++ b/docs/amp-powered-subgraphs.md
@@ -1,7 +1,10 @@
 # Amp-powered subgraphs
 
+> [!WARNING]
+> This feature is experimental and may change in future releases.
+
 > [!NOTE]
-> This features is available starting from spec version `1.5.0`
+> This feature is available starting from spec version `1.5.0`
 
 Amp-powered subgraphs are a new kind of subgraphs with SQL data sources that query and index data from the Amp servers.
 They are significantly more efficient than the standard subgraphs, and the indexing time can be reduced from days and weeks,
@@ -41,6 +44,7 @@ The minimum spec version for Amp-powered subgraphs is `1.5.0`.
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Data source structure
@@ -70,6 +74,7 @@ This is used to assign the subgraph to the appropriate indexing process.
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `name`
@@ -97,6 +102,7 @@ This name is used for observability purposes and to identify progress and potent
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `network`
@@ -127,6 +133,7 @@ This is used to validate that the SQL queries for this data source produce resul
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `source`
@@ -158,6 +165,7 @@ This is used to validate that the SQL queries for this data source only query th
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `source.tables`
@@ -185,6 +193,7 @@ This is used to validate that the SQL queries for this data source only query th
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Optional `source.address`
@@ -193,7 +202,7 @@ Contains the contract address with which SQL queries in the data source interact
 
 Enables SQL query reuse through `sg_source_address()` calls instead of hard-coding the contract address.
 SQL queries resolve `sg_source_address()` calls to this contract address.
-    
+
 <details>
 <summary>Example YAML:</summary>
 
@@ -215,6 +224,7 @@ SQL queries resolve `sg_source_address()` calls to this contract address.
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Optional `source.startBlock`
@@ -245,6 +255,7 @@ _When not provided, defaults to block number `0`._
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Optional `source.endBlock`
@@ -275,6 +286,7 @@ _When not provided, defaults to the maximum possible block number._
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `transformer`
@@ -309,6 +321,7 @@ Represents the version of this transformer. Each version may contain a different
           - name: Transfers
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Optional `transformer.abis`
@@ -344,6 +357,7 @@ _When not provided, defaults to an empty list._
           - name: Transfer
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `transformer.tables`
@@ -368,6 +382,7 @@ type Block @entity(immutable: true) {
 ```
 
 **YAML manifest:**
+
 ```diff
   specVersion: 1.5.0
 + dataSources:
@@ -386,6 +401,7 @@ type Block @entity(immutable: true) {
 +         - name: Block
             file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### `transformer.tables[i].query`
@@ -419,6 +435,7 @@ _When not provided, the `file` field is used instead._
           - name: Block
 +           query: SELECT * FROM "edgeandnode/ethereum_mainnet".blocks;
 ```
+
 </details>
 
 ### `transformer.tables[i].file`
@@ -451,6 +468,7 @@ _When not provided, the `query` field is used instead._
           - name: Block
 +           file: <IPFS CID of the SQL query file>
 ```
+
 </details>
 
 ### Amp-powered subgraph examples
@@ -460,6 +478,11 @@ https://github.com/edgeandnode/amp-subgraph-examples
 
 ## SQL query requirements
 
+### Names
+
+The names of tables, columns, and aliases must not start with `amp_` as this
+prefix is reserved for internal use.
+
 ### Block numbers
 
 Every SQL query in Amp-powered subgraphs must return the block number for every row.
@@ -543,8 +566,8 @@ Amp-powered subgraphs feature introduces the following new ENV variables:
 
 - `GRAPH_AMP_FLIGHT_SERVICE_ADDRESS` – The address of the Amp Flight gRPC service. _Defaults to `None`, which disables support for Amp-powered subgraphs._
 - `GRAPH_AMP_FLIGHT_SERVICE_TOKEN` – Token used to authenticate Amp Flight gRPC service requests. _Defaults to `None`, which disables authentication._
-- `GRAPH_AMP_MAX_BUFFER_SIZE` – Maximum number of response batches to buffer in memory per stream for each SQL query. _Defaults to `1,000`._
-- `GRAPH_AMP_MAX_BLOCK_RANGE` – Maximum number of blocks to request per stream for each SQL query. _Defaults to `2,000,000`._
+- `GRAPH_AMP_BUFFER_SIZE` – Maximum number of response batches to buffer in memory per stream for each SQL query. _Defaults to `1,000`._
+- `GRAPH_AMP_BLOCK_RANGE` – Maximum number of blocks to request per stream for each SQL query. _Defaults to `100,000`._
 - `GRAPH_AMP_QUERY_RETRY_MIN_DELAY_SECONDS` – Minimum time to wait before retrying a failed SQL query to the Amp server. _Defaults to `1` second._
 - `GRAPH_AMP_QUERY_RETRY_MAX_DELAY_SECONDS` – Maximum time to wait before retrying a failed SQL query to the Amp server. _Defaults to `600` seconds._
 
diff --git a/docs/config.md b/docs/config.md
index 8641398867c..db5fc083a5f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -5,12 +5,11 @@ CLI. The location of the file is passed with the `--config` command line switch.
 configuration file, it is not possible to use the options `--postgres-url`,
 `--postgres-secondary-hosts`, and `--postgres-host-weights`.
 
-The TOML file consists of four sections:
+The TOML file consists of three sections:
 
-- `[chains]` sets the endpoints to blockchain clients.
-- `[store]` describes the available databases.
-- `[ingestor]` sets the name of the node responsible for block ingestion.
-- `[deployment]` describes how to place newly deployed subgraphs.
+- [`[chains]`](#configuring-chains) lists the available chains and how to access them.
+- [`[store]`](#configuring-multiple-databases) describes the available databases.
+- [`[deployment]`](#controlling-deployment) describes how to place newly deployed subgraphs.
 
 Some of these sections support environment variable expansion out of the box,
 most notably Postgres connection strings. The official `graph-node` Docker image
@@ -104,8 +103,19 @@ names that will use this configuration file.
 
 The `[chains]` section controls the providers that `graph-node`
 connects to, and where blocks and other metadata for each chain are
-stored. The section consists of the name of the node doing block ingestion
-(currently not used), and a list of chains.
+stored. The section consists of the name of the node responsible for block
+ingestion and a list of chains. Block ingestion only runs on the node
+whose `--node-id` matches the `ingestor` value. The
+`--disable-block-ingestor` flag (or `DISABLE_BLOCK_INGESTOR` env var)
+acts as a hard override that always prevents ingestion regardless of
+the config.
+
+The section-level setting `cache_size` controls the default number of
+blocks from the chain head for which block data is kept cached. Individual
+chains can override this value. The default is 500. When the environment
+variable `GRAPH_STORE_IGNORE_BLOCK_CACHE` is set, blocks older than
+`cache_size` are treated as if they have no data. The value must be greater
+than the reorg threshold.
 
 The configuration for a chain `name` is specified in the section
 `[chains.<name>]`, with the following:
@@ -113,9 +123,43 @@ The configuration for a chain `name` is specified in the section
 - `shard`: where chain data is stored
 - `protocol`: the protocol type being indexed, default `ethereum`
   (alternatively `near`, `cosmos`,`arweave`,`starknet`)
-- `polling_interval`: the polling interval for the block ingestor (default 500ms)
+- `amp`: the network name used by AMP for this chain; defaults to the chain name.
+  Set this when AMP uses a different name than graph-node (e.g., `amp = "ethereum-mainnet"`
+  on a chain named `mainnet`).
+- `cache_size`: number of blocks from the chain head for which to keep
+  block data cached. Defaults to the section-level `cache_size`.
 - `provider`: a list of providers for that chain
 
+Additionally, Ethereum chains support per-chain RPC tuning settings. When
+omitted, each setting falls back to its corresponding environment variable
+default (see [environment-variables.md](environment-variables.md) for
+details):
+
+- `polling_interval`: block ingestor polling interval in milliseconds.
+  Default: `ETHEREUM_POLLING_INTERVAL` (1000ms).
+- `json_rpc_timeout`: timeout for JSON-RPC requests in seconds.
+  Default: `GRAPH_ETHEREUM_JSON_RPC_TIMEOUT` (180s).
+- `request_retries`: number of times to retry failed JSON-RPC requests.
+  Default: `GRAPH_ETHEREUM_REQUEST_RETRIES` (10).
+- `max_block_range_size`: maximum number of blocks to scan for triggers per
+  request. Default: `GRAPH_ETHEREUM_MAX_BLOCK_RANGE_SIZE` (1000).
+- `block_batch_size`: number of blocks to request in parallel.
+  Default: `ETHEREUM_BLOCK_BATCH_SIZE` (10).
+- `block_ptr_batch_size`: number of block pointers to request in parallel.
+  Default: `ETHEREUM_BLOCK_PTR_BATCH_SIZE` (100).
+- `max_event_only_range`: maximum range for `eth_getLogs` requests that
+  don't filter on contract address.
+  Default: `GRAPH_ETHEREUM_MAX_EVENT_ONLY_RANGE` (500).
+- `target_triggers_per_block_range`: ideal number of triggers per batch.
+  Default: `GRAPH_ETHEREUM_TARGET_TRIGGERS_PER_BLOCK_RANGE` (100).
+- `get_logs_max_contracts`: maximum contracts per `eth_getLogs` call.
+  Default: `GRAPH_ETH_GET_LOGS_MAX_CONTRACTS` (2000).
+- `block_ingestor_max_concurrent_json_rpc_calls`: maximum concurrent
+  JSON-RPC calls for transaction receipts during block ingestion.
+  Default: `GRAPH_ETHEREUM_BLOCK_INGESTOR_MAX_CONCURRENT_JSON_RPC_CALLS_FOR_TXN_RECEIPTS` (1000).
+- `genesis_block_number`: genesis block number for this chain.
+  Default: `GRAPH_ETHEREUM_GENESIS_BLOCK_NUMBER` (0).
+
 A `provider` is an object with the following characteristics:
 
 - `label`: the name of the provider, which will appear in logs
@@ -127,8 +171,19 @@ A `provider` is an object with the following characteristics:
 - `transport`: one of `rpc`, `ws`, and `ipc`. Defaults to `rpc`.
 - `url`: the URL for the provider
 - `features`: an array of features that the provider supports, either empty
-  or any combination of `traces` and `archive` for Web3 providers, or
-  `compression` and `filters` for Firehose providers
+  or any combination of the following for Web3 providers:
+  - `traces`: provider supports `debug_traceBlockByNumber` for call tracing
+  - `archive`: provider is an archive node with full historical state
+  - `no_eip1898`: provider doesn't support EIP-1898 (block parameter by hash/number object)
+  - `no_eip2718`: provider doesn't return the `type` field in transaction receipts
+    (pre-EIP-2718 chains). When set, receipts are patched to add
+    `"type": "0x0"` for legacy transaction compatibility.
+  - `compression/<method>`: provider supports compression for RPC requests,
+    where `<method>` is the compression method supported by the provider,
+    one of `gzip`, `brotli`, or `deflate`. The default is no compression.
+
+  For Firehose providers: `compression` and `filters`
+
 - `headers`: HTTP headers to be added on every request. Defaults to none.
 - `limit`: the maximum number of subgraphs that can use this provider.
   Defaults to unlimited. At least one provider should be unlimited,
@@ -151,8 +206,14 @@ optimisations.
 ```toml
 [chains]
 ingestor = "block_ingestor_node"
+cache_size = 500
 [chains.mainnet]
 shard = "vip"
+amp = "ethereum-mainnet"
+# Per-chain RPC tuning (all optional — omitted fields use env var defaults)
+json_rpc_timeout = 300
+request_retries = 15
+max_block_range_size = 2000
 provider = [
   { label = "mainnet1", url = "http://..", features = [], headers = { Authorization = "Bearer foo" } },
   { label = "mainnet2", url = "http://..", features = [ "archive", "traces" ] }
@@ -167,6 +228,33 @@ protocol = "near"
 provider = [ { label = "near", details = { type = "firehose", url = "https://..", key = "", features = ["compression", "filters"] } } ]
 ```
 
+### Block ingestor failover
+
+When the block ingestor's `do_poll()` call fails (after all internal per-request retries are
+exhausted), `graph-node` automatically attempts to switch to a healthier provider. The logic
+is:
+
+1. **Probe the current provider first.** `do_poll()` can fail for reasons unrelated to RPC
+   availability (e.g. a database error or a chain reorg). If the current provider still
+   responds to `eth_blockNumber`, the failure was not caused by the provider — no switch
+   occurs.
+2. **Probe all alternatives in parallel.** If the current provider is unreachable, all other
+   validated providers are probed simultaneously via `eth_blockNumber` to minimise wait time
+   when providers are timing out.
+3. **Switch to the first reachable provider.** The first provider to respond successfully
+   to the probe is selected as the new provider for the ingestor.
+   The remaining probes are cancelled at this point.
+4. **If all providers are unreachable**, the ingestor stays on the current provider and
+   re-probes on the next `do_poll()` failure.
+
+There is no automatic return to the original provider. Once the ingestor switches, it stays on
+the new provider until that provider fails, at which point the same probe-and-switch logic
+applies.
+
+Only validated providers are eligible as failover candidates. A provider in a temporary failure
+state (e.g. unreachable at startup, pending re-validation) is excluded until it passes
+validation again.
+
 ### Controlling the number of subgraphs using a provider
 
 **This feature is experimental and might be removed in a future release**
diff --git a/docs/dump.md b/docs/dump.md
new file mode 100644
index 00000000000..c8a3d32372b
--- /dev/null
+++ b/docs/dump.md
@@ -0,0 +1,311 @@
+## Dump Format
+
+The `graphman dump` command exports all entity data and metadata for a
+single subgraph deployment into a self-contained directory of Parquet files
+and JSON metadata. The resulting dump can be used to restore the deployment
+into a different `graph-node` instance via `graphman restore`. Dumps are
+consistent snapshots of the deployment's state at a specific point in time.
+
+**WARNING**: The dump and restore commands are experimental and can not
+replace proper database backups at this point. In particular, there is no
+guarantee that a dump will be restorable. Having said that, we encourage
+users to try out the dump and restore commands in non-production
+environments and report any issues they encounter.
+
+**WARNING**: Dumping happens in a single transaction and can put significant
+load on the database for large subgraphs. Use with caution on production
+instances.
+
+**WARNING**: Restoring a dump will currently create all the default indexes
+that a new deployment gets, and ignores the indexes that might have been
+carefully curated for the original deployment, even though they are recorded
+in the dump. This can lead to very long restore times for large subgraphs.
+The restore process will be optimized in the future to only create indexes
+that are present in the dump's metadata.
+
+### Usage
+
+#### Dumping a deployment
+
+```bash
+graphman dump <deployment> <directory>
+```
+
+`<deployment>` identifies the subgraph deployment to dump. It can be a
+subgraph name, a deployment hash (`Qm...`), or a database namespace
+(`sgdNNN`). `<directory>` is the path where the dump will be written; it
+will be created if it does not exist.
+
+Running `graphman dump` against an existing dump directory performs an
+**incremental dump**: only rows added since the last dump are exported, and
+new chunk files are appended rather than rewriting existing ones.
+
+```bash
+# Full dump
+graphman dump my-subgraph /backups/my-subgraph
+
+# Incremental update of the same dump
+graphman dump my-subgraph /backups/my-subgraph
+```
+
+#### Restoring a deployment
+
+```bash
+graphman restore <directory> [options]
+```
+
+`<directory>` is the path to a dump previously created with `graphman
+dump`.
+
+| Option      | Description                                                                                         |
+| ----------- | --------------------------------------------------------------------------------------------------- |
+| `--shard`   | Target database shard. Uses deployment rules (or primary shard) when omitted. Required with `--add` |
+| `--name`    | Subgraph name for deployment rule matching and node assignment. Falls back to an existing name       |
+| `--replace` | Drop and recreate if the deployment already exists in the target shard                               |
+| `--add`     | Create a copy in a shard that doesn't already have this deployment (requires `--shard`)              |
+| `--force`   | Replace if the deployment exists in the target shard, add if it doesn't                              |
+
+`--replace`, `--add`, and `--force` are mutually exclusive. When none is
+given, restore fails if the deployment already exists in the target shard.
+
+```bash
+# Restore into the default shard
+graphman restore /backups/my-subgraph
+
+# Restore into a specific shard, replacing if it already exists
+graphman restore /backups/my-subgraph --shard shard1 --replace
+
+# Force-restore (replace or add as needed)
+graphman restore /backups/my-subgraph --force
+```
+
+### Directory layout
+
+A dump directory has the following structure:
+
+```
+<dump-dir>/
+  metadata.json                  -- deployment metadata + per-table state
+  schema.graphql                 -- raw GraphQL schema text
+  subgraph.yaml                  -- raw subgraph manifest YAML (optional)
+  <EntityType>/
+    chunk_000000.parquet         -- rows ordered by vid
+    chunk_000001.parquet         -- incremental append (future chunks)
+    ...
+  data_sources$/
+    chunk_000000.parquet         -- dynamic data sources
+```
+
+Each entity type defined in the GraphQL schema gets its own subdirectory,
+named after the entity type exactly as it appears in the schema (e.g.
+`Token/`, `Pool/`). The Proof of Indexing appears as a regular entity
+directory name `Poi$`. The special `data_sources$` directory holds dynamic
+data sources created at runtime.
+
+Within each directory, data is stored in numbered chunk files
+(`chunk_000000.parquet`, `chunk_000001.parquet`, ...). A fresh dump
+produces a single `chunk_000000.parquet` per table. Incremental dumps
+append new chunks rather than rewriting existing ones.
+
+The GraphQL schema and subgraph manifest are stored as separate plain-text
+files `schema.graphql` and `subgraph.yaml`.
+
+### metadata.json
+
+The top-level `metadata.json` contains everything needed to reconstruct the
+deployment's table structure, plus diagnostic information captured at dump
+time. Its structure is:
+
+```json
+{
+  "version": 1,
+  "deployment": "Qm...",
+  "network": "mainnet",
+
+  "manifest": {
+    "spec_version": "1.0.0",
+    "description": "Optional subgraph description",
+    "repository": "https://github.com/...",
+    "features": ["..."],
+    "entities_with_causality_region": ["EntityType1"],
+    "history_blocks": 2147483647
+  },
+
+  "earliest_block_number": 12345,
+  "start_block": { "number": 12345, "hash": "0xabc..." },
+  "head_block": { "number": 99999, "hash": "0xdef..." },
+  "entity_count": 150000,
+
+  "graft_base": null,
+  "graft_block": null,
+  "debug_fork": null,
+
+  "health": {
+    "failed": false,
+    "health": "healthy",
+    "fatal_error": null,
+    "non_fatal_errors": []
+  },
+
+  "indexes": {
+    "token": [
+      "CREATE INDEX CONCURRENTLY IF NOT EXISTS attr_0_0_id ON sgd.token USING btree (id)"
+    ]
+  },
+
+  "tables": {
+    "Token": {
+      "immutable": true,
+      "has_causality_region": false,
+      "chunks": [
+        {
+          "file": "Token/chunk_000000.parquet",
+          "min_vid": 0,
+          "max_vid": 50000,
+          "row_count": 50000
+        }
+      ],
+      "max_vid": 50000
+    },
+    "data_sources$": {
+      "immutable": false,
+      "has_causality_region": true,
+      "chunks": [
+        {
+          "file": "data_sources$/chunk_000000.parquet",
+          "min_vid": 0,
+          "max_vid": 100,
+          "row_count": 100
+        }
+      ],
+      "max_vid": 100
+    }
+  }
+}
+```
+
+**Field descriptions:**
+
+| Field                                     | Description                                                                                                                         |
+| ----------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `version`                                 | Format version. Must be `1`.                                                                                                        |
+| `deployment`                              | Deployment hash (`Qm...`).                                                                                                          |
+| `network`                                 | The blockchain network (e.g. `mainnet`, `goerli`).                                                                                  |
+| `manifest`                                | Manifest metadata extracted from `subgraphs.subgraph_manifest`.                                                                     |
+| `manifest.spec_version`                   | Subgraph API version. Required to parse `schema.graphql`.                                                                           |
+| `manifest.entities_with_causality_region` | Entity types that have a `causality_region` column.                                                                                 |
+| `manifest.history_blocks`                 | How many blocks of entity version history are retained.                                                                             |
+| `earliest_block_number`                   | Earliest block for which data exists (accounts for pruning).                                                                        |
+| `start_block`                             | The block where indexing started. Null if not set.                                                                                  |
+| `head_block`                              | The latest indexed block at dump time.                                                                                              |
+| `entity_count`                            | Total entity count across all tables.                                                                                               |
+| `graft_base`                              | Deployment hash of the graft base, if any.                                                                                          |
+| `graft_block`                             | Block pointer of the graft point, if any.                                                                                           |
+| `debug_fork`                              | Debug fork deployment hash, if any.                                                                                                 |
+| `health`                                  | Point-in-time health snapshot. Not used during restore.                                                                             |
+| `indexes`                                 | Point-in-time index definitions as SQL. Not used during restore (indexes are auto-created by `Layout::create_relational_schema()`). |
+| `tables`                                  | Per-table metadata keyed by entity type name (or `data_sources$`).                                                                  |
+
+Each entry in `tables` contains:
+
+| Field                  | Description                                                                    |
+| ---------------------- | ------------------------------------------------------------------------------ |
+| `immutable`            | Whether the entity type is immutable (uses `block$` instead of `block_range`). |
+| `has_causality_region` | Whether rows have a `causality_region` column.                                 |
+| `chunks`               | Ordered list of Parquet chunk files for this table.                            |
+| `chunks[].file`        | Relative path from the dump directory.                                         |
+| `chunks[].min_vid`     | Minimum `vid` value in this chunk.                                             |
+| `chunks[].max_vid`     | Maximum `vid` value in this chunk.                                             |
+| `chunks[].row_count`   | Number of rows in this chunk.                                                  |
+| `max_vid`              | Maximum `vid` across all chunks. `-1` if the table is empty.                   |
+
+### Parquet schema: entity tables
+
+Each entity table's Parquet file uses an Arrow schema derived from the
+entity's GraphQL definition. Columns are ordered as follows:
+
+1. **System columns** (always present, in this order):
+   - `vid` (Int64, non-nullable) -- row version ID
+   - Block tracking (one of):
+     - Immutable entities: `block$` (Int32, non-nullable)
+     - Mutable entities: `block_range_start` (Int32, non-nullable),
+       `block_range_end` (Int32, nullable -- null means unbounded/current)
+   - `causality_region` (Int32, non-nullable) -- only if the entity has one
+
+2. **Data columns** in GraphQL declaration order, skipping fulltext
+   (`TSVector`) columns which are generated and rebuilt on restore.
+
+The PostgreSQL `int4range` type used for `block_range` is decomposed into
+two scalar columns (`block_range_start`, `block_range_end`) in the Parquet
+representation. This avoids the need for a custom range type in Arrow.
+
+#### Type mapping
+
+GraphQL/PostgreSQL column types map to Arrow data types as follows:
+
+| ColumnType      | Arrow DataType                 | Notes                                                          |
+| --------------- | ------------------------------ | -------------------------------------------------------------- |
+| `Boolean`       | `Boolean`                      |                                                                |
+| `Int`           | `Int32`                        |                                                                |
+| `Int8`          | `Int64`                        |                                                                |
+| `Bytes`         | `Binary`                       | Raw bytes, no hex encoding                                     |
+| `BigInt`        | `Utf8`                         | Stored as decimal string for arbitrary precision               |
+| `BigDecimal`    | `Utf8`                         | Stored as decimal string for arbitrary precision               |
+| `Timestamp`     | `Timestamp(Microsecond, None)` | Microseconds since epoch, no timezone                          |
+| `String`        | `Utf8`                         |                                                                |
+| `Enum(...)`     | `Utf8`                         | Enum variant as string (cast from PG enum to text during dump) |
+| `TSVector(...)` | _skipped_                      | Fulltext index columns are generated; rebuilt on restore       |
+
+**Array columns:** A GraphQL list field (e.g. `tags: [String!]!`) is
+stored as `List<T>` where `T` is the base Arrow type from the table
+above. Whether a column is a list is determined by the GraphQL field type,
+not by `ColumnType`. For example, `[String!]!` becomes `List<Utf8>` and
+`[Int!]` becomes `List<Int32>`.
+
+**Nullability** follows the GraphQL schema: non-null fields produce
+non-nullable Arrow columns; optional fields produce nullable columns. List
+elements within list columns are always marked nullable in the Arrow schema.
+
+### Parquet schema: data_sources$
+
+The `data_sources$` table has a fixed schema independent of the GraphQL
+definition:
+
+| Column              | Arrow DataType | Nullable | Description                                        |
+| ------------------- | -------------- | -------- | -------------------------------------------------- |
+| `vid`               | `Int64`        | no       | Row version ID                                     |
+| `block_range_start` | `Int32`        | no       | Lower bound of `block_range`                       |
+| `block_range_end`   | `Int32`        | yes      | Upper bound (null = unbounded)                     |
+| `causality_region`  | `Int32`        | no       | Causality region                                   |
+| `manifest_idx`      | `Int32`        | no       | Index into the manifest's data source list         |
+| `parent`            | `Int32`        | yes      | Self-referencing parent data source                |
+| `id`                | `Binary`       | yes      | Data source identifier                             |
+| `param`             | `Binary`       | yes      | Data source parameter                              |
+| `context`           | `Utf8`         | yes      | JSON context                                       |
+| `done_at`           | `Int32`        | yes      | Block number where the data source was marked done |
+
+### Compression
+
+All Parquet files use ZSTD compression (default level).
+
+### Row ordering
+
+Within each Parquet chunk file, rows are ordered by `vid` (ascending).
+This matches the primary key ordering in PostgreSQL and enables efficient
+sequential reads during restore.
+
+### Incremental dumps
+
+An incremental dump reads the existing `metadata.json`, determines the
+`max_vid` for each table, and queries only rows with `vid > max_vid`. New
+rows are written to new chunk files (e.g. `chunk_000001.parquet`) and the
+metadata is updated atomically (write to a temp file, then rename).
+
+### Atomicity
+
+The `metadata.json` file is always written atomically: the dump writes to
+`metadata.json.tmp` first, then renames it to `metadata.json`. This
+ensures that a reader never sees a partially-written metadata file. If the
+dump process crashes mid-write, the previous `metadata.json` remains
+intact. The Parquet chunk files are written before `metadata.json` is
+updated, so chunk files referenced by `metadata.json` are always complete.
diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index 9c4fc5dc8b4..7a601e32e64 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -10,10 +10,15 @@ those.
 
 ## JSON-RPC configuration for EVM chains
 
+> **Note**: Many of these settings can now be overridden per-chain in the TOML
+> configuration file under `[chains.<name>]`. When a per-chain value is set in
+> the config file it takes precedence over the environment variable. See
+> [config.md](config.md#configuring-chains) for details.
+
 - `ETHEREUM_REORG_THRESHOLD`: Maximum expected reorg size, if a larger reorg
   happens, subgraphs might process inconsistent data. Defaults to 250.
 - `ETHEREUM_POLLING_INTERVAL`: how often to poll Ethereum for new blocks (in ms,
-  defaults to 500ms)
+  defaults to 1000ms)
 - `GRAPH_ETHEREUM_TARGET_TRIGGERS_PER_BLOCK_RANGE`: The ideal amount of triggers
   to be processed in a batch. If this is too small it may cause too many requests
   to the ethereum node, if it is too large it may cause unreasonably expensive
@@ -216,6 +221,9 @@ those.
   decisions. Set to `true` to turn simulation on, defaults to `false`
 - `GRAPH_STORE_CONNECTION_TIMEOUT`: How long to wait to connect to a
   database before assuming the database is down in ms. Defaults to 5000ms.
+- `GRAPH_STORE_SETUP_TIMEOUT`: Timeout for database setup operations
+  (migrations, schema creation) in milliseconds. Defaults to 30000ms (30s).
+  Setup operations can legitimately take longer than normal runtime operations.
 - `GRAPH_STORE_CONNECTION_UNAVAILABLE_RETRY`: When a database shard is marked
   unavailable due to connection timeouts, this controls how often to allow a
   single probe request through to check if the database has recovered. Only one
@@ -307,3 +315,55 @@ those.
   Disabling the store call cache may significantly impact performance; the actual impact depends on
   the average execution time of an `eth_call` compared to the cost of a database lookup for a cached result.
   (default: false)
+
+## Log Store Configuration
+
+`graph-node` supports storing and querying subgraph logs through multiple backends: Elasticsearch, Loki, local files, or disabled.
+
+**For complete log store documentation**, including detailed configuration, querying examples, and choosing the right backend, see the **[Log Store Guide](log-store.md)**.
+
+### Quick Reference
+
+**Backend selection:**
+- `GRAPH_LOG_STORE_BACKEND`: `disabled` (default), `elasticsearch`, `loki`, or `file`
+
+**Elasticsearch:**
+- `GRAPH_LOG_STORE_ELASTICSEARCH_URL`: Elasticsearch endpoint URL (required)
+- `GRAPH_LOG_STORE_ELASTICSEARCH_USER`: Username (optional)
+- `GRAPH_LOG_STORE_ELASTICSEARCH_PASSWORD`: Password (optional)
+- `GRAPH_LOG_STORE_ELASTICSEARCH_INDEX`: Index name (default: `subgraph`)
+
+**Loki:**
+- `GRAPH_LOG_STORE_LOKI_URL`: Loki endpoint URL (required)
+- `GRAPH_LOG_STORE_LOKI_TENANT_ID`: Tenant ID (optional)
+
+**File-based:**
+- `GRAPH_LOG_STORE_FILE_DIR`: Log directory (required)
+- `GRAPH_LOG_STORE_FILE_MAX_SIZE`: Max file size in bytes (default: 104857600 = 100MB)
+- `GRAPH_LOG_STORE_FILE_RETENTION_DAYS`: Retention period (default: 30)
+
+**Deprecated variables** (will be removed in future versions):
+- `GRAPH_ELASTICSEARCH_URL` → use `GRAPH_LOG_STORE_ELASTICSEARCH_URL`
+- `GRAPH_ELASTICSEARCH_USER` → use `GRAPH_LOG_STORE_ELASTICSEARCH_USER`
+- `GRAPH_ELASTICSEARCH_PASSWORD` → use `GRAPH_LOG_STORE_ELASTICSEARCH_PASSWORD`
+- `GRAPH_ELASTIC_SEARCH_INDEX` → use `GRAPH_LOG_STORE_ELASTICSEARCH_INDEX`
+
+### Example: File-based Logs for Local Development
+
+```bash
+mkdir -p ./graph-logs
+export GRAPH_LOG_STORE_BACKEND=file
+export GRAPH_LOG_STORE_FILE_DIR=./graph-logs
+
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001
+```
+
+See the **[Log Store Guide](log-store.md)** for:
+- Detailed configuration for all backends
+- How log stores work internally
+- GraphQL query examples
+- Choosing the right backend for your use case
+- Best practices and troubleshooting
diff --git a/docs/implementation/README.md b/docs/implementation/README.md
index 31d4eb694a6..d54a39babbe 100644
--- a/docs/implementation/README.md
+++ b/docs/implementation/README.md
@@ -10,3 +10,4 @@ the code should go into comments.
 * [SQL Query Generation](./sql-query-generation.md)
 * [Adding support for a new chain](./add-chain.md)
 * [Pruning](./pruning.md)
+* [Dump Format](./dump.md)
diff --git a/docs/log-store.md b/docs/log-store.md
new file mode 100644
index 00000000000..8be1cddecd8
--- /dev/null
+++ b/docs/log-store.md
@@ -0,0 +1,853 @@
+# Log Store Configuration and Usage
+
+This guide explains how to configure subgraph indexing logs storage in graph-node.
+
+## Table of Contents
+
+- [Overview](#overview)
+- [How Log Stores Work](#how-log-stores-work)
+- [Log Store Types](#log-store-types)
+  - [File-based Logs](#file-based-logs)
+  - [Elasticsearch](#elasticsearch)
+  - [Loki](#loki)
+  - [Disabled](#disabled)
+- [Configuration](#configuration)
+  - [Environment Variables](#environment-variables)
+  - [CLI Arguments](#cli-arguments)
+  - [Configuration Precedence](#configuration-precedence)
+- [Querying Logs](#querying-logs)
+- [Migrating from Deprecated Configuration](#migrating-from-deprecated-configuration)
+- [Choosing the Right Backend](#choosing-the-right-backend)
+- [Best Practices](#best-practices)
+- [Troubleshooting](#troubleshooting)
+
+## Overview
+
+Graph Node supports multiple logs storage backends for subgraph indexing logs. Subgraph indexing logs include:
+- **User-generated logs**: Explicit logging from subgraph mapping code (`log.info()`, `log.error()`, etc.)
+- **Runtime logs**: Handler execution, event processing, data source activity
+- **System logs**: Warnings, errors, and diagnostics from the indexing system
+
+**Available backends:**
+- **File**: JSON Lines files on local filesystem (for local development)
+- **Elasticsearch**: Enterprise-grade search and analytics (for production)
+- **Loki**: Grafana's lightweight log aggregation system (for production)
+- **Disabled**: No log storage (default)
+
+All backends share the same query interface through GraphQL, making it easy to switch between them.
+
+**Important Note:** When log storage is disabled (the default), subgraph logs still appear in stdout/stderr as they always have. The "disabled" setting simply means logs are not stored separately in a queryable format. You can still see logs in your terminal or container logs - they just won't be available via the `_logs` GraphQL query.
+
+## How Log Stores Work
+
+### Architecture
+
+```
+┌─────────────────┐
+│  Subgraph Code  │
+│   (mappings)    │
+└────────┬────────┘
+         │ log.info(), log.error(), etc.
+         ▼
+┌─────────────────┐
+│  Graph Runtime  │
+│   (WebAssembly) │
+└────────┬────────┘
+         │ Log events
+         ▼
+┌─────────────────┐
+│   Log Drain     │  ◄─── slog-based logging system
+└────────┬────────┘
+         │ Write
+         ▼
+┌─────────────────┐
+│   Log Store     │  ◄─── Configurable backend
+│  (ES/Loki/File) │
+└────────┬────────┘
+         │
+         ▼
+┌─────────────────┐
+│  GraphQL API    │  ◄─── Unified query interface
+│  (port 8000)    │
+└─────────────────┘
+```
+
+### Log Flow
+
+1. **Log sources** generate logs from:
+   - User mapping code (explicit `log.info()`, `log.error()`, etc. calls)
+   - Subgraph runtime (handler execution, event processing, data source triggers)
+   - System warnings and errors (indexing issues, constraint violations, etc.)
+2. **Graph runtime** captures these logs with metadata (timestamp, level, source location)
+3. **Log drain** formats logs and writes to configured backend
+4. **Log store** persists logs and handles queries
+5. **GraphQL API** exposes logs through the `_logs` query
+
+### Log Entry Structure
+
+Each log entry contains:
+- **`id`**: Unique identifier
+- **`subgraphId`**: Deployment hash (QmXxx...)
+- **`timestamp`**: ISO 8601 timestamp (e.g., `2024-01-15T10:30:00.123456789Z`)
+- **`level`**: CRITICAL, ERROR, WARNING, INFO, or DEBUG
+- **`text`**: Log message
+- **`arguments`**: Key-value pairs from structured logging
+- **`meta`**: Source location (module, line, column)
+
+## Log Store Types
+
+### File-based Logs
+
+**Best for:** Local development, testing
+
+#### How It Works
+
+File-based logs store each subgraph's logs in a separate JSON Lines (`.jsonl`) file:
+
+```
+graph-logs/
+├── QmSubgraph1Hash.jsonl
+├── QmSubgraph2Hash.jsonl
+└── QmSubgraph3Hash.jsonl
+```
+
+Each line in the file is a complete JSON object representing one log entry.
+
+#### Storage Format
+
+```json
+{"id":"QmTest-2024-01-15T10:30:00.123456789Z","subgraphId":"QmTest","timestamp":"2024-01-15T10:30:00.123456789Z","level":"error","text":"Handler execution failed, retries: 3","arguments":[{"key":"retries","value":"3"}],"meta":{"module":"mapping.ts","line":42,"column":10}}
+```
+
+#### Query Performance
+
+File-based logs stream through files line-by-line with bounded memory usage.
+
+**Performance characteristics:**
+- Query time: O(n) where n = number of log entries
+- Memory usage: O(skip + first) - only matching entries kept in memory
+- Suitable for: Development and testing
+
+#### Configuration
+
+**Minimum configuration (CLI):**
+```bash
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend file \
+  --log-store-file-dir ./graph-logs
+```
+
+**Full configuration (environment variables):**
+```bash
+export GRAPH_LOG_STORE_BACKEND=file
+export GRAPH_LOG_STORE_FILE_DIR=/var/log/graph-node
+export GRAPH_LOG_STORE_FILE_MAX_SIZE=104857600      # 100MB
+export GRAPH_LOG_STORE_FILE_RETENTION_DAYS=30
+```
+
+#### Features
+
+**Advantages:**
+- No external dependencies
+- Simple setup (just specify a directory)
+- Human-readable format (JSON Lines)
+- Easy to inspect with standard tools (`jq`, `grep`, etc.)
+- Good for debugging during development
+
+**Limitations:**
+- Not suitable for production with high log volume
+- No indexing (O(n) query time scales with file size)
+- No automatic log rotation or retention management
+- Single file per subgraph (no sharding)
+
+#### When to Use
+
+Use file-based logs when:
+- Developing subgraphs locally
+- Testing on a development machine
+- Running low-traffic subgraphs (< 1000 total logs/day including system logs)
+- You want simple log access without external services
+
+### Elasticsearch
+
+**Best for:** Production deployments, high log volume, advanced search
+
+#### How It Works
+
+Elasticsearch stores logs in indices with full-text search capabilities, making it ideal for production deployments with high log volume.
+
+**Architecture:**
+```
+graph-node → Elasticsearch HTTP API → Elasticsearch cluster
+                                    → Index: subgraph-logs-*
+                                    → Query DSL for filtering
+```
+
+#### Features
+
+**Advantages:**
+- **Indexed searching**: Fast queries even with millions of logs
+- **Full-text search**: Powerful text search across log messages
+- **Scalability**: Handles billions of log entries
+- **High availability**: Supports clustering and replication
+- **Kibana integration**: Rich visualization and dashboards for operators
+- **Time-based indices**: Efficient retention management
+
+**Considerations:**
+- Requires Elasticsearch cluster (infrastructure overhead)
+- Resource-intensive (CPU, memory, disk)
+
+#### Configuration
+
+**Minimum configuration (CLI):**
+```bash
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend elasticsearch \
+  --log-store-elasticsearch-url http://localhost:9200
+```
+
+**Full configuration with authentication:**
+```bash
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend elasticsearch \
+  --log-store-elasticsearch-url https://es.example.com:9200 \
+  --log-store-elasticsearch-user elastic \
+  --log-store-elasticsearch-password secret \
+  --log-store-elasticsearch-index subgraph-logs
+```
+
+**Environment variables:**
+```bash
+export GRAPH_LOG_STORE_BACKEND=elasticsearch
+export GRAPH_LOG_STORE_ELASTICSEARCH_URL=http://localhost:9200
+export GRAPH_LOG_STORE_ELASTICSEARCH_USER=elastic
+export GRAPH_LOG_STORE_ELASTICSEARCH_PASSWORD=secret
+export GRAPH_LOG_STORE_ELASTICSEARCH_INDEX=subgraph-logs
+```
+
+#### Index Configuration
+
+Logs are stored in the configured index (default: `subgraph`). The index mapping is automatically created.
+
+**Recommended index settings for production:**
+```json
+{
+  "settings": {
+    "number_of_shards": 3,
+    "number_of_replicas": 1,
+    "refresh_interval": "5s"
+  }
+}
+```
+
+#### Query Performance
+
+**Performance characteristics:**
+- Query time: O(log n) with indexing
+- Memory usage: Minimal (server-side filtering)
+- Suitable for: Millions to billions of log entries
+
+#### When to Use
+
+Use Elasticsearch when:
+- Running production deployments
+- High log volume
+- Need advanced search and filtering
+- Want to build dashboards with Kibana
+- Need high availability and scalability
+- Have DevOps resources to manage Elasticsearch or can set up a managed ElasticSearch deployment
+
+### Loki
+
+**Best for:** Production deployments, Grafana users, cost-effective at scale
+
+#### How It Works
+
+Loki is Grafana's log aggregation system, designed to be cost-effective and easy to operate. Unlike Elasticsearch, Loki only indexes metadata (not full-text), making it more efficient for time-series log data.
+
+**Architecture:**
+```
+graph-node → Loki HTTP API → Loki
+                           → Stores compressed chunks
+                           → Indexes labels only
+```
+
+#### Features
+
+**Advantages:**
+- **Cost-effective**: Lower storage costs than Elasticsearch
+- **Grafana integration**: Native integration with Grafana
+- **Horizontal scalability**: Designed for cloud-native deployments
+- **Multi-tenancy**: Built-in tenant isolation
+- **Efficient compression**: Optimized for log data
+- **LogQL**: Powerful query language similar to PromQL
+- **Lower resource usage**: Less CPU/memory than Elasticsearch
+
+**Considerations:**
+- No full-text indexing (slower text searches)
+- Best used with Grafana (less tooling than Elasticsearch)
+- Younger ecosystem than Elasticsearch
+- Query performance depends on label cardinality
+
+#### Configuration
+
+**Minimum configuration (CLI):**
+```bash
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend loki \
+  --log-store-loki-url http://localhost:3100
+```
+
+**With multi-tenancy:**
+```bash
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001 \
+  --log-store-backend loki \
+  --log-store-loki-url http://localhost:3100 \
+  --log-store-loki-tenant-id my-graph-node
+```
+
+**Environment variables:**
+```bash
+export GRAPH_LOG_STORE_BACKEND=loki
+export GRAPH_LOG_STORE_LOKI_URL=http://localhost:3100
+export GRAPH_LOG_STORE_LOKI_TENANT_ID=my-graph-node
+```
+
+#### Labels
+
+Loki uses labels for indexing. Graph Node automatically creates labels:
+- `subgraph_id`: Deployment hash
+- `level`: Log level
+- `job`: "graph-node"
+
+#### Query Performance
+
+**Performance characteristics:**
+- Query time: O(n) for text searches, O(log n) for label queries
+- Memory usage: Minimal (server-side processing)
+- Suitable for: Millions to billions of log entries
+- Best performance with label-based filtering
+
+#### When to Use
+
+Use Loki when:
+- Already using Grafana for monitoring
+- Need cost-effective log storage at scale
+- Want simpler operations than Elasticsearch
+- Multi-tenancy is required
+- Log volume is very high (> 1M logs/day)
+- Full-text search is not critical
+
+### Disabled
+
+**Best for:** Minimalist deployments, reduced overhead
+
+#### How It Works
+
+When log storage is disabled (the default), subgraph logs are **still written to stdout/stderr** along with all other graph-node logs. They are just **not stored separately** in a queryable format.
+
+**Important:** "Disabled" does NOT mean logs are discarded. It means:
+- Logs appear in stdout/stderr (traditional behavior)
+- Logs are not stored in a separate queryable backend
+- The `_logs` GraphQL query returns empty results
+
+This is the default behavior - logs continue to work exactly as they did before this feature was added.
+
+#### Configuration
+
+**Explicitly disable:**
+```bash
+export GRAPH_LOG_STORE_BACKEND=disabled
+```
+
+**Or simply don't configure a backend** (defaults to disabled):
+```bash
+# No log store configuration = disabled
+graph-node \
+  --postgres-url postgresql://graph:pass@localhost/graph-node \
+  --ethereum-rpc mainnet:https://... \
+  --ipfs 127.0.0.1:5001
+```
+
+#### Features
+
+**Advantages:**
+- Zero additional overhead
+- No external dependencies
+- Minimal configuration
+- Logs still appear in stdout/stderr for debugging
+
+**Limitations:**
+- Cannot query logs via GraphQL (`_logs` returns empty results)
+- No separation of subgraph logs from other graph-node logs in stdout
+- Logs mixed with system logs (harder to filter programmatically)
+- No structured querying or filtering capabilities
+
+#### When to Use
+
+Use disabled log storage when:
+- Running minimal test deployments with less dependencies
+- Exposing logs to users is not required for your use case
+- You'd like subgraph logs sent to external log collection (e.g., container logs)
+
+## Configuration
+
+### Environment Variables
+
+Environment variables are the recommended way to configure log stores, especially in containerized deployments.
+
+#### Backend Selection
+
+```bash
+GRAPH_LOG_STORE_BACKEND=<backend>
+```
+Valid values: `disabled`, `elasticsearch`, `loki`, `file`
+
+#### Elasticsearch
+
+```bash
+GRAPH_LOG_STORE_ELASTICSEARCH_URL=http://localhost:9200
+GRAPH_LOG_STORE_ELASTICSEARCH_USER=elastic          # Optional
+GRAPH_LOG_STORE_ELASTICSEARCH_PASSWORD=secret       # Optional
+GRAPH_LOG_STORE_ELASTICSEARCH_INDEX=subgraph        # Default: "subgraph"
+```
+
+#### Loki
+
+```bash
+GRAPH_LOG_STORE_LOKI_URL=http://localhost:3100
+GRAPH_LOG_STORE_LOKI_TENANT_ID=my-tenant           # Optional
+```
+
+#### File
+
+```bash
+GRAPH_LOG_STORE_FILE_DIR=/var/log/graph-node
+GRAPH_LOG_STORE_FILE_MAX_SIZE=104857600            # Default: 100MB
+GRAPH_LOG_STORE_FILE_RETENTION_DAYS=30             # Default: 30
+```
+
+### CLI Arguments
+
+CLI arguments provide the same functionality as environment variables and the two can be mixed together.
+
+#### Backend Selection
+
+```bash
+--log-store-backend <backend>
+```
+
+#### Elasticsearch
+
+```bash
+--log-store-elasticsearch-url <URL>
+--log-store-elasticsearch-user <USER>
+--log-store-elasticsearch-password <PASSWORD>
+--log-store-elasticsearch-index <INDEX>
+```
+
+#### Loki
+
+```bash
+--log-store-loki-url <URL>
+--log-store-loki-tenant-id <TENANT_ID>
+```
+
+#### File
+
+```bash
+--log-store-file-dir <DIR>
+--log-store-file-max-size <BYTES>
+--log-store-file-retention-days <DAYS>
+```
+
+### Configuration Precedence
+
+When multiple configuration methods are used:
+
+1. **CLI arguments** take highest precedence
+2. **Environment variables** are used if no CLI args provided
+3. **Defaults** are used if neither is set
+
+## Querying Logs
+
+All log backends share the same GraphQL query interface. Logs are queried through the subgraph-specific GraphQL endpoint:
+
+- **Subgraph by deployment**: `http://localhost:8000/subgraphs/id/<deployment-hash>`
+- **Subgraph by name**: `http://localhost:8000/subgraphs/name/<subgraph-name>`
+
+The `_logs` query is automatically scoped to the subgraph in the URL, so you don't need to pass a `subgraphId` parameter.
+
+**Note**: Queries return all log types - both user-generated logs from mapping code and system-generated runtime logs (handler execution, events, warnings, etc.). Use the `search` filter to search for specific messages, or `level` to filter by severity.
+
+### Basic Query
+
+Query the `_logs` field at your subgraph's GraphQL endpoint:
+
+```graphql
+query {
+  _logs(
+    first: 100
+  ) {
+    id
+    timestamp
+    level
+    text
+  }
+}
+```
+
+**Example endpoint**: `http://localhost:8000/subgraphs/id/QmYourDeploymentHash`
+
+### Query with Filters
+
+```graphql
+query {
+  _logs(
+    level: ERROR
+    from: "2024-01-01T00:00:00Z"
+    to: "2024-01-31T23:59:59Z"
+    search: "timeout"
+    first: 50
+    skip: 0
+  ) {
+    id
+    timestamp
+    level
+    text
+    arguments {
+      key
+      value
+    }
+    meta {
+      module
+      line
+      column
+    }
+  }
+}
+```
+
+### Available Filters
+
+| Filter | Type | Description |
+|--------|------|-------------|
+| `level` | LogLevel | Filter by level: CRITICAL, ERROR, WARNING, INFO, DEBUG |
+| `from` | String | Start timestamp (ISO 8601) |
+| `to` | String | End timestamp (ISO 8601) |
+| `search` | String | Case-insensitive substring search in log messages |
+| `first` | Int | Number of results to return (default: 100, max: 1000) |
+| `skip` | Int | Number of results to skip for pagination (max: 10000) |
+
+### Response Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `id` | String | Unique log entry ID |
+| `timestamp` | String | ISO 8601 timestamp with nanosecond precision |
+| `level` | LogLevel | Log level (CRITICAL, ERROR, WARNING, INFO, DEBUG) |
+| `text` | String | Complete log message with arguments |
+| `arguments` | [(String, String)] | Structured key-value pairs |
+| `meta.module` | String | Source file name |
+| `meta.line` | Int | Line number |
+| `meta.column` | Int | Column number |
+
+### Query Examples
+
+#### Recent Errors
+
+```graphql
+query RecentErrors {
+  _logs(
+    level: ERROR
+    first: 20
+  ) {
+    timestamp
+    text
+    meta {
+      module
+      line
+    }
+  }
+}
+```
+
+#### Search for Specific Text
+
+```graphql
+query SearchTimeout {
+  _logs(
+    search: "timeout"
+    first: 50
+  ) {
+    timestamp
+    level
+    text
+  }
+}
+```
+
+#### Handler Execution Logs
+
+```graphql
+query HandlerLogs {
+  _logs(
+    search: "handler"
+    first: 50
+  ) {
+    timestamp
+    level
+    text
+  }
+}
+```
+
+#### Time Range Query
+
+```graphql
+query LogsInRange {
+  _logs(
+    from: "2024-01-15T00:00:00Z"
+    to: "2024-01-15T23:59:59Z"
+    first: 1000
+  ) {
+    timestamp
+    level
+    text
+  }
+}
+```
+
+#### Pagination
+
+```graphql
+# First page
+query Page1 {
+  _logs(
+    first: 100
+    skip: 0
+  ) {
+    id
+    text
+  }
+}
+
+# Second page
+query Page2 {
+  _logs(
+    first: 100
+    skip: 100
+  ) {
+    id
+    text
+  }
+}
+```
+
+### Querying the logs store using cURL
+
+```bash
+curl -X POST http://localhost:8000/subgraphs/id/<deployment-hash> \
+  -H "Content-Type: application/json" \
+  -d '{
+    "query": "{ _logs(level: ERROR, first: 10) { timestamp level text } }"
+  }'
+```
+
+### Performance Considerations
+
+**File-based:** _for development only_
+- Streams through files line-by-line (bounded memory usage)
+- Memory usage limited to O(skip + first) entries
+- Query time is O(n) where n = total log entries in file
+
+**Elasticsearch:**
+- Indexed queries are fast regardless of size
+- Text searches are optimized with full-text indexing
+- Can handle billions of log entries
+- Best for production with high query volume
+
+**Loki:**
+- Label-based queries are fast (indexed)
+- Text searches scan compressed chunks (slower than Elasticsearch)
+- Good performance with proper label filtering
+- Best for production with Grafana integration
+
+## Choosing the Right Backend
+
+### Decision Matrix
+
+| Scenario | Recommended Backend | Reason                                                                            |
+|----------|-------------------|-----------------------------------------------------------------------------------|
+| Local development | **File** | Simple, no dependencies, easy to inspect                                          |
+| Testing/staging | **File** or **Elasticsearch** | File for simplicity, ES if testing production config                              |
+| Production | **Elasticsearch** or **Loki** | Both handle scale well                                                            |
+| Using Grafana | **Loki** | Native integration                                                                |
+| Cost-sensitive at scale | **Loki** | Lower storage costs                                                               |
+| Want rich ecosystem | **Elasticsearch** | More tools and plugins                                                            |
+| Minimal deployment | **Disabled** | No overhead                                                                       |
+
+### Resource Requirements
+
+#### File-based
+- **Disk**: Minimal (log files only)
+- **Memory**: Depends on file size during queries
+- **CPU**: Minimal
+- **Network**: None
+- **External services**: None
+
+#### Elasticsearch
+- **Disk**: High (indices + replicas)
+- **Memory**: 4-8GB minimum for small deployments
+- **CPU**: Medium to high
+- **Network**: HTTP API calls
+- **External services**: Elasticsearch cluster
+
+#### Loki
+- **Disk**: Medium (compressed chunks)
+- **Memory**: 2-4GB minimum
+- **CPU**: Low to medium
+- **Network**: HTTP API calls
+- **External services**: Loki server
+
+## Best Practices
+
+### General
+
+1. **Start with file-based for development** - Simplest setup, easy debugging
+2. **Use Elasticsearch or Loki for production** - Better performance and features
+3. **Monitor log volume** - Set up alerts if log volume grows unexpectedly (includes both user logs and system-generated runtime logs)
+4. **Set retention policies** - Don't keep logs forever (disk space and cost)
+5. **Use structured logging** - Pass key-value pairs to log functions for better filtering
+
+### File-based Logs
+
+1. **Monitor file size** - While queries use bounded memory, larger files take longer to scan (O(n) query time)
+2. **Archive old logs** - Manually archive/delete old files or implement external rotation
+3. **Monitor disk usage** - Files can grow quickly with verbose logging
+4. **Use JSON tools** - `jq` is excellent for inspecting .jsonl files locally
+
+**Example local inspection:**
+```bash
+# Count logs by level
+cat graph-logs/QmExample.jsonl | jq -r '.level' | sort | uniq -c
+
+# Find errors in last 1000 lines
+tail -n 1000 graph-logs/QmExample.jsonl | jq 'select(.level == "error")'
+
+# Search for specific text
+cat graph-logs/QmExample.jsonl | jq 'select(.text | contains("timeout"))'
+```
+
+### Elasticsearch
+
+1. **Use index patterns** - Time-based indices for easier management
+2. **Configure retention** - Use Index Lifecycle Management (ILM)
+3. **Monitor cluster health** - Set up Elasticsearch monitoring
+4. **Tune for your workload** - Adjust shards/replicas based on log volume
+5. **Use Kibana** - Visualize and explore logs effectively
+
+**Example Elasticsearch retention policy:**
+```json
+{
+  "policy": "graph-logs-policy",
+  "phases": {
+    "hot": { "min_age": "0ms", "actions": {} },
+    "warm": { "min_age": "7d", "actions": {} },
+    "delete": { "min_age": "30d", "actions": { "delete": {} } }
+  }
+}
+```
+
+### Loki
+
+1. **Use proper labels** - Don't over-index, keep label cardinality low
+2. **Configure retention** - Set retention period in Loki config
+3. **Use Grafana** - Native integration provides best experience
+4. **Compress efficiently** - Loki's compression works best with batch writes
+5. **Multi-tenancy** - Use tenant IDs if running multiple environments
+
+**Example Grafana query:**
+```logql
+{subgraph_id="QmExample", level="error"} |= "timeout"
+```
+
+## Troubleshooting
+
+### File-based Logs
+
+**Problem: Log file doesn't exist**
+- Check `GRAPH_LOG_STORE_FILE_DIR` is set correctly
+- Verify directory is writable by graph-node
+
+**Problem: Queries are slow**
+- Subgraph logs file may be very large
+- Consider archiving old logs or implementing retention
+- For high-volume production use, switch to Elasticsearch or Loki
+
+**Problem: Disk filling up**
+- Implement log rotation
+- Reduce log verbosity in subgraph code
+- Set up monitoring for disk usage
+
+### Elasticsearch
+
+**Problem: Cannot connect to Elasticsearch**
+- Verify `GRAPH_LOG_STORE_ELASTICSEARCH_URL` is correct
+- Check Elasticsearch is running: `curl http://localhost:9200`
+- Verify authentication credentials if using security features
+- Check network connectivity and firewall rules
+
+**Problem: No logs appearing in Elasticsearch**
+- Check Elasticsearch cluster health
+- Verify index exists: `curl http://localhost:9200/_cat/indices`
+- Check graph-node logs for write errors
+- Verify Elasticsearch has disk space
+
+**Problem: Queries are slow**
+- Check Elasticsearch cluster health and resources
+- Verify indices are not over-sharded
+- Consider adding replicas for query performance
+- Review query patterns and add appropriate indices
+
+### Loki
+
+**Problem: Cannot connect to Loki**
+- Verify `GRAPH_LOG_STORE_LOKI_URL` is correct
+- Check Loki is running: `curl http://localhost:3100/ready`
+- Verify tenant ID if using multi-tenancy
+- Check network connectivity
+
+**Problem: No logs appearing in Loki**
+- Check Loki service health
+- Verify Loki has disk space for chunks
+- Check graph-node logs for write errors
+- Verify Loki retention settings aren't deleting logs immediately
+
+**Problem: Queries return no results in Grafana**
+- Check label selectors match what graph-node is sending
+- Verify time range includes when logs were written
+- Check Loki retention period
+- Verify tenant ID matches if using multi-tenancy
+
+## Further Reading
+
+- [Environment Variables Reference](environment-variables.md)
+- [Graph Node Configuration](config.md)
+- [Elasticsearch Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html)
+- [Grafana Loki Documentation](https://grafana.com/docs/loki/latest/)
diff --git a/docs/plans/gnd-cli-expansion.md b/docs/plans/gnd-cli-expansion.md
new file mode 100644
index 00000000000..b1bef8bc108
--- /dev/null
+++ b/docs/plans/gnd-cli-expansion.md
@@ -0,0 +1,418 @@
+# Plan: Extend gnd with graph-cli functionality
+
+## Overview
+
+Extend the existing `gnd` (Graph Node Dev) CLI to be a **drop-in replacement** for the TypeScript-based `graph-cli`. The goal is identical CLI behavior, flags, output format, and byte-for-byte identical AssemblyScript code generation.
+
+**Spec document**: `docs/specs/gnd-cli-expansion.md`
+
+**Scope**:
+
+- Ethereum protocol only (other protocols are future work)
+- All graph-cli commands except `local` and `node` subcommand
+- Match latest graph-cli version (0.98.x)
+
+**Current state of gnd** (`~/code/graph-node/gnd/`):
+
+- ~700 lines of Rust across 3 files
+- Single command with flags (no subcommands)
+- Already uses clap, imports graph crates
+- Runs graph-node in dev mode with file watching
+
+## Status Summary (Updated 2026-01-19)
+
+**Overall Progress**: ~99% complete (implementation + docs + automated tests done, only publish/test commands need manual verification)
+
+| Phase | Status | Notes |
+|-------|--------|-------|
+| Phase 1: CLI Restructure | ✅ Complete | |
+| Phase 2: Infrastructure | ✅ Complete | |
+| Phase 3: Simple Commands | ✅ Complete | |
+| Phase 4: Code Generation | ✅ Complete | 11 verification fixtures passing |
+| Phase 5: Migrations | ✅ Complete | |
+| Phase 6: Build Command | ✅ Complete | Tested via `just test-gnd-commands` |
+| Phase 7: Deploy Command | ✅ Complete | Tested via `just test-gnd-cli` |
+| Phase 8: Init Command | ✅ Complete | Tested via `just test-gnd-commands` |
+| Phase 9: Add Command | ✅ Complete | |
+| Phase 10: Publish Command | 🟡 Needs Testing | Manual end-to-end verification |
+| Phase 11: Test Command | 🟡 Needs Testing | Manual Matchstick test |
+| Phase 12: Testing & Polish | ✅ Complete | Documentation done, test porting analyzed |
+| Phase 13: CLI Integration Tests | ✅ Complete | Test infrastructure created, ready for manual verification |
+
+**Total LOC**: ~15,000 lines of Rust (158 unit tests, 11 verification tests passing)
+
+**Documentation**:
+- `gnd/README.md` - CLI command reference with examples
+- `gnd/docs/MIGRATING_FROM_GRAPH_CLI.md` - Migration guide from graph-cli
+
+## Git Workflow
+
+**Branch**: All work should be committed to the `gnd-cli` branch.
+
+**Commit discipline**:
+
+- Commit work in small, reviewable chunks
+- Each commit should be self-contained and pass all checks
+- Prefer many small commits over few large ones
+- Each commit message should clearly describe what it does
+
+**Before each commit**:
+
+```bash
+just format
+just lint
+just test-unit  # only run the tests in gnd/
+```
+
+- MANDATORY: Work must be committed, a task is only done when work is committed
+- MANDATORY: Make sure to follow the commit discipline above
+
+## Commands
+
+| Command       | Description                         | Complexity              |
+| ------------- | ----------------------------------- | ----------------------- |
+| `gnd dev`     | Existing gnd functionality          | Done (restructure only) |
+| `gnd codegen` | Generate AssemblyScript types       | High                    |
+| `gnd build`   | Compile to WASM                     | Medium                  |
+| `gnd deploy`  | Deploy to Graph Node                | Medium                  |
+| `gnd init`    | Scaffold new subgraph               | High                    |
+| `gnd add`     | Add datasource to existing subgraph | Medium                  |
+| `gnd create`  | Register subgraph name              | Low                     |
+| `gnd remove`  | Unregister subgraph name            | Low                     |
+| `gnd auth`    | Set deploy key                      | Low                     |
+| `gnd publish` | Publish to decentralized network    | Medium                  |
+| `gnd test`    | Run Matchstick tests                | Low (shell out)         |
+| `gnd clean`   | Remove build artifacts              | Low                     |
+
+**Not implemented** (documented differences):
+
+- `gnd local` - Use existing test infrastructure
+- `gnd node` - Use graphman for node management
+- `--uncrashable` flag - Float Capital third-party feature
+
+## Reusable from graph-node
+
+| Feature             | Location                              | Status                       |
+| ------------------- | ------------------------------------- | ---------------------------- |
+| Manifest parsing    | `graph/src/data/subgraph/mod.rs`      | Ready                        |
+| Manifest validation | `graph/src/data/subgraph/mod.rs`      | Ready (may need refactoring) |
+| GraphQL schema      | `graph/src/schema/input/`             | Ready                        |
+| ABI parsing         | `ethabi` + chain/ethereum wrappers    | Ready                        |
+| IPFS client         | `graph/src/ipfs/`                     | Ready                        |
+| Link resolution     | `graph/src/components/link_resolver/` | Ready                        |
+| File watching       | `gnd/src/watcher.rs`                  | Ready                        |
+| CLI framework       | `clap` (already in gnd)               | Ready                        |
+
+## Module Structure
+
+```
+gnd/src/
+├── main.rs                    # Entry point, clap setup
+├── lib.rs
+├── commands/
+│   ├── mod.rs
+│   ├── dev.rs                 # Existing gnd functionality
+│   ├── codegen.rs
+│   ├── build.rs
+│   ├── deploy.rs
+│   ├── init.rs
+│   ├── add.rs
+│   ├── create.rs
+│   ├── remove.rs
+│   ├── auth.rs
+│   ├── publish.rs
+│   ├── test.rs
+│   └── clean.rs
+├── codegen/
+│   ├── mod.rs
+│   ├── schema.rs              # Entity class generation
+│   ├── abi.rs                 # ABI binding generation
+│   └── template.rs            # Template binding generation
+├── scaffold/
+│   ├── mod.rs
+│   ├── manifest.rs            # Generate subgraph.yaml
+│   ├── schema.rs              # Generate schema.graphql
+│   └── mapping.rs             # Generate mapping.ts
+├── migrations/
+│   ├── mod.rs
+│   └── ...                    # One module per migration version
+├── compiler/
+│   ├── mod.rs
+│   └── asc.rs                 # Shell out to asc
+├── services/
+│   ├── mod.rs
+│   ├── etherscan.rs           # Etherscan API client
+│   ├── sourcify.rs            # Sourcify API client
+│   ├── registry.rs            # Network registry client
+│   └── graph_node.rs          # Graph Node JSON-RPC client
+├── config/
+│   ├── mod.rs
+│   ├── auth.rs                # ~/.graphprotocol/ management
+│   └── networks.rs            # networks.json handling
+├── output/
+│   ├── mod.rs
+│   └── spinner.rs             # Progress/spinner output (match TS CLI exactly)
+└── watcher.rs                 # Existing file watcher
+```
+
+## Dependencies to Add
+
+| Crate       | Purpose                                     |
+| ----------- | ------------------------------------------- |
+| `inquire`   | Interactive prompts (init)                  |
+| `minijinja` | Template rendering (scaffold)               |
+| `indicatif` | Progress bars and spinners                  |
+| `reqwest`   | HTTP client (Etherscan, Sourcify, registry) |
+
+## TODO List
+
+### Phase 1: CLI Restructure
+
+- [x] Create `gnd-cli` branch
+- [x] Restructure main.rs with clap subcommands
+- [x] Move existing gnd logic to `commands/dev.rs`
+- [x] Add empty command stubs for all commands
+- [x] Verify `gnd dev` works exactly as before
+- [x] Add `--version` output showing both gnd and graph-cli versions
+
+### Phase 2: Infrastructure
+
+- [x] Implement `output/spinner.rs` matching TS CLI output format exactly
+- [x] Implement `config/auth.rs` for `~/.graph-cli.json` management (in commands/auth.rs)
+- [x] Implement `config/networks.rs` for networks.json parsing
+- [x] Add reqwest dependency and basic HTTP client setup (in services/graph_node.rs)
+- [x] Implement `services/registry.rs` for @pinax/graph-networks-registry (implemented as `NetworksRegistry` in services/contract.rs)
+
+### Phase 3: Simple Commands
+
+- [x] Implement `gnd clean` command
+- [x] Implement `gnd auth` command
+- [x] Implement `gnd create` command
+- [x] Implement `gnd remove` command
+- [x] Add tests for simple commands
+
+### Phase 4: Code Generation (High Priority, High Risk)
+
+- [x] Study TS CLI codegen output in detail
+- [x] Implement `codegen/schema.rs` - entity classes from GraphQL
+- [x] Implement `codegen/typescript.rs` - AST builders for TypeScript/AssemblyScript
+- [x] Implement `codegen/types.rs` - type conversion utilities
+- [x] Implement `codegen/abi.rs` - ABI bindings
+- [x] Implement `codegen/template.rs` - template bindings
+- [x] Integrate prettier formatting (shell out)
+- [x] Implement `commands/codegen.rs` with all flags
+- [x] Implement `--watch` mode using existing file watcher
+- [x] Create snapshot tests comparing output to TS CLI (11 fixtures from graph-cli validation tests)
+- [x] Verify byte-for-byte identical output - tests pass with documented known differences:
+  - Int8 import always included (gnd simplicity)
+  - Trailing commas in multi-line constructs (gnd style)
+  - 2D array accessors use correct `toStringMatrix()` (gnd fixes graph-cli bug)
+
+### Phase 5: Migrations
+
+- [x] Study TS CLI migrations in `/packages/cli/src/migrations/`
+- [x] Implement migration framework in `migrations/mod.rs`
+- [x] Implement each migration version (0.0.1 → current)
+- [x] Add `--skip-migrations` flag support
+- [x] Test migrations with old manifest versions
+
+### Phase 6: Build Command
+
+- [x] Implement `compiler/asc.rs` - shell out to asc
+- [x] Implement `commands/build.rs` with all flags (~1084 lines, full build pipeline)
+- [x] Handle network file resolution
+- [x] Implement `--watch` mode
+- [x] Implement optional IPFS upload with deduplication
+- [x] Test build output matches TS CLI - Covered by `just test-gnd-commands` (test_build_after_codegen)
+
+### Phase 7: Deploy Command
+
+- [x] Implement `services/graph_node.rs` - JSON-RPC client (~258 lines, create/remove/deploy)
+- [x] Implement `commands/deploy.rs` with all flags (~239 lines)
+- [x] Support all deploy targets (local, studio, hosted service) - defaults to Subgraph Studio
+- [x] Handle access token / deploy key authentication
+- [x] Test deployment to local Graph Node - Covered by `just test-gnd-cli` (block-handlers, value-roundtrip, int8)
+
+### Phase 8: Init Command
+
+- [x] Add `inquire` dependency for interactive prompts
+- [x] Implement `services/contract.rs` - ABI fetching (Etherscan, Blockscout, Sourcify) (~730 lines)
+- [x] Implement networks registry loading
+- [x] Implement `scaffold/manifest.rs` (~271 lines)
+- [x] Implement `scaffold/schema.rs` (~206 lines)
+- [x] Implement `scaffold/mapping.rs` (~205 lines)
+- [x] Implement `commands/init.rs` with all flags (~1060 lines including --from-subgraph)
+- [x] Implement --from-example mode
+- [x] Implement --from-contract mode (uses ContractService for ABI fetching)
+- [x] Add interactive prompts when required options are missing
+- [x] Implement --from-subgraph mode (fetches manifest from IPFS, extracts immutable entities)
+- [x] Test scaffold output matches TS CLI - Covered by `just test-gnd-commands` (test_init_from_example, test_init_from_contract_with_abi)
+
+### Phase 9: Add Command
+
+- [x] Implement `commands/add.rs` (~773 lines, fully functional)
+- [x] Reuse scaffold components for actual implementation
+- [x] ABI validation, entity generation, mapping creation, manifest updates
+- [x] Test adding datasource to existing subgraph (unit tests for helper functions)
+- [x] Comprehensive error handling
+
+### Phase 10: Publish Command
+
+- [x] Implement `commands/publish.rs` (~230 lines, fully functional)
+- [x] Build subgraph and upload to IPFS (reuses build command)
+- [x] Open browser to webapp URL with query params (same approach as graph-cli)
+- [x] Support --ipfs-hash flag to skip build
+- [x] Support --subgraph-id, --api-key for updating existing subgraphs
+- [x] Support --protocol-network (arbitrum-one, arbitrum-sepolia)
+- [x] Interactive prompt before opening browser
+- [ ] Test publish workflow (NEEDS HUMAN: manual end-to-end verification)
+
+### Phase 11: Test Command
+
+- [x] Implement Matchstick binary download/detection
+- [x] Implement `commands/test.rs` (~254 lines, shell out to Matchstick)
+- [x] Handle Docker mode (Dockerfile generation on demand)
+- [x] Recompilation flag support
+- [ ] Test with actual Matchstick tests (NEEDS HUMAN: install matchstick + run end-to-end)
+
+### Phase 12: Testing & Polish
+
+- [x] Port all tests from TS CLI test suite not already covered by gnd tests
+  - Location: `/home/lutter/code/subgraphs/graph-cli/packages/cli/tests/`
+  - Review existing coverage and identify gaps
+  - Analysis: gnd has 11/12 success fixtures from graph-cli validation tests (missing `near-is-valid` which is out of scope for Ethereum-only support). Error/validation fixtures test manifest parsing which is handled by graph-node's validation layer.
+- [x] Add snapshot tests for code generation scenarios (11 fixtures from graph-cli validation tests)
+- [x] Add tests for overloaded events/functions in ABI codegen (disambiguation)
+- [x] Add tests for simple array fields in schema codegen
+- [x] Add tests for nested array types (`[[String]]` etc.) - schema codegen refactored to track list depth
+- [x] Add tests for tuple/struct types in ABI codegen (functions, events, nested, arrays)
+- [x] Add tests for array types in ABI codegen (array params in events, 2D matrices)
+- [x] Codegen verification test framework (gnd/tests/codegen_verification.rs)
+- [x] Add comprehensive tests for prompt module (network completer, source type)
+- [x] Add comprehensive tests for init command (interactive mode detection)
+- [ ] Ensure all edge cases are covered (ongoing)
+- [x] Documentation:
+  - [x] CLI usage docs (README with command reference, examples, common workflows)
+  - [x] Migration guide from graph-cli to gnd (differences, compatibility notes)
+- [x] Shell completions (bash, elvish, fish, powershell, zsh via clap_complete)
+
+### Phase 13: CLI Integration Tests
+
+Verify gnd works as a drop-in replacement for graph-cli by running integration tests with `GRAPH_CLI=../target/debug/gnd`.
+
+**Key Insight**: The existing integration test infrastructure uses `CONFIG.graph_cli` which can be set via the `GRAPH_CLI` environment variable. By setting this to the gnd binary, existing integration tests will use gnd for the deployment flow (codegen, create, deploy).
+
+#### Integration Deployment Tests (`tests/tests/gnd_cli_tests.rs`)
+
+- [x] Create test file that sets `GRAPH_CLI` env var to gnd binary
+- [x] Verify gnd binary exists (fail fast with clear message)
+- [x] Run subset of integration tests: `block-handlers`, `value-roundtrip`, `int8`
+- [x] Reuse `Contract::deploy_all()`, `CONFIG.reset_database()`, `CONFIG.spawn_graph_node()`
+- [x] Use `Subgraph::deploy()` which calls: `gnd codegen`, `gnd create`, `gnd deploy`
+- [x] Verify subgraphs sync and queries return expected data
+
+**Commands Tested via Subgraph::deploy()**:
+- `gnd codegen` - via `Subgraph::deploy()`
+- `gnd create` - via `Subgraph::deploy()`
+- `gnd deploy` - via `Subgraph::deploy()`
+
+#### Standalone Command Tests (`gnd/tests/cli_commands.rs`)
+
+Tests for commands that don't require running graph-node:
+
+**`gnd init` Tests**:
+- [x] `test_init_from_example` - Run `gnd init --from-example ethereum-gravatar`, verify scaffold created
+- [x] `test_init_from_contract_with_abi` - Run with `--from-contract` + `--abi`, verify manifest/schema/mapping created
+- [ ] `test_init_from_subgraph` - Run with `--from-subgraph`, verify immutable entities extracted (requires IPFS) - **Skipped**: Requires IPFS with subgraph data
+
+**`gnd add` Tests**:
+- [x] `test_add_datasource` - Create base subgraph with init, then add contract, verify manifest updated
+
+**`gnd build` Tests**:
+- [x] `test_build_after_codegen` - Copy fixture, run codegen + build, verify `build/` directory created with WASM
+
+**`gnd codegen` Tests**:
+- [x] `test_codegen_generates_types` - Run codegen on scaffolded subgraph, verify `generated/schema.ts` exists
+
+**`gnd clean` Tests**:
+- [x] `test_clean_removes_artifacts` - Verify clean removes `generated/` and `build/` directories
+
+**ABIs Available**: `tests/contracts/abis/*.json`
+
+#### Justfile Targets
+
+- [x] Add `test-gnd-cli` - Run gnd CLI integration tests (deployment with gnd as CLI)
+- [x] Add `test-gnd-commands` - Run gnd standalone command tests (init, add, build)
+
+#### Service Requirements
+
+Tests use the same services as `just test-integration`:
+
+| Service | Port | Start Command |
+|---------|------|---------------|
+| PostgreSQL | 3011 | `nix run .#integration` |
+| IPFS | 3001 | (included above) |
+| Anvil | 3021 | (included above) |
+
+#### Verification
+
+1. `just build` - Build gnd binary
+2. `just test-gnd-cli` - Run integration deployment tests with gnd
+3. `just test-gnd-commands` - Run standalone command tests
+
+Expected output: All tests pass, showing gnd works as drop-in replacement.
+
+## Key Decisions
+
+| Decision         | Choice                       | Rationale                                   |
+| ---------------- | ---------------------------- | ------------------------------------------- |
+| Binary name      | `gnd`                        | Existing name, avoid confusion with `graph` |
+| Protocol support | Ethereum only                | Simplify initial scope                      |
+| Compatibility    | Drop-in replacement          | Same flags, output, exit codes              |
+| Code generation  | Byte-for-byte identical      | Snapshot testable, no surprises             |
+| Formatting       | Shell out to prettier        | Guarantees identical output                 |
+| Compilation      | Shell out to asc             | Same as TS CLI                              |
+| Testing          | Shell out to Matchstick      | Same as TS CLI                              |
+| Debug logging    | RUST_LOG                     | Rust standard, not DEBUG env var            |
+| Validation       | Use graph-node's             | Refactor if needed, single source of truth  |
+| Network registry | Fetch at runtime             | Registry contents change over time          |
+| Error messages   | Same info, format may differ | Convey same information                     |
+| TS CLI bugs      | Fix them                     | Don't replicate bugs                        |
+
+## Risk Assessment
+
+| Risk                        | Severity | Mitigation                           |
+| --------------------------- | -------- | ------------------------------------ |
+| Code generation fidelity    | High     | Snapshot tests against TS CLI output |
+| Migration correctness       | High     | Test with real old manifests         |
+| Breaking existing gnd users | Medium   | Keep `gnd dev` behavior identical    |
+| `asc` version compat        | Medium   | Version detection, clear errors      |
+| Network API changes         | Low      | Error handling, clear messages       |
+
+## TS CLI References
+
+Key files to study in `/home/lutter/code/subgraphs/graph-cli/packages/cli/src/`:
+
+| Feature          | TS CLI Location                     |
+| ---------------- | ----------------------------------- |
+| Commands         | `commands/*.ts`                     |
+| Type generator   | `type-generator.ts`                 |
+| Schema codegen   | `codegen/schema.ts`                 |
+| ABI codegen      | `protocols/ethereum/codegen/abi.ts` |
+| Template codegen | `codegen/template.ts`               |
+| Compiler         | `compiler/index.ts`                 |
+| Migrations       | `migrations/`                       |
+| Scaffold         | `scaffold/`                         |
+| Spinner/output   | `command-helpers/spinner.ts`        |
+| Auth             | `command-helpers/auth.ts`           |
+| Network config   | `command-helpers/network.ts`        |
+| Tests            | `../tests/cli/`                     |
+
+## Effort Estimate
+
+**~3-4 person-months** for full implementation because:
+
+- Code generation must be byte-for-byte identical (requires careful study)
+- All migrations must be implemented
+- Full test coverage needed
+- But we reuse: manifest parsing, validation, IPFS client, file watching, CLI framework
diff --git a/docs/plans/runner-refactor.md b/docs/plans/runner-refactor.md
new file mode 100644
index 00000000000..c5ce612f8db
--- /dev/null
+++ b/docs/plans/runner-refactor.md
@@ -0,0 +1,281 @@
+# Runner Refactor Implementation Plan
+
+This document outlines the implementation plan for the runner refactor described in [the spec](../specs/runner-refactor.md).
+
+## Overview
+
+The refactor transforms `core/src/subgraph/runner.rs` from a complex nested-loop structure into a cleaner state machine with explicit pipeline stages.
+
+## Git Workflow
+
+**Branch**: All work should be committed to the `runner-refactor` branch.
+
+**Commit discipline**:
+
+- Commit work in small, reviewable chunks
+- Each commit should be self-contained and pass all checks
+- Prefer many small commits over few large ones
+- Each commit message should clearly describe what it does
+- Each step in the implementation phases should correspond to one or more commits
+
+**Before each commit**:
+
+```bash
+just format
+just lint
+just test-unit
+just test-runner
+```
+
+- MANDATORY: Work must be committed, a task is only done when work is committed
+- MANDATORY: Make sure to follow the commit discipline above
+- IMPORTANT: The runner tests produce output in `tests/runner-tests.log`. Use that to investigate failures.
+
+## Implementation Phases
+
+### Phase 1: Extract TriggerRunner Component
+
+**Goal:** Eliminate duplicated trigger processing code (lines 616-656 vs 754-790).
+
+**Files to modify:**
+
+- `core/src/subgraph/runner.rs` - Extract logic
+- Create `core/src/subgraph/runner/trigger_runner.rs`
+
+**Steps:**
+
+1. Create `TriggerRunner` struct with execute method
+2. Replace first trigger loop (lines 616-656) with `TriggerRunner::execute()`
+3. Replace second trigger loop (lines 754-790) with same call
+4. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- `just test-runner` passes
+- No behavioral changes
+
+### Phase 2: Define RunnerState Enum
+
+**Goal:** Introduce explicit state machine types without changing control flow yet.
+
+**Files to modify:**
+
+- Create `core/src/subgraph/runner/state.rs`
+- `core/src/subgraph/runner.rs` - Add state field
+
+**Steps:**
+
+1. Define `RunnerState` enum with all variants
+2. Define `RestartReason` and `StopReason` enums
+3. Add `state: RunnerState` field to `SubgraphRunner`
+4. Initialize state in constructor
+5. Verify tests pass (no behavioral changes yet)
+
+**Verification:**
+
+- Code compiles
+- Tests pass unchanged
+
+### Phase 3: Refactor run_inner to State Machine
+
+**Goal:** Replace nested loops with explicit state transitions.
+
+**Files to modify:**
+
+- `core/src/subgraph/runner.rs` - Rewrite `run_inner`
+
+**Steps:**
+
+1. Extract `initialize()` method for pre-loop setup
+2. Extract `await_block()` method for stream event handling
+3. Extract `restart()` method for restart logic
+4. Extract `finalize()` method for cleanup
+5. Rewrite `run_inner` as state machine loop
+6. Remove nested loop structure
+7. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- `just test-runner` passes
+- Same behavior, cleaner structure
+
+### Phase 4: Define Pipeline Stages
+
+**Goal:** Break `process_block` into explicit stages.
+
+**Files to modify:**
+
+- Create `core/src/subgraph/runner/pipeline.rs`
+- `core/src/subgraph/runner.rs` - Refactor `process_block`
+
+**Steps:**
+
+1. Extract `match_triggers()` stage method
+2. Extract `execute_triggers()` stage method (uses `TriggerRunner`)
+3. Extract `process_dynamic_data_sources()` stage method
+4. Extract `process_offchain_triggers()` stage method
+5. Extract `persist_block_state()` stage method
+6. Rewrite `process_block` to call stages in sequence
+7. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- `just test-runner` passes
+- Same behavior, cleaner structure
+
+### Phase 5: Consolidate Error Handling
+
+**Goal:** Unify scattered error handling into explicit classification.
+
+**Files to modify:**
+
+- `graph/src/components/subgraph/error.rs` (or wherever `ProcessingError` lives)
+- `core/src/subgraph/runner.rs` - Use new error methods
+
+**Steps:**
+
+1. Add `ProcessingErrorKind` enum with Deterministic/NonDeterministic/PossibleReorg variants
+2. Add `kind()` method to `ProcessingError`
+3. Add helper methods: `should_stop_processing()`, `should_restart()`, `is_retryable()`
+4. Replace scattered error checks in `process_block` with unified logic
+5. Replace scattered error checks in dynamic DS handling
+6. Replace scattered error checks in `handle_offchain_triggers`
+7. Document error handling invariants in code comments
+8. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- `just test-runner` passes
+- Error behavior unchanged (same semantics, cleaner code)
+
+### Phase 6: Add BlockState Checkpoints
+
+**Goal:** Enable rollback capability with minimal overhead.
+
+**Files to modify:**
+
+- `graph/src/prelude.rs` or wherever `BlockState` is defined
+- `core/src/subgraph/runner.rs` - Use checkpoints
+
+**Steps:**
+
+1. Add `checkpoint()` method to `BlockState`
+2. Add `BlockStateCheckpoint` struct
+3. Add `restore()` method to `BlockState`
+4. Use checkpoint before dynamic DS processing
+5. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- No performance regression (checkpoints are lightweight)
+
+### Phase 7: Module Organization
+
+**Goal:** Organize code into proper module structure.
+
+**Files to create/modify:**
+
+- `core/src/subgraph/runner/mod.rs`
+- Move/organize existing extracted modules
+
+**Steps:**
+
+1. Create `runner/` directory
+2. Move `state.rs`, `pipeline.rs`, `trigger_runner.rs` into it
+3. Update `runner.rs` to re-export from module
+4. Update imports in dependent files
+5. Verify tests pass
+
+**Verification:**
+
+- `just test-unit` passes
+- `just test-runner` passes
+- `just lint` shows no warnings
+
+## Completion Criteria
+
+Each phase is complete when:
+
+1. `just format` - Code is formatted
+2. `just lint` - Zero warnings
+3. `just check --release` - Builds in release mode
+4. `just test-unit` - Unit tests pass
+5. `just test-runner` - Runner tests pass
+
+## Progress Checklist
+
+### Phase 1: Extract TriggerRunner Component
+
+- [x] Create `TriggerRunner` struct with execute method
+- [x] Replace first trigger loop (lines 616-656)
+- [x] Replace second trigger loop (lines 754-790)
+- [x] Verify tests pass
+
+### Phase 2: Define RunnerState Enum
+
+- [x] Define `RunnerState` enum with all variants
+- [x] Define `RestartReason` and `StopReason` enums
+- [x] Add `state: RunnerState` field to `SubgraphRunner`
+- [x] Initialize state in constructor
+- [x] Verify tests pass
+
+### Phase 3: Refactor run_inner to State Machine
+
+- [x] Extract `initialize()` method
+- [x] Extract `await_block()` method
+- [x] Extract `restart()` method
+- [x] Extract `finalize()` method
+- [x] Rewrite `run_inner` as state machine loop
+- [x] Remove nested loop structure
+- [x] Verify tests pass
+
+### Phase 4: Define Pipeline Stages
+
+- [x] Extract `match_triggers()` stage method
+- [x] Extract `execute_triggers()` stage method
+- [x] Extract `process_dynamic_data_sources()` stage method
+- [x] Extract `process_offchain_triggers()` stage method
+- [x] Extract `persist_block_state()` stage method
+- [x] Rewrite `process_block` to call stages in sequence
+- [x] Verify tests pass
+
+### Phase 5: Consolidate Error Handling
+
+- [x] Add `ProcessingErrorKind` enum
+- [x] Add `kind()` method to `ProcessingError`
+- [x] Add helper methods (`should_stop_processing()`, `should_restart()`, `is_retryable()`)
+- [x] Replace scattered error checks in `process_block`
+- [x] Replace scattered error checks in dynamic DS handling (preserved existing behavior per spec)
+- [x] Replace scattered error checks in `handle_offchain_triggers` (preserved existing behavior per spec)
+- [x] Document error handling invariants
+- [x] Verify tests pass
+
+### Phase 6: Add BlockState Checkpoints
+
+- [x] Add `BlockStateCheckpoint` struct
+- [x] Add `checkpoint()` method to `BlockState`
+- [x] Add `restore()` method to `BlockState`
+- [x] Use checkpoint before dynamic DS processing
+- [x] Verify tests pass
+
+### Phase 7: Module Organization
+
+- [x] Create `runner_components/` directory (named to avoid conflict with `runner.rs`)
+- [x] Move `state.rs`, `trigger_runner.rs` into it (pipeline.rs was not created as stages are methods)
+- [x] Create `runner_components/mod.rs` with re-exports
+- [x] Update imports in `runner.rs` to use the new module path
+- [x] Verify tests pass
+- [x] `just lint` shows zero warnings
+
+## Notes
+
+- Each phase should be a separate, reviewable PR
+- Phases 1-4 can potentially be combined if changes are small
+- Phase 3 (FSM refactor of run_inner) is the most invasive and should be reviewed carefully
+- Phase 5 (error handling) can be done earlier if it helps simplify other phases
+- Preserve all existing behavior - this is a refactor, not a feature change
diff --git a/docs/specs/dump-restore.md b/docs/specs/dump-restore.md
new file mode 100644
index 00000000000..6d7e117b78d
--- /dev/null
+++ b/docs/specs/dump-restore.md
@@ -0,0 +1,269 @@
+# Spec: Parquet Dump/Restore for Subgraph Data
+
+## Problem
+
+Subgraph entity data lives exclusively in PostgreSQL. There's no way to export a subgraph's data for backup, migration between environments, or sharing. We need a file-based dump/restore mechanism.
+
+## Goals
+
+1. **Dump** a subgraph's entity data to parquet files
+2. **Restore** a subgraph from parquet files
+3. **Incremental append** -- add newly arrived data to an existing dump without rewriting it
+4. Long-term: make dumping an **ongoing process** (not just a one-off CLI operation)
+
+## Non-goals (for now)
+
+- S3/GCS output
+- Schema evolution / migration between different schema versions
+
+## Data Model Recap
+
+Each subgraph deployment has:
+- A PostgreSQL schema (e.g., `sgd123`)
+- One table per entity type, with columns:
+  - `vid` (bigserial) -- row version ID, primary key
+  - `block_range` (int4range) for mutable entities OR `block$` (int) for immutable
+  - `causality_region` (int, optional) -- for offchain data sources
+  - Data columns matching GraphQL fields (text, int, bigint, numeric, bytea, bool, timestamptz, arrays, enums)
+- `data_sources$` table -- dynamic data sources created at runtime (defined in `dynds/private.rs`, separate from Layout):
+  - `vid` (int, identity PK), `block_range` (int4range), `causality_region` (int)
+  - `manifest_idx` (int), `parent` (int, self-ref FK), `id` (bytea)
+  - `param` (bytea, nullable), `context` (jsonb, nullable), `done_at` (int, nullable)
+  - Note: `parent` and `id` exist in the DDL but are currently unused by `insert()`, `load()`, and `copy_to()`. The dump should include them for completeness (they may contain data in older deployments).
+- `poi2$` table -- Proof of Indexing data (a **mutable** entity table in the Layout, i.e. it uses `block_range` not `block$`; has `digest` (bytea), `id` (text), optionally `block_time$` (int8); `has_causality_region: false`). Conditionally created when `catalog.use_poi` is true. Excluded from some Layout operations like `find_changes()`.
+- Metadata in `subgraphs.subgraph_manifest`, `subgraphs.deployment`, and `subgraphs.head` tables
+
+## Dump Format
+
+### Directory layout
+
+```
+<dump-dir>/
+  metadata.json                  -- deployment metadata + per-table state
+  schema.graphql                 -- raw GraphQL schema text
+  subgraph.yaml                  -- raw subgraph manifest YAML (optional)
+  <EntityType>/
+    chunk_000000.parquet         -- rows ordered by vid
+    chunk_000001.parquet         -- incremental append
+    ...
+  data_sources$/
+    chunk_000000.parquet         -- dynamic data sources
+```
+
+One parquet file per entity type (each has a different columnar schema). The `data_sources$` table is dumped alongside entity tables. The `poi2$` table, when present, is a regular entity table in the `Layout` (conditionally created when `catalog.use_poi` is true) and appears as any other entity type directory. Incremental dumps produce new chunk files rather than rewriting existing ones.
+
+The GraphQL schema and subgraph manifest YAML are stored as separate files rather than embedded in `metadata.json`. This matches the existing dump code in `dump.rs` and keeps the files human-readable and diffable.
+
+### Parquet schema per entity type
+
+System columns (always present):
+- `vid` -> Int64
+- Immutable entities: `block$` -> Int32
+- Mutable entities: `block_range_start` -> Int32, `block_range_end` -> Int32 (nullable; null = unbounded/current)
+- `causality_region` -> Int32 (only if table has it)
+
+Data columns mapped from `ColumnType` (all 10 variants defined in `relational.rs:1342`):
+
+| ColumnType         | Arrow DataType             | Notes                        |
+|--------------------|---------------------------|-------------------------------|
+| Boolean            | Boolean                    |                               |
+| Int                | Int32                      |                               |
+| Int8               | Int64                      |                               |
+| Bytes              | Binary                     | Raw bytes                     |
+| BigInt             | Utf8                       | Arbitrary precision as string |
+| BigDecimal         | Utf8                       | Arbitrary precision as string |
+| Timestamp          | TimestampMicrosecond(None) | Matches Value::Timestamp      |
+| String             | Utf8                       |                               |
+| Enum(EnumType)     | Utf8                       | String value of enum variant  |
+| TSVector(FulltextConfig) | **Skip**             | Generated; rebuild on restore |
+
+**List/array columns:** `List(T)` is not a `ColumnType` variant. Whether a column is an array is determined by `Column.is_list()` (delegates to the GraphQL `field_type`). A `[String]` field has `column_type: ColumnType::String` with a list-typed `field_type`. For Arrow mapping, check `column.is_list()` and wrap the base Arrow type in `List<mapped T>`. In `OidValue`, arrays have separate variants (`StringArray`, `BytesArray`, `BoolArray`, `Ints`, `Int8Array`, `BigDecimalArray`, `TimestampArray`).
+
+Nullability follows the GraphQL schema (non-null fields -> non-nullable Arrow columns).
+
+### metadata.json
+
+Contains everything needed to reconstruct the deployment's table structure, plus diagnostic information (health, indexes) captured at dump time. The GraphQL schema and manifest YAML are stored in separate files (`schema.graphql`, `subgraph.yaml`), not embedded here.
+
+The struct backing this file is `Metadata` (evolved from the existing `Control` struct in `dump.rs`).
+
+```json
+{
+  "version": 1,
+  "deployment": "Qm...",
+  "network": "mainnet",
+
+  "manifest": {
+    "spec_version": "1.0.0",
+    "description": "Optional subgraph description",
+    "repository": "https://github.com/...",
+    "features": ["..."],
+    "entities_with_causality_region": ["EntityType1"],
+    "history_blocks": 2147483647
+  },
+
+  "earliest_block_number": 12345,
+  "start_block": { "number": 12345, "hash": "0xabc..." },
+  "head_block": { "number": 99999, "hash": "0xdef..." },
+  "entity_count": 150000,
+
+  "graft_base": null,
+  "graft_block": null,
+  "debug_fork": null,
+
+  "health": {
+    "failed": false,
+    "health": "healthy",
+    "fatal_error": null,
+    "non_fatal_errors": []
+  },
+
+  "indexes": {
+    "token": [
+      "CREATE INDEX CONCURRENTLY IF NOT EXISTS attr_0_0_id ON sgd.token USING btree (id)"
+    ]
+  },
+
+  "tables": {
+    "Token": {
+      "immutable": true,
+      "has_causality_region": false,
+      "chunks": [
+        { "file": "Token/chunk_000000.parquet", "min_vid": 0, "max_vid": 50000, "row_count": 50000 }
+      ],
+      "max_vid": 50000
+    },
+    "data_sources$": {
+      "immutable": false,
+      "has_causality_region": true,
+      "chunks": [
+        { "file": "data_sources$/chunk_000000.parquet", "min_vid": 0, "max_vid": 100, "row_count": 100 }
+      ],
+      "max_vid": 100
+    }
+  }
+}
+```
+
+**Field sources:**
+
+| Field | Source | Code path |
+|-------|--------|-----------|
+| `manifest.*` | `subgraphs.subgraph_manifest` | `SubgraphManifestEntity` via `deployment_entity()` in `detail.rs` |
+| `start_block` | `subgraphs.subgraph_manifest` | `start_block_number`, `start_block_hash` columns; available via `StoredSubgraphManifest` in `detail.rs:542-543`, assembled into `SubgraphDeploymentEntity.start_block` |
+| `earliest_block_number` | `subgraphs.deployment` | `SubgraphDeploymentEntity.earliest_block_number` |
+| `graft_base`, `graft_block` | `subgraphs.deployment` | `SubgraphDeploymentEntity.graft_base`, `.graft_block` |
+| `debug_fork` | `subgraphs.deployment` | `SubgraphDeploymentEntity.debug_fork` |
+| `head_block` | `subgraphs.head` | `SubgraphDeploymentEntity.latest_block` |
+| `entity_count` | `subgraphs.head` | `DeploymentDetail.entity_count` (i64 in DB, usize in Rust) |
+| `health.*` | `subgraphs.deployment` + `subgraph_error` | `SubgraphDeploymentEntity.{failed, health, fatal_error, non_fatal_errors}` |
+| `indexes` | `pg_indexes` catalog | `IndexList::load()` → `CreateIndex::to_sql()` (existing code in `dump.rs:163-179`) |
+| `network` | `deployment_schemas` | `Site.network` |
+| `tables.*` | `Layout.tables` | `Table.{immutable, has_causality_region}` |
+
+**Notes:**
+- `use_bytea_prefix` is not stored in the dump. It is hardcoded to `true` in `create_deployment` (deployment.rs:1302) and will always be set to `true` on restore.
+- `health` and `indexes` are point-in-time diagnostic snapshots. They are not used during restore (a restored deployment starts healthy; indexes are auto-created by `Layout::create_relational_schema()`). They are included for inspection and debugging.
+- `indexes` are serialized as SQL strings using `CreateIndex::with_nsp("sgd")` + `to_sql(true, true)`, producing `CREATE INDEX CONCURRENTLY IF NOT EXISTS` statements with a normalized `sgd` namespace.
+- The `manifest` fields mirror the existing `Manifest` struct in `dump.rs` (derived from `SubgraphManifestEntity`). The `schema` and `raw_yaml` fields of `SubgraphManifestEntity` are written to separate files instead.
+- The `poi2$` table, when present, is a regular mutable entity table in `Layout.tables` and appears in the `tables` map like any other entity. It does not need special handling.
+
+The raw GraphQL schema (in `schema.graphql`) is sufficient to reconstruct the full relational layout via `InputSchema::parse(spec_version, schema, deployment_hash)` → `Layout::new()`. The `InputSchema::parse()` call requires `manifest.spec_version` for version-specific parsing logic.
+
+## Dump Process
+
+**Existing code:** There is already a metadata-only dump in `store/postgres/src/relational/dump.rs` (`Layout::dump()`) that writes `control.json`, `schema.graphql`, and `subgraph.yaml`. It is called via `DeploymentStore::dump()` (deployment_store.rs:901) which loads `Layout` + `IndexList` and passes both to `Layout::dump()`. The connection is `AsyncPgConnection` via `pool.get_permitted()`. The new parquet dump extends this to include entity data.
+
+The existing `Control` struct is renamed to `Metadata` and extended with the fields described above. The existing `Manifest`, `BlockPtr`, `Health`, and `Error` structs in `dump.rs` are reused and extended.
+
+1. Resolve the deployment (by name, hash, or sgdN)
+2. Read deployment metadata from `subgraph_manifest` + `deployment` + `head` tables (via `deployment_entity()` in `detail.rs`)
+3. Write `schema.graphql` and `subgraph.yaml` (existing behavior)
+4. For each entity type table in `Layout.tables` (sorted by name for determinism; includes `poi2$` when present):
+   a. Query rows in vid order, batched (adaptive sizing like `VidBatcher`)
+   b. Convert PG rows directly to Arrow `RecordBatch` (no JSON intermediate)
+   c. Write batches to parquet file
+   d. Record chunk info (file path, min_vid, max_vid, row_count)
+5. Dump `data_sources$` table (fixed schema, same batch approach; include all DDL columns: `vid`, `block_range`, `causality_region`, `manifest_idx`, `parent`, `id`, `param`, `context`, `done_at`). Note: `parent` and `id` are in the DDL (`private.rs:68-69`) but not in the `DataSourcesTable` struct — dumping them requires raw SQL or extending the struct.
+6. Write `metadata.json` atomically (write to tmp file, rename)
+
+### Incremental append
+
+- Read existing `metadata.json` to get `max_vid` per entity type
+- Query rows with `vid > max_vid`
+- Write as new chunk files (`chunk_000001.parquet`, etc.)
+- Update metadata atomically
+
+## Restore Process
+
+1. Read `metadata.json` and `schema.graphql`
+2. Parse schema via `InputSchema::parse(manifest.spec_version, schema_text, deployment_hash)`
+3. Create a `Site` entry in `deployment_schemas` (needed for the deployment to be discoverable)
+4. Create deployment via `create_deployment(conn, site, DeploymentCreate { .. })` -- this populates three tables:
+   - `subgraphs.head` (block pointers, entity count -- initially null/0)
+   - `subgraphs.deployment` (deployment hash, earliest_block, graft info, health)
+   - `subgraphs.subgraph_manifest` (schema from file, features/spec_version/etc. from metadata)
+5. Create tables via `Layout::create_relational_schema()` -- this generates DDL from the parsed schema and creates all entity tables with default indexes
+6. Restore `data_sources$` table via DDL from `DataSourcesTable::new().as_ddl()` + batch-insert
+7. For each entity type (including `poi2$` if present), read all parquet chunks in order, batch-insert into PG
+8. Reset vid sequences to `max_vid + 1` for all entity tables and data_sources$
+9. Update `subgraphs.head` with `head_block.number`, `head_block.hash`, and `entity_count` from dump metadata
+
+## PG Read Strategy: OidValue-based Dynamic Columns
+
+Use the existing `dsl::Table::select_cols()` + `DynamicRow<OidValue>` pattern (see `store/postgres/src/relational/dsl.rs` and `store/postgres/src/relational/value.rs`). This already solves dynamic-schema typed extraction through the connection pool:
+
+1. `select_cols()` builds a typed SELECT using `DynamicSelectClause` for any set of columns
+2. Results are `DynamicRow<OidValue>` where `OidValue` dispatches on PG OID at runtime
+3. `OidValue` captures all needed types: String, Bytes, Bool, Int, Int8, BigDecimal, Timestamp, plus array variants
+4. Convert `OidValue` -> Arrow `ArrayBuilder` (analogous to existing `OidValue` -> `Entity` in `FromOidRow`)
+
+No JSON, no separate connection. The existing `DeploymentStore::dump()` already uses `AsyncPgConnection` via `pool.get_permitted()`.
+
+**Block range handling:** Add `OidValue::Int4Range(Bound<i32>, Bound<i32>)` variant (OID 3904). Diesel already has `FromSql<Range<Integer>, Pg>` for `(Bound<i32>, Bound<i32>)` which parses the binary format. ~15 lines of code in `value.rs` + fix the `BLOCK_RANGE_COL` placeholder in `dsl.rs:46-49` (currently `ColumnType::Bytes`, with comment "we can't deserialize in4range"). This resolves the existing TODO at dsl.rs line 294.
+
+**Key existing code:**
+- `dsl::Table::select_cols()` (`store/postgres/src/relational/dsl.rs:305`)
+- `OidValue` enum and `FromSql<Any, Pg>` impl (`store/postgres/src/relational/value.rs:33`)
+- `FromOidRow` trait for result deserialization (`value.rs:206`)
+- `selected_columns()` for building column list with system columns (`dsl.rs:246`)
+
+### Vid continuity on restore
+
+Preserve original vid values. Needed for incremental consistency and simpler to implement. Reset vid sequence to `max_vid + 1` after restore.
+
+## Where Code Lives
+
+- `store/postgres/src/relational/dump.rs` -- **Existing** metadata-only dump. Contains `Manifest`, `BlockPtr`, `Error`, `Health`, `Control` structs. `Control` will be renamed to `Metadata` and extended. The existing helper structs (`Manifest`, `BlockPtr`, `Health`, `Error`) are reused. Called via `DeploymentStore::dump()` → `Layout::dump()`.
+- `store/postgres/src/parquet/` -- New module for parquet read/write/schema mapping
+- `node/src/manager/commands/dump.rs` -- **Existing** CLI command skeleton (resolves deployment, calls `SubgraphStore::dump()`)
+- `node/src/manager/commands/restore.rs` -- New CLI command for restore
+- Expose via `command_support` in `store/postgres/src/lib.rs`
+
+## Dependencies to Add
+
+- `parquet = "=57.3.0"` (same version as existing `arrow`) to workspace and `store/postgres`
+- `arrow` workspace dep to `store/postgres`
+
+## Existing Code to Reuse
+
+- `Layout`, `Table`, `Column`, `ColumnType` (`store/postgres/src/relational.rs`) -- schema introspection; `poi2$` is in Layout as a mutable entity table (conditionally, when `catalog.use_poi` is true)
+- `Column.is_list()` (`relational.rs:1574`) -- determines if a column is an array type (delegates to GraphQL `field_type.is_list()`)
+- `DataSourcesTable` (`store/postgres/src/dynds/private.rs`) -- `data_sources$` DDL via `as_ddl()` method; note that `parent` and `id` columns are in the DDL but not in the struct's typed fields
+- `VidBatcher` (`store/postgres/src/vid_batcher.rs`) -- adaptive batch iteration using PG histogram statistics
+- `copy.rs` pattern -- progress reporting, batch operation lifecycle; already handles both entity tables and `data_sources$` copying
+- `InputSchema::parse(spec_version, raw, id)` (`graph/src/schema/input/mod.rs:965`) -- schema reconstruction from text
+- `DeploymentSearch` (`node/src/manager/deployment.rs`) -- CLI deployment resolution (supports name, Qm hash, sgdN namespace)
+- `create_deployment` (`store/postgres/src/deployment.rs:1224`) -- populates `head`, `deployment`, and `subgraph_manifest` tables
+- `DeploymentCreate` + `SubgraphManifestEntity` (`graph/src/data/subgraph/schema.rs:103`) -- structs needed by `create_deployment`
+- `deployment_entity()` (`store/postgres/src/detail.rs`) -- reads deployment metadata into `SubgraphDeploymentEntity`; note that `start_block_*` is in the DB table (`StoredSubgraphManifest`) but only partially exposed through `SubgraphDeploymentEntity`
+- `IndexList::load()` + `CreateIndex::to_sql()` (`store/postgres/src/relational/index.rs`) -- loads and serializes indexes
+- Existing `dump.rs` (`store/postgres/src/relational/dump.rs`) -- metadata serialization types: `Manifest`, `BlockPtr`, `Health`, `Error`, `Control` (to be renamed `Metadata`)
+
+## Implementation Order
+
+1. Schema mapping + metadata types (foundation, unit-testable)
+2. Parquet writer (dump from PG) + graphman `dump` command
+3. Incremental append support
+4. Parquet reader (restore to PG) + graphman `restore` command
+5. Ongoing dump integration (run as part of graph-node, not just CLI)
diff --git a/docs/specs/gnd-cli-expansion.md b/docs/specs/gnd-cli-expansion.md
new file mode 100644
index 00000000000..7d0cf0d37fe
--- /dev/null
+++ b/docs/specs/gnd-cli-expansion.md
@@ -0,0 +1,891 @@
+# Spec: gnd CLI Expansion
+
+This spec describes the expansion of `gnd` (Graph Node Dev) to include functionality currently provided by the TypeScript-based `graph-cli`. The goal is a drop-in replacement for subgraph development workflows, implemented in Rust and integrated with graph-node's existing infrastructure.
+
+## Goals
+
+- **Drop-in replacement**: Same commands, flags, output format, and exit codes as `graph-cli`
+- **Identical code generation**: AssemblyScript output must be byte-for-byte identical after formatting
+- **Ethereum only**: Initial scope limited to Ethereum protocol
+- **Reuse graph-node internals**: Leverage existing manifest parsing, validation, IPFS client, etc.
+
+## Non-Goals
+
+- Multi-protocol support (NEAR, Cosmos, Arweave, Substreams) - future work
+- Rollout/migration plan from TS CLI
+- Performance optimization beyond reasonable behavior
+
+## Commands
+
+### Command Matrix
+
+| Command   | TS CLI | gnd | Notes                                      |
+| --------- | ------ | --- | ------------------------------------------ |
+| `codegen` | Yes    | Yes | Generate AssemblyScript types              |
+| `build`   | Yes    | Yes | Compile to WASM                            |
+| `deploy`  | Yes    | Yes | Deploy to Graph Node                       |
+| `init`    | Yes    | Yes | Scaffold new subgraph                      |
+| `add`     | Yes    | Yes | Add datasource to existing subgraph        |
+| `remove`  | Yes    | Yes | Unregister subgraph name                   |
+| `create`  | Yes    | Yes | Register subgraph name                     |
+| `auth`    | Yes    | Yes | Set deploy key                             |
+| `publish` | Yes    | Yes | Publish to decentralized network           |
+| `test`    | Yes    | Yes | Run Matchstick tests                       |
+| `clean`   | Yes    | Yes | Remove build artifacts                     |
+| `dev`     | No     | Yes | Run graph-node in dev mode (existing gnd)  |
+| `local`   | Yes    | No  | Skipped - use existing test infrastructure |
+| `node`    | Yes    | No  | Skipped - use graphman for node management |
+
+### Known Differences from TS CLI
+
+**Commands:**
+
+1. **`local` command**: Not implemented. Users should use existing integration test infrastructure.
+2. **`node` subcommand**: Not implemented. Use `graphman` for node management operations.
+3. **`--uncrashable` flag on codegen**: Not implemented. Float Capital's uncrashable helper generation is a niche third-party feature.
+4. **Debug output**: Uses `RUST_LOG` environment variable instead of `DEBUG=graph-cli:*`.
+
+**Code generation** (intentional, documented in verification tests): 5. **Int8 import**: gnd always imports `Int8` for simplicity, even when not used. 6. **Trailing commas**: gnd uses trailing commas in multi-line constructs. 7. **2D array accessors**: gnd uses correct `toStringMatrix()` while graph-cli has a bug using `toStringArray()` for 2D GraphQL array types. 8. **Tuple/struct component names**: gnd correctly extracts component names from raw ABI JSON, while graph-cli's ethabi parser loses nested component names for some tuple types. 9. **Subgraph data source file naming**: gnd uses the data source name (`subgraph-SourceName.ts`) instead of IPFS hash (`subgraph-QmHash.ts`) for stable import paths that don't break when source subgraphs are redeployed.
+
+## CLI Interface
+
+### Binary and Invocation
+
+```
+gnd <command> [options] [arguments]
+```
+
+The binary name is `gnd`. All graph-cli commands become gnd subcommands.
+
+### Version Output
+
+```
+$ gnd --version
+gnd 0.1.0 (graph-cli compatible: 0.98.1)
+```
+
+Shows both gnd version and the graph-cli version it emulates.
+
+### Flag Compatibility
+
+All flags must match the TS CLI exactly:
+
+- Same long names (`--output-dir`)
+- Same short names (`-o`)
+- Same defaults
+- Same validation behavior
+
+Reference: Each command section below lists flags with references to TS CLI source.
+
+### Output Format
+
+Output must match TS CLI format exactly, including:
+
+- Spinner/progress indicators
+- Success checkmarks (`✔`)
+- Step descriptions
+- File paths displayed
+- Error formatting (information must match; exact wording may differ)
+
+Reference: `/packages/cli/src/command-helpers/spinner.ts`
+
+### Exit Codes
+
+Exit codes must match TS CLI behavior:
+
+- `0`: Success
+- `1`: Error (validation, compilation, deployment failure, etc.)
+
+### Configuration Files
+
+Use same paths and formats as TS CLI:
+
+| File           | Path                           | Purpose                       |
+| -------------- | ------------------------------ | ----------------------------- |
+| Auth tokens    | `~/.graphprotocol/`            | Deploy keys and access tokens |
+| Network config | `networks.json` (project root) | Network-specific addresses    |
+
+Reference: `/packages/cli/src/command-helpers/auth.ts`
+
+## Command Specifications
+
+### `gnd codegen`
+
+Generates AssemblyScript types from subgraph manifest.
+
+**Usage:**
+
+```
+gnd codegen [subgraph-manifest]
+```
+
+**Arguments:**
+
+- `subgraph-manifest`: Path to manifest file (default: `subgraph.yaml`)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--output-dir` | `-o` | `generated/` | Output directory for generated types |
+| `--skip-migrations` | | `false` | Skip subgraph migrations |
+| `--watch` | `-w` | `false` | Regenerate on file changes |
+| `--ipfs` | `-i` | `https://api.thegraph.com/ipfs/` | IPFS node URL |
+| `--help` | `-h` | | Show help |
+
+**Behavior:**
+
+1. Load and validate manifest
+2. Apply migrations (unless `--skip-migrations`)
+3. Assert minimum API version (0.0.5) and graph-ts version (0.25.0)
+4. Generate entity classes from GraphQL schema
+5. Generate ABI bindings for each contract
+6. Generate template datasource bindings
+7. Format output with prettier
+8. Write to output directory
+
+**Output Structure:**
+
+```
+generated/
+├── schema.ts                           # Entity classes
+├── <DataSourceName>/
+│   └── <ContractName>.ts              # ABI bindings
+├── templates/
+│   └── <TemplateName>/
+│       └── <ContractName>.ts          # Template ABI bindings
+└── subgraph-<DataSourceName>.ts       # Entity types for subgraph data sources
+```
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/codegen.ts`
+- Type generator: `/packages/cli/src/type-generator.ts`
+- Schema codegen: `/packages/cli/src/codegen/schema.ts`
+- ABI codegen: `/packages/cli/src/protocols/ethereum/codegen/abi.ts`
+
+### `gnd build`
+
+Compiles subgraph to WASM.
+
+**Usage:**
+
+```
+gnd build [subgraph-manifest]
+```
+
+**Arguments:**
+
+- `subgraph-manifest`: Path to manifest file (default: `subgraph.yaml`)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--output-dir` | `-o` | `build/` | Output directory |
+| `--output-format` | `-t` | `wasm` | Output format: `wasm` or `wast` |
+| `--skip-migrations` | | `false` | Skip subgraph migrations |
+| `--watch` | `-w` | `false` | Rebuild on file changes |
+| `--ipfs` | `-i` | | IPFS node URL (uploads if provided) |
+| `--network` | | | Network to use from networks.json |
+| `--network-file` | | `networks.json` | Path to networks config |
+| `--help` | `-h` | | Show help |
+
+**Behavior:**
+
+1. Run codegen (unless types already exist)
+2. Apply migrations (unless `--skip-migrations`)
+3. Resolve network-specific values from networks.json
+4. Shell out to `asc` (AssemblyScript compiler) for each mapping
+5. Copy ABIs and schema to build directory
+6. Copy template ABIs to build/templates/<name>/ directories
+7. Generate build manifest
+8. Optionally upload to IPFS
+
+**Build Output Structure:**
+
+```
+build/
+├── schema.graphql
+├── subgraph.yaml
+├── <DataSourceName>/
+│   ├── <DataSourceName>.wasm
+│   └── <ContractName>.json          # ABI
+└── templates/
+    └── <TemplateName>/
+        ├── <TemplateName>.wasm
+        └── <ContractName>.json      # ABI
+```
+
+**Note:** When multiple data sources or templates share the same mapping.ts file, gnd compiles it once and copies the resulting WASM to all required output locations.
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/build.ts`
+- Compiler: `/packages/cli/src/compiler/index.ts`
+
+### `gnd deploy`
+
+Deploys subgraph to a Graph Node.
+
+**Usage:**
+
+```
+gnd deploy [subgraph-name] [subgraph-manifest]
+```
+
+**Arguments:**
+
+- `subgraph-name`: Name to deploy as (e.g., `user/subgraph`)
+- `subgraph-manifest`: Path to manifest file (default: `subgraph.yaml`)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--product` | | | Product: `subgraph-studio` or `hosted-service` |
+| `--studio` | | `false` | Shorthand for `--product subgraph-studio` |
+| `--node` | `-g` | | Graph Node URL |
+| `--ipfs` | `-i` | | IPFS node URL |
+| `--access-token` | | | Access token for authentication |
+| `--deploy-key` | | | Deploy key (alias for access-token) |
+| `--version-label` | `-l` | | Version label |
+| `--headers` | | | Additional HTTP headers (JSON) |
+| `--debug-fork` | | | Fork subgraph for debugging |
+| `--skip-migrations` | | `false` | Skip subgraph migrations |
+| `--network` | | | Network from networks.json |
+| `--network-file` | | `networks.json` | Path to networks config |
+| `--output-dir` | `-o` | `build/` | Build output directory |
+| `--help` | `-h` | | Show help |
+
+**Deploy Targets:**
+
+- Local Graph Node (via `--node` and `--ipfs`)
+- Subgraph Studio (`--product subgraph-studio` or `--studio`)
+- Hosted Service (`--product hosted-service`)
+- Decentralized network (via `publish` command)
+
+**Behavior:**
+
+1. Build subgraph (runs build command)
+2. Upload build artifacts to IPFS
+3. Send deployment request to Graph Node via JSON-RPC
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/deploy.ts`
+
+### `gnd init`
+
+Scaffolds a new subgraph project.
+
+**Usage:**
+
+```
+gnd init [directory]
+```
+
+**Arguments:**
+
+- `directory`: Directory to create subgraph in
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--protocol` | | | Protocol: `ethereum` |
+| `--product` | | | Product for deployment |
+| `--studio` | | `false` | Initialize for Subgraph Studio |
+| `--from-contract` | | | Contract address to generate from |
+| `--from-example` | | | Example subgraph to clone |
+| `--contract-name` | | | Name for the contract |
+| `--index-events` | | `false` | Index all contract events |
+| `--start-block` | | | Start block for indexing |
+| `--network` | | `mainnet` | Network name |
+| `--abi` | | | Path to ABI file |
+| `--spkg` | | | Path to Substreams package |
+| `--allow-simple-name` | | `false` | Allow simple subgraph names |
+| `--help` | `-h` | | Show help |
+
+**Example Subgraphs:**
+
+The `--from-example <name>` flag clones from `https://github.com/graphprotocol/graph-tooling/tree/main/examples`.
+The example name is **required** - no default is provided. Available examples include:
+`ethereum-gravatar`, `aggregations`, `ethereum-basic-event-handlers`, `substreams-powered-subgraph`, etc.
+Legacy name `ethereum/gravatar` is automatically converted to `ethereum-gravatar`.
+
+**Behavior:**
+
+1. Prompt for missing information (protocol, network, contract, etc.)
+2. Fetch ABI from Etherscan/Sourcify if `--from-contract` and no `--abi`
+3. Generate scaffold:
+   - `subgraph.yaml` manifest
+   - `schema.graphql` with entities for events
+   - `src/mapping.ts` with event handlers
+   - `package.json` with dependencies
+   - `tsconfig.json`
+   - ABIs directory
+4. Optionally initialize git repository
+5. Install dependencies
+
+**External APIs:**
+
+- Etherscan API: Fetch verified contract ABIs
+- Sourcify API: Fetch verified contract ABIs (fallback)
+- Network registry: `@pinax/graph-networks-registry` for chain configuration
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/init.ts`
+- Scaffold: `/packages/cli/src/scaffold/index.ts`
+- Schema generation: `/packages/cli/src/scaffold/schema.ts`
+- Mapping generation: `/packages/cli/src/scaffold/mapping.ts`
+- Etherscan client: `/packages/cli/src/command-helpers/contracts.ts`
+
+### `gnd add`
+
+Adds a new datasource to an existing subgraph.
+
+**Usage:**
+
+```
+gnd add <address> [subgraph-manifest]
+```
+
+**Arguments:**
+
+- `address`: Contract address
+- `subgraph-manifest`: Path to manifest file (default: `subgraph.yaml`)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--abi` | | | Path to ABI file |
+| `--contract-name` | | | Name for the contract |
+| `--merge-entities` | | `false` | Merge with existing entities |
+| `--network-file` | | `networks.json` | Path to networks config |
+| `--start-block` | | | Start block |
+| `--help` | `-h` | | Show help |
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/add.ts`
+
+### `gnd create`
+
+Registers a subgraph name with a Graph Node.
+
+**Usage:**
+
+```
+gnd create <subgraph-name>
+```
+
+**Arguments:**
+
+- `subgraph-name`: Name to register
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--node` | `-g` | | Graph Node URL |
+| `--access-token` | | | Access token |
+| `--help` | `-h` | | Show help |
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/create.ts`
+
+### `gnd remove`
+
+Unregisters a subgraph name from a Graph Node.
+
+**Usage:**
+
+```
+gnd remove <subgraph-name>
+```
+
+**Arguments:**
+
+- `subgraph-name`: Name to unregister
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--node` | `-g` | | Graph Node URL |
+| `--access-token` | | | Access token |
+| `--help` | `-h` | | Show help |
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/remove.ts`
+
+### `gnd auth`
+
+Sets the deploy key for a Graph Node.
+
+**Usage:**
+
+```
+gnd auth <deploy-key>
+```
+
+**Arguments:**
+
+- `deploy-key`: Deploy key to store
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--product` | | | Product: `subgraph-studio` or `hosted-service` |
+| `--studio` | | `false` | Shorthand for subgraph-studio |
+| `--help` | `-h` | | Show help |
+
+**Behavior:**
+Stores deploy key in `~/.graphprotocol/` for later use by deploy/publish commands.
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/auth.ts`
+- Auth helpers: `/packages/cli/src/command-helpers/auth.ts`
+
+### `gnd publish`
+
+Publishes a subgraph to The Graph's decentralized network.
+
+**Usage:**
+
+```
+gnd publish [subgraph-manifest]
+```
+
+**Arguments:**
+
+- `subgraph-manifest`: Path to manifest file (default: `subgraph.yaml`)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--subgraph-id` | | | Subgraph ID to publish to |
+| `--ipfs` | `-i` | | IPFS node URL |
+| `--protocol-network` | | | Protocol network (e.g., `arbitrum-one`) |
+| `--help` | `-h` | | Show help |
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/publish.ts`
+
+### `gnd test`
+
+Runs Matchstick tests for the subgraph.
+
+**Usage:**
+
+```
+gnd test [datasource]
+```
+
+**Arguments:**
+
+- `datasource`: Specific datasource to test (optional)
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--coverage` | `-c` | `false` | Run with coverage |
+| `--docker` | `-d` | `false` | Run in Docker container |
+| `--force` | `-f` | `false` | Force recompilation |
+| `--logs` | `-l` | `false` | Show logs |
+| `--recompile` | `-r` | `false` | Recompile before testing |
+| `--version` | `-v` | | Matchstick version |
+| `--help` | `-h` | | Show help |
+
+**Behavior:**
+
+1. Download Matchstick binary (if not present)
+2. Shell out to Matchstick with appropriate flags
+3. Report test results
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/test.ts`
+
+### `gnd clean`
+
+Removes build artifacts and generated files.
+
+**Usage:**
+
+```
+gnd clean
+```
+
+**Flags:**
+| Flag | Short | Default | Description |
+|------|-------|---------|-------------|
+| `--codegen-dir` | | `generated/` | Codegen output directory |
+| `--build-dir` | | `build/` | Build output directory |
+| `--help` | `-h` | | Show help |
+
+**Behavior:**
+Removes `generated/` and `build/` directories (or custom paths if specified).
+
+**TS CLI References:**
+
+- Command: `/packages/cli/src/commands/clean.ts`
+
+### `gnd dev`
+
+Runs graph-node in development mode with file watching.
+
+This is the existing `gnd` functionality, preserved as a subcommand. The implementation can be adjusted to fit the new subcommand structure.
+
+**Usage:**
+
+```
+gnd dev [options]
+```
+
+**Flags:**
+Preserve existing gnd flags, adjusted as needed for subcommand structure.
+
+## Code Generation
+
+Code generation is the most complex component and must produce byte-for-byte identical output to the TS CLI (after prettier formatting).
+
+### Generated File Types
+
+#### 1. Entity Classes (`schema.ts`)
+
+Generated from GraphQL schema. Each entity type becomes an AssemblyScript class with:
+
+- Constructor
+- Static `load(id)` method
+- Static `loadInBlock(id)` method
+- `save()` method
+- Getters/setters for each field
+- Proper type mappings (GraphQL → AssemblyScript)
+
+**TS CLI Reference:** `/packages/cli/src/codegen/schema.ts`
+
+#### 2. ABI Bindings (`<Contract>.ts`)
+
+Generated from contract ABI. Includes:
+
+- Event classes with typed parameters
+- Function call result classes
+- Contract class with typed call methods
+- Proper Ethereum type mappings
+
+**Tuple/Struct Handling:**
+When an event or function has tuple parameters with named components (e.g., a struct), gnd generates proper struct classes with named getters:
+
+```typescript
+class AssetTransfer__ParamsAssetStruct extends ethereum.Tuple {
+  get addr(): Address {
+    return this[0].toAddress();
+  }
+  get amount(): BigInt {
+    return this[1].toBigInt();
+  }
+  get active(): boolean {
+    return this[2].toBoolean();
+  }
+}
+```
+
+gnd parses the raw ABI JSON to extract component names, which ethabi loses during parsing.
+
+**TS CLI Reference:** `/packages/cli/src/protocols/ethereum/codegen/abi.ts`
+
+#### 3. Template Bindings
+
+Generated for template datasources with the same structure as ABI bindings.
+
+**TS CLI Reference:** `/packages/cli/src/codegen/template.ts`
+
+#### 4. Subgraph Data Source Bindings (`subgraph-<DataSourceName>.ts`)
+
+Generated for `kind: subgraph` data sources. When a manifest contains a subgraph data source:
+
+```yaml
+dataSources:
+  - kind: subgraph
+    name: SourceSubgraph
+    source:
+      address: "QmRWTEejPDDwALaquFGm6X2GBbbh5osYDXwCRRkoZ6KQhb"
+```
+
+gnd will:
+
+1. Validate that all subgraph data source names are unique (error if duplicates found)
+2. Fetch the referenced subgraph's manifest from IPFS
+3. Extract and fetch the schema from the manifest
+4. Generate entity types (without store methods) to `generated/subgraph-{DataSourceName}.ts`
+
+**Note:** gnd uses the data source name (e.g., `SourceSubgraph`) for the generated filename rather than the IPFS hash. This produces stable import paths like `import { Entity } from '../generated/subgraph-SourceSubgraph'` that don't break when the source subgraph is redeployed with a new hash. This differs from graph-cli which uses the IPFS hash.
+
+The generated types include entity classes with getters for all fields, but no `save()`, `load()`, or `loadInBlock()` methods since these are read-only types from the source subgraph.
+
+**TS CLI Reference:** `/packages/cli/src/type-generator.ts` lines 72-136
+
+### Type Mappings
+
+#### GraphQL → AssemblyScript
+
+| GraphQL          | AssemblyScript |
+| ---------------- | -------------- |
+| `ID`             | `string`       |
+| `String`         | `string`       |
+| `Int`            | `i32`          |
+| `BigInt`         | `BigInt`       |
+| `BigDecimal`     | `BigDecimal`   |
+| `Bytes`          | `Bytes`        |
+| `Boolean`        | `boolean`      |
+| `[T]`            | `Array<T>`     |
+| Entity reference | `string` (ID)  |
+
+**TS CLI Reference:** `/packages/cli/src/codegen/schema.ts` (look for type mapping functions)
+
+#### Ethereum ABI → AssemblyScript
+
+| Solidity  | AssemblyScript  |
+| --------- | --------------- |
+| `address` | `Address`       |
+| `bool`    | `boolean`       |
+| `bytes`   | `Bytes`         |
+| `bytesN`  | `Bytes`         |
+| `intN`    | `BigInt`        |
+| `uintN`   | `BigInt`        |
+| `string`  | `string`        |
+| `T[]`     | `Array<T>`      |
+| tuple     | Generated class |
+
+**TS CLI Reference:** `/packages/cli/src/protocols/ethereum/codegen/abi.ts`
+
+### API Version Handling
+
+Different `apiVersion` values in the manifest affect code generation. gnd must support all versions that the TS CLI supports.
+
+**TS CLI Reference:** `/packages/cli/src/codegen/` (version-specific logic throughout)
+
+### Formatting
+
+All generated code must be formatted with prettier before writing:
+
+- Shell out to `prettier` with same configuration as TS CLI
+- Parser: `typescript`
+
+## Migrations
+
+Migrations update older manifest formats to newer versions. gnd must implement all migrations that TS CLI supports.
+
+**Migration Chain:**
+
+```
+0.0.1 → 0.0.2 → 0.0.3 → 0.0.4 → 0.0.5 → ... → current
+```
+
+**TS CLI Reference:** `/packages/cli/src/migrations/`
+
+Each migration is a transformation function that:
+
+1. Checks manifest version
+2. Applies necessary changes
+3. Updates version number
+
+## External Dependencies
+
+### Runtime Dependencies (shell out)
+
+| Tool         | Purpose                 | Required      |
+| ------------ | ----------------------- | ------------- |
+| `asc`        | AssemblyScript compiler | For `build`   |
+| `prettier`   | Code formatting         | For `codegen` |
+| `matchstick` | Test runner             | For `test`    |
+
+### Network APIs
+
+| API                              | Purpose                                 |
+| -------------------------------- | --------------------------------------- |
+| Etherscan                        | Fetch verified contract ABIs            |
+| Sourcify                         | Fetch verified contract ABIs (fallback) |
+| `@pinax/graph-networks-registry` | Network configuration (chain IDs, etc.) |
+
+The network registry should be fetched at runtime to get current network configurations.
+
+### graph-node Reuse
+
+| Component           | graph-node Location                   | Purpose                     |
+| ------------------- | ------------------------------------- | --------------------------- |
+| Manifest parsing    | `graph/src/data/subgraph/`            | Load subgraph.yaml          |
+| Manifest validation | `graph/src/data/subgraph/`            | Validate manifest structure |
+| GraphQL schema      | `graph/src/schema/input/`             | Parse schema.graphql        |
+| IPFS client         | `graph/src/ipfs/`                     | Upload to IPFS              |
+| Link resolver       | `graph/src/components/link_resolver/` | Resolve file references     |
+| File watcher        | `gnd/src/watcher.rs`                  | Watch mode                  |
+
+Refactor graph-node components as needed to make them reusable.
+
+## Module Structure
+
+```
+gnd/src/
+├── main.rs                    # Entry point, clap setup
+├── lib.rs
+├── formatter.rs               # Prettier integration for code formatting
+├── prompt.rs                  # Interactive prompts (network selection, etc.)
+├── watcher.rs                 # File watcher for --watch modes
+├── commands/
+│   ├── mod.rs
+│   ├── add.rs
+│   ├── auth.rs
+│   ├── build.rs
+│   ├── clean.rs
+│   ├── codegen.rs
+│   ├── create.rs
+│   ├── deploy.rs
+│   ├── dev.rs                 # Existing gnd functionality
+│   ├── init.rs
+│   ├── publish.rs
+│   ├── remove.rs
+│   └── test.rs
+├── codegen/
+│   ├── mod.rs
+│   ├── abi.rs                 # ABI binding generation
+│   ├── schema.rs              # Entity class generation
+│   ├── template.rs            # Template binding generation
+│   ├── types.rs               # Type conversion utilities
+│   └── typescript.rs          # AST builders for TypeScript/AssemblyScript
+├── scaffold/
+│   ├── mod.rs
+│   ├── manifest.rs            # Generate subgraph.yaml
+│   ├── mapping.rs             # Generate mapping.ts
+│   └── schema.rs              # Generate schema.graphql
+├── migrations/
+│   ├── mod.rs
+│   ├── api_version.rs         # API version migrations
+│   ├── spec_version.rs        # Spec version migrations
+│   └── versions.rs            # Version definitions
+├── compiler/
+│   ├── mod.rs
+│   └── asc.rs                 # Shell out to asc
+├── services/
+│   ├── mod.rs
+│   ├── contract.rs            # ABI fetching (Etherscan, Blockscout, Sourcify, registry)
+│   ├── graph_node.rs          # Graph Node JSON-RPC client
+│   └── ipfs.rs                # IPFS client for uploads
+├── config/
+│   ├── mod.rs
+│   └── networks.rs            # networks.json handling
+└── output/
+    ├── mod.rs
+    └── spinner.rs             # Progress/spinner output
+```
+
+## Testing
+
+### Current Status
+
+- **166 unit tests** passing (`cargo test -p gnd --lib`)
+- **12 codegen verification tests** passing (`cargo test -p gnd --test codegen_verification`)
+- **7 CLI command tests** passing (`cargo test -p gnd --test cli_commands`)
+- Test fixtures from graph-cli validation tests in `gnd/tests/fixtures/codegen_verification/`
+
+### Test Strategy
+
+1. **Unit tests**: Test individual functions (type mappings, migrations, etc.)
+2. **Snapshot tests**: Compare generated output against TS CLI output
+3. **Integration tests**: End-to-end command execution
+
+### Test Corpus
+
+Use the same test corpus as graph-cli. Tests must cover at least everything the TS CLI tests cover.
+
+**TS CLI Test Location:** `/packages/cli/tests/`
+
+### Codegen Verification Tests
+
+Located in `gnd/tests/codegen_verification.rs`, these tests verify compatibility with graph-cli:
+
+1. Copy fixture to temp directory (excluding `generated/`)
+2. Run `gnd codegen` on the fixture
+3. Compare output against expected `generated/` directory
+4. Allow known differences (Int8 import, trailing commas, 2D array fix)
+
+Fixtures can be regenerated with `./tests/fixtures/regenerate.sh`.
+
+### Edge Cases
+
+When edge case bugs are discovered in the TS CLI, gnd should fix them rather than replicate them. Document any behavioral differences that result from bug fixes.
+
+### CLI Integration Tests
+
+Located in `tests/tests/gnd_cli_tests.rs`, these tests verify gnd works as a drop-in replacement for graph-cli by running the integration test suite with `GRAPH_CLI` environment variable pointing to the gnd binary.
+
+**How it works:**
+
+- The integration test infrastructure uses `CONFIG.graph_cli` for deployment commands
+- Setting `GRAPH_CLI=../target/debug/gnd` makes tests use gnd instead of graph-cli
+- `Subgraph::deploy()` calls `gnd codegen`, `gnd create`, `gnd deploy`
+
+**Commands tested:**
+
+- `gnd codegen` - Generate AssemblyScript types
+- `gnd create` - Register subgraph name with Graph Node
+- `gnd deploy` - Deploy subgraph to Graph Node
+
+**Running:**
+
+```bash
+just test-gnd-cli
+```
+
+### Standalone Command Tests
+
+Located in `gnd/tests/cli_commands.rs`, these tests verify commands that don't require a running Graph Node:
+
+**Commands tested:**
+
+- `gnd init` - Scaffold generation (--from-example, --from-contract, --from-subgraph)
+- `gnd add` - Add datasource to existing subgraph
+- `gnd build` - WASM compilation
+
+**Running:**
+
+```bash
+just test-gnd-commands
+```
+
+## Dependencies to Add
+
+### Cargo.toml additions
+
+```toml
+[dependencies]
+# CLI framework (already present)
+clap = { version = "...", features = ["derive"] }
+
+# Interactive prompts (for init)
+inquire = "..."
+
+# HTTP client (for Etherscan, Sourcify, registry)
+reqwest = { version = "...", features = ["json"] }
+
+# Progress/spinner output
+indicatif = "..."
+
+# Template rendering (for scaffold)
+minijinja = "..."
+
+# JSON handling
+serde_json = "..."
+```
+
+## Open Questions
+
+None at this time. All major decisions have been made.
+
+## References
+
+- TS CLI repository: https://github.com/graphprotocol/graph-tooling
+- TS CLI source: `/packages/cli/src/`
+- Local checkout: `/home/lutter/code/subgraphs/graph-cli`
+- Original gnd expansion plan: `/LOCAL/plans/gnd-cli-expansion.md`
diff --git a/docs/specs/runner-refactor.md b/docs/specs/runner-refactor.md
new file mode 100644
index 00000000000..ee36ebe3342
--- /dev/null
+++ b/docs/specs/runner-refactor.md
@@ -0,0 +1,380 @@
+# Subgraph Runner Simplification Spec
+
+## Problem Statement
+
+`core/src/subgraph/runner.rs` is complex and hard to modify. Key issues:
+
+1. **Duplicated trigger processing** (lines 616-656 vs 754-790): Nearly identical loops
+2. **Control flow confusion**: Nested loops in `run_inner` with 6 exit paths
+3. **State management**: Mixed patterns (mutable fields, `std::mem::take`, drains)
+4. **`process_block` monolith**: ~260 lines handling triggers, dynamic DS, offchain, persistence
+
+## Design Decisions
+
+| Aspect | Decision |
+|--------|----------|
+| Control flow | Enum-based FSM for full runner lifecycle |
+| Trigger processing | New `TriggerRunner` component |
+| Block processing | Pipeline with explicitly defined stages |
+| State management | Mutable accumulator with checkpoints |
+| Breaking changes | Moderate (internal APIs can change) |
+
+## Target Architecture
+
+### 1. Runner State Machine
+
+Replace nested loops in `run_inner` with an explicit enum FSM covering the full lifecycle:
+
+```rust
+enum RunnerState {
+    /// Initial state, ready to start block stream
+    Initializing,
+
+    /// Block stream active, waiting for next event
+    AwaitingBlock {
+        block_stream: Cancelable<Box<dyn BlockStream<C>>>,
+    },
+
+    /// Processing a block through the pipeline
+    ProcessingBlock {
+        block: BlockWithTriggers<C>,
+        cursor: FirehoseCursor,
+    },
+
+    /// Handling a revert event
+    Reverting {
+        to_ptr: BlockPtr,
+        cursor: FirehoseCursor,
+    },
+
+    /// Restarting block stream (new filters, store restart, etc.)
+    Restarting {
+        reason: RestartReason,
+    },
+
+    /// Terminal state
+    Stopped {
+        reason: StopReason,
+    },
+}
+
+enum RestartReason {
+    DynamicDataSourceCreated,
+    DataSourceExpired,
+    StoreError,
+    PossibleReorg,
+}
+
+enum StopReason {
+    MaxEndBlockReached,
+    Canceled,
+    Unassigned,
+}
+```
+
+The main loop becomes:
+
+```rust
+async fn run(mut self) -> Result<(), SubgraphRunnerError> {
+    loop {
+        self.state = match self.state {
+            RunnerState::Initializing => self.initialize().await?,
+            RunnerState::AwaitingBlock { stream } => self.await_block(stream).await?,
+            RunnerState::ProcessingBlock { block, cursor } => {
+                self.process_block(block, cursor).await?
+            }
+            RunnerState::Reverting { to_ptr, cursor } => {
+                self.handle_revert(to_ptr, cursor).await?
+            }
+            RunnerState::Restarting { reason } => self.restart(reason).await?,
+            RunnerState::Stopped { reason } => return self.finalize(reason).await,
+        };
+    }
+}
+```
+
+### 2. Block Processing Pipeline
+
+Replace the `process_block` monolith with explicit stages:
+
+```rust
+/// Pipeline stages for block processing
+mod pipeline {
+    pub struct TriggerMatchStage;
+    pub struct TriggerExecuteStage;
+    pub struct DynamicDataSourceStage;
+    pub struct OffchainTriggerStage;
+    pub struct PersistStage;
+}
+
+/// Result of block processing pipeline
+pub struct BlockProcessingResult {
+    pub action: Action,
+    pub block_state: BlockState,
+}
+
+impl SubgraphRunner {
+    async fn process_block(
+        &mut self,
+        block: BlockWithTriggers<C>,
+        cursor: FirehoseCursor,
+    ) -> Result<RunnerState, ProcessingError> {
+        let block = Arc::new(block.block);
+        let triggers = block.trigger_data;
+
+        // Stage 1: Match triggers to hosts and decode
+        let runnables = self.match_triggers(&block, triggers).await?;
+
+        // Stage 2: Execute triggers (unified for initial + dynamic DS)
+        let mut block_state = self.execute_triggers(&block, runnables).await?;
+
+        // Checkpoint before dynamic DS processing
+        let checkpoint = block_state.checkpoint();
+
+        // Stage 3: Process dynamic data sources (loop until none created)
+        block_state = self.process_dynamic_data_sources(&block, &cursor, block_state).await?;
+
+        // Stage 4: Handle offchain triggers
+        let offchain_result = self.process_offchain_triggers(&block, &mut block_state).await?;
+
+        // Stage 5: Persist to store
+        self.persist_block_state(block_state, offchain_result).await?;
+
+        // Determine next state
+        Ok(self.determine_next_state())
+    }
+}
+```
+
+### 3. Error Handling Strategy
+
+Consolidate scattered error handling into explicit classification:
+
+```rust
+/// Unified error classification for trigger processing
+pub enum ProcessingErrorKind {
+    /// Stop processing, persist PoI only
+    Deterministic(anyhow::Error),
+    /// Retry with backoff, attempt to unfail
+    NonDeterministic(anyhow::Error),
+    /// Restart block stream cleanly (don't persist)
+    PossibleReorg(anyhow::Error),
+}
+
+impl ProcessingError {
+    /// Classify error once, use classification throughout
+    pub fn kind(&self) -> ProcessingErrorKind { ... }
+
+    /// Whether this error should stop processing the current block
+    pub fn should_stop_processing(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::Deterministic(_))
+    }
+
+    /// Whether this error requires a clean restart
+    pub fn should_restart(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::PossibleReorg(_))
+    }
+
+    /// Whether this error is retryable with backoff
+    pub fn is_retryable(&self) -> bool {
+        matches!(self.kind(), ProcessingErrorKind::NonDeterministic(_))
+    }
+}
+```
+
+**Key Invariant (must be preserved):**
+```
+Deterministic    → Stop processing block, persist PoI only
+NonDeterministic → Retry with backoff
+PossibleReorg    → Restart cleanly (don't persist)
+```
+
+Currently this logic is scattered across:
+- `process_block` early return for PossibleReorg (line 664-677)
+- Dynamic data sources error mapping (line 792-802)
+- `transact_block_state` (line 405-430)
+- `handle_offchain_triggers` (line 1180-1190)
+
+Consolidating into helper methods eliminates these scattered special cases.
+
+### 4. TriggerRunner Component
+
+Extract trigger execution into a dedicated component:
+
+```rust
+/// Handles matching, decoding, and executing triggers
+pub struct TriggerRunner<'a, C: Blockchain, T: RuntimeHostBuilder<C>> {
+    decoder: &'a Decoder<C, T>,
+    processor: &'a dyn TriggerProcessor<C, T>,
+    logger: &'a Logger,
+    metrics: &'a SubgraphMetrics,
+    debug_fork: &'a Option<Arc<dyn SubgraphFork>>,
+    instrument: bool,
+}
+
+impl<'a, C, T> TriggerRunner<'a, C, T>
+where
+    C: Blockchain,
+    T: RuntimeHostBuilder<C>,
+{
+    /// Execute triggers against hosts, accumulating state
+    pub async fn execute(
+        &self,
+        block: &Arc<C::Block>,
+        runnables: Vec<RunnableTriggers<'a, C>>,
+        mut block_state: BlockState,
+        proof_of_indexing: &SharedProofOfIndexing,
+        causality_region: &PoICausalityRegion,
+    ) -> Result<BlockState, MappingError> {
+        for runnable in runnables {
+            block_state = self.processor
+                .process_trigger(
+                    self.logger,
+                    runnable.hosted_triggers,
+                    block,
+                    block_state,
+                    proof_of_indexing,
+                    causality_region,
+                    self.debug_fork,
+                    self.metrics,
+                    self.instrument,
+                )
+                .await
+                .map_err(|e| e.add_trigger_context(&runnable.trigger))?;
+        }
+        Ok(block_state)
+    }
+}
+```
+
+This eliminates the duplicated loops (lines 616-656 and 754-790).
+
+### 5. State Management with Checkpoints
+
+**Explicit Input/Output Types for Pipeline Stages:**
+
+```rust
+/// Input to trigger processing - makes dependencies explicit
+struct TriggerProcessingContext<'a> {
+    block: &'a Arc<C::Block>,
+    proof_of_indexing: &'a SharedProofOfIndexing,
+    causality_region: &'a PoICausalityRegion,
+}
+
+/// Output from trigger processing - makes results explicit
+struct TriggerProcessingResult {
+    block_state: BlockState,
+    restart_needed: bool,
+}
+```
+
+**Add checkpoint capability to `BlockState` for rollback scenarios:**
+
+```rust
+impl BlockState {
+    /// Create a lightweight checkpoint for rollback
+    pub fn checkpoint(&self) -> BlockStateCheckpoint {
+        BlockStateCheckpoint {
+            created_data_sources_count: self.created_data_sources.len(),
+            persisted_data_sources_count: self.persisted_data_sources.len(),
+            // Note: entity_cache changes cannot be easily checkpointed
+            // Rollback clears the cache (acceptable per current behavior)
+        }
+    }
+
+    /// Restore state to checkpoint (partial rollback)
+    pub fn restore(&mut self, checkpoint: BlockStateCheckpoint) {
+        self.created_data_sources.truncate(checkpoint.created_data_sources_count);
+        self.persisted_data_sources.truncate(checkpoint.persisted_data_sources_count);
+        // Entity cache is cleared on rollback (matches current behavior)
+    }
+}
+```
+
+### 6. File Structure
+
+```
+core/src/subgraph/
+├── runner.rs              # Main SubgraphRunner with FSM
+├── runner/
+│   ├── mod.rs
+│   ├── state.rs           # RunnerState enum and transitions
+│   ├── pipeline.rs        # Pipeline stage definitions
+│   └── trigger_runner.rs  # TriggerRunner component
+├── context.rs             # IndexingContext (unchanged)
+├── inputs.rs              # IndexingInputs (unchanged)
+└── state.rs               # IndexingState (unchanged)
+```
+
+## Deferred Concerns
+
+### Fishy Block Refetch (Preserve Behavior)
+
+The TODO at lines 721-729 notes unclear behavior around block refetching in the dynamic DS loop. The restructure preserves this behavior without attempting to fix it. Investigate separately.
+
+## Key Interfaces
+
+### RunnerState Transitions
+
+```
+Initializing ──────────────────────────────────┐
+     │                                          │
+     v                                          │
+AwaitingBlock ◄─────────────────────────────────┤
+     │                                          │
+     ├── ProcessBlock event ──► ProcessingBlock │
+     │                              │           │
+     │                              ├── success ┼──► AwaitingBlock
+     │                              │           │
+     │                              └── restart ┼──► Restarting
+     │                                          │
+     ├── Revert event ──────────► Reverting ────┤
+     │                                          │
+     ├── Error ─────────────────► Restarting ───┤
+     │                                          │
+     └── Cancel/MaxBlock ───────► Stopped       │
+                                                │
+Restarting ─────────────────────────────────────┘
+```
+
+### Pipeline Data Flow
+
+```
+BlockWithTriggers
+       │
+       v
+┌──────────────────┐
+│ TriggerMatchStage│ ─► Vec<RunnableTriggers>
+└──────────────────┘
+       │
+       v
+┌────────────────────┐
+│ TriggerExecuteStage│ ─► BlockState (mutated)
+└────────────────────┘
+       │
+       v (loop while has_created_data_sources)
+┌─────────────────────────┐
+│ DynamicDataSourceStage  │ ─► BlockState (mutated), new hosts added
+└─────────────────────────┘
+       │
+       v
+┌─────────────────────┐
+│ OffchainTriggerStage│ ─► offchain_mods, processed_ds
+└─────────────────────┘
+       │
+       v
+┌─────────────┐
+│ PersistStage│ ─► Store transaction
+└─────────────┘
+```
+
+## Verification
+
+After implementation, verify:
+
+1. **Unit tests pass**: `just test-unit`
+2. **Runner tests pass**: `just test-runner`
+3. **Lint clean**: `just lint` (zero warnings)
+4. **Build succeeds**: `just check --release`
+
+For behavioral verification, the existing runner tests should catch regressions. No new integration tests required for a refactor that preserves behavior.
diff --git a/flake.lock b/flake.lock
index d8c4d140a34..7d69cf5ac8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,16 +60,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1756199436,
-        "narHash": "sha256-tkLoAk2BkFIwxp9YrtcUeWugGQjiubbiZx/YGGnVrz4=",
+        "lastModified": 1760001025,
+        "narHash": "sha256-j/jPNlW2W4zwV2rSqgw5ts1VoTXVe5n3CNXFvtQhK3Q=",
         "owner": "shazow",
         "repo": "foundry.nix",
-        "rev": "2d28ea426c27166c8169e114eff4a5adcc00548d",
+        "rev": "b7adb89167832516589c899addcd25ca2a78dcfe",
         "type": "github"
       },
       "original": {
         "owner": "shazow",
         "repo": "foundry.nix",
+        "rev": "b7adb89167832516589c899addcd25ca2a78dcfe",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index e0e7e6aeef9..933a35ef04c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    foundry.url = "github:shazow/foundry.nix";
+    foundry.url = "github:shazow/foundry.nix/b7adb89167832516589c899addcd25ca2a78dcfe";
     fenix = {
       url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -90,6 +90,7 @@
             inherit port dataDir;
             initialScript = {
               before = ''
+                CREATE ROLE postgres WITH LOGIN;
                 CREATE USER \"${user}\" WITH PASSWORD '${password}' SUPERUSER;
               '';
             };
@@ -140,6 +141,11 @@
               database = "graph-test";
             };
 
+            # Set PGUSER so psql connects as the OS user (matching initdb's superuser)
+            settings.processes."postgres-unit-init".environment = {
+              PGUSER = builtins.getEnv "USER";
+            };
+
             services.ipfs."ipfs-unit" = {
               enable = true;
               dataDir = "./.data/unit/ipfs";
@@ -172,6 +178,11 @@
               database = "graph-node";
             };
 
+            # Set PGUSER so psql connects as the OS user (matching initdb's superuser)
+            settings.processes."postgres-integration-init".environment = {
+              PGUSER = builtins.getEnv "USER";
+            };
+
             services.ipfs."ipfs-integration" = {
               enable = true;
               dataDir = "./.data/integration/ipfs";
@@ -186,7 +197,10 @@
               timestamp = 1743944919;
               gasLimit = 100000000000;
               baseFee = 1;
-              blockTime = 2;
+              blockTime = null;
+              state = "./.data/integration/anvil/state.json";
+              stateInterval = 30;
+              preserveHistoricalStates = true;
             };
           };
         };
diff --git a/gnd/Cargo.toml b/gnd/Cargo.toml
index f8748246d64..754949a4722 100644
--- a/gnd/Cargo.toml
+++ b/gnd/Cargo.toml
@@ -7,25 +7,86 @@ edition.workspace = true
 name = "gnd"
 path = "src/main.rs"
 
+[[test]]
+name = "cli_commands"
+path = "tests/cli_commands.rs"
+
+[[test]]
+name = "codegen_verification"
+path = "tests/codegen_verification.rs"
+
+[[test]]
+name = "gnd_test"
+path = "tests/gnd_test.rs"
+
 [dependencies]
 # Core graph dependencies
 graph = { path = "../graph" }
+graph-chain-ethereum = { path = "../chain/ethereum" }
 graph-core = { path = "../core" }
 graph-node = { path = "../node" }
+graph-graphql = { path = "../graphql" }
+graph-store-postgres = { path = "../store/postgres" }
+
+# Test command dependencies
+hex = "0.4"
+async-trait = { workspace = true }
+tower = { workspace = true }
 
 # Direct dependencies from current dev.rs
 anyhow = { workspace = true }
 clap = { workspace = true }
-env_logger = "0.11.8"
-git-testament = "0.2"
-lazy_static = "1.5.0"
+clap_complete = { workspace = true }
+env_logger = { workspace = true }
+git-testament = { workspace = true }
+lazy_static = { workspace = true }
+serde = { workspace = true }
 tokio = { workspace = true }
-tokio-util.workspace = true
+tokio-util = { workspace = true }
 
 # File watching
 notify = "8.2.0"
 globset = "0.4.18"
+
+# Config and auth
+url = { workspace = true }
+serde_json = { workspace = true }
 pq-sys = { version = "0.7.5", features = ["bundled"] }
 
+# HTTP client for Graph Node API
+reqwest = { workspace = true }
+thiserror = { workspace = true }
+
+# Console output
+similar = "3"
+indicatif = { workspace = true }
+console = { workspace = true }
+
+# Code generation
+graphql-tools = { workspace = true }
+regex = { workspace = true }
+serde_yaml = { workspace = true }
+Inflector = { workspace = true }
+
+# Migrations
+semver = { workspace = true }
+
+# Build command
+sha1 = "0.11"
+wasmparser = { workspace = true }
+
+# Interactive prompts
+inquire = "0.9"
+
+# Temp directories for init
+tempfile = "3"
+
+# Browser opening for publish command
+open = "5"
+
 [target.'cfg(unix)'.dependencies]
 pgtemp = { git = "https://github.com/graphprotocol/pgtemp", branch = "initdb-args" }
+
+[dev-dependencies]
+tempfile = "3"
+walkdir = "2"
diff --git a/gnd/README.md b/gnd/README.md
new file mode 100644
index 00000000000..375e1ef0e01
--- /dev/null
+++ b/gnd/README.md
@@ -0,0 +1,524 @@
+# gnd - Graph Node Dev CLI
+
+A drop-in replacement for `graph-cli` written in Rust. `gnd` provides all the subgraph development commands with identical output, flags, and behavior.
+
+## Installation
+
+Build from source:
+
+```bash
+cargo build -p gnd --release
+```
+
+The binary will be at `target/release/gnd`.
+
+## Quick Start
+
+```bash
+# Create a new subgraph from a contract
+gnd init --from-contract 0x1234... --network mainnet my-subgraph
+
+# Generate AssemblyScript types
+gnd codegen
+
+# Build the subgraph
+gnd build
+
+# Deploy to a local Graph Node
+gnd create --node http://localhost:8020 my-name/my-subgraph
+gnd deploy --node http://localhost:8020 --ipfs http://localhost:5001 -l v0.0.1 my-name/my-subgraph
+
+# Or deploy to Subgraph Studio
+gnd auth YOUR_DEPLOY_KEY
+gnd deploy -l v0.0.1 my-name/my-subgraph
+```
+
+## Commands
+
+### `gnd init`
+
+Create a new subgraph with basic scaffolding.
+
+```bash
+gnd init [SUBGRAPH_NAME] [DIRECTORY]
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--protocol` | | Protocol: `ethereum`, `near`, `cosmos`, `arweave`, `substreams` |
+| `--from-contract` | | Create from an existing contract address |
+| `--from-example` | | Create from an example subgraph template |
+| `--from-subgraph` | | Create from an existing deployed subgraph |
+| `--contract-name` | | Name for the contract (with `--from-contract`) |
+| `--index-events` | | Index all contract events as entities |
+| `--network` | | Network the contract is deployed to |
+| `--start-block` | | Block number to start indexing from |
+| `--abi` | | Path to the contract ABI file |
+| `--node` | `-g` | Graph Node URL |
+| `--ipfs` | `-i` | IPFS node URL |
+| `--skip-install` | | Skip installing npm dependencies |
+| `--skip-git` | | Skip initializing a Git repository |
+
+**Examples:**
+
+```bash
+# Interactive mode (prompts for all options)
+gnd init
+
+# From contract with ABI fetched from Etherscan
+gnd init --from-contract 0x1234... --network mainnet my-subgraph
+
+# From contract with local ABI
+gnd init --from-contract 0x1234... --abi ./MyContract.json my-subgraph
+
+# From an existing deployed subgraph
+gnd init --from-subgraph QmHash... my-subgraph
+```
+
+### `gnd codegen`
+
+Generate AssemblyScript types from the subgraph manifest.
+
+```bash
+gnd codegen [MANIFEST]
+```
+
+**Arguments:**
+- `MANIFEST`: Path to subgraph manifest (default: `subgraph.yaml`)
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--output-dir` | `-o` | Output directory (default: `generated/`) |
+| `--skip-migrations` | | Skip manifest migrations |
+| `--watch` | `-w` | Regenerate on file changes |
+| `--ipfs` | `-i` | IPFS node URL |
+
+**Examples:**
+
+```bash
+# Generate types
+gnd codegen
+
+# Generate to custom directory
+gnd codegen -o src/generated/
+
+# Watch mode
+gnd codegen --watch
+```
+
+### `gnd build`
+
+Compile the subgraph to WASM.
+
+```bash
+gnd build [MANIFEST]
+```
+
+**Arguments:**
+- `MANIFEST`: Path to subgraph manifest (default: `subgraph.yaml`)
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--output-dir` | `-o` | Output directory (default: `build/`) |
+| `--output-format` | `-t` | Output format: `wasm` or `wast` (default: `wasm`) |
+| `--skip-migrations` | | Skip manifest migrations |
+| `--watch` | `-w` | Rebuild on file changes |
+| `--ipfs` | `-i` | IPFS node URL (uploads if provided) |
+| `--network` | | Network from networks.json |
+| `--network-file` | | Path to networks config (default: `networks.json`) |
+
+**Examples:**
+
+```bash
+# Build subgraph
+gnd build
+
+# Build and upload to IPFS
+gnd build --ipfs http://localhost:5001
+
+# Build for specific network
+gnd build --network mainnet
+```
+
+### `gnd deploy`
+
+Deploy a subgraph to a Graph Node.
+
+```bash
+gnd deploy <SUBGRAPH_NAME> [MANIFEST]
+```
+
+**Arguments:**
+- `SUBGRAPH_NAME`: Name to deploy as (e.g., `user/subgraph`)
+- `MANIFEST`: Path to subgraph manifest (default: `subgraph.yaml`)
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--node` | `-g` | Graph Node URL (defaults to Subgraph Studio) |
+| `--ipfs` | `-i` | IPFS node URL |
+| `--deploy-key` | | Deploy key for authentication |
+| `--version-label` | `-l` | Version label for the deployment (required in non-interactive mode) |
+| `--ipfs-hash` | | IPFS hash of already-uploaded manifest |
+| `--output-dir` | `-o` | Build output directory (default: `build/`) |
+| `--skip-migrations` | | Skip manifest migrations |
+| `--network` | | Network from networks.json |
+| `--network-file` | | Path to networks config |
+| `--debug-fork` | | Fork subgraph ID for debugging |
+
+If `--version-label` is omitted in an interactive terminal, `gnd deploy` prompts for it.
+In non-interactive environments (CI/scripts), you must pass `--version-label`.
+
+**Examples:**
+
+```bash
+# Deploy to Subgraph Studio (uses saved auth key)
+gnd deploy -l v1.0.0 my-name/my-subgraph
+
+# Deploy to local Graph Node
+gnd deploy --node http://localhost:8020 --ipfs http://localhost:5001 -l v1.0.0 my-name/my-subgraph
+
+# Deploy without --version-label in an interactive terminal (prompts)
+gnd deploy my-name/my-subgraph
+```
+
+### `gnd publish`
+
+Publish a subgraph to The Graph's decentralized network.
+
+```bash
+gnd publish [MANIFEST]
+```
+
+**Arguments:**
+- `MANIFEST`: Path to subgraph manifest (default: `subgraph.yaml`)
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--ipfs` | `-i` | IPFS node URL |
+| `--ipfs-hash` | | Skip build, use existing IPFS hash |
+| `--subgraph-id` | | Subgraph ID for updating existing subgraphs |
+| `--protocol-network` | | Network: `arbitrum-one` or `arbitrum-sepolia` |
+| `--api-key` | | API key (required when updating existing) |
+| `--output-dir` | `-o` | Build output directory |
+| `--skip-migrations` | | Skip manifest migrations |
+| `--network` | | Network from networks.json |
+| `--network-file` | | Path to networks config |
+
+**Examples:**
+
+```bash
+# Publish new subgraph
+gnd publish
+
+# Update existing subgraph
+gnd publish --subgraph-id Qm... --api-key YOUR_KEY
+```
+
+### `gnd add`
+
+Add a new data source to an existing subgraph.
+
+```bash
+gnd add <ADDRESS> [MANIFEST]
+```
+
+**Arguments:**
+- `ADDRESS`: Contract address to add
+- `MANIFEST`: Path to subgraph manifest (default: `subgraph.yaml`)
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--abi` | | Path to the contract ABI |
+| `--contract-name` | | Name for the new data source |
+| `--merge-entities` | | Merge with existing entities of same name |
+| `--network` | | Network the contract is deployed to |
+| `--start-block` | | Block number to start indexing from |
+
+**Examples:**
+
+```bash
+# Add contract with ABI from Etherscan
+gnd add 0x1234... --network mainnet
+
+# Add contract with local ABI
+gnd add 0x1234... --abi ./NewContract.json --contract-name MyContract
+```
+
+### `gnd create`
+
+Register a subgraph name with a Graph Node.
+
+```bash
+gnd create <SUBGRAPH_NAME> --node <URL>
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--node` | `-g` | Graph Node URL (required) |
+| `--access-token` | | Access token for authentication |
+
+### `gnd remove`
+
+Unregister a subgraph name from a Graph Node.
+
+```bash
+gnd remove <SUBGRAPH_NAME> --node <URL>
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--node` | `-g` | Graph Node URL (required) |
+| `--access-token` | | Access token for authentication |
+
+### `gnd auth`
+
+Store a deploy key for authentication.
+
+```bash
+gnd auth <DEPLOY_KEY>
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--node` | `-g` | Graph Node URL (default: Subgraph Studio) |
+
+Keys are stored in `~/.graph-cli.json`.
+
+### `gnd test`
+
+Run subgraph tests.
+
+```bash
+gnd test [TEST_FILES...]
+```
+
+**Arguments:**
+- `PATHS`: Test JSON files or directories to scan. Defaults to `tests/` when nothing is specified.
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--manifest` | `-m` | Path to subgraph manifest (default: `subgraph.yaml`) |
+| `--skip-build` | `-s` | Skip building the subgraph before testing |
+| `--postgres-url` | | PostgreSQL connection URL (env: `POSTGRES_URL`) |
+| `--matchstick` | | Use legacy Matchstick runner (**deprecated** — migrate to JSON-based tests) |
+| `--docker` | `-d` | Run Matchstick in Docker (requires `--matchstick`) |
+| `--coverage` | `-c` | Run with coverage reporting (requires `--matchstick`) |
+| `--recompile` | `-r` | Force recompilation (requires `--matchstick`) |
+| `--force` | `-f` | Force redownload of Matchstick binary (requires `--matchstick`) |
+
+**Examples:**
+
+```bash
+# Run all tests in tests/ directory (default)
+gnd test
+
+# Run specific test files
+gnd test transfer.json approval.json
+gnd test tests/transfer.json
+
+# Scan a custom directory
+gnd test my-tests/
+
+# Use a different manifest
+gnd test -m subgraph.staging.yaml tests/transfer.json
+
+# Skip automatic build
+gnd test -s
+```
+
+### `gnd clean`
+
+Remove build artifacts and generated files.
+
+```bash
+gnd clean
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--codegen-dir` | | Codegen directory (default: `generated/`) |
+| `--build-dir` | | Build directory (default: `build/`) |
+
+### `gnd dev`
+
+Run graph-node in development mode with file watching.
+
+```bash
+gnd dev [OPTIONS]
+```
+
+**Flags:**
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--watch` | | Watch build directory for changes |
+| `--manifests` | | Subgraph manifest locations |
+| `--sources` | | Source manifest locations for aliases |
+| `--database-dir` | | Database directory (default: `./build`) |
+| `--postgres-url` | | PostgreSQL connection URL |
+| `--ethereum-rpc` | | Ethereum RPC URL |
+| `--ipfs` | | IPFS node URL |
+
+### `gnd indexer`
+
+Manage indexer operations via [`indexer-cli`](https://github.com/graphprotocol/indexer/tree/main/packages/indexer-cli).
+
+Requires `graph-indexer` to be installed and on `$PATH`:
+
+```bash
+npm install -g @graphprotocol/indexer-cli
+```
+
+```bash
+gnd indexer <subcommand> [args...]
+```
+
+**Help:**
+
+There are two ways to get help:
+
+| Command | What it shows |
+|---------|---------------|
+| `gnd indexer --help` | gnd's own help for the indexer subcommand (works without `graph-indexer` installed) |
+| `gnd indexer help` | Full `graph-indexer` help with all available commands (requires `graph-indexer`) |
+
+**Examples:**
+
+```bash
+# Check indexer status
+gnd indexer status --network arbitrum-one
+
+# Manage indexing rules
+gnd indexer rules get all --network mainnet
+gnd indexer rules set <deployment> decisionBasis always --network mainnet
+
+# Manage allocations
+gnd indexer allocations get --network arbitrum-one
+
+# Manage cost models
+gnd indexer cost get
+
+# View available indexer commands
+gnd indexer help
+
+# Check graph-indexer version
+gnd indexer version
+```
+
+### `gnd completions`
+
+Generate shell completions.
+
+```bash
+gnd completions <SHELL>
+```
+
+**Arguments:**
+- `SHELL`: One of `bash`, `elvish`, `fish`, `powershell`, `zsh`
+
+**Examples:**
+
+```bash
+# Bash
+gnd completions bash > ~/.bash_completion.d/gnd
+
+# Zsh
+gnd completions zsh > ~/.zfunc/_gnd
+
+# Fish
+gnd completions fish > ~/.config/fish/completions/gnd.fish
+```
+
+## Configuration Files
+
+### `~/.graph-cli.json`
+
+Stores deploy keys for different Graph Node URLs. Created by `gnd auth`.
+
+### `networks.json`
+
+Network-specific configuration for contract addresses and start blocks:
+
+```json
+{
+  "mainnet": {
+    "MyContract": {
+      "address": "0x1234...",
+      "startBlock": 12345678
+    }
+  },
+  "sepolia": {
+    "MyContract": {
+      "address": "0x5678...",
+      "startBlock": 1000000
+    }
+  }
+}
+```
+
+Use with `--network mainnet` on build/deploy commands.
+
+## Differences from graph-cli
+
+`gnd` is designed as a drop-in replacement for `graph-cli`. Some intentional differences:
+
+### Commands Not Implemented
+
+- **`local`**: Use graph-node's integration test infrastructure instead
+- **`node`**: Use `graphman` for node management operations
+
+### Code Generation Differences
+
+These are documented and tested:
+
+1. **Int8 import**: Always imported for simplicity, even when not used
+2. **Trailing commas**: Used in multi-line constructs
+3. **2D array accessors**: Uses correct `toStringMatrix()` (fixes a bug in graph-cli)
+
+### Other Differences
+
+- **Debug logging**: Uses `RUST_LOG` environment variable instead of `DEBUG=graph-cli:*`
+- **`--uncrashable` flag**: Not implemented (Float Capital third-party feature)
+
+## Environment Variables
+
+| Variable | Description |
+|----------|-------------|
+| `RUST_LOG` | Debug logging level (e.g., `RUST_LOG=gnd=debug`) |
+| `POSTGRES_URL` | PostgreSQL URL for `gnd dev` |
+| `ETHEREUM_RPC` | Ethereum RPC URL for `gnd dev` |
+
+## Version
+
+```bash
+gnd --version
+# gnd 0.1.0 (graph-cli compatible: 0.98.1)
+```
+
+Shows both the gnd version and the graph-cli version it emulates.
+
+## License
+
+Apache-2.0 OR MIT
diff --git a/gnd/docs/gnd-test.md b/gnd/docs/gnd-test.md
new file mode 100644
index 00000000000..6fcc118fc29
--- /dev/null
+++ b/gnd/docs/gnd-test.md
@@ -0,0 +1,939 @@
+# gnd test
+
+Mock-based subgraph test runner that feeds JSON-defined blocks through real graph-node infrastructure (store, WASM runtime, trigger processing) with only the blockchain layer mocked.
+
+## Quick Start
+
+```bash
+# Run all tests in tests/ directory
+gnd test
+
+# Run a specific test file
+gnd test tests/transfer.json
+
+# Skip automatic build (if subgraph already built)
+gnd test --skip-build
+
+# Use legacy Matchstick runner
+gnd test --matchstick
+```
+
+## Test File Format
+
+Tests are JSON files that define:
+- Mock blockchain blocks with events
+- Mock Ethereum RPC responses (`eth_call`, `eth_getBalance`, `eth_getCode`)
+- GraphQL assertions to validate entity state
+
+Place test files in a `tests/` directory with `.json` or `.test.json` extension.
+
+### Basic Example
+
+```json
+{
+  "name": "Transfer creates entity",
+  "blocks": [
+    {
+      "number": 1,
+      "timestamp": 1672531200,
+      "events": [
+        {
+          "address": "0x1234...",
+          "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+          "params": {
+            "from": "0xaaaa...",
+            "to": "0xbbbb...",
+            "value": "1000"
+          }
+        }
+      ],
+      "ethCalls": [
+        {
+          "address": "0x1234...",
+          "function": "balanceOf(address)(uint256)",
+          "params": ["0xaaaa..."],
+          "returns": ["1000000000000000000"]
+        }
+      ]
+    }
+  ],
+  "assertions": [
+    {
+      "query": "{ transfer(id: \"1\") { from to value } }",
+      "expected": {
+        "transfer": {
+          "from": "0xaaaa...",
+          "to": "0xbbbb...",
+          "value": "1000"
+        }
+      }
+    }
+  ]
+}
+```
+
+## Block Fields
+
+| Field | Required | Default | Description |
+|-------|----------|---------|-------------|
+| `number` | No | Auto-increments from lowest defined `startBlock` in the manifest file, or from  `0` if no `startBlock` are defined | Block number |
+| `hash` | No | `keccak256(block_number)` | Block hash |
+| `timestamp` | No | `block_number` | Unix timestamp |
+| `baseFeePerGas` | No | None (pre-EIP-1559) | Base fee in wei |
+| `events` | No | Empty array | Log events in this block |
+| `ethCalls` | No | Empty array | Mock `eth_call` responses |
+| `getBalanceCalls` | No | Empty array | Mock `eth_getBalance` responses for `ethereum.getBalance()` |
+| `hasCodeCalls` | No | Empty array | Mock `eth_getCode` responses for `ethereum.hasCode()` |
+
+### Empty Blocks
+
+Empty blocks (no events) still trigger block handlers:
+
+```json
+{
+  "name": "Test block handlers",
+  "blocks": [
+    {
+      "number": 1,
+      "events": [...]
+    },
+    {}  // Block 2 with no events - block handlers still fire
+  ]
+}
+```
+
+## Event Fields
+
+| Field | Required | Default | Description |
+|-------|----------|---------|-------------|
+| `address` | Yes | — | Contract address (lowercase hex with 0x prefix) |
+| `event` | Yes | — | Full event signature with `indexed` keywords |
+| `params` | No | Empty object | Event parameter values |
+| `txHash` | No | `keccak256(block_number \|\| log_index)` | Transaction hash |
+
+### Event Signature Format
+
+**Important:** Include `indexed` keywords in the signature:
+
+```json
+{
+  "event": "Transfer(address indexed from, address indexed to, uint256 value)"
+}
+```
+
+Not:
+```json
+{
+  "event": "Transfer(address,address,uint256)"  // ❌ Missing indexed keywords
+}
+```
+
+### Parameter Types
+
+Event parameters are automatically ABI-encoded based on the signature. Supported formats:
+
+```json
+{
+  "params": {
+    "from": "0xaaaa...",           // address
+    "to": "0xbbbb...",              // address
+    "value": "1000",                // uint256 (string or number)
+    "amount": 1000,                 // uint256 (number)
+    "enabled": true,                // bool
+    "data": "0x1234...",           // bytes
+    "name": "Token"                 // string
+  }
+}
+```
+
+## Transaction Receipts
+
+Mock receipts are constructed for every log trigger and attached only to handlers that declare `receipt: true` in the manifest, mirroring production behaviour. Handlers without `receipt: true` receive a null receipt — the same as on a real node.
+
+**Limitation:** Only `receipt.logs` reflects your test data. All other receipt fields (`from`, `to`, `gas_used`, `status`, etc.) are hardcoded stubs and do not correspond to real transaction data. If your handler reads those fields, the values will be fixed defaults regardless of what you put in the test JSON.
+
+### How receipts are built
+
+Every event gets a mock receipt attached automatically. The key rule is **`txHash` grouping**:
+
+- Events sharing the same `txHash` share **one receipt** — `event.receipt!.logs` contains all of their logs in declaration order.
+- Events without an explicit `txHash` each get a unique auto-generated hash (`keccak256(block_number || log_index)`), so each gets its own single-log receipt.
+
+### Example: Two events sharing a receipt
+
+```json
+{
+  "events": [
+    {
+      "address": "0x1234...",
+      "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+      "params": { "from": "0xaaaa...", "to": "0xbbbb...", "value": "100" },
+      "txHash": "0xdeadbeef0000000000000000000000000000000000000000000000000000000"
+    },
+    {
+      "address": "0x1234...",
+      "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+      "params": { "from": "0xbbbb...", "to": "0xcccc...", "value": "50" },
+      "txHash": "0xdeadbeef0000000000000000000000000000000000000000000000000000000"
+    }
+  ]
+}
+```
+
+Both handlers receive a receipt where `receipt.logs` has two entries, in declaration order.
+
+### Mock receipt defaults
+
+| Field | Value |
+|-------|-------|
+| `status` | success |
+| `cumulative_gas_used` | `21000` |
+| `gas_used` | `21000` |
+| transaction type | `2` (EIP-1559) |
+| `from` | `0x000...000` |
+| `to` | `null` |
+| `effective_gas_price` | `0` |
+
+Handlers without `receipt: true` in the manifest are unaffected — they never access `event.receipt`.
+
+## Block Handlers
+
+Block handlers are **automatically triggered** for every block. You don't need to specify block triggers in the JSON.
+
+### How Block Handlers Work
+
+The test runner auto-injects both `Start` and `End` block triggers for each block, ensuring all block handler filters work correctly:
+
+- **`once` filter** → Fires once at `startBlock` (via `Start` trigger)
+- **No filter** → Fires on every block (via `End` trigger)
+- **`polling` filter** → Fires every N blocks based on formula: `(block_number - startBlock) % every == 0`
+
+### Example: Basic Block Handlers
+
+```json
+{
+  "name": "Block handlers test",
+  "blocks": [
+    {},  // Block 0 - both 'once' and regular block handlers fire
+    {}   // Block 1 - only regular block handlers fire
+  ],
+  "assertions": [
+    {
+      "query": "{ blocks { number } }",
+      "expected": {
+        "blocks": [
+          {"number": "0"},
+          {"number": "1"}
+        ]
+      }
+    },
+    {
+      "query": "{ blockOnces { msg } }",
+      "expected": {
+        "blockOnces": [
+          {"msg": "This fires only once at block 0"}
+        ]
+      }
+    }
+  ]
+}
+```
+
+### Polling Block Handlers
+
+Polling handlers fire at regular intervals specified by the `every` parameter. The handler fires when:
+
+```
+(block_number - startBlock) % every == 0
+```
+
+**Manifest example:**
+```yaml
+blockHandlers:
+  - handler: handleEveryThreeBlocks
+    filter:
+      kind: polling
+      every: 3
+```
+
+**Test example (startBlock: 0):**
+```json
+{
+  "name": "Polling handler test",
+  "blocks": [
+    {},  // Block 0 - handler fires (0 % 3 == 0)
+    {},  // Block 1 - handler doesn't fire
+    {},  // Block 2 - handler doesn't fire
+    {},  // Block 3 - handler fires (3 % 3 == 0)
+    {},  // Block 4 - handler doesn't fire
+    {},  // Block 5 - handler doesn't fire
+    {}   // Block 6 - handler fires (6 % 3 == 0)
+  ],
+  "assertions": [
+    {
+      "query": "{ pollingBlocks(orderBy: number) { number } }",
+      "expected": {
+        "pollingBlocks": [
+          {"number": "0"},
+          {"number": "3"},
+          {"number": "6"}
+        ]
+      }
+    }
+  ]
+}
+```
+
+**With non-zero startBlock:**
+
+When your data source has `startBlock > 0`, the polling interval is calculated from that starting point.
+
+**Manifest:**
+```yaml
+dataSources:
+  - name: Token
+    source:
+      startBlock: 100
+    mapping:
+      blockHandlers:
+        - handler: handlePolling
+          filter:
+            kind: polling
+            every: 5
+```
+
+**Test:**
+```json
+{
+  "name": "Polling from block 100",
+  "blocks": [
+    {"number": 100},  // Fires: (100-100) % 5 == 0
+    {"number": 101},  // Doesn't fire
+    {"number": 102},  // Doesn't fire
+    {"number": 103},  // Doesn't fire
+    {"number": 104},  // Doesn't fire
+    {"number": 105},  // Fires: (105-100) % 5 == 0
+    {"number": 106},  // Doesn't fire
+    {"number": 107},  // Doesn't fire
+    {"number": 108},  // Doesn't fire
+    {"number": 109},  // Doesn't fire
+    {"number": 110}   // Fires: (110-100) % 5 == 0
+  ],
+  "assertions": [
+    {
+      "query": "{ pollingBlocks(orderBy: number) { number } }",
+      "expected": {
+        "pollingBlocks": [
+          {"number": "100"},
+          {"number": "105"},
+          {"number": "110"}
+        ]
+      }
+    }
+  ]
+}
+```
+
+**Note:** The test runner automatically handles `startBlock > 0`, so blocks default to numbering from the manifest's `startBlock`.
+
+## eth_call Mocking
+
+Mock contract calls made from mapping handlers using `contract.call()`:
+
+```json
+{
+  "ethCalls": [
+    {
+      "address": "0x1234...",
+      "function": "balanceOf(address)(uint256)",
+      "params": ["0xaaaa..."],
+      "returns": ["1000000000000000000"]
+    }
+  ]
+}
+```
+
+### ethCall Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `address` | Yes | Contract address |
+| `function` | Yes | Full signature: `"functionName(inputTypes)(returnTypes)"` |
+| `params` | Yes | Array of input parameters (as strings) |
+| `returns` | Yes | Array of return values (as strings, ignored if `reverts: true`) |
+| `reverts` | No | Default `false`. If `true`, the mock transport returns an RPC error |
+
+### Function Signature Format
+
+Use full signatures with input and return types:
+
+```json
+{
+  "function": "symbol()(string)",           // No inputs, returns string
+  "function": "balanceOf(address)(uint256)", // One input, returns uint256
+  "function": "decimals()(uint8)"           // No inputs, returns uint8
+}
+```
+
+### Mocking Reverts
+
+```json
+{
+  "address": "0x1234...",
+  "function": "transfer(address,uint256)(bool)",
+  "params": ["0xaaaa...", "1000"],
+  "returns": [],
+  "reverts": true
+}
+```
+
+### Real-World Example
+
+From the ERC20 test:
+
+```json
+{
+  "ethCalls": [
+    {
+      "address": "0x731a10897d267e19b34503ad902d0a29173ba4b1",
+      "function": "symbol()(string)",
+      "params": [],
+      "returns": ["GRT"]
+    },
+    {
+      "address": "0x731a10897d267e19b34503ad902d0a29173ba4b1",
+      "function": "name()(string)",
+      "params": [],
+      "returns": ["TheGraph"]
+    },
+    {
+      "address": "0x731a10897d267e19b34503ad902d0a29173ba4b1",
+      "function": "balanceOf(address)(uint256)",
+      "params": ["0xaaaa000000000000000000000000000000000000"],
+      "returns": ["3000000000000000000"]
+    }
+  ]
+}
+```
+
+## ethereum.getBalance() Mocking
+
+Mock balance lookups made from mapping handlers using `ethereum.getBalance()`:
+
+```json
+{
+  "getBalanceCalls": [
+    {
+      "address": "0xaaaa000000000000000000000000000000000000",
+      "value": "1000000000000000000"
+    }
+  ]
+}
+```
+
+### getBalanceCalls Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `address` | Yes | Account address (checksummed or lowercase hex) |
+| `value` | Yes | Balance in Wei as a decimal string |
+
+## ethereum.hasCode() Mocking
+
+Mock code existence checks made from mapping handlers using `ethereum.hasCode()`:
+
+```json
+{
+  "hasCodeCalls": [
+    {
+      "address": "0x1234000000000000000000000000000000000000",
+      "hasCode": true
+    }
+  ]
+}
+```
+
+### hasCodeCalls Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `address` | Yes | Contract address (checksummed or lowercase hex) |
+| `hasCode` | Yes | Whether the address has deployed bytecode |
+
+## File Data Sources
+
+Mock IPFS and Arweave file contents for file data source handlers. Files are defined at the top level of the test JSON (not inside blocks).
+
+### IPFS Files
+
+```json
+{
+  "name": "File data source test",
+  "files": [
+    {
+      "cid": "QmExample...",
+      "content": "{\"name\": \"Token\", \"description\": \"A token\"}"
+    },
+    {
+      "cid": "QmAnother...",
+      "file": "fixtures/metadata.json"
+    }
+  ],
+  "blocks": [...],
+  "assertions": [...]
+}
+```
+
+#### files Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `cid` | Yes | IPFS CID (`Qm...` or `bafy...`). The mock ignores hash/content relationship |
+| `content` | One of `content`/`file` | Inline UTF-8 content |
+| `file` | One of `content`/`file` | File path, resolved relative to the test JSON |
+
+### Arweave Files
+
+```json
+{
+  "name": "Arweave data source test",
+  "arweaveFiles": [
+    {
+      "txId": "abc123",
+      "content": "{\"name\": \"Token\"}"
+    },
+    {
+      "txId": "def456/metadata.json",
+      "file": "fixtures/arweave-data.json"
+    }
+  ],
+  "blocks": [...],
+  "assertions": [...]
+}
+```
+
+#### arweaveFiles Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `txId` | Yes | Arweave transaction ID or bundle path (e.g. `"txid/filename.json"`) |
+| `content` | One of `content`/`file` | Inline UTF-8 content |
+| `file` | One of `content`/`file` | File path, resolved relative to the test JSON |
+
+## Assertions
+
+GraphQL queries to validate the indexed entity state after processing all blocks.
+
+### Assertion Fields
+
+| Field | Required | Description |
+|-------|----------|-------------|
+| `query` | Yes | GraphQL query string |
+| `expected` | Yes | Expected JSON response |
+
+### Comparison Behavior
+
+| Aspect | Behavior |
+|--------|----------|
+| Objects | Key-compared, order-insensitive |
+| Arrays | **Order-insensitive** (set comparison) |
+| String vs Number | Coerced — `"123"` matches `123` |
+| Nulls/Booleans | Strict equality |
+| Hex strings | **Must be lowercase** — graph-node returns all hex values in lowercase |
+
+**Important:** Arrays are compared as sets (order doesn't matter).
+
+**Important:** graph-node returns all hex-encoded values (addresses, transaction hashes, byte arrays) in **lowercase**. Expected values in assertions must match exactly — mixed-case hex will not match:
+
+```json
+{
+  "expected": {
+    "transfer": {
+      "from": "0xaaaa000000000000000000000000000000000000",  // ✅ lowercase
+      "to":   "0xBBBB000000000000000000000000000000000000"   // ❌ will not match
+    }
+  }
+}
+```
+
+Note: hex values in event inputs (`params`, `address`) are normalized automatically and can be mixed case. If you need ordered results, use `orderBy` in your GraphQL query:
+
+```json
+{
+  "query": "{ transfers(orderBy: timestamp, orderDirection: asc) { id from to value } }",
+  "expected": { ... }
+}
+```
+
+### Multiple Assertions
+
+You can have multiple assertions per test. They run sequentially after all blocks are processed:
+
+```json
+{
+  "assertions": [
+    {
+      "query": "{ tokens { id name symbol } }",
+      "expected": { ... }
+    },
+    {
+      "query": "{ accounts { id balance } }",
+      "expected": { ... }
+    }
+  ]
+}
+```
+
+### Nested Entity Queries
+
+Test relationships and nested entities:
+
+```json
+{
+  "query": "{ accounts { id balances { token { symbol } amount } } }",
+  "expected": {
+    "accounts": [
+      {
+        "id": "0xbbbb...",
+        "balances": [
+          {
+            "token": { "symbol": "GRT" },
+            "amount": "5000000000000000000"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+## startBlock Handling
+
+The test runner automatically reads `startBlock` from your subgraph manifest and handles it correctly — **no real blockchain connection needed**.
+
+### How It Works
+
+1. Extracts the **minimum `startBlock`** across all data sources in your manifest
+2. If min > 0, creates a `start_block_override` to bypass graph-node's on-chain block validation
+3. Test blocks without explicit `"number"` auto-increment starting from that minimum `startBlock`
+
+### Default Block Numbering
+
+The starting block number depends on your manifest:
+
+| Manifest Configuration | Test Block Numbers |
+|----------------------|-------------------|
+| `startBlock: 0` (or unset) | 0, 1, 2, ... |
+| `startBlock: 100` | 100, 101, 102, ... |
+| Multiple data sources: `startBlock: 50` and `startBlock: 200` | 50, 51, 52, ... (uses minimum) |
+
+### Example: Single Data Source
+
+**Manifest:**
+```yaml
+dataSources:
+  - name: Token
+    source:
+      startBlock: 1000
+```
+
+**Test:**
+```json
+{
+  "blocks": [
+    {},  // Block 1000 (auto-numbered)
+    {}   // Block 1001 (auto-numbered)
+  ]
+}
+```
+
+### Example: Explicit Block Numbers
+
+Override auto-numbering by specifying `"number"`:
+
+```json
+{
+  "blocks": [
+    {
+      "number": 5000,
+      "events": [...]
+    },
+    {
+      "number": 5001,
+      "events": [...]
+    }
+  ]
+}
+```
+
+### Multi-Data Source Testing
+
+When your subgraph has multiple data sources with different `startBlock` values, you may need to use explicit block numbers.
+
+**Scenario:** DataSource A at `startBlock: 50` (Transfer events), DataSource B at `startBlock: 200` (Approval events). You want to test only DataSource B.
+
+**Manifest:**
+```yaml
+dataSources:
+  - name: TokenTransfers
+    source:
+      startBlock: 50
+    mapping:
+      eventHandlers:
+        - event: Transfer(...)
+          handler: handleTransfer
+  - name: TokenApprovals
+    source:
+      startBlock: 200
+    mapping:
+      eventHandlers:
+        - event: Approval(...)
+          handler: handleApproval
+```
+
+**Test:**
+```json
+{
+  "name": "Test Approval handler",
+  "blocks": [
+    {
+      "number": 200,  // Explicit number >= DataSource B's startBlock
+      "events": [
+        {
+          "address": "0x5678...",
+          "event": "Approval(address indexed owner, address indexed spender, uint256 value)",
+          "params": {
+            "owner": "0xaaaa...",
+            "spender": "0xbbbb...",
+            "value": "500"
+          }
+        }
+      ]
+    },
+    {
+      "number": 201,
+      "events": [...]
+    }
+  ]
+}
+```
+
+**Why explicit numbers are needed:**
+- Default numbering starts at the **minimum** `startBlock` across all data sources (50 in this case)
+- Blocks 50-199 are below DataSource B's `startBlock: 200`, so its handlers won't fire
+- Use explicit `"number": 200` to ensure the block is in DataSource B's active range
+
+**Note:** DataSource A is still "active" from block 50 onward, but it simply sees no matching Transfer events in blocks 200-201, so no handlers fire for it. This is normal behavior — graph-node doesn't error on inactive handlers.
+
+## Test Organization
+
+### Directory Structure
+
+```
+my-subgraph/
+├── subgraph.yaml
+├── schema.graphql
+├── src/
+│   └── mapping.ts
+└── tests/
+    ├── transfer.json
+    ├── approval.json
+    └── edge-cases.test.json
+```
+
+### Naming Conventions
+
+- Use `.json` or `.test.json` extension
+- Descriptive names: `transfer.json`, `mint-burn.json`, `edge-cases.json`
+- The test runner discovers all `*.json` and `*.test.json` files in the test directory
+
+## Known Limitations
+
+| Feature | Status |
+|---------|--------|
+| Log events | ✅ Supported |
+| Block handlers (all filters) | ✅ Supported |
+| `eth_call` mocking | ✅ Supported |
+| `ethereum.getBalance()` mocking | ✅ Supported |
+| `ethereum.hasCode()` mocking | ✅ Supported |
+| Dynamic/template data sources | ✅ Supported |
+| Transaction receipts (`receipt: true`) | ⚠️ Partial — `receipt.logs` is populated and grouped by `txHash`; other fields (gas, from, to, etc.) are hardcoded stubs (see [Transaction Receipts](#transaction-receipts)) |
+| File data sources (IPFS + Arweave) | ✅ Supported |
+| Call triggers (traces) | ❌ Not implemented |
+| `--json` CI output | ❌ Not implemented |
+| Parallel test execution | ❌ Not implemented |
+| Test name filtering (`--filter`) | ❌ Not implemented |
+
+## Tips & Best Practices
+
+### Use Lowercase Hex in Assertions
+
+graph-node returns **all** hex-encoded values in lowercase — addresses, transaction hashes, and any `Bytes`/`ID` fields. Expected values in assertions must use lowercase hex:
+
+```json
+{
+  "expected": {
+    "transfer": {
+      "from": "0xaaaa000000000000000000000000000000000000"  // ✅ lowercase
+    }
+  }
+}
+```
+
+Not:
+```json
+{
+  "expected": {
+    "transfer": {
+      "from": "0xAAAA000000000000000000000000000000000000"  // ❌ will not match
+    }
+  }
+}
+```
+
+Event inputs (`address`, `params`) are normalized automatically and can be mixed case.
+
+### Test One Thing at a Time
+
+Write focused tests that validate a single behavior:
+
+```json
+// ✅ Good - tests one scenario
+{
+  "name": "Transfer event creates TransferEvent entity",
+  "blocks": [...],
+  "assertions": [...]
+}
+```
+
+```json
+// ❌ Avoid - tests too many things
+{
+  "name": "Test everything",
+  "blocks": [/* 50 blocks */],
+  "assertions": [/* 20 assertions */]
+}
+```
+
+### Order GraphQL Results
+
+If your assertion needs specific ordering, use `orderBy`:
+
+```json
+{
+  "query": "{ transfers(first: 10, orderBy: timestamp, orderDirection: asc) { id } }",
+  "expected": { ... }
+}
+```
+
+### Test Block Handlers with Empty Blocks
+
+Use empty blocks to test that block handlers fire even without events:
+
+```json
+{
+  "blocks": [
+    {},  // Empty block - block handlers still fire
+    {}
+  ]
+}
+```
+
+### Split Complex Tests
+
+Instead of one large test with many blocks, split into multiple focused test files:
+
+```
+tests/
+├── transfer-basic.json        # Basic transfer functionality
+├── transfer-zero-value.json   # Edge case: zero value
+└── transfer-same-account.json # Edge case: self-transfer
+```
+
+## Architecture
+
+The test runner reuses real graph-node infrastructure:
+
+```
+test.json
+    ↓
+Parse & ABI encode events
+    ↓
+Mock block stream (StaticStreamBuilder)
+    ↓
+Real graph-node indexer
+    ├── WASM runtime
+    ├── Trigger processing
+    └── Entity storage (pgtemp database)
+    ↓
+GraphQL queries → Assertions
+```
+
+**Key design principles:**
+
+- **Isolated database per test:** Each test gets a pgtemp database dropped on completion (default), or a shared persistent database with post-test cleanup (`--postgres-url`)
+- **Mock transport layer:** A mock Alloy transport serves `eth_call`, `eth_getBalance`, and `eth_getCode` from test JSON data. All three flow through the real production code path — only the transport returns mock responses. Unmocked RPC calls fail immediately with a descriptive error.
+- **No IPFS for manifest:** Uses `FileLinkResolver` to load manifest/WASM from build directory
+
+## Troubleshooting
+
+### Test Fails: "Entity not found"
+
+**Cause:** Handler didn't create the expected entity.
+
+**Fix:**
+1. Check event signature matches ABI (include `indexed` keywords)
+2. Verify contract address matches manifest
+3. Check block number is >= data source's `startBlock`
+4. Add debug logging to your mapping handler
+
+### Test Timeout
+
+**Cause:** Indexer took longer than 60 seconds (default timeout).
+
+**Fix:**
+1. Reduce number of blocks in test
+2. Simplify mapping logic
+3. Check for infinite loops in handler code
+
+### Unmocked RPC Call
+
+**Cause:** A mapping handler calls `ethereum.call`, `ethereum.getBalance`, or `ethereum.hasCode` for a call that has no matching mock entry.
+
+**Symptom:** Test fails immediately with a descriptive error like:
+```
+gnd test: unmocked eth_call to 0x1234... at block hash 0xabcd...
+Add a matching 'ethCalls' entry to this block in your test JSON.
+```
+
+**Fix:**
+1. Add the missing mock to the appropriate field in your test block (`ethCalls`, `getBalanceCalls`, or `hasCodeCalls`)
+2. If the call is not supposed to happen, check the mapping logic — a code path may be executing unexpectedly
+
+### Block Handler Not Firing
+
+**Cause:** Block handlers auto-fire, but might be outside data source's active range.
+
+**Fix:**
+1. Check data source's `startBlock` in manifest
+2. Use explicit `"number"` in test blocks to ensure they're >= `startBlock`
+3. Verify handler is defined in manifest's `blockHandlers` section
+
+## Legacy Matchstick Mode
+
+Fall back to the external Matchstick test runner for backward compatibility:
+
+```bash
+gnd test --matchstick
+```
+
+This is useful if:
+- You have existing Matchstick tests
+- You need features not yet supported by the mock-based runner
+- You're migrating gradually from Matchstick to the new test format
+
+## See Also
+
+- [Subgraph Manifest Documentation](https://thegraph.com/docs/en/developing/creating-a-subgraph/)
+- [AssemblyScript Mapping API](https://thegraph.com/docs/en/developing/assemblyscript-api/)
+- [GraphQL Schema](https://thegraph.com/docs/en/developing/creating-a-subgraph/#the-graph-ql-schema)
diff --git a/gnd/docs/migrating-from-graph-cli.md b/gnd/docs/migrating-from-graph-cli.md
new file mode 100644
index 00000000000..6203a6f2f21
--- /dev/null
+++ b/gnd/docs/migrating-from-graph-cli.md
@@ -0,0 +1,303 @@
+# Migrating from graph-cli to gnd
+
+`gnd` is designed as a drop-in replacement for `graph-cli`. This guide covers the differences and how to migrate your workflow.
+
+## TL;DR
+
+For most users, migration is straightforward:
+
+```bash
+# Instead of:
+graph codegen
+graph build
+graph deploy --studio my-subgraph
+
+# Use:
+gnd codegen
+gnd build
+gnd deploy my-subgraph  # defaults to Studio; prompts for version label in interactive terminals
+```
+
+## Command Mapping
+
+| graph-cli | gnd | Notes |
+|-----------|-----|-------|
+| `graph init` | `gnd init` | Identical flags |
+| `graph codegen` | `gnd codegen` | Identical flags |
+| `graph build` | `gnd build` | Identical flags |
+| `graph deploy` | `gnd deploy` | Defaults to Studio if `--node` not provided; pass `--version-label` in non-interactive mode |
+| `graph create` | `gnd create` | Identical flags |
+| `graph remove` | `gnd remove` | Identical flags |
+| `graph auth` | `gnd auth` | Identical flags |
+| `graph add` | `gnd add` | Identical flags |
+| `graph test` | `gnd test` | Identical flags |
+| `graph clean` | `gnd clean` | Identical flags (new in graph-cli 0.80+) |
+| `graph publish` | `gnd publish` | Identical flags |
+| `graph indexer` | `gnd indexer` | Delegates to `graph-indexer` — requires `indexer-cli` installed |
+| `graph local` | N/A | Not implemented - use graph-node's test infrastructure |
+| `graph node` | N/A | Not implemented - use `graphman` |
+
+## What's the Same
+
+### Flag Compatibility
+
+All flags use the same names, short forms, and defaults:
+
+```bash
+# Both work identically
+graph codegen -o generated/ --skip-migrations
+gnd codegen -o generated/ --skip-migrations
+
+graph build -t wasm --network mainnet
+gnd build -t wasm --network mainnet
+
+graph deploy -l v1.0.0 --ipfs http://localhost:5001 my-subgraph
+gnd deploy -l v1.0.0 --ipfs http://localhost:5001 my-subgraph
+```
+
+### Output Format
+
+Same success checkmarks, step descriptions, and progress indicators:
+
+```
+✔ Generate types for data source: Gravity (...)
+✔ Write types to generated/Gravity/Gravity.ts (...)
+```
+
+### Exit Codes
+
+- `0` for success
+- `1` for any error
+- `gnd indexer` passes through the exit code from `graph-indexer`
+
+### Configuration Files
+
+`gnd` uses the same configuration files as `graph-cli`:
+
+- `~/.graph-cli.json` - Deploy keys (from `gnd auth`)
+- `networks.json` - Network-specific addresses
+
+Your existing auth keys work with both tools.
+
+### Generated Code
+
+Code generation produces identical AssemblyScript output (after formatting). Your existing subgraph code will work without changes.
+
+## What's Different
+
+### Indexer Commands
+
+`gnd indexer` provides access to indexer management commands via [`indexer-cli`](https://github.com/graphprotocol/indexer/tree/main/packages/indexer-cli). Requires `graph-indexer` on `$PATH`:
+
+```bash
+npm install -g @graphprotocol/indexer-cli
+
+gnd indexer status --network arbitrum-one
+gnd indexer rules get all --network mainnet
+gnd indexer allocations get --network arbitrum-one
+```
+
+Note: `gnd indexer --help` shows gnd's own help and works without `graph-indexer` installed. Use `gnd indexer help` to see the full list of `graph-indexer` commands.
+
+### Commands Not Available
+
+#### `graph local`
+
+Not implemented in `gnd`. Use graph-node's built-in integration test infrastructure or Docker compose setups instead.
+
+#### `graph node`
+
+Not implemented. Use `graphman` for node management operations:
+
+```bash
+# Instead of graph node commands, use graphman:
+graphman info subgraph-name
+graphman reassign subgraph-name shard
+```
+
+### Debug Logging
+
+```bash
+# graph-cli uses:
+DEBUG=graph-cli:* graph codegen
+
+# gnd uses:
+RUST_LOG=gnd=debug gnd codegen
+```
+
+### The `--uncrashable` Flag
+
+The `--uncrashable` flag on `codegen` (Float Capital's uncrashable helper generation) is not implemented. This is a third-party feature that most subgraphs don't use.
+
+### Minor Code Generation Differences
+
+These differences are intentional and documented:
+
+1. **Int8 import**: `gnd` always imports `Int8` in generated code for simplicity, even when not used. This doesn't affect functionality.
+
+2. **Trailing commas**: `gnd` uses trailing commas in multi-line constructs:
+   ```typescript
+   // gnd output
+   new Foo(
+     param1,
+     param2,  // trailing comma
+   )
+
+   // graph-cli output
+   new Foo(
+     param1,
+     param2
+   )
+   ```
+
+3. **2D array accessors**: `gnd` uses the correct `toStringMatrix()` method for 2D GraphQL arrays, fixing a bug in graph-cli that used `toStringArray()`.
+
+## Migration Steps
+
+### Step 1: Install gnd
+
+Build from source in the graph-node repository:
+
+```bash
+cargo build -p gnd --release
+# Binary at target/release/gnd
+```
+
+### Step 2: Verify Your Auth
+
+Your existing `~/.graph-cli.json` works with both tools. Verify with:
+
+```bash
+# Check stored keys
+cat ~/.graph-cli.json
+
+# Or just run a deploy dry-run to see if auth is working
+gnd deploy --help
+```
+
+### Step 3: Test Locally
+
+Run your normal workflow with gnd:
+
+```bash
+gnd codegen
+gnd build
+```
+
+Compare the output to graph-cli if you want to verify:
+
+```bash
+# graph-cli
+graph codegen -o generated-graph/
+graph build -o build-graph/
+
+# gnd
+gnd codegen -o generated-gnd/
+gnd build -o build-gnd/
+
+# Compare (should be identical after formatting)
+diff -r generated-graph generated-gnd
+diff -r build-graph build-gnd
+```
+
+### Step 4: Update CI/CD
+
+Replace `graph` with `gnd` in your CI configuration:
+
+```yaml
+# Before
+- run: graph codegen
+- run: graph build
+- run: graph deploy --studio -l ${{ github.sha }} ${{ secrets.SUBGRAPH_NAME }}
+
+# After
+- run: gnd codegen
+- run: gnd build
+- run: gnd deploy -l ${{ github.sha }} ${{ secrets.SUBGRAPH_NAME }}
+```
+
+### Step 5: Update package.json Scripts (Optional)
+
+If you have npm scripts calling graph-cli:
+
+```json
+{
+  "scripts": {
+    "codegen": "gnd codegen",
+    "build": "gnd build",
+    "deploy": "gnd deploy -l $VERSION_LABEL"
+  }
+}
+```
+
+Set `VERSION_LABEL` in your environment (for example, from a git tag or commit SHA).
+
+## Troubleshooting
+
+### "Command not found: gnd"
+
+Make sure the gnd binary is in your PATH:
+
+```bash
+export PATH="$PATH:/path/to/graph-node/target/release"
+```
+
+### "prettier: command not found"
+
+`gnd codegen` shells out to `prettier` for formatting. Install it:
+
+```bash
+npm install -g prettier
+# or
+pnpm add -g prettier
+```
+
+### "asc: command not found"
+
+`gnd build` shells out to the AssemblyScript compiler. Install it:
+
+```bash
+npm install -g assemblyscript
+# or have it in your subgraph's node_modules
+npm install --save-dev assemblyscript
+```
+
+### Different Output After codegen
+
+If you notice differences in generated code:
+
+1. Check if it's one of the documented differences (Int8 import, trailing commas)
+2. Run prettier on both outputs to normalize formatting
+3. Report any unexpected differences as a bug
+
+### Authentication Issues
+
+Keys stored by graph-cli work with gnd and vice versa. If you have issues:
+
+```bash
+# Re-authenticate
+gnd auth YOUR_DEPLOY_KEY
+
+# Verify the key was saved
+cat ~/.graph-cli.json
+```
+
+## Why Migrate?
+
+### Benefits of gnd
+
+- **Native performance**: Rust implementation is faster for large subgraphs
+- **Integrated with graph-node**: Same codebase, consistent behavior
+- **Better error messages**: Leverages graph-node's validation
+- **`gnd dev` command**: Run graph-node in development mode
+
+### When to Keep Using graph-cli
+
+- If you need multi-protocol support (NEAR, Cosmos, Arweave, Substreams) - gnd currently focuses on Ethereum
+- If you use the `--uncrashable` flag
+- If you need the `graph local` or `graph node` commands
+
+## Getting Help
+
+- File issues at: https://github.com/graphprotocol/graph-node/issues
+- Check gnd version: `gnd --version`
diff --git a/gnd/npm/README.md b/gnd/npm/README.md
new file mode 100644
index 00000000000..acca621b4dc
--- /dev/null
+++ b/gnd/npm/README.md
@@ -0,0 +1,35 @@
+# The Graph CLI
+
+This package installs the CLI for developing subgraphs for [The Graph
+Network](https://thegraph.com/subgraphs/) It supports all aspects of
+[developing, testing, and deploying subgraphs](https://thegraph.com/docs/en/subgraphs/quick-start/) locally and
+on the network.
+
+This package is a complete replacement for the older
+[graph-cli](https://www.npmjs.com/package/@graphprotocol/graph-cli) which
+will over time be migrated to be a simple wrapper for `gnd`. Older
+documentation will reference `graph-cli` in its instructions; running
+`alias graph=gnd` in the shell make it possible to follow these
+instructions verbatim with `gnd`.
+
+Besides the tools to develop subgraphs, `gnd` also contains a version of
+[graph-node](https://github.com/graphprotocol/graph-node) tailored to
+running subgraphs locally via `gnd dev`.
+
+
+## Getting started
+
+Run `npm install -g @graphprotocol/gnd` to install `gnd`.
+
+After installation, you can create and run an example subgraph locally with
+```bash
+gnd init --from-example ethereum-gravatar 'My new subgraph' new-subgraph
+cd new-subgraph
+gnd codegen
+gnd build
+gnd dev --ethereum-rpc 'mainnet:<RPC URL>'
+```
+
+If you have an existing contract for which you want to write a subgraph,
+have a look at `gnd help init` and the `--from-contract` option. You can
+also simply run `gnd init` and follow the prompts to set up your subgraph.
diff --git a/gnd/npm/bin/gnd.js b/gnd/npm/bin/gnd.js
new file mode 100644
index 00000000000..82a7ae5bf09
--- /dev/null
+++ b/gnd/npm/bin/gnd.js
@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+const { execFileSync } = require("child_process");
+const path = require("path");
+
+const PLATFORMS = {
+  "darwin-arm64": "@graphprotocol/gnd-darwin-arm64",
+  "darwin-x64": "@graphprotocol/gnd-darwin-x64",
+  "linux-arm64": "@graphprotocol/gnd-linux-arm64",
+  "linux-x64": "@graphprotocol/gnd-linux-x64",
+  "win32-x64": "@graphprotocol/gnd-win32-x64",
+};
+
+const key = `${process.platform}-${process.arch}`;
+const pkg = PLATFORMS[key];
+if (!pkg) {
+  console.error(`Unsupported platform: ${key}`);
+  process.exit(1);
+}
+
+const bin = process.platform === "win32" ? "gnd.exe" : "gnd";
+const binPath = path.join(
+  require.resolve(`${pkg}/package.json`),
+  "..",
+  "bin",
+  bin
+);
+
+try {
+  execFileSync(binPath, process.argv.slice(2), { stdio: "inherit" });
+} catch (e) {
+  process.exit(e.status ?? 1);
+}
diff --git a/gnd/src/abi.rs b/gnd/src/abi.rs
new file mode 100644
index 00000000000..0a5fa695cf4
--- /dev/null
+++ b/gnd/src/abi.rs
@@ -0,0 +1,101 @@
+//! ABI normalization utilities.
+//!
+//! Handles extraction of bare ABI arrays from various artifact formats
+//! (raw arrays, Hardhat/Foundry, Truffle).
+
+use anyhow::{Context, Result, anyhow};
+
+/// Normalize ABI JSON to extract the actual ABI array from various artifact formats.
+///
+/// Supports:
+/// - Raw ABI array: `[{...}]`
+/// - Foundry/Hardhat format: `{"abi": [...], ...}`
+/// - Truffle format: `{"compilerOutput": {"abi": [...], ...}, ...}`
+pub fn normalize_abi_json(abi_str: &str) -> Result<serde_json::Value> {
+    let value: serde_json::Value =
+        serde_json::from_str(abi_str).context("Failed to parse ABI JSON")?;
+
+    // Case 1: Already an array - return as-is
+    if value.is_array() {
+        return Ok(value);
+    }
+
+    // Case 2: Object with "abi" field (Foundry/Hardhat format)
+    if let Some(abi) = value.get("abi")
+        && abi.is_array()
+    {
+        return Ok(abi.clone());
+    }
+
+    // Case 3: Object with "compilerOutput.abi" field (Truffle format)
+    if let Some(compiler_output) = value.get("compilerOutput")
+        && let Some(abi) = compiler_output.get("abi")
+        && abi.is_array()
+    {
+        return Ok(abi.clone());
+    }
+
+    Err(anyhow!(
+        "Invalid ABI format: expected an array or an object with 'abi' field"
+    ))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_normalize_abi_json_raw_array() {
+        let raw_abi = r#"[{"type": "event", "name": "Transfer"}]"#;
+        let result = normalize_abi_json(raw_abi).unwrap();
+        assert!(result.is_array());
+        assert_eq!(result.as_array().unwrap().len(), 1);
+    }
+
+    #[test]
+    fn test_normalize_abi_json_hardhat_format() {
+        let hardhat_abi = r#"{
+            "_format": "hh-sol-artifact-1",
+            "contractName": "MyContract",
+            "abi": [{"type": "event", "name": "Transfer"}],
+            "bytecode": "0x..."
+        }"#;
+        let result = normalize_abi_json(hardhat_abi).unwrap();
+        assert!(result.is_array());
+        assert_eq!(result.as_array().unwrap().len(), 1);
+        assert_eq!(
+            result.as_array().unwrap()[0].get("name").unwrap(),
+            "Transfer"
+        );
+    }
+
+    #[test]
+    fn test_normalize_abi_json_truffle_format() {
+        let truffle_abi = r#"{
+            "contractName": "MyContract",
+            "compilerOutput": {
+                "abi": [{"type": "event", "name": "Transfer"}]
+            }
+        }"#;
+        let result = normalize_abi_json(truffle_abi).unwrap();
+        assert!(result.is_array());
+        assert_eq!(result.as_array().unwrap().len(), 1);
+        assert_eq!(
+            result.as_array().unwrap()[0].get("name").unwrap(),
+            "Transfer"
+        );
+    }
+
+    #[test]
+    fn test_normalize_abi_json_invalid_format() {
+        let invalid_abi = r#"{"contractName": "MyContract"}"#;
+        let result = normalize_abi_json(invalid_abi);
+        assert!(result.is_err());
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("Invalid ABI format")
+        );
+    }
+}
diff --git a/gnd/src/codegen/abi.rs b/gnd/src/codegen/abi.rs
new file mode 100644
index 00000000000..9b881fdcbe9
--- /dev/null
+++ b/gnd/src/codegen/abi.rs
@@ -0,0 +1,1955 @@
+//! ABI code generation for Ethereum contracts.
+//!
+//! Generates AssemblyScript bindings from contract ABIs:
+//! - Event classes with typed parameters
+//! - Call classes for function calls with inputs/outputs
+//! - Contract class with typed call methods
+
+use std::collections::HashMap;
+
+use graph::abi::{
+    DynSolType, Event, EventParam, Function, FunctionExt, JsonAbi, Param, StateMutability,
+};
+use regex::Regex;
+
+use super::typescript::{self as ts, Class, ClassMember, Method, ModuleImports, Param as TsParam};
+use crate::shared::{capitalize, handle_reserved_word};
+
+/// Resolve a `Param`'s type to `DynSolType`.
+fn resolve_param_type(param: &Param) -> DynSolType {
+    param
+        .selector_type()
+        .parse::<DynSolType>()
+        .expect("valid ABI type")
+}
+
+/// Resolve an `EventParam`'s type to `DynSolType`.
+fn resolve_event_param_type(param: &EventParam) -> DynSolType {
+    param
+        .selector_type()
+        .parse::<DynSolType>()
+        .expect("valid ABI type")
+}
+
+const GRAPH_TS_MODULE: &str = "@graphprotocol/graph-ts";
+
+/// ABI code generator.
+pub struct AbiCodeGenerator {
+    contract: JsonAbi,
+    name: String,
+}
+
+impl AbiCodeGenerator {
+    /// Create a new ABI code generator.
+    pub fn new(contract: JsonAbi, name: impl Into<String>) -> Self {
+        let mut name = name.into();
+        // Sanitize name to be a valid class name
+        let re = Regex::new(r#"[!@#$%^&*()+\-=\[\]{};':\"|,.<>/?]+"#).unwrap();
+        name = re.replace_all(&name, "_").to_string();
+        Self { contract, name }
+    }
+
+    /// Generate module imports for the ABI file.
+    pub fn generate_module_imports(&self) -> Vec<ModuleImports> {
+        vec![ModuleImports::new(
+            vec![
+                "ethereum".to_string(),
+                "JSONValue".to_string(),
+                "TypedMap".to_string(),
+                "Entity".to_string(),
+                "Bytes".to_string(),
+                "Address".to_string(),
+                "BigInt".to_string(),
+            ],
+            GRAPH_TS_MODULE,
+        )]
+    }
+
+    /// Generate all types from the ABI.
+    pub fn generate_types(&self) -> Vec<Class> {
+        let mut classes = Vec::new();
+        classes.extend(self.generate_event_types());
+        classes.extend(self.generate_smart_contract_class());
+        classes.extend(self.generate_call_types());
+        classes
+    }
+
+    /// Generate event type classes.
+    fn generate_event_types(&self) -> Vec<Class> {
+        let mut classes = Vec::new();
+        let events = self.disambiguate_events();
+
+        for (event, alias) in events {
+            let event_class_name = alias.clone();
+            let mut tuple_classes = Vec::new();
+
+            // Generate params class
+            let params_class_name = [&event_class_name, "__Params"].concat();
+            let mut params_class = ts::klass(&params_class_name).exported();
+            params_class.add_member(ClassMember::new("_event", &event_class_name));
+            params_class.add_method(Method::new(
+                "constructor",
+                vec![TsParam::new("event", ts::NamedType::new(&event_class_name))],
+                None,
+                "this._event = event",
+            ));
+
+            // Generate getters for event params
+            let inputs = self.disambiguate_event_params(&event.inputs, "param");
+            for (index, (param, param_name)) in inputs.iter().enumerate() {
+                let param_object = self.generate_event_param(
+                    param,
+                    param_name,
+                    index,
+                    &event_class_name,
+                    &mut tuple_classes,
+                );
+                params_class.add_method(param_object);
+            }
+
+            // Generate event class
+            let mut event_class = ts::klass(&event_class_name)
+                .exported()
+                .extends("ethereum.Event");
+            event_class.add_method(Method::new(
+                "get params",
+                vec![],
+                Some(ts::NamedType::new(&params_class_name).into()),
+                format!("return new {}(this)", params_class_name),
+            ));
+
+            classes.push(event_class);
+            classes.push(params_class);
+            classes.extend(tuple_classes);
+        }
+
+        classes
+    }
+
+    /// Generate the smart contract class with call methods.
+    fn generate_smart_contract_class(&self) -> Vec<Class> {
+        let mut classes = Vec::new();
+
+        let mut contract_class = ts::klass(&self.name)
+            .exported()
+            .extends("ethereum.SmartContract");
+
+        // Add static bind method
+        let contract_name = &self.name;
+        contract_class.add_static_method(ts::StaticMethod::new(
+            "bind",
+            vec![TsParam::new("address", ts::NamedType::new("Address"))],
+            ts::NamedType::new(&self.name),
+            format!("return new {}('{}', address)", contract_name, contract_name),
+        ));
+
+        // Get callable functions and sort alphabetically for deterministic output
+        let mut functions = self.get_callable_functions();
+        functions.sort_by(|a, b| a.name.cmp(&b.name));
+        let disambiguated = self.disambiguate_functions(&functions);
+
+        for (func, alias) in disambiguated {
+            let (method, try_method, result_classes) = self.generate_function_methods(func, &alias);
+            contract_class.add_method(method);
+            contract_class.add_method(try_method);
+            classes.extend(result_classes);
+        }
+
+        classes.push(contract_class);
+        classes
+    }
+
+    /// Generate call type classes.
+    fn generate_call_types(&self) -> Vec<Class> {
+        let mut classes = Vec::new();
+        let mut functions = self.get_call_functions();
+        functions.sort_by(|a, b| a.name.cmp(&b.name));
+        let disambiguated = self.disambiguate_call_functions(&functions);
+
+        for (func, alias) in disambiguated {
+            let cap_alias = capitalize(&alias);
+            let call_class_name = format!("{}Call", cap_alias);
+            let mut tuple_classes = Vec::new();
+
+            // Generate inputs class
+            let inputs_class_name = [&call_class_name, "__Inputs"].concat();
+            let mut inputs_class = ts::klass(&inputs_class_name).exported();
+            inputs_class.add_member(ClassMember::new("_call", &call_class_name));
+            inputs_class.add_method(Method::new(
+                "constructor",
+                vec![TsParam::new("call", ts::NamedType::new(&call_class_name))],
+                None,
+                "this._call = call",
+            ));
+
+            let inputs = self.disambiguate_params(&func.inputs, "value");
+            for (index, (param, param_name)) in inputs.iter().enumerate() {
+                let getter = self.generate_input_output_getter(
+                    param,
+                    param_name,
+                    index,
+                    &call_class_name,
+                    "call",
+                    "inputValues",
+                    &mut tuple_classes,
+                );
+                inputs_class.add_method(getter);
+            }
+
+            // Generate outputs class
+            let outputs_class_name = [&call_class_name, "__Outputs"].concat();
+            let mut outputs_class = ts::klass(&outputs_class_name).exported();
+            outputs_class.add_member(ClassMember::new("_call", &call_class_name));
+            outputs_class.add_method(Method::new(
+                "constructor",
+                vec![TsParam::new("call", ts::NamedType::new(&call_class_name))],
+                None,
+                "this._call = call",
+            ));
+
+            let outputs = self.disambiguate_params(&func.outputs, "value");
+            for (index, (param, param_name)) in outputs.iter().enumerate() {
+                let getter = self.generate_input_output_getter(
+                    param,
+                    param_name,
+                    index,
+                    &call_class_name,
+                    "call",
+                    "outputValues",
+                    &mut tuple_classes,
+                );
+                outputs_class.add_method(getter);
+            }
+
+            // Generate call class
+            let mut call_class = ts::klass(&call_class_name)
+                .exported()
+                .extends("ethereum.Call");
+            call_class.add_method(Method::new(
+                "get inputs",
+                vec![],
+                Some(ts::NamedType::new(&inputs_class_name).into()),
+                format!("return new {}(this)", inputs_class_name),
+            ));
+            call_class.add_method(Method::new(
+                "get outputs",
+                vec![],
+                Some(ts::NamedType::new(&outputs_class_name).into()),
+                format!("return new {}(this)", outputs_class_name),
+            ));
+
+            classes.push(call_class);
+            classes.push(inputs_class);
+            classes.push(outputs_class);
+            classes.extend(tuple_classes);
+        }
+
+        classes
+    }
+
+    /// Generate a getter method for an event parameter.
+    fn generate_event_param(
+        &self,
+        param: &EventParam,
+        name: &str,
+        index: usize,
+        event_class_name: &str,
+        tuple_classes: &mut Vec<Class>,
+    ) -> Method {
+        let param_type = resolve_event_param_type(param);
+
+        // Handle indexed params - strings, bytes and arrays are hashed to bytes32
+        let value_type = if param.indexed {
+            indexed_input_type(&param_type)
+        } else {
+            param_type.clone()
+        };
+
+        if contains_tuple_type(&value_type) {
+            self.generate_tuple_getter_for_event_param(
+                param,
+                &param_type,
+                name,
+                index,
+                event_class_name,
+                "event",
+                "parameters",
+                tuple_classes,
+            )
+        } else {
+            let asc_type = asc_type_for_ethereum(&value_type);
+            let access = format!("this._event.parameters[{}].value", index);
+            let conversion = ethereum_to_asc(&access, &value_type, None);
+            Method::new(
+                format!("get {}", name),
+                vec![],
+                Some(ts::TypeExpr::Raw(asc_type)),
+                format!("return {}", conversion),
+            )
+        }
+    }
+
+    /// Generate a getter for call inputs/outputs.
+    #[allow(clippy::too_many_arguments)]
+    fn generate_input_output_getter(
+        &self,
+        param: &Param,
+        name: &str,
+        index: usize,
+        parent_class: &str,
+        parent_type: &str,
+        parent_field: &str,
+        tuple_classes: &mut Vec<Class>,
+    ) -> Method {
+        let param_type = resolve_param_type(param);
+        if contains_tuple_type(&param_type) {
+            self.generate_tuple_getter(
+                param,
+                &param_type,
+                name,
+                index,
+                parent_class,
+                parent_type,
+                parent_field,
+                tuple_classes,
+            )
+        } else {
+            let asc_type = asc_type_for_ethereum(&param_type);
+            let access = format!("this._{}.{}[{}].value", parent_type, parent_field, index);
+            let conversion = ethereum_to_asc(&access, &param_type, None);
+            Method::new(
+                format!("get {}", name),
+                vec![],
+                Some(ts::TypeExpr::Raw(asc_type)),
+                format!("return {}", conversion),
+            )
+        }
+    }
+
+    /// Generate a tuple getter and its associated classes (for `Param`).
+    #[allow(clippy::too_many_arguments)]
+    fn generate_tuple_getter(
+        &self,
+        param: &Param,
+        param_type: &DynSolType,
+        name: &str,
+        index: usize,
+        parent_class: &str,
+        parent_type: &str,
+        parent_field: &str,
+        tuple_classes: &mut Vec<Class>,
+    ) -> Method {
+        let cap_name = capitalize(name);
+        let tuple_identifier = format!("{}{}", parent_class, cap_name);
+        let tuple_class_name = if parent_field == "outputValues" {
+            format!("{}OutputStruct", tuple_identifier)
+        } else {
+            format!("{}Struct", tuple_identifier)
+        };
+
+        let is_tuple = matches!(param_type, DynSolType::Tuple(_));
+        let access_code = if parent_type == "tuple" {
+            format!("this[{}]", index)
+        } else {
+            format!("this._{}.{}[{}].value", parent_type, parent_field, index)
+        };
+
+        let return_value = ethereum_to_asc(&access_code, param_type, Some(&tuple_class_name));
+
+        let return_type = if is_tuple_matrix_type(param_type) {
+            format!("Array<Array<{}>>", tuple_class_name)
+        } else if is_tuple_array_type(param_type) {
+            format!("Array<{}>", tuple_class_name)
+        } else {
+            tuple_class_name.clone()
+        };
+
+        let body = if is_tuple {
+            format!("return changetype<{}>({})", tuple_class_name, return_value)
+        } else {
+            format!("return {}", return_value)
+        };
+
+        // Generate tuple class from Param's components
+        let components = get_tuple_param_components(param);
+        if !components.is_empty() {
+            let mut tuple_class = ts::klass(&tuple_class_name)
+                .exported()
+                .extends("ethereum.Tuple");
+
+            let component_params = disambiguate_tuple_components(components);
+            for (idx, (component, component_name)) in component_params.iter().enumerate() {
+                let component_getter = self.generate_tuple_component_getter(
+                    component,
+                    component_name,
+                    idx,
+                    &tuple_identifier,
+                    tuple_classes,
+                );
+                tuple_class.add_method(component_getter);
+            }
+
+            tuple_classes.push(tuple_class);
+        }
+
+        Method::new(
+            format!("get {}", name),
+            vec![],
+            Some(ts::TypeExpr::Raw(return_type)),
+            body,
+        )
+    }
+
+    /// Generate a tuple getter and its associated classes (for `EventParam`).
+    #[allow(clippy::too_many_arguments)]
+    fn generate_tuple_getter_for_event_param(
+        &self,
+        param: &EventParam,
+        param_type: &DynSolType,
+        name: &str,
+        index: usize,
+        parent_class: &str,
+        parent_type: &str,
+        parent_field: &str,
+        tuple_classes: &mut Vec<Class>,
+    ) -> Method {
+        let cap_name = capitalize(name);
+        let tuple_identifier = format!("{}{}", parent_class, cap_name);
+        let tuple_class_name = if parent_field == "outputValues" {
+            format!("{}OutputStruct", tuple_identifier)
+        } else {
+            format!("{}Struct", tuple_identifier)
+        };
+
+        let is_tuple = matches!(param_type, DynSolType::Tuple(_));
+        let access_code = if parent_type == "tuple" {
+            format!("this[{}]", index)
+        } else {
+            format!("this._{}.{}[{}].value", parent_type, parent_field, index)
+        };
+
+        let return_value = ethereum_to_asc(&access_code, param_type, Some(&tuple_class_name));
+
+        let return_type = if is_tuple_matrix_type(param_type) {
+            format!("Array<Array<{}>>", tuple_class_name)
+        } else if is_tuple_array_type(param_type) {
+            format!("Array<{}>", tuple_class_name)
+        } else {
+            tuple_class_name.clone()
+        };
+
+        let body = if is_tuple {
+            format!("return changetype<{}>({})", tuple_class_name, return_value)
+        } else {
+            format!("return {}", return_value)
+        };
+
+        // Generate tuple class from EventParam's components
+        // EventParam.components is Vec<Param>, same as Param.components
+        let components = &param.components;
+        if !components.is_empty() {
+            let mut tuple_class = ts::klass(&tuple_class_name)
+                .exported()
+                .extends("ethereum.Tuple");
+
+            let component_params = disambiguate_tuple_components(components);
+            for (idx, (component, component_name)) in component_params.iter().enumerate() {
+                let component_getter = self.generate_tuple_component_getter(
+                    component,
+                    component_name,
+                    idx,
+                    &tuple_identifier,
+                    tuple_classes,
+                );
+                tuple_class.add_method(component_getter);
+            }
+
+            tuple_classes.push(tuple_class);
+        }
+
+        Method::new(
+            format!("get {}", name),
+            vec![],
+            Some(ts::TypeExpr::Raw(return_type)),
+            body,
+        )
+    }
+
+    /// Generate a getter for a tuple component.
+    fn generate_tuple_component_getter(
+        &self,
+        param: &Param,
+        name: &str,
+        index: usize,
+        parent_class: &str,
+        tuple_classes: &mut Vec<Class>,
+    ) -> Method {
+        let param_type = resolve_param_type(param);
+        if contains_tuple_type(&param_type) {
+            self.generate_tuple_getter(
+                param,
+                &param_type,
+                name,
+                index,
+                parent_class,
+                "tuple",
+                "",
+                tuple_classes,
+            )
+        } else {
+            let asc_type = asc_type_for_ethereum(&param_type);
+            let access = format!("this[{}]", index);
+            let conversion = ethereum_to_asc(&access, &param_type, None);
+            Method::new(
+                format!("get {}", name),
+                vec![],
+                Some(ts::TypeExpr::Raw(asc_type)),
+                format!("return {}", conversion),
+            )
+        }
+    }
+
+    /// Generate methods for a callable function.
+    fn generate_function_methods(
+        &self,
+        func: &Function,
+        alias: &str,
+    ) -> (Method, Method, Vec<Class>) {
+        let mut result_classes = Vec::new();
+        let fn_signature = func.signature_compat();
+        let contract_name = &self.name;
+        let tuple_result_parent_type = [contract_name, "__", alias, "Result"].concat();
+        let tuple_input_parent_type = [contract_name, "__", alias, "Input"].concat();
+
+        // Disambiguate outputs
+        let outputs = self.disambiguate_params(&func.outputs, "value");
+
+        // Determine return type
+        let (return_type, simple_return_type) = if outputs.len() > 1 {
+            // Multiple outputs - create a result struct
+            let result_class = self.generate_result_class(
+                &outputs,
+                &tuple_result_parent_type,
+                &mut result_classes,
+            );
+            result_classes.push(result_class.clone());
+            (result_class.name.clone(), false)
+        } else if !outputs.is_empty() {
+            let (param, _) = &outputs[0];
+            let param_type = resolve_param_type(param);
+            if contains_tuple_type(&param_type) {
+                let tuple_name = self.generate_tuple_return_type(
+                    param,
+                    &param_type,
+                    0,
+                    &tuple_result_parent_type,
+                    &mut result_classes,
+                );
+                (tuple_name, true)
+            } else {
+                (asc_type_for_ethereum(&param_type), true)
+            }
+        } else {
+            ("void".to_string(), true)
+        };
+
+        // Disambiguate inputs
+        let inputs = self.disambiguate_params(&func.inputs, "param");
+
+        // Generate tuple types for inputs
+        for (index, (param, _)) in inputs.iter().enumerate() {
+            let param_type = resolve_param_type(param);
+            if contains_tuple_type(&param_type) {
+                self.generate_tuple_class_for_input(
+                    param,
+                    index,
+                    &tuple_input_parent_type,
+                    &mut result_classes,
+                );
+            }
+        }
+
+        // Build params
+        let params: Vec<TsParam> = inputs
+            .iter()
+            .enumerate()
+            .map(|(index, (param, name))| {
+                let p_type = resolve_param_type(param);
+                let param_type_str =
+                    get_param_type_for_input(&p_type, index, &tuple_input_parent_type);
+                TsParam::new(name.clone(), ts::TypeExpr::Raw(param_type_str))
+            })
+            .collect();
+
+        // Build call arguments
+        let call_args: Vec<String> = inputs
+            .iter()
+            .map(|(param, name)| {
+                let p_type = resolve_param_type(param);
+                ethereum_from_asc(name, &p_type)
+            })
+            .collect();
+
+        let func_name = &func.name;
+        let call_args_str = call_args.join(", ");
+        let super_inputs = format!("'{}', '{}', [{}]", func_name, fn_signature, call_args_str);
+
+        // Generate method body
+        let method_body = self.generate_call_body(
+            &outputs,
+            &return_type,
+            simple_return_type,
+            &super_inputs,
+            &tuple_result_parent_type,
+            false,
+        );
+
+        let try_method_body = self.generate_call_body(
+            &outputs,
+            &return_type,
+            simple_return_type,
+            &super_inputs,
+            &tuple_result_parent_type,
+            true,
+        );
+
+        let method = Method::new(
+            alias.to_string(),
+            params.clone(),
+            Some(ts::TypeExpr::Raw(return_type.clone())),
+            method_body,
+        );
+
+        let try_method = Method::new(
+            format!("try_{}", alias),
+            params,
+            Some(ts::TypeExpr::Raw(format!(
+                "ethereum.CallResult<{}>",
+                return_type
+            ))),
+            try_method_body,
+        );
+
+        (method, try_method, result_classes)
+    }
+
+    /// Generate call method body.
+    fn generate_call_body(
+        &self,
+        outputs: &[(&Param, String)],
+        return_type: &str,
+        simple_return_type: bool,
+        super_inputs: &str,
+        tuple_result_parent_type: &str,
+        is_try: bool,
+    ) -> String {
+        let nl = "\n";
+        let (call_stmt, result_var) = if is_try {
+            let mut lines = Vec::new();
+            lines.push(format!("let result = super.tryCall({})", super_inputs));
+            lines.push("    if (result.reverted) {".to_string());
+            lines.push("      return new ethereum.CallResult()".to_string());
+            lines.push("    }".to_string());
+            lines.push("    let value = result.value".to_string());
+            (lines.join(nl), "value")
+        } else {
+            (
+                format!("let result = super.call({})", super_inputs),
+                "result",
+            )
+        };
+
+        let return_val = if simple_return_type {
+            if outputs.is_empty() {
+                String::new()
+            } else {
+                let (param, _) = &outputs[0];
+                let p_type = resolve_param_type(param);
+                let tuple_name = if is_tuple_array_type(&p_type) {
+                    Some(tuple_type_name(0, tuple_result_parent_type))
+                } else {
+                    None
+                };
+                let val = ethereum_to_asc(
+                    &format!("{}[0]", result_var),
+                    &p_type,
+                    tuple_name.as_deref(),
+                );
+                if matches!(p_type, DynSolType::Tuple(_)) {
+                    format!("changetype<{}>({})", return_type, val)
+                } else {
+                    val
+                }
+            }
+        } else {
+            let conversions: Vec<String> = outputs
+                .iter()
+                .enumerate()
+                .map(|(index, (param, _))| {
+                    let p_type = resolve_param_type(param);
+                    let tuple_name = if is_tuple_array_type(&p_type) {
+                        Some(tuple_type_name(index, tuple_result_parent_type))
+                    } else {
+                        None
+                    };
+                    let val = ethereum_to_asc(
+                        &format!("{}[{}]", result_var, index),
+                        &p_type,
+                        tuple_name.as_deref(),
+                    );
+                    if matches!(p_type, DynSolType::Tuple(_)) {
+                        let tn = tuple_type_name(index, tuple_result_parent_type);
+                        format!("changetype<{}>({})", tn, val)
+                    } else {
+                        val
+                    }
+                })
+                .collect();
+            let conv_str = conversions.join(", ");
+            format!("new {}({})", return_type, conv_str)
+        };
+
+        if is_try {
+            [
+                &call_stmt,
+                nl,
+                "    return ethereum.CallResult.fromValue(",
+                &return_val,
+                ")",
+            ]
+            .concat()
+        } else if outputs.is_empty() {
+            call_stmt
+        } else {
+            [&call_stmt, nl, nl, "    return (", &return_val, ")"].concat()
+        }
+    }
+
+    /// Generate a result class for multiple outputs.
+    fn generate_result_class(
+        &self,
+        outputs: &[(&Param, String)],
+        tuple_result_parent_type: &str,
+        result_classes: &mut Vec<Class>,
+    ) -> Class {
+        let class_name = tuple_result_parent_type.to_string();
+        let mut klass = ts::klass(&class_name).exported();
+
+        // Add constructor
+        let constructor_params: Vec<TsParam> = outputs
+            .iter()
+            .enumerate()
+            .map(|(index, (param, _))| {
+                let p_type = resolve_param_type(param);
+                let param_type_str =
+                    get_param_type_for_input(&p_type, index, tuple_result_parent_type);
+                TsParam::new(format!("value{}", index), ts::TypeExpr::Raw(param_type_str))
+            })
+            .collect();
+
+        let nl = "\n";
+        let constructor_body: Vec<String> = outputs
+            .iter()
+            .enumerate()
+            .map(|(index, _)| format!("this.value{} = value{}", index, index))
+            .collect();
+
+        klass.add_method(Method::new(
+            "constructor",
+            constructor_params,
+            None,
+            constructor_body.join(&format!("{}    ", nl)),
+        ));
+
+        // Add toMap method
+        let map_entries: Vec<String> = outputs
+            .iter()
+            .enumerate()
+            .map(|(index, (param, _))| {
+                let p_type = resolve_param_type(param);
+                let this_val = format!("this.value{}", index);
+                let from_asc = ethereum_from_asc(&this_val, &p_type);
+                format!("map.set('value{}', {})", index, from_asc)
+            })
+            .collect();
+
+        let map_body = [
+            "let map = new TypedMap<string,ethereum.Value>()",
+            nl,
+            "    ",
+            &map_entries.join(&format!("{}    ", nl)),
+            nl,
+            "    return map",
+        ]
+        .concat();
+
+        klass.add_method(Method::new(
+            "toMap",
+            vec![],
+            Some(ts::TypeExpr::Raw(
+                "TypedMap<string,ethereum.Value>".to_string(),
+            )),
+            map_body,
+        ));
+
+        // Add members
+        for (index, (param, _)) in outputs.iter().enumerate() {
+            let p_type = resolve_param_type(param);
+            let param_type_str = get_param_type_for_input(&p_type, index, tuple_result_parent_type);
+            klass.add_member(ClassMember::new(format!("value{}", index), param_type_str));
+        }
+
+        // Add getters for outputs
+        for (index, (param, _)) in outputs.iter().enumerate() {
+            let getter_name = if param.name.trim().is_empty() {
+                format!("getValue{}", index)
+            } else {
+                let cap = capitalize(&param.name);
+                format!("get{}", cap)
+            };
+            let p_type = resolve_param_type(param);
+            let param_type_str = get_param_type_for_input(&p_type, index, tuple_result_parent_type);
+            klass.add_method(Method::new(
+                getter_name,
+                vec![],
+                Some(ts::TypeExpr::Raw(param_type_str)),
+                format!("return this.value{}", index),
+            ));
+        }
+
+        // Generate tuple classes for outputs
+        for (index, (param, _)) in outputs.iter().enumerate() {
+            let p_type = resolve_param_type(param);
+            if contains_tuple_type(&p_type) {
+                self.generate_tuple_class_for_input(
+                    param,
+                    index,
+                    tuple_result_parent_type,
+                    result_classes,
+                );
+            }
+        }
+
+        klass
+    }
+
+    /// Generate tuple return type name and classes.
+    fn generate_tuple_return_type(
+        &self,
+        param: &Param,
+        param_type: &DynSolType,
+        index: usize,
+        parent_type: &str,
+        result_classes: &mut Vec<Class>,
+    ) -> String {
+        self.generate_tuple_class_for_input(param, index, parent_type, result_classes);
+        let tn = tuple_type_name(index, parent_type);
+        if is_tuple_array_type(param_type) {
+            format!("Array<{}>", tn)
+        } else if is_tuple_matrix_type(param_type) {
+            format!("Array<Array<{}>>", tn)
+        } else {
+            tn
+        }
+    }
+
+    /// Generate tuple class for an input/output.
+    fn generate_tuple_class_for_input(
+        &self,
+        param: &Param,
+        index: usize,
+        parent_type: &str,
+        result_classes: &mut Vec<Class>,
+    ) {
+        let tuple_class_name = tuple_type_name(index, parent_type);
+        let mut tuple_class = ts::klass(&tuple_class_name)
+            .exported()
+            .extends("ethereum.Tuple");
+
+        let components = get_tuple_param_components(param);
+        if !components.is_empty() {
+            let component_params = disambiguate_tuple_components(components);
+            for (idx, (component, component_name)) in component_params.iter().enumerate() {
+                let component_type = resolve_param_type(component);
+                let getter = if contains_tuple_type(&component_type) {
+                    // Recursively generate tuple classes
+                    let cap = capitalize(&format!("{}", index));
+                    let nested_parent = format!("{}Value{}", parent_type, cap);
+                    self.generate_tuple_class_for_input(
+                        component,
+                        idx,
+                        &nested_parent,
+                        result_classes,
+                    );
+                    let nested_tuple_name = tuple_type_name(idx, &nested_parent);
+                    let access = format!("this[{}]", idx);
+                    let conversion =
+                        ethereum_to_asc(&access, &component_type, Some(&nested_tuple_name));
+                    let return_type = if is_tuple_array_type(&component_type) {
+                        format!("Array<{}>", nested_tuple_name)
+                    } else {
+                        nested_tuple_name.clone()
+                    };
+                    let body = if matches!(component_type, DynSolType::Tuple(_)) {
+                        format!("return changetype<{}>({})", nested_tuple_name, conversion)
+                    } else {
+                        format!("return {}", conversion)
+                    };
+                    Method::new(
+                        format!("get {}", component_name),
+                        vec![],
+                        Some(ts::TypeExpr::Raw(return_type)),
+                        body,
+                    )
+                } else {
+                    let asc_type = asc_type_for_ethereum(&component_type);
+                    let access = format!("this[{}]", idx);
+                    let conversion = ethereum_to_asc(&access, &component_type, None);
+                    Method::new(
+                        format!("get {}", component_name),
+                        vec![],
+                        Some(ts::TypeExpr::Raw(asc_type)),
+                        format!("return {}", conversion),
+                    )
+                };
+                tuple_class.add_method(getter);
+            }
+        }
+
+        result_classes.push(tuple_class);
+    }
+
+    /// Get callable functions (view, pure, nonpayable, constant with outputs).
+    fn get_callable_functions(&self) -> Vec<&Function> {
+        self.contract
+            .functions()
+            .filter(|f| {
+                !f.outputs.is_empty()
+                    && matches!(
+                        f.state_mutability,
+                        StateMutability::View | StateMutability::Pure | StateMutability::NonPayable
+                    )
+            })
+            .collect()
+    }
+
+    /// Get functions that can be used as calls (non-view, non-pure functions).
+    fn get_call_functions(&self) -> Vec<&Function> {
+        self.contract
+            .functions()
+            .filter(|f| {
+                matches!(
+                    f.state_mutability,
+                    StateMutability::NonPayable | StateMutability::Payable
+                )
+            })
+            .collect()
+    }
+
+    /// Disambiguate events with duplicate names.
+    fn disambiguate_events(&self) -> Vec<(&Event, String)> {
+        let mut result = Vec::new();
+        let mut collision_counter: HashMap<String, u32> = HashMap::new();
+
+        for event in self.contract.events() {
+            let name = handle_reserved_word(&event.name);
+            let counter = collision_counter.entry(name.clone()).or_insert(0);
+            let alias = if *counter == 0 {
+                name.clone()
+            } else {
+                format!("{}{}", name, counter)
+            };
+            *counter += 1;
+            result.push((event, alias));
+        }
+
+        result
+    }
+
+    /// Disambiguate functions.
+    fn disambiguate_functions<'a>(
+        &self,
+        functions: &[&'a Function],
+    ) -> Vec<(&'a Function, String)> {
+        let mut result = Vec::new();
+        let mut collision_counter: HashMap<String, u32> = HashMap::new();
+
+        for func in functions {
+            let name = handle_reserved_word(&func.name);
+            let counter = collision_counter.entry(name.clone()).or_insert(0);
+            let alias = if *counter == 0 {
+                name.clone()
+            } else {
+                format!("{}{}", name, counter)
+            };
+            *counter += 1;
+            result.push((*func, alias));
+        }
+
+        result
+    }
+
+    /// Disambiguate call functions.
+    fn disambiguate_call_functions<'a>(
+        &self,
+        functions: &[&'a Function],
+    ) -> Vec<(&'a Function, String)> {
+        let mut result = Vec::new();
+        let mut collision_counter: HashMap<String, u32> = HashMap::new();
+
+        for func in functions {
+            let name = if func.name.is_empty() {
+                "default".to_string()
+            } else {
+                handle_reserved_word(&func.name)
+            };
+            let counter = collision_counter.entry(name.clone()).or_insert(0);
+            let alias = if *counter == 0 {
+                name.clone()
+            } else {
+                format!("{}{}", name, counter)
+            };
+            *counter += 1;
+            result.push((*func, alias));
+        }
+
+        result
+    }
+
+    /// Disambiguate event params.
+    fn disambiguate_event_params<'a>(
+        &self,
+        params: &'a [EventParam],
+        default_prefix: &str,
+    ) -> Vec<(&'a EventParam, String)> {
+        let mut result = Vec::new();
+        let mut collision_counter: HashMap<String, u32> = HashMap::new();
+
+        for (index, param) in params.iter().enumerate() {
+            let name = if param.name.is_empty() {
+                format!("{}{}", default_prefix, index)
+            } else {
+                handle_reserved_word(&param.name)
+            };
+            let counter = collision_counter.entry(name.clone()).or_insert(0);
+            let disambiguated = if *counter == 0 {
+                name.clone()
+            } else {
+                format!("{}{}", name, counter)
+            };
+            *counter += 1;
+            result.push((param, disambiguated));
+        }
+
+        result
+    }
+
+    /// Disambiguate function params.
+    fn disambiguate_params<'a>(
+        &self,
+        params: &'a [Param],
+        default_prefix: &str,
+    ) -> Vec<(&'a Param, String)> {
+        let mut result = Vec::new();
+        let mut collision_counter: HashMap<String, u32> = HashMap::new();
+
+        for (index, param) in params.iter().enumerate() {
+            let name = if param.name.is_empty() {
+                format!("{}{}", default_prefix, index)
+            } else {
+                handle_reserved_word(&param.name)
+            };
+            let counter = collision_counter.entry(name.clone()).or_insert(0);
+            let disambiguated = if *counter == 0 {
+                name.clone()
+            } else {
+                format!("{}{}", name, counter)
+            };
+            *counter += 1;
+            result.push((param, disambiguated));
+        }
+
+        result
+    }
+}
+
+/// Get tuple type name for a param.
+fn tuple_type_name(index: usize, parent_type: &str) -> String {
+    format!("{}Value{}Struct", parent_type, index)
+}
+
+/// Get the param type string for an input, handling tuples.
+fn get_param_type_for_input(param_type: &DynSolType, index: usize, parent_type: &str) -> String {
+    if matches!(param_type, DynSolType::Tuple(_)) {
+        tuple_type_name(index, parent_type)
+    } else if is_tuple_matrix_type(param_type) {
+        let tn = tuple_type_name(index, parent_type);
+        format!("Array<Array<{}>>", tn)
+    } else if is_tuple_array_type(param_type) {
+        let tn = tuple_type_name(index, parent_type);
+        format!("Array<{}>", tn)
+    } else {
+        asc_type_for_ethereum(param_type)
+    }
+}
+
+/// Get the tuple components from a `Param`, following through arrays.
+/// Returns the `components` from the innermost tuple `Param`.
+fn get_tuple_param_components(param: &Param) -> &[Param] {
+    // If this param has components directly (tuple type), return them
+    if !param.components.is_empty() {
+        return &param.components;
+    }
+    // For array-of-tuple types, the components are on the param itself
+    // (alloy stores them on the outer param for tuple[] types)
+    &[]
+}
+
+/// Disambiguate tuple components, reading names directly from `Param.name`.
+fn disambiguate_tuple_components(components: &[Param]) -> Vec<(&Param, String)> {
+    components
+        .iter()
+        .enumerate()
+        .map(|(index, component)| {
+            let name = if component.name.is_empty() {
+                format!("value{}", index)
+            } else {
+                component.name.clone()
+            };
+            (component, name)
+        })
+        .collect()
+}
+
+/// Get AssemblyScript type for an Ethereum type.
+fn asc_type_for_ethereum(param_type: &DynSolType) -> String {
+    match param_type {
+        DynSolType::Address => "Address".to_string(),
+        DynSolType::Bool => "boolean".to_string(),
+        DynSolType::Bytes => "Bytes".to_string(),
+        DynSolType::FixedBytes(_) => "Bytes".to_string(),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                "i32".to_string()
+            } else {
+                "BigInt".to_string()
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                "i32".to_string()
+            } else {
+                "BigInt".to_string()
+            }
+        }
+        DynSolType::String => "string".to_string(),
+        DynSolType::Array(inner) => {
+            let inner_type = asc_type_for_ethereum(inner);
+            format!("Array<{}>", inner_type)
+        }
+        DynSolType::FixedArray(inner, _) => {
+            let inner_type = asc_type_for_ethereum(inner);
+            format!("Array<{}>", inner_type)
+        }
+        DynSolType::Tuple(_) => "ethereum.Tuple".to_string(),
+        _ => "ethereum.Tuple".to_string(), // Function and other future variants
+    }
+}
+
+/// Convert ethereum value to AssemblyScript.
+fn ethereum_to_asc(code: &str, param_type: &DynSolType, tuple_type: Option<&str>) -> String {
+    match param_type {
+        DynSolType::Address => format!("{}.toAddress()", code),
+        DynSolType::Bool => format!("{}.toBoolean()", code),
+        DynSolType::Bytes | DynSolType::FixedBytes(_) => format!("{}.toBytes()", code),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                format!("{}.toI32()", code)
+            } else {
+                format!("{}.toBigInt()", code)
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                format!("{}.toI32()", code)
+            } else {
+                format!("{}.toBigInt()", code)
+            }
+        }
+        DynSolType::String => format!("{}.toString()", code),
+        DynSolType::Array(inner) | DynSolType::FixedArray(inner, _) => match inner.as_ref() {
+            DynSolType::Address => format!("{}.toAddressArray()", code),
+            DynSolType::Bool => format!("{}.toBooleanArray()", code),
+            DynSolType::Bytes | DynSolType::FixedBytes(_) => {
+                format!("{}.toBytesArray()", code)
+            }
+            DynSolType::Int(bits) => {
+                if *bits <= 32 {
+                    format!("{}.toI32Array()", code)
+                } else {
+                    format!("{}.toBigIntArray()", code)
+                }
+            }
+            DynSolType::Uint(bits) => {
+                if *bits <= 24 {
+                    format!("{}.toI32Array()", code)
+                } else {
+                    format!("{}.toBigIntArray()", code)
+                }
+            }
+            DynSolType::String => format!("{}.toStringArray()", code),
+            DynSolType::Tuple(_) => {
+                if let Some(tuple_name) = tuple_type {
+                    format!("{}.toTupleArray<{}>()", code, tuple_name)
+                } else {
+                    format!("{}.toTupleArray<ethereum.Tuple>()", code)
+                }
+            }
+            DynSolType::Array(inner2) | DynSolType::FixedArray(inner2, _) => {
+                ethereum_to_asc_matrix(code, inner2.as_ref(), tuple_type)
+            }
+            _ => format!("{}.toString()", code), // fallback for Function etc.
+        },
+        DynSolType::Tuple(_) => format!("{}.toTuple()", code),
+        _ => format!("{}.toTuple()", code), // fallback for Function etc.
+    }
+}
+
+/// Convert matrix type to AssemblyScript.
+fn ethereum_to_asc_matrix(code: &str, inner_type: &DynSolType, tuple_type: Option<&str>) -> String {
+    match inner_type {
+        DynSolType::Address => format!("{}.toAddressMatrix()", code),
+        DynSolType::Bool => format!("{}.toBooleanMatrix()", code),
+        DynSolType::Bytes | DynSolType::FixedBytes(_) => format!("{}.toBytesMatrix()", code),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                format!("{}.toI32Matrix()", code)
+            } else {
+                format!("{}.toBigIntMatrix()", code)
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                format!("{}.toI32Matrix()", code)
+            } else {
+                format!("{}.toBigIntMatrix()", code)
+            }
+        }
+        DynSolType::String => format!("{}.toStringMatrix()", code),
+        DynSolType::Tuple(_) => {
+            if let Some(tuple_name) = tuple_type {
+                format!("{}.toTupleMatrix<{}>()", code, tuple_name)
+            } else {
+                format!("{}.toTupleMatrix<ethereum.Tuple>()", code)
+            }
+        }
+        _ => format!("{}.toStringMatrix()", code), // fallback
+    }
+}
+
+/// Convert AssemblyScript value to ethereum value.
+fn ethereum_from_asc(code: &str, param_type: &DynSolType) -> String {
+    match param_type {
+        DynSolType::Address => format!("ethereum.Value.fromAddress({})", code),
+        DynSolType::Bool => format!("ethereum.Value.fromBoolean({})", code),
+        DynSolType::Bytes => format!("ethereum.Value.fromBytes({})", code),
+        DynSolType::FixedBytes(_) => format!("ethereum.Value.fromFixedBytes({})", code),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                format!("ethereum.Value.fromI32({})", code)
+            } else {
+                format!("ethereum.Value.fromSignedBigInt({})", code)
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                format!(
+                    "ethereum.Value.fromUnsignedBigInt(BigInt.fromI32({}))",
+                    code
+                )
+            } else {
+                format!("ethereum.Value.fromUnsignedBigInt({})", code)
+            }
+        }
+        DynSolType::String => format!("ethereum.Value.fromString({})", code),
+        DynSolType::Array(inner) | DynSolType::FixedArray(inner, _) => {
+            ethereum_from_asc_array(code, inner.as_ref())
+        }
+        DynSolType::Tuple(_) => format!("ethereum.Value.fromTuple({})", code),
+        _ => format!("ethereum.Value.fromTuple({})", code), // fallback
+    }
+}
+
+/// Convert array to ethereum value.
+fn ethereum_from_asc_array(code: &str, inner_type: &DynSolType) -> String {
+    match inner_type {
+        DynSolType::Address => format!("ethereum.Value.fromAddressArray({})", code),
+        DynSolType::Bool => format!("ethereum.Value.fromBooleanArray({})", code),
+        DynSolType::Bytes => format!("ethereum.Value.fromBytesArray({})", code),
+        DynSolType::FixedBytes(_) => format!("ethereum.Value.fromFixedBytesArray({})", code),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                format!("ethereum.Value.fromI32Array({})", code)
+            } else {
+                format!("ethereum.Value.fromSignedBigIntArray({})", code)
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                format!("ethereum.Value.fromI32Array({})", code)
+            } else {
+                format!("ethereum.Value.fromUnsignedBigIntArray({})", code)
+            }
+        }
+        DynSolType::String => format!("ethereum.Value.fromStringArray({})", code),
+        DynSolType::Tuple(_) => format!("ethereum.Value.fromTupleArray({})", code),
+        DynSolType::Array(inner2) | DynSolType::FixedArray(inner2, _) => {
+            ethereum_from_asc_matrix(code, inner2.as_ref())
+        }
+        _ => format!("ethereum.Value.fromStringArray({})", code), // fallback
+    }
+}
+
+/// Convert matrix to ethereum value.
+fn ethereum_from_asc_matrix(code: &str, inner_type: &DynSolType) -> String {
+    match inner_type {
+        DynSolType::Address => format!("ethereum.Value.fromAddressMatrix({})", code),
+        DynSolType::Bool => format!("ethereum.Value.fromBooleanMatrix({})", code),
+        DynSolType::Bytes => format!("ethereum.Value.fromBytesMatrix({})", code),
+        DynSolType::FixedBytes(_) => format!("ethereum.Value.fromFixedBytesMatrix({})", code),
+        DynSolType::Int(bits) => {
+            if *bits <= 32 {
+                format!("ethereum.Value.fromI32Matrix({})", code)
+            } else {
+                format!("ethereum.Value.fromSignedBigIntMatrix({})", code)
+            }
+        }
+        DynSolType::Uint(bits) => {
+            if *bits <= 24 {
+                format!("ethereum.Value.fromI32Matrix({})", code)
+            } else {
+                format!("ethereum.Value.fromUnsignedBigIntMatrix({})", code)
+            }
+        }
+        DynSolType::String => format!("ethereum.Value.fromStringMatrix({})", code),
+        DynSolType::Tuple(_) => format!("ethereum.Value.fromTupleMatrix({})", code),
+        _ => format!("ethereum.Value.fromStringMatrix({})", code), // fallback
+    }
+}
+
+/// Check if param type contains a tuple.
+fn contains_tuple_type(param_type: &DynSolType) -> bool {
+    match param_type {
+        DynSolType::Tuple(_) => true,
+        DynSolType::Array(inner) | DynSolType::FixedArray(inner, _) => contains_tuple_type(inner),
+        _ => false,
+    }
+}
+
+/// Check if param type is a tuple array.
+fn is_tuple_array_type(param_type: &DynSolType) -> bool {
+    matches!(
+        param_type,
+        DynSolType::Array(inner) | DynSolType::FixedArray(inner, _)
+            if matches!(inner.as_ref(), DynSolType::Tuple(_))
+    )
+}
+
+/// Check if param type is a tuple matrix (2D array).
+fn is_tuple_matrix_type(param_type: &DynSolType) -> bool {
+    match param_type {
+        DynSolType::Array(inner) | DynSolType::FixedArray(inner, _) => is_tuple_array_type(inner),
+        _ => false,
+    }
+}
+
+/// Handle indexed input type conversion.
+fn indexed_input_type(param_type: &DynSolType) -> DynSolType {
+    // Strings, bytes, and arrays are encoded and hashed to bytes32
+    match param_type {
+        DynSolType::String | DynSolType::Bytes | DynSolType::Tuple(_) => DynSolType::FixedBytes(32),
+        DynSolType::Array(_) | DynSolType::FixedArray(_, _) => DynSolType::FixedBytes(32),
+        _ => param_type.clone(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    fn parse_abi(json: &str) -> JsonAbi {
+        serde_json::from_str(json).unwrap()
+    }
+
+    #[test]
+    fn test_simple_event() {
+        let abi_json = r#"[
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ],
+                "anonymous": false
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
+
+        assert!(types.iter().any(|c| c.name == "Transfer"));
+        assert!(types.iter().any(|c| c.name == "Transfer__Params"));
+    }
+
+    #[test]
+    fn test_function_with_outputs() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "balanceOf",
+                "inputs": [{"name": "owner", "type": "address"}],
+                "outputs": [{"name": "", "type": "uint256"}],
+                "stateMutability": "view"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
+
+        assert!(types.iter().any(|c| c.name == "Token"));
+        let token_class = types.iter().find(|c| c.name == "Token").unwrap();
+
+        assert!(token_class.methods.iter().any(|m| m.name == "balanceOf"));
+        assert!(
+            token_class
+                .methods
+                .iter()
+                .any(|m| m.name == "try_balanceOf")
+        );
+    }
+
+    #[test]
+    fn test_asc_type_for_ethereum() {
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Address), "Address");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Bool), "boolean");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Uint(256)), "BigInt");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Uint(8)), "i32");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Int(32)), "i32");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::String), "string");
+        assert_eq!(asc_type_for_ethereum(&DynSolType::Bytes), "Bytes");
+    }
+
+    #[test]
+    fn test_name_sanitization() {
+        let generator = AbiCodeGenerator::new(JsonAbi::default(), "Test!Contract@Name");
+        assert_eq!(generator.name, "Test_Contract_Name");
+    }
+
+    #[test]
+    fn test_indexed_input_type() {
+        assert_eq!(
+            indexed_input_type(&DynSolType::String),
+            DynSolType::FixedBytes(32)
+        );
+        assert_eq!(
+            indexed_input_type(&DynSolType::Bytes),
+            DynSolType::FixedBytes(32)
+        );
+        assert_eq!(
+            indexed_input_type(&DynSolType::Array(Box::new(DynSolType::Uint(256)))),
+            DynSolType::FixedBytes(32)
+        );
+        assert_eq!(
+            indexed_input_type(&DynSolType::Address),
+            DynSolType::Address
+        );
+        assert_eq!(
+            indexed_input_type(&DynSolType::Uint(256)),
+            DynSolType::Uint(256)
+        );
+    }
+
+    /// Test that overloaded events (same name, different inputs) are disambiguated.
+    /// The TS CLI generates unique names like Transfer, Transfer1, Transfer2.
+    #[test]
+    fn test_overloaded_events() {
+        let abi_json = r#"[
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [],
+                "anonymous": false
+            },
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [{"name": "to", "type": "address", "indexed": false}],
+                "anonymous": false
+            },
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": false},
+                    {"name": "to", "type": "address", "indexed": false}
+                ],
+                "anonymous": false
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
+
+        // Get all event class names
+        let event_names: Vec<&str> = types
+            .iter()
+            .filter(|c| c.extends == Some("ethereum.Event".to_string()))
+            .map(|c| c.name.as_str())
+            .collect();
+
+        // Verify we have 3 distinct Transfer events with disambiguation
+        assert_eq!(
+            event_names.len(),
+            3,
+            "Should have 3 Transfer event variants"
+        );
+
+        // Check that Transfer (with no suffix) exists
+        assert!(
+            event_names.contains(&"Transfer"),
+            "Should have base Transfer event"
+        );
+
+        // Check that numbered variants exist (Transfer1, Transfer2)
+        assert!(
+            event_names.contains(&"Transfer1"),
+            "Should have Transfer1 event"
+        );
+        assert!(
+            event_names.contains(&"Transfer2"),
+            "Should have Transfer2 event"
+        );
+    }
+
+    /// Test that overloaded functions are disambiguated.
+    #[test]
+    fn test_overloaded_functions() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "getSomething",
+                "inputs": [],
+                "outputs": [{"name": "result", "type": "bytes32"}],
+                "stateMutability": "view"
+            },
+            {
+                "type": "function",
+                "name": "getSomething",
+                "inputs": [{"name": "owner", "type": "address"}],
+                "outputs": [{"name": "result", "type": "bytes32"}],
+                "stateMutability": "view"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
+
+        // Find the Token contract class
+        let token_class = types.iter().find(|c| c.name == "Token").unwrap();
+
+        // Get all method names (excluding try_ variants and bind)
+        let method_names: Vec<&str> = token_class
+            .methods
+            .iter()
+            .map(|m| m.name.as_str())
+            .filter(|n| !n.starts_with("try_") && *n != "bind")
+            .collect();
+
+        // Verify we have disambiguated getSomething variants
+        assert!(
+            method_names.contains(&"getSomething"),
+            "Should have base getSomething method"
+        );
+        assert!(
+            method_names.contains(&"getSomething1"),
+            "Should have getSomething1 method"
+        );
+    }
+
+    /// Test that tuple/struct types in function inputs and outputs are handled correctly.
+    #[test]
+    fn test_tuple_types_in_functions() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "doSomething",
+                "inputs": [
+                    {
+                        "name": "data",
+                        "type": "tuple",
+                        "components": [
+                            {"name": "owner", "type": "address"},
+                            {"name": "value", "type": "uint256"}
+                        ]
+                    }
+                ],
+                "outputs": [
+                    {
+                        "name": "result",
+                        "type": "tuple",
+                        "components": [
+                            {"name": "success", "type": "bool"},
+                            {"name": "newValue", "type": "uint256"}
+                        ]
+                    }
+                ],
+                "stateMutability": "nonpayable"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "TestContract");
+        let types = generator.generate_types();
+
+        // Get class names
+        let class_names: Vec<&str> = types.iter().map(|c| c.name.as_str()).collect();
+
+        // Should have main contract class
+        assert!(
+            class_names.contains(&"TestContract"),
+            "Should have TestContract class"
+        );
+
+        // Should have struct classes for input and output tuples
+        // Input struct: TestContract__doSomethingInputValue0Struct
+        // Output struct: TestContract__doSomethingResultValue0Struct
+        let has_input_struct = class_names
+            .iter()
+            .any(|n| n.contains("Input") && n.contains("Struct"));
+        let has_output_struct = class_names
+            .iter()
+            .any(|n| n.contains("Result") && n.contains("Struct"));
+
+        assert!(
+            has_input_struct,
+            "Should have input struct class, found: {:?}",
+            class_names
+        );
+        assert!(
+            has_output_struct,
+            "Should have output/result struct class, found: {:?}",
+            class_names
+        );
+
+        // Verify the output struct extends ethereum.Tuple
+        let output_struct = types
+            .iter()
+            .find(|c| c.name.contains("Result") && c.name.contains("Struct"))
+            .expect("Should find output struct");
+        assert_eq!(
+            output_struct.extends,
+            Some("ethereum.Tuple".to_string()),
+            "Output struct should extend ethereum.Tuple"
+        );
+
+        // Verify the output struct has getters for its components
+        // With alloy, component names are preserved from the ABI
+        let method_names: Vec<&str> = output_struct
+            .methods
+            .iter()
+            .map(|m| m.name.as_str())
+            .collect();
+        assert!(
+            method_names.iter().any(|n| n.contains("success")),
+            "Should have success getter for first component, found methods: {:?}",
+            method_names
+        );
+        assert!(
+            method_names.iter().any(|n| n.contains("newValue")),
+            "Should have newValue getter for second component, found methods: {:?}",
+            method_names
+        );
+    }
+
+    /// Test that tuple types in events are handled correctly.
+    #[test]
+    fn test_tuple_types_in_events() {
+        let abi_json = r#"[
+            {
+                "type": "event",
+                "name": "DataUpdated",
+                "inputs": [
+                    {"name": "id", "type": "uint256", "indexed": true},
+                    {
+                        "name": "data",
+                        "type": "tuple",
+                        "indexed": false,
+                        "components": [
+                            {"name": "timestamp", "type": "uint256"},
+                            {"name": "value", "type": "bytes32"}
+                        ]
+                    }
+                ],
+                "anonymous": false
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "TestContract");
+        let types = generator.generate_types();
+
+        // Get class names
+        let class_names: Vec<&str> = types.iter().map(|c| c.name.as_str()).collect();
+
+        // Should have event class
+        assert!(
+            class_names.contains(&"DataUpdated"),
+            "Should have DataUpdated event class"
+        );
+
+        // Should have params class
+        assert!(
+            class_names.contains(&"DataUpdated__Params"),
+            "Should have DataUpdated__Params class"
+        );
+
+        // Should have struct class for the tuple parameter
+        let has_struct = class_names
+            .iter()
+            .any(|n| n.contains("Struct") && n.contains("DataUpdated"));
+        assert!(
+            has_struct,
+            "Should have struct class for tuple parameter, found: {:?}",
+            class_names
+        );
+    }
+
+    /// Test that nested tuple types (struct with struct field) are handled.
+    #[test]
+    fn test_nested_tuple_types() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "getNestedData",
+                "inputs": [],
+                "outputs": [
+                    {
+                        "name": "result",
+                        "type": "tuple",
+                        "components": [
+                            {"name": "id", "type": "uint256"},
+                            {
+                                "name": "inner",
+                                "type": "tuple",
+                                "components": [
+                                    {"name": "x", "type": "uint256"},
+                                    {"name": "y", "type": "uint256"}
+                                ]
+                            }
+                        ]
+                    }
+                ],
+                "stateMutability": "view"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "TestContract");
+        let types = generator.generate_types();
+
+        // Get class names
+        let class_names: Vec<&str> = types.iter().map(|c| c.name.as_str()).collect();
+
+        // Should have main contract class
+        assert!(
+            class_names.contains(&"TestContract"),
+            "Should have TestContract class"
+        );
+
+        // Should have at least two struct classes (outer and inner)
+        let struct_count = class_names.iter().filter(|n| n.contains("Struct")).count();
+        assert!(
+            struct_count >= 2,
+            "Should have at least 2 struct classes for nested tuple, found {} in {:?}",
+            struct_count,
+            class_names
+        );
+    }
+
+    /// Test that tuple arrays are handled correctly.
+    #[test]
+    fn test_tuple_array_types() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "getAllItems",
+                "inputs": [],
+                "outputs": [
+                    {
+                        "name": "items",
+                        "type": "tuple[]",
+                        "components": [
+                            {"name": "id", "type": "uint256"},
+                            {"name": "name", "type": "string"}
+                        ]
+                    }
+                ],
+                "stateMutability": "view"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "TestContract");
+        let types = generator.generate_types();
+
+        // Find the contract class
+        let contract_class = types.iter().find(|c| c.name == "TestContract").unwrap();
+
+        // Find the getAllItems method
+        let method = contract_class
+            .methods
+            .iter()
+            .find(|m| m.name == "getAllItems")
+            .expect("Should have getAllItems method");
+
+        // The return type should be an Array of the struct type
+        let return_type = method
+            .return_type
+            .as_ref()
+            .expect("Should have return type");
+        let return_type_str = return_type.to_string();
+        assert!(
+            return_type_str.starts_with("Array<"),
+            "Return type should be Array<...>, got: {}",
+            return_type_str
+        );
+    }
+
+    /// Test that array types in events are handled correctly.
+    #[test]
+    fn test_array_types_in_events() {
+        let abi_json = r#"[
+            {
+                "type": "event",
+                "name": "Airdropped",
+                "inputs": [
+                    {"name": "sender", "type": "address", "indexed": true},
+                    {"name": "recipients", "type": "address[]", "indexed": false},
+                    {"name": "amounts", "type": "uint256[]", "indexed": false}
+                ],
+                "anonymous": false
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
+
+        // Find the params class
+        let params_class = types
+            .iter()
+            .find(|c| c.name == "Airdropped__Params")
+            .expect("Should have Airdropped__Params class");
+
+        // Check that the array getters exist and have correct return types
+        let method_names: Vec<&str> = params_class
+            .methods
+            .iter()
+            .map(|m| m.name.as_str())
+            .collect();
+
+        assert!(
+            method_names.iter().any(|n| n.contains("recipients")),
+            "Should have recipients getter, found: {:?}",
+            method_names
+        );
+        assert!(
+            method_names.iter().any(|n| n.contains("amounts")),
+            "Should have amounts getter, found: {:?}",
+            method_names
+        );
+
+        // Verify the recipients getter returns Array<Address>
+        let recipients_getter = params_class
+            .methods
+            .iter()
+            .find(|m| m.name.contains("recipients"))
+            .expect("Should have recipients getter");
+        let return_type_str = recipients_getter
+            .return_type
+            .as_ref()
+            .expect("Should have return type")
+            .to_string();
+        assert!(
+            return_type_str.contains("Array<Address>"),
+            "recipients should return Array<Address>, got: {}",
+            return_type_str
+        );
+
+        // Verify the amounts getter returns Array<BigInt>
+        let amounts_getter = params_class
+            .methods
+            .iter()
+            .find(|m| m.name.contains("amounts"))
+            .expect("Should have amounts getter");
+        let amounts_type_str = amounts_getter
+            .return_type
+            .as_ref()
+            .expect("Should have return type")
+            .to_string();
+        assert!(
+            amounts_type_str.contains("Array<BigInt>"),
+            "amounts should return Array<BigInt>, got: {}",
+            amounts_type_str
+        );
+    }
+
+    /// Test that 2D array types (matrices) are handled correctly in functions.
+    #[test]
+    fn test_matrix_types_in_functions() {
+        let abi_json = r#"[
+            {
+                "type": "function",
+                "name": "getMatrix",
+                "inputs": [],
+                "outputs": [
+                    {"name": "data", "type": "uint256[][]"}
+                ],
+                "stateMutability": "view"
+            }
+        ]"#;
+
+        let contract = parse_abi(abi_json);
+        let generator = AbiCodeGenerator::new(contract, "TestContract");
+        let types = generator.generate_types();
+
+        // Find the contract class
+        let contract_class = types.iter().find(|c| c.name == "TestContract").unwrap();
+
+        // Find the getMatrix method
+        let method = contract_class
+            .methods
+            .iter()
+            .find(|m| m.name == "getMatrix")
+            .expect("Should have getMatrix method");
+
+        // The return type should be Array<Array<BigInt>>
+        let return_type = method
+            .return_type
+            .as_ref()
+            .expect("Should have return type");
+        let return_type_str = return_type.to_string();
+        assert!(
+            return_type_str.contains("Array<Array<BigInt>>"),
+            "Return type should be Array<Array<BigInt>>, got: {}",
+            return_type_str
+        );
+    }
+}
diff --git a/gnd/src/codegen/mod.rs b/gnd/src/codegen/mod.rs
new file mode 100644
index 00000000000..4c8f5fdbd98
--- /dev/null
+++ b/gnd/src/codegen/mod.rs
@@ -0,0 +1,20 @@
+//! Code generation for subgraph AssemblyScript types.
+//!
+//! This module generates AssemblyScript types from:
+//! - GraphQL schema (entity classes)
+//! - Contract ABIs (event and call bindings)
+//! - Data source templates
+
+mod abi;
+mod schema;
+mod template;
+mod types;
+mod typescript;
+
+pub use abi::AbiCodeGenerator;
+pub use schema::SchemaCodeGenerator;
+pub use template::{Template, TemplateCodeGenerator, TemplateKind};
+pub use typescript::{
+    ArrayType, Class, ClassMember, GENERATED_FILE_NOTE, Method, ModuleImports, NamedType,
+    NullableType, Param, StaticMethod,
+};
diff --git a/gnd/src/codegen/schema.rs b/gnd/src/codegen/schema.rs
new file mode 100644
index 00000000000..a8a276f1ca0
--- /dev/null
+++ b/gnd/src/codegen/schema.rs
@@ -0,0 +1,1289 @@
+//! Schema code generation.
+//!
+//! Generates AssemblyScript entity classes from GraphQL schemas.
+
+use anyhow::{Result, anyhow};
+use graphql_tools::parser::schema::{
+    Definition, Document, Field, ObjectType, Type, TypeDefinition,
+};
+
+use super::types::{asc_type_for_value, value_from_asc, value_to_asc};
+use super::typescript::{
+    self as ts, ArrayType, Class, Method, ModuleImports, NamedType, NullableType, Param,
+    StaticMethod, TypeExpr,
+};
+use crate::shared::handle_reserved_word;
+
+/// Type of the ID field.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum IdFieldKind {
+    String,
+    Bytes,
+    Int8,
+}
+
+impl IdFieldKind {
+    /// Get the AssemblyScript type name for this ID type.
+    pub fn type_name(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "string",
+            IdFieldKind::Bytes => "Bytes",
+            IdFieldKind::Int8 => "i64",
+        }
+    }
+
+    /// Get the GraphQL type name for this ID type.
+    pub fn gql_type_name(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "String",
+            IdFieldKind::Bytes => "Bytes",
+            IdFieldKind::Int8 => "Int8",
+        }
+    }
+
+    /// Get the code to create a Value from the ID.
+    pub fn value_from(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "Value.fromString(id)",
+            IdFieldKind::Bytes => "Value.fromBytes(id)",
+            IdFieldKind::Int8 => "Value.fromI64(id)",
+        }
+    }
+
+    /// Get the ValueKind for this ID type.
+    pub fn value_kind(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "ValueKind.STRING",
+            IdFieldKind::Bytes => "ValueKind.BYTES",
+            IdFieldKind::Int8 => "ValueKind.INT8",
+        }
+    }
+
+    /// Get the code to convert a Value to a string representation.
+    pub fn value_to_string(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "id.toString()",
+            IdFieldKind::Bytes => "id.toBytes().toHexString()",
+            IdFieldKind::Int8 => "id.toI64().toString()",
+        }
+    }
+
+    /// Get the code to convert the ID to a string.
+    pub fn id_to_string_code(self) -> &'static str {
+        match self {
+            IdFieldKind::String => "id",
+            IdFieldKind::Bytes => "id.toHexString()",
+            IdFieldKind::Int8 => "id.toString()",
+        }
+    }
+
+    /// Determine the ID field kind from a type name.
+    pub fn from_type_name(type_name: &str) -> Self {
+        match type_name {
+            "Bytes" => IdFieldKind::Bytes,
+            "Int8" => IdFieldKind::Int8,
+            _ => IdFieldKind::String,
+        }
+    }
+
+    /// Returns true if this ID type supports auto-increment (optional constructor arg).
+    pub fn supports_auto(&self) -> bool {
+        matches!(self, IdFieldKind::Int8 | IdFieldKind::Bytes)
+    }
+
+    /// Get the constructor parameter type (with nullability for auto-increment types).
+    pub fn constructor_param_type(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "string",
+            IdFieldKind::Bytes => "Bytes | null",
+            IdFieldKind::Int8 => "i64", // primitive, can't be nullable
+        }
+    }
+
+    /// Get the default value for constructor parameter (for auto-increment types).
+    pub fn constructor_default(&self) -> Option<&'static str> {
+        match self {
+            IdFieldKind::String => None,
+            IdFieldKind::Bytes => Some("null"),
+            IdFieldKind::Int8 => Some("i64.MIN_VALUE"),
+        }
+    }
+
+    /// Get the condition to check if id was provided (not auto-increment).
+    pub fn auto_check_condition(&self) -> &'static str {
+        match self {
+            IdFieldKind::String => "", // N/A
+            // For Bytes we end up generating 'if (id) { .. }' Using 'id !=
+            // null' crashes the AssemblyScript compiler  0.19.23 because id
+            // has type 'Bytes | null' and the compiler doesn't strip the
+            // null from the type in the body of the if
+            IdFieldKind::Bytes => "id",
+            IdFieldKind::Int8 => "id != i64.MIN_VALUE",
+        }
+    }
+}
+
+/// Get the base type name from a GraphQL type (stripping NonNull and List wrappers).
+fn get_base_type_name(ty: &Type<'_, String>) -> String {
+    match ty {
+        Type::NamedType(name) => name.clone(),
+        Type::NonNullType(inner) => get_base_type_name(inner),
+        Type::ListType(inner) => get_base_type_name(inner),
+    }
+}
+
+/// Check if a type is nullable (not wrapped in NonNull).
+fn is_nullable(ty: &Type<'_, String>) -> bool {
+    !matches!(ty, Type::NonNullType(_))
+}
+
+/// Count the list nesting depth of a type.
+/// `String` -> 0, `[String]` -> 1, `[[String]]` -> 2, etc.
+fn list_depth(ty: &Type<'_, String>) -> u8 {
+    match ty {
+        Type::ListType(inner) => 1 + list_depth(inner),
+        Type::NonNullType(inner) => list_depth(inner),
+        Type::NamedType(_) => 0,
+    }
+}
+
+/// Check if the innermost list members are nullable.
+/// For `[String]` returns true, for `[String!]` returns false.
+/// For non-list types, returns false.
+fn is_list_member_nullable(ty: &Type<'_, String>) -> bool {
+    match ty {
+        Type::ListType(inner) => {
+            // Check the immediate inner type
+            is_nullable(inner)
+        }
+        Type::NonNullType(inner) => is_list_member_nullable(inner),
+        Type::NamedType(_) => false,
+    }
+}
+
+/// Check if a field has the @derivedFrom directive.
+fn is_derived_field(field: &Field<'_, String>) -> bool {
+    field.directives.iter().any(|d| d.name == "derivedFrom")
+}
+
+/// Check if an object type has the @entity directive.
+fn is_entity_type(obj: &ObjectType<'_, String>) -> bool {
+    obj.directives.iter().any(|d| d.name == "entity")
+}
+
+/// Collected entity info for code generation.
+struct EntityInfo {
+    name: String,
+    id_kind: IdFieldKind,
+    fields: Vec<FieldInfo>,
+}
+
+/// Collected field info.
+struct FieldInfo {
+    name: String,
+    is_derived: bool,
+    base_type: String,
+    is_nullable: bool,
+    /// The nesting depth of list wrappers. 0 = scalar, 1 = [T], 2 = [[T]], etc.
+    list_depth: u8,
+    /// Whether list members are nullable. Only meaningful when list_depth > 0.
+    member_nullable: bool,
+}
+
+/// Schema code generator.
+pub struct SchemaCodeGenerator {
+    entities: Vec<EntityInfo>,
+    entity_names: std::collections::HashSet<String>,
+    /// Maps entity name to its ID field kind, for resolving entity reference types.
+    entity_id_kinds: std::collections::HashMap<String, IdFieldKind>,
+}
+
+impl SchemaCodeGenerator {
+    /// Create a new schema code generator from a parsed GraphQL document.
+    ///
+    /// Returns an error if the schema contains invalid patterns like non-nullable
+    /// lists with nullable members (e.g., `[Something]!`).
+    pub fn new(document: &Document<'_, String>) -> Result<Self> {
+        let mut entities = Vec::new();
+        let mut entity_names = std::collections::HashSet::new();
+        let mut entity_id_kinds = std::collections::HashMap::new();
+
+        // First pass: collect entity names and their ID types
+        for def in &document.definitions {
+            if let Definition::TypeDefinition(TypeDefinition::Object(obj)) = def
+                && is_entity_type(obj)
+            {
+                entity_names.insert(obj.name.clone());
+                let id_field = obj.fields.iter().find(|f| f.name == "id");
+                let id_kind = id_field
+                    .map(|f| IdFieldKind::from_type_name(&get_base_type_name(&f.field_type)))
+                    .unwrap_or(IdFieldKind::String);
+                entity_id_kinds.insert(obj.name.clone(), id_kind);
+            }
+        }
+
+        // Second pass: collect entity info
+        for def in &document.definitions {
+            if let Definition::TypeDefinition(TypeDefinition::Object(obj)) = def
+                && is_entity_type(obj)
+            {
+                let name = obj.name.clone();
+
+                // Find ID field
+                let id_field = obj.fields.iter().find(|f| f.name == "id");
+                let id_kind = id_field
+                    .map(|f| IdFieldKind::from_type_name(&get_base_type_name(&f.field_type)))
+                    .unwrap_or(IdFieldKind::String);
+
+                // Collect field info
+                let fields: Vec<_> = obj
+                    .fields
+                    .iter()
+                    .map(|f| FieldInfo {
+                        name: f.name.clone(),
+                        is_derived: is_derived_field(f),
+                        base_type: get_base_type_name(&f.field_type),
+                        is_nullable: is_nullable(&f.field_type),
+                        list_depth: list_depth(&f.field_type),
+                        member_nullable: is_list_member_nullable(&f.field_type),
+                    })
+                    .collect();
+
+                entities.push(EntityInfo {
+                    name,
+                    id_kind,
+                    fields,
+                });
+            }
+        }
+
+        // Validate: non-nullable lists must have non-nullable members
+        for entity in &entities {
+            for field in &entity.fields {
+                if field.list_depth > 0 && !field.is_nullable && field.member_nullable {
+                    return Err(anyhow!(
+                        "Codegen can't generate code for GraphQL field '{}' of type '[{}]!' since the inner type is nullable.\n\
+                         Suggestion: add an '!' to the inner type, e.g., '[{}!]!'",
+                        field.name,
+                        field.base_type,
+                        field.base_type
+                    ));
+                }
+            }
+        }
+
+        Ok(Self {
+            entities,
+            entity_names,
+            entity_id_kinds,
+        })
+    }
+
+    /// Generate module imports for the schema file.
+    pub fn generate_module_imports(&self) -> Vec<ModuleImports> {
+        vec![ModuleImports::new(
+            vec![
+                "TypedMap".to_string(),
+                "Entity".to_string(),
+                "Value".to_string(),
+                "ValueKind".to_string(),
+                "store".to_string(),
+                "Bytes".to_string(),
+                "BigInt".to_string(),
+                "BigDecimal".to_string(),
+                "Int8".to_string(),
+            ],
+            "@graphprotocol/graph-ts",
+        )]
+    }
+
+    /// Generate entity classes from the schema.
+    pub fn generate_types(&self, generate_store_methods: bool) -> Vec<Class> {
+        self.entities
+            .iter()
+            .map(|entity| self.generate_entity_type(entity, generate_store_methods))
+            .collect()
+    }
+
+    /// Generate derived loaders for fields with @derivedFrom.
+    pub fn generate_derived_loaders(&self) -> Vec<Class> {
+        let mut loaders = Vec::new();
+        let mut seen_types = std::collections::HashSet::new();
+
+        for entity in &self.entities {
+            for field in &entity.fields {
+                if field.is_derived && !seen_types.contains(&field.base_type) {
+                    // Only generate loaders for entity types, not interfaces
+                    if self.entity_names.contains(&field.base_type) {
+                        seen_types.insert(field.base_type.clone());
+                        loaders.push(self.generate_derived_loader(&field.base_type));
+                    }
+                }
+            }
+        }
+
+        loaders
+    }
+
+    fn generate_entity_type(&self, entity: &EntityInfo, generate_store_methods: bool) -> Class {
+        let mut klass = ts::klass(&entity.name).exported().extends("Entity");
+
+        // Generate constructor
+        klass.add_method(self.generate_constructor(&entity.id_kind));
+
+        // Generate store methods
+        if generate_store_methods {
+            for method in self.generate_store_methods(&entity.name, &entity.id_kind) {
+                match method {
+                    StoreMethod::Regular(m) => klass.add_method(m),
+                    StoreMethod::Static(m) => klass.add_static_method(m),
+                }
+            }
+        }
+
+        // Generate field getters and setters
+        for field in &entity.fields {
+            if let Some(getter) = self.generate_field_getter(&entity.name, field, &entity.id_kind) {
+                klass.add_method(getter);
+            }
+            if let Some(setter) = self.generate_field_setter(field) {
+                klass.add_method(setter);
+            }
+        }
+
+        klass
+    }
+
+    fn generate_constructor(&self, id_kind: &IdFieldKind) -> Method {
+        if id_kind.supports_auto() {
+            // For Int8 and Bytes, make id optional to support auto-increment
+            let param_type = id_kind.constructor_param_type();
+            let default_value = id_kind.constructor_default().unwrap();
+            let check_condition = id_kind.auto_check_condition();
+
+            Method::new(
+                "constructor",
+                vec![Param::with_default(
+                    "id",
+                    TypeExpr::Raw(param_type.to_string()),
+                    default_value,
+                )],
+                None,
+                format!(
+                    r#"
+      super()
+      if ({}) {{
+        this.set('id', {})
+      }}"#,
+                    check_condition,
+                    id_kind.value_from()
+                ),
+            )
+            .with_doc("Leaving out the id argument uses an autoincrementing id.")
+        } else {
+            // For String IDs, keep the existing behavior (required parameter)
+            Method::new(
+                "constructor",
+                vec![Param::new("id", NamedType::new(id_kind.type_name()))],
+                None,
+                format!(
+                    r#"
+      super()
+      this.set('id', {})"#,
+                    id_kind.value_from()
+                ),
+            )
+        }
+    }
+
+    fn generate_store_methods(&self, entity_name: &str, id_kind: &IdFieldKind) -> Vec<StoreMethod> {
+        // Generate save() method - different for auto-increment vs string IDs
+        let save_method = if id_kind.supports_auto() {
+            // For Int8 and Bytes, check if id is null/unset and use "auto" as the key
+            Method::new(
+                "save",
+                vec![],
+                Some(NamedType::new("void").into()),
+                format!(
+                    r#"
+        let id = this.get('id')
+        if (id == null || id.kind == ValueKind.NULL) {{
+          store.set('{}', 'auto', this)
+        }} else {{
+          assert(id.kind == {},
+                 `Entities of type {} must have an ID of type {} but the id '${{id.displayData()}}' is of type ${{id.displayKind()}}`)
+          store.set('{}', {}, this)
+        }}"#,
+                    entity_name,
+                    id_kind.value_kind(),
+                    entity_name,
+                    id_kind.gql_type_name(),
+                    entity_name,
+                    id_kind.value_to_string()
+                ),
+            )
+        } else {
+            // For String IDs, keep the existing behavior (require ID)
+            Method::new(
+                "save",
+                vec![],
+                Some(NamedType::new("void").into()),
+                format!(
+                    r#"
+        let id = this.get('id')
+        assert(id != null,
+               'Cannot save {} entity without an ID')
+        if (id) {{
+          assert(id.kind == {},
+                 `Entities of type {} must have an ID of type {} but the id '${{id.displayData()}}' is of type ${{id.displayKind()}}`)
+          store.set('{}', {}, this)
+        }}"#,
+                    entity_name,
+                    id_kind.value_kind(),
+                    entity_name,
+                    id_kind.gql_type_name(),
+                    entity_name,
+                    id_kind.value_to_string()
+                ),
+            )
+        };
+
+        vec![
+            StoreMethod::Regular(save_method),
+            // loadInBlock() static method
+            StoreMethod::Static(StaticMethod::new(
+                "loadInBlock",
+                vec![Param::new("id", NamedType::new(id_kind.type_name()))],
+                NullableType::new(NamedType::new(entity_name)),
+                format!(
+                    r#"
+        return changetype<{} | null>(store.get_in_block('{}', {}))"#,
+                    entity_name,
+                    entity_name,
+                    id_kind.id_to_string_code()
+                ),
+            )),
+            // load() static method
+            StoreMethod::Static(StaticMethod::new(
+                "load",
+                vec![Param::new("id", NamedType::new(id_kind.type_name()))],
+                NullableType::new(NamedType::new(entity_name)),
+                format!(
+                    r#"
+        return changetype<{} | null>(store.get('{}', {}))"#,
+                    entity_name,
+                    entity_name,
+                    id_kind.id_to_string_code()
+                ),
+            )),
+        ]
+    }
+
+    fn generate_field_getter(
+        &self,
+        entity_name: &str,
+        field: &FieldInfo,
+        id_kind: &IdFieldKind,
+    ) -> Option<Method> {
+        let safe_name = handle_reserved_word(&field.name);
+
+        // Handle derived fields
+        if field.is_derived {
+            return self.generate_derived_field_getter(entity_name, field, &safe_name, id_kind);
+        }
+
+        let value_type = self.value_type_from_field(field);
+        let return_type = self.type_from_field(field);
+        let nullable = field.is_nullable;
+
+        let primitive_default = match &return_type {
+            TypeExpr::Named(t) => t.get_primitive_default(),
+            _ => None,
+        };
+
+        let get_code = if nullable {
+            format!(
+                r#"
+       let value = this.get('{}')
+       if (!value || value.kind == ValueKind.NULL) {{
+         return null
+       }} else {{
+         return {}
+       }}"#,
+                field.name,
+                value_to_asc("value", &value_type)
+            )
+        } else {
+            let null_handling = match primitive_default {
+                Some(default) => format!("return {}", default),
+                None => "throw new Error('Cannot return null for a required field.')".to_string(),
+            };
+            format!(
+                r#"
+       let value = this.get('{}')
+       if (!value || value.kind == ValueKind.NULL) {{
+         {}
+       }} else {{
+         return {}
+       }}"#,
+                field.name,
+                null_handling,
+                value_to_asc("value", &value_type)
+            )
+        };
+
+        Some(Method::new(
+            format!("get {}", safe_name),
+            vec![],
+            Some(return_type),
+            get_code,
+        ))
+    }
+
+    fn generate_derived_field_getter(
+        &self,
+        entity_name: &str,
+        field: &FieldInfo,
+        safe_name: &str,
+        id_kind: &IdFieldKind,
+    ) -> Option<Method> {
+        let loader_name = format!("{}Loader", field.base_type);
+
+        let id_conversion = match id_kind {
+            IdFieldKind::Bytes => "this.get('id')!.toBytes().toHexString()",
+            _ => "this.get('id')!.toString()",
+        };
+
+        Some(Method::new(
+            format!("get {}", safe_name),
+            vec![],
+            Some(NamedType::new(&loader_name).into()),
+            format!(
+                r#"
+        return new {}('{}', {}, '{}')"#,
+                loader_name, entity_name, id_conversion, field.name
+            ),
+        ))
+    }
+
+    fn generate_field_setter(&self, field: &FieldInfo) -> Option<Method> {
+        // No setters for derived fields
+        if field.is_derived {
+            return None;
+        }
+
+        let safe_name = handle_reserved_word(&field.name);
+        let value_type = self.value_type_from_field(field);
+        let param_type = self.type_from_field(field);
+        let nullable = field.is_nullable;
+
+        let set_code = if nullable {
+            let inner_type = match &param_type {
+                TypeExpr::Nullable(n) => n.inner.to_string(),
+                other => other.to_string(),
+            };
+            format!(
+                r#"
+      if (!value) {{
+        this.unset('{}')
+      }} else {{
+        this.set('{}', {})
+      }}"#,
+                field.name,
+                field.name,
+                value_from_asc(&format!("<{}>value", inner_type), &value_type)
+            )
+        } else {
+            format!(
+                r#"
+      this.set('{}', {})"#,
+                field.name,
+                value_from_asc("value", &value_type)
+            )
+        };
+
+        Some(Method::new(
+            format!("set {}", safe_name),
+            vec![Param::new("value", param_type)],
+            None,
+            set_code,
+        ))
+    }
+
+    fn generate_derived_loader(&self, type_name: &str) -> Class {
+        let loader_name = format!("{}Loader", type_name);
+        let mut klass = ts::klass(&loader_name).exported().extends("Entity");
+
+        // Add members
+        klass.add_member(ts::klass_member("_entity", "string"));
+        klass.add_member(ts::klass_member("_field", "string"));
+        klass.add_member(ts::klass_member("_id", "string"));
+
+        // Add constructor
+        klass.add_method(Method::new(
+            "constructor",
+            vec![
+                Param::new("entity", NamedType::new("string")),
+                Param::new("id", NamedType::new("string")),
+                Param::new("field", NamedType::new("string")),
+            ],
+            None,
+            r#"
+      super();
+      this._entity = entity;
+      this._id = id;
+      this._field = field;"#
+                .to_string(),
+        ));
+
+        // Add load() method
+        klass.add_method(Method::new(
+            "load",
+            vec![],
+            Some(TypeExpr::Raw(format!("{}[]", type_name))),
+            format!(
+                r#"
+  let value = store.loadRelated(this._entity, this._id, this._field);
+  return changetype<{}[]>(value);"#,
+                type_name
+            ),
+        ));
+
+        klass
+    }
+
+    /// Get the value type string for a field.
+    ///
+    /// Returns the GraphQL-style value type string:
+    /// - Scalars: `String`, `Int`, `BigInt`, etc.
+    /// - Arrays: `[String]`, `[Int]`, etc.
+    /// - Nested arrays: `[[String]]`, `[[Int]]`, etc.
+    /// - Entity references are converted to the referenced entity's ID type
+    fn value_type_from_field(&self, field: &FieldInfo) -> String {
+        let base = if let Some(id_kind) = self.entity_id_kinds.get(&field.base_type) {
+            id_kind.gql_type_name().to_string()
+        } else {
+            field.base_type.clone()
+        };
+
+        // Wrap with brackets for each level of list nesting
+        let mut result = base;
+        for _ in 0..field.list_depth {
+            result = format!("[{}]", result);
+        }
+        result
+    }
+
+    /// Convert field info to an AssemblyScript TypeExpr.
+    ///
+    /// Creates the correct type expression including nested arrays:
+    /// - Scalars: `string`, `i32`, `BigInt`, etc.
+    /// - Arrays: `Array<string>`, `Array<i32>`, etc.
+    /// - Nested arrays: `Array<Array<string>>`, etc.
+    fn type_from_field(&self, field: &FieldInfo) -> TypeExpr {
+        let type_name = if let Some(id_kind) = self.entity_id_kinds.get(&field.base_type) {
+            id_kind.type_name()
+        } else {
+            asc_type_for_value(&field.base_type)
+        };
+
+        let named = NamedType::new(type_name);
+
+        if field.list_depth > 0 {
+            // Use ArrayType::with_depth to create nested array types
+            let array_type = ArrayType::with_depth(named, field.list_depth);
+            if field.is_nullable {
+                NullableType::new(array_type).into()
+            } else {
+                array_type
+            }
+        } else if field.is_nullable && !named.is_primitive() {
+            NullableType::new(named).into()
+        } else {
+            named.into()
+        }
+    }
+}
+
+enum StoreMethod {
+    Regular(Method),
+    Static(StaticMethod),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use graphql_tools::parser::parse_schema;
+
+    #[test]
+    fn test_simple_entity() {
+        let schema = r#"
+            type Transfer @entity {
+                id: ID!
+                from: Bytes!
+                to: Bytes!
+                value: BigInt!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let transfer = &classes[0];
+        assert_eq!(transfer.name, "Transfer");
+        assert_eq!(transfer.extends, Some("Entity".to_string()));
+        assert!(transfer.export);
+    }
+
+    #[test]
+    fn test_nullable_field() {
+        let schema = r#"
+            type Token @entity {
+                id: ID!
+                name: String
+                symbol: String!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        // Check that we have methods for nullable and non-nullable fields
+        let token = &classes[0];
+        let method_names: Vec<_> = token.methods.iter().map(|m| m.name.as_str()).collect();
+        assert!(method_names.contains(&"get name"));
+        assert!(method_names.contains(&"set name"));
+        assert!(method_names.contains(&"get symbol"));
+        assert!(method_names.contains(&"set symbol"));
+    }
+
+    #[test]
+    fn test_id_field_types() {
+        assert_eq!(IdFieldKind::String.type_name(), "string");
+        assert_eq!(IdFieldKind::Bytes.type_name(), "Bytes");
+        assert_eq!(IdFieldKind::Int8.type_name(), "i64");
+    }
+
+    #[test]
+    fn test_auto_increment_support() {
+        // String IDs don't support auto-increment
+        assert!(!IdFieldKind::String.supports_auto());
+        assert!(IdFieldKind::String.constructor_default().is_none());
+
+        // Int8 IDs support auto-increment
+        assert!(IdFieldKind::Int8.supports_auto());
+        assert_eq!(IdFieldKind::Int8.constructor_param_type(), "i64");
+        assert_eq!(
+            IdFieldKind::Int8.constructor_default(),
+            Some("i64.MIN_VALUE")
+        );
+        assert_eq!(
+            IdFieldKind::Int8.auto_check_condition(),
+            "id != i64.MIN_VALUE"
+        );
+
+        // Bytes IDs support auto-increment
+        assert!(IdFieldKind::Bytes.supports_auto());
+        assert_eq!(IdFieldKind::Bytes.constructor_param_type(), "Bytes | null");
+        assert_eq!(IdFieldKind::Bytes.constructor_default(), Some("null"));
+        assert_eq!(IdFieldKind::Bytes.auto_check_condition(), "id");
+    }
+
+    #[test]
+    fn test_int8_id_auto_increment_codegen() {
+        let schema = r#"
+            type Counter @entity {
+                id: Int8!
+                value: BigInt!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let counter = &classes[0];
+        let output = counter.to_string();
+
+        // Constructor should have optional id with sentinel default
+        assert!(
+            output.contains("constructor(id: i64 = i64.MIN_VALUE)"),
+            "Int8 ID constructor should have default sentinel value, got: {}",
+            output
+        );
+
+        // Constructor should have doc comment
+        assert!(
+            output.contains("Leaving out the id argument uses an autoincrementing id"),
+            "Constructor should have auto-increment doc comment"
+        );
+
+        // Constructor body should conditionally set id
+        assert!(
+            output.contains("if (id != i64.MIN_VALUE)"),
+            "Constructor should check for sentinel value"
+        );
+
+        // save() method should use "auto" when id is null
+        assert!(
+            output.contains("store.set('Counter', 'auto', this)"),
+            "save() should use 'auto' key for auto-increment, got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_bytes_id_auto_increment_codegen() {
+        let schema = r#"
+            type Event @entity {
+                id: Bytes!
+                data: String!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let event = &classes[0];
+        let output = event.to_string();
+
+        // Constructor should have nullable id with null default
+        assert!(
+            output.contains("constructor(id: Bytes | null = null)"),
+            "Bytes ID constructor should have null default, got: {}",
+            output
+        );
+
+        // Constructor should have doc comment
+        assert!(
+            output.contains("Leaving out the id argument uses an autoincrementing id"),
+            "Constructor should have auto-increment doc comment"
+        );
+
+        // Constructor body should conditionally set id
+        assert!(
+            output.contains("if (id)"),
+            "Constructor should check for null"
+        );
+
+        // save() method should use "auto" when id is null
+        assert!(
+            output.contains("store.set('Event', 'auto', this)"),
+            "save() should use 'auto' key for auto-increment, got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_string_id_no_auto_increment() {
+        let schema = r#"
+            type User @entity {
+                id: ID!
+                name: String!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let user = &classes[0];
+        let output = user.to_string();
+
+        // Constructor should have required id (no default)
+        assert!(
+            output.contains("constructor(id: string)"),
+            "String ID constructor should have required parameter, got: {}",
+            output
+        );
+
+        // Constructor should NOT have auto-increment doc comment
+        assert!(
+            !output.contains("autoincrementing"),
+            "String ID should not mention auto-increment"
+        );
+
+        // save() method should NOT use "auto"
+        assert!(
+            !output.contains("'auto'"),
+            "String ID save() should not use 'auto' key"
+        );
+
+        // save() should require ID
+        assert!(
+            output.contains("Cannot save User entity without an ID"),
+            "String ID save() should require ID"
+        );
+    }
+
+    #[test]
+    fn test_entity_reference() {
+        let schema = r#"
+            type User @entity {
+                id: ID!
+                name: String!
+            }
+            type Post @entity {
+                id: ID!
+                author: User!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        // The Post.author field should be treated as a string (entity ID reference)
+        assert!(generator.entity_names.contains("User"));
+        assert!(generator.entity_names.contains("Post"));
+    }
+
+    #[test]
+    fn test_simple_array_field() {
+        let schema = r#"
+            type Token @entity {
+                id: ID!
+                holders: [String!]!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let token = &classes[0];
+        let output = token.to_string();
+
+        // Verify array field getter/setter are generated
+        assert!(
+            output.contains("get holders()"),
+            "Should have holders getter"
+        );
+        assert!(
+            output.contains("set holders("),
+            "Should have holders setter"
+        );
+
+        // Check the type is Array<string>
+        assert!(
+            output.contains("Array<string>"),
+            "Array field should use Array<string> type"
+        );
+    }
+
+    #[test]
+    fn test_nested_array_field() {
+        let schema = r#"
+            type Matrix @entity {
+                id: ID!
+                stringMatrix: [[String!]!]!
+                intMatrix: [[Int!]!]
+                bigIntMatrix: [[BigInt!]!]!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        assert_eq!(classes.len(), 1);
+
+        let matrix = &classes[0];
+        let output = matrix.to_string();
+
+        // Verify nested array field getter/setter are generated
+        assert!(
+            output.contains("get stringMatrix()"),
+            "Should have stringMatrix getter"
+        );
+        assert!(
+            output.contains("set stringMatrix("),
+            "Should have stringMatrix setter"
+        );
+
+        // Check the type is Array<Array<string>>
+        assert!(
+            output.contains("Array<Array<string>>"),
+            "Nested array field should use Array<Array<string>> type, got: {}",
+            output
+        );
+
+        // Check that toStringMatrix() and fromStringMatrix() are used
+        assert!(
+            output.contains("toStringMatrix()"),
+            "Should use toStringMatrix() for nested string arrays"
+        );
+        assert!(
+            output.contains("fromStringMatrix("),
+            "Should use Value.fromStringMatrix() for nested string arrays"
+        );
+
+        // Check BigInt matrix uses correct methods
+        assert!(
+            output.contains("Array<Array<BigInt>>"),
+            "BigInt matrix should use Array<Array<BigInt>> type"
+        );
+        assert!(
+            output.contains("toBigIntMatrix()"),
+            "Should use toBigIntMatrix() for nested BigInt arrays"
+        );
+        assert!(
+            output.contains("fromBigIntMatrix("),
+            "Should use Value.fromBigIntMatrix() for nested BigInt arrays"
+        );
+
+        // Check nullable nested array has correct type
+        assert!(
+            output.contains("Array<Array<i32>> | null"),
+            "Nullable nested array should be Array<Array<i32>> | null"
+        );
+    }
+
+    #[test]
+    fn test_list_depth() {
+        use graphql_tools::parser::parse_schema;
+
+        // Helper to get list depth from schema field type
+        fn get_field_list_depth(schema_str: &str) -> u8 {
+            let doc = parse_schema::<String>(schema_str).unwrap();
+            for def in &doc.definitions {
+                if let Definition::TypeDefinition(TypeDefinition::Object(obj)) = def {
+                    for field in &obj.fields {
+                        if field.name == "field" {
+                            return list_depth(&field.field_type);
+                        }
+                    }
+                }
+            }
+            panic!("Field not found");
+        }
+
+        // Scalar
+        assert_eq!(
+            get_field_list_depth("type T @entity { id: ID!, field: String! }"),
+            0
+        );
+
+        // Simple array
+        assert_eq!(
+            get_field_list_depth("type T @entity { id: ID!, field: [String!]! }"),
+            1
+        );
+
+        // Nested array (matrix)
+        assert_eq!(
+            get_field_list_depth("type T @entity { id: ID!, field: [[String!]!]! }"),
+            2
+        );
+
+        // Triple nested array
+        assert_eq!(
+            get_field_list_depth("type T @entity { id: ID!, field: [[[String!]!]!]! }"),
+            3
+        );
+    }
+
+    #[test]
+    fn test_value_type_from_field_nested() {
+        let schema = r#"
+            type Test @entity {
+                id: ID!
+                scalar: String!
+                array: [String!]!
+                matrix: [[String!]!]!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        // Find the entity
+        let entity = &generator.entities[0];
+
+        // Find each field and check its value type
+        let scalar_field = entity.fields.iter().find(|f| f.name == "scalar").unwrap();
+        let array_field = entity.fields.iter().find(|f| f.name == "array").unwrap();
+        let matrix_field = entity.fields.iter().find(|f| f.name == "matrix").unwrap();
+
+        assert_eq!(generator.value_type_from_field(scalar_field), "String");
+        assert_eq!(generator.value_type_from_field(array_field), "[String]");
+        assert_eq!(generator.value_type_from_field(matrix_field), "[[String]]");
+    }
+
+    #[test]
+    fn test_bytes_id_entity_reference() {
+        let schema = r#"
+            type Token @entity {
+                id: Bytes!
+                name: String!
+            }
+            type Balance @entity {
+                id: ID!
+                token: Token!
+                amount: BigInt!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        let balance = classes.iter().find(|c| c.name == "Balance").unwrap();
+        let output = balance.to_string();
+
+        // Getter should return Bytes and use toBytes()
+        assert!(
+            output.contains("value.toBytes()"),
+            "Bytes-ID entity reference getter should use toBytes(), got: {}",
+            output
+        );
+
+        // Setter should use Value.fromBytes()
+        assert!(
+            output.contains("Value.fromBytes("),
+            "Bytes-ID entity reference setter should use Value.fromBytes(), got: {}",
+            output
+        );
+
+        // Return type should be Bytes, not string
+        assert!(
+            output.contains("get token(): Bytes"),
+            "Bytes-ID entity reference getter should return Bytes, got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_int8_id_entity_reference() {
+        let schema = r#"
+            type Counter @entity {
+                id: Int8!
+                value: BigInt!
+            }
+            type Snapshot @entity {
+                id: ID!
+                counter: Counter!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        let snapshot = classes.iter().find(|c| c.name == "Snapshot").unwrap();
+        let output = snapshot.to_string();
+
+        // Getter should return i64 and use toI64()
+        assert!(
+            output.contains("value.toI64()"),
+            "Int8-ID entity reference getter should use toI64(), got: {}",
+            output
+        );
+
+        // Setter should use Value.fromI64()
+        assert!(
+            output.contains("Value.fromI64("),
+            "Int8-ID entity reference setter should use Value.fromI64(), got: {}",
+            output
+        );
+
+        // Return type should be i64
+        assert!(
+            output.contains("get counter(): i64"),
+            "Int8-ID entity reference getter should return i64, got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_mixed_id_entity_references() {
+        let schema = r#"
+            type User @entity {
+                id: ID!
+                name: String!
+            }
+            type Token @entity {
+                id: Bytes!
+                owner: User!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        let token = classes.iter().find(|c| c.name == "Token").unwrap();
+        let output = token.to_string();
+
+        // Token.owner references User which has String ID
+        assert!(
+            output.contains("get owner(): string"),
+            "Reference to String-ID entity should use string type, got: {}",
+            output
+        );
+        assert!(
+            output.contains("value.toString()"),
+            "Reference to String-ID entity should use toString(), got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_nullable_bytes_id_entity_reference() {
+        let schema = r#"
+            type Token @entity {
+                id: Bytes!
+                name: String!
+            }
+            type Balance @entity {
+                id: ID!
+                token: Token
+                amount: BigInt!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        let balance = classes.iter().find(|c| c.name == "Balance").unwrap();
+        let output = balance.to_string();
+
+        // Nullable Bytes reference should be `Bytes | null`
+        assert!(
+            output.contains("get token(): Bytes | null"),
+            "Nullable Bytes-ID reference should return Bytes | null, got: {}",
+            output
+        );
+    }
+
+    #[test]
+    fn test_derived_field_with_bytes_id_parent() {
+        let schema = r#"
+            type Token @entity {
+                id: Bytes!
+                balances: [Balance!]! @derivedFrom(field: "token")
+            }
+            type Balance @entity {
+                id: ID!
+                token: Token!
+                amount: BigInt!
+            }
+        "#;
+        let doc = parse_schema::<String>(schema).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
+
+        let classes = generator.generate_types(true);
+        let token = classes.iter().find(|c| c.name == "Token").unwrap();
+        let output = token.to_string();
+
+        // Derived field getter on Bytes-ID entity should use toBytes().toHexString()
+        assert!(
+            output.contains("this.get('id')!.toBytes().toHexString()"),
+            "Derived field on Bytes-ID entity should use toBytes().toHexString(), got: {}",
+            output
+        );
+    }
+}
diff --git a/gnd/src/codegen/template.rs b/gnd/src/codegen/template.rs
new file mode 100644
index 00000000000..72a27f9e733
--- /dev/null
+++ b/gnd/src/codegen/template.rs
@@ -0,0 +1,286 @@
+//! Data source template code generation.
+//!
+//! Generates AssemblyScript classes for subgraph templates that allow
+//! dynamic data source creation at runtime.
+
+use super::typescript::{self as ts, Class, ModuleImports, Param, StaticMethod};
+
+/// The kind of a data source template.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TemplateKind {
+    /// Ethereum contract template
+    Ethereum,
+    /// IPFS file template
+    FileIpfs,
+    /// Arweave file template
+    FileArweave,
+}
+
+impl TemplateKind {
+    /// Parse a template kind from a string (e.g., "ethereum/contract", "file/ipfs").
+    pub fn from_str_kind(kind: &str) -> Option<Self> {
+        match kind {
+            "ethereum/contract" | "ethereum" => Some(TemplateKind::Ethereum),
+            "file/ipfs" => Some(TemplateKind::FileIpfs),
+            "file/arweave" => Some(TemplateKind::FileArweave),
+            _ => None,
+        }
+    }
+}
+
+/// A data source template from the subgraph manifest.
+pub struct Template {
+    /// The name of the template.
+    pub name: String,
+    /// The kind of template.
+    pub kind: TemplateKind,
+}
+
+impl Template {
+    /// Create a new template.
+    pub fn new(name: impl Into<String>, kind: TemplateKind) -> Self {
+        Self {
+            name: name.into(),
+            kind,
+        }
+    }
+}
+
+const GRAPH_TS_MODULE: &str = "@graphprotocol/graph-ts";
+
+/// Template code generator.
+pub struct TemplateCodeGenerator {
+    templates: Vec<Template>,
+}
+
+impl TemplateCodeGenerator {
+    /// Create a new template code generator.
+    pub fn new(templates: Vec<Template>) -> Self {
+        Self { templates }
+    }
+
+    /// Generate module imports for templates.
+    pub fn generate_module_imports(&self) -> Vec<ModuleImports> {
+        if self.templates.is_empty() {
+            return vec![];
+        }
+
+        let mut imports = vec![
+            "DataSourceTemplate".to_string(),
+            "DataSourceContext".to_string(),
+        ];
+
+        // Add Address if any Ethereum templates exist
+        if self
+            .templates
+            .iter()
+            .any(|t| t.kind == TemplateKind::Ethereum)
+        {
+            imports.push("Address".to_string());
+        }
+
+        vec![ModuleImports::new(imports, GRAPH_TS_MODULE)]
+    }
+
+    /// Generate all template classes.
+    pub fn generate_types(&self) -> Vec<Class> {
+        self.templates
+            .iter()
+            .map(|t| self.generate_type(t))
+            .collect()
+    }
+
+    /// Generate a single template class.
+    fn generate_type(&self, template: &Template) -> Class {
+        let mut klass = ts::klass(&template.name)
+            .exported()
+            .extends("DataSourceTemplate");
+
+        klass.add_static_method(self.generate_create_method(template));
+        klass.add_static_method(self.generate_create_with_context_method(template));
+
+        klass
+    }
+
+    /// Generate the static `create` method.
+    fn generate_create_method(&self, template: &Template) -> StaticMethod {
+        match template.kind {
+            TemplateKind::Ethereum => StaticMethod::new(
+                "create",
+                vec![Param::new("address", ts::NamedType::new("Address"))],
+                ts::NamedType::new("void"),
+                format!(
+                    "\n      DataSourceTemplate.create('{}', [address.toHex()])\n      ",
+                    template.name
+                ),
+            ),
+            TemplateKind::FileIpfs | TemplateKind::FileArweave => StaticMethod::new(
+                "create",
+                vec![Param::new("cid", ts::NamedType::new("string"))],
+                ts::NamedType::new("void"),
+                format!(
+                    "\n      DataSourceTemplate.create('{}', [cid])\n      ",
+                    template.name
+                ),
+            ),
+        }
+    }
+
+    /// Generate the static `createWithContext` method.
+    fn generate_create_with_context_method(&self, template: &Template) -> StaticMethod {
+        match template.kind {
+            TemplateKind::Ethereum => StaticMethod::new(
+                "createWithContext",
+                vec![
+                    Param::new("address", ts::NamedType::new("Address")),
+                    Param::new("context", ts::NamedType::new("DataSourceContext")),
+                ],
+                ts::NamedType::new("void"),
+                format!(
+                    "\n      DataSourceTemplate.createWithContext('{}', [address.toHex()], context)\n      ",
+                    template.name
+                ),
+            ),
+            TemplateKind::FileIpfs | TemplateKind::FileArweave => StaticMethod::new(
+                "createWithContext",
+                vec![
+                    Param::new("cid", ts::NamedType::new("string")),
+                    Param::new("context", ts::NamedType::new("DataSourceContext")),
+                ],
+                ts::NamedType::new("void"),
+                format!(
+                    "\n      DataSourceTemplate.createWithContext('{}', [cid], context)\n      ",
+                    template.name
+                ),
+            ),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn test_template_kind_parsing() {
+        assert_eq!(
+            TemplateKind::from_str_kind("ethereum/contract"),
+            Some(TemplateKind::Ethereum)
+        );
+        assert_eq!(
+            TemplateKind::from_str_kind("ethereum"),
+            Some(TemplateKind::Ethereum)
+        );
+        assert_eq!(
+            TemplateKind::from_str_kind("file/ipfs"),
+            Some(TemplateKind::FileIpfs)
+        );
+        assert_eq!(
+            TemplateKind::from_str_kind("file/arweave"),
+            Some(TemplateKind::FileArweave)
+        );
+        assert_eq!(TemplateKind::from_str_kind("unknown"), None);
+    }
+
+    #[test]
+    fn test_ethereum_template() {
+        let template = Template::new("DynamicToken", TemplateKind::Ethereum);
+        let generator = TemplateCodeGenerator::new(vec![template]);
+
+        let imports = generator.generate_module_imports();
+        assert_eq!(imports.len(), 1);
+        let import_names: Vec<_> = imports[0].names.iter().collect();
+        assert!(import_names.contains(&&"DataSourceTemplate".to_string()));
+        assert!(import_names.contains(&&"DataSourceContext".to_string()));
+        assert!(import_names.contains(&&"Address".to_string()));
+
+        let types = generator.generate_types();
+        assert_eq!(types.len(), 1);
+
+        let klass = &types[0];
+        assert_eq!(klass.name, "DynamicToken");
+        assert!(klass.export);
+        assert_eq!(klass.extends, Some("DataSourceTemplate".to_string()));
+        assert_eq!(klass.static_methods.len(), 2);
+
+        // Check create method
+        let create = &klass.static_methods[0];
+        assert_eq!(create.name, "create");
+        assert_eq!(create.params.len(), 1);
+        assert_eq!(create.params[0].name, "address");
+
+        // Check createWithContext method
+        let create_ctx = &klass.static_methods[1];
+        assert_eq!(create_ctx.name, "createWithContext");
+        assert_eq!(create_ctx.params.len(), 2);
+    }
+
+    #[test]
+    fn test_file_ipfs_template() {
+        let template = Template::new("TokenMetadata", TemplateKind::FileIpfs);
+        let generator = TemplateCodeGenerator::new(vec![template]);
+
+        let imports = generator.generate_module_imports();
+        assert_eq!(imports.len(), 1);
+        let import_names: Vec<_> = imports[0].names.iter().collect();
+        assert!(import_names.contains(&&"DataSourceTemplate".to_string()));
+        assert!(import_names.contains(&&"DataSourceContext".to_string()));
+        // No Address for file templates
+        assert!(!import_names.contains(&&"Address".to_string()));
+
+        let types = generator.generate_types();
+        assert_eq!(types.len(), 1);
+
+        let klass = &types[0];
+        assert_eq!(klass.name, "TokenMetadata");
+
+        // Check create method uses cid parameter
+        let create = &klass.static_methods[0];
+        assert_eq!(create.params[0].name, "cid");
+        assert!(create.body.contains("[cid]"));
+    }
+
+    #[test]
+    fn test_mixed_templates() {
+        let templates = vec![
+            Template::new("DynamicToken", TemplateKind::Ethereum),
+            Template::new("TokenMetadata", TemplateKind::FileIpfs),
+        ];
+        let generator = TemplateCodeGenerator::new(templates);
+
+        let imports = generator.generate_module_imports();
+        // Should have Address because of Ethereum template
+        let import_names: Vec<_> = imports[0].names.iter().collect();
+        assert!(import_names.contains(&&"Address".to_string()));
+
+        let types = generator.generate_types();
+        assert_eq!(types.len(), 2);
+    }
+
+    #[test]
+    fn test_empty_templates() {
+        let generator = TemplateCodeGenerator::new(vec![]);
+        assert!(generator.generate_module_imports().is_empty());
+        assert!(generator.generate_types().is_empty());
+    }
+
+    #[test]
+    fn test_generated_output() {
+        let template = Template::new("DynamicToken", TemplateKind::Ethereum);
+        let generator = TemplateCodeGenerator::new(vec![template]);
+
+        let types = generator.generate_types();
+        let output = types[0].to_string();
+
+        assert!(output.contains("export class DynamicToken extends DataSourceTemplate"));
+        assert!(output.contains("static create(address: Address): void"));
+        assert!(output.contains("DataSourceTemplate.create('DynamicToken', [address.toHex()])"));
+        assert!(output.contains(
+            "static createWithContext(address: Address, context: DataSourceContext): void"
+        ));
+        assert!(output.contains(
+            "DataSourceTemplate.createWithContext('DynamicToken', [address.toHex()], context)"
+        ));
+    }
+}
diff --git a/gnd/src/codegen/types.rs b/gnd/src/codegen/types.rs
new file mode 100644
index 00000000000..faeccbe772b
--- /dev/null
+++ b/gnd/src/codegen/types.rs
@@ -0,0 +1,297 @@
+//! Type conversion utilities for code generation.
+//!
+//! This module handles conversions between:
+//! - GraphQL schema types and AssemblyScript types
+//! - Ethereum ABI types and AssemblyScript types
+//! - graph-node Value types and AssemblyScript types
+
+/// Get the AssemblyScript type for a GraphQL Value type.
+///
+/// Supports scalar types, arrays, and nested arrays (matrices).
+/// Value types use bracket notation: `String`, `[String]`, `[[String]]`
+pub fn asc_type_for_value(value_type: &str) -> &'static str {
+    match value_type {
+        // Scalar types
+        "Bytes" => "Bytes",
+        "Boolean" => "boolean",
+        "Int" => "i32",
+        "Int8" => "i64",
+        "BigInt" => "BigInt",
+        "ID" | "String" => "string",
+        "BigDecimal" => "BigDecimal",
+        "Timestamp" => "i64",
+        // Array types (single dimension)
+        "[Bytes]" => "Array<Bytes>",
+        "[Boolean]" => "Array<boolean>",
+        "[Int]" => "Array<i32>",
+        "[Int8]" => "Array<i64>",
+        "[Timestamp]" => "Array<i64>",
+        "[BigInt]" => "Array<BigInt>",
+        "[ID]" | "[String]" => "Array<string>",
+        "[BigDecimal]" => "Array<BigDecimal>",
+        // Matrix types (nested arrays - 2D)
+        "[[Bytes]]" => "Array<Array<Bytes>>",
+        "[[Boolean]]" => "Array<Array<boolean>>",
+        "[[Int]]" => "Array<Array<i32>>",
+        "[[Int8]]" => "Array<Array<i64>>",
+        "[[Timestamp]]" => "Array<Array<i64>>",
+        "[[BigInt]]" => "Array<Array<BigInt>>",
+        "[[ID]]" | "[[String]]" => "Array<Array<string>>",
+        "[[BigDecimal]]" => "Array<Array<BigDecimal>>",
+        // Default for entity references and unknown types
+        _ => {
+            if value_type.starts_with("[[") && value_type.ends_with("]]") {
+                "Array<Array<string>>" // Entity reference matrices
+            } else if value_type.starts_with('[') && value_type.ends_with(']') {
+                "Array<string>" // Entity reference arrays
+            } else {
+                "string" // Entity references
+            }
+        }
+    }
+}
+
+/// Generate code to convert a Value to AssemblyScript.
+///
+/// Supports scalar types, arrays, and nested arrays (matrices).
+pub fn value_to_asc(code: &str, value_type: &str) -> String {
+    match value_type {
+        // Scalar types
+        "Bytes" => format!("{}.toBytes()", code),
+        "Boolean" => format!("{}.toBoolean()", code),
+        "Int" => format!("{}.toI32()", code),
+        "Int8" => format!("{}.toI64()", code),
+        "BigInt" => format!("{}.toBigInt()", code),
+        "ID" | "String" => format!("{}.toString()", code),
+        "BigDecimal" => format!("{}.toBigDecimal()", code),
+        "Timestamp" => format!("{}.toTimestamp()", code),
+        // Array types (single dimension)
+        "[Bytes]" => format!("{}.toBytesArray()", code),
+        "[Boolean]" => format!("{}.toBooleanArray()", code),
+        "[Int]" => format!("{}.toI32Array()", code),
+        "[Int8]" => format!("{}.toI64Array()", code),
+        "[Timestamp]" => format!("{}.toTimestampArray()", code),
+        "[BigInt]" => format!("{}.toBigIntArray()", code),
+        "[ID]" | "[String]" => format!("{}.toStringArray()", code),
+        "[BigDecimal]" => format!("{}.toBigDecimalArray()", code),
+        // Matrix types (nested arrays - 2D)
+        "[[Bytes]]" => format!("{}.toBytesMatrix()", code),
+        "[[Boolean]]" => format!("{}.toBooleanMatrix()", code),
+        "[[Int]]" => format!("{}.toI32Matrix()", code),
+        "[[Int8]]" => format!("{}.toI64Matrix()", code),
+        "[[Timestamp]]" => format!("{}.toTimestampMatrix()", code),
+        "[[BigInt]]" => format!("{}.toBigIntMatrix()", code),
+        "[[ID]]" | "[[String]]" => format!("{}.toStringMatrix()", code),
+        "[[BigDecimal]]" => format!("{}.toBigDecimalMatrix()", code),
+        // Default for entity references
+        _ => {
+            if value_type.starts_with("[[") {
+                format!("{}.toStringMatrix()", code)
+            } else if value_type.starts_with('[') {
+                format!("{}.toStringArray()", code)
+            } else {
+                format!("{}.toString()", code)
+            }
+        }
+    }
+}
+
+/// Generate code to convert an AssemblyScript value to a Value.
+///
+/// Supports scalar types, arrays, and nested arrays (matrices).
+pub fn value_from_asc(code: &str, value_type: &str) -> String {
+    match value_type {
+        // Scalar types
+        "Bytes" => format!("Value.fromBytes({})", code),
+        "Boolean" => format!("Value.fromBoolean({})", code),
+        "Int" => format!("Value.fromI32({})", code),
+        "Int8" => format!("Value.fromI64({})", code),
+        "BigInt" => format!("Value.fromBigInt({})", code),
+        "ID" | "String" => format!("Value.fromString({})", code),
+        "BigDecimal" => format!("Value.fromBigDecimal({})", code),
+        "Timestamp" => format!("Value.fromTimestamp({})", code),
+        // Array types (single dimension)
+        "[Bytes]" => format!("Value.fromBytesArray({})", code),
+        "[Boolean]" => format!("Value.fromBooleanArray({})", code),
+        "[Int]" => format!("Value.fromI32Array({})", code),
+        "[Int8]" => format!("Value.fromI64Array({})", code),
+        "[Timestamp]" => format!("Value.fromTimestampArray({})", code),
+        "[BigInt]" => format!("Value.fromBigIntArray({})", code),
+        "[ID]" | "[String]" => format!("Value.fromStringArray({})", code),
+        "[BigDecimal]" => format!("Value.fromBigDecimalArray({})", code),
+        // Matrix types (nested arrays - 2D)
+        "[[Bytes]]" => format!("Value.fromBytesMatrix({})", code),
+        "[[Boolean]]" => format!("Value.fromBooleanMatrix({})", code),
+        "[[Int]]" => format!("Value.fromI32Matrix({})", code),
+        "[[Int8]]" => format!("Value.fromI64Matrix({})", code),
+        "[[Timestamp]]" => format!("Value.fromTimestampMatrix({})", code),
+        "[[BigInt]]" => format!("Value.fromBigIntMatrix({})", code),
+        "[[ID]]" | "[[String]]" => format!("Value.fromStringMatrix({})", code),
+        "[[BigDecimal]]" => format!("Value.fromBigDecimalMatrix({})", code),
+        // Default for entity references
+        _ => {
+            if value_type.starts_with("[[") {
+                format!("Value.fromStringMatrix({})", code)
+            } else if value_type.starts_with('[') {
+                format!("Value.fromStringArray({})", code)
+            } else {
+                format!("Value.fromString({})", code)
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_asc_type_for_value() {
+        // Scalar types
+        assert_eq!(asc_type_for_value("String"), "string");
+        assert_eq!(asc_type_for_value("ID"), "string");
+        assert_eq!(asc_type_for_value("Int"), "i32");
+        assert_eq!(asc_type_for_value("BigInt"), "BigInt");
+        assert_eq!(asc_type_for_value("Bytes"), "Bytes");
+        assert_eq!(asc_type_for_value("Boolean"), "boolean");
+        assert_eq!(asc_type_for_value("BigDecimal"), "BigDecimal");
+        assert_eq!(asc_type_for_value("Int8"), "i64");
+        assert_eq!(asc_type_for_value("Timestamp"), "i64");
+
+        // Array types
+        assert_eq!(asc_type_for_value("[String]"), "Array<string>");
+        assert_eq!(asc_type_for_value("[ID]"), "Array<string>");
+        assert_eq!(asc_type_for_value("[Int]"), "Array<i32>");
+        assert_eq!(asc_type_for_value("[BigInt]"), "Array<BigInt>");
+        assert_eq!(asc_type_for_value("[Bytes]"), "Array<Bytes>");
+        assert_eq!(asc_type_for_value("[Boolean]"), "Array<boolean>");
+        assert_eq!(asc_type_for_value("[BigDecimal]"), "Array<BigDecimal>");
+        assert_eq!(asc_type_for_value("[Int8]"), "Array<i64>");
+        assert_eq!(asc_type_for_value("[Timestamp]"), "Array<i64>");
+
+        // Matrix types (nested arrays)
+        assert_eq!(asc_type_for_value("[[String]]"), "Array<Array<string>>");
+        assert_eq!(asc_type_for_value("[[ID]]"), "Array<Array<string>>");
+        assert_eq!(asc_type_for_value("[[Int]]"), "Array<Array<i32>>");
+        assert_eq!(asc_type_for_value("[[BigInt]]"), "Array<Array<BigInt>>");
+        assert_eq!(asc_type_for_value("[[Bytes]]"), "Array<Array<Bytes>>");
+        assert_eq!(asc_type_for_value("[[Boolean]]"), "Array<Array<boolean>>");
+        assert_eq!(
+            asc_type_for_value("[[BigDecimal]]"),
+            "Array<Array<BigDecimal>>"
+        );
+        assert_eq!(asc_type_for_value("[[Int8]]"), "Array<Array<i64>>");
+        assert_eq!(asc_type_for_value("[[Timestamp]]"), "Array<Array<i64>>");
+
+        // Entity references
+        assert_eq!(asc_type_for_value("SomeEntity"), "string");
+        assert_eq!(asc_type_for_value("[SomeEntity]"), "Array<string>");
+        assert_eq!(asc_type_for_value("[[SomeEntity]]"), "Array<Array<string>>");
+    }
+
+    #[test]
+    fn test_value_to_asc() {
+        // Scalar types
+        assert_eq!(value_to_asc("value", "String"), "value.toString()");
+        assert_eq!(value_to_asc("value", "BigInt"), "value.toBigInt()");
+        assert_eq!(value_to_asc("value", "Bytes"), "value.toBytes()");
+        assert_eq!(value_to_asc("value", "Boolean"), "value.toBoolean()");
+        assert_eq!(value_to_asc("value", "Int"), "value.toI32()");
+        assert_eq!(value_to_asc("value", "Int8"), "value.toI64()");
+
+        // Array types
+        assert_eq!(value_to_asc("value", "[Int]"), "value.toI32Array()");
+        assert_eq!(value_to_asc("value", "[String]"), "value.toStringArray()");
+        assert_eq!(value_to_asc("value", "[Bytes]"), "value.toBytesArray()");
+        assert_eq!(value_to_asc("value", "[BigInt]"), "value.toBigIntArray()");
+
+        // Matrix types
+        assert_eq!(value_to_asc("value", "[[Int]]"), "value.toI32Matrix()");
+        assert_eq!(
+            value_to_asc("value", "[[String]]"),
+            "value.toStringMatrix()"
+        );
+        assert_eq!(value_to_asc("value", "[[Bytes]]"), "value.toBytesMatrix()");
+        assert_eq!(
+            value_to_asc("value", "[[BigInt]]"),
+            "value.toBigIntMatrix()"
+        );
+        assert_eq!(
+            value_to_asc("value", "[[Boolean]]"),
+            "value.toBooleanMatrix()"
+        );
+        assert_eq!(value_to_asc("value", "[[Int8]]"), "value.toI64Matrix()");
+        assert_eq!(
+            value_to_asc("value", "[[BigDecimal]]"),
+            "value.toBigDecimalMatrix()"
+        );
+
+        // Entity reference matrices
+        assert_eq!(
+            value_to_asc("value", "[[SomeEntity]]"),
+            "value.toStringMatrix()"
+        );
+    }
+
+    #[test]
+    fn test_value_from_asc() {
+        // Scalar types
+        assert_eq!(value_from_asc("value", "String"), "Value.fromString(value)");
+        assert_eq!(value_from_asc("value", "BigInt"), "Value.fromBigInt(value)");
+        assert_eq!(value_from_asc("value", "Bytes"), "Value.fromBytes(value)");
+        assert_eq!(
+            value_from_asc("value", "Boolean"),
+            "Value.fromBoolean(value)"
+        );
+
+        // Array types
+        assert_eq!(
+            value_from_asc("value", "[Int]"),
+            "Value.fromI32Array(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[String]"),
+            "Value.fromStringArray(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[BigInt]"),
+            "Value.fromBigIntArray(value)"
+        );
+
+        // Matrix types
+        assert_eq!(
+            value_from_asc("value", "[[Int]]"),
+            "Value.fromI32Matrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[String]]"),
+            "Value.fromStringMatrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[Bytes]]"),
+            "Value.fromBytesMatrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[BigInt]]"),
+            "Value.fromBigIntMatrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[Boolean]]"),
+            "Value.fromBooleanMatrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[Int8]]"),
+            "Value.fromI64Matrix(value)"
+        );
+        assert_eq!(
+            value_from_asc("value", "[[BigDecimal]]"),
+            "Value.fromBigDecimalMatrix(value)"
+        );
+
+        // Entity reference matrices
+        assert_eq!(
+            value_from_asc("value", "[[SomeEntity]]"),
+            "Value.fromStringMatrix(value)"
+        );
+    }
+}
diff --git a/gnd/src/codegen/typescript.rs b/gnd/src/codegen/typescript.rs
new file mode 100644
index 00000000000..5ed19a9bd1b
--- /dev/null
+++ b/gnd/src/codegen/typescript.rs
@@ -0,0 +1,537 @@
+//! TypeScript/AssemblyScript code generation utilities.
+//!
+//! This module provides builder types for generating TypeScript/AssemblyScript code,
+//! matching the output format of the TS CLI's `codegen/typescript.ts`.
+
+use std::fmt::{self, Display};
+
+/// Note prepended to all generated files.
+pub const GENERATED_FILE_NOTE: &str = r#"
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+"#;
+
+/// A function/method parameter.
+#[derive(Debug, Clone)]
+pub struct Param {
+    pub name: String,
+    pub param_type: Box<TypeExpr>,
+    /// Optional default value for the parameter.
+    pub default_value: Option<String>,
+}
+
+impl Param {
+    pub fn new(name: impl Into<String>, param_type: impl Into<TypeExpr>) -> Self {
+        Self {
+            name: name.into(),
+            param_type: Box::new(param_type.into()),
+            default_value: None,
+        }
+    }
+
+    /// Create a parameter with a default value.
+    pub fn with_default(
+        name: impl Into<String>,
+        param_type: impl Into<TypeExpr>,
+        default: impl Into<String>,
+    ) -> Self {
+        Self {
+            name: name.into(),
+            param_type: Box::new(param_type.into()),
+            default_value: Some(default.into()),
+        }
+    }
+}
+
+impl Display for Param {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match &self.default_value {
+            Some(default) => write!(f, "{}: {} = {}", self.name, self.param_type, default),
+            None => write!(f, "{}: {}", self.name, self.param_type),
+        }
+    }
+}
+
+/// A type expression (named type, array type, or nullable type).
+#[derive(Debug, Clone)]
+pub enum TypeExpr {
+    Named(NamedType),
+    Array(ArrayType),
+    Nullable(NullableType),
+    /// Raw string type (for complex types like `ethereum.CallResult<T>`)
+    Raw(String),
+}
+
+impl From<NamedType> for TypeExpr {
+    fn from(t: NamedType) -> Self {
+        TypeExpr::Named(t)
+    }
+}
+
+impl From<ArrayType> for TypeExpr {
+    fn from(t: ArrayType) -> Self {
+        TypeExpr::Array(t)
+    }
+}
+
+impl From<NullableType> for TypeExpr {
+    fn from(t: NullableType) -> Self {
+        TypeExpr::Nullable(t)
+    }
+}
+
+impl From<&str> for TypeExpr {
+    fn from(s: &str) -> Self {
+        TypeExpr::Named(NamedType::new(s))
+    }
+}
+
+impl From<String> for TypeExpr {
+    fn from(s: String) -> Self {
+        TypeExpr::Named(NamedType::new(s))
+    }
+}
+
+impl Display for TypeExpr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            TypeExpr::Named(t) => write!(f, "{}", t),
+            TypeExpr::Array(t) => write!(f, "{}", t),
+            TypeExpr::Nullable(t) => write!(f, "{}", t),
+            TypeExpr::Raw(s) => write!(f, "{}", s),
+        }
+    }
+}
+
+/// A named type (e.g., `string`, `BigInt`, `MyEntity`).
+#[derive(Debug, Clone)]
+pub struct NamedType {
+    pub name: String,
+}
+
+impl NamedType {
+    pub fn new(name: impl Into<String>) -> Self {
+        Self { name: name.into() }
+    }
+
+    /// Capitalize the first letter of the type name.
+    pub fn capitalize(&mut self) -> &mut Self {
+        if let Some(c) = self.name.chars().next() {
+            self.name = c.to_uppercase().collect::<String>() + &self.name[c.len_utf8()..];
+        }
+        self
+    }
+
+    /// Returns true if this is a primitive AssemblyScript type.
+    pub fn is_primitive(&self) -> bool {
+        matches!(
+            self.name.as_str(),
+            "boolean"
+                | "u8"
+                | "i8"
+                | "u16"
+                | "i16"
+                | "u32"
+                | "i32"
+                | "u64"
+                | "i64"
+                | "f32"
+                | "f64"
+                | "usize"
+                | "isize"
+        )
+    }
+
+    /// Returns the default value for primitive types, or None if not a primitive.
+    pub fn get_primitive_default(&self) -> Option<&'static str> {
+        if !self.is_primitive() {
+            return None;
+        }
+        match self.name.as_str() {
+            "boolean" => Some("false"),
+            "u8" | "i8" | "u16" | "i16" | "u32" | "i32" | "u64" | "i64" | "f32" | "f64"
+            | "usize" | "isize" => Some("0"),
+            _ => None,
+        }
+    }
+}
+
+impl Display for NamedType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
+
+/// An array type (e.g., `Array<string>` or `Array<Array<string>>`).
+#[derive(Debug, Clone)]
+pub struct ArrayType {
+    pub inner: Box<TypeExpr>,
+}
+
+impl ArrayType {
+    /// Create a new array type from any inner type expression.
+    pub fn new(inner: impl Into<TypeExpr>) -> Self {
+        Self {
+            inner: Box::new(inner.into()),
+        }
+    }
+
+    /// Create a nested array type with the specified nesting depth.
+    /// depth=1 creates `Array<T>`, depth=2 creates `Array<Array<T>>`, etc.
+    pub fn with_depth(inner: impl Into<TypeExpr>, depth: u8) -> TypeExpr {
+        let mut result = inner.into();
+        for _ in 0..depth {
+            result = ArrayType::new(result).into();
+        }
+        result
+    }
+}
+
+impl Display for ArrayType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Array<{}>", self.inner)
+    }
+}
+
+/// A nullable type (e.g., `string | null`).
+#[derive(Debug, Clone)]
+pub struct NullableType {
+    pub inner: Box<TypeExpr>,
+}
+
+impl NullableType {
+    pub fn new(inner: impl Into<TypeExpr>) -> Self {
+        Self {
+            inner: Box::new(inner.into()),
+        }
+    }
+}
+
+impl Display for NullableType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} | null", self.inner)
+    }
+}
+
+/// A class method.
+#[derive(Debug, Clone)]
+pub struct Method {
+    pub name: String,
+    pub params: Vec<Param>,
+    pub return_type: Option<TypeExpr>,
+    pub body: String,
+    /// Optional documentation comment.
+    pub doc: Option<String>,
+}
+
+impl Method {
+    pub fn new(
+        name: impl Into<String>,
+        params: Vec<Param>,
+        return_type: Option<TypeExpr>,
+        body: impl Into<String>,
+    ) -> Self {
+        Self {
+            name: name.into(),
+            params,
+            return_type,
+            body: body.into(),
+            doc: None,
+        }
+    }
+
+    /// Add a documentation comment to the method.
+    pub fn with_doc(mut self, doc: impl Into<String>) -> Self {
+        self.doc = Some(doc.into());
+        self
+    }
+}
+
+impl Display for Method {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // Write doc comment if present
+        if let Some(doc) = &self.doc {
+            writeln!(f)?;
+            writeln!(f, "  /**")?;
+            writeln!(f, "   * {}", doc)?;
+            writeln!(f, "   */")?;
+        }
+        let params = self
+            .params
+            .iter()
+            .map(|p| p.to_string())
+            .collect::<Vec<_>>()
+            .join(", ");
+        let return_type = self
+            .return_type
+            .as_ref()
+            .map(|t| format!(": {}", t))
+            .unwrap_or_default();
+        if self.doc.is_some() {
+            // Already wrote newline for doc
+            write!(
+                f,
+                "  {}({}){} {{{}\n  }}\n",
+                self.name, params, return_type, self.body
+            )
+        } else {
+            write!(
+                f,
+                "\n  {}({}){} {{{}\n  }}\n",
+                self.name, params, return_type, self.body
+            )
+        }
+    }
+}
+
+/// A static class method.
+#[derive(Debug, Clone)]
+pub struct StaticMethod {
+    pub name: String,
+    pub params: Vec<Param>,
+    pub return_type: TypeExpr,
+    pub body: String,
+}
+
+impl StaticMethod {
+    pub fn new(
+        name: impl Into<String>,
+        params: Vec<Param>,
+        return_type: impl Into<TypeExpr>,
+        body: impl Into<String>,
+    ) -> Self {
+        Self {
+            name: name.into(),
+            params,
+            return_type: return_type.into(),
+            body: body.into(),
+        }
+    }
+}
+
+impl Display for StaticMethod {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let params = self
+            .params
+            .iter()
+            .map(|p| p.to_string())
+            .collect::<Vec<_>>()
+            .join(", ");
+        write!(
+            f,
+            "\n  static {}({}): {} {{{}\n  }}\n",
+            self.name, params, self.return_type, self.body
+        )
+    }
+}
+
+/// A class member (field).
+#[derive(Debug, Clone)]
+pub struct ClassMember {
+    pub name: String,
+    pub member_type: String,
+}
+
+impl ClassMember {
+    pub fn new(name: impl Into<String>, member_type: impl Into<String>) -> Self {
+        Self {
+            name: name.into(),
+            member_type: member_type.into(),
+        }
+    }
+}
+
+impl Display for ClassMember {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "  {}: {}", self.name, self.member_type)
+    }
+}
+
+/// Code that can be part of a class body (method or static method).
+#[derive(Debug, Clone)]
+pub enum ClassCode {
+    Method(Method),
+    StaticMethod(StaticMethod),
+}
+
+impl Display for ClassCode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ClassCode::Method(m) => write!(f, "{}", m),
+            ClassCode::StaticMethod(m) => write!(f, "{}", m),
+        }
+    }
+}
+
+/// A TypeScript/AssemblyScript class.
+#[derive(Debug, Clone)]
+pub struct Class {
+    pub name: String,
+    pub extends: Option<String>,
+    pub export: bool,
+    pub members: Vec<ClassMember>,
+    /// Methods in insertion order (regular and static)
+    code: Vec<ClassCode>,
+    // Keep separate vectors for backward compatibility with existing code
+    pub methods: Vec<Method>,
+    pub static_methods: Vec<StaticMethod>,
+}
+
+impl Class {
+    pub fn new(name: impl Into<String>) -> Self {
+        Self {
+            name: name.into(),
+            extends: None,
+            export: false,
+            members: Vec::new(),
+            code: Vec::new(),
+            methods: Vec::new(),
+            static_methods: Vec::new(),
+        }
+    }
+
+    pub fn exported(mut self) -> Self {
+        self.export = true;
+        self
+    }
+
+    pub fn extends(mut self, base: impl Into<String>) -> Self {
+        self.extends = Some(base.into());
+        self
+    }
+
+    pub fn add_member(&mut self, member: ClassMember) {
+        self.members.push(member);
+    }
+
+    pub fn add_method(&mut self, method: Method) {
+        self.code.push(ClassCode::Method(method.clone()));
+        self.methods.push(method);
+    }
+
+    pub fn add_static_method(&mut self, method: StaticMethod) {
+        self.code.push(ClassCode::StaticMethod(method.clone()));
+        self.static_methods.push(method);
+    }
+}
+
+impl Display for Class {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let export = if self.export { "export " } else { "" };
+        let extends = self
+            .extends
+            .as_ref()
+            .map(|e| format!(" extends {}", e))
+            .unwrap_or_default();
+
+        writeln!(f, "\n{}class {}{} {{", export, self.name, extends)?;
+
+        // Write members
+        for member in &self.members {
+            writeln!(f, "{}", member)?;
+        }
+
+        // Write methods in insertion order (maintains graph-cli output order)
+        for code in &self.code {
+            write!(f, "{}", code)?;
+        }
+
+        writeln!(f, "}}")
+    }
+}
+
+/// An import statement.
+#[derive(Debug, Clone)]
+pub struct ModuleImports {
+    pub names: Vec<String>,
+    pub module: String,
+}
+
+impl ModuleImports {
+    pub fn new(names: Vec<String>, module: impl Into<String>) -> Self {
+        Self {
+            names,
+            module: module.into(),
+        }
+    }
+
+    pub fn single(name: impl Into<String>, module: impl Into<String>) -> Self {
+        Self {
+            names: vec![name.into()],
+            module: module.into(),
+        }
+    }
+}
+
+impl Display for ModuleImports {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let names = self.names.join(", ");
+        write!(f, "import {{ {} }} from \"{}\"", names, self.module)
+    }
+}
+
+/// Helper functions matching the TS CLI API.
+pub fn klass(name: impl Into<String>) -> Class {
+    Class::new(name)
+}
+
+pub fn klass_member(name: impl Into<String>, member_type: impl Into<String>) -> ClassMember {
+    ClassMember::new(name, member_type)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    pub fn named_type(name: impl Into<String>) -> NamedType {
+        NamedType::new(name)
+    }
+
+    pub fn param(name: impl Into<String>, param_type: impl Into<TypeExpr>) -> Param {
+        Param::new(name, param_type)
+    }
+
+    pub fn method(
+        name: impl Into<String>,
+        params: Vec<Param>,
+        return_type: Option<TypeExpr>,
+        body: impl Into<String>,
+    ) -> Method {
+        Method::new(name, params, return_type, body)
+    }
+
+    #[test]
+    fn test_method() {
+        let m = method(
+            "save",
+            vec![],
+            Some(named_type("void").into()),
+            "\n    store.set('Entity', this.id, this)\n  ",
+        );
+        let output = m.to_string();
+        assert!(output.contains("save()"));
+        assert!(output.contains(": void"));
+        assert!(output.contains("store.set"));
+    }
+
+    #[test]
+    fn test_class() {
+        let mut c = klass("MyEntity").exported().extends("Entity");
+        c.add_method(method(
+            "constructor",
+            vec![param("id", named_type("string"))],
+            None,
+            "\n    super()\n    this.set('id', Value.fromString(id))\n  ",
+        ));
+        let output = c.to_string();
+        assert!(output.contains("export class MyEntity extends Entity"));
+        assert!(output.contains("constructor(id: string)"));
+    }
+
+    #[test]
+    fn test_is_primitive() {
+        assert!(named_type("boolean").is_primitive());
+        assert!(named_type("i32").is_primitive());
+        assert!(!named_type("string").is_primitive());
+        assert!(!named_type("BigInt").is_primitive());
+    }
+}
diff --git a/gnd/src/commands/add.rs b/gnd/src/commands/add.rs
new file mode 100644
index 00000000000..ef936884dfe
--- /dev/null
+++ b/gnd/src/commands/add.rs
@@ -0,0 +1,736 @@
+//! Add command for adding data sources to existing subgraphs.
+//!
+//! This command adds a new data source to an existing subgraph, generating
+//! the necessary manifest entries, schema types, and mapping stubs.
+
+use std::collections::HashSet;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use anyhow::{Context, Result, anyhow};
+use clap::Parser;
+use graphql_tools::parser::schema as gql;
+use serde_json::Value as JsonValue;
+
+use crate::config::networks::update_networks_file;
+use crate::formatter::format_typescript;
+use crate::output::{Step, step};
+use crate::scaffold::manifest::{EventInfo, extract_events_from_abi};
+use crate::scaffold::{
+    MAPPING_API_VERSION, ResolvedEvent, ScaffoldOptions, disambiguate_events,
+    generate_event_entity, generate_event_handlers, to_kebab_case,
+};
+use crate::services::ContractService;
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Add a data source to an existing subgraph")]
+pub struct AddOpt {
+    /// Contract address to add
+    #[clap()]
+    pub address: String,
+
+    /// Path to the subgraph manifest
+    #[clap(default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// Path to the contract ABI
+    #[clap(long)]
+    pub abi: Option<PathBuf>,
+
+    /// Name for the new data source
+    #[clap(long)]
+    pub contract_name: Option<String>,
+
+    /// Merge entities with the same name (off by default)
+    #[clap(long)]
+    pub merge_entities: bool,
+
+    /// Path to the networks.json file
+    #[clap(long, default_value = "networks.json")]
+    pub network_file: PathBuf,
+
+    /// Block number to start indexing from
+    #[clap(long)]
+    pub start_block: Option<String>,
+
+    /// Suppress "Next steps" output (used when called from init loop)
+    #[clap(skip)]
+    pub quiet: bool,
+}
+
+/// Run the add command.
+pub async fn run_add(opt: AddOpt) -> Result<()> {
+    // Validate address format first
+    if !opt.address.starts_with("0x") || opt.address.len() != 42 {
+        return Err(anyhow!(
+            "Invalid contract address '{}'. Expected format: 0x followed by 40 hex characters.",
+            opt.address
+        ));
+    }
+
+    // Check if manifest exists
+    if !opt.manifest.exists() {
+        return Err(anyhow!(
+            "Manifest file '{}' not found. Run 'gnd init' first to create a subgraph.",
+            opt.manifest.display()
+        ));
+    }
+
+    step(
+        Step::Load,
+        &format!("Adding data source for {}", opt.address),
+    );
+
+    // Load existing manifest to get network
+    let manifest_content = fs::read_to_string(&opt.manifest)
+        .with_context(|| format!("Failed to read manifest: {}", opt.manifest.display()))?;
+
+    let manifest: serde_yaml::Value = serde_yaml::from_str(&manifest_content)
+        .with_context(|| format!("Failed to parse manifest: {}", opt.manifest.display()))?;
+
+    // Get network from manifest's first data source
+    let network = manifest
+        .get("dataSources")
+        .and_then(|ds| ds.as_sequence())
+        .and_then(|seq| seq.first())
+        .and_then(|first| first.get("network"))
+        .and_then(|n| n.as_str())
+        .map(String::from)
+        .unwrap_or_else(|| "mainnet".to_string());
+
+    // Fetch or load ABI
+    let (abi, contract_name, start_block) = get_contract_info(&opt, &network).await?;
+
+    // A data source / template name must be unique within the subgraph.
+    if existing_source_names(&manifest).contains(&contract_name) {
+        return Err(anyhow!(
+            "Data source or template named '{}' already exists. Choose a different name with --contract-name.",
+            contract_name
+        ));
+    }
+
+    // Get project directory
+    let project_dir = crate::manifest::manifest_dir(&opt.manifest);
+
+    // Create scaffold options for code generation
+    let scaffold_options = ScaffoldOptions {
+        address: Some(opt.address.clone()),
+        network: network.clone(),
+        contract_name: contract_name.clone(),
+        subgraph_name: "subgraph".to_string(),
+        start_block,
+        abi: Some(abi.clone()),
+        index_events: true, // Always index events for add command
+    };
+
+    // Extract events from the ABI and resolve their names against the entities
+    // already present in the subgraph (handles overloads and collisions). Both
+    // the manifest's entity lists and the types declared in schema.graphql count
+    // as existing, since either can be the source of a name collision.
+    let events = extract_events_from_abi(&scaffold_options);
+    let mut existing = existing_entities(&manifest);
+    existing.extend(schema_entity_types(project_dir, &manifest));
+    let resolved = resolve_events(events, &existing, &contract_name, opt.merge_entities)?;
+
+    // Add ABI file
+    add_abi_file(project_dir, &contract_name, &abi)?;
+
+    // Add mapping file
+    add_mapping_file(project_dir, &contract_name, &resolved)?;
+
+    // Update manifest
+    update_manifest(
+        &opt.manifest,
+        &opt.address,
+        &contract_name,
+        &network,
+        start_block,
+        &resolved,
+    )?;
+
+    // Declare the new event entities in the schema so codegen/build succeed.
+    add_schema_entities(project_dir, &manifest, &resolved)?;
+
+    // Update networks.json if the subgraph uses one.
+    let networks_path = project_dir.join(&opt.network_file);
+    if networks_path.exists() {
+        update_networks_file(
+            &networks_path,
+            &network,
+            &contract_name,
+            &opt.address,
+            start_block,
+        )?;
+        step(
+            Step::Write,
+            &format!("Updated {}", opt.network_file.display()),
+        );
+    }
+
+    step(Step::Done, &format!("Added data source: {}", contract_name));
+
+    if !opt.quiet {
+        println!();
+        println!("Next steps:");
+        println!("  gnd codegen");
+        println!("  gnd build");
+    }
+
+    Ok(())
+}
+
+/// Get contract info (ABI, name, start block) from local file or network.
+async fn get_contract_info(
+    opt: &AddOpt,
+    network: &str,
+) -> Result<(JsonValue, String, Option<u64>)> {
+    if let Some(abi_path) = &opt.abi {
+        // Load ABI from file
+        step(
+            Step::Load,
+            &format!("Loading ABI from {}", abi_path.display()),
+        );
+
+        let abi_str = fs::read_to_string(abi_path)
+            .with_context(|| format!("Failed to read ABI file: {}", abi_path.display()))?;
+
+        let abi: JsonValue = serde_json::from_str(&abi_str)
+            .with_context(|| format!("Failed to parse ABI file: {}", abi_path.display()))?;
+
+        let contract_name = opt.contract_name.clone().unwrap_or_else(|| {
+            abi_path
+                .file_stem()
+                .and_then(|s| s.to_str())
+                .map(|s| s.to_string())
+                .unwrap_or_else(|| "Contract".to_string())
+        });
+
+        let start_block = opt.start_block.as_ref().and_then(|s| s.parse::<u64>().ok());
+
+        Ok((abi, contract_name, start_block))
+    } else {
+        // Fetch from network
+        step(
+            Step::Load,
+            &format!("Fetching ABI from {} network", network),
+        );
+
+        let contract_info = {
+            let service = ContractService::load()
+                .await
+                .context("Failed to load contract service")?;
+
+            service
+                .get_contract_info(network, &opt.address)
+                .await
+                .context("Failed to fetch contract info")?
+        };
+
+        let contract_name = opt.contract_name.clone().unwrap_or(contract_info.name);
+
+        let start_block = opt
+            .start_block
+            .as_ref()
+            .and_then(|s| s.parse::<u64>().ok())
+            .or(contract_info.start_block);
+
+        Ok((contract_info.abi, contract_name, start_block))
+    }
+}
+
+/// Add ABI file to the abis directory.
+fn add_abi_file(project_dir: &Path, contract_name: &str, abi: &JsonValue) -> Result<()> {
+    let abis_dir = project_dir.join("abis");
+    fs::create_dir_all(&abis_dir).context("Failed to create abis directory")?;
+
+    let abi_file = abis_dir.join(format!("{}.json", contract_name));
+    let abi_str = serde_json::to_string_pretty(abi).context("Failed to serialize ABI")?;
+
+    step(
+        Step::Write,
+        &format!("Writing ABI to {}", abi_file.display()),
+    );
+    fs::write(&abi_file, abi_str).context("Failed to write ABI file")?;
+
+    Ok(())
+}
+
+/// Add mapping file for the new data source.
+fn add_mapping_file(
+    project_dir: &Path,
+    contract_name: &str,
+    events: &[ResolvedEvent],
+) -> Result<()> {
+    let src_dir = project_dir.join("src");
+    fs::create_dir_all(&src_dir).context("Failed to create src directory")?;
+
+    let mapping_file = src_dir.join(format!("{}.ts", to_kebab_case(contract_name)));
+
+    if mapping_file.exists() {
+        step(
+            Step::Skip,
+            &format!("Mapping file {} already exists", mapping_file.display()),
+        );
+        return Ok(());
+    }
+
+    let mapping_content = generate_event_handlers(contract_name, events);
+    let formatted = format_typescript(&mapping_content).unwrap_or(mapping_content);
+
+    step(
+        Step::Write,
+        &format!("Writing mapping to {}", mapping_file.display()),
+    );
+    fs::write(&mapping_file, formatted).context("Failed to write mapping file")?;
+
+    Ok(())
+}
+
+/// Collect the names of all existing data sources and templates in the manifest.
+fn existing_source_names(manifest: &serde_yaml::Value) -> HashSet<String> {
+    let mut names = HashSet::new();
+    for key in ["dataSources", "templates"] {
+        if let Some(seq) = manifest.get(key).and_then(|v| v.as_sequence()) {
+            for item in seq {
+                if let Some(name) = item.get("name").and_then(|n| n.as_str()) {
+                    names.insert(name.to_string());
+                }
+            }
+        }
+    }
+    names
+}
+
+/// Collect the entity names already declared by existing data sources / templates.
+fn existing_entities(manifest: &serde_yaml::Value) -> HashSet<String> {
+    let mut entities = HashSet::new();
+    for key in ["dataSources", "templates"] {
+        if let Some(seq) = manifest.get(key).and_then(|v| v.as_sequence()) {
+            for item in seq {
+                if let Some(list) = item
+                    .get("mapping")
+                    .and_then(|m| m.get("entities"))
+                    .and_then(|e| e.as_sequence())
+                {
+                    for entity in list.iter().filter_map(|e| e.as_str()) {
+                        entities.insert(entity.to_string());
+                    }
+                }
+            }
+        }
+    }
+    entities
+}
+
+/// Collect the `@entity` type names declared in the subgraph's schema.graphql.
+///
+/// The schema is the real source of truth for declared types, so a hand-written
+/// `type Foo @entity` that no mapping lists in its `entities` still counts as a
+/// collision. Returns empty on a missing or unparseable schema (falling back to
+/// the manifest's entity lists).
+fn schema_entity_types(project_dir: &Path, manifest: &serde_yaml::Value) -> HashSet<String> {
+    let schema_file = manifest
+        .get("schema")
+        .and_then(|s| s.get("file"))
+        .and_then(|f| f.as_str())
+        .unwrap_or("schema.graphql");
+    let Ok(content) = fs::read_to_string(project_dir.join(schema_file)) else {
+        return HashSet::new();
+    };
+    entity_types_in_schema(&content)
+}
+
+/// Parse GraphQL schema text and return the names of object types marked
+/// `@entity`. Returns empty if the schema does not parse.
+fn entity_types_in_schema(content: &str) -> HashSet<String> {
+    let Ok(ast) = gql::parse_schema::<String>(content) else {
+        return HashSet::new();
+    };
+    ast.definitions
+        .into_iter()
+        .filter_map(|def| match def {
+            gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj))
+                if obj.directives.iter().any(|d| d.name == "entity") =>
+            {
+                Some(obj.name)
+            }
+            _ => None,
+        })
+        .collect()
+}
+
+/// Resolve event names against the entities already present in the subgraph.
+///
+/// - Events overloaded within this ABI are disambiguated (`Transfer`, `Transfer1`).
+/// - An event whose name collides with an existing entity is either merged into
+///   that entity (`merge_entities`: reuse it, keeping the handler so this
+///   contract's events are still indexed, but don't redeclare the type) or
+///   renamed with the contract prefix so both entities can coexist.
+fn resolve_events(
+    events: Vec<EventInfo>,
+    existing: &HashSet<String>,
+    contract_name: &str,
+    merge_entities: bool,
+) -> Result<Vec<ResolvedEvent>> {
+    let mut resolved = disambiguate_events(events);
+
+    for r in &mut resolved {
+        // Check the name we would actually declare (the disambiguated alias),
+        // not the raw event name, so an overload alias like `Transfer1` that
+        // collides with an existing entity is still caught.
+        if !existing.contains(&r.entity_name) {
+            continue;
+        }
+        if merge_entities {
+            // Reuse the existing entity (entity_name already equals it). Merge is
+            // by name only, so a signature mismatch surfaces at codegen/build.
+            r.declare_in_schema = false;
+        } else {
+            let prefixed = format!("{}{}", contract_name, r.alias);
+            if existing.contains(&prefixed) {
+                return Err(anyhow!(
+                    "Entity '{}' already exists; cannot rename '{}' to avoid a collision. Choose a different contract name.",
+                    prefixed,
+                    r.entity_name
+                ));
+            }
+            r.entity_name = prefixed;
+        }
+    }
+
+    Ok(resolved)
+}
+
+/// Append entity type definitions for the new events to the subgraph schema.
+///
+/// The mapping and manifest reference one entity per event; without this the
+/// referenced types never exist in schema.graphql and codegen/build fail.
+fn add_schema_entities(
+    project_dir: &Path,
+    manifest: &serde_yaml::Value,
+    events: &[ResolvedEvent],
+) -> Result<()> {
+    let mut additions = String::new();
+    for resolved in events {
+        // Reused entities already exist in the schema; don't redeclare them.
+        if !resolved.declare_in_schema {
+            continue;
+        }
+        additions.push('\n');
+        additions.push_str(&generate_event_entity(
+            &resolved.entity_name,
+            &resolved.event.inputs,
+        ));
+        additions.push('\n');
+    }
+
+    if additions.is_empty() {
+        return Ok(());
+    }
+
+    let schema_file = manifest
+        .get("schema")
+        .and_then(|s| s.get("file"))
+        .and_then(|f| f.as_str())
+        .unwrap_or("schema.graphql");
+    let schema_path = project_dir.join(schema_file);
+
+    step(Step::Write, &format!("Updating {}", schema_path.display()));
+
+    use std::io::Write;
+    let mut file = fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(&schema_path)
+        .with_context(|| format!("Failed to open schema file: {}", schema_path.display()))?;
+    file.write_all(additions.as_bytes())
+        .context("Failed to append entities to schema")?;
+
+    Ok(())
+}
+
+/// Update the manifest with the new data source.
+fn update_manifest(
+    manifest_path: &Path,
+    address: &str,
+    contract_name: &str,
+    network: &str,
+    start_block: Option<u64>,
+    events: &[ResolvedEvent],
+) -> Result<()> {
+    let content = fs::read_to_string(manifest_path).context("Failed to read manifest")?;
+
+    let mut manifest: serde_yaml::Value =
+        serde_yaml::from_str(&content).context("Failed to parse manifest")?;
+
+    // Build the new data source
+    let mut source = serde_yaml::Mapping::new();
+    source.insert(
+        serde_yaml::Value::String("abi".to_string()),
+        serde_yaml::Value::String(contract_name.to_string()),
+    );
+    source.insert(
+        serde_yaml::Value::String("address".to_string()),
+        serde_yaml::Value::String(address.to_string()),
+    );
+    if let Some(block) = start_block {
+        source.insert(
+            serde_yaml::Value::String("startBlock".to_string()),
+            serde_yaml::Value::Number(block.into()),
+        );
+    }
+
+    // Build event handlers
+    let mut event_handlers = Vec::new();
+    for resolved in events {
+        let mut handler = serde_yaml::Mapping::new();
+        handler.insert(
+            serde_yaml::Value::String("event".to_string()),
+            serde_yaml::Value::String(resolved.event.signature.clone()),
+        );
+        handler.insert(
+            serde_yaml::Value::String("handler".to_string()),
+            serde_yaml::Value::String(format!("handle{}", resolved.alias)),
+        );
+        event_handlers.push(serde_yaml::Value::Mapping(handler));
+    }
+
+    // Build entities list
+    let entities: Vec<serde_yaml::Value> = events
+        .iter()
+        .map(|e| serde_yaml::Value::String(e.entity_name.clone()))
+        .collect();
+
+    // Build ABI entry
+    let mut abi_entry = serde_yaml::Mapping::new();
+    abi_entry.insert(
+        serde_yaml::Value::String("name".to_string()),
+        serde_yaml::Value::String(contract_name.to_string()),
+    );
+    abi_entry.insert(
+        serde_yaml::Value::String("file".to_string()),
+        serde_yaml::Value::String(format!("./abis/{}.json", contract_name)),
+    );
+
+    // Build mapping section
+    let mut mapping = serde_yaml::Mapping::new();
+    mapping.insert(
+        serde_yaml::Value::String("kind".to_string()),
+        serde_yaml::Value::String("ethereum/events".to_string()),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("apiVersion".to_string()),
+        serde_yaml::Value::String(MAPPING_API_VERSION.to_string()),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("language".to_string()),
+        serde_yaml::Value::String("wasm/assemblyscript".to_string()),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("entities".to_string()),
+        serde_yaml::Value::Sequence(entities),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("abis".to_string()),
+        serde_yaml::Value::Sequence(vec![serde_yaml::Value::Mapping(abi_entry)]),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("eventHandlers".to_string()),
+        serde_yaml::Value::Sequence(event_handlers),
+    );
+    mapping.insert(
+        serde_yaml::Value::String("file".to_string()),
+        serde_yaml::Value::String(format!("./src/{}.ts", to_kebab_case(contract_name))),
+    );
+
+    // Build the data source
+    let mut data_source = serde_yaml::Mapping::new();
+    data_source.insert(
+        serde_yaml::Value::String("kind".to_string()),
+        serde_yaml::Value::String("ethereum".to_string()),
+    );
+    data_source.insert(
+        serde_yaml::Value::String("name".to_string()),
+        serde_yaml::Value::String(contract_name.to_string()),
+    );
+    data_source.insert(
+        serde_yaml::Value::String("network".to_string()),
+        serde_yaml::Value::String(network.to_string()),
+    );
+    data_source.insert(
+        serde_yaml::Value::String("source".to_string()),
+        serde_yaml::Value::Mapping(source),
+    );
+    data_source.insert(
+        serde_yaml::Value::String("mapping".to_string()),
+        serde_yaml::Value::Mapping(mapping),
+    );
+
+    // Add to dataSources array
+    let data_sources = manifest
+        .get_mut("dataSources")
+        .and_then(|ds| ds.as_sequence_mut())
+        .ok_or_else(|| anyhow!("Manifest missing dataSources array"))?;
+
+    data_sources.push(serde_yaml::Value::Mapping(data_source));
+
+    // Write back
+    let updated = serde_yaml::to_string(&manifest)?;
+    step(Step::Write, "Updating subgraph.yaml");
+    fs::write(manifest_path, updated).context("Failed to write manifest")?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_invalid_address() {
+        let opt = AddOpt {
+            address: "invalid".to_string(),
+            manifest: PathBuf::from("subgraph.yaml"),
+            abi: None,
+            contract_name: None,
+            merge_entities: false,
+            network_file: PathBuf::from("networks.json"),
+            start_block: None,
+            quiet: false,
+        };
+
+        let result = run_add(opt).await;
+        assert!(result.is_err());
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("Invalid contract address")
+        );
+    }
+
+    #[tokio::test]
+    async fn test_missing_manifest() {
+        let opt = AddOpt {
+            address: "0x1234567890123456789012345678901234567890".to_string(),
+            manifest: PathBuf::from("nonexistent.yaml"),
+            abi: None,
+            contract_name: None,
+            merge_entities: false,
+            network_file: PathBuf::from("networks.json"),
+            start_block: None,
+            quiet: false,
+        };
+
+        let result = run_add(opt).await;
+        assert!(result.is_err());
+        assert!(result.unwrap_err().to_string().contains("Manifest file"));
+    }
+
+    fn ev(name: &str) -> EventInfo {
+        EventInfo {
+            name: name.to_string(),
+            signature: format!("{}()", name),
+            inputs: vec![],
+        }
+    }
+
+    fn entities(names: &[&str]) -> HashSet<String> {
+        names.iter().map(|s| s.to_string()).collect()
+    }
+
+    #[test]
+    fn test_resolve_events_no_collision() {
+        let resolved =
+            resolve_events(vec![ev("Transfer")], &entities(&[]), "Token", false).unwrap();
+        assert_eq!(resolved.len(), 1);
+        assert_eq!(resolved[0].alias, "Transfer");
+        assert_eq!(resolved[0].entity_name, "Transfer");
+        assert!(resolved[0].declare_in_schema);
+    }
+
+    #[test]
+    fn test_resolve_events_overload_disambiguates() {
+        // Two events named Transfer in one ABI get distinct aliases.
+        let resolved = resolve_events(
+            vec![ev("Transfer"), ev("Transfer")],
+            &entities(&[]),
+            "Token",
+            false,
+        )
+        .unwrap();
+        assert_eq!(resolved[0].alias, "Transfer");
+        assert_eq!(resolved[1].alias, "Transfer1");
+        assert_eq!(resolved[1].entity_name, "Transfer1");
+    }
+
+    #[test]
+    fn test_resolve_events_collision_merge_reuses() {
+        let resolved = resolve_events(
+            vec![ev("Transfer")],
+            &entities(&["Transfer"]),
+            "Token",
+            true,
+        )
+        .unwrap();
+        // Reuse the existing entity, don't redeclare it, but keep the handler.
+        assert_eq!(resolved[0].entity_name, "Transfer");
+        assert!(!resolved[0].declare_in_schema);
+    }
+
+    #[test]
+    fn test_resolve_events_collision_no_merge_renames() {
+        let resolved = resolve_events(
+            vec![ev("Transfer")],
+            &entities(&["Transfer"]),
+            "Token",
+            false,
+        )
+        .unwrap();
+        assert_eq!(resolved[0].entity_name, "TokenTransfer");
+        assert!(resolved[0].declare_in_schema);
+    }
+
+    #[test]
+    fn test_resolve_events_collision_renamed_also_exists_errors() {
+        let result = resolve_events(
+            vec![ev("Transfer")],
+            &entities(&["Transfer", "TokenTransfer"]),
+            "Token",
+            false,
+        );
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_resolve_events_overload_alias_collision_renames() {
+        // The second overload's disambiguated alias (Transfer1) collides with an
+        // existing entity; the collision must be detected on the alias, not the
+        // raw event name.
+        let resolved = resolve_events(
+            vec![ev("Transfer"), ev("Transfer")],
+            &entities(&["Transfer1"]),
+            "Token",
+            false,
+        )
+        .unwrap();
+        assert_eq!(resolved[0].entity_name, "Transfer");
+        assert_eq!(resolved[1].alias, "Transfer1");
+        assert_eq!(resolved[1].entity_name, "TokenTransfer1");
+    }
+
+    #[test]
+    fn test_entity_types_in_schema() {
+        let schema = r#"
+            type Foo @entity { id: Bytes! }
+            type Bar @entity(immutable: true) { id: Bytes! }
+            type NotAnEntity { id: Bytes! }
+        "#;
+        let types = entity_types_in_schema(schema);
+        assert!(types.contains("Foo"));
+        assert!(types.contains("Bar"));
+        assert!(!types.contains("NotAnEntity"));
+        // A schema that doesn't parse yields no types rather than erroring.
+        assert!(entity_types_in_schema("this is not graphql {{{").is_empty());
+    }
+}
diff --git a/gnd/src/commands/auth.rs b/gnd/src/commands/auth.rs
new file mode 100644
index 00000000000..925aac2de02
--- /dev/null
+++ b/gnd/src/commands/auth.rs
@@ -0,0 +1,182 @@
+use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
+
+use anyhow::{Context, Result};
+use clap::Parser;
+use url::Url;
+
+/// Default Subgraph Studio deploy URL
+const SUBGRAPH_STUDIO_URL: &str = "https://api.studio.thegraph.com/deploy/";
+
+/// Get the path to the config file (~/.graph-cli.json)
+fn config_path() -> PathBuf {
+    std::env::home_dir()
+        .expect("Could not determine home directory")
+        .join(".graph-cli.json")
+}
+
+/// Normalize a node URL by parsing and re-serializing it
+fn normalize_node_url(node: &str) -> Result<String> {
+    let url = Url::parse(node).context("Invalid node URL")?;
+    Ok(url.to_string())
+}
+
+/// Load the config file from a specific path, returning an empty map if it doesn't exist
+fn load_config_from(path: &PathBuf) -> Result<HashMap<String, String>> {
+    if !path.exists() {
+        return Ok(HashMap::new());
+    }
+
+    let content = fs::read_to_string(path)
+        .with_context(|| format!("Failed to read config file: {}", path.display()))?;
+
+    serde_json::from_str(&content)
+        .with_context(|| format!("Failed to parse config file: {}", path.display()))
+}
+
+/// Save the config file to a specific path
+fn save_config_to(path: &PathBuf, config: &HashMap<String, String>) -> Result<()> {
+    let content = serde_json::to_string(config).context("Failed to serialize config")?;
+    fs::write(path, content)
+        .with_context(|| format!("Failed to write config file: {}", path.display()))
+}
+
+/// Save a deploy key for a node (uses default config path)
+pub fn save_deploy_key(node: &str, deploy_key: &str) -> Result<()> {
+    save_deploy_key_to(&config_path(), node, deploy_key)
+}
+
+/// Save a deploy key for a node to a specific config file
+fn save_deploy_key_to(config_file: &PathBuf, node: &str, deploy_key: &str) -> Result<()> {
+    let normalized_node = normalize_node_url(node)?;
+    let mut config = load_config_from(config_file)?;
+    config.insert(normalized_node, deploy_key.to_string());
+    save_config_to(config_file, &config)
+}
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Set the deploy key for a Graph Node")]
+pub struct AuthOpt {
+    /// The deploy key to store
+    #[clap(value_name = "DEPLOY_KEY")]
+    pub deploy_key: String,
+
+    /// The Graph Node URL to authenticate with
+    #[clap(
+        long,
+        short = 'g',
+        value_name = "URL",
+        default_value = SUBGRAPH_STUDIO_URL,
+        help = "Graph Node URL"
+    )]
+    pub node: String,
+}
+
+/// Validate that a deploy key looks like a valid Subgraph Studio key (32 hex chars)
+fn is_valid_studio_key(key: &str) -> bool {
+    key.len() == 32 && key.chars().all(|c| c.is_ascii_hexdigit())
+}
+
+/// Run the auth command
+pub fn run_auth(opt: AuthOpt) -> Result<()> {
+    // Validate the deploy key format for Studio
+    if opt.node == SUBGRAPH_STUDIO_URL && !is_valid_studio_key(&opt.deploy_key) {
+        println!(
+            "Warning: Deploy key doesn't look like a valid Subgraph Studio key (expected 32 hex characters)"
+        );
+    }
+
+    save_deploy_key(&opt.node, &opt.deploy_key)?;
+
+    let normalized_node = normalize_node_url(&opt.node)?;
+    println!("✔ Deploy key set for {}", normalized_node);
+
+    Ok(())
+}
+
+/// Get the deploy key for a node, if one is saved (uses default config path)
+pub fn get_deploy_key(node: &str) -> Result<Option<String>> {
+    get_deploy_key_from(&config_path(), node)
+}
+
+/// Get the deploy key for a node from a specific config file
+fn get_deploy_key_from(config_file: &PathBuf, node: &str) -> Result<Option<String>> {
+    let normalized_node = normalize_node_url(node)?;
+    let config = load_config_from(config_file)?;
+    Ok(config.get(&normalized_node).cloned())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_normalize_node_url() {
+        assert_eq!(
+            normalize_node_url("https://example.com").unwrap(),
+            "https://example.com/"
+        );
+        assert_eq!(
+            normalize_node_url("https://example.com/").unwrap(),
+            "https://example.com/"
+        );
+        assert_eq!(
+            normalize_node_url("https://api.studio.thegraph.com/deploy/").unwrap(),
+            "https://api.studio.thegraph.com/deploy/"
+        );
+    }
+
+    #[test]
+    fn test_is_valid_studio_key() {
+        assert!(is_valid_studio_key("0123456789abcdef0123456789abcdef"));
+        assert!(is_valid_studio_key("ABCDEF0123456789abcdef0123456789"));
+        assert!(!is_valid_studio_key("too-short"));
+        assert!(!is_valid_studio_key("0123456789abcdef0123456789abcdefXX")); // too long
+        assert!(!is_valid_studio_key("0123456789abcdef0123456789abcdeg")); // invalid char
+    }
+
+    #[test]
+    fn test_save_and_get_deploy_key() {
+        let temp_dir = tempfile::TempDir::new().unwrap();
+        let config_file = temp_dir.path().join(".graph-cli.json");
+
+        let node = "https://example.com/deploy/";
+        let key = "test-deploy-key-12345";
+
+        // Initially no key
+        assert!(get_deploy_key_from(&config_file, node).unwrap().is_none());
+
+        // Save key
+        save_deploy_key_to(&config_file, node, key).unwrap();
+
+        // Get key back
+        assert_eq!(
+            get_deploy_key_from(&config_file, node).unwrap(),
+            Some(key.to_string())
+        );
+    }
+
+    #[test]
+    fn test_multiple_nodes() {
+        let temp_dir = tempfile::TempDir::new().unwrap();
+        let config_file = temp_dir.path().join(".graph-cli.json");
+
+        let node1 = "https://node1.example.com/";
+        let node2 = "https://node2.example.com/";
+        let key1 = "key1";
+        let key2 = "key2";
+
+        save_deploy_key_to(&config_file, node1, key1).unwrap();
+        save_deploy_key_to(&config_file, node2, key2).unwrap();
+
+        assert_eq!(
+            get_deploy_key_from(&config_file, node1).unwrap(),
+            Some(key1.to_string())
+        );
+        assert_eq!(
+            get_deploy_key_from(&config_file, node2).unwrap(),
+            Some(key2.to_string())
+        );
+    }
+}
diff --git a/gnd/src/commands/build.rs b/gnd/src/commands/build.rs
new file mode 100644
index 00000000000..b33731330aa
--- /dev/null
+++ b/gnd/src/commands/build.rs
@@ -0,0 +1,930 @@
+//! Build command for compiling subgraph mappings to WebAssembly.
+//!
+//! This command compiles AssemblyScript mappings to WASM using the asc compiler,
+//! copies all required files to the build directory, and optionally uploads
+//! the result to IPFS.
+
+use std::collections::HashMap;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use anyhow::{Context, Result, anyhow};
+use clap::Parser;
+use sha1::{Digest, Sha1};
+
+use crate::abi::normalize_abi_json;
+use crate::compiler::{AscCompileOptions, compile_mapping, find_graph_ts};
+use crate::config::{apply_network_config, get_network_config, load_networks_config};
+use crate::manifest::{DataSource, Manifest, Template, load_manifest, resolve_path};
+use crate::migrations;
+use crate::output::{Step, step};
+use crate::services::IpfsClient;
+use crate::validation::{
+    collect_handler_names, collect_template_handler_names, format_manifest_errors,
+    format_schema_errors, validate_manifest, validate_schema, validate_wasm_handlers,
+};
+use crate::watch::watch_and_run;
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Build a subgraph and (optionally) upload it to IPFS")]
+pub struct BuildOpt {
+    /// Path to the subgraph manifest
+    #[clap(default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// Output directory for build results
+    #[clap(short = 'o', long, default_value = "build/")]
+    pub output_dir: PathBuf,
+
+    /// Output format for mappings (wasm or wast)
+    #[clap(short = 't', long, default_value = "wasm")]
+    pub output_format: String,
+
+    /// Skip subgraph migrations
+    #[clap(long)]
+    pub skip_migrations: bool,
+
+    /// Rebuild when subgraph files change
+    #[clap(short = 'w', long)]
+    pub watch: bool,
+
+    /// IPFS node URL to upload build results to
+    #[clap(short = 'i', long)]
+    pub ipfs: Option<String>,
+
+    /// Network configuration to use from the networks config file
+    #[clap(long)]
+    pub network: Option<String>,
+
+    /// Networks config file path
+    #[clap(long, default_value = "networks.json")]
+    pub network_file: PathBuf,
+
+    /// Skip the asc version check (use with caution)
+    #[clap(long, env = "GND_SKIP_ASC_VERSION_CHECK")]
+    pub skip_asc_version_check: bool,
+}
+
+/// Result of a build operation.
+#[derive(Debug)]
+pub struct BuildResult {
+    /// IPFS hash of the uploaded manifest (if IPFS upload was requested)
+    pub ipfs_hash: Option<String>,
+}
+
+/// Run the build command.
+pub async fn run_build(opt: BuildOpt) -> Result<Option<String>> {
+    // Validate output format
+    if opt.output_format != "wasm" && opt.output_format != "wast" {
+        return Err(anyhow!(
+            "Invalid output format '{}'. Must be 'wasm' or 'wast'",
+            opt.output_format
+        ));
+    }
+
+    if opt.watch {
+        watch_and_build(&opt).await?;
+        Ok(None)
+    } else {
+        let result = build_subgraph(&opt).await?;
+        Ok(result.ipfs_hash)
+    }
+}
+
+/// Watch subgraph files and rebuild on changes.
+async fn watch_and_build(opt: &BuildOpt) -> Result<()> {
+    // Get files to watch (need to load manifest first)
+    let manifest = load_manifest(&opt.manifest)?;
+    let files_to_watch = get_files_to_watch(&opt.manifest, &manifest);
+
+    watch_and_run(
+        files_to_watch,
+        "Watching subgraph files for changes...",
+        || async { build_subgraph(opt).await.map(|_| ()) },
+    )
+    .await
+}
+
+/// Get the list of files to watch for changes.
+fn get_files_to_watch(manifest_path: &Path, manifest: &Manifest) -> Vec<PathBuf> {
+    let mut files = vec![manifest_path.to_path_buf()];
+
+    // Add schema file
+    if let Some(schema_path) = &manifest.schema {
+        files.push(resolve_path(manifest_path, schema_path));
+    }
+
+    // Add mapping files
+    for ds in &manifest.data_sources {
+        if let Some(mapping) = &ds.mapping_file {
+            files.push(resolve_path(manifest_path, mapping));
+        }
+        for abi in &ds.abis {
+            files.push(resolve_path(manifest_path, &abi.file));
+        }
+    }
+
+    // Add template mapping files
+    for template in &manifest.templates {
+        if let Some(mapping) = &template.mapping_file {
+            files.push(resolve_path(manifest_path, mapping));
+        }
+    }
+
+    files
+}
+
+/// Build the subgraph.
+async fn build_subgraph(opt: &BuildOpt) -> Result<BuildResult> {
+    // Apply migrations unless skipped
+    if !opt.skip_migrations {
+        migrations::apply_migrations(&opt.manifest)?;
+    }
+
+    // Apply network configuration if specified
+    if let Some(network) = &opt.network {
+        apply_network_to_manifest(&opt.manifest, network, &opt.network_file)?;
+    }
+
+    // Load the manifest
+    let manifest = load_manifest(&opt.manifest)?;
+    let source_dir = crate::manifest::manifest_dir(&opt.manifest).to_path_buf();
+
+    // Validate manifest structure
+    let manifest_errors = validate_manifest(&manifest, &source_dir);
+    if !manifest_errors.is_empty() {
+        eprintln!(
+            "Manifest validation errors:\n{}",
+            format_manifest_errors(&manifest_errors)
+        );
+        return Err(anyhow!(
+            "Manifest validation failed with {} error(s)",
+            manifest_errors.len()
+        ));
+    }
+
+    // Validate schema before compilation
+    if let Some(schema_path) = &manifest.schema {
+        let schema_path = resolve_path(&opt.manifest, schema_path);
+        let validation_errors = validate_schema(&schema_path, &manifest.spec_version)?;
+
+        if !validation_errors.is_empty() {
+            eprintln!(
+                "Schema validation errors:\n{}",
+                format_schema_errors(&validation_errors)
+            );
+            return Err(anyhow!(
+                "Schema validation failed with {} error(s)",
+                validation_errors.len()
+            ));
+        }
+    }
+
+    // Find graph-ts and node_modules
+    let (lib_dirs, global_file) = find_graph_ts(&source_dir)?;
+    let libs = lib_dirs
+        .iter()
+        .map(|p| p.to_string_lossy().to_string())
+        .collect::<Vec<_>>()
+        .join(",");
+
+    // Create output directory
+    fs::create_dir_all(&opt.output_dir)
+        .with_context(|| format!("Failed to create output directory: {:?}", opt.output_dir))?;
+
+    // Compile data source mappings
+    // Track compiled files: source hash -> compiled output path
+    let mut compiled_files: HashMap<String, PathBuf> = HashMap::new();
+
+    for ds in &manifest.data_sources {
+        if let Some(mapping) = &ds.mapping_file {
+            let mapping_path = resolve_path(&opt.manifest, mapping);
+            let output_subdir = opt.output_dir.join(&ds.name);
+            compile_mapping_to_dir(
+                &ds.name,
+                &mapping_path,
+                &source_dir,
+                &output_subdir,
+                &libs,
+                &global_file,
+                &opt.output_format,
+                &mut compiled_files,
+                opt.skip_asc_version_check,
+                "data source",
+            )?;
+        }
+    }
+
+    // Compile template mappings
+    for template in &manifest.templates {
+        if let Some(mapping) = &template.mapping_file {
+            let mapping_path = resolve_path(&opt.manifest, mapping);
+            let output_subdir = opt.output_dir.join("templates").join(&template.name);
+            compile_mapping_to_dir(
+                &template.name,
+                &mapping_path,
+                &source_dir,
+                &output_subdir,
+                &libs,
+                &global_file,
+                &opt.output_format,
+                &mut compiled_files,
+                opt.skip_asc_version_check,
+                "data source template",
+            )?;
+        }
+    }
+
+    // Validate compiled WASM handler exports (only for binary WASM output)
+    if opt.output_format == "wasm" {
+        let mut wasm_errors = Vec::new();
+
+        for ds in &manifest.data_sources {
+            let handler_names = collect_handler_names(ds);
+            if handler_names.is_empty() {
+                continue;
+            }
+            let wasm_path = opt
+                .output_dir
+                .join(&ds.name)
+                .join(format!("{}.wasm", ds.name));
+            if wasm_path.exists() {
+                wasm_errors.extend(validate_wasm_handlers(&wasm_path, &ds.name, &handler_names));
+            }
+        }
+
+        for template in &manifest.templates {
+            let handler_names = collect_template_handler_names(template);
+            if handler_names.is_empty() {
+                continue;
+            }
+            let wasm_path = opt
+                .output_dir
+                .join("templates")
+                .join(&template.name)
+                .join(format!("{}.wasm", template.name));
+            if wasm_path.exists() {
+                wasm_errors.extend(validate_wasm_handlers(
+                    &wasm_path,
+                    &template.name,
+                    &handler_names,
+                ));
+            }
+        }
+
+        if !wasm_errors.is_empty() {
+            eprintln!(
+                "WASM handler validation errors:\n{}",
+                format_manifest_errors(&wasm_errors)
+            );
+            return Err(anyhow!(
+                "WASM handler validation failed with {} error(s)",
+                wasm_errors.len()
+            ));
+        }
+    }
+
+    // Copy schema file
+    if let Some(schema_path) = &manifest.schema {
+        let schema_path = resolve_path(&opt.manifest, schema_path);
+        copy_schema(&schema_path, &opt.output_dir)?;
+    }
+
+    // Copy ABI files for data sources
+    for ds in &manifest.data_sources {
+        for abi in &ds.abis {
+            let abi_path = resolve_path(&opt.manifest, &abi.file);
+            let output_subdir = opt.output_dir.join(&ds.name);
+            copy_abi_to_dir(&abi.name, &abi_path, &output_subdir)?;
+        }
+    }
+
+    // Copy ABI files for templates
+    for template in &manifest.templates {
+        for abi in &template.abis {
+            let abi_path = resolve_path(&opt.manifest, &abi.file);
+            let output_subdir = opt.output_dir.join("templates").join(&template.name);
+            copy_abi_to_dir(&abi.name, &abi_path, &output_subdir)?;
+        }
+    }
+
+    // Write output manifest
+    write_output_manifest(
+        &opt.manifest,
+        &manifest,
+        &opt.output_dir,
+        &opt.output_format,
+    )?;
+
+    // Upload to IPFS if requested
+    let ipfs_hash = if let Some(ipfs_url) = &opt.ipfs {
+        let hash = upload_to_ipfs(ipfs_url, &opt.output_dir, &manifest).await?;
+        step(Step::Done, &format!("Build completed: {}", hash));
+        Some(hash)
+    } else {
+        let manifest_path = opt.output_dir.join("subgraph.yaml");
+
+        step(
+            Step::Done,
+            &format!("Build completed: {}", manifest_path.display()),
+        );
+        None
+    };
+
+    Ok(BuildResult { ipfs_hash })
+}
+
+/// Tracks both content hash to IPFS hash (for deduplication) and path to IPFS hash (for lookups).
+#[derive(Default)]
+struct UploadedFiles {
+    /// Content hash -> IPFS hash (for deduplication)
+    content_to_ipfs: HashMap<String, String>,
+    /// Relative path -> IPFS hash (for manifest updates)
+    path_to_ipfs: HashMap<String, String>,
+}
+
+/// Upload build artifacts to IPFS and return the manifest hash.
+async fn upload_to_ipfs(ipfs_url: &str, output_dir: &Path, manifest: &Manifest) -> Result<String> {
+    step(Step::Generate, "Upload subgraph to IPFS");
+
+    let client = IpfsClient::new(ipfs_url)?;
+
+    // Track uploaded files
+    let mut uploaded = UploadedFiles::default();
+
+    // Upload schema file
+    if let Some(schema_path) = &manifest.schema {
+        let schema_name = Path::new(schema_path)
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("schema.graphql");
+        let schema_file = output_dir.join(schema_name);
+        let content = fs::read(&schema_file)
+            .with_context(|| format!("Failed to read schema file: {}", schema_file.display()))?;
+        let hash = upload_file_to_ipfs(&client, schema_name, content, &mut uploaded).await?;
+        step(Step::Write, &format!("  {} => {}", schema_name, hash));
+    }
+
+    // Upload ABI files for data sources
+    for ds in &manifest.data_sources {
+        for abi in &ds.abis {
+            let abi_filename = format!("{}.json", abi.name);
+            let abi_file = output_dir.join(&ds.name).join(&abi_filename);
+            if abi_file.exists() {
+                let content = fs::read(&abi_file)
+                    .with_context(|| format!("Failed to read ABI file: {}", abi_file.display()))?;
+                let rel_path = format!("{}/{}", ds.name, abi_filename);
+                let hash = upload_file_to_ipfs(&client, &rel_path, content, &mut uploaded).await?;
+                step(Step::Write, &format!("  {} => {}", rel_path, hash));
+            }
+        }
+    }
+
+    // Upload ABI files for templates
+    for template in &manifest.templates {
+        for abi in &template.abis {
+            let abi_filename = format!("{}.json", abi.name);
+            let abi_file = output_dir
+                .join("templates")
+                .join(&template.name)
+                .join(&abi_filename);
+            if abi_file.exists() {
+                let content = fs::read(&abi_file)
+                    .with_context(|| format!("Failed to read ABI file: {}", abi_file.display()))?;
+                let rel_path = format!("templates/{}/{}", template.name, abi_filename);
+                let hash = upload_file_to_ipfs(&client, &rel_path, content, &mut uploaded).await?;
+                step(Step::Write, &format!("  {} => {}", rel_path, hash));
+            }
+        }
+    }
+
+    // Upload mapping files
+    for ds in &manifest.data_sources {
+        let mapping_filename = format!("{}.wasm", ds.name);
+        let mapping_file = output_dir.join(&ds.name).join(&mapping_filename);
+        if mapping_file.exists() {
+            let content = fs::read(&mapping_file).with_context(|| {
+                format!("Failed to read mapping file: {}", mapping_file.display())
+            })?;
+            let rel_path = format!("{}/{}", ds.name, mapping_filename);
+            let hash = upload_file_to_ipfs(&client, &rel_path, content, &mut uploaded).await?;
+            step(Step::Write, &format!("  {} => {}", rel_path, hash));
+        }
+    }
+
+    // Upload template mapping files
+    for template in &manifest.templates {
+        let mapping_filename = format!("{}.wasm", template.name);
+        let mapping_file = output_dir
+            .join("templates")
+            .join(&template.name)
+            .join(&mapping_filename);
+        if mapping_file.exists() {
+            let content = fs::read(&mapping_file).with_context(|| {
+                format!(
+                    "Failed to read template mapping: {}",
+                    mapping_file.display()
+                )
+            })?;
+            let rel_path = format!("templates/{}/{}", template.name, mapping_filename);
+            let hash = upload_file_to_ipfs(&client, &rel_path, content, &mut uploaded).await?;
+            step(Step::Write, &format!("  {} => {}", rel_path, hash));
+        }
+    }
+
+    // Now we need to update the manifest with IPFS hashes and upload it
+    let manifest_content = create_ipfs_manifest(output_dir, manifest, &uploaded)?;
+    let manifest_hash = client
+        .add("subgraph.yaml", manifest_content.into_bytes())
+        .await?;
+    step(
+        Step::Write,
+        &format!("  subgraph.yaml => {}", manifest_hash),
+    );
+
+    Ok(manifest_hash)
+}
+
+/// Upload a file to IPFS, using cache to avoid duplicates.
+async fn upload_file_to_ipfs(
+    client: &IpfsClient,
+    path: &str,
+    content: Vec<u8>,
+    uploaded: &mut UploadedFiles,
+) -> Result<String> {
+    // Check if we already uploaded this content
+    let content_hash = {
+        let mut hasher = Sha1::new();
+        hasher.update(&content);
+        hex::encode(hasher.finalize())
+    };
+
+    let ipfs_hash = if let Some(hash) = uploaded.content_to_ipfs.get(&content_hash) {
+        hash.clone()
+    } else {
+        let hash = client.add(path, content).await?;
+        uploaded.content_to_ipfs.insert(content_hash, hash.clone());
+        hash
+    };
+
+    // Also track by path for manifest lookups
+    uploaded
+        .path_to_ipfs
+        .insert(path.to_string(), ipfs_hash.clone());
+
+    Ok(ipfs_hash)
+}
+
+/// Create the IPFS manifest with file paths replaced by IPFS hashes.
+fn create_ipfs_manifest(
+    output_dir: &Path,
+    manifest: &Manifest,
+    uploaded: &UploadedFiles,
+) -> Result<String> {
+    // Read the original manifest
+    let manifest_path = output_dir.join("subgraph.yaml");
+    let manifest_str = fs::read_to_string(&manifest_path)
+        .with_context(|| format!("Failed to read manifest: {}", manifest_path.display()))?;
+
+    let mut value: serde_yaml::Value = serde_yaml::from_str(&manifest_str)?;
+
+    // Update schema path to IPFS reference
+    if let Some(schema_path) = &manifest.schema {
+        let schema_name = Path::new(schema_path)
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("schema.graphql");
+
+        // Find the hash for this file
+        if let Some(hash) = uploaded.path_to_ipfs.get(schema_name)
+            && let Some(schema) = value.get_mut("schema")
+            && let Some(file) = schema.get_mut("file")
+        {
+            *file = create_ipfs_link(hash);
+        }
+    }
+
+    // Update data source paths
+    if let Some(data_sources) = value.get_mut("dataSources")
+        && let Some(arr) = data_sources.as_sequence_mut()
+    {
+        for (i, ds_value) in arr.iter_mut().enumerate() {
+            if i < manifest.data_sources.len() {
+                let ds = &manifest.data_sources[i];
+                update_data_source_ipfs_paths(ds_value, ds, uploaded);
+            }
+        }
+    }
+
+    // Update template paths
+    if let Some(templates) = value.get_mut("templates")
+        && let Some(arr) = templates.as_sequence_mut()
+    {
+        for (i, template_value) in arr.iter_mut().enumerate() {
+            if i < manifest.templates.len() {
+                let template = &manifest.templates[i];
+                update_template_ipfs_paths(template_value, template, uploaded);
+            }
+        }
+    }
+
+    serde_yaml::to_string(&value).context("Failed to serialize IPFS manifest")
+}
+
+/// Create an IPFS link value.
+fn create_ipfs_link(hash: &str) -> serde_yaml::Value {
+    let mut map = serde_yaml::Mapping::new();
+    map.insert(
+        serde_yaml::Value::String("/".to_string()),
+        serde_yaml::Value::String(format!("/ipfs/{}", hash)),
+    );
+    serde_yaml::Value::Mapping(map)
+}
+
+/// Update data source paths in the manifest to IPFS references.
+fn update_data_source_ipfs_paths(
+    ds_value: &mut serde_yaml::Value,
+    ds: &DataSource,
+    uploaded: &UploadedFiles,
+) {
+    if let Some(mapping) = ds_value.get_mut("mapping") {
+        // Update mapping file
+        if let Some(file) = mapping.get_mut("file") {
+            let mapping_path = format!("{}/{}.wasm", ds.name, ds.name);
+            if let Some(hash) = uploaded.path_to_ipfs.get(&mapping_path) {
+                *file = create_ipfs_link(hash);
+            }
+        }
+
+        // Update ABIs
+        if let Some(abis) = mapping.get_mut("abis")
+            && let Some(arr) = abis.as_sequence_mut()
+        {
+            for (j, abi_value) in arr.iter_mut().enumerate() {
+                if j < ds.abis.len() {
+                    let abi = &ds.abis[j];
+                    if let Some(file) = abi_value.get_mut("file") {
+                        let abi_path = format!("{}/{}.json", ds.name, abi.name);
+                        if let Some(hash) = uploaded.path_to_ipfs.get(&abi_path) {
+                            *file = create_ipfs_link(hash);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Update template paths in the manifest to IPFS references.
+fn update_template_ipfs_paths(
+    template_value: &mut serde_yaml::Value,
+    template: &Template,
+    uploaded: &UploadedFiles,
+) {
+    if let Some(mapping) = template_value.get_mut("mapping") {
+        // Update mapping file
+        if let Some(file) = mapping.get_mut("file") {
+            let mapping_path = format!("templates/{}/{}.wasm", template.name, template.name);
+            if let Some(hash) = uploaded.path_to_ipfs.get(&mapping_path) {
+                *file = create_ipfs_link(hash);
+            }
+        }
+
+        // Update ABIs
+        if let Some(abis) = mapping.get_mut("abis")
+            && let Some(arr) = abis.as_sequence_mut()
+        {
+            for (j, abi_value) in arr.iter_mut().enumerate() {
+                if j < template.abis.len() {
+                    let abi = &template.abis[j];
+                    if let Some(file) = abi_value.get_mut("file") {
+                        let abi_path = format!("templates/{}/{}.json", template.name, abi.name);
+                        if let Some(hash) = uploaded.path_to_ipfs.get(&abi_path) {
+                            *file = create_ipfs_link(hash);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/// Get the file extension for the output format.
+fn output_extension(output_format: &str) -> &'static str {
+    if output_format == "wasm" {
+        "wasm"
+    } else {
+        "wast"
+    }
+}
+
+/// Compile a mapping to a specific output directory.
+///
+/// This unified function handles both data source and template mappings.
+/// The caller specifies the output directory and display name.
+#[allow(clippy::too_many_arguments)]
+fn compile_mapping_to_dir(
+    name: &str,
+    mapping_path: &Path,
+    source_dir: &Path,
+    output_subdir: &Path,
+    libs: &str,
+    global_file: &Path,
+    output_format: &str,
+    compiled_files: &mut HashMap<String, PathBuf>,
+    skip_version_check: bool,
+    item_type: &str, // "data source" or "data source template"
+) -> Result<()> {
+    let cache_key = file_hash(mapping_path)?;
+
+    fs::create_dir_all(output_subdir)?;
+
+    let extension = output_extension(output_format);
+    let output_file = output_subdir.join(format!("{}.{}", name, extension));
+
+    // Check if already compiled - copy existing WASM file if so
+    if let Some(existing_wasm) = compiled_files.get(&cache_key) {
+        step(
+            Step::Skip,
+            &format!("Compile {}: {} (already compiled)", item_type, name),
+        );
+        fs::copy(existing_wasm, &output_file).with_context(|| {
+            format!(
+                "Failed to copy WASM from {} to {}",
+                existing_wasm.display(),
+                output_file.display()
+            )
+        })?;
+        return Ok(());
+    }
+
+    step(Step::Generate, &format!("Compile {}: {}", item_type, name));
+
+    let options = AscCompileOptions {
+        input_file: mapping_path.to_path_buf(),
+        base_dir: source_dir.to_path_buf(),
+        libs: libs.to_string(),
+        global_file: global_file.to_path_buf(),
+        output_file: output_file.clone(),
+        output_format: output_format.to_string(),
+        skip_version_check,
+    };
+
+    compile_mapping(&options)?;
+    compiled_files.insert(cache_key, output_file);
+
+    Ok(())
+}
+
+/// Copy the schema file to the output directory.
+fn copy_schema(schema_path: &Path, output_dir: &Path) -> Result<()> {
+    let schema_name = schema_path
+        .file_name()
+        .ok_or_else(|| anyhow!("Invalid schema path"))?;
+    let output_path = output_dir.join(schema_name);
+
+    step(
+        Step::Write,
+        &format!("Copy schema file to {}", output_path.display()),
+    );
+
+    fs::copy(schema_path, &output_path).with_context(|| {
+        format!(
+            "Failed to copy schema from {} to {}",
+            schema_path.display(),
+            output_path.display()
+        )
+    })?;
+
+    Ok(())
+}
+
+/// Copy an ABI file to the specified output directory, normalizing it to a bare
+/// ABI array. This handles Hardhat/Foundry artifacts (`{"abi": [...]}`) and
+/// Truffle artifacts (`{"compilerOutput": {"abi": [...]}}`) in addition to raw
+/// ABI arrays.
+fn copy_abi_to_dir(abi_name: &str, abi_path: &Path, output_subdir: &Path) -> Result<()> {
+    fs::create_dir_all(output_subdir)?;
+
+    let abi_filename = format!("{}.json", abi_name);
+    let output_path = output_subdir.join(&abi_filename);
+
+    step(
+        Step::Write,
+        &format!("Copy ABI {} to {}", abi_name, output_path.display()),
+    );
+
+    let abi_str = fs::read_to_string(abi_path)
+        .with_context(|| format!("Failed to read ABI file: {}", abi_path.display()))?;
+
+    let normalized = normalize_abi_json(&abi_str)
+        .with_context(|| format!("Failed to normalize ABI: {}", abi_path.display()))?;
+
+    let output_str =
+        serde_json::to_string_pretty(&normalized).context("Failed to serialize normalized ABI")?;
+
+    fs::write(&output_path, output_str)
+        .with_context(|| format!("Failed to write ABI to {}", output_path.display()))?;
+
+    Ok(())
+}
+
+/// Write the output manifest file.
+fn write_output_manifest(
+    manifest_path: &Path,
+    manifest: &Manifest,
+    output_dir: &Path,
+    output_format: &str,
+) -> Result<()> {
+    let output_path = output_dir.join("subgraph.yaml");
+
+    step(
+        Step::Write,
+        &format!("Write subgraph manifest to {}", output_path.display()),
+    );
+
+    // Load original manifest
+    let manifest_str = fs::read_to_string(manifest_path)
+        .with_context(|| format!("Failed to read manifest: {:?}", manifest_path))?;
+
+    let mut value: serde_yaml::Value = serde_yaml::from_str(&manifest_str)?;
+
+    // Update schema path
+    if let Some(schema) = value.get_mut("schema")
+        && let Some(file) = schema.get_mut("file")
+        && let Some(schema_path) = manifest.schema.as_ref()
+    {
+        let schema_name = Path::new(schema_path)
+            .file_name()
+            .and_then(|n| n.to_str())
+            .unwrap_or("schema.graphql");
+        *file = serde_yaml::Value::String(schema_name.to_string());
+    }
+
+    // Update data source paths
+    if let Some(data_sources) = value.get_mut("dataSources")
+        && let Some(arr) = data_sources.as_sequence_mut()
+    {
+        for (i, ds) in arr.iter_mut().enumerate() {
+            if i < manifest.data_sources.len() {
+                let ds_name = &manifest.data_sources[i].name;
+                update_data_source_paths(ds, ds_name, output_format);
+            }
+        }
+    }
+
+    // Update template paths
+    if let Some(templates) = value.get_mut("templates")
+        && let Some(arr) = templates.as_sequence_mut()
+    {
+        for (i, template) in arr.iter_mut().enumerate() {
+            if i < manifest.templates.len() {
+                let template_name = &manifest.templates[i].name;
+                update_template_paths(template, template_name, output_format);
+            }
+        }
+    }
+
+    // Write output manifest
+    let output_str = serde_yaml::to_string(&value)?;
+    fs::write(&output_path, output_str)?;
+
+    Ok(())
+}
+
+/// Update paths in a data source for the output manifest.
+fn update_data_source_paths(ds: &mut serde_yaml::Value, ds_name: &str, output_format: &str) {
+    // Update mapping file path
+    if let Some(mapping) = ds.get_mut("mapping") {
+        if let Some(file) = mapping.get_mut("file") {
+            let extension = output_extension(output_format);
+            *file = serde_yaml::Value::String(format!("{}/{}.{}", ds_name, ds_name, extension));
+        }
+
+        // Update ABI paths
+        if let Some(abis) = mapping.get_mut("abis")
+            && let Some(arr) = abis.as_sequence_mut()
+        {
+            for abi in arr.iter_mut() {
+                // Extract name first to avoid borrow conflicts
+                let abi_name = abi
+                    .get("name")
+                    .and_then(|n| n.as_str())
+                    .map(|s| s.to_string());
+                if let Some(name) = abi_name
+                    && let Some(file) = abi.get_mut("file")
+                {
+                    *file = serde_yaml::Value::String(format!("{}/{}.json", ds_name, name));
+                }
+            }
+        }
+    }
+}
+
+/// Update paths in a template for the output manifest.
+fn update_template_paths(
+    template: &mut serde_yaml::Value,
+    template_name: &str,
+    output_format: &str,
+) {
+    // Update mapping file path
+    if let Some(mapping) = template.get_mut("mapping") {
+        if let Some(file) = mapping.get_mut("file") {
+            let extension = output_extension(output_format);
+            *file = serde_yaml::Value::String(format!(
+                "templates/{}/{}.{}",
+                template_name, template_name, extension
+            ));
+        }
+
+        // Update ABI paths
+        if let Some(abis) = mapping.get_mut("abis")
+            && let Some(arr) = abis.as_sequence_mut()
+        {
+            for abi in arr.iter_mut() {
+                // Extract name first to avoid borrow conflicts
+                let abi_name = abi
+                    .get("name")
+                    .and_then(|n| n.as_str())
+                    .map(|s| s.to_string());
+                if let Some(name) = abi_name
+                    && let Some(file) = abi.get_mut("file")
+                {
+                    *file = serde_yaml::Value::String(format!(
+                        "templates/{}/{}.json",
+                        template_name, name
+                    ));
+                }
+            }
+        }
+    }
+}
+
+/// Apply network configuration to the manifest file.
+///
+/// This modifies the manifest file in place, updating data source addresses
+/// and start blocks based on the networks.json configuration.
+fn apply_network_to_manifest(
+    manifest_path: &Path,
+    network: &str,
+    network_file: &Path,
+) -> Result<()> {
+    // Check if network file exists
+    if !network_file.exists() {
+        return Err(anyhow!(
+            "Network file '{}' does not exist. Create it or remove --network flag.",
+            network_file.display()
+        ));
+    }
+
+    step(
+        Step::Generate,
+        &format!("Apply network configuration: {}", network),
+    );
+
+    // Load network config
+    let networks_config = load_networks_config(network_file)?;
+    let network_config = get_network_config(&networks_config, network)?;
+
+    // Load manifest
+    let manifest_str = fs::read_to_string(manifest_path)
+        .with_context(|| format!("Failed to read manifest: {}", manifest_path.display()))?;
+
+    let mut manifest: serde_yaml::Value = serde_yaml::from_str(&manifest_str)
+        .with_context(|| format!("Failed to parse manifest: {}", manifest_path.display()))?;
+
+    // Apply network config
+    apply_network_config(&mut manifest, network, network_config)?;
+
+    // Write back to manifest
+    let updated_str = serde_yaml::to_string(&manifest)?;
+    fs::write(manifest_path, updated_str)
+        .with_context(|| format!("Failed to write manifest: {}", manifest_path.display()))?;
+
+    Ok(())
+}
+
+/// Calculate SHA1 hash of a file for caching.
+fn file_hash(path: &Path) -> Result<String> {
+    let content = fs::read(path).with_context(|| format!("Failed to read file: {:?}", path))?;
+    let mut hasher = Sha1::new();
+    hasher.update(&content);
+    Ok(hex::encode(hasher.finalize()))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_file_hash() {
+        let temp_dir = TempDir::new().unwrap();
+        let file_path = temp_dir.path().join("test.txt");
+        fs::write(&file_path, "hello world").unwrap();
+
+        let hash = file_hash(&file_path).unwrap();
+        // SHA1 of "hello world"
+        assert_eq!(hash, "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed");
+    }
+}
diff --git a/gnd/src/commands/clean.rs b/gnd/src/commands/clean.rs
new file mode 100644
index 00000000000..3968532b917
--- /dev/null
+++ b/gnd/src/commands/clean.rs
@@ -0,0 +1,102 @@
+use std::path::Path;
+
+use anyhow::Result;
+use clap::Parser;
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Remove build artifacts and generated files")]
+pub struct CleanOpt {
+    #[clap(
+        long,
+        default_value = "generated/",
+        help = "Directory where the codegen output is stored"
+    )]
+    pub codegen_dir: String,
+
+    #[clap(
+        long,
+        default_value = "build/",
+        help = "Directory where the build output is stored"
+    )]
+    pub build_dir: String,
+}
+
+/// Run the clean command
+pub fn run_clean(opt: CleanOpt) -> Result<()> {
+    println!("Cleaning cache and generated files...");
+
+    let codegen_path = Path::new(&opt.codegen_dir);
+    let build_path = Path::new(&opt.build_dir);
+
+    let mut cleaned = false;
+
+    if codegen_path.exists() {
+        std::fs::remove_dir_all(codegen_path)?;
+        println!("✔ Removed {}", opt.codegen_dir);
+        cleaned = true;
+    }
+
+    if build_path.exists() {
+        std::fs::remove_dir_all(build_path)?;
+        println!("✔ Removed {}", opt.build_dir);
+        cleaned = true;
+    }
+
+    if cleaned {
+        println!("Cache and generated files cleaned");
+    } else {
+        println!("Nothing to clean");
+    }
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_clean_removes_directories() {
+        let temp_dir = TempDir::new().unwrap();
+        let codegen_dir = temp_dir.path().join("generated");
+        let build_dir = temp_dir.path().join("build");
+
+        // Create the directories
+        fs::create_dir(&codegen_dir).unwrap();
+        fs::create_dir(&build_dir).unwrap();
+
+        // Create some files in them
+        fs::write(codegen_dir.join("schema.ts"), "test").unwrap();
+        fs::write(build_dir.join("subgraph.wasm"), "test").unwrap();
+
+        assert!(codegen_dir.exists());
+        assert!(build_dir.exists());
+
+        let opt = CleanOpt {
+            codegen_dir: codegen_dir.to_string_lossy().to_string(),
+            build_dir: build_dir.to_string_lossy().to_string(),
+        };
+
+        run_clean(opt).unwrap();
+
+        assert!(!codegen_dir.exists());
+        assert!(!build_dir.exists());
+    }
+
+    #[test]
+    fn test_clean_handles_missing_directories() {
+        let temp_dir = TempDir::new().unwrap();
+        let codegen_dir = temp_dir.path().join("nonexistent_generated");
+        let build_dir = temp_dir.path().join("nonexistent_build");
+
+        let opt = CleanOpt {
+            codegen_dir: codegen_dir.to_string_lossy().to_string(),
+            build_dir: build_dir.to_string_lossy().to_string(),
+        };
+
+        // Should not error when directories don't exist
+        run_clean(opt).unwrap();
+    }
+}
diff --git a/gnd/src/commands/codegen.rs b/gnd/src/commands/codegen.rs
new file mode 100644
index 00000000000..deb0feb0ca5
--- /dev/null
+++ b/gnd/src/commands/codegen.rs
@@ -0,0 +1,959 @@
+//! Code generation command.
+//!
+//! Generates AssemblyScript types for a subgraph from:
+//! - GraphQL schema (entity classes)
+//! - Contract ABIs (event and call bindings)
+//! - Data source templates
+//! - Subgraph data sources (fetches schema from IPFS)
+
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use anyhow::{Context, Result, anyhow};
+use clap::Parser;
+use graph::abi::JsonAbi;
+use graphql_tools::parser::schema as gql;
+use semver::Version;
+
+use crate::abi::normalize_abi_json;
+use crate::codegen::{
+    AbiCodeGenerator, Class, GENERATED_FILE_NOTE, ModuleImports, SchemaCodeGenerator,
+    Template as CodegenTemplate, TemplateCodeGenerator, TemplateKind,
+};
+use crate::formatter::try_format_typescript;
+use crate::manifest::{DataSource, Manifest, Template, load_manifest, resolve_path};
+use crate::migrations;
+use crate::output::{Step, step};
+use crate::services::IpfsClient;
+use crate::validation::{
+    format_manifest_errors, format_schema_errors, validate_manifest_files, validate_schema,
+};
+use crate::watch::watch_and_run;
+
+/// Default IPFS URL.
+const DEFAULT_IPFS_URL: &str = "https://api.thegraph.com/ipfs/api/v0";
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Generate AssemblyScript types for a subgraph")]
+pub struct CodegenOpt {
+    /// Path to the subgraph manifest
+    #[clap(default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// Output directory for generated types
+    #[clap(short = 'o', long, default_value = "generated/")]
+    pub output_dir: PathBuf,
+
+    /// Skip subgraph migrations
+    #[clap(long)]
+    pub skip_migrations: bool,
+
+    /// Regenerate types when subgraph files change
+    #[clap(short = 'w', long)]
+    pub watch: bool,
+
+    /// IPFS node to use for fetching subgraph data
+    #[clap(short = 'i', long, default_value = DEFAULT_IPFS_URL)]
+    pub ipfs: String,
+}
+
+/// Run the codegen command.
+pub async fn run_codegen(opt: CodegenOpt) -> Result<()> {
+    if opt.watch {
+        watch_and_generate(&opt).await
+    } else {
+        generate_types(&opt).await
+    }
+}
+
+/// Watch subgraph files and regenerate types on changes.
+async fn watch_and_generate(opt: &CodegenOpt) -> Result<()> {
+    // Get files to watch (need to load manifest first)
+    let manifest = load_manifest(&opt.manifest)?;
+    let files_to_watch = get_files_to_watch(&opt.manifest, &manifest);
+
+    watch_and_run(
+        files_to_watch,
+        "Watching subgraph files for changes...",
+        || generate_types(opt),
+    )
+    .await
+}
+
+/// Get the list of files to watch for changes.
+fn get_files_to_watch(manifest_path: &Path, manifest: &Manifest) -> Vec<PathBuf> {
+    let mut files = vec![manifest_path.to_path_buf()];
+
+    // Add schema file
+    if let Some(schema_path) = &manifest.schema {
+        files.push(resolve_path(manifest_path, schema_path));
+    }
+
+    // Add ABI files
+    for ds in &manifest.data_sources {
+        for abi in &ds.abis {
+            files.push(resolve_path(manifest_path, &abi.file));
+        }
+    }
+
+    files
+}
+
+/// Generate all types for the subgraph.
+async fn generate_types(opt: &CodegenOpt) -> Result<()> {
+    // Apply migrations unless skipped
+    if !opt.skip_migrations {
+        migrations::apply_migrations(&opt.manifest)?;
+    }
+
+    // Load the subgraph manifest
+    let manifest = load_manifest(&opt.manifest)?;
+
+    // Validate manifest file references (schema, mappings, ABIs exist and are valid)
+    let source_dir = crate::manifest::manifest_dir(&opt.manifest).to_path_buf();
+    let manifest_errors = validate_manifest_files(&manifest, &source_dir);
+    if !manifest_errors.is_empty() {
+        eprintln!(
+            "Manifest validation errors:\n{}",
+            format_manifest_errors(&manifest_errors)
+        );
+        return Err(anyhow!(
+            "Manifest validation failed with {} error(s)",
+            manifest_errors.len()
+        ));
+    }
+
+    // Create output directory
+    fs::create_dir_all(&opt.output_dir)
+        .with_context(|| format!("Failed to create output directory: {:?}", opt.output_dir))?;
+
+    // Generate schema types
+    if let Some(schema_path) = manifest.schema.as_ref() {
+        let schema_path = resolve_path(&opt.manifest, schema_path);
+        let _ = generate_schema_types(&schema_path, &opt.output_dir, &manifest.spec_version)?;
+    }
+
+    // Generate ABI types for each data source
+    for ds in &manifest.data_sources {
+        for abi in &ds.abis {
+            let abi_path = resolve_path(&opt.manifest, &abi.file);
+            // Output to: <output_dir>/<DataSourceName>/<AbiName>.ts
+            let ds_output_dir = opt.output_dir.join(&ds.name);
+            generate_abi_types(&abi.name, &abi_path, &ds_output_dir)?;
+        }
+    }
+
+    // Generate template types
+    if !manifest.templates.is_empty() {
+        generate_template_types(&manifest.templates, &opt.output_dir)?;
+
+        // Generate ABI types for templates
+        for template in &manifest.templates {
+            for abi in &template.abis {
+                let abi_path = resolve_path(&opt.manifest, &abi.file);
+                // Output to: <output_dir>/templates/<TemplateName>/<AbiName>.ts
+                let template_output_dir = opt.output_dir.join("templates").join(&template.name);
+                generate_abi_types(&abi.name, &abi_path, &template_output_dir)?;
+            }
+        }
+    }
+
+    // Generate types for subgraph data sources
+    let subgraph_sources: Vec<&DataSource> = manifest
+        .data_sources
+        .iter()
+        .filter(|ds| ds.is_subgraph_source())
+        .collect();
+    if !subgraph_sources.is_empty() {
+        generate_subgraph_source_types(&subgraph_sources, &opt.output_dir, &opt.ipfs).await?;
+    }
+
+    step(Step::Done, "Types generated successfully");
+    Ok(())
+}
+
+/// Generate types from the GraphQL schema.
+///
+/// Returns Ok(true) if types were generated successfully, Ok(false) if schema
+/// validation failed and schema.ts was skipped.
+fn generate_schema_types(
+    schema_path: &Path,
+    output_dir: &Path,
+    spec_version: &Version,
+) -> Result<bool> {
+    step(
+        Step::Load,
+        &format!("Load GraphQL schema from {}", schema_path.display()),
+    );
+
+    // Run graph-node schema validation
+    let validation_errors = validate_schema(schema_path, spec_version)?;
+
+    if !validation_errors.is_empty() {
+        eprintln!(
+            "Schema validation errors:\n{}",
+            format_schema_errors(&validation_errors)
+        );
+        return Err(anyhow!(
+            "Schema validation failed with {} error(s)",
+            validation_errors.len()
+        ));
+    }
+
+    let schema_str = fs::read_to_string(schema_path)
+        .with_context(|| format!("Failed to read schema file: {:?}", schema_path))?;
+
+    let ast: gql::Document<'_, String> = gql::parse_schema(&schema_str)
+        .map_err(|e| anyhow::anyhow!("Failed to parse GraphQL schema: {}", e))?;
+
+    step(Step::Generate, "Generate types for GraphQL schema");
+
+    let generator = match SchemaCodeGenerator::new(&ast) {
+        Ok(generator) => generator,
+        Err(e) => {
+            // Schema validation failed - skip schema.ts generation but don't fail
+            eprintln!("Warning: {}", e);
+            return Ok(false);
+        }
+    };
+    let imports = generator.generate_module_imports();
+    let entity_classes = generator.generate_types(true);
+    let derived_loaders = generator.generate_derived_loaders();
+
+    // Combine entity classes with derived loaders
+    let all_classes: Vec<Class> = entity_classes.into_iter().chain(derived_loaders).collect();
+
+    let code = generate_file(&imports, &all_classes);
+    let formatted = try_format_typescript(&code);
+
+    let output_file = output_dir.join("schema.ts");
+    step(
+        Step::Write,
+        &format!("Write types to {}", output_file.display()),
+    );
+    fs::write(&output_file, formatted)
+        .with_context(|| format!("Failed to write schema types: {:?}", output_file))?;
+
+    Ok(true)
+}
+
+/// Preprocess ABI JSON to normalize artifact formats and add defaults
+/// required by alloy's ABI parser:
+/// - `anonymous: false` for events (alloy requires this field)
+/// - `param{index}` names for unnamed event parameters (to match graph-cli behavior)
+fn preprocess_abi_json(abi_str: &str) -> Result<String> {
+    // Normalize to get the ABI array from various artifact formats
+    let mut abi = normalize_abi_json(abi_str)?;
+
+    if let Some(items) = abi.as_array_mut() {
+        for item in items {
+            if let Some(obj) = item.as_object_mut() {
+                let is_event = obj
+                    .get("type")
+                    .and_then(|t| t.as_str())
+                    .map(|t| t == "event")
+                    .unwrap_or(false);
+
+                if is_event {
+                    // Add anonymous: false for events if missing (alloy requires it)
+                    if !obj.contains_key("anonymous") {
+                        obj.insert("anonymous".to_string(), serde_json::Value::Bool(false));
+                    }
+
+                    // Add param{index} names for unnamed event parameters
+                    if let Some(inputs) = obj.get_mut("inputs") {
+                        add_default_event_param_names(inputs);
+                    }
+                }
+            }
+        }
+    }
+
+    serde_json::to_string(&abi).context("Failed to serialize processed ABI")
+}
+
+/// Add `param{index}` names to unnamed event parameters to match graph-cli behavior.
+/// Alloy defaults missing names to empty strings, but for events we want `param0`, `param1`, etc.
+fn add_default_event_param_names(params: &mut serde_json::Value) {
+    if let Some(params_arr) = params.as_array_mut() {
+        for (index, param) in params_arr.iter_mut().enumerate() {
+            if let Some(obj) = param.as_object_mut()
+                && !obj.contains_key("name")
+            {
+                obj.insert(
+                    "name".to_string(),
+                    serde_json::Value::String(format!("param{}", index)),
+                );
+            }
+        }
+    }
+}
+
+/// Generate types from an ABI file.
+fn generate_abi_types(name: &str, abi_path: &Path, output_dir: &Path) -> Result<()> {
+    step(Step::Load, &format!("Load ABI from {}", abi_path.display()));
+
+    let abi_str = fs::read_to_string(abi_path)
+        .with_context(|| format!("Failed to read ABI file: {:?}", abi_path))?;
+
+    // Preprocess ABI to normalize format and add default event param names
+    let processed_abi = preprocess_abi_json(&abi_str)
+        .with_context(|| format!("Failed to preprocess ABI: {:?}", abi_path))?;
+
+    let contract: JsonAbi = serde_json::from_str(&processed_abi)
+        .with_context(|| format!("Failed to parse ABI JSON: {:?}", abi_path))?;
+
+    step(Step::Generate, &format!("Generate types for ABI {}", name));
+
+    let generator = AbiCodeGenerator::new(contract, name);
+    let imports = generator.generate_module_imports();
+    let classes = generator.generate_types();
+
+    let code = generate_file(&imports, &classes);
+    let formatted = try_format_typescript(&code);
+
+    // Create output directory (for data source subdirectory)
+    fs::create_dir_all(output_dir)
+        .with_context(|| format!("Failed to create output directory: {:?}", output_dir))?;
+
+    let output_file = output_dir.join(format!("{}.ts", name));
+    step(
+        Step::Write,
+        &format!("Write types to {}", output_file.display()),
+    );
+    fs::write(&output_file, formatted)
+        .with_context(|| format!("Failed to write ABI types: {:?}", output_file))?;
+
+    Ok(())
+}
+
+/// Generate types for data source templates.
+fn generate_template_types(templates: &[Template], output_dir: &Path) -> Result<()> {
+    step(Step::Generate, "Generate types for data source templates");
+
+    let codegen_templates: Vec<CodegenTemplate> = templates
+        .iter()
+        .filter_map(|t| {
+            TemplateKind::from_str_kind(&t.kind).map(|kind| CodegenTemplate::new(&t.name, kind))
+        })
+        .collect();
+
+    if codegen_templates.is_empty() {
+        return Ok(());
+    }
+
+    let generator = TemplateCodeGenerator::new(codegen_templates);
+    let imports = generator.generate_module_imports();
+    let classes = generator.generate_types();
+
+    let code = generate_file(&imports, &classes);
+    let formatted = try_format_typescript(&code);
+
+    let output_file = output_dir.join("templates.ts");
+    step(
+        Step::Write,
+        &format!("Write types to {}", output_file.display()),
+    );
+    fs::write(&output_file, formatted)
+        .with_context(|| format!("Failed to write template types: {:?}", output_file))?;
+
+    Ok(())
+}
+
+/// Generate types for subgraph data sources.
+///
+/// For each subgraph data source, this fetches the referenced subgraph's schema
+/// from IPFS and generates entity types (without store methods).
+async fn generate_subgraph_source_types(
+    subgraph_sources: &[&DataSource],
+    output_dir: &Path,
+    ipfs_url: &str,
+) -> Result<()> {
+    step(Step::Generate, "Generate types for subgraph data sources");
+
+    let ipfs_client = IpfsClient::new(ipfs_url)?;
+
+    // Validate that all subgraph data source names are unique
+    let mut seen_names = std::collections::HashSet::new();
+    for source in subgraph_sources {
+        if !seen_names.insert(&source.name) {
+            return Err(anyhow!(
+                "Duplicate subgraph data source name '{}'. Each subgraph data source must have a unique name.",
+                source.name
+            ));
+        }
+    }
+
+    for source in subgraph_sources {
+        // source_address is guaranteed to be Some because of is_subgraph_source() filter
+        let address = source.source_address.as_ref().unwrap();
+
+        step(
+            Step::Load,
+            &format!("Fetch schema for subgraph {} ({})", source.name, address),
+        );
+
+        // Fetch schema from IPFS using block_in_place to allow blocking in async context
+        let schema_str = ipfs_client.fetch_subgraph_schema(address).await?;
+
+        // Parse the schema
+        let ast: gql::Document<'_, String> = gql::parse_schema(&schema_str)
+            .map_err(|e| anyhow::anyhow!("Failed to parse subgraph schema: {}", e))?;
+
+        step(
+            Step::Generate,
+            &format!("Generate types for subgraph {} ({})", source.name, address),
+        );
+
+        // Generate entity types WITHOUT store methods (false = no store methods)
+        let generator = match SchemaCodeGenerator::new(&ast) {
+            Ok(generator) => generator,
+            Err(e) => {
+                eprintln!(
+                    "Warning: Failed to create schema generator for subgraph {} ({}): {}",
+                    source.name, address, e
+                );
+                continue;
+            }
+        };
+
+        let imports = generator.generate_module_imports();
+        // Pass false to generate entities without store methods
+        let entity_classes = generator.generate_types(false);
+
+        let code = generate_file(&imports, &entity_classes);
+        let formatted = try_format_typescript(&code);
+
+        // Output to: <output_dir>/subgraph-<NAME>.ts
+        // Using name instead of IPFS hash for stable file names
+        let output_file = output_dir.join(format!("subgraph-{}.ts", source.name));
+        step(
+            Step::Write,
+            &format!("Write types to {}", output_file.display()),
+        );
+        fs::write(&output_file, formatted)
+            .with_context(|| format!("Failed to write subgraph types: {:?}", output_file))?;
+    }
+
+    Ok(())
+}
+
+/// Generate a TypeScript file from imports and classes.
+fn generate_file(imports: &[ModuleImports], classes: &[Class]) -> String {
+    let mut output = String::new();
+
+    // Add generated file note
+    output.push_str(GENERATED_FILE_NOTE);
+    output.push('\n');
+
+    // Add imports
+    for import in imports {
+        output.push_str(&import.to_string());
+        output.push('\n');
+    }
+
+    // Add classes
+    for class in classes {
+        output.push_str(&class.to_string());
+    }
+
+    output
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_generate_file() {
+        let imports = vec![ModuleImports::new(
+            vec!["Entity".to_string()],
+            "@graphprotocol/graph-ts",
+        )];
+        let classes = vec![];
+        let output = generate_file(&imports, &classes);
+        assert!(output.contains("AUTOGENERATED"));
+        assert!(output.contains("import { Entity }"));
+    }
+
+    /// Test that codegen generates types in the correct directory structure.
+    ///
+    /// TS CLI generates:
+    /// - generated/schema.ts
+    /// - generated/<DataSourceName>/<AbiName>.ts
+    /// - generated/templates/<TemplateName>/<AbiName>.ts
+    #[tokio::test]
+    async fn test_codegen_directory_structure() {
+        let temp_dir = TempDir::new().unwrap();
+        let project_dir = temp_dir.path();
+        let output_dir = project_dir.join("generated");
+
+        // Create manifest
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    network: mainnet
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
+"#;
+        fs::write(project_dir.join("subgraph.yaml"), manifest_content).unwrap();
+
+        // Create schema
+        let schema_content = r#"
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  x: BigDecimal!
+}
+"#;
+        fs::write(project_dir.join("schema.graphql"), schema_content).unwrap();
+
+        // Create ABI
+        let abi_content = r#"[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "anonymous": false,
+    "inputs": [{ "type": "string", "name": "param0", "indexed": false }]
+  }
+]"#;
+        fs::write(project_dir.join("Abi.json"), abi_content).unwrap();
+
+        // Create mapping (empty is fine)
+        fs::write(project_dir.join("mapping.ts"), "").unwrap();
+
+        // Run codegen
+        let opt = CodegenOpt {
+            manifest: project_dir.join("subgraph.yaml"),
+            output_dir: output_dir.clone(),
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+        generate_types(&opt).await.unwrap();
+
+        // Verify directory structure
+        assert!(
+            output_dir.join("schema.ts").exists(),
+            "schema.ts should exist at root of output dir"
+        );
+        assert!(
+            output_dir.join("ExampleSubgraph").is_dir(),
+            "ExampleSubgraph directory should exist"
+        );
+        assert!(
+            output_dir
+                .join("ExampleSubgraph/ExampleContract.ts")
+                .exists(),
+            "ExampleContract.ts should be in ExampleSubgraph subdirectory"
+        );
+
+        // Verify schema.ts content
+        let schema_ts = fs::read_to_string(output_dir.join("schema.ts")).unwrap();
+        assert!(
+            schema_ts.contains("export class MyEntity"),
+            "schema.ts should contain MyEntity class"
+        );
+        assert!(
+            schema_ts.contains("AUTOGENERATED"),
+            "schema.ts should have autogenerated note"
+        );
+
+        // Verify ABI types content
+        let abi_ts =
+            fs::read_to_string(output_dir.join("ExampleSubgraph/ExampleContract.ts")).unwrap();
+        assert!(
+            abi_ts.contains("export class ExampleEvent"),
+            "ABI types should contain ExampleEvent class"
+        );
+        assert!(
+            abi_ts.contains("export class ExampleContract"),
+            "ABI types should contain ExampleContract class"
+        );
+    }
+
+    /// Snapshot test for schema codegen output format.
+    ///
+    /// Tests that schema.ts matches the expected TS CLI format for a simple entity.
+    /// This helps ensure byte-for-byte compatibility with the graph-cli.
+    #[tokio::test]
+    async fn test_schema_codegen_snapshot() {
+        let temp_dir = TempDir::new().unwrap();
+        let project_dir = temp_dir.path();
+        let output_dir = project_dir.join("generated");
+
+        // Create manifest
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: TestDataSource
+    network: mainnet
+    source:
+      abi: TestContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: TestContract
+          file: ./TestContract.json
+      eventHandlers:
+        - event: Transfer(address,address,uint256)
+          handler: handleTransfer
+"#;
+        fs::write(project_dir.join("subgraph.yaml"), manifest_content).unwrap();
+
+        // Create a simple schema with BigDecimal field
+        let schema_content = r#"
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  x: BigDecimal!
+}
+"#;
+        fs::write(project_dir.join("schema.graphql"), schema_content).unwrap();
+        fs::write(project_dir.join("mapping.ts"), "").unwrap();
+        let abi = r#"[{
+            "type": "event",
+            "name": "Transfer",
+            "anonymous": false,
+            "inputs": [
+                {"name": "from", "type": "address", "indexed": true},
+                {"name": "to", "type": "address", "indexed": true},
+                {"name": "value", "type": "uint256", "indexed": false}
+            ]
+        }]"#;
+        fs::write(project_dir.join("TestContract.json"), abi).unwrap();
+
+        // Run codegen
+        let opt = CodegenOpt {
+            manifest: project_dir.join("subgraph.yaml"),
+            output_dir: output_dir.clone(),
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+        generate_types(&opt).await.unwrap();
+
+        // Read generated schema.ts
+        let schema_ts = fs::read_to_string(output_dir.join("schema.ts")).unwrap();
+
+        // Verify key parts of the output that must match TS CLI format
+        assert!(
+            schema_ts.contains("// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY."),
+            "Should have standard autogenerated note"
+        );
+        assert!(schema_ts.contains("import {"), "Should have imports");
+        assert!(
+            schema_ts.contains("from \"@graphprotocol/graph-ts\""),
+            "Should import from @graphprotocol/graph-ts"
+        );
+        assert!(
+            schema_ts.contains("export class MyEntity extends Entity"),
+            "Should export MyEntity class extending Entity"
+        );
+        assert!(
+            schema_ts.contains("constructor(id: string)"),
+            "Should have constructor with id parameter"
+        );
+        assert!(
+            schema_ts.contains("save(): void"),
+            "Should have save method"
+        );
+        assert!(
+            schema_ts.contains("static loadInBlock(id: string): MyEntity | null"),
+            "Should have loadInBlock static method"
+        );
+        assert!(
+            schema_ts.contains("static load(id: string): MyEntity | null"),
+            "Should have load static method"
+        );
+        assert!(
+            schema_ts.contains("get id(): string"),
+            "Should have id getter"
+        );
+        assert!(
+            schema_ts.contains("set id(value: string)"),
+            "Should have id setter"
+        );
+        assert!(
+            schema_ts.contains("get x(): BigDecimal"),
+            "Should have x getter returning BigDecimal"
+        );
+        assert!(
+            schema_ts.contains("set x(value: BigDecimal)"),
+            "Should have x setter accepting BigDecimal"
+        );
+
+        // Verify the save method has correct entity type assertion
+        assert!(
+            schema_ts.contains("store.set(\"MyEntity\""),
+            "save() should call store.set with entity type name"
+        );
+
+        // Verify load methods use correct store methods
+        assert!(
+            schema_ts.contains("store.get(\"MyEntity\""),
+            "load() should call store.get with entity type name"
+        );
+        assert!(
+            schema_ts.contains("store.get_in_block(\"MyEntity\""),
+            "loadInBlock() should call store.get_in_block with entity type name"
+        );
+    }
+
+    /// Snapshot test for ABI codegen output format.
+    ///
+    /// Tests that ABI types match the expected TS CLI format for events and contract class.
+    #[tokio::test]
+    async fn test_abi_codegen_snapshot() {
+        let temp_dir = TempDir::new().unwrap();
+        let project_dir = temp_dir.path();
+        let output_dir = project_dir.join("generated");
+
+        // Create manifest
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    network: mainnet
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
+"#;
+        fs::write(project_dir.join("subgraph.yaml"), manifest_content).unwrap();
+
+        // Create schema
+        fs::write(
+            project_dir.join("schema.graphql"),
+            "type MyEntity @entity { id: ID! }",
+        )
+        .unwrap();
+        fs::write(project_dir.join("mapping.ts"), "").unwrap();
+
+        // Create ABI with event
+        let abi_content = r#"[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "anonymous": false,
+    "inputs": [{ "type": "string", "name": "param0", "indexed": false }]
+  }
+]"#;
+        fs::write(project_dir.join("Abi.json"), abi_content).unwrap();
+
+        // Run codegen
+        let opt = CodegenOpt {
+            manifest: project_dir.join("subgraph.yaml"),
+            output_dir: output_dir.clone(),
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+        generate_types(&opt).await.unwrap();
+
+        // Read generated ABI types
+        let abi_ts =
+            fs::read_to_string(output_dir.join("ExampleSubgraph/ExampleContract.ts")).unwrap();
+
+        // Verify key parts of the output that must match TS CLI format
+        assert!(
+            abi_ts.contains("// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY."),
+            "Should have standard autogenerated note"
+        );
+        assert!(abi_ts.contains("import {"), "Should have imports");
+        assert!(
+            abi_ts.contains("from \"@graphprotocol/graph-ts\""),
+            "Should import from @graphprotocol/graph-ts"
+        );
+
+        // Event class
+        assert!(
+            abi_ts.contains("export class ExampleEvent extends ethereum.Event"),
+            "Should export event class extending ethereum.Event"
+        );
+        assert!(
+            abi_ts.contains("get params(): ExampleEvent__Params"),
+            "Event should have params getter"
+        );
+
+        // Params class
+        assert!(
+            abi_ts.contains("export class ExampleEvent__Params"),
+            "Should have params class"
+        );
+        assert!(
+            abi_ts.contains("_event: ExampleEvent"),
+            "Params should have _event field"
+        );
+        assert!(
+            abi_ts.contains("get param0(): string"),
+            "Params should have param0 getter"
+        );
+
+        // Contract class
+        assert!(
+            abi_ts.contains("export class ExampleContract extends ethereum.SmartContract"),
+            "Should export contract class extending ethereum.SmartContract"
+        );
+        assert!(
+            abi_ts.contains("static bind(address: Address): ExampleContract"),
+            "Contract should have static bind method"
+        );
+    }
+
+    /// Test that codegen fails when referenced ABI file does not exist.
+    ///
+    /// Before Step 2, codegen did not validate the manifest. Now it calls
+    /// `validate_manifest()` which checks file existence, so a missing ABI
+    /// file is caught before codegen even starts generating types.
+    #[tokio::test]
+    async fn test_codegen_fails_on_missing_abi_file() {
+        let temp_dir = TempDir::new().unwrap();
+        let project_dir = temp_dir.path();
+        let output_dir = project_dir.join("generated");
+
+        // Manifest references an ABI file that doesn't exist
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+"#;
+        fs::write(project_dir.join("subgraph.yaml"), manifest_content).unwrap();
+
+        // Create schema and mapping, but NOT the ABI file
+        fs::write(
+            project_dir.join("schema.graphql"),
+            "type MyEntity @entity { id: ID! }",
+        )
+        .unwrap();
+        fs::write(project_dir.join("mapping.ts"), "").unwrap();
+
+        let opt = CodegenOpt {
+            manifest: project_dir.join("subgraph.yaml"),
+            output_dir,
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+
+        let result = generate_types(&opt).await;
+        assert!(
+            result.is_err(),
+            "Codegen should fail when ABI file is missing"
+        );
+        let err = format!("{:#}", result.unwrap_err());
+        assert!(
+            err.contains("validation failed"),
+            "Error should mention validation failure, got: {}",
+            err
+        );
+    }
+
+    /// Test that codegen fails when referenced schema file does not exist.
+    #[tokio::test]
+    async fn test_codegen_fails_on_missing_schema_file() {
+        let temp_dir = TempDir::new().unwrap();
+        let project_dir = temp_dir.path();
+        let output_dir = project_dir.join("generated");
+
+        // Manifest references a schema file that doesn't exist
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - MyEntity
+      abis: []
+"#;
+        fs::write(project_dir.join("subgraph.yaml"), manifest_content).unwrap();
+
+        // Create mapping, but NOT the schema file
+        fs::write(project_dir.join("mapping.ts"), "").unwrap();
+
+        let opt = CodegenOpt {
+            manifest: project_dir.join("subgraph.yaml"),
+            output_dir,
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+
+        let result = generate_types(&opt).await;
+        assert!(
+            result.is_err(),
+            "Codegen should fail when schema file is missing"
+        );
+        let err = format!("{:#}", result.unwrap_err());
+        assert!(
+            err.contains("validation failed"),
+            "Error should mention validation failure, got: {}",
+            err
+        );
+    }
+}
diff --git a/gnd/src/commands/create.rs b/gnd/src/commands/create.rs
new file mode 100644
index 00000000000..5351a4eff21
--- /dev/null
+++ b/gnd/src/commands/create.rs
@@ -0,0 +1,96 @@
+use anyhow::{Context, Result};
+use clap::Parser;
+
+use crate::commands::auth::get_deploy_key;
+use crate::services::GraphNodeClient;
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Register a subgraph name with a Graph Node")]
+pub struct CreateOpt {
+    /// The subgraph name to register (e.g., "user/subgraph")
+    #[clap(value_name = "SUBGRAPH_NAME")]
+    pub subgraph_name: String,
+
+    /// Graph Node admin URL
+    #[clap(long, short = 'g', value_name = "URL", help = "Graph Node URL")]
+    pub node: String,
+
+    /// Access token for authentication
+    #[clap(long, value_name = "TOKEN", help = "Graph access token")]
+    pub access_token: Option<String>,
+}
+
+/// Run the create command
+pub async fn run_create(opt: CreateOpt) -> Result<()> {
+    println!("Creating subgraph in Graph node: {}", opt.node);
+
+    // Get access token (from flag or from config)
+    let access_token = match &opt.access_token {
+        Some(token) => Some(token.clone()),
+        None => get_deploy_key(&opt.node)
+            .ok()
+            .flatten()
+            .map(|key| key.to_string()),
+    };
+
+    let client = GraphNodeClient::new(&opt.node, access_token.as_deref())
+        .context("Failed to create Graph Node client")?;
+
+    client
+        .create_subgraph(&opt.subgraph_name)
+        .await
+        .context("Failed to create subgraph")?;
+
+    println!("✔ Created subgraph: {}", opt.subgraph_name);
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_create_opt_parsing() {
+        // Test that required args are enforced
+        let result = CreateOpt::try_parse_from(["create"]);
+        assert!(result.is_err());
+
+        // Test with just subgraph name (missing --node)
+        let result = CreateOpt::try_parse_from(["create", "user/subgraph"]);
+        assert!(result.is_err());
+
+        // Test with all required args
+        let result = CreateOpt::try_parse_from([
+            "create",
+            "user/subgraph",
+            "--node",
+            "http://localhost:8020",
+        ]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.subgraph_name, "user/subgraph");
+        assert_eq!(opt.node, "http://localhost:8020");
+        assert!(opt.access_token.is_none());
+
+        // Test with access token
+        let result = CreateOpt::try_parse_from([
+            "create",
+            "user/subgraph",
+            "--node",
+            "http://localhost:8020",
+            "--access-token",
+            "my-token",
+        ]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.access_token, Some("my-token".to_string()));
+
+        // Test short flag for node
+        let result =
+            CreateOpt::try_parse_from(["create", "user/subgraph", "-g", "http://localhost:8020"]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.node, "http://localhost:8020");
+    }
+}
diff --git a/gnd/src/commands/deploy.rs b/gnd/src/commands/deploy.rs
new file mode 100644
index 00000000000..5c9e744ba02
--- /dev/null
+++ b/gnd/src/commands/deploy.rs
@@ -0,0 +1,318 @@
+//! Deploy command for deploying subgraphs to a Graph Node.
+//!
+//! This command builds a subgraph (unless an IPFS hash is provided),
+//! uploads it to IPFS, and deploys it to a Graph Node.
+
+use std::{
+    io::{self, IsTerminal},
+    path::PathBuf,
+};
+
+use anyhow::{Context, Result, anyhow};
+use clap::Parser;
+use url::Url;
+
+use crate::commands::auth::get_deploy_key;
+use crate::commands::build::{BuildOpt, run_build};
+use crate::output::{Step, step};
+use crate::prompt::{normalize_version_label, prompt_version_label};
+use crate::services::GraphNodeClient;
+
+/// Default IPFS URL used by The Graph
+const DEFAULT_IPFS_URL: &str = "https://api.thegraph.com/ipfs/api/v0";
+
+/// Default deploy URL for Subgraph Studio
+const SUBGRAPH_STUDIO_URL: &str = "https://api.studio.thegraph.com/deploy/";
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Deploy a subgraph to a Graph Node")]
+pub struct DeployOpt {
+    /// Name to deploy the subgraph as (e.g., "user/subgraph")
+    #[clap()]
+    pub subgraph_name: String,
+
+    /// Path to the subgraph manifest
+    #[clap(default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// Graph Node admin URL. Defaults to Subgraph Studio if not provided.
+    #[clap(short = 'g', long)]
+    pub node: Option<String>,
+
+    /// IPFS node URL to upload build results to
+    #[clap(short = 'i', long, default_value = DEFAULT_IPFS_URL)]
+    pub ipfs: String,
+
+    /// Deploy key for authentication
+    #[clap(long)]
+    pub deploy_key: Option<String>,
+
+    /// Version label for the deployment (e.g., "v0.0.1")
+    #[clap(short = 'l', long)]
+    pub version_label: Option<String>,
+
+    /// IPFS hash of an already-uploaded subgraph manifest to deploy
+    #[clap(long)]
+    pub ipfs_hash: Option<String>,
+
+    /// Output directory for build results
+    #[clap(short = 'o', long, default_value = "build/")]
+    pub output_dir: PathBuf,
+
+    /// Skip subgraph migrations
+    #[clap(long)]
+    pub skip_migrations: bool,
+
+    /// Network configuration to use from the networks config file
+    #[clap(long)]
+    pub network: Option<String>,
+
+    /// Networks config file path
+    #[clap(long, default_value = "networks.json")]
+    pub network_file: PathBuf,
+
+    /// Fork subgraph ID for debugging
+    #[clap(long)]
+    pub debug_fork: Option<String>,
+
+    /// Skip the asc version check (use with caution)
+    #[clap(long, env = "GND_SKIP_ASC_VERSION_CHECK")]
+    pub skip_asc_version_check: bool,
+}
+
+/// Run the deploy command.
+pub async fn run_deploy(opt: DeployOpt) -> Result<()> {
+    // Use Subgraph Studio URL if no node is provided
+    let node = opt.node.as_deref().unwrap_or(SUBGRAPH_STUDIO_URL);
+
+    // Validate URLs
+    validate_url(node, "node")?;
+    validate_url(&opt.ipfs, "IPFS")?;
+
+    // Get deploy key (from flag or stored auth)
+    let deploy_key = match &opt.deploy_key {
+        Some(key) => Some(key.clone()),
+        None => get_deploy_key(node)?,
+    };
+
+    let version_label =
+        match resolve_version_label(opt.version_label.as_deref(), io::stdin().is_terminal())? {
+            Some(label) => label,
+            None => prompt_version_label()?,
+        };
+
+    // Get or build the IPFS hash
+    let ipfs_hash = match &opt.ipfs_hash {
+        Some(hash) => {
+            step(Step::Skip, "Build (using provided IPFS hash)");
+            hash.clone()
+        }
+        None => {
+            // Build the subgraph and upload to IPFS
+            build_and_upload(&opt).await?
+        }
+    };
+
+    // Deploy to Graph Node
+    deploy_to_node(
+        &opt,
+        node,
+        &ipfs_hash,
+        &version_label,
+        deploy_key.as_deref(),
+    )
+    .await
+}
+
+/// Validate that a URL is well-formed.
+fn validate_url(url: &str, name: &str) -> Result<()> {
+    Url::parse(url)
+        .map_err(|e| anyhow!("Invalid {} URL '{}': {}", name, url, e))
+        .map(|parsed| {
+            match parsed.scheme() {
+                "http" | "https" => {}
+                scheme => {
+                    return Err(anyhow!(
+                        "Unsupported protocol '{}' for {} URL. Must be http:// or https://",
+                        scheme,
+                        name
+                    ));
+                }
+            }
+            Ok(())
+        })??;
+    Ok(())
+}
+
+/// Parse and validate a normalized version label.
+fn parse_version_label(label: &str) -> Result<String> {
+    let normalized = normalize_version_label(label);
+    if normalized.is_empty() {
+        return Err(anyhow!("Version label cannot be empty"));
+    }
+    Ok(normalized)
+}
+
+/// Resolve version label from flag or interactive prompt mode.
+fn resolve_version_label(
+    version_label: Option<&str>,
+    stdin_is_terminal: bool,
+) -> Result<Option<String>> {
+    match version_label {
+        Some(label) => parse_version_label(label)
+            .context("Invalid --version-label value")
+            .map(Some),
+        None if stdin_is_terminal => Ok(None),
+        None => Err(anyhow!(
+            "--version-label is required in non-interactive mode. \
+             Pass --version-label <LABEL>."
+        )),
+    }
+}
+
+/// Build the subgraph and upload to IPFS.
+async fn build_and_upload(opt: &DeployOpt) -> Result<String> {
+    // Run the build command with IPFS upload enabled
+    let build_opt = BuildOpt {
+        manifest: opt.manifest.clone(),
+        output_dir: opt.output_dir.clone(),
+        output_format: "wasm".to_string(),
+        skip_migrations: opt.skip_migrations,
+        watch: false,
+        ipfs: Some(opt.ipfs.clone()),
+        network: opt.network.clone(),
+        network_file: opt.network_file.clone(),
+        skip_asc_version_check: opt.skip_asc_version_check,
+    };
+
+    match run_build(build_opt).await? {
+        Some(ipfs_hash) => Ok(ipfs_hash),
+        None => Err(anyhow!(
+            "Build succeeded but no IPFS hash was returned. This is unexpected."
+        )),
+    }
+}
+
+/// Deploy the subgraph to the Graph Node.
+async fn deploy_to_node(
+    opt: &DeployOpt,
+    node: &str,
+    ipfs_hash: &str,
+    version_label: &str,
+    deploy_key: Option<&str>,
+) -> Result<()> {
+    step(Step::Deploy, &format!("Deploying to {}", node));
+
+    let client = GraphNodeClient::new(node, deploy_key)?;
+
+    let result = client
+        .deploy_subgraph(
+            &opt.subgraph_name,
+            ipfs_hash,
+            Some(version_label),
+            opt.debug_fork.as_deref(),
+        )
+        .await
+        .with_context(|| {
+            format!(
+                "Failed to deploy subgraph '{}' to {}",
+                opt.subgraph_name, node
+            )
+        })?;
+
+    // Normalize URLs if they're relative (start with ':')
+    let base = Url::parse(node)?;
+    let base_str = format!(
+        "{}://{}",
+        base.scheme(),
+        base.host_str().unwrap_or("localhost")
+    );
+
+    let playground = if result.playground.starts_with(':') {
+        format!("{}{}", base_str, result.playground)
+    } else {
+        result.playground
+    };
+
+    let queries = if result.queries.starts_with(':') {
+        format!("{}{}", base_str, result.queries)
+    } else {
+        result.queries
+    };
+
+    step(Step::Done, &format!("Deployed to {}", playground));
+    println!();
+    println!("Subgraph endpoints:");
+    println!("Queries (HTTP):     {}", queries);
+    println!();
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_validate_url_valid_http() {
+        assert!(validate_url("http://localhost:8020", "node").is_ok());
+    }
+
+    #[test]
+    fn test_validate_url_valid_https() {
+        assert!(validate_url("https://api.thegraph.com/ipfs", "IPFS").is_ok());
+    }
+
+    #[test]
+    fn test_validate_url_invalid() {
+        assert!(validate_url("not-a-url", "test").is_err());
+    }
+
+    #[test]
+    fn test_validate_url_unsupported_protocol() {
+        assert!(validate_url("ftp://example.com", "test").is_err());
+    }
+
+    #[test]
+    fn test_subgraph_studio_url() {
+        // Verify the default URL is valid
+        assert!(validate_url(SUBGRAPH_STUDIO_URL, "node").is_ok());
+    }
+
+    #[test]
+    fn test_default_ipfs_url() {
+        // Verify the default IPFS URL is valid
+        assert!(validate_url(DEFAULT_IPFS_URL, "IPFS").is_ok());
+    }
+
+    #[test]
+    fn test_parse_version_label_rejects_empty_after_normalize() {
+        assert!(parse_version_label("").is_err());
+        assert!(parse_version_label("   ").is_err());
+        assert!(parse_version_label("\"\"").is_err());
+        assert!(parse_version_label(" \"\" ").is_err());
+        assert!(parse_version_label("\"   \"").is_err());
+    }
+
+    #[test]
+    fn test_resolve_version_label_from_flag() {
+        assert_eq!(
+            resolve_version_label(Some(" \"v1.0.0\" "), false).unwrap(),
+            Some("v1.0.0".to_string())
+        );
+    }
+
+    #[test]
+    fn test_resolve_version_label_interactive_without_flag() {
+        assert_eq!(resolve_version_label(None, true).unwrap(), None);
+    }
+
+    #[test]
+    fn test_resolve_version_label_non_interactive_requires_flag() {
+        let err = resolve_version_label(None, false).unwrap_err();
+        assert!(
+            err.to_string()
+                .contains("--version-label is required in non-interactive mode")
+        );
+    }
+}
diff --git a/gnd/src/commands/dev.rs b/gnd/src/commands/dev.rs
new file mode 100644
index 00000000000..044cefa877e
--- /dev/null
+++ b/gnd/src/commands/dev.rs
@@ -0,0 +1,304 @@
+use std::{path::Path, sync::Arc};
+
+use anyhow::{Context, Result};
+use clap::Parser;
+use graph::{
+    components::link_resolver::FileLinkResolver,
+    env::EnvVars,
+    prelude::{CheapClone, DeploymentHash, LinkResolver, SubgraphName},
+    slog::{Logger, error, info},
+};
+use graph_core::polling_monitor::ipfs_service;
+use graph_node::{launcher, opt::Opt};
+use tokio::sync::mpsc;
+use tokio_util::sync::CancellationToken;
+
+use crate::watcher::{deploy_all_subgraphs, parse_manifest_args, watch_subgraphs};
+
+#[cfg(unix)]
+use pgtemp::{PgTempDB, PgTempDBBuilder};
+
+// Add an alias for the temporary Postgres DB handle. On non unix
+// targets we don't have pgtemp, but we still need the type to satisfy the
+// function signatures.
+#[cfg(unix)]
+type TempPgDB = PgTempDB;
+#[cfg(not(unix))]
+type TempPgDB = ();
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Run graph-node in dev mode")]
+pub struct DevOpt {
+    #[clap(
+        long,
+        help = "Start a graph-node in dev mode watching a build directory for changes"
+    )]
+    pub watch: bool,
+
+    #[clap(
+        long,
+        value_name = "MANIFEST:[BUILD_DIR]",
+        help = "The location of the subgraph manifest file. If no build directory is provided, the default is 'build'. The file can be an alias, in the format '[BUILD_DIR:]manifest' where 'manifest' is the path to the manifest file, and 'BUILD_DIR' is the path to the build directory relative to the manifest file.",
+        default_value = "./subgraph.yaml",
+        value_delimiter = ','
+    )]
+    pub manifests: Vec<String>,
+
+    #[clap(
+        long,
+        value_name = "ALIAS:MANIFEST:[BUILD_DIR]",
+        value_delimiter = ',',
+        help = "The location of the source subgraph manifest files. This is used to resolve aliases in the manifest files for subgraph data sources. The format is ALIAS:MANIFEST:[BUILD_DIR], where ALIAS is the alias name, BUILD_DIR is the build directory relative to the manifest file, and MANIFEST is the manifest file location."
+    )]
+    pub sources: Vec<String>,
+
+    #[clap(
+        long,
+        help = "The location of the database directory.",
+        default_value = "./build"
+    )]
+    pub database_dir: String,
+
+    #[clap(
+        long,
+        value_name = "URL",
+        env = "POSTGRES_URL",
+        help = "Location of the Postgres database used for storing entities"
+    )]
+    pub postgres_url: Option<String>,
+
+    #[clap(
+        long,
+        allow_negative_numbers = false,
+        value_name = "NETWORK_NAME:[CAPABILITIES]:URL",
+        env = "ETHEREUM_RPC",
+        help = "Ethereum network name (e.g. 'mainnet'), optional comma-separated capabilities (eg 'full,archive'), and an Ethereum RPC URL, separated by a ':'"
+    )]
+    pub ethereum_rpc: Vec<String>,
+
+    #[clap(
+        long,
+        value_name = "HOST:PORT",
+        env = "IPFS",
+        help = "HTTP addresses of IPFS servers (RPC, Gateway)",
+        default_value = "https://api.thegraph.com/ipfs"
+    )]
+    pub ipfs: Vec<String>,
+    #[clap(
+        long,
+        default_value = "8000",
+        value_name = "PORT",
+        help = "Port for the GraphQL HTTP server",
+        env = "GRAPH_GRAPHQL_HTTP_PORT"
+    )]
+    pub http_port: u16,
+    #[clap(
+        long,
+        default_value = "8030",
+        value_name = "PORT",
+        help = "Port for the index node server"
+    )]
+    pub index_node_port: u16,
+    #[clap(
+        long,
+        default_value = "8020",
+        value_name = "PORT",
+        help = "Port for the JSON-RPC admin server"
+    )]
+    pub admin_port: u16,
+    #[clap(
+        long,
+        default_value = "8040",
+        value_name = "PORT",
+        help = "Port for the Prometheus metrics server"
+    )]
+    pub metrics_port: u16,
+}
+
+/// Builds the Graph Node options from DevOpt
+fn build_args(dev_opt: &DevOpt, db_url: &str) -> Result<Opt> {
+    let mut args = vec!["gnd".to_string()];
+
+    if !dev_opt.ipfs.is_empty() {
+        args.push("--ipfs".to_string());
+        args.push(dev_opt.ipfs.join(","));
+    }
+
+    if !dev_opt.ethereum_rpc.is_empty() {
+        args.push("--ethereum-rpc".to_string());
+        args.push(dev_opt.ethereum_rpc.join(","));
+    }
+
+    args.push("--postgres-url".to_string());
+    args.push(db_url.to_string());
+
+    let mut opt = Opt::parse_from(args);
+
+    opt.http_port = dev_opt.http_port;
+    opt.admin_port = dev_opt.admin_port;
+    opt.metrics_port = dev_opt.metrics_port;
+    opt.index_node_port = dev_opt.index_node_port;
+
+    Ok(opt)
+}
+
+async fn run_graph_node(
+    logger: &Logger,
+    opt: Opt,
+    link_resolver: Arc<dyn LinkResolver>,
+    subgraph_updates_channel: mpsc::Receiver<(DeploymentHash, SubgraphName)>,
+    cancel_token: CancellationToken,
+) -> Result<()> {
+    let env_vars = Arc::new(EnvVars::from_env().context("Failed to load environment variables")?);
+
+    let (prometheus_registry, metrics_registry) = launcher::setup_metrics(logger);
+
+    let ipfs_client = graph::ipfs::new_ipfs_client(&opt.ipfs, &metrics_registry, logger)
+        .await
+        .unwrap_or_else(|err| panic!("Failed to create IPFS client: {err:#}"));
+
+    let ipfs_service = ipfs_service(
+        ipfs_client.cheap_clone(),
+        env_vars.mappings.max_ipfs_file_bytes,
+        env_vars.mappings.ipfs_timeout,
+        env_vars.mappings.ipfs_request_limit,
+    );
+
+    launcher::run(
+        logger.clone(),
+        opt,
+        env_vars,
+        ipfs_service,
+        link_resolver,
+        Some(subgraph_updates_channel),
+        prometheus_registry,
+        metrics_registry,
+        cancel_token,
+    )
+    .await;
+    Ok(())
+}
+
+/// Get the database URL, either from the provided option or by creating a temporary database
+fn get_database_url(
+    postgres_url: Option<&String>,
+    database_dir: &Path,
+) -> Result<(String, Option<TempPgDB>)> {
+    if let Some(url) = postgres_url {
+        Ok((url.clone(), None))
+    } else {
+        #[cfg(unix)]
+        {
+            // Check the database directory exists
+            if !database_dir.exists() {
+                anyhow::bail!(
+                    "Database directory does not exist: {}",
+                    database_dir.display()
+                );
+            }
+
+            let db = PgTempDBBuilder::new()
+                .with_data_dir_prefix(database_dir)
+                .persist_data(false)
+                .with_initdb_arg("-E", "UTF8")
+                .with_initdb_arg("--locale", "C")
+                .start();
+            let url = db.connection_uri().to_string();
+            // Return the handle so it lives for the lifetime of the program; dropping it will
+            // shut down Postgres and remove the temporary directory automatically.
+            Ok((url, Some(db)))
+        }
+
+        #[cfg(not(unix))]
+        {
+            let _ = database_dir; // Suppress unused warning
+            anyhow::bail!(
+                "Please provide a postgres_url manually using the --postgres-url option."
+            );
+        }
+    }
+}
+
+/// Run the dev command
+pub async fn run_dev(
+    dev_opt: DevOpt,
+    logger: Logger,
+    cancel_token: CancellationToken,
+) -> Result<()> {
+    let database_dir = Path::new(&dev_opt.database_dir);
+
+    info!(logger, "Starting Graph Node Dev");
+    info!(logger, "Database directory: {}", database_dir.display());
+
+    // Get the database URL and keep the temporary database handle alive for the life of the
+    // program so that it is dropped (and cleaned up) on graceful shutdown.
+    let (db_url, mut temp_db_opt) = get_database_url(dev_opt.postgres_url.as_ref(), database_dir)?;
+
+    let opt = build_args(&dev_opt, &db_url)?;
+
+    let (manifests_paths, source_subgraph_aliases): (
+        Vec<std::path::PathBuf>,
+        std::collections::HashMap<String, std::path::PathBuf>,
+    ) = parse_manifest_args(dev_opt.manifests.clone(), dev_opt.sources.clone(), &logger)?;
+    let file_link_resolver = Arc::new(FileLinkResolver::new(None, source_subgraph_aliases.clone()));
+
+    let (tx, rx) = mpsc::channel(1);
+
+    let logger_clone = logger.clone();
+    let cancel_token_clone = cancel_token.clone();
+    graph::spawn(async move {
+        let _ = run_graph_node(
+            &logger_clone,
+            opt,
+            file_link_resolver,
+            rx,
+            cancel_token_clone,
+        )
+        .await;
+    });
+
+    let deploy_result: anyhow::Result<()> =
+        deploy_all_subgraphs(&logger, &manifests_paths, &source_subgraph_aliases, &tx).await;
+    if let Err(e) = deploy_result {
+        let error_msg = e.to_string();
+        error!(logger, "Error deploying subgraphs"; "error" => error_msg);
+        std::process::exit(1);
+    }
+
+    if dev_opt.watch {
+        let logger_clone_watch = logger.clone();
+        graph::spawn_blocking(async move {
+            let watch_result: anyhow::Result<()> = watch_subgraphs(
+                &logger_clone_watch,
+                manifests_paths,
+                source_subgraph_aliases,
+                vec!["pgtemp-*".to_string()],
+                tx,
+            )
+            .await;
+            if let Err(e) = watch_result {
+                let error_msg = e.to_string();
+                error!(logger_clone_watch, "Error watching subgraphs"; "error" => error_msg);
+                std::process::exit(1);
+            }
+        });
+    }
+
+    // Wait for Ctrl+C so we can shut down cleanly and drop the temporary database, which removes
+    // the data directory.
+    tokio::signal::ctrl_c()
+        .await
+        .expect("Failed to listen for Ctrl+C signal");
+    info!(logger, "Received Ctrl+C, shutting down.");
+
+    // Explicitly shut down and clean up the temporary database directory if we started one.
+    #[cfg(unix)]
+    if let Some(db) = temp_db_opt.take() {
+        db.shutdown();
+    }
+
+    #[cfg(not(unix))]
+    let _ = temp_db_opt; // Suppress unused warning
+
+    Ok(())
+}
diff --git a/gnd/src/commands/init.rs b/gnd/src/commands/init.rs
new file mode 100644
index 00000000000..629297616d0
--- /dev/null
+++ b/gnd/src/commands/init.rs
@@ -0,0 +1,1450 @@
+//! Init command for creating new subgraphs.
+//!
+//! This command creates a new subgraph with basic scaffolding. It supports
+//! multiple modes:
+//! - From an example subgraph template
+//! - From an existing contract (fetch ABI from Etherscan/Sourcify)
+//! - From an existing deployed subgraph
+//!
+//! When required options are not provided, the command runs in interactive mode,
+//! prompting the user for necessary information.
+
+use std::fs;
+use std::io::{self, IsTerminal};
+use std::path::{Path, PathBuf};
+
+use anyhow::{Context, Result, anyhow};
+use clap::{Parser, ValueEnum};
+use graphql_tools::parser::schema as gql;
+
+use crate::commands::add::{AddOpt, run_add};
+use crate::commands::codegen::{CodegenOpt, run_codegen};
+use crate::config::networks::update_networks_file;
+use crate::output::{Step, step, with_spinner};
+use crate::prompt::{
+    InitForm, SourceType, get_subgraph_basename, prompt_add_another_contract,
+    prompt_contract_address, prompt_contract_name, prompt_directory_with_confirm,
+    prompt_start_block, prompt_subgraph_slug_with_confirm, resolve_directory_collision,
+};
+use crate::scaffold::{ScaffoldOptions, generate_scaffold, init_git, install_dependencies};
+use crate::services::{ContractInfo, ContractService, IpfsClient, NetworksRegistry};
+
+/// Available protocols for subgraph development.
+#[derive(Clone, Debug, ValueEnum)]
+pub enum Protocol {
+    Ethereum,
+    Near,
+    Cosmos,
+    Arweave,
+    Substreams,
+}
+
+impl std::fmt::Display for Protocol {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Protocol::Ethereum => write!(f, "ethereum"),
+            Protocol::Near => write!(f, "near"),
+            Protocol::Cosmos => write!(f, "cosmos"),
+            Protocol::Arweave => write!(f, "arweave"),
+            Protocol::Substreams => write!(f, "substreams"),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Parser, Default)]
+#[clap(about = "Create a new subgraph with basic scaffolding")]
+pub struct InitOpt {
+    /// Name of the subgraph (e.g., "user/my-subgraph")
+    #[clap()]
+    pub subgraph_name: Option<String>,
+
+    /// Directory to create the subgraph in
+    #[clap()]
+    pub directory: Option<PathBuf>,
+
+    /// Protocol to use for the subgraph
+    #[clap(long, value_enum)]
+    pub protocol: Option<Protocol>,
+
+    /// Graph node URL
+    #[clap(short = 'g', long)]
+    pub node: Option<String>,
+
+    /// Create scaffold from an existing contract address
+    #[clap(long, conflicts_with_all = ["from_example", "from_subgraph"])]
+    pub from_contract: Option<String>,
+
+    /// Create scaffold from an example subgraph
+    #[clap(long, conflicts_with_all = ["from_contract", "from_subgraph"])]
+    pub from_example: Option<String>,
+
+    /// Create scaffold based on an existing deployed subgraph
+    #[clap(long, conflicts_with_all = ["from_contract", "from_example"])]
+    pub from_subgraph: Option<String>,
+
+    /// Name of the contract (used with --from-contract)
+    #[clap(long)]
+    pub contract_name: Option<String>,
+
+    /// Index contract events as entities
+    #[clap(long)]
+    pub index_events: bool,
+
+    /// Skip installing dependencies
+    #[clap(long)]
+    pub skip_install: bool,
+
+    /// Skip initializing a Git repository
+    #[clap(long)]
+    pub skip_git: bool,
+
+    /// Block number to start indexing from
+    #[clap(long)]
+    pub start_block: Option<String>,
+
+    /// Path to the contract ABI file
+    #[clap(long)]
+    pub abi: Option<PathBuf>,
+
+    /// Network the contract is deployed to
+    #[clap(long)]
+    pub network: Option<String>,
+
+    /// IPFS node URL for fetching subgraph data
+    #[clap(short = 'i', long)]
+    pub ipfs: Option<String>,
+}
+
+/// Run the init command.
+pub async fn run_init(opt: InitOpt) -> Result<()> {
+    // Check if we need interactive mode
+    let needs_interactive = should_run_interactive(&opt);
+
+    if needs_interactive {
+        // Check if we're in a terminal
+        if !io::stdin().is_terminal() {
+            return Err(anyhow!(
+                "Interactive mode requires a terminal. \
+                 Please provide required options via command line flags.\n\n\
+                 Required: --from-contract <address> --network <network>\n\
+                 Or use: --from-example to create from an example"
+            ));
+        }
+
+        return run_interactive(opt).await;
+    }
+
+    // Non-interactive mode - determine the scaffold source
+    let source = if opt.from_contract.is_some() {
+        ScaffoldSource::Contract
+    } else if opt.from_example.is_some() {
+        ScaffoldSource::Example
+    } else if opt.from_subgraph.is_some() {
+        ScaffoldSource::Subgraph
+    } else {
+        // Default to example if nothing specified
+        ScaffoldSource::Example
+    };
+
+    match source {
+        ScaffoldSource::Contract => init_from_contract(&opt, None).await,
+        ScaffoldSource::Example => init_from_example(&opt),
+        ScaffoldSource::Subgraph => init_from_subgraph(&opt).await,
+    }
+}
+
+/// Check if we should run in interactive mode.
+fn should_run_interactive(opt: &InitOpt) -> bool {
+    // If --from-example is specified, we can run non-interactively
+    if opt.from_example.is_some() {
+        return false;
+    }
+
+    // If --from-subgraph is specified, we can run non-interactively (will error)
+    if opt.from_subgraph.is_some() {
+        return false;
+    }
+
+    // If --from-contract is specified with network, we can run non-interactively
+    if opt.from_contract.is_some() && opt.network.is_some() {
+        return false;
+    }
+
+    // If --from-contract is specified without network, need interactive
+    if opt.from_contract.is_some() && opt.network.is_none() {
+        return true;
+    }
+
+    // If no source specified, we need interactive mode
+    true
+}
+
+/// Run in interactive mode.
+async fn run_interactive(opt: InitOpt) -> Result<()> {
+    println!("Creating a new subgraph...\n");
+
+    // Load the networks registry
+    let registry = NetworksRegistry::load().await?;
+
+    // Parse start block if provided
+    let start_block = opt.start_block.as_ref().and_then(|s| s.parse::<u64>().ok());
+
+    // Run the interactive form
+    let form = InitForm::run_interactive(
+        &registry,
+        opt.network.clone(),
+        opt.subgraph_name.clone(),
+        opt.directory
+            .clone()
+            .map(|p| p.to_string_lossy().to_string()),
+        opt.from_contract.clone(),
+        opt.from_example.is_some(),
+        opt.contract_name.clone(),
+        start_block,
+        opt.index_events,
+        opt.abi.clone().map(|p| p.to_string_lossy().to_string()),
+    )
+    .await?;
+
+    // Execute based on source type
+    match form.source_type {
+        SourceType::Example => {
+            let example_opt = InitOpt {
+                subgraph_name: Some(form.subgraph_name),
+                directory: Some(PathBuf::from(&form.directory)),
+                from_example: Some("ethereum-gravatar".to_string()),
+                skip_install: opt.skip_install,
+                skip_git: opt.skip_git,
+                ..Default::default()
+            };
+            init_from_example(&example_opt)
+        }
+        SourceType::Contract => {
+            let contract_opt = InitOpt {
+                subgraph_name: Some(form.subgraph_name),
+                directory: Some(PathBuf::from(&form.directory)),
+                from_contract: form.contract_address,
+                contract_name: Some(form.contract_name),
+                network: Some(form.network),
+                start_block: form.start_block.map(|b| b.to_string()),
+                index_events: form.index_events,
+                abi: form.abi_path.map(PathBuf::from),
+                skip_install: opt.skip_install,
+                skip_git: opt.skip_git,
+                ..Default::default()
+            };
+            init_from_contract(&contract_opt, form.contract_info).await
+        }
+    }
+}
+
+enum ScaffoldSource {
+    Contract,
+    Example,
+    Subgraph,
+}
+
+/// Initialize a subgraph from a contract address.
+///
+/// If `prefetched` is provided, it will be used instead of fetching contract info again.
+/// This avoids duplicate network requests when running in interactive mode.
+async fn init_from_contract(opt: &InitOpt, prefetched: Option<ContractInfo>) -> Result<()> {
+    let address = opt
+        .from_contract
+        .as_ref()
+        .ok_or_else(|| anyhow!("Contract address is required"))?;
+
+    // Validate address format
+    if !address.starts_with("0x") || address.len() != 42 {
+        return Err(anyhow!(
+            "Invalid contract address '{}'. Expected format: 0x followed by 40 hex characters.",
+            address
+        ));
+    }
+
+    let network = opt.network.as_deref().unwrap_or("mainnet");
+
+    let contract_info = {
+        // Load ABI from file if provided
+        if let Some(abi_path) = &opt.abi {
+            step(
+                Step::Load,
+                &format!("Loading contract ABI from {}", abi_path.display()),
+            );
+
+            let abi_str = fs::read_to_string(abi_path)
+                .with_context(|| format!("Failed to read ABI file: {}", abi_path.display()))?;
+            let abi: serde_json::Value = serde_json::from_str(&abi_str)
+                .with_context(|| format!("Failed to parse ABI file: {}", abi_path.display()))?;
+
+            // Try to get start block from API if not provided
+            let start_block = if let Some(block) = &opt.start_block {
+                block.parse::<u64>().ok()
+            } else {
+                // Try to fetch from API
+                match ContractService::load().await {
+                    Ok(service) => service.get_start_block(network, address).await.ok(),
+                    Err(_) => None,
+                }
+            };
+
+            let name = opt
+                .contract_name
+                .clone()
+                .unwrap_or_else(|| "Contract".to_string());
+
+            ContractInfo {
+                abi,
+                name,
+                start_block,
+            }
+        } else if let Some(info) = prefetched {
+            // Use pre-fetched contract info from interactive prompts
+            info
+        } else {
+            // Fetch ABI from Etherscan/Sourcify
+            step(
+                Step::Load,
+                &format!("Fetching contract info from {} on {}", address, network),
+            );
+
+            let service = ContractService::load()
+                .await
+                .context("Failed to load contract service")?;
+
+            service
+                .get_contract_info(network, address)
+                .await
+                .context("Failed to fetch contract info")?
+        }
+    };
+
+    step(
+        Step::Done,
+        &format!("Found contract: {}", contract_info.name),
+    );
+
+    // Determine contract name
+    let contract_name = opt
+        .contract_name
+        .clone()
+        .unwrap_or_else(|| contract_info.name.clone());
+
+    // Determine subgraph name
+    let subgraph_name = opt
+        .subgraph_name
+        .clone()
+        .unwrap_or_else(|| format!("user/{}", contract_name.to_lowercase()));
+
+    // Determine directory
+    let initial_directory = opt.directory.clone().unwrap_or_else(|| {
+        PathBuf::from(
+            subgraph_name
+                .split('/')
+                .next_back()
+                .unwrap_or(&contract_name),
+        )
+    });
+
+    // Resolve directory collision by prompting for a new name if needed
+    let directory = PathBuf::from(resolve_directory_collision(&initial_directory)?);
+
+    // Determine start block
+    let start_block = opt
+        .start_block
+        .as_ref()
+        .and_then(|s| s.parse::<u64>().ok())
+        .or(contract_info.start_block);
+
+    // Generate scaffold
+    let scaffold_options = ScaffoldOptions {
+        address: Some(address.clone()),
+        network: network.to_string(),
+        contract_name: contract_name.clone(),
+        subgraph_name: subgraph_name.clone(),
+        start_block,
+        abi: Some(contract_info.abi),
+        index_events: opt.index_events,
+    };
+
+    generate_scaffold(&directory, &scaffold_options)?;
+
+    // Create networks.json with the contract configuration
+    let networks_path = directory.join("networks.json");
+    update_networks_file(
+        &networks_path,
+        network,
+        &contract_name,
+        address,
+        start_block,
+    )?;
+
+    // Initialize git unless skipped
+    if !opt.skip_git {
+        let _ = init_git(&directory);
+    }
+
+    // Install dependencies unless skipped
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
+    }
+
+    // Run codegen to generate types (requires dependencies to be installed)
+    if !opt.skip_install {
+        let codegen_opt = CodegenOpt {
+            manifest: directory.join("subgraph.yaml"),
+            output_dir: directory.join("generated"),
+            skip_migrations: true,
+            watch: false,
+            ipfs: "https://api.thegraph.com/ipfs/api/v0".to_string(),
+        };
+        if let Err(e) = run_codegen(codegen_opt).await {
+            eprintln!("Warning: codegen failed: {}", e);
+        }
+    }
+
+    step(
+        Step::Done,
+        &format!("Subgraph created at {}", directory.display()),
+    );
+
+    // Prompt to add more contracts if in interactive mode
+    if io::stdin().is_terminal() {
+        add_more_contracts_loop(&directory, network).await?;
+    }
+
+    println!();
+    println!("Next steps:");
+    println!("  cd {}", directory.display());
+    println!("  gnd codegen");
+    println!("  gnd build");
+
+    Ok(())
+}
+
+/// Loop to add more contracts interactively.
+async fn add_more_contracts_loop(directory: &Path, network: &str) -> Result<()> {
+    while prompt_add_another_contract(network)? {
+        // Prompt for contract address
+        let address = prompt_contract_address()?;
+
+        // Fetch contract info to get defaults
+        let fetched_info = fetch_contract_info_for_add(network, &address).await;
+
+        // Prompt for contract name with fetched default
+        let default_name = fetched_info.as_ref().map(|i| i.name.as_str());
+        let contract_name = prompt_contract_name(default_name)?;
+
+        // Prompt for start block with fetched default
+        let default_start_block = fetched_info.as_ref().and_then(|i| i.start_block);
+        let start_block = prompt_start_block(default_start_block)?;
+
+        // Run the add command
+        let add_opt = AddOpt {
+            address,
+            manifest: directory.join("subgraph.yaml"),
+            abi: None,
+            contract_name: Some(contract_name),
+            merge_entities: true, // Merge by default when adding during init
+            network_file: PathBuf::from("networks.json"),
+            start_block: start_block.map(|b| b.to_string()),
+            quiet: true,
+        };
+
+        if let Err(e) = run_add(add_opt).await {
+            eprintln!("Warning: Failed to add contract: {}", e);
+            // Continue the loop to allow trying again or adding a different contract
+        }
+    }
+
+    Ok(())
+}
+
+/// Fetch contract info for the add-another-contract flow.
+async fn fetch_contract_info_for_add(network: &str, address: &str) -> Option<ContractInfo> {
+    step(
+        Step::Load,
+        &format!("Fetching contract info for {} on {}", address, network),
+    );
+
+    let service = match ContractService::load().await {
+        Ok(s) => s,
+        Err(e) => {
+            step(
+                Step::Warn,
+                &format!("Could not load contract service: {}", e),
+            );
+            return None;
+        }
+    };
+
+    match service.get_contract_info(network, address).await {
+        Ok(info) => {
+            step(Step::Done, &format!("Found contract: {}", info.name));
+            Some(info)
+        }
+        Err(e) => {
+            step(Step::Warn, &format!("Could not fetch contract info: {}", e));
+            None
+        }
+    }
+}
+
+/// Recursively copy a directory and its contents.
+fn copy_dir_recursive(src: &Path, dst: &Path) -> Result<()> {
+    fs::create_dir_all(dst)?;
+    for entry in fs::read_dir(src)? {
+        let entry = entry?;
+        let src_path = entry.path();
+        let dst_path = dst.join(entry.file_name());
+        if entry.file_type()?.is_dir() {
+            copy_dir_recursive(&src_path, &dst_path)?;
+        } else {
+            fs::copy(&src_path, &dst_path)?;
+        }
+    }
+    Ok(())
+}
+
+/// Initialize a subgraph from an example template.
+///
+/// This matches the graph-cli `init --from-example` behavior:
+/// 1. Prompt for subgraph slug (with confirmation output)
+/// 2. Prompt for directory (with confirmation output)
+/// 3. Clone example with spinner
+/// 4. Initialize networks config with spinner
+/// 5. Update package.json with spinner
+/// 6. Initialize git with spinner
+/// 7. Install dependencies with spinner
+/// 8. Run codegen with spinner
+/// 9. Print "Next steps" message
+fn init_from_example(opt: &InitOpt) -> Result<()> {
+    use std::io::IsTerminal;
+
+    let example = opt.from_example.as_deref().ok_or_else(|| {
+        anyhow!(
+            "Example name is required. See available examples at:\n\
+             https://github.com/graphprotocol/graph-tooling/tree/main/examples"
+        )
+    })?;
+
+    // Handle legacy example name format
+    let example = match example {
+        "ethereum/gravatar" => "ethereum-gravatar",
+        other => other,
+    };
+
+    // Determine subgraph slug - prompt if not provided and in terminal
+    let subgraph_name = if let Some(name) = &opt.subgraph_name {
+        name.clone()
+    } else if io::stdin().is_terminal() {
+        prompt_subgraph_slug_with_confirm(None)?
+    } else {
+        "my-subgraph".to_string()
+    };
+
+    // Determine directory - prompt if not provided and in terminal
+    let initial_directory = if let Some(dir) = &opt.directory {
+        dir.clone()
+    } else if io::stdin().is_terminal() {
+        let default_dir = get_subgraph_basename(&subgraph_name);
+        PathBuf::from(prompt_directory_with_confirm(Some(&default_dir))?)
+    } else {
+        PathBuf::from(get_subgraph_basename(&subgraph_name))
+    };
+
+    // Resolve directory collision by prompting for a new name if needed
+    let directory = PathBuf::from(resolve_directory_collision(&initial_directory)?);
+
+    // Clone example with spinner
+    clone_example_with_spinner(example, &directory)?;
+
+    // Initialize networks config with spinner
+    init_networks_config_with_spinner(&directory)?;
+
+    // Update package.json with subgraph name
+    update_package_json_with_spinner(&directory, &subgraph_name)?;
+
+    // Initialize git unless skipped
+    if !opt.skip_git {
+        init_git_with_spinner(&directory)?;
+    }
+
+    // Install dependencies unless skipped
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
+    }
+
+    // Run codegen unless install was skipped (codegen requires dependencies)
+    if !opt.skip_install {
+        run_codegen_with_spinner(&directory)?;
+    }
+
+    // Print final message
+    print_next_steps(&subgraph_name, &directory);
+
+    Ok(())
+}
+
+/// Clone example subgraph with spinner.
+fn clone_example_with_spinner(example: &str, directory: &Path) -> Result<()> {
+    use std::process::{Command, Stdio};
+
+    with_spinner(
+        "Cloning example subgraph",
+        "Failed to clone example",
+        "Cloned with warnings",
+        |_spinner| {
+            let temp_dir = tempfile::tempdir()?;
+            let repo_url = "https://github.com/graphprotocol/graph-tooling";
+            let example_subpath = format!("examples/{}", example);
+
+            // Initialize empty repo with sparse checkout
+            let status = Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["init"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            if !status.success() {
+                return Err(anyhow!("Failed to initialize git repository"));
+            }
+
+            // Configure sparse checkout for just the example directory
+            Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["sparse-checkout", "init", "--cone"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["sparse-checkout", "set", &example_subpath])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            // Add remote and fetch only the needed content
+            Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["remote", "add", "origin", repo_url])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            let fetch_status = Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["fetch", "--depth=1", "origin", "main"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            if !fetch_status.success() {
+                return Err(anyhow!("Failed to fetch from graph-tooling repository"));
+            }
+
+            Command::new("git")
+                .current_dir(temp_dir.path())
+                .args(["checkout", "origin/main"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            // Verify example exists
+            let example_path = temp_dir.path().join("examples").join(example);
+            if !example_path.exists() {
+                return Err(anyhow!(
+                    "Example '{}' not found. See available examples at:\n\
+                     https://github.com/graphprotocol/graph-tooling/tree/main/examples",
+                    example
+                ));
+            }
+
+            // Copy example to target directory
+            copy_dir_recursive(&example_path, directory)?;
+
+            Ok(())
+        },
+    )
+}
+
+/// Initialize networks.json with spinner.
+fn init_networks_config_with_spinner(directory: &Path) -> Result<()> {
+    with_spinner(
+        "Initialize networks config",
+        "Failed to initialize networks config",
+        "Networks config initialized with warnings",
+        |_spinner| {
+            // Create a minimal networks.json if it doesn't exist
+            let networks_path = directory.join("networks.json");
+            if !networks_path.exists() {
+                let networks_content = serde_json::json!({
+                    "mainnet": {
+                        "Gravity": {
+                            "address": "0x2E645469f354BB4F5c8a05B3b30A929361cf77eC"
+                        }
+                    }
+                });
+                fs::write(
+                    &networks_path,
+                    serde_json::to_string_pretty(&networks_content)?,
+                )?;
+            }
+            Ok(())
+        },
+    )
+}
+
+/// Update package.json with subgraph name with spinner.
+fn update_package_json_with_spinner(directory: &Path, subgraph_name: &str) -> Result<()> {
+    with_spinner(
+        "Update subgraph name and commands in package.json",
+        "Failed to update package.json",
+        "Updated with warnings",
+        |_spinner| {
+            let package_path = directory.join("package.json");
+            if package_path.exists() {
+                let content = fs::read_to_string(&package_path)?;
+                let mut package: serde_json::Value = serde_json::from_str(&content)?;
+
+                if let Some(obj) = package.as_object_mut() {
+                    // Update name to the subgraph basename
+                    let basename = subgraph_name
+                        .split('/')
+                        .next_back()
+                        .unwrap_or(subgraph_name);
+                    obj.insert("name".to_string(), serde_json::json!(basename));
+
+                    // Remove license and repository fields (like graph-cli does)
+                    obj.remove("license");
+                    obj.remove("repository");
+
+                    // Update deploy script with new subgraph name
+                    if let Some(scripts) = obj.get_mut("scripts").and_then(|s| s.as_object_mut()) {
+                        scripts.insert(
+                            "deploy".to_string(),
+                            serde_json::json!(format!(
+                                "graph deploy --node https://api.studio.thegraph.com/deploy/ {}",
+                                subgraph_name
+                            )),
+                        );
+                        scripts.insert(
+                            "create-local".to_string(),
+                            serde_json::json!(format!(
+                                "graph create --node http://localhost:8020/ {}",
+                                subgraph_name
+                            )),
+                        );
+                        scripts.insert(
+                            "remove-local".to_string(),
+                            serde_json::json!(format!(
+                                "graph remove --node http://localhost:8020/ {}",
+                                subgraph_name
+                            )),
+                        );
+                        scripts.insert(
+                            "deploy-local".to_string(),
+                            serde_json::json!(format!(
+                                "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 {}",
+                                subgraph_name
+                            )),
+                        );
+                    }
+                }
+
+                fs::write(&package_path, serde_json::to_string_pretty(&package)?)?;
+            }
+            Ok(())
+        },
+    )
+}
+
+/// Initialize git repository with spinner.
+fn init_git_with_spinner(directory: &Path) -> Result<()> {
+    use std::process::{Command, Stdio};
+
+    with_spinner(
+        "Initialize subgraph repository",
+        "Failed to initialize git repository",
+        "Git initialized with warnings",
+        |_spinner| {
+            // Remove any existing .git directory (from the cloned example)
+            let git_dir = directory.join(".git");
+            if git_dir.exists() {
+                fs::remove_dir_all(&git_dir)?;
+            }
+
+            // Initialize fresh git repo
+            let status = Command::new("git")
+                .current_dir(directory)
+                .arg("init")
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            if !status.success() {
+                return Err(anyhow!("git init failed"));
+            }
+
+            // Stage all files
+            let _ = Command::new("git")
+                .current_dir(directory)
+                .args(["add", "--all"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status();
+
+            // Create initial commit
+            let _ = Command::new("git")
+                .current_dir(directory)
+                .args(["commit", "-m", "Initial commit"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status();
+
+            Ok(())
+        },
+    )
+}
+
+/// Run codegen with spinner.
+fn run_codegen_with_spinner(directory: &Path) -> Result<()> {
+    use std::process::{Command, Stdio};
+
+    // Detect package manager
+    let pkg_manager = if directory.join("pnpm-lock.yaml").exists() {
+        "pnpm"
+    } else if directory.join("yarn.lock").exists() {
+        "yarn"
+    } else {
+        "npm"
+    };
+
+    with_spinner(
+        format!("Generate ABI and schema types with {} codegen", pkg_manager),
+        "Failed to run codegen",
+        "Codegen completed with warnings",
+        |_spinner| {
+            let status = Command::new(pkg_manager)
+                .current_dir(directory)
+                .args(["run", "codegen"])
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()?;
+
+            if !status.success() {
+                return Err(anyhow!("codegen failed"));
+            }
+
+            Ok(())
+        },
+    )
+}
+
+/// Print the "Next steps" message in graph-cli format.
+fn print_next_steps(subgraph_name: &str, directory: &Path) {
+    let basename = subgraph_name
+        .split('/')
+        .next_back()
+        .unwrap_or(subgraph_name);
+    let dir_name = directory
+        .file_name()
+        .map(|s| s.to_string_lossy().to_string())
+        .unwrap_or_else(|| directory.to_string_lossy().to_string());
+
+    println!();
+    println!("Subgraph {} created in {}", basename, dir_name);
+    println!();
+    println!("Next steps:");
+    println!();
+    println!("  1. Run `graph auth` to authenticate with your deploy key.");
+    println!();
+    println!("  2. Type `cd {}` to enter the subgraph.", dir_name);
+    println!();
+    println!("  3. Run `yarn deploy` to deploy the subgraph.");
+    println!();
+    println!(
+        "Make sure to visit the documentation on https://thegraph.com/docs/ for further information."
+    );
+}
+
+/// Initialize a subgraph from an existing deployed subgraph.
+///
+/// This creates a new subgraph scaffold based on an existing subgraph deployment,
+/// extracting immutable entities from the deployed schema.
+async fn init_from_subgraph(opt: &InitOpt) -> Result<()> {
+    let deployment_id = opt
+        .from_subgraph
+        .as_ref()
+        .ok_or_else(|| anyhow!("Deployment ID is required for --from-subgraph"))?;
+
+    let network = opt.network.as_deref().unwrap_or("mainnet");
+
+    // Determine IPFS URL
+    let ipfs_url = opt
+        .ipfs
+        .as_deref()
+        .unwrap_or("https://api.thegraph.com/ipfs");
+
+    step(
+        Step::Load,
+        &format!("Fetching subgraph {} from IPFS", deployment_id),
+    );
+
+    // Create IPFS client
+    let ipfs_client = IpfsClient::new(ipfs_url)?;
+
+    // Fetch the manifest from IPFS
+    let manifest_yaml = ipfs_client.fetch_manifest(deployment_id).await?;
+
+    step(Step::Done, "Manifest fetched successfully");
+
+    // Parse the manifest
+    let manifest: serde_yaml::Value =
+        serde_yaml::from_str(&manifest_yaml).context("Failed to parse subgraph manifest YAML")?;
+
+    // Validate network matches
+    if let Some(manifest_network) = extract_network(&manifest)
+        && manifest_network != network
+    {
+        return Err(anyhow!(
+            "Network mismatch: The source subgraph is indexing '{}', but you specified '{}'.\n\
+                 When composing subgraphs, they must index the same network.",
+            manifest_network,
+            network
+        ));
+    }
+
+    // Get start block from manifest if not provided
+    let start_block = opt
+        .start_block
+        .as_ref()
+        .and_then(|s| s.parse::<u64>().ok())
+        .or_else(|| get_min_start_block(&manifest));
+
+    // Extract schema CID from manifest
+    let schema_cid = extract_schema_cid(&manifest).ok_or_else(|| {
+        anyhow!("Could not find schema CID in manifest. Expected schema.file['/'] field.")
+    })?;
+
+    step(Step::Load, &format!("Fetching schema {}", schema_cid));
+
+    // Fetch the schema from IPFS
+    let schema_content = ipfs_client.fetch_schema(&schema_cid).await?;
+
+    step(Step::Done, "Schema fetched successfully");
+
+    // Find immutable entities in the schema
+    let immutable_entities = find_immutable_entities(&schema_content)?;
+
+    if immutable_entities.is_empty() {
+        return Err(anyhow!(
+            "Source subgraph must have at least one immutable entity.\n\
+             This subgraph cannot be used as a source subgraph since it has no immutable entities.\n\n\
+             Immutable entities are marked with @entity(immutable: true) in the schema."
+        ));
+    }
+
+    step(
+        Step::Generate,
+        &format!(
+            "Found {} immutable entities: {}",
+            immutable_entities.len(),
+            immutable_entities.join(", ")
+        ),
+    );
+
+    // Determine subgraph name
+    let subgraph_name = opt
+        .subgraph_name
+        .clone()
+        .unwrap_or_else(|| "composed-subgraph".to_string());
+
+    // Determine directory
+    let initial_directory = opt.directory.clone().unwrap_or_else(|| {
+        PathBuf::from(subgraph_name.split('/').next_back().unwrap_or("subgraph"))
+    });
+
+    // Resolve directory collision by prompting for a new name if needed
+    let directory = PathBuf::from(resolve_directory_collision(&initial_directory)?);
+
+    // Generate scaffold with immutable entities
+    let scaffold_options = ScaffoldOptions {
+        address: None,
+        network: network.to_string(),
+        contract_name: "Contract".to_string(),
+        subgraph_name: subgraph_name.clone(),
+        start_block,
+        abi: None,
+        index_events: false,
+    };
+
+    generate_scaffold(&directory, &scaffold_options)?;
+
+    // Write the fetched schema to the subgraph
+    let schema_path = directory.join("schema.graphql");
+    fs::write(&schema_path, &schema_content)
+        .with_context(|| format!("Failed to write schema to {}", schema_path.display()))?;
+
+    // Update the manifest with the source subgraph reference
+    update_manifest_with_source(&directory, deployment_id, &immutable_entities)?;
+
+    // Initialize git unless skipped
+    if !opt.skip_git {
+        let _ = init_git(&directory);
+    }
+
+    // Install dependencies unless skipped
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
+    }
+
+    step(
+        Step::Done,
+        &format!("Subgraph created at {}", directory.display()),
+    );
+
+    println!();
+    println!("Next steps:");
+    println!("  cd {}", directory.display());
+    println!("  # Edit subgraph.yaml to add your own data sources");
+    println!("  # The source subgraph's immutable entities are available via grafting");
+    println!("  gnd codegen");
+    println!("  gnd build");
+
+    Ok(())
+}
+
+// ============================================================================
+// Manifest Parsing Utilities
+// ============================================================================
+
+/// Extract the schema CID from a subgraph manifest.
+///
+/// The schema is typically at `schema.file["/"]` in the manifest YAML.
+fn extract_schema_cid(manifest: &serde_yaml::Value) -> Option<String> {
+    let schema = manifest.get("schema")?;
+    let file = schema.get("file")?;
+    let cid = file.get("/")?;
+    let cid_str = cid.as_str()?;
+
+    // Strip /ipfs/ prefix if present
+    Some(
+        cid_str
+            .strip_prefix("/ipfs/")
+            .unwrap_or(cid_str)
+            .to_string(),
+    )
+}
+
+/// Extract the network from the first data source in a manifest.
+fn extract_network(manifest: &serde_yaml::Value) -> Option<String> {
+    let data_sources = manifest.get("dataSources")?.as_sequence()?;
+    let first_ds = data_sources.first()?;
+    let network = first_ds.get("network")?.as_str()?;
+    Some(network.to_string())
+}
+
+/// Get the minimum start block from all data sources.
+fn get_min_start_block(manifest: &serde_yaml::Value) -> Option<u64> {
+    let data_sources = manifest.get("dataSources")?.as_sequence()?;
+
+    let start_blocks: Vec<u64> = data_sources
+        .iter()
+        .filter_map(|ds| {
+            ds.get("source")
+                .and_then(|s| s.get("startBlock"))
+                .and_then(|b| b.as_u64())
+        })
+        .collect();
+
+    start_blocks.into_iter().min()
+}
+
+// ============================================================================
+// Schema Parsing Utilities
+// ============================================================================
+
+/// Find all immutable entities in a GraphQL schema.
+///
+/// Immutable entities are marked with `@entity(immutable: true)`.
+fn find_immutable_entities(schema: &str) -> Result<Vec<String>> {
+    let ast = gql::parse_schema::<String>(schema)
+        .map_err(|e| anyhow!("Failed to parse GraphQL schema: {}", e))?;
+
+    let mut immutable_entities = Vec::new();
+
+    for def in ast.definitions {
+        if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def {
+            // Check if this type has @entity(immutable: true)
+            if is_immutable_entity(&obj) {
+                immutable_entities.push(obj.name);
+            }
+        }
+    }
+
+    Ok(immutable_entities)
+}
+
+/// Check if an object type has the @entity(immutable: true) directive.
+fn is_immutable_entity(obj: &gql::ObjectType<String>) -> bool {
+    for directive in &obj.directives {
+        if directive.name == "entity" {
+            for (name, value) in &directive.arguments {
+                if name == "immutable"
+                    && let gql::Value::Boolean(true) = value
+                {
+                    return true;
+                }
+            }
+        }
+    }
+    false
+}
+
+/// Update the generated manifest to include the source subgraph reference.
+fn update_manifest_with_source(
+    directory: &Path,
+    source_deployment: &str,
+    _immutable_entities: &[String],
+) -> Result<()> {
+    let manifest_path = directory.join("subgraph.yaml");
+
+    // Read the generated manifest
+    let manifest_content = fs::read_to_string(&manifest_path)
+        .with_context(|| format!("Failed to read manifest at {}", manifest_path.display()))?;
+
+    // Add a comment about the source subgraph at the top
+    let updated_content = format!(
+        "# This subgraph composes data from an existing subgraph.\n\
+         # Source deployment: {}\n\
+         #\n\
+         # To access the source subgraph's immutable entities, you can use grafting:\n\
+         # features:\n\
+         #   - grafting\n\
+         # graft:\n\
+         #   base: {}\n\
+         #   block: <block-number>\n\
+         #\n{}",
+        source_deployment, source_deployment, manifest_content
+    );
+
+    fs::write(&manifest_path, updated_content)
+        .with_context(|| format!("Failed to update manifest at {}", manifest_path.display()))?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_protocol_display() {
+        assert_eq!(Protocol::Ethereum.to_string(), "ethereum");
+        assert_eq!(Protocol::Near.to_string(), "near");
+        assert_eq!(Protocol::Cosmos.to_string(), "cosmos");
+        assert_eq!(Protocol::Arweave.to_string(), "arweave");
+        assert_eq!(Protocol::Substreams.to_string(), "substreams");
+    }
+
+    #[test]
+    fn test_should_run_interactive() {
+        // Example mode should not be interactive
+        let opt = InitOpt {
+            from_example: Some("gravatar".to_string()),
+            ..Default::default()
+        };
+        assert!(!should_run_interactive(&opt));
+
+        // Contract with network should not be interactive
+        let opt = InitOpt {
+            from_contract: Some("0x1234567890123456789012345678901234567890".to_string()),
+            network: Some("mainnet".to_string()),
+            ..Default::default()
+        };
+        assert!(!should_run_interactive(&opt));
+
+        // Contract without network should be interactive
+        let opt = InitOpt {
+            from_contract: Some("0x1234567890123456789012345678901234567890".to_string()),
+            ..Default::default()
+        };
+        assert!(should_run_interactive(&opt));
+
+        // No source should be interactive
+        let opt = InitOpt::default();
+        assert!(should_run_interactive(&opt));
+
+        // from_subgraph should not be interactive (will error)
+        let opt = InitOpt {
+            from_subgraph: Some("Qm123".to_string()),
+            ..Default::default()
+        };
+        assert!(!should_run_interactive(&opt));
+    }
+
+    #[test]
+    fn test_init_opt_default() {
+        let opt = InitOpt::default();
+        assert!(opt.subgraph_name.is_none());
+        assert!(opt.directory.is_none());
+        assert!(opt.protocol.is_none());
+        assert!(opt.node.is_none());
+        assert!(opt.from_contract.is_none());
+        assert!(opt.from_example.is_none());
+        assert!(opt.from_subgraph.is_none());
+        assert!(opt.contract_name.is_none());
+        assert!(!opt.index_events);
+        assert!(!opt.skip_install);
+        assert!(!opt.skip_git);
+        assert!(opt.start_block.is_none());
+        assert!(opt.abi.is_none());
+        assert!(opt.network.is_none());
+        assert!(opt.ipfs.is_none());
+    }
+
+    // ========================================================================
+    // Manifest Parsing Tests
+    // ========================================================================
+
+    #[test]
+    fn test_extract_schema_cid() {
+        // Standard manifest format with /ipfs/ prefix
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            schema:
+              file:
+                "/": "/ipfs/QmSchemaHash123"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(
+            extract_schema_cid(&manifest),
+            Some("QmSchemaHash123".to_string())
+        );
+
+        // Manifest without /ipfs/ prefix
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            schema:
+              file:
+                "/": "QmSchemaHash456"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(
+            extract_schema_cid(&manifest),
+            Some("QmSchemaHash456".to_string())
+        );
+
+        // Missing schema
+        let manifest: serde_yaml::Value = serde_yaml::from_str(r#"dataSources: []"#).unwrap();
+        assert_eq!(extract_schema_cid(&manifest), None);
+
+        // Missing file
+        let manifest: serde_yaml::Value = serde_yaml::from_str(r#"schema: {}"#).unwrap();
+        assert_eq!(extract_schema_cid(&manifest), None);
+    }
+
+    #[test]
+    fn test_extract_network() {
+        // Standard manifest with network
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            dataSources:
+              - network: mainnet
+                source:
+                  address: "0x123"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(extract_network(&manifest), Some("mainnet".to_string()));
+
+        // Multiple data sources
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            dataSources:
+              - network: polygon
+                source:
+                  address: "0x123"
+              - network: polygon
+                source:
+                  address: "0x456"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(extract_network(&manifest), Some("polygon".to_string()));
+
+        // No data sources
+        let manifest: serde_yaml::Value = serde_yaml::from_str(r#"dataSources: []"#).unwrap();
+        assert_eq!(extract_network(&manifest), None);
+
+        // Missing dataSources
+        let manifest: serde_yaml::Value = serde_yaml::from_str(r#"schema: {}"#).unwrap();
+        assert_eq!(extract_network(&manifest), None);
+    }
+
+    #[test]
+    fn test_get_min_start_block() {
+        // Multiple data sources with start blocks
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            dataSources:
+              - source:
+                  startBlock: 100
+              - source:
+                  startBlock: 50
+              - source:
+                  startBlock: 200
+            "#,
+        )
+        .unwrap();
+        assert_eq!(get_min_start_block(&manifest), Some(50));
+
+        // Mixed with and without start blocks
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            dataSources:
+              - source:
+                  address: "0x123"
+              - source:
+                  startBlock: 150
+              - source:
+                  startBlock: 75
+            "#,
+        )
+        .unwrap();
+        assert_eq!(get_min_start_block(&manifest), Some(75));
+
+        // No start blocks
+        let manifest: serde_yaml::Value = serde_yaml::from_str(
+            r#"
+            dataSources:
+              - source:
+                  address: "0x123"
+            "#,
+        )
+        .unwrap();
+        assert_eq!(get_min_start_block(&manifest), None);
+
+        // Empty data sources
+        let manifest: serde_yaml::Value = serde_yaml::from_str(r#"dataSources: []"#).unwrap();
+        assert_eq!(get_min_start_block(&manifest), None);
+    }
+
+    // ========================================================================
+    // Schema Parsing Tests
+    // ========================================================================
+
+    #[test]
+    fn test_find_immutable_entities() {
+        // Schema with immutable entities
+        let schema = r#"
+            type Transfer @entity(immutable: true) {
+                id: ID!
+                from: Bytes!
+                to: Bytes!
+                amount: BigInt!
+            }
+
+            type Account @entity {
+                id: ID!
+                balance: BigInt!
+            }
+
+            type Approval @entity(immutable: true) {
+                id: ID!
+                owner: Bytes!
+                spender: Bytes!
+            }
+        "#;
+
+        let entities = find_immutable_entities(schema).unwrap();
+        assert_eq!(entities.len(), 2);
+        assert!(entities.contains(&"Transfer".to_string()));
+        assert!(entities.contains(&"Approval".to_string()));
+        assert!(!entities.contains(&"Account".to_string()));
+    }
+
+    #[test]
+    fn test_find_immutable_entities_none() {
+        // Schema with no immutable entities
+        let schema = r#"
+            type Account @entity {
+                id: ID!
+                balance: BigInt!
+            }
+
+            type Token @entity {
+                id: ID!
+                name: String!
+            }
+        "#;
+
+        let entities = find_immutable_entities(schema).unwrap();
+        assert!(entities.is_empty());
+    }
+
+    #[test]
+    fn test_find_immutable_entities_explicit_false() {
+        // Entity with immutable: false should not be included
+        let schema = r#"
+            type Transfer @entity(immutable: false) {
+                id: ID!
+                amount: BigInt!
+            }
+
+            type Withdrawal @entity(immutable: true) {
+                id: ID!
+                amount: BigInt!
+            }
+        "#;
+
+        let entities = find_immutable_entities(schema).unwrap();
+        assert_eq!(entities.len(), 1);
+        assert!(entities.contains(&"Withdrawal".to_string()));
+    }
+
+    #[test]
+    fn test_is_immutable_entity() {
+        let schema = r#"
+            type Transfer @entity(immutable: true) {
+                id: ID!
+            }
+        "#;
+
+        let ast = gql::parse_schema::<String>(schema).unwrap();
+        for def in ast.definitions {
+            if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def
+                && obj.name == "Transfer"
+            {
+                assert!(is_immutable_entity(&obj));
+            }
+        }
+
+        // Non-immutable entity
+        let schema = r#"
+            type Account @entity {
+                id: ID!
+            }
+        "#;
+
+        let ast = gql::parse_schema::<String>(schema).unwrap();
+        for def in ast.definitions {
+            if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def
+                && obj.name == "Account"
+            {
+                assert!(!is_immutable_entity(&obj));
+            }
+        }
+    }
+}
diff --git a/gnd/src/commands/mod.rs b/gnd/src/commands/mod.rs
new file mode 100644
index 00000000000..5867cc8d584
--- /dev/null
+++ b/gnd/src/commands/mod.rs
@@ -0,0 +1,25 @@
+mod add;
+mod auth;
+mod build;
+mod clean;
+mod codegen;
+mod create;
+mod deploy;
+mod dev;
+mod init;
+mod publish;
+mod remove;
+mod test;
+
+pub use add::{AddOpt, run_add};
+pub use auth::{AuthOpt, get_deploy_key, run_auth};
+pub use build::{BuildOpt, run_build};
+pub use clean::{CleanOpt, run_clean};
+pub use codegen::{CodegenOpt, run_codegen};
+pub use create::{CreateOpt, run_create};
+pub use deploy::{DeployOpt, run_deploy};
+pub use dev::{DevOpt, run_dev};
+pub use init::{InitOpt, run_init};
+pub use publish::{PublishOpt, run_publish};
+pub use remove::{RemoveOpt, run_remove};
+pub use test::{TestOpt, run_test};
diff --git a/gnd/src/commands/publish.rs b/gnd/src/commands/publish.rs
new file mode 100644
index 00000000000..e07a57de999
--- /dev/null
+++ b/gnd/src/commands/publish.rs
@@ -0,0 +1,249 @@
+//! Publish command for publishing subgraphs to The Graph's decentralized network.
+//!
+//! This command builds a subgraph, uploads it to IPFS, and opens a browser
+//! to complete the publishing process on The Graph Network.
+
+use std::path::PathBuf;
+
+use anyhow::{Result, anyhow};
+use clap::Parser;
+use inquire::Confirm;
+
+use crate::commands::build::{BuildOpt, run_build};
+use crate::output::{Step, step};
+
+/// Default IPFS URL for The Graph's hosted IPFS node.
+const DEFAULT_IPFS_URL: &str = "https://api.thegraph.com/ipfs/api/v0";
+
+/// Default webapp URL for publishing.
+const DEFAULT_WEBAPP_URL: &str = "https://cli.thegraph.com/publish";
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Publish a subgraph to The Graph's decentralized network")]
+pub struct PublishOpt {
+    /// Path to the subgraph manifest
+    #[clap(default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// IPFS node URL to upload build results to
+    #[clap(short = 'i', long, default_value = DEFAULT_IPFS_URL)]
+    pub ipfs: String,
+
+    /// IPFS hash of the subgraph manifest to deploy (skips build)
+    #[clap(long)]
+    pub ipfs_hash: Option<String>,
+
+    /// Subgraph ID to publish to (for updating existing subgraphs)
+    #[clap(long)]
+    pub subgraph_id: Option<String>,
+
+    /// The network to use for the subgraph deployment
+    #[clap(long, default_value = "arbitrum-one")]
+    pub protocol_network: String,
+
+    /// The API key for Subgraph queries (required when updating existing subgraph)
+    #[clap(long)]
+    pub api_key: Option<String>,
+
+    /// URL of the web UI to use for publishing
+    #[clap(long, default_value = DEFAULT_WEBAPP_URL)]
+    pub webapp_url: String,
+
+    /// Output directory for build results
+    #[clap(short = 'o', long, default_value = "build/")]
+    pub output_dir: PathBuf,
+
+    /// Skip subgraph migrations
+    #[clap(long)]
+    pub skip_migrations: bool,
+
+    /// Network configuration to use from the networks config file
+    #[clap(long)]
+    pub network: Option<String>,
+
+    /// Networks config file path
+    #[clap(long, default_value = "networks.json")]
+    pub network_file: PathBuf,
+
+    /// Skip the asc version check (use with caution)
+    #[clap(long, env = "GND_SKIP_ASC_VERSION_CHECK")]
+    pub skip_asc_version_check: bool,
+}
+
+/// Run the publish command.
+pub async fn run_publish(opt: PublishOpt) -> Result<()> {
+    // Validate: if subgraph_id is provided, api_key is required
+    if opt.subgraph_id.is_some() && opt.api_key.is_none() {
+        return Err(anyhow!(
+            "API key is required to publish to an existing subgraph (--api-key).\n\
+             See https://thegraph.com/docs/en/deploying/subgraph-studio-faqs/#2-how-do-i-create-an-api-key"
+        ));
+    }
+
+    // Validate protocol network
+    if opt.protocol_network != "arbitrum-one" && opt.protocol_network != "arbitrum-sepolia" {
+        return Err(anyhow!(
+            "Invalid protocol network '{}'. Must be 'arbitrum-one' or 'arbitrum-sepolia'",
+            opt.protocol_network
+        ));
+    }
+
+    // Extract URL-related fields before potentially moving opt fields into BuildOpt
+    let webapp_url = opt.webapp_url.clone();
+    let subgraph_id = opt.subgraph_id.clone();
+    let protocol_network = opt.protocol_network.clone();
+    let api_key = opt.api_key.clone();
+
+    // Get the IPFS hash - either from flag or by building
+    let ipfs_hash = if let Some(hash) = opt.ipfs_hash {
+        step(Step::Skip, "Using provided IPFS hash");
+        hash
+    } else {
+        // Build the subgraph and upload to IPFS
+        step(Step::Load, "Building subgraph for publishing");
+
+        // Validate manifest exists
+        if !opt.manifest.exists() {
+            return Err(anyhow!(
+                "Manifest '{}' not found.\n\
+                 Please provide either:\n\
+                 - A valid manifest path: gnd publish <manifest>\n\
+                 - An IPFS hash: gnd publish --ipfs-hash <hash>",
+                opt.manifest.display()
+            ));
+        }
+
+        let build_opt = BuildOpt {
+            manifest: opt.manifest,
+            output_dir: opt.output_dir,
+            output_format: "wasm".to_string(),
+            skip_migrations: opt.skip_migrations,
+            watch: false,
+            ipfs: Some(opt.ipfs),
+            network: opt.network,
+            network_file: opt.network_file,
+            skip_asc_version_check: opt.skip_asc_version_check,
+        };
+
+        match run_build(build_opt).await? {
+            Some(hash) => hash,
+            None => {
+                return Err(anyhow!(
+                    "Build completed but IPFS upload failed. Cannot proceed with publish."
+                ));
+            }
+        }
+    };
+
+    // Prompt user to open browser
+    step(Step::Generate, "Ready to publish to The Graph Network");
+
+    let open_browser = Confirm::new("Open browser to continue publishing?")
+        .with_default(true)
+        .prompt()?;
+
+    if !open_browser {
+        println!("\nTo publish manually, visit:");
+        println!(
+            "  {}",
+            build_publish_url(
+                &webapp_url,
+                &ipfs_hash,
+                &subgraph_id,
+                &protocol_network,
+                &api_key
+            )
+        );
+        return Ok(());
+    }
+
+    // Build the URL with query parameters
+    let url = build_publish_url(
+        &webapp_url,
+        &ipfs_hash,
+        &subgraph_id,
+        &protocol_network,
+        &api_key,
+    );
+
+    step(Step::Done, "Opening browser to complete publishing");
+    println!("\n  {}\n", url);
+
+    // Open the browser
+    open::that(&url).map_err(|e| anyhow!("Failed to open browser: {}", e))?;
+
+    Ok(())
+}
+
+/// Build the publish URL with query parameters.
+fn build_publish_url(
+    base_url: &str,
+    ipfs_hash: &str,
+    subgraph_id: &Option<String>,
+    protocol_network: &str,
+    api_key: &Option<String>,
+) -> String {
+    let mut params = vec![format!("id={}", ipfs_hash)];
+
+    if let Some(id) = subgraph_id {
+        params.push(format!("subgraphId={}", id));
+    }
+
+    params.push(format!("network={}", protocol_network));
+
+    if let Some(key) = api_key {
+        params.push(format!("apiKey={}", key));
+    }
+
+    format!("{}?{}", base_url, params.join("&"))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_build_publish_url_basic() {
+        let url = build_publish_url(
+            DEFAULT_WEBAPP_URL,
+            "QmTest123",
+            &None,
+            "arbitrum-one",
+            &None,
+        );
+        assert_eq!(
+            url,
+            "https://cli.thegraph.com/publish?id=QmTest123&network=arbitrum-one"
+        );
+    }
+
+    #[test]
+    fn test_build_publish_url_with_subgraph_id() {
+        let url = build_publish_url(
+            DEFAULT_WEBAPP_URL,
+            "QmTest456",
+            &Some("my-subgraph".to_string()),
+            "arbitrum-sepolia",
+            &Some("abc123".to_string()),
+        );
+        assert_eq!(
+            url,
+            "https://cli.thegraph.com/publish?id=QmTest456&subgraphId=my-subgraph&network=arbitrum-sepolia&apiKey=abc123"
+        );
+    }
+
+    #[test]
+    fn test_build_publish_url_custom_webapp() {
+        let url = build_publish_url(
+            "https://custom.example.com/publish",
+            "QmCustom",
+            &None,
+            "arbitrum-one",
+            &None,
+        );
+        assert_eq!(
+            url,
+            "https://custom.example.com/publish?id=QmCustom&network=arbitrum-one"
+        );
+    }
+}
diff --git a/gnd/src/commands/remove.rs b/gnd/src/commands/remove.rs
new file mode 100644
index 00000000000..52cac738968
--- /dev/null
+++ b/gnd/src/commands/remove.rs
@@ -0,0 +1,96 @@
+use anyhow::{Context, Result};
+use clap::Parser;
+
+use crate::commands::auth::get_deploy_key;
+use crate::services::GraphNodeClient;
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Unregister a subgraph name from a Graph Node")]
+pub struct RemoveOpt {
+    /// The subgraph name to unregister
+    #[clap(value_name = "SUBGRAPH_NAME")]
+    pub subgraph_name: String,
+
+    /// Graph Node admin URL
+    #[clap(long, short = 'g', value_name = "URL", help = "Graph Node URL")]
+    pub node: String,
+
+    /// Access token for authentication
+    #[clap(long, value_name = "TOKEN", help = "Graph access token")]
+    pub access_token: Option<String>,
+}
+
+/// Run the remove command
+pub async fn run_remove(opt: RemoveOpt) -> Result<()> {
+    println!("Removing subgraph from Graph node: {}", opt.node);
+
+    // Get access token (from flag or from config)
+    let access_token = match &opt.access_token {
+        Some(token) => Some(token.clone()),
+        None => get_deploy_key(&opt.node)
+            .ok()
+            .flatten()
+            .map(|key| key.to_string()),
+    };
+
+    let client = GraphNodeClient::new(&opt.node, access_token.as_deref())
+        .context("Failed to create Graph Node client")?;
+
+    client
+        .remove_subgraph(&opt.subgraph_name)
+        .await
+        .context("Failed to remove subgraph")?;
+
+    println!("✔ Removed subgraph: {}", opt.subgraph_name);
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_remove_opt_parsing() {
+        // Test that required args are enforced
+        let result = RemoveOpt::try_parse_from(["remove"]);
+        assert!(result.is_err());
+
+        // Test with just subgraph name (missing --node)
+        let result = RemoveOpt::try_parse_from(["remove", "user/subgraph"]);
+        assert!(result.is_err());
+
+        // Test with all required args
+        let result = RemoveOpt::try_parse_from([
+            "remove",
+            "user/subgraph",
+            "--node",
+            "http://localhost:8020",
+        ]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.subgraph_name, "user/subgraph");
+        assert_eq!(opt.node, "http://localhost:8020");
+        assert!(opt.access_token.is_none());
+
+        // Test with access token
+        let result = RemoveOpt::try_parse_from([
+            "remove",
+            "user/subgraph",
+            "--node",
+            "http://localhost:8020",
+            "--access-token",
+            "my-token",
+        ]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.access_token, Some("my-token".to_string()));
+
+        // Test short flag for node
+        let result =
+            RemoveOpt::try_parse_from(["remove", "user/subgraph", "-g", "http://localhost:8020"]);
+        assert!(result.is_ok());
+        let opt = result.unwrap();
+        assert_eq!(opt.node, "http://localhost:8020");
+    }
+}
diff --git a/gnd/src/commands/test/assertion.rs b/gnd/src/commands/test/assertion.rs
new file mode 100644
index 00000000000..9d6455c69bb
--- /dev/null
+++ b/gnd/src/commands/test/assertion.rs
@@ -0,0 +1,192 @@
+//! GraphQL assertion execution for test validation.
+
+use super::runner::TestContext;
+use super::schema::{Assertion, AssertionFailure, AssertionOutcome, TestResult};
+use anyhow::{Result, anyhow};
+use graph::data::query::{Query, QueryResults, QueryTarget};
+use graph::prelude::{ApiVersion, GraphQlRunner as GraphQlRunnerTrait, q};
+
+pub(super) async fn run_assertions(
+    ctx: &TestContext,
+    assertions: &[Assertion],
+) -> Result<TestResult> {
+    let mut outcomes = Vec::new();
+
+    for assertion in assertions {
+        match run_single_assertion(ctx, assertion).await {
+            Ok(None) => {
+                outcomes.push(AssertionOutcome::Passed {
+                    query: assertion.query.clone(),
+                });
+            }
+            Ok(Some(failure)) => {
+                outcomes.push(AssertionOutcome::Failed(failure));
+            }
+            Err(e) => {
+                outcomes.push(AssertionOutcome::Failed(AssertionFailure {
+                    query: assertion.query.clone(),
+                    expected: assertion.expected.clone(),
+                    actual: serde_json::json!({ "error": e.to_string() }),
+                }));
+            }
+        }
+    }
+
+    Ok(TestResult {
+        handler_error: None,
+        assertions: outcomes,
+    })
+}
+
+/// Execute a single assertion. Returns `None` on pass, `Some(failure)` on mismatch.
+async fn run_single_assertion(
+    ctx: &TestContext,
+    assertion: &Assertion,
+) -> Result<Option<AssertionFailure>> {
+    let target = QueryTarget::Deployment(ctx.deployment.hash.clone(), ApiVersion::default());
+    let query = Query::new(
+        q::parse_query(&assertion.query)
+            .map_err(|e| anyhow!("Failed to parse query: {:?}", e))?
+            .into_static(),
+        None,
+        false,
+    );
+
+    let query_res: QueryResults = ctx.graphql_runner.clone().run_query(query, target).await;
+
+    let result = query_res
+        .first()
+        .ok_or_else(|| anyhow!("No query result"))?
+        .duplicate()
+        .to_result()
+        .map_err(|errors| anyhow!("Query errors: {:?}", errors))?;
+
+    let actual_json = match result {
+        Some(value) => serde_json::to_value(&value)?,
+        None => serde_json::Value::Null,
+    };
+
+    if json_equal(&actual_json, &assertion.expected) {
+        Ok(None)
+    } else {
+        Ok(Some(AssertionFailure {
+            query: assertion.query.clone(),
+            expected: assertion.expected.clone(),
+            actual: actual_json,
+        }))
+    }
+}
+
+/// Reorder `actual` arrays to match `expected`'s element order for cleaner diffs.
+///
+/// Without this, out-of-order elements show every field as changed even when
+/// only one field differs.
+pub(super) fn align_for_diff(
+    expected: &serde_json::Value,
+    actual: &serde_json::Value,
+) -> serde_json::Value {
+    match (expected, actual) {
+        (serde_json::Value::Array(exp), serde_json::Value::Array(act)) => {
+            let mut used = vec![false; act.len()];
+            let mut aligned = Vec::with_capacity(exp.len().max(act.len()));
+
+            for exp_elem in exp {
+                let best = act
+                    .iter()
+                    .enumerate()
+                    .filter(|(i, _)| !used[*i])
+                    .max_by_key(|(_, a)| json_similarity(exp_elem, a));
+
+                if let Some((idx, _)) = best {
+                    used[idx] = true;
+                    aligned.push(align_for_diff(exp_elem, &act[idx]));
+                }
+            }
+
+            for (i, elem) in act.iter().enumerate() {
+                if !used[i] {
+                    aligned.push(elem.clone());
+                }
+            }
+
+            serde_json::Value::Array(aligned)
+        }
+        (serde_json::Value::Object(exp), serde_json::Value::Object(act)) => {
+            let aligned: serde_json::Map<String, serde_json::Value> = act
+                .iter()
+                .map(|(k, v)| {
+                    let aligned_v = if let Some(exp_v) = exp.get(k) {
+                        align_for_diff(exp_v, v)
+                    } else {
+                        v.clone()
+                    };
+                    (k.clone(), aligned_v)
+                })
+                .collect();
+            serde_json::Value::Object(aligned)
+        }
+        _ => actual.clone(),
+    }
+}
+
+/// Score JSON similarity for [`align_for_diff`].
+/// Objects: matching `"id"` = 100, other equal fields = 1. Non-objects: 0 or 1.
+fn json_similarity(a: &serde_json::Value, b: &serde_json::Value) -> usize {
+    match (a, b) {
+        (serde_json::Value::Object(a_obj), serde_json::Value::Object(b_obj)) => {
+            let mut score = 0;
+            for (k, v) in a_obj {
+                if let Some(bv) = b_obj.get(k)
+                    && json_equal(v, bv)
+                {
+                    // `id` match is a strong signal for entity identity.
+                    score += if k == "id" { 100 } else { 1 };
+                }
+            }
+            score
+        }
+        _ => {
+            if json_equal(a, b) {
+                1
+            } else {
+                0
+            }
+        }
+    }
+}
+
+/// Compare JSON values for equality, ignoring object key ordering.
+///
+/// Coerces string/number: `"123"` == `123` to handle GraphQL `BigInt`/`BigDecimal`.
+fn json_equal(a: &serde_json::Value, b: &serde_json::Value) -> bool {
+    match (a, b) {
+        (serde_json::Value::Null, serde_json::Value::Null) => true,
+        (serde_json::Value::Bool(a), serde_json::Value::Bool(b)) => a == b,
+        (serde_json::Value::Number(a), serde_json::Value::Number(b)) => a == b,
+        (serde_json::Value::String(a), serde_json::Value::String(b)) => a == b,
+        (serde_json::Value::String(s), serde_json::Value::Number(n))
+        | (serde_json::Value::Number(n), serde_json::Value::String(s)) => s == &n.to_string(),
+        (serde_json::Value::Array(a), serde_json::Value::Array(b)) => {
+            if a.len() != b.len() {
+                return false;
+            }
+            // Order-insensitive: O(n²), fine for realistic test sizes.
+            let mut used = vec![false; b.len()];
+            a.iter().all(|a_elem| {
+                for (i, b_elem) in b.iter().enumerate() {
+                    if !used[i] && json_equal(a_elem, b_elem) {
+                        used[i] = true;
+                        return true;
+                    }
+                }
+                false
+            })
+        }
+        (serde_json::Value::Object(a), serde_json::Value::Object(b)) => {
+            a.len() == b.len()
+                && a.iter()
+                    .all(|(k, v)| b.get(k).map(|bv| json_equal(v, bv)).unwrap_or(false))
+        }
+        _ => false,
+    }
+}
diff --git a/gnd/src/commands/test/block_stream.rs b/gnd/src/commands/test/block_stream.rs
new file mode 100644
index 00000000000..cd8dd8642c3
--- /dev/null
+++ b/gnd/src/commands/test/block_stream.rs
@@ -0,0 +1,105 @@
+//! Mock `BlockStreamBuilder` that feeds pre-defined test blocks.
+
+use async_trait::async_trait;
+use graph::blockchain::block_stream::{
+    BlockStream, BlockStreamBuilder, BlockStreamError, BlockStreamEvent, BlockWithTriggers,
+    FirehoseCursor,
+};
+use graph::blockchain::{BlockPtr, Blockchain, TriggerFilterWrapper};
+use graph::components::store::{DeploymentLocator, SourceableStore};
+use graph::futures03::Stream;
+use graph::prelude::BlockNumber;
+use graph_chain_ethereum::Chain;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context as TaskContext, Poll};
+
+pub(super) struct StaticStreamBuilder {
+    pub chain: Vec<BlockWithTriggers<Chain>>,
+}
+
+#[async_trait]
+impl BlockStreamBuilder<Chain> for StaticStreamBuilder {
+    async fn build_firehose(
+        &self,
+        _chain: &Chain,
+        _deployment: DeploymentLocator,
+        _block_cursor: FirehoseCursor,
+        _start_blocks: Vec<BlockNumber>,
+        current_block: Option<BlockPtr>,
+        _filter: Arc<<Chain as Blockchain>::TriggerFilter>,
+        _unified_api_version: graph::data::subgraph::UnifiedMappingApiVersion,
+    ) -> anyhow::Result<Box<dyn BlockStream<Chain>>> {
+        let current_idx = current_block.map(|current_block| {
+            self.chain
+                .iter()
+                .enumerate()
+                .find(|(_, b)| b.ptr() == current_block)
+                .map(|(i, _)| i)
+                .unwrap_or(0)
+        });
+        Ok(Box::new(StaticStream::new(self.chain.clone(), current_idx)))
+    }
+
+    async fn build_polling(
+        &self,
+        _chain: &Chain,
+        _deployment: DeploymentLocator,
+        _start_blocks: Vec<BlockNumber>,
+        _source_subgraph_stores: Vec<Arc<dyn SourceableStore>>,
+        current_block: Option<BlockPtr>,
+        _filter: Arc<TriggerFilterWrapper<Chain>>,
+        _unified_api_version: graph::data::subgraph::UnifiedMappingApiVersion,
+    ) -> anyhow::Result<Box<dyn BlockStream<Chain>>> {
+        let current_idx = current_block.map(|current_block| {
+            self.chain
+                .iter()
+                .enumerate()
+                .find(|(_, b)| b.ptr() == current_block)
+                .map(|(i, _)| i)
+                .unwrap_or(0)
+        });
+        Ok(Box::new(StaticStream::new(self.chain.clone(), current_idx)))
+    }
+}
+
+/// A `Stream` that yields pre-defined blocks synchronously.
+/// Returns `None` when all blocks are emitted, signaling sync completion.
+struct StaticStream {
+    blocks: Vec<BlockWithTriggers<Chain>>,
+    current_idx: usize,
+}
+
+impl StaticStream {
+    /// `skip_to`: if `Some(i)`, start from block `i+1` (block `i` already processed).
+    fn new(blocks: Vec<BlockWithTriggers<Chain>>, skip_to: Option<usize>) -> Self {
+        Self {
+            blocks,
+            current_idx: skip_to.map(|i| i + 1).unwrap_or(0),
+        }
+    }
+}
+
+impl BlockStream<Chain> for StaticStream {
+    fn buffer_size_hint(&self) -> usize {
+        1
+    }
+}
+
+impl Unpin for StaticStream {}
+
+impl Stream for StaticStream {
+    type Item = Result<BlockStreamEvent<Chain>, BlockStreamError>;
+
+    fn poll_next(mut self: Pin<&mut Self>, _cx: &mut TaskContext<'_>) -> Poll<Option<Self::Item>> {
+        if self.current_idx >= self.blocks.len() {
+            return Poll::Ready(None);
+        }
+
+        let block = self.blocks[self.current_idx].clone();
+        let cursor = FirehoseCursor::from(format!("test-cursor-{}", self.current_idx));
+        self.current_idx += 1;
+
+        Poll::Ready(Some(Ok(BlockStreamEvent::ProcessBlock(block, cursor))))
+    }
+}
diff --git a/gnd/src/commands/test/eth_calls.rs b/gnd/src/commands/test/eth_calls.rs
new file mode 100644
index 00000000000..5f9152037a1
--- /dev/null
+++ b/gnd/src/commands/test/eth_calls.rs
@@ -0,0 +1,175 @@
+//! ABI encoding helpers for mock Ethereum call data.
+
+use super::trigger::json_to_sol_value;
+use anyhow::{Context, Result, anyhow};
+use graph::abi::FunctionExt as GraphFunctionExt;
+use graph::prelude::alloy::dyn_abi::{DynSolType, FunctionExt as AlloyFunctionExt};
+use graph::prelude::alloy::json_abi::Function;
+
+/// ABI-encode a function call (selector + params) using graph-node's encoding path.
+pub(super) fn encode_function_call(
+    function_sig: &str,
+    params: &[serde_json::Value],
+) -> Result<Vec<u8>> {
+    let alloy_sig = to_alloy_signature(function_sig);
+    let function = Function::parse(&alloy_sig).map_err(|e| {
+        anyhow!(
+            "Failed to parse function signature '{}': {:?}",
+            function_sig,
+            e
+        )
+    })?;
+
+    if params.len() != function.inputs.len() {
+        return Err(anyhow!(
+            "Parameter count mismatch for '{}': expected {} parameters, got {}",
+            function_sig,
+            function.inputs.len(),
+            params.len()
+        ));
+    }
+
+    let args: Vec<_> = params
+        .iter()
+        .zip(&function.inputs)
+        .map(|(json, param)| {
+            let sol_type: DynSolType = param
+                .ty
+                .parse()
+                .map_err(|e| anyhow!("Invalid type '{}': {:?}", param.ty, e))?;
+            json_to_sol_value(&sol_type, json)
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    GraphFunctionExt::abi_encode_input(&function, &args).context("Failed to encode function call")
+}
+
+/// ABI-encode function return values (no selector prefix).
+pub(super) fn encode_return_value(
+    function_sig: &str,
+    returns: &[serde_json::Value],
+) -> Result<Vec<u8>> {
+    let alloy_sig = to_alloy_signature(function_sig);
+    let function = Function::parse(&alloy_sig).map_err(|e| {
+        anyhow!(
+            "Failed to parse function signature '{}': {:?}",
+            function_sig,
+            e
+        )
+    })?;
+
+    if returns.len() != function.outputs.len() {
+        return Err(anyhow!(
+            "Return value count mismatch for '{}': expected {} return values, got {}",
+            function_sig,
+            function.outputs.len(),
+            returns.len()
+        ));
+    }
+
+    let output_values: Vec<_> = returns
+        .iter()
+        .zip(&function.outputs)
+        .map(|(json, param)| {
+            let sol_type: DynSolType = param
+                .ty
+                .parse()
+                .map_err(|e| anyhow!("Invalid type '{}': {:?}", param.ty, e))?;
+            json_to_sol_value(&sol_type, json)
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    AlloyFunctionExt::abi_encode_output(&function, &output_values)
+        .map_err(|e| anyhow!("Failed to encode return value: {}", e))
+}
+
+/// Convert graph-node `name(inputs):(outputs)` to alloy `name(inputs) returns (outputs)`.
+/// Passes through signatures already in alloy format or without outputs.
+pub(super) fn to_alloy_signature(sig: &str) -> String {
+    // If it already contains "returns", assume alloy format.
+    if sig.contains(" returns ") {
+        return sig.to_string();
+    }
+
+    // Look for the "):(" pattern that separates inputs from outputs.
+    if let Some(pos) = sig.find("):(") {
+        let inputs = &sig[..=pos]; // "name(inputs)"
+        let outputs = &sig[pos + 2..]; // "(outputs)"
+        format!("{} returns {}", inputs, outputs)
+    } else {
+        sig.to_string()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_to_alloy_signature_with_colon() {
+        assert_eq!(
+            to_alloy_signature("balanceOf(address):(uint256)"),
+            "balanceOf(address) returns (uint256)"
+        );
+    }
+
+    #[test]
+    fn test_to_alloy_signature_multiple_outputs() {
+        assert_eq!(
+            to_alloy_signature("getReserves():(uint112,uint112,uint32)"),
+            "getReserves() returns (uint112,uint112,uint32)"
+        );
+    }
+
+    #[test]
+    fn test_to_alloy_signature_no_outputs() {
+        assert_eq!(
+            to_alloy_signature("transfer(address,uint256)"),
+            "transfer(address,uint256)"
+        );
+    }
+
+    #[test]
+    fn test_to_alloy_signature_already_alloy_format() {
+        assert_eq!(
+            to_alloy_signature("balanceOf(address) returns (uint256)"),
+            "balanceOf(address) returns (uint256)"
+        );
+    }
+
+    #[test]
+    fn test_encode_function_call_balanceof() {
+        let encoded = encode_function_call(
+            "balanceOf(address):(uint256)",
+            &[serde_json::json!(
+                "0x0000000000000000000000000000000000000001"
+            )],
+        )
+        .unwrap();
+
+        // First 4 bytes should be the selector for balanceOf(address)
+        assert_eq!(&encoded[..4], &[0x70, 0xa0, 0x82, 0x31]);
+        // Total length: 4 (selector) + 32 (address param) = 36
+        assert_eq!(encoded.len(), 36);
+    }
+
+    #[test]
+    fn test_encode_return_value_uint256() {
+        let encoded = encode_return_value(
+            "balanceOf(address):(uint256)",
+            &[serde_json::json!("1000000000000000000")],
+        )
+        .unwrap();
+
+        // ABI-encoded uint256 is 32 bytes (no selector)
+        assert_eq!(encoded.len(), 32);
+    }
+
+    #[test]
+    fn test_encode_function_call_no_params() {
+        let encoded = encode_function_call("symbol():(string)", &[]).unwrap();
+
+        // Just the 4-byte selector
+        assert_eq!(encoded.len(), 4);
+    }
+}
diff --git a/gnd/src/commands/test/matchstick.rs b/gnd/src/commands/test/matchstick.rs
new file mode 100644
index 00000000000..08657366650
--- /dev/null
+++ b/gnd/src/commands/test/matchstick.rs
@@ -0,0 +1,398 @@
+//! Backward-compatible Matchstick test runner (legacy mode).
+//!
+//! Dispatches to Docker mode or binary mode depending on the `--docker` flag.
+//! This is the legacy path for projects that haven't migrated to the new
+//! JSON-based test format yet.
+
+use anyhow::{Context, Result, anyhow};
+use serde::{Deserialize, Serialize};
+use std::path::{Path, PathBuf};
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use crate::output::{Step, step};
+
+use super::TestOpt;
+
+const MATCHSTICK_GITHUB_RELEASES: &str =
+    "https://api.github.com/repos/LimeChain/matchstick/releases/latest";
+const MATCHSTICK_DOWNLOAD_BASE: &str = "https://github.com/LimeChain/matchstick/releases/download";
+const MATCHSTICK_FALLBACK_VERSION: &str = "0.6.0";
+const VERSION_CACHE_TTL_SECS: u64 = 86400; // 24 hours
+
+/// Cached version info written to `{test_dir}/.latest.json`.
+#[derive(Serialize, Deserialize)]
+struct VersionCache {
+    version: String,
+    timestamp: u64,
+}
+
+pub(super) async fn run(opt: &TestOpt) -> Result<()> {
+    if opt.docker {
+        run_docker_tests(opt).await
+    } else {
+        run_binary_tests(opt).await
+    }
+}
+
+/// Resolve the Matchstick version to use.
+///
+/// Priority: CLI flag → cached `.latest.json` (24h TTL) → GitHub API → fallback.
+async fn resolve_matchstick_version(
+    explicit_version: Option<&str>,
+    cache_dir: &Path,
+) -> Result<String> {
+    if let Some(v) = explicit_version {
+        return Ok(v.to_string());
+    }
+
+    let cache_path = cache_dir.join(".latest.json");
+
+    if let Some(cached) = read_version_cache(&cache_path) {
+        return Ok(cached);
+    }
+
+    step(Step::Load, "Fetching latest Matchstick version");
+    match fetch_latest_version().await {
+        Ok(version) => {
+            let _ = write_version_cache(&cache_path, &version);
+            Ok(version)
+        }
+        Err(e) => {
+            step(
+                Step::Warn,
+                &format!(
+                    "Failed to fetch latest version ({}), using {}",
+                    e, MATCHSTICK_FALLBACK_VERSION
+                ),
+            );
+            Ok(MATCHSTICK_FALLBACK_VERSION.to_string())
+        }
+    }
+}
+
+async fn fetch_latest_version() -> Result<String> {
+    let client = reqwest::Client::builder().user_agent("gnd-cli").build()?;
+
+    let resp: serde_json::Value = client
+        .get(MATCHSTICK_GITHUB_RELEASES)
+        .send()
+        .await
+        .context("Failed to reach GitHub API")?
+        .error_for_status()
+        .context("GitHub API returned an error")?
+        .json()
+        .await
+        .context("Failed to parse GitHub API response")?;
+
+    resp["tag_name"]
+        .as_str()
+        .map(|s| s.to_string())
+        .ok_or_else(|| anyhow!("GitHub API response missing tag_name"))
+}
+
+fn read_version_cache(path: &Path) -> Option<String> {
+    let data = std::fs::read_to_string(path).ok()?;
+    let cache: VersionCache = serde_json::from_str(&data).ok()?;
+    let now = SystemTime::now().duration_since(UNIX_EPOCH).ok()?.as_secs();
+
+    if now.saturating_sub(cache.timestamp) < VERSION_CACHE_TTL_SECS {
+        Some(cache.version)
+    } else {
+        None
+    }
+}
+
+fn write_version_cache(path: &Path, version: &str) -> Result<()> {
+    let now = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .context("System clock before UNIX epoch")?
+        .as_secs();
+
+    let cache = VersionCache {
+        version: version.to_string(),
+        timestamp: now,
+    };
+
+    if let Some(parent) = path.parent() {
+        std::fs::create_dir_all(parent)?;
+    }
+    std::fs::write(path, serde_json::to_string_pretty(&cache)?)?;
+    Ok(())
+}
+
+/// Platform-specific binary name for a Matchstick version.
+/// Mirrors getPlatform from graph-tooling: versions > 0.5.4 use simplified names.
+fn get_platform(version: &str) -> Result<String> {
+    let ver = semver::Version::parse(version)?;
+    let cutoff = semver::Version::new(0, 5, 4);
+
+    let os = std::env::consts::OS;
+    let arch = std::env::consts::ARCH;
+
+    if arch != "x86_64" && !(os == "macos" && arch == "aarch64") {
+        return Err(anyhow!("Unsupported platform: {} {}", os, arch));
+    }
+
+    if ver > cutoff {
+        match os {
+            "macos" if arch == "aarch64" => Ok("binary-macos-12-m1".to_string()),
+            "macos" => Ok("binary-macos-12".to_string()),
+            "linux" => Ok("binary-linux-22".to_string()),
+            _ => Err(anyhow!("Unsupported OS: {}", os)),
+        }
+    } else {
+        // Legacy platform detection for versions <= 0.5.4
+        match os {
+            "macos" => {
+                let darwin_major = get_darwin_major_version();
+                if matches!(darwin_major, Some(18) | Some(19)) {
+                    Ok("binary-macos-10.15".to_string())
+                } else if arch == "aarch64" {
+                    Ok("binary-macos-11-m1".to_string())
+                } else {
+                    Ok("binary-macos-11".to_string())
+                }
+            }
+            "linux" => {
+                let linux_major = get_linux_major_version();
+                match linux_major {
+                    Some(18) => Ok("binary-linux-18".to_string()),
+                    Some(22) | Some(24) => Ok("binary-linux-22".to_string()),
+                    _ => Ok("binary-linux-20".to_string()),
+                }
+            }
+            _ => Err(anyhow!("Unsupported OS: {}", os)),
+        }
+    }
+}
+
+/// Darwin kernel major version from `uname -r`. Darwin 18/19 → macOS 10.14/10.15.
+fn get_darwin_major_version() -> Option<u32> {
+    let output = std::process::Command::new("uname")
+        .arg("-r")
+        .output()
+        .ok()?;
+    let release = String::from_utf8_lossy(&output.stdout);
+    release.trim().split('.').next()?.parse().ok()
+}
+
+fn get_linux_major_version() -> Option<u32> {
+    let content = std::fs::read_to_string("/etc/os-release").ok()?;
+    for line in content.lines() {
+        if let Some(val) = line.strip_prefix("VERSION_ID=") {
+            let val = val.trim_matches('"');
+            // Handle "22.04" → 22, or "22" → 22
+            return val.split('.').next()?.parse().ok();
+        }
+    }
+    None
+}
+
+/// Download the Matchstick binary to `node_modules/.bin/matchstick-{platform}`. Skips if already exists.
+async fn download_matchstick_binary(version: &str, platform: &str, force: bool) -> Result<PathBuf> {
+    let bin_dir = PathBuf::from("node_modules/.bin");
+    let bin_path = bin_dir.join(format!("matchstick-{platform}"));
+
+    if bin_path.exists() && !force {
+        step(
+            Step::Done,
+            &format!("Binary already exists: {}", bin_path.display()),
+        );
+        return Ok(bin_path);
+    }
+
+    std::fs::create_dir_all(&bin_dir)?;
+
+    let url = format!("{MATCHSTICK_DOWNLOAD_BASE}/{version}/{platform}");
+    step(Step::Load, &format!("Downloading Matchstick {version}"));
+
+    let client = reqwest::Client::builder().user_agent("gnd-cli").build()?;
+
+    let resp = client.get(&url).send().await?.error_for_status()?;
+
+    let bytes = resp
+        .bytes()
+        .await
+        .context("Failed to read download response")?;
+
+    std::fs::write(&bin_path, &bytes)?;
+
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        std::fs::set_permissions(&bin_path, std::fs::Permissions::from_mode(0o755))?;
+    }
+
+    step(Step::Done, &format!("Downloaded to {}", bin_path.display()));
+    Ok(bin_path)
+}
+
+async fn run_binary_tests(opt: &TestOpt) -> Result<()> {
+    step(Step::Generate, "Running Matchstick tests (legacy mode)");
+
+    let version = resolve_matchstick_version(
+        opt.matchstick_version.as_deref(),
+        Path::new(super::DEFAULT_TEST_DIR),
+    )
+    .await?;
+
+    let platform = get_platform(&version)?;
+    let bin_path = download_matchstick_binary(&version, &platform, opt.force).await?;
+
+    let workdir = opt
+        .manifest
+        .parent()
+        .filter(|p| !p.as_os_str().is_empty())
+        .unwrap_or(Path::new("."));
+    let mut cmd = std::process::Command::new(&bin_path);
+    cmd.current_dir(workdir);
+
+    if opt.coverage {
+        cmd.arg("-c");
+    }
+    if opt.recompile {
+        cmd.arg("-r");
+    }
+    if let Some(datasource) = &opt.datasource {
+        cmd.arg(datasource);
+    }
+
+    let status = cmd.status()?;
+
+    if status.success() {
+        step(Step::Done, "Matchstick tests passed");
+        Ok(())
+    } else {
+        Err(anyhow!("Matchstick tests failed"))
+    }
+}
+
+/// Run Matchstick tests in Docker (recommended on macOS where the native binary is bugged).
+async fn run_docker_tests(opt: &TestOpt) -> Result<()> {
+    step(Step::Generate, "Running Matchstick tests in Docker");
+
+    std::process::Command::new("docker")
+        .arg("--version")
+        .output()
+        .context("Docker not found. Please install Docker to use -d/--docker mode.")?;
+
+    let mut test_args = String::new();
+    if opt.coverage {
+        test_args.push_str(" -c");
+    }
+    if opt.recompile {
+        test_args.push_str(" -r");
+    }
+    if let Some(datasource) = &opt.datasource {
+        // Validate datasource name to prevent shell injection via Docker's
+        // `sh -c "matchstick $ARGS"` expansion.
+        if !datasource
+            .chars()
+            .all(|c| c.is_alphanumeric() || c == '_' || c == '-')
+        {
+            anyhow::bail!(
+                "Invalid datasource name '{}': must contain only alphanumeric characters, hyphens, or underscores",
+                datasource
+            );
+        }
+        test_args.push_str(&format!(" {}", datasource));
+    }
+
+    let cwd = std::env::current_dir().context("Failed to get current directory")?;
+
+    let mut cmd = std::process::Command::new("docker");
+    cmd.args([
+        "run",
+        "-it",
+        "--rm",
+        "--mount",
+        &format!("type=bind,source={},target=/matchstick", cwd.display()),
+    ]);
+    if !test_args.is_empty() {
+        cmd.args(["-e", &format!("ARGS={}", test_args.trim())]);
+    }
+    cmd.arg("matchstick");
+
+    // Check if the Docker image already exists.
+    let image_check = std::process::Command::new("docker")
+        .args(["images", "-q", "matchstick"])
+        .output()
+        .context("Failed to check for Docker image")?;
+    let image_exists = !image_check.stdout.is_empty();
+
+    if !image_exists || opt.force {
+        let version = resolve_matchstick_version(
+            opt.matchstick_version.as_deref(),
+            Path::new(super::DEFAULT_TEST_DIR),
+        )
+        .await?;
+
+        step(Step::Generate, "Building Matchstick Docker image");
+        let dockerfile_path = PathBuf::from("tests/.docker/Dockerfile");
+        if !dockerfile_path.exists() || opt.force {
+            create_dockerfile(&dockerfile_path, &version)?;
+        }
+        let build_status = std::process::Command::new("docker")
+            .args([
+                "build",
+                "-f",
+                &dockerfile_path.to_string_lossy(),
+                "-t",
+                "matchstick",
+                ".",
+            ])
+            .status()
+            .context("Failed to build Docker image")?;
+        if !build_status.success() {
+            return Err(anyhow!("Failed to build Matchstick Docker image"));
+        }
+    }
+
+    let status = cmd.status().context("Failed to run Docker container")?;
+    if status.success() {
+        step(Step::Done, "Tests passed");
+        Ok(())
+    } else {
+        Err(anyhow!("Tests failed"))
+    }
+}
+
+/// Generate a Dockerfile that downloads the Matchstick runner binary (not from npm).
+fn create_dockerfile(path: &PathBuf, version: &str) -> Result<()> {
+    use std::fs;
+
+    if let Some(parent) = path.parent() {
+        fs::create_dir_all(parent)?;
+    }
+
+    let dockerfile_content = format!(
+        r#"FROM --platform=linux/x86_64 ubuntu:22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+ENV ARGS=""
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+     curl ca-certificates postgresql postgresql-contrib \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+  && apt-get install -y --no-install-recommends nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL -o /usr/local/bin/matchstick \
+     https://github.com/LimeChain/matchstick/releases/download/{version}/binary-linux-22 \
+  && chmod +x /usr/local/bin/matchstick
+
+RUN mkdir /matchstick
+WORKDIR /matchstick
+
+CMD ["sh", "-c", "matchstick $ARGS"]
+"#,
+        version = version
+    );
+
+    fs::write(path, dockerfile_content)?;
+    step(Step::Write, &format!("Created {}", path.display()));
+    Ok(())
+}
diff --git a/gnd/src/commands/test/mock_arweave.rs b/gnd/src/commands/test/mock_arweave.rs
new file mode 100644
index 00000000000..7b04cb60e4a
--- /dev/null
+++ b/gnd/src/commands/test/mock_arweave.rs
@@ -0,0 +1,45 @@
+//! Mock Arweave resolver for `gnd test`.
+//!
+//! Replaces the real `ArweaveClient` with a map of pre-loaded txId → bytes.
+//! Any txId not found in the map is sent to the `unresolved_tx` channel and
+//! `ServerUnavailable` is returned, which causes the `PollingMonitor` to retry
+//! with backoff. After sync, the runner drains the channel and reports missing
+//! tx IDs as a clear test failure.
+
+use std::collections::HashMap;
+
+use async_trait::async_trait;
+use graph::bytes::Bytes;
+use graph::components::link_resolver::{ArweaveClientError, ArweaveResolver, FileSizeLimit};
+use graph::data_source::offchain::Base64;
+use tokio::sync::mpsc::UnboundedSender;
+
+#[derive(Debug)]
+pub struct MockArweaveResolver {
+    pub files: HashMap<String, Bytes>,
+    pub unresolved_tx: UnboundedSender<String>,
+}
+
+#[async_trait]
+impl ArweaveResolver for MockArweaveResolver {
+    async fn get(&self, file: &Base64) -> Result<Vec<u8>, ArweaveClientError> {
+        self.get_with_limit(file, &FileSizeLimit::Unlimited).await
+    }
+
+    async fn get_with_limit(
+        &self,
+        file: &Base64,
+        _limit: &FileSizeLimit,
+    ) -> Result<Vec<u8>, ArweaveClientError> {
+        match self.files.get(file.as_str()) {
+            Some(bytes) => Ok(bytes.to_vec()),
+            None => {
+                let _ = self.unresolved_tx.send(file.as_str().to_owned());
+                Err(ArweaveClientError::ServerUnavailable(format!(
+                    "txId '{}' not found in mock 'arweaveFiles'",
+                    file.as_str()
+                )))
+            }
+        }
+    }
+}
diff --git a/gnd/src/commands/test/mock_chain.rs b/gnd/src/commands/test/mock_chain.rs
new file mode 100644
index 00000000000..c3a1a69f01f
--- /dev/null
+++ b/gnd/src/commands/test/mock_chain.rs
@@ -0,0 +1,19 @@
+//! Block pointer utilities for mock chains.
+
+use graph::blockchain::block_stream::BlockWithTriggers;
+use graph::prelude::BlockPtr;
+use graph::prelude::alloy::primitives::B256;
+use graph_chain_ethereum::Chain;
+
+/// Last block pointer — used as the indexer's stop target.
+pub fn final_block_ptr(blocks: &[BlockWithTriggers<Chain>]) -> Option<BlockPtr> {
+    blocks.last().map(|b| b.ptr())
+}
+
+/// Genesis block (block 0, zero hash) — used as stop target when there are no blocks.
+pub fn genesis_ptr() -> BlockPtr {
+    BlockPtr {
+        hash: B256::ZERO.into(),
+        number: 0,
+    }
+}
diff --git a/gnd/src/commands/test/mock_ipfs.rs b/gnd/src/commands/test/mock_ipfs.rs
new file mode 100644
index 00000000000..4c31f958682
--- /dev/null
+++ b/gnd/src/commands/test/mock_ipfs.rs
@@ -0,0 +1,46 @@
+//! Mock IPFS client for `gnd test`.
+//!
+//! Replaces the real `IpfsRpcClient` with a map of pre-loaded CID → bytes.
+//! Any CID not found in the map is sent to the `unresolved_tx` channel and
+//! an error is returned so the `OffchainMonitor` retries with backoff.
+//! After sync, the runner drains the channel and reports missing CIDs.
+
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use graph::bytes::Bytes;
+use graph::ipfs::{
+    ContentPath, IpfsClient, IpfsError, IpfsMetrics, IpfsRequest, IpfsResponse, IpfsResult,
+};
+use tokio::sync::mpsc::UnboundedSender;
+
+pub struct MockIpfsClient {
+    pub files: HashMap<ContentPath, Bytes>,
+    pub metrics: IpfsMetrics,
+    pub unresolved_tx: UnboundedSender<ContentPath>,
+}
+
+#[async_trait]
+impl IpfsClient for MockIpfsClient {
+    fn metrics(&self) -> &IpfsMetrics {
+        &self.metrics
+    }
+
+    async fn call(self: Arc<Self>, req: IpfsRequest) -> IpfsResult<IpfsResponse> {
+        let path = match req {
+            IpfsRequest::Cat(p) | IpfsRequest::GetBlock(p) => p,
+        };
+
+        match self.files.get(&path) {
+            Some(bytes) => Ok(IpfsResponse::for_test(path, bytes.clone())),
+            None => {
+                let _ = self.unresolved_tx.send(path.clone());
+                Err(IpfsError::ContentNotAvailable {
+                    path,
+                    reason: anyhow::anyhow!("CID not found in mock 'files'"),
+                })
+            }
+        }
+    }
+}
diff --git a/gnd/src/commands/test/mock_runtime.rs b/gnd/src/commands/test/mock_runtime.rs
new file mode 100644
index 00000000000..d18e93fd3c0
--- /dev/null
+++ b/gnd/src/commands/test/mock_runtime.rs
@@ -0,0 +1,77 @@
+//! Wraps Ethereum host functions to convert `PossibleReorg` errors into
+//! `Deterministic` ones so they surface immediately instead of causing
+//! infinite restart loops.
+
+use anyhow::anyhow;
+use graph::blockchain::{self, ChainIdentifier, HostFn, HostFnCtx};
+use graph::data_source;
+use graph::futures03::FutureExt;
+use graph::prelude::EthereumCallCache;
+use graph::runtime::HostExportError;
+use graph_chain_ethereum::Chain;
+use graph_chain_ethereum::chain::{EthereumRuntimeAdapterBuilder, RuntimeAdapterBuilder};
+use graph_chain_ethereum::network::EthereumNetworkAdapters;
+use std::sync::Arc;
+
+const WRAPPED_HOST_FNS: &[&str] = &["ethereum.call", "ethereum.getBalance", "ethereum.hasCode"];
+
+pub struct TestRuntimeAdapterBuilder;
+
+impl RuntimeAdapterBuilder for TestRuntimeAdapterBuilder {
+    fn build(
+        &self,
+        eth_adapters: Arc<EthereumNetworkAdapters>,
+        call_cache: Arc<dyn EthereumCallCache>,
+        chain_identifier: Arc<ChainIdentifier>,
+    ) -> Arc<dyn blockchain::RuntimeAdapter<Chain>> {
+        let real_adapter =
+            EthereumRuntimeAdapterBuilder {}.build(eth_adapters, call_cache, chain_identifier);
+        Arc::new(TestRuntimeAdapter { real_adapter })
+    }
+}
+
+struct TestRuntimeAdapter {
+    real_adapter: Arc<dyn blockchain::RuntimeAdapter<Chain>>,
+}
+
+impl TestRuntimeAdapter {
+    /// Convert `PossibleReorg` → `Deterministic` for a single host function.
+    fn wrap_possible_reorg(real: HostFn) -> HostFn {
+        let real_func = real.func.clone();
+        let name = real.name;
+        HostFn {
+            name,
+            func: Arc::new(move |ctx: HostFnCtx<'_>, wasm_ptr: u32| {
+                let real_func = real_func.clone();
+                async move {
+                    match real_func(ctx, wasm_ptr).await {
+                        Ok(result) => Ok(result),
+                        Err(HostExportError::PossibleReorg(e)) => {
+                            Err(HostExportError::Deterministic(anyhow!(
+                                "{}. Add mock data to your test JSON.",
+                                e
+                            )))
+                        }
+                        Err(other) => Err(other),
+                    }
+                }
+                .boxed()
+            }),
+        }
+    }
+}
+
+impl blockchain::RuntimeAdapter<Chain> for TestRuntimeAdapter {
+    fn host_fns(&self, ds: &data_source::DataSource<Chain>) -> Result<Vec<HostFn>, anyhow::Error> {
+        let mut fns = self.real_adapter.host_fns(ds)?;
+
+        // PossibleReorg → Deterministic for mock-backed host functions.
+        for hf in &mut fns {
+            if WRAPPED_HOST_FNS.contains(&hf.name) {
+                *hf = Self::wrap_possible_reorg(hf.clone());
+            }
+        }
+
+        Ok(fns)
+    }
+}
diff --git a/gnd/src/commands/test/mock_transport.rs b/gnd/src/commands/test/mock_transport.rs
new file mode 100644
index 00000000000..4db45addeb9
--- /dev/null
+++ b/gnd/src/commands/test/mock_transport.rs
@@ -0,0 +1,285 @@
+//! Mock Alloy transport that serves `eth_getBalance`, `eth_getCode`, and
+//! `eth_call` from test JSON mock data. Unmocked RPC calls fail immediately.
+
+use super::eth_calls::{encode_function_call, encode_return_value};
+use super::schema::TestFile;
+use anyhow::{Context, Result};
+use graph::blockchain::block_stream::BlockWithTriggers;
+use graph::prelude::alloy::primitives::{Address, B256, U256};
+use graph::prelude::alloy::rpc::json_rpc::{RequestPacket, ResponsePacket};
+use graph::prelude::alloy::transports::{TransportError, TransportErrorKind, TransportFut};
+use graph_chain_ethereum::Chain;
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::task::{Context as TaskContext, Poll};
+use tower::Service;
+
+#[derive(Debug)]
+enum EthCallResult {
+    Success(Vec<u8>),
+    Revert,
+}
+
+#[derive(Debug)]
+struct Inner {
+    get_balance: HashMap<(Address, B256), U256>,
+    get_code: HashMap<(Address, B256), bool>,
+    eth_calls: HashMap<(Address, Vec<u8>, B256), EthCallResult>,
+}
+
+/// Mock RPC transport backed by test JSON data. Cheap to clone (`Arc` inner).
+#[derive(Clone)]
+pub struct MockTransport {
+    inner: Arc<Inner>,
+}
+
+impl MockTransport {
+    /// Build from test file mock data, keyed by built block hashes.
+    pub fn new(test_file: &TestFile, blocks: &[BlockWithTriggers<Chain>]) -> Result<Self> {
+        let mut get_balance = HashMap::new();
+        let mut get_code = HashMap::new();
+        let mut eth_calls = HashMap::new();
+
+        for (test_block, built_block) in test_file.blocks.iter().zip(blocks.iter()) {
+            let block_hash = built_block.ptr().hash.as_b256();
+
+            for mock_balance in &test_block.get_balance_calls {
+                let address: Address = mock_balance
+                    .address
+                    .parse()
+                    .context("Invalid address in getBalanceCalls mock")?;
+                let value: U256 = mock_balance.value.parse().context(
+                    "Invalid value in getBalanceCalls mock — expected decimal Wei string",
+                )?;
+                get_balance.insert((address, block_hash), value);
+            }
+
+            for mock_code in &test_block.has_code_calls {
+                let address: Address = mock_code
+                    .address
+                    .parse()
+                    .context("Invalid address in hasCodeCalls mock")?;
+                get_code.insert((address, block_hash), mock_code.has_code);
+            }
+
+            for eth_call in &test_block.eth_calls {
+                let address: Address = eth_call
+                    .address
+                    .parse()
+                    .context("Invalid address in ethCalls mock")?;
+                let calldata = encode_function_call(&eth_call.function, &eth_call.params)?;
+                let result = if eth_call.reverts {
+                    EthCallResult::Revert
+                } else {
+                    let return_data = encode_return_value(&eth_call.function, &eth_call.returns)?;
+                    EthCallResult::Success(return_data)
+                };
+                eth_calls.insert((address, calldata, block_hash), result);
+            }
+        }
+
+        Ok(Self {
+            inner: Arc::new(Inner {
+                get_balance,
+                get_code,
+                eth_calls,
+            }),
+        })
+    }
+
+    /// Successful JSON-RPC response.
+    fn success_response(
+        id: &serde_json::Value,
+        result: serde_json::Value,
+    ) -> Result<ResponsePacket, TransportError> {
+        let response = serde_json::json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "result": result,
+        });
+        serde_json::from_value(response).map_err(|e| {
+            TransportErrorKind::custom_str(&format!("Failed to build mock response: {}", e))
+        })
+    }
+
+    /// JSON-RPC error response (for reverts).
+    fn error_response(
+        id: &serde_json::Value,
+        code: i64,
+        message: &str,
+    ) -> Result<ResponsePacket, TransportError> {
+        let response = serde_json::json!({
+            "jsonrpc": "2.0",
+            "id": id,
+            "error": {
+                "code": code,
+                "message": message,
+            },
+        });
+        serde_json::from_value(response).map_err(|e| {
+            TransportErrorKind::custom_str(&format!("Failed to build mock error response: {}", e))
+        })
+    }
+
+    /// Extract `(address, block_hash)` from `[address, {"blockHash": hash}]` params.
+    fn parse_address_and_block_hash(params: &serde_json::Value) -> Result<(Address, B256), String> {
+        let arr = params.as_array().ok_or("Expected array params")?;
+
+        let address_str = arr
+            .first()
+            .and_then(|v| v.as_str())
+            .ok_or("Missing address param")?;
+        let address: Address = address_str
+            .parse()
+            .map_err(|e| format!("Invalid address '{}': {}", address_str, e))?;
+
+        let block_hash_str = arr
+            .get(1)
+            .and_then(|v| v.get("blockHash"))
+            .and_then(|v| v.as_str())
+            .ok_or("Missing blockHash in params")?;
+        let block_hash: B256 = block_hash_str
+            .parse()
+            .map_err(|e| format!("Invalid blockHash '{}': {}", block_hash_str, e))?;
+
+        Ok((address, block_hash))
+    }
+
+    fn handle_get_balance(
+        &self,
+        params: &serde_json::Value,
+        id: &serde_json::Value,
+    ) -> Result<ResponsePacket, TransportError> {
+        let (address, block_hash) = Self::parse_address_and_block_hash(params)
+            .map_err(|e| TransportErrorKind::custom_str(&format!("eth_getBalance: {}", e)))?;
+
+        match self.inner.get_balance.get(&(address, block_hash)) {
+            Some(value) => Self::success_response(id, serde_json::json!(format!("0x{:x}", value))),
+            None => Err(TransportErrorKind::custom_str(&format!(
+                "gnd test: no mock getBalance entry for address {} at block hash {}. \
+                 Add a 'getBalanceCalls' entry to this block in your test JSON.",
+                address, block_hash
+            ))),
+        }
+    }
+
+    fn handle_get_code(
+        &self,
+        params: &serde_json::Value,
+        id: &serde_json::Value,
+    ) -> Result<ResponsePacket, TransportError> {
+        let (address, block_hash) = Self::parse_address_and_block_hash(params)
+            .map_err(|e| TransportErrorKind::custom_str(&format!("eth_getCode: {}", e)))?;
+
+        match self.inner.get_code.get(&(address, block_hash)) {
+            // graph-node checks `code.len() > 2`; "0xff" is the minimal truthy value.
+            Some(true) => Self::success_response(id, serde_json::json!("0xff")),
+            Some(false) => Self::success_response(id, serde_json::json!("0x")),
+            None => Err(TransportErrorKind::custom_str(&format!(
+                "gnd test: no mock hasCode entry for address {} at block hash {}. \
+                 Add a 'hasCodeCalls' entry to this block in your test JSON.",
+                address, block_hash
+            ))),
+        }
+    }
+
+    fn handle_eth_call(
+        &self,
+        params: &serde_json::Value,
+        id: &serde_json::Value,
+    ) -> Result<ResponsePacket, TransportError> {
+        let arr = params
+            .as_array()
+            .ok_or_else(|| TransportErrorKind::custom_str("eth_call: expected array params"))?;
+
+        let tx = arr.first().ok_or_else(|| {
+            TransportErrorKind::custom_str("eth_call: missing transaction object")
+        })?;
+
+        let to_str = tx
+            .get("to")
+            .and_then(|v| v.as_str())
+            .ok_or_else(|| TransportErrorKind::custom_str("eth_call: missing 'to' field"))?;
+        let address: Address = to_str.parse().map_err(|e| {
+            TransportErrorKind::custom_str(&format!("eth_call: invalid 'to' address: {}", e))
+        })?;
+
+        let input_str = tx
+            .get("input")
+            .and_then(|v| v.as_str())
+            .ok_or_else(|| TransportErrorKind::custom_str("eth_call: missing 'input' field"))?;
+        let input =
+            hex::decode(input_str.strip_prefix("0x").unwrap_or(input_str)).map_err(|e| {
+                TransportErrorKind::custom_str(&format!("eth_call: invalid 'input' hex: {}", e))
+            })?;
+
+        let block_hash_str = arr
+            .get(1)
+            .and_then(|v| v.get("blockHash"))
+            .and_then(|v| v.as_str())
+            .ok_or_else(|| TransportErrorKind::custom_str("eth_call: missing blockHash"))?;
+        let block_hash: B256 = block_hash_str.parse().map_err(|e| {
+            TransportErrorKind::custom_str(&format!("eth_call: invalid blockHash: {}", e))
+        })?;
+
+        match self.inner.eth_calls.get(&(address, input, block_hash)) {
+            Some(EthCallResult::Success(data)) => {
+                Self::success_response(id, serde_json::json!(format!("0x{}", hex::encode(data))))
+            }
+            Some(EthCallResult::Revert) => Self::error_response(id, 3, "execution reverted"),
+            None => Err(TransportErrorKind::custom_str(&format!(
+                "gnd test: unmocked eth_call to {} at block hash {}. \
+                 Add a matching 'ethCalls' entry to this block in your test JSON.",
+                address, block_hash
+            ))),
+        }
+    }
+}
+
+impl Service<RequestPacket> for MockTransport {
+    type Response = ResponsePacket;
+    type Error = TransportError;
+    type Future = TransportFut<'static>;
+
+    fn poll_ready(&mut self, _cx: &mut TaskContext<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, request: RequestPacket) -> Self::Future {
+        let transport = self.clone();
+        Box::pin(async move {
+            let req = match &request {
+                RequestPacket::Single(req) => req,
+                RequestPacket::Batch(_) => {
+                    return Err(TransportErrorKind::custom_str(
+                        "gnd test: batch RPC requests are not supported by MockTransport",
+                    ));
+                }
+            };
+
+            let method = req.method();
+            let params: serde_json::Value = req
+                .params()
+                .map(|p| serde_json::from_str(p.get()))
+                .transpose()
+                .map_err(|e| {
+                    TransportErrorKind::custom_str(&format!("Failed to parse params: {}", e))
+                })?
+                .unwrap_or(serde_json::Value::Null);
+
+            let id = serde_json::to_value(req.id()).map_err(|e| {
+                TransportErrorKind::custom_str(&format!("Failed to serialize request id: {}", e))
+            })?;
+
+            match method {
+                "eth_getBalance" => transport.handle_get_balance(&params, &id),
+                "eth_getCode" => transport.handle_get_code(&params, &id),
+                "eth_call" => transport.handle_eth_call(&params, &id),
+                _ => Err(TransportErrorKind::custom_str(&format!(
+                    "gnd test: unmocked RPC method '{}'. Add mock data to your test JSON file.",
+                    method
+                ))),
+            }
+        })
+    }
+}
diff --git a/gnd/src/commands/test/mod.rs b/gnd/src/commands/test/mod.rs
new file mode 100644
index 00000000000..7352ae73e48
--- /dev/null
+++ b/gnd/src/commands/test/mod.rs
@@ -0,0 +1,218 @@
+//! Mock-based subgraph test runner for `gnd test`.
+//!
+//! This module replaces the old Matchstick-only test command with a mock-based
+//! integration testing solution. Tests are defined as JSON files containing mock
+//! blockchain data (blocks, log events, block triggers) and GraphQL assertions
+//! that validate the resulting entity state.
+//!
+//! ## How it works
+//!
+//! 1. Build the subgraph (unless `--skip-build`)
+//! 2. Discover `*.json` / `*.test.json` files in the test directory
+//! 3. For each test file:
+//!    a. Parse JSON into mock blocks with triggers
+//!    b. Spin up a temporary PostgreSQL database (pgtemp on Unix)
+//!    c. Initialize graph-node stores and deploy the subgraph
+//!    d. Feed mock blocks through a static block stream (no real RPC)
+//!    e. Wait for the indexer to process all blocks
+//!    f. Run GraphQL assertions against the indexed data
+//! 4. Report pass/fail results
+//!
+//! The key insight is that we reuse real graph-node infrastructure (stores,
+//! subgraph deployment, WASM runtime) and only mock the blockchain layer.
+//! This means tests exercise the same code paths as production indexing.
+//!
+//! ## Legacy mode
+//!
+//! The `--matchstick` flag falls back to the external Matchstick test runner
+//! for backward compatibility with existing test suites.
+
+mod assertion;
+mod block_stream;
+mod eth_calls;
+mod matchstick;
+mod mock_arweave;
+mod mock_chain;
+mod mock_ipfs;
+mod mock_runtime;
+mod mock_transport;
+mod noop;
+mod output;
+mod runner;
+mod schema;
+mod trigger;
+
+use anyhow::{Result, anyhow};
+use clap::Parser;
+use console::style;
+use std::path::PathBuf;
+
+use crate::output::{Step, step};
+
+const DEFAULT_TEST_DIR: &str = "tests";
+
+#[derive(Clone, Debug, Parser)]
+#[clap(about = "Run subgraph tests")]
+pub struct TestOpt {
+    /// Test files or directories to run. Directories are scanned for *.json / *.test.json.
+    /// Defaults to the "tests/" directory when nothing is specified.
+    pub tests: Vec<PathBuf>,
+
+    /// Path to subgraph manifest
+    #[clap(short = 'm', long, default_value = "subgraph.yaml")]
+    pub manifest: PathBuf,
+
+    /// Skip building the subgraph before testing
+    #[clap(short = 's', long)]
+    pub skip_build: bool,
+
+    /// PostgreSQL connection URL. If not provided, a temporary database will be created (Unix only).
+    #[clap(long, env = "POSTGRES_URL")]
+    pub postgres_url: Option<String>,
+
+    /// Use Matchstick runner instead (deprecated legacy mode — migrate to JSON-based tests)
+    #[clap(long)]
+    pub matchstick: bool,
+
+    /// Run Matchstick tests in Docker (recommended on macOS where the native binary is bugged)
+    #[clap(short = 'd', long, requires = "matchstick")]
+    pub docker: bool,
+
+    /// Run tests with coverage reporting (Matchstick only)
+    #[clap(short = 'c', long, requires = "matchstick")]
+    pub coverage: bool,
+
+    /// Force recompilation of tests (Matchstick only)
+    #[clap(short = 'r', long, requires = "matchstick")]
+    pub recompile: bool,
+
+    /// Force redownload of Matchstick binary / rebuild Docker image
+    #[clap(short = 'f', long, requires = "matchstick")]
+    pub force: bool,
+
+    /// Matchstick version to use (default: latest from GitHub)
+    #[clap(long, requires = "matchstick")]
+    pub matchstick_version: Option<String>,
+
+    /// Specific data source to test (Matchstick only)
+    #[clap(long, requires = "matchstick")]
+    pub datasource: Option<String>,
+
+    /// Increase graph-node log verbosity (-v info, -vv debug, -vvv trace).
+    /// Overridden by GRAPH_LOG env var when set.
+    #[clap(short = 'v', long, action = clap::ArgAction::Count)]
+    pub verbose: u8,
+}
+
+pub async fn run_test(opt: TestOpt) -> Result<()> {
+    if opt.matchstick {
+        step(
+            Step::Warn,
+            "Matchstick is deprecated and will be removed in a future release. \
+            Migrate to the JSON-based test format (see: gnd/docs/gnd-test.md).",
+        );
+        return matchstick::run(&opt).await;
+    }
+
+    // Build the subgraph first (WASM and schema must be available in build/).
+    if !opt.skip_build {
+        step(Step::Generate, "Building subgraph");
+        let build_opt = crate::commands::BuildOpt {
+            manifest: opt.manifest.clone(),
+            output_dir: std::path::PathBuf::from("build"),
+            output_format: "wasm".to_string(),
+            skip_migrations: false,
+            watch: false,
+            ipfs: None,
+            network: None,
+            network_file: std::path::PathBuf::from("networks.json"),
+            skip_asc_version_check: false,
+        };
+        crate::commands::run_build(build_opt).await?;
+        step(Step::Done, "Build complete");
+    }
+
+    // Resolve test files from positional args. Default to "tests/" when none given.
+    let tests = if opt.tests.is_empty() {
+        vec![PathBuf::from(DEFAULT_TEST_DIR)]
+    } else {
+        opt.tests.clone()
+    };
+
+    step(Step::Load, "Loading manifest");
+    let manifest_info = runner::load_manifest_info(&opt)?;
+
+    step(Step::Load, "Discovering test files");
+    let test_files = resolve_test_paths(&tests)?;
+
+    if test_files.is_empty() {
+        step(Step::Warn, "No test files found");
+        for test in &tests {
+            println!(
+                "  Looking in: {}",
+                test.canonicalize().unwrap_or(test.clone()).display()
+            );
+        }
+        println!("  Expected: *.test.json or *.json files");
+        return Ok(());
+    }
+
+    let mut passed = 0;
+    let mut failed = 0;
+    let mut all_failures = Vec::new();
+
+    for path in test_files {
+        output::print_test_start(&path);
+
+        let test_file = match schema::parse_test_file(&path) {
+            Ok(tf) => tf,
+            Err(e) => {
+                println!("  {} Failed to parse: {}", style("✘").red(), e);
+                failed += 1;
+                continue;
+            }
+        };
+
+        match runner::run_single_test(&opt, &manifest_info, &test_file, &path).await {
+            Ok(result) => {
+                output::print_test_result(&test_file.name, &result);
+                if result.is_passed() {
+                    passed += 1;
+                } else {
+                    all_failures.extend(output::collect_failures(&test_file.name, &result));
+                    failed += 1;
+                }
+            }
+            Err(e) => {
+                println!("  {} {} - Error: {}", style("✘").red(), test_file.name, e);
+                failed += 1;
+            }
+        }
+    }
+
+    output::print_failure_details(&all_failures);
+    output::print_summary(passed, failed);
+
+    if failed > 0 {
+        Err(anyhow!("{} test(s) failed", failed))
+    } else {
+        Ok(())
+    }
+}
+
+fn resolve_test_paths(paths: &[PathBuf]) -> Result<Vec<PathBuf>> {
+    let mut files = Vec::new();
+
+    for path in paths {
+        if path.is_dir() {
+            files.extend(schema::discover_test_files(path)?);
+        } else if path.exists() {
+            files.push(path.clone());
+        } else {
+            anyhow::bail!("Test file not found: {}", path.display());
+        }
+    }
+
+    files.sort();
+    Ok(files)
+}
diff --git a/gnd/src/commands/test/noop.rs b/gnd/src/commands/test/noop.rs
new file mode 100644
index 00000000000..069ab45bcbd
--- /dev/null
+++ b/gnd/src/commands/test/noop.rs
@@ -0,0 +1,119 @@
+//! Noop trait implementations for the mock `Chain`.
+//!
+//! Satisfy `Chain` constructor bounds but are never called:
+//! - Triggers come from `StaticStreamBuilder` (no scanning)
+//! - Host functions use `EthereumRuntimeAdapterBuilder` with the eth_call cache
+
+use async_trait::async_trait;
+use graph::blockchain::block_stream::{BlockRefetcher, BlockWithTriggers, FirehoseCursor};
+use graph::blockchain::{BlockPtr, Blockchain, TriggersAdapter, TriggersAdapterSelector};
+use graph::components::store::DeploymentLocator;
+use graph::prelude::{BlockHash, BlockNumber, Error};
+use graph::slog::{Discard, Logger};
+use std::collections::BTreeSet;
+use std::marker::PhantomData;
+use std::sync::Arc;
+
+use graph::slog::o;
+
+/// No-op block refetcher. Tests have no reorgs, so refetching is never needed.
+pub(super) struct StaticBlockRefetcher<C: Blockchain> {
+    pub _phantom: PhantomData<C>,
+}
+
+#[async_trait]
+impl<C: Blockchain> BlockRefetcher<C> for StaticBlockRefetcher<C> {
+    fn required(&self, _chain: &C) -> bool {
+        false
+    }
+
+    async fn get_block(
+        &self,
+        _chain: &C,
+        _logger: &Logger,
+        _cursor: FirehoseCursor,
+    ) -> Result<C::Block, Error> {
+        Err(anyhow::anyhow!(
+            "StaticBlockRefetcher::get_block should never be called — block refetching is disabled in test mode"
+        ))
+    }
+}
+
+pub(super) struct NoopAdapterSelector<C> {
+    pub _phantom: PhantomData<C>,
+}
+
+impl<C: Blockchain> TriggersAdapterSelector<C> for NoopAdapterSelector<C> {
+    fn triggers_adapter(
+        &self,
+        _loc: &DeploymentLocator,
+        _capabilities: &<C as Blockchain>::NodeCapabilities,
+        _unified_api_version: graph::data::subgraph::UnifiedMappingApiVersion,
+    ) -> Result<Arc<dyn TriggersAdapter<C>>, Error> {
+        Ok(Arc::new(NoopTriggersAdapter {
+            _phantom: PhantomData,
+        }))
+    }
+}
+
+/// Returns empty/default results. Never called since triggers come from `StaticStreamBuilder`.
+struct NoopTriggersAdapter<C: Blockchain> {
+    _phantom: PhantomData<C>,
+}
+
+#[async_trait]
+impl<C: Blockchain> TriggersAdapter<C> for NoopTriggersAdapter<C> {
+    async fn ancestor_block(
+        &self,
+        _ptr: BlockPtr,
+        _offset: BlockNumber,
+        _root: Option<BlockHash>,
+    ) -> Result<Option<<C as Blockchain>::Block>, Error> {
+        Ok(None)
+    }
+
+    async fn load_block_ptrs_by_numbers(
+        &self,
+        _logger: Logger,
+        _block_numbers: BTreeSet<BlockNumber>,
+    ) -> Result<Vec<C::Block>, Error> {
+        Ok(vec![])
+    }
+
+    async fn chain_head_ptr(&self) -> Result<Option<BlockPtr>, Error> {
+        Ok(None)
+    }
+
+    async fn scan_triggers(
+        &self,
+        _from: BlockNumber,
+        _to: BlockNumber,
+        _filter: &C::TriggerFilter,
+    ) -> Result<(Vec<BlockWithTriggers<C>>, BlockNumber), Error> {
+        Ok((vec![], 0))
+    }
+
+    async fn triggers_in_block(
+        &self,
+        _logger: &Logger,
+        block: <C as Blockchain>::Block,
+        _filter: &<C as Blockchain>::TriggerFilter,
+    ) -> Result<BlockWithTriggers<C>, Error> {
+        let logger = Logger::root(Discard, o!());
+        Ok(BlockWithTriggers::new(block, Vec::new(), &logger))
+    }
+
+    async fn is_on_main_chain(&self, _ptr: BlockPtr) -> Result<bool, Error> {
+        Ok(true)
+    }
+
+    async fn parent_ptr(&self, block: &BlockPtr) -> Result<Option<BlockPtr>, Error> {
+        match block.number {
+            0 => Ok(None),
+            n => Ok(Some(BlockPtr {
+                hash: BlockHash::default(),
+                number: n - 1,
+            })),
+        }
+    }
+}
diff --git a/gnd/src/commands/test/output.rs b/gnd/src/commands/test/output.rs
new file mode 100644
index 00000000000..8746574b511
--- /dev/null
+++ b/gnd/src/commands/test/output.rs
@@ -0,0 +1,113 @@
+//! Console output formatting for test results.
+
+use console::style;
+use similar::{ChangeTag, TextDiff};
+
+use super::assertion::align_for_diff;
+use super::schema::{AssertionFailure, AssertionOutcome, TestResult};
+use crate::output::{Step, step};
+
+pub fn print_test_start(path: &std::path::Path) {
+    step(Step::Load, &format!("Running {}", path.display()));
+}
+
+/// Print pass/fail for a test case. Diffs are deferred to `print_failure_details`.
+pub fn print_test_result(name: &str, result: &TestResult) {
+    if result.is_passed() {
+        println!("  {} {}", style("✔").green(), name);
+    } else {
+        println!("  {} {}", style("✘").red(), name);
+    }
+
+    if let Some(err) = &result.handler_error {
+        println!("    {} {}", style("Handler error:").red(), err);
+    }
+
+    for outcome in &result.assertions {
+        match outcome {
+            AssertionOutcome::Passed { query } => {
+                println!("    {} {}", style("✔").green(), style(query).dim());
+            }
+            AssertionOutcome::Failed(failure) => {
+                println!("    {} {}", style("✘").red(), failure.query);
+            }
+        }
+    }
+}
+
+pub struct FailureDetail {
+    pub test_name: String,
+    pub failure: AssertionFailure,
+}
+
+pub fn collect_failures(test_name: &str, result: &TestResult) -> Vec<FailureDetail> {
+    result
+        .assertions
+        .iter()
+        .filter_map(|outcome| match outcome {
+            AssertionOutcome::Passed { .. } => None,
+            AssertionOutcome::Failed(failure) => Some(FailureDetail {
+                test_name: test_name.to_string(),
+                failure: AssertionFailure {
+                    query: failure.query.clone(),
+                    expected: failure.expected.clone(),
+                    actual: failure.actual.clone(),
+                },
+            }),
+        })
+        .collect()
+}
+
+pub fn print_failure_details(details: &[FailureDetail]) {
+    if details.is_empty() {
+        return;
+    }
+
+    println!("\n{}", style("Failures:").red().bold());
+
+    for detail in details {
+        println!(
+            "\n  {} {} {}",
+            style("●").red(),
+            style(&detail.test_name).bold(),
+            style("→").dim(),
+        );
+        println!("    {} {}", style("Query:").yellow(), detail.failure.query);
+
+        let expected = serde_json::to_string_pretty(&detail.failure.expected).unwrap_or_default();
+        let aligned_actual = align_for_diff(&detail.failure.expected, &detail.failure.actual);
+        let actual = serde_json::to_string_pretty(&aligned_actual).unwrap_or_default();
+
+        println!(
+            "    {} {} expected {} actual",
+            style("Diff:").yellow(),
+            style("(-)").red(),
+            style("(+)").green(),
+        );
+
+        let diff = TextDiff::from_lines(&expected, &actual);
+        for change in diff.iter_all_changes() {
+            let text = change.value().trim_end_matches('\n');
+            match change.tag() {
+                ChangeTag::Delete => println!("      {}", style(format!("- {text}")).red()),
+                ChangeTag::Insert => println!("      {}", style(format!("+ {text}")).green()),
+                ChangeTag::Equal => println!("        {text}"),
+            }
+        }
+    }
+}
+
+pub fn print_summary(passed: usize, failed: usize) {
+    println!();
+    if failed == 0 {
+        println!(
+            "{}",
+            style(format!("Tests: {} passed, {} failed", passed, failed)).green()
+        );
+    } else {
+        println!(
+            "{}",
+            style(format!("Tests: {} passed, {} failed", passed, failed)).red()
+        );
+    }
+}
diff --git a/gnd/src/commands/test/runner.rs b/gnd/src/commands/test/runner.rs
new file mode 100644
index 00000000000..19db7347deb
--- /dev/null
+++ b/gnd/src/commands/test/runner.rs
@@ -0,0 +1,912 @@
+//! Test runner: orchestrates subgraph indexing with mock blockchain data.
+//!
+//! This is the core of `gnd test`. For each test file, it:
+//!
+//! 1. Creates a test database (`TestDatabase::Temporary` via pgtemp, or
+//!    `TestDatabase::Persistent` via `--postgres-url`) for test isolation
+//! 2. Initializes graph-node stores (entity storage, block storage, chain store)
+//! 3. Constructs a mock Ethereum chain that feeds pre-defined blocks
+//! 4. Deploys the subgraph and starts the indexer
+//! 5. Waits for all blocks to be processed (or a fatal error)
+//! 6. Runs GraphQL assertions against the indexed entity state
+
+use super::TestOpt;
+use super::assertion::run_assertions;
+use super::block_stream::StaticStreamBuilder;
+use super::mock_arweave::MockArweaveResolver;
+use super::mock_chain;
+use super::mock_ipfs::MockIpfsClient;
+use super::mock_runtime::TestRuntimeAdapterBuilder;
+use super::mock_transport::MockTransport;
+use super::noop::{NoopAdapterSelector, StaticBlockRefetcher};
+use super::schema::{TestFile, TestResult};
+use super::trigger::build_blocks_with_triggers;
+use crate::manifest::{Manifest, load_manifest};
+use anyhow::{Context, Result, anyhow, ensure};
+use graph::amp::FlightClient;
+use graph::blockchain::block_stream::BlockWithTriggers;
+use graph::blockchain::{BlockPtr, BlockchainMap, ChainIdentifier};
+use graph::cheap_clone::CheapClone;
+use graph::components::link_resolver::FileLinkResolver;
+use graph::components::metrics::MetricsRegistry;
+use graph::components::network_provider::{
+    AmpChainNames, ChainName, ProviderCheckStrategy, ProviderManager,
+};
+use graph::components::store::DeploymentLocator;
+use graph::components::subgraph::{Settings, SubgraphInstanceManager as _};
+use graph::data::graphql::load_manager::LoadManager;
+use graph::data::subgraph::schema::SubgraphError;
+use graph::endpoint::EndpointMetrics;
+use graph::env::EnvVars;
+use graph::firehose::{FirehoseEndpoint, FirehoseEndpoints, SubgraphLimit};
+use graph::ipfs::{ContentPath, IpfsMetrics};
+use graph::prelude::{
+    DeploymentHash, LoggerFactory, NodeId, SubgraphCountMetric, SubgraphName, SubgraphRegistrar,
+    SubgraphStore as SubgraphStoreTrait, SubgraphVersionSwitchingMode,
+};
+use graph::slog::{Logger, info, o};
+use graph_chain_ethereum::network::{EthereumNetworkAdapter, EthereumNetworkAdapters};
+use graph_chain_ethereum::{
+    Chain, EthereumAdapter, NodeCapabilities, ProviderEthRpcMetrics, Transport,
+    chain::ChainSettings,
+};
+use graph_core::polling_monitor::{arweave_service, ipfs_service};
+use graph_graphql::prelude::GraphQlRunner;
+use graph_node::config::{Config, Opt};
+use graph_node::manager::PanicSubscriptionManager;
+use graph_node::store_builder::StoreBuilder;
+use graph_store_postgres::{ChainHeadUpdateListener, ChainStore, Store, SubgraphStore};
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
+
+#[cfg(unix)]
+use pgtemp::PgTempDBBuilder;
+
+const NODE_ID: &str = "gnd-test";
+
+/// Build a logger from the `-v` flag. `GRAPH_LOG` env var always takes precedence.
+/// `verbose`: 0=off, 1=Info, 2=Debug, 3+=Trace.
+fn make_test_logger(verbose: u8) -> Logger {
+    if std::env::var("GRAPH_LOG").is_ok() {
+        return graph::log::logger(true);
+    }
+
+    match verbose {
+        0 => graph::log::discard(),
+        1 => graph::log::logger_with_levels(false, None),
+        2 => graph::log::logger_with_levels(true, None),
+        // "trace" sets GRAPH_LOG=trace globally via slog_envlogger.
+        _ => graph::log::logger_with_levels(true, Some("trace")),
+    }
+}
+
+/// Mock file data passed to `setup_context`.
+struct MockData {
+    ipfs_files: HashMap<ContentPath, graph::bytes::Bytes>,
+    ipfs_unresolved_tx: tokio::sync::mpsc::UnboundedSender<ContentPath>,
+    arweave_files: HashMap<String, graph::bytes::Bytes>,
+    arweave_unresolved_tx: tokio::sync::mpsc::UnboundedSender<String>,
+}
+
+struct TestStores {
+    network_name: ChainName,
+    /// Listens for chain head updates — needed by the Chain constructor.
+    chain_head_listener: Arc<ChainHeadUpdateListener>,
+    network_store: Arc<Store>,
+    chain_store: Arc<ChainStore>,
+}
+
+/// Components needed to run a test after infrastructure setup.
+pub(super) struct TestContext {
+    pub(super) provider: Arc<graph_core::subgraph_provider::SubgraphProvider>,
+    pub(super) store: Arc<SubgraphStore>,
+    pub(super) deployment: DeploymentLocator,
+    pub(super) graphql_runner: Arc<GraphQlRunner<Store>>,
+}
+
+/// Manifest data shared across all tests in a run.
+pub(super) struct ManifestInfo {
+    pub build_dir: PathBuf,
+    /// Built manifest path. Aliased to `hash` in `FileLinkResolver` so the Qm
+    /// hash resolves to a real filesystem path.
+    pub manifest_path: PathBuf,
+    pub network_name: ChainName,
+    pub min_start_block: u64,
+    /// Override for on-chain block validation when startBlock > 0.
+    pub start_block_override: Option<BlockPtr>,
+    pub hash: DeploymentHash,
+    pub subgraph_name: SubgraphName,
+    /// Event selectors (topic0) for handlers that declare `receipt: true`.
+    /// Only logs whose topic0 is in this set receive a non-null receipt.
+    pub receipt_required_selectors:
+        std::collections::HashSet<graph::prelude::alloy::primitives::B256>,
+}
+
+/// Compute `"Qm" + hex(sha1(path + '\0' + seed))`. Seed ensures per-run uniqueness.
+fn deployment_hash_from_path_and_seed(path: &Path, seed: u128) -> Result<DeploymentHash> {
+    use sha1::{Digest, Sha1};
+
+    let input = format!("{}\0{}", path.display(), seed);
+    let digest = Sha1::digest(input.as_bytes());
+    let qm = format!("Qm{}", hex::encode(digest));
+    DeploymentHash::new(qm).map_err(|e| anyhow!("Failed to create deployment hash: {}", e))
+}
+
+pub(super) fn load_manifest_info(opt: &TestOpt) -> Result<ManifestInfo> {
+    let manifest_dir = opt
+        .manifest
+        .parent()
+        .map(|p| p.to_path_buf())
+        .unwrap_or_else(|| PathBuf::from("."));
+
+    let build_dir = manifest_dir.join("build");
+
+    let manifest_filename = opt
+        .manifest
+        .file_name()
+        .and_then(|s| s.to_str())
+        .unwrap_or("subgraph.yaml");
+    let built_manifest_path = build_dir.join(manifest_filename);
+    let built_manifest_path = built_manifest_path
+        .canonicalize()
+        .context("Failed to resolve built manifest path — did you run 'gnd build'?")?;
+
+    let manifest = load_manifest(&built_manifest_path)?;
+
+    let network_name: ChainName = extract_network_from_manifest(&manifest)?.into();
+    let min_start_block = extract_start_block_from_manifest(&manifest)?;
+
+    let start_block_override = if min_start_block > 0 {
+        use graph::prelude::alloy::primitives::keccak256;
+        let hash = keccak256((min_start_block - 1).to_be_bytes());
+        ensure!(
+            min_start_block - 1 <= i32::MAX as u64,
+            "block number {} exceeds i32::MAX",
+            min_start_block - 1
+        );
+        Some(BlockPtr::new(hash.into(), (min_start_block - 1) as i32))
+    } else {
+        None
+    };
+
+    // Per-run seed for unique deployment hash and subgraph name.
+    let seed = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_millis();
+
+    let hash = deployment_hash_from_path_and_seed(&built_manifest_path, seed)?;
+
+    // Derive subgraph name from the root dir, sanitized for SubgraphName compatibility.
+    let root_dir_name = manifest_dir
+        .canonicalize()
+        .unwrap_or(manifest_dir.clone())
+        .file_name()
+        .and_then(|s| s.to_str())
+        .unwrap_or("gnd-test")
+        .chars()
+        .filter(|c| c.is_alphanumeric() || *c == '-' || *c == '_')
+        .collect::<String>();
+    let subgraph_name = SubgraphName::new(format!("test/{}-{}", root_dir_name, seed))
+        .map_err(|e| anyhow!("{}", e))?;
+
+    let receipt_required_selectors = extract_receipt_required_selectors(&manifest);
+
+    Ok(ManifestInfo {
+        build_dir,
+        manifest_path: built_manifest_path,
+        network_name,
+        min_start_block,
+        start_block_override,
+        hash,
+        subgraph_name,
+        receipt_required_selectors,
+    })
+}
+
+/// Collect topic0 selectors for handlers declaring `receipt: true`.
+///
+/// Covers data sources and templates. Mirrors `MappingEventHandler::topic0()`:
+/// strip `"indexed "` and spaces, then keccak256.
+fn extract_receipt_required_selectors(
+    manifest: &Manifest,
+) -> std::collections::HashSet<graph::prelude::alloy::primitives::B256> {
+    use graph::prelude::alloy::primitives::keccak256;
+
+    manifest
+        .data_sources
+        .iter()
+        .flat_map(|ds| &ds.event_handlers)
+        .chain(manifest.templates.iter().flat_map(|t| &t.event_handlers))
+        .filter(|h| h.receipt)
+        .map(|h| {
+            let normalized = h.event.replace("indexed ", "").replace(' ', "");
+            keccak256(normalized.as_bytes())
+        })
+        .collect()
+}
+
+fn extract_network_from_manifest(manifest: &Manifest) -> Result<String> {
+    let network = manifest
+        .data_sources
+        .first()
+        .and_then(|ds| ds.network.clone())
+        .unwrap_or_else(|| "mainnet".to_string());
+
+    Ok(network)
+}
+
+/// Extract the minimum `startBlock` across all data sources.
+fn extract_start_block_from_manifest(manifest: &Manifest) -> Result<u64> {
+    Ok(manifest
+        .data_sources
+        .iter()
+        .map(|ds| ds.start_block)
+        .min()
+        .unwrap_or(0))
+}
+
+pub async fn run_single_test(
+    opt: &TestOpt,
+    manifest_info: &ManifestInfo,
+    test_file: &TestFile,
+    test_file_path: &Path,
+) -> Result<TestResult> {
+    // Warn (and short-circuit) when there are no assertions.
+    if test_file.assertions.is_empty() {
+        if test_file.blocks.is_empty() {
+            eprintln!(
+                "  {} Test '{}' has no blocks and no assertions",
+                console::style("⚠").yellow(),
+                test_file.name
+            );
+            return Ok(TestResult {
+                handler_error: None,
+                assertions: vec![],
+            });
+        } else {
+            eprintln!(
+                "  {} Test '{}' has blocks but no assertions",
+                console::style("⚠").yellow(),
+                test_file.name
+            );
+        }
+    }
+
+    // Start numbering at the manifest's startBlock so implicit blocks are in range.
+    let blocks = build_blocks_with_triggers(
+        test_file,
+        manifest_info.min_start_block,
+        &manifest_info.receipt_required_selectors,
+    )?;
+
+    // Build mock IPFS file map.
+    let test_file_dir = test_file_path
+        .parent()
+        .map(|p| p.to_path_buf())
+        .unwrap_or_else(|| PathBuf::from("."));
+
+    let mut mock_files: HashMap<ContentPath, graph::bytes::Bytes> = HashMap::new();
+    for entry in &test_file.files {
+        let path = ContentPath::new(&entry.cid)
+            .map_err(|e| anyhow!("Invalid CID '{}' in test files: {}", entry.cid, e))?;
+        let content = entry
+            .resolve(&test_file_dir)
+            .with_context(|| format!("Failed to resolve mock file for CID '{}'", entry.cid))?;
+        mock_files.insert(path, content);
+    }
+
+    let (unresolved_tx, mut unresolved_rx) = tokio::sync::mpsc::unbounded_channel::<ContentPath>();
+
+    let mut mock_arweave_files: HashMap<String, graph::bytes::Bytes> = HashMap::new();
+    for entry in &test_file.arweave_files {
+        let content = entry.resolve(&test_file_dir).with_context(|| {
+            format!(
+                "Failed to resolve mock Arweave file for txId '{}'",
+                entry.tx_id
+            )
+        })?;
+        mock_arweave_files.insert(entry.tx_id.clone(), content);
+    }
+
+    let (arweave_unresolved_tx, mut arweave_unresolved_rx) =
+        tokio::sync::mpsc::unbounded_channel::<String>();
+
+    // `db` must stay alive — dropping it destroys a pgtemp database.
+    let db = create_test_database(opt, &manifest_info.build_dir)?;
+
+    let logger = make_test_logger(opt.verbose).new(o!("test" => test_file.name.clone()));
+
+    let stores = setup_stores(&logger, &db, &manifest_info.network_name).await?;
+
+    let mock_transport = MockTransport::new(test_file, &blocks)?;
+    let chain = setup_chain(&logger, blocks.clone(), &stores, mock_transport).await?;
+
+    let mock_data = MockData {
+        ipfs_files: mock_files,
+        ipfs_unresolved_tx: unresolved_tx,
+        arweave_files: mock_arweave_files,
+        arweave_unresolved_tx,
+    };
+
+    let ctx = setup_context(&logger, &stores, &chain, manifest_info, mock_data).await?;
+
+    // The indexer will process until it reaches this block.
+    let stop_block = if blocks.is_empty() {
+        mock_chain::genesis_ptr()
+    } else {
+        mock_chain::final_block_ptr(&blocks).ok_or_else(|| anyhow!("No blocks to process"))?
+    };
+
+    info!(logger, "Starting subgraph indexing"; "stop_block" => stop_block.number);
+
+    ctx.provider
+        .clone()
+        .start_subgraph(ctx.deployment.clone(), Some(stop_block.number))
+        .await;
+
+    let result = match wait_for_sync(
+        &logger,
+        ctx.store.clone(),
+        &ctx.deployment,
+        stop_block.clone(),
+    )
+    .await
+    {
+        Ok(()) => {
+            // Drain unresolved CIDs/tx IDs, deduplicating.
+            let mut unresolved_ipfs: Vec<ContentPath> = Vec::new();
+            while let Ok(cid) = unresolved_rx.try_recv() {
+                if !unresolved_ipfs.contains(&cid) {
+                    unresolved_ipfs.push(cid);
+                }
+            }
+
+            let mut unresolved_arweave: Vec<String> = Vec::new();
+            while let Ok(tx_id) = arweave_unresolved_rx.try_recv() {
+                if !unresolved_arweave.contains(&tx_id) {
+                    unresolved_arweave.push(tx_id);
+                }
+            }
+
+            let mut missing_parts: Vec<String> = Vec::new();
+
+            if !unresolved_ipfs.is_empty() {
+                let list = unresolved_ipfs
+                    .iter()
+                    .map(|p| format!("  - {}", p))
+                    .collect::<Vec<_>>()
+                    .join("\n");
+                missing_parts.push(format!(
+                    "IPFS CIDs not found in mock 'files':\n{}\n\
+                     Add the missing CID(s) to the \"files\" array in your test JSON.",
+                    list
+                ));
+            }
+
+            if !unresolved_arweave.is_empty() {
+                let list = unresolved_arweave
+                    .iter()
+                    .map(|id| format!("  - {}", id))
+                    .collect::<Vec<_>>()
+                    .join("\n");
+                missing_parts.push(format!(
+                    "Arweave tx IDs not found in mock 'arweaveFiles':\n{}\n\
+                     Add the missing txId(s) to the \"arweaveFiles\" array in your test JSON.",
+                    list
+                ));
+            }
+
+            if !missing_parts.is_empty() {
+                Ok(TestResult {
+                    handler_error: Some(missing_parts.join("\n\n")),
+                    assertions: vec![],
+                })
+            } else {
+                run_assertions(&ctx, &test_file.assertions).await
+            }
+        }
+        Err(subgraph_error) => {
+            // Fatal handler error — skip assertions.
+            Ok(TestResult {
+                handler_error: Some(format_handler_error(&subgraph_error)),
+                assertions: vec![],
+            })
+        }
+    };
+
+    // Stop the subgraph regardless of result.
+    ctx.provider
+        .clone()
+        .stop_subgraph(ctx.deployment.clone())
+        .await;
+
+    // For persistent DBs: clean up on pass, preserve on failure for inspection.
+    if db.needs_cleanup() {
+        let test_passed = result.as_ref().map(|r| r.is_passed()).unwrap_or(false);
+        if test_passed {
+            cleanup(
+                &ctx.store,
+                &manifest_info.subgraph_name,
+                &manifest_info.hash,
+            )
+            .await
+            .ok();
+        } else {
+            eprintln!(
+                "  {} Test failed — database preserved for inspection: {}",
+                console::style("ℹ").cyan(),
+                db.url()
+            );
+        }
+    }
+
+    result
+}
+
+/// Create the test database: pgtemp (auto-dropped) or persistent (`--postgres-url`).
+/// On non-Unix systems, `--postgres-url` is required.
+fn create_test_database(opt: &TestOpt, build_dir: &Path) -> Result<TestDatabase> {
+    if let Some(url) = &opt.postgres_url {
+        return Ok(TestDatabase::Persistent { url: url.clone() });
+    }
+
+    #[cfg(unix)]
+    {
+        if !build_dir.exists() {
+            anyhow::bail!(
+                "Build directory does not exist: {}. Run 'gnd build' first.",
+                build_dir.display()
+            );
+        }
+
+        // Override unix_socket_directories to /tmp: macOS temp paths can exceed
+        // the 104-byte Unix socket limit, causing postgres to silently fail to start.
+        let db = PgTempDBBuilder::new()
+            .with_data_dir_prefix(build_dir)
+            .persist_data(false)
+            .with_initdb_arg("-E", "UTF8")
+            .with_initdb_arg("--locale", "C")
+            .with_config_param("unix_socket_directories", "/tmp")
+            .start();
+
+        let url = db.connection_uri().to_string();
+        Ok(TestDatabase::Temporary { url, _handle: db })
+    }
+
+    #[cfg(not(unix))]
+    {
+        let _ = build_dir;
+        Err(anyhow!(
+            "On non-Unix systems, please provide --postgres-url"
+        ))
+    }
+}
+
+/// Database used for a single test run.
+enum TestDatabase {
+    #[cfg(unix)]
+    Temporary {
+        url: String,
+        _handle: pgtemp::PgTempDB,
+    },
+    Persistent {
+        url: String,
+    },
+}
+
+impl TestDatabase {
+    fn url(&self) -> &str {
+        match self {
+            #[cfg(unix)]
+            Self::Temporary { url, .. } => url,
+            Self::Persistent { url } => url,
+        }
+    }
+
+    /// Returns true if the deployment must be cleaned up after the test.
+    /// Temporary databases are auto-dropped; persistent ones accumulate state.
+    fn needs_cleanup(&self) -> bool {
+        match self {
+            #[cfg(unix)]
+            Self::Temporary { .. } => false,
+            Self::Persistent { .. } => true,
+        }
+    }
+}
+
+async fn setup_stores(
+    logger: &Logger,
+    db: &TestDatabase,
+    network_name: &ChainName,
+) -> Result<TestStores> {
+    let config_str = format!(
+        r#"
+[store]
+[store.primary]
+connection = "{}"
+pool_size = 2
+
+[deployment]
+[[deployment.rule]]
+store = "primary"
+indexers = [ "default" ]
+
+[chains]
+ingestor = "default"
+"#,
+        db.url()
+    );
+
+    let config = Config::from_str(&config_str, &Opt::default())
+        .map_err(|e| anyhow!("Failed to parse config: {}", e))?;
+
+    let mock_registry = Arc::new(MetricsRegistry::mock());
+    let node_id = NodeId::new(NODE_ID).unwrap();
+
+    // StoreBuilder runs migrations and creates connection pools.
+    let store_builder =
+        StoreBuilder::new(logger, &node_id, &config, None, mock_registry.clone()).await;
+
+    let chain_head_listener = store_builder.chain_head_update_listener();
+    let network_identifiers: Vec<ChainName> = vec![network_name.clone()];
+    let network_store = store_builder.network_store(network_identifiers).await;
+
+    let block_store = network_store.block_store();
+
+    // Synthetic chain identifier — net_version "1" with zero genesis hash.
+    let ident = ChainIdentifier {
+        net_version: "1".into(),
+        genesis_block_hash: graph::prelude::alloy::primitives::B256::ZERO.into(),
+    };
+
+    let chain_store = block_store
+        .create_chain_store(network_name, ident)
+        .await
+        .context("Failed to create chain store")?;
+
+    Ok(TestStores {
+        network_name: network_name.clone(),
+        chain_head_listener,
+        network_store,
+        chain_store,
+    })
+}
+
+/// Construct the mock Ethereum `Chain` with pre-built blocks.
+async fn setup_chain(
+    logger: &Logger,
+    blocks: Vec<BlockWithTriggers<Chain>>,
+    stores: &TestStores,
+    mock_transport: MockTransport,
+) -> Result<Arc<Chain>> {
+    let mock_registry = Arc::new(MetricsRegistry::mock());
+    let logger_factory = LoggerFactory::new(logger.clone(), None, mock_registry.clone());
+
+    // Dummy firehose endpoint — required by Chain constructor, never used.
+    let firehose_endpoints = FirehoseEndpoints::for_testing(vec![Arc::new(FirehoseEndpoint::new(
+        "",
+        "http://0.0.0.0:0",
+        None,
+        None,
+        true,
+        false,
+        SubgraphLimit::Unlimited,
+        Arc::new(EndpointMetrics::mock()),
+    ))]);
+
+    let client =
+        Arc::new(graph::blockchain::client::ChainClient::<Chain>::new_firehose(firehose_endpoints));
+
+    let endpoint_metrics = Arc::new(EndpointMetrics::mock());
+    let provider_metrics = Arc::new(ProviderEthRpcMetrics::new(mock_registry.clone()));
+    let rpc_client = graph::prelude::alloy::rpc::client::RpcClient::new(mock_transport, true);
+    let transport = Transport::RPC(rpc_client);
+
+    let block_stream_builder: Arc<dyn graph::blockchain::block_stream::BlockStreamBuilder<Chain>> =
+        Arc::new(StaticStreamBuilder { chain: blocks });
+    let dummy_adapter = Arc::new(
+        EthereumAdapter::new(
+            logger.clone(),
+            String::new(),
+            transport,
+            provider_metrics,
+            true,
+            false,
+            Arc::new(ChainSettings::from_env_defaults()),
+        )
+        .await,
+    );
+    let adapter = EthereumNetworkAdapter::new(
+        endpoint_metrics,
+        NodeCapabilities {
+            archive: true,
+            traces: false,
+        },
+        dummy_adapter,
+        SubgraphLimit::Unlimited,
+    );
+    let provider_manager = ProviderManager::new(
+        logger.clone(),
+        vec![(stores.network_name.clone(), vec![adapter])],
+        ProviderCheckStrategy::MarkAsValid,
+    );
+    let eth_adapters = Arc::new(EthereumNetworkAdapters::new(
+        stores.network_name.clone(),
+        provider_manager,
+        vec![],
+        None,
+    ));
+
+    let chain_settings = Arc::new(ChainSettings::from_env_defaults());
+    let chain = Chain::new(
+        logger_factory,
+        stores.network_name.clone(),
+        mock_registry,
+        stores.chain_store.cheap_clone(),
+        stores.chain_store.cheap_clone(),
+        client,
+        stores.chain_head_listener.cheap_clone(),
+        block_stream_builder,
+        Arc::new(StaticBlockRefetcher {
+            _phantom: PhantomData,
+        }),
+        Arc::new(NoopAdapterSelector {
+            _phantom: PhantomData,
+        }),
+        Arc::new(TestRuntimeAdapterBuilder),
+        eth_adapters,
+        graph::prelude::ENV_VARS.reorg_threshold(),
+        true,
+        chain_settings,
+    );
+
+    Ok(Arc::new(chain))
+}
+
+/// Wire up all graph-node components and deploy the subgraph.
+async fn setup_context(
+    logger: &Logger,
+    stores: &TestStores,
+    chain: &Arc<Chain>,
+    manifest_info: &ManifestInfo,
+    mock_data: MockData,
+) -> Result<TestContext> {
+    let build_dir = &manifest_info.build_dir;
+    let manifest_path = &manifest_info.manifest_path;
+    let hash = manifest_info.hash.clone();
+    let subgraph_name = manifest_info.subgraph_name.clone();
+    let start_block_override = manifest_info.start_block_override.clone();
+
+    let env_vars = Arc::new(EnvVars::from_env().unwrap_or_default());
+    let mock_registry = Arc::new(MetricsRegistry::mock());
+    let logger_factory = LoggerFactory::new(logger.clone(), None, mock_registry.clone());
+    let node_id = NodeId::new(NODE_ID).unwrap();
+
+    let subgraph_store = stores.network_store.subgraph_store();
+
+    // Route triggers to our mock chain.
+    let mut blockchain_map = BlockchainMap::new();
+    blockchain_map.insert(stores.network_name.clone(), chain.clone());
+    let blockchain_map = Arc::new(blockchain_map);
+
+    // FileLinkResolver loads from build dir. Alias maps the Qm hash → manifest path
+    // so clone_for_manifest can resolve it without treating the hash as a path.
+    let aliases =
+        std::collections::HashMap::from([(hash.to_string(), manifest_path.to_path_buf())]);
+    let link_resolver: Arc<dyn graph::components::link_resolver::LinkResolver> = Arc::new(
+        FileLinkResolver::new(Some(build_dir.to_path_buf()), aliases),
+    );
+
+    // Mock IPFS client for file data sources (FileLinkResolver handles the manifest).
+    let ipfs_metrics = IpfsMetrics::new(&mock_registry);
+    let ipfs_client = Arc::new(MockIpfsClient {
+        files: mock_data.ipfs_files,
+        metrics: ipfs_metrics,
+        unresolved_tx: mock_data.ipfs_unresolved_tx,
+    });
+
+    let ipfs_service = ipfs_service(
+        ipfs_client,
+        env_vars.mappings.max_ipfs_file_bytes,
+        env_vars.mappings.ipfs_timeout,
+        env_vars.mappings.ipfs_request_limit,
+    );
+
+    let arweave_resolver: Arc<dyn graph::components::link_resolver::ArweaveResolver> =
+        Arc::new(MockArweaveResolver {
+            files: mock_data.arweave_files,
+            unresolved_tx: mock_data.arweave_unresolved_tx,
+        });
+    let arweave_service = arweave_service(
+        arweave_resolver,
+        env_vars.mappings.ipfs_request_limit,
+        graph::components::link_resolver::FileSizeLimit::MaxBytes(
+            env_vars.mappings.max_ipfs_file_bytes as u64,
+        ),
+    );
+
+    let sg_count = Arc::new(SubgraphCountMetric::new(mock_registry.cheap_clone()));
+    let static_filters = env_vars.experimental_static_filters;
+
+    let subgraph_instance_manager = Arc::new(graph_core::subgraph::SubgraphInstanceManager::<
+        SubgraphStore,
+        FlightClient,
+    >::new(
+        &logger_factory,
+        env_vars.cheap_clone(),
+        subgraph_store.clone(),
+        blockchain_map.clone(),
+        sg_count.cheap_clone(),
+        mock_registry.clone(),
+        link_resolver.cheap_clone(),
+        ipfs_service,
+        arweave_service,
+        None,
+        static_filters,
+    ));
+
+    let mut subgraph_instance_managers =
+        graph_core::subgraph_provider::SubgraphInstanceManagers::new();
+    subgraph_instance_managers.add(
+        graph_core::subgraph_provider::SubgraphProcessingKind::Trigger,
+        subgraph_instance_manager.cheap_clone(),
+    );
+
+    let subgraph_provider = Arc::new(graph_core::subgraph_provider::SubgraphProvider::new(
+        &logger_factory,
+        sg_count.cheap_clone(),
+        subgraph_store.clone(),
+        link_resolver.cheap_clone(),
+        tokio_util::sync::CancellationToken::new(),
+        subgraph_instance_managers,
+    ));
+
+    let load_manager = LoadManager::new(logger, Vec::new(), Vec::new(), mock_registry.clone());
+    let graphql_runner = Arc::new(GraphQlRunner::new(
+        logger,
+        stores.network_store.clone(),
+        Arc::new(load_manager),
+        mock_registry.clone(),
+        Arc::new(graph::components::log_store::NoOpLogStore),
+    ));
+
+    // Uses PanicSubscriptionManager — tests don't need GraphQL subscriptions.
+    let panicking_subscription_manager = Arc::new(PanicSubscriptionManager {});
+    let subgraph_registrar = Arc::new(graph_core::subgraph::SubgraphRegistrar::new(
+        &logger_factory,
+        link_resolver.cheap_clone(),
+        subgraph_provider.cheap_clone(),
+        subgraph_store.clone(),
+        panicking_subscription_manager,
+        Option::<Arc<graph::amp::FlightClient>>::None,
+        blockchain_map.clone(),
+        node_id.clone(),
+        SubgraphVersionSwitchingMode::Instant,
+        Arc::new(Settings::default()),
+        Arc::new(AmpChainNames::default()),
+    ));
+
+    SubgraphRegistrar::create_subgraph(subgraph_registrar.as_ref(), subgraph_name.clone()).await?;
+
+    // Deploy the subgraph. start_block_override bypasses on-chain block validation.
+    let deployment = SubgraphRegistrar::create_subgraph_version(
+        subgraph_registrar.as_ref(),
+        subgraph_name.clone(),
+        hash.clone(),
+        node_id.clone(),
+        None,
+        start_block_override,
+        None,
+        None,
+        false,
+    )
+    .await?;
+
+    Ok(TestContext {
+        provider: subgraph_provider,
+        store: subgraph_store,
+        deployment,
+        graphql_runner,
+    })
+}
+
+/// Remove a subgraph deployment after a test run. Errors are ignored.
+async fn cleanup(
+    subgraph_store: &SubgraphStore,
+    name: &SubgraphName,
+    hash: &DeploymentHash,
+) -> Result<()> {
+    let locators = SubgraphStoreTrait::locators(subgraph_store, hash).await?;
+
+    // Ignore errors - the subgraph might not exist on first run
+    let _ = subgraph_store.remove_subgraph(name.clone()).await;
+
+    for locator in &locators {
+        // Unassign the deployment from its node first — remove_deployment
+        // silently skips deletion if the deployment is still assigned.
+        let _ = SubgraphStoreTrait::unassign_subgraph(subgraph_store, locator).await;
+        subgraph_store.remove_deployment(locator.id.into()).await?;
+    }
+
+    Ok(())
+}
+
+/// Format a `SubgraphError` for user-facing output.
+fn format_handler_error(err: &SubgraphError) -> String {
+    let mut parts = Vec::new();
+
+    if let Some(handler) = &err.handler {
+        parts.push(format!("in {handler}"));
+    }
+    if let Some(block_ptr) = &err.block_ptr {
+        parts.push(format!("at block #{}", block_ptr.number));
+    }
+
+    let location = parts.join(" ");
+    if location.is_empty() {
+        err.message.clone()
+    } else {
+        format!("{location}: {}", err.message)
+    }
+}
+
+/// Poll until the subgraph reaches `stop_block`, returning `Err` on fatal error or timeout.
+async fn wait_for_sync(
+    logger: &Logger,
+    store: Arc<SubgraphStore>,
+    deployment: &DeploymentLocator,
+    stop_block: BlockPtr,
+) -> Result<(), SubgraphError> {
+    // Hardcoded; could be made configurable via env var or CLI flag.
+    const MAX_WAIT: Duration = Duration::from_secs(60);
+    const WAIT_TIME: Duration = Duration::from_millis(500);
+
+    let start = Instant::now();
+
+    async fn flush(logger: &Logger, store: &Arc<SubgraphStore>, deployment: &DeploymentLocator) {
+        if let Ok(writable) = store
+            .clone()
+            .writable(logger.clone(), deployment.id, Arc::new(vec![]))
+            .await
+        {
+            let _ = writable.flush().await;
+        }
+    }
+
+    flush(logger, &store, deployment).await;
+
+    while start.elapsed() < MAX_WAIT {
+        tokio::time::sleep(WAIT_TIME).await;
+        flush(logger, &store, deployment).await;
+
+        let block_ptr = match store.least_block_ptr(&deployment.hash).await {
+            Ok(Some(ptr)) => ptr,
+            _ => continue, // Not started yet
+        };
+
+        info!(logger, "Sync progress"; "current" => block_ptr.number, "target" => stop_block.number);
+
+        // Check for fatal errors.
+        let status = store.status_for_id(deployment.id).await;
+        if let Some(fatal_error) = status.fatal_error {
+            return Err(fatal_error);
+        }
+
+        if block_ptr.number >= stop_block.number {
+            info!(logger, "Reached stop block");
+            return Ok(());
+        }
+    }
+
+    Err(SubgraphError {
+        subgraph_id: deployment.hash.clone(),
+        message: format!("Sync timeout after {}s", MAX_WAIT.as_secs()),
+        block_ptr: None,
+        handler: None,
+        deterministic: false,
+    })
+}
diff --git a/gnd/src/commands/test/schema.rs b/gnd/src/commands/test/schema.rs
new file mode 100644
index 00000000000..d684e98fff6
--- /dev/null
+++ b/gnd/src/commands/test/schema.rs
@@ -0,0 +1,315 @@
+//! JSON schema types for test files.
+//!
+//! Test files describe mock blockchain blocks with triggers and GraphQL assertions.
+//! Block triggers (Start/End) are auto-injected so block handlers with any filter
+//! (`once`, `polling`, or none) fire without explicit config.
+//!
+//! ```json
+//! {
+//!   "name": "Transfer creates entity",
+//!   "blocks": [
+//!     {
+//!       "number": 1,
+//!       "events": [
+//!         {
+//!           "address": "0x1234...",
+//!           "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+//!           "params": { "from": "0xaaaa...", "to": "0xbbbb...", "value": "1000" }
+//!         }
+//!       ]
+//!     }
+//!   ],
+//!   "assertions": [
+//!     {
+//!       "query": "{ transfer(id: \"1\") { from to value } }",
+//!       "expected": { "transfer": { "from": "0xaaaa...", "to": "0xbbbb...", "value": "1000" } }
+//!     }
+//!   ]
+//! }
+//! ```
+
+use graph::bytes::Bytes;
+use serde::Deserialize;
+use serde_json::Value;
+use std::path::{Path, PathBuf};
+
+/// Top-level test file. A named test case with mock blocks and GraphQL assertions.
+#[derive(Debug, Clone, Deserialize)]
+pub struct TestFile {
+    pub name: String,
+
+    /// Mock IPFS file contents keyed by CID. Used for file data sources.
+    #[serde(default)]
+    pub files: Vec<MockFile>,
+
+    /// Mock Arweave file contents keyed by transaction ID. Used for file/arweave data sources.
+    #[serde(default, rename = "arweaveFiles")]
+    pub arweave_files: Vec<MockArweaveFile>,
+
+    /// Ordered sequence of mock blocks to index.
+    #[serde(default)]
+    pub blocks: Vec<TestBlock>,
+
+    /// GraphQL assertions to run after indexing.
+    #[serde(default)]
+    pub assertions: Vec<Assertion>,
+}
+
+/// A mock IPFS file entry for file data source testing.
+///
+/// Exactly one of `content` or `file` must be set.
+#[derive(Debug, Clone, Deserialize)]
+pub struct MockFile {
+    /// IPFS CID (`Qm...` or `bafy...`). The mock ignores hash/content relationship.
+    pub cid: String,
+
+    /// Inline UTF-8 content. Exactly one of `content` or `file` must be set.
+    #[serde(default)]
+    pub content: Option<String>,
+
+    /// File path, resolved relative to the test JSON. One of `content` or `file` required.
+    #[serde(default)]
+    pub file: Option<String>,
+}
+
+/// A mock Arweave file entry for file/arweave data source testing.
+///
+/// Exactly one of `content` or `file` must be set.
+#[derive(Debug, Clone, Deserialize)]
+pub struct MockArweaveFile {
+    /// Arweave transaction ID or bundle path (e.g. `"txid/filename.json"`).
+    /// No format validation — treated as an opaque string key.
+    #[serde(rename = "txId")]
+    pub tx_id: String,
+
+    /// Inline UTF-8 content. Exactly one of `content` or `file` must be set.
+    #[serde(default)]
+    pub content: Option<String>,
+
+    /// File path, resolved relative to the test JSON. One of `content` or `file` required.
+    #[serde(default)]
+    pub file: Option<String>,
+}
+
+impl MockArweaveFile {
+    /// Resolve to bytes. Exactly one of `content` or `file` must be set.
+    pub fn resolve(&self, test_dir: &Path) -> anyhow::Result<graph::bytes::Bytes> {
+        match (&self.content, &self.file) {
+            (Some(content), None) => Ok(graph::bytes::Bytes::from(content.clone().into_bytes())),
+            (None, Some(file)) => {
+                let path = if Path::new(file).is_absolute() {
+                    PathBuf::from(file)
+                } else {
+                    test_dir.join(file)
+                };
+                let data = std::fs::read(&path).map_err(|e| {
+                    anyhow::anyhow!("Failed to read file '{}': {}", path.display(), e)
+                })?;
+                Ok(graph::bytes::Bytes::from(data))
+            }
+            (Some(_), Some(_)) => anyhow::bail!(
+                "MockArweaveFile entry for txId '{}' must have either 'content' or 'file', not both",
+                self.tx_id
+            ),
+            (None, None) => anyhow::bail!(
+                "MockArweaveFile entry for txId '{}' must have either 'content' or 'file'",
+                self.tx_id
+            ),
+        }
+    }
+}
+
+impl MockFile {
+    /// Resolve to bytes. Exactly one of `content` or `file` must be set.
+    pub fn resolve(&self, test_dir: &Path) -> anyhow::Result<Bytes> {
+        match (&self.content, &self.file) {
+            (Some(content), None) => Ok(Bytes::from(content.clone().into_bytes())),
+            (None, Some(file)) => {
+                let path = if Path::new(file).is_absolute() {
+                    PathBuf::from(file)
+                } else {
+                    test_dir.join(file)
+                };
+                let data = std::fs::read(&path).map_err(|e| {
+                    anyhow::anyhow!("Failed to read file '{}': {}", path.display(), e)
+                })?;
+                Ok(Bytes::from(data))
+            }
+            (Some(_), Some(_)) => {
+                anyhow::bail!(
+                    "MockFile entry for CID '{}' must have either 'content' or 'file', not both",
+                    self.cid
+                )
+            }
+            (None, None) => {
+                anyhow::bail!(
+                    "MockFile entry for CID '{}' must have either 'content' or 'file'",
+                    self.cid
+                )
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct TestBlock {
+    /// Block number. If omitted, auto-increments starting from `start_block`
+    /// (default 1). Explicit numbers allow gaps (e.g., blocks 1, 5, 100).
+    #[serde(default)]
+    pub number: Option<u64>,
+
+    /// Block hash as hex string (e.g., "0xabc..."). If omitted, generated
+    /// deterministically as `keccak256(block_number)`.
+    #[serde(default)]
+    pub hash: Option<String>,
+
+    /// Unix timestamp in seconds. Defaults to the block number if omitted.
+    #[serde(default)]
+    pub timestamp: Option<u64>,
+
+    /// Log events within this block. Block triggers (Start/End) are auto-injected.
+    #[serde(default)]
+    pub events: Vec<LogEvent>,
+
+    #[serde(default, rename = "ethCalls")]
+    pub eth_calls: Vec<MockEthCall>,
+
+    #[serde(default, rename = "getBalanceCalls")]
+    pub get_balance_calls: Vec<MockBalance>,
+
+    #[serde(default, rename = "hasCodeCalls")]
+    pub has_code_calls: Vec<MockCode>,
+}
+
+/// A mock Ethereum event log.
+#[derive(Debug, Clone, Deserialize)]
+pub struct LogEvent {
+    /// Contract address that emitted the event (checksummed or lowercase hex).
+    pub address: String,
+
+    /// Full event signature with parameter names and `indexed` keywords.
+    /// e.g. `"Transfer(address indexed from, address indexed to, uint256 value)"`
+    pub event: String,
+
+    /// Parameter values keyed by name. JSON → Solidity type:
+    /// - Addresses: `"0x1234..."`
+    /// - Integers: `"1000000000000000000"` or `1000`
+    /// - Booleans: `true` / `false`
+    /// - Bytes: `"0xdeadbeef"`
+    #[serde(default)]
+    pub params: serde_json::Map<String, Value>,
+
+    /// Explicit tx hash, or generated as `keccak256(block_number || log_index)`.
+    #[serde(default, rename = "txHash")]
+    pub tx_hash: Option<String>,
+}
+
+/// A mock contract call response pre-cached for a specific block.
+#[derive(Debug, Clone, Deserialize)]
+pub struct MockEthCall {
+    pub address: String,
+    pub function: String,
+    pub params: Vec<Value>,
+    pub returns: Vec<Value>,
+
+    #[serde(default)]
+    pub reverts: bool,
+}
+
+/// Mock `ethereum.getBalance()` response.
+#[derive(Debug, Clone, Deserialize)]
+pub struct MockBalance {
+    pub address: String,
+    /// Wei as a decimal string.
+    pub value: String,
+}
+
+/// Mock `ethereum.hasCode()` response.
+#[derive(Debug, Clone, Deserialize)]
+pub struct MockCode {
+    pub address: String,
+    #[serde(rename = "hasCode")]
+    pub has_code: bool,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct Assertion {
+    pub query: String,
+
+    /// Expected JSON result. String/number coercion is applied (BigInt/BigDecimal).
+    pub expected: Value,
+}
+
+#[derive(Debug)]
+pub struct TestResult {
+    pub handler_error: Option<String>,
+    pub assertions: Vec<AssertionOutcome>,
+}
+
+impl TestResult {
+    pub fn is_passed(&self) -> bool {
+        self.handler_error.is_none()
+            && self
+                .assertions
+                .iter()
+                .all(|a| matches!(a, AssertionOutcome::Passed { .. }))
+    }
+}
+
+#[derive(Debug)]
+pub enum AssertionOutcome {
+    Passed { query: String },
+    Failed(AssertionFailure),
+}
+
+#[derive(Debug)]
+pub struct AssertionFailure {
+    pub query: String,
+    pub expected: Value,
+    pub actual: Value,
+}
+
+/// Parse a JSON test file (validates schema only, not semantic correctness).
+pub fn parse_test_file(path: &Path) -> anyhow::Result<TestFile> {
+    let content = std::fs::read_to_string(path)
+        .map_err(|e| anyhow::anyhow!("Failed to read test file {}: {}", path.display(), e))?;
+    serde_json::from_str(&content)
+        .map_err(|e| anyhow::anyhow!("Failed to parse test file {}: {}", path.display(), e))
+}
+
+/// Recursively discover `*.json` / `*.test.json` files.
+/// Skips entries whose name starts with a non-alphanumeric character.
+pub fn discover_test_files(dir: &Path) -> anyhow::Result<Vec<PathBuf>> {
+    let mut files = Vec::new();
+
+    if !dir.exists() {
+        return Ok(files);
+    }
+
+    discover_recursive(dir, &mut files)?;
+    files.sort();
+    Ok(files)
+}
+
+fn discover_recursive(dir: &Path, files: &mut Vec<PathBuf>) -> anyhow::Result<()> {
+    for entry in std::fs::read_dir(dir)? {
+        let entry = entry?;
+        let path = entry.path();
+        let name = match path.file_name().and_then(|n| n.to_str()) {
+            Some(n) => n,
+            None => continue,
+        };
+
+        if !name.starts_with(|c: char| c.is_alphanumeric()) {
+            continue;
+        }
+
+        if path.is_dir() {
+            discover_recursive(&path, files)?;
+        } else if path.is_file() && (name.ends_with(".test.json") || name.ends_with(".json")) {
+            files.push(path);
+        }
+    }
+
+    Ok(())
+}
diff --git a/gnd/src/commands/test/trigger.rs b/gnd/src/commands/test/trigger.rs
new file mode 100644
index 00000000000..6ac11557678
--- /dev/null
+++ b/gnd/src/commands/test/trigger.rs
@@ -0,0 +1,504 @@
+//! ABI encoding of JSON test triggers into graph-node's Ethereum trigger types.
+//!
+//! For `Transfer(address indexed from, address indexed to, uint256 value)`:
+//! - topic0 = keccak256("Transfer(address,address,uint256)")
+//! - topic1 = left-padded `from` address (indexed)
+//! - topic2 = left-padded `to` address (indexed)
+//! - data = ABI-encoded `value` (non-indexed)
+
+use super::schema::{LogEvent, TestFile};
+use anyhow::{Context, Result, anyhow, ensure};
+use graph::blockchain::block_stream::BlockWithTriggers;
+use graph::components::ethereum::AnyTransactionReceiptBare;
+use graph::prelude::alloy::consensus::{Eip658Value, Receipt, ReceiptWithBloom};
+use graph::prelude::alloy::dyn_abi::{DynSolType, DynSolValue};
+use graph::prelude::alloy::json_abi::Event;
+use graph::prelude::alloy::network::AnyReceiptEnvelope;
+use graph::prelude::alloy::primitives::{Address, B256, Bloom, Bytes, I256, U256, keccak256};
+use graph::prelude::alloy::rpc::types::{Log, TransactionReceipt};
+use graph::prelude::{BlockPtr, LightEthereumBlock};
+use graph_chain_ethereum::Chain;
+use graph_chain_ethereum::chain::BlockFinality;
+use graph_chain_ethereum::trigger::{EthereumBlockTriggerType, EthereumTrigger, LogRef};
+use std::collections::HashMap;
+use std::sync::Arc;
+
+/// Build `BlockWithTriggers` from test blocks, chained by parent hash.
+/// Numbers auto-increment from `start_block` when omitted.
+/// Only logs whose topic0 is in `receipt_required_selectors` get a non-null receipt.
+pub fn build_blocks_with_triggers(
+    test_file: &TestFile,
+    start_block: u64,
+    receipt_required_selectors: &std::collections::HashSet<B256>,
+) -> Result<Vec<BlockWithTriggers<Chain>>> {
+    let mut blocks = Vec::new();
+    let mut current_number = start_block;
+    let mut parent_hash = B256::ZERO;
+
+    for test_block in &test_file.blocks {
+        let number = test_block.number.unwrap_or(current_number);
+
+        let hash = test_block
+            .hash
+            .as_ref()
+            .map(|h| h.parse::<B256>())
+            .transpose()
+            .context("Invalid block hash")?
+            .unwrap_or_else(|| keccak256(number.to_be_bytes()));
+
+        // Default timestamp = block number — avoids chain-specific block times.
+        let timestamp = test_block.timestamp.unwrap_or(number);
+
+        let mut triggers = Vec::new();
+
+        // Pass 1: parse each event into (tx_hash, Arc<Log>).
+        let event_logs: Vec<(B256, Arc<Log>)> = test_block
+            .events
+            .iter()
+            .enumerate()
+            .map(|(i, e)| prepare_event_log(number, hash, i as u64, e))
+            .collect::<Result<_>>()?;
+
+        // Pass 2: build one mock receipt per tx-hash group.
+        let receipts = build_receipts_by_tx(number, hash, &event_logs);
+
+        // Pass 3: one log trigger per event. Receipt only for `receipt: true` handlers.
+        for (tx_hash, full_log) in &event_logs {
+            let needs_receipt = full_log
+                .topics()
+                .first()
+                .is_some_and(|t| receipt_required_selectors.contains(t));
+            let receipt = needs_receipt.then(|| receipts[tx_hash].clone());
+            triggers.push(EthereumTrigger::Log(LogRef::FullLog(
+                full_log.clone(),
+                receipt,
+            )));
+        }
+
+        // Inject Start/End block triggers so `once`, `polling`, and unfiltered handlers fire.
+        ensure!(
+            number <= i32::MAX as u64,
+            "block number {} exceeds i32::MAX",
+            number
+        );
+        let block_ptr = BlockPtr::new(hash.into(), number as i32);
+        triggers.push(EthereumTrigger::Block(
+            block_ptr.clone(),
+            EthereumBlockTriggerType::Start,
+        ));
+        triggers.push(EthereumTrigger::Block(
+            block_ptr,
+            EthereumBlockTriggerType::End,
+        ));
+
+        let block = create_block_with_triggers(number, hash, parent_hash, timestamp, triggers)?;
+        blocks.push(block);
+
+        parent_hash = hash;
+        current_number = number + 1;
+    }
+
+    Ok(blocks)
+}
+
+/// Parse a test event into `(tx_hash, Arc<Log>)`.
+/// tx_hash from the event or generated as `keccak256(block_number || log_index)`.
+fn prepare_event_log(
+    block_number: u64,
+    block_hash: B256,
+    log_index: u64,
+    trigger: &LogEvent,
+) -> Result<(B256, Arc<Log>)> {
+    let address: Address = trigger.address.parse()?;
+
+    let (topics, data) = encode_event_log(&trigger.event, &trigger.params)?;
+
+    // Deterministic tx hash: keccak256(block_number || log_index).
+    let tx_hash = trigger
+        .tx_hash
+        .as_ref()
+        .map(|h| h.parse::<B256>())
+        .transpose()?
+        .unwrap_or_else(|| {
+            keccak256([block_number.to_be_bytes(), log_index.to_be_bytes()].concat())
+        });
+
+    let inner_log = graph::prelude::alloy::primitives::Log {
+        address,
+        data: graph::prelude::alloy::primitives::LogData::new_unchecked(topics, data),
+    };
+
+    let full_log = Arc::new(Log {
+        inner: inner_log,
+        block_hash: Some(block_hash),
+        block_number: Some(block_number),
+        block_timestamp: None,
+        transaction_hash: Some(tx_hash),
+        transaction_index: Some(0),
+        log_index: Some(log_index),
+        removed: false,
+    });
+
+    Ok((tx_hash, full_log))
+}
+
+/// Build one receipt per unique tx_hash. Logs sharing a tx_hash are grouped;
+/// events without an explicit tx_hash each get their own receipt.
+fn build_receipts_by_tx(
+    block_number: u64,
+    block_hash: B256,
+    event_logs: &[(B256, Arc<Log>)],
+) -> HashMap<B256, Arc<AnyTransactionReceiptBare>> {
+    // Collect logs per tx_hash, preserving insertion order for tx_index.
+    let mut tx_order: Vec<B256> = Vec::new();
+    let mut logs_by_tx: HashMap<B256, Vec<Log>> = HashMap::new();
+
+    for (tx_hash, log) in event_logs {
+        let entry = logs_by_tx.entry(*tx_hash).or_insert_with(|| {
+            tx_order.push(*tx_hash);
+            Vec::new()
+        });
+        entry.push((**log).clone());
+    }
+
+    let mut receipts: HashMap<B256, Arc<AnyTransactionReceiptBare>> =
+        HashMap::with_capacity(tx_order.len());
+
+    for (tx_index, tx_hash) in tx_order.into_iter().enumerate() {
+        let logs = logs_by_tx.remove(&tx_hash).unwrap_or_default();
+
+        let core_receipt = Receipt {
+            status: Eip658Value::Eip658(true),
+            cumulative_gas_used: 21_000,
+            logs,
+        };
+
+        let receipt_with_bloom = ReceiptWithBloom::new(core_receipt, Bloom::default());
+
+        let any_envelope = AnyReceiptEnvelope {
+            inner: receipt_with_bloom,
+            r#type: 2,
+        };
+
+        let receipt = TransactionReceipt {
+            transaction_hash: tx_hash,
+            transaction_index: Some(tx_index as u64),
+            block_hash: Some(block_hash),
+            block_number: Some(block_number),
+            gas_used: 21_000,
+            from: Address::ZERO,
+            to: None,
+            effective_gas_price: 0,
+            blob_gas_used: None,
+            blob_gas_price: None,
+            contract_address: None,
+            inner: any_envelope,
+        };
+
+        receipts.insert(tx_hash, Arc::new(receipt));
+    }
+
+    receipts
+}
+
+/// ABI-encode event params into EVM log (topics, data).
+///
+/// topic0 = keccak256 of the canonical signature; indexed params → topics;
+/// non-indexed params → ABI-encoded data.
+pub fn encode_event_log(
+    event_sig: &str,
+    params: &serde_json::Map<String, serde_json::Value>,
+) -> Result<(Vec<B256>, Bytes)> {
+    // Event::parse requires "event " prefix — add if missing.
+    let sig_with_prefix = if event_sig.trim_start().starts_with("event ") {
+        event_sig.to_string()
+    } else {
+        format!("event {}", event_sig)
+    };
+
+    let event = Event::parse(&sig_with_prefix)
+        .map_err(|e| anyhow!("Failed to parse event signature '{}': {:?}", event_sig, e))?;
+
+    let topic0 = event.selector();
+    let mut topics = vec![topic0];
+    let mut data_values = Vec::new();
+
+    for input in &event.inputs {
+        let value = params
+            .get(&input.name)
+            .ok_or_else(|| anyhow!("Missing parameter: {}", input.name))?;
+
+        let sol_type: DynSolType = input
+            .ty
+            .parse()
+            .map_err(|e| anyhow!("Invalid type '{}': {:?}", input.ty, e))?;
+
+        let sol_value = json_to_sol_value(&sol_type, value)?;
+
+        if input.indexed {
+            let topic = sol_value_to_topic(&sol_value)?;
+            topics.push(topic);
+        } else {
+            data_values.push(sol_value);
+        }
+    }
+
+    let data = if data_values.is_empty() {
+        Bytes::new()
+    } else {
+        let tuple = DynSolValue::Tuple(data_values);
+        Bytes::from(tuple.abi_encode_params())
+    };
+
+    Ok((topics, data))
+}
+
+/// Convert a JSON value to the corresponding Solidity type.
+/// Supports: address, uint/int (decimal or hex string), bool, bytes, string, bytes1-32, arrays, tuples.
+pub fn json_to_sol_value(sol_type: &DynSolType, value: &serde_json::Value) -> Result<DynSolValue> {
+    match sol_type {
+        DynSolType::Address => {
+            let s = value
+                .as_str()
+                .ok_or_else(|| anyhow!("Expected string for address"))?;
+            let addr: Address = s.parse().context("Invalid address")?;
+            Ok(DynSolValue::Address(addr))
+        }
+        DynSolType::Uint(bits) => {
+            let n = match value {
+                serde_json::Value::String(s) => {
+                    let (digits, radix) = match s.strip_prefix("0x") {
+                        Some(hex) => (hex, 16),
+                        None => (s.as_str(), 10),
+                    };
+                    U256::from_str_radix(digits, radix).context("Invalid uint")?
+                }
+                // JSON numbers are limited to u64 range — use strings for larger values.
+                serde_json::Value::Number(n) => U256::from(n.as_u64().ok_or_else(|| {
+                    anyhow!("uint value {} does not fit in u64, use a string instead", n)
+                })?),
+                _ => return Err(anyhow!("Expected string or number for uint")),
+            };
+            Ok(DynSolValue::Uint(n, *bits))
+        }
+        DynSolType::Int(bits) => {
+            let n = match value {
+                serde_json::Value::String(s) => {
+                    let (is_neg, s_abs) = match s.strip_prefix('-') {
+                        Some(rest) => (true, rest),
+                        None => (false, s.as_str()),
+                    };
+                    let (digits, radix) = match s_abs.strip_prefix("0x") {
+                        Some(hex) => (hex, 16),
+                        None => (s_abs, 10),
+                    };
+                    let abs = U256::from_str_radix(digits, radix).context("Invalid int")?;
+                    if is_neg { !abs + U256::from(1) } else { abs }
+                }
+                serde_json::Value::Number(n) => {
+                    if let Some(i) = n.as_i64() {
+                        // into_raw() gives the two's complement U256 representation.
+                        // Handles i64::MIN correctly (unlike `-i as u64` which overflows).
+                        I256::try_from(i).unwrap().into_raw()
+                    } else {
+                        U256::from(n.as_u64().ok_or_else(|| {
+                            anyhow!(
+                                "int value {} not representable as u64, use a string instead",
+                                n
+                            )
+                        })?)
+                    }
+                }
+                _ => return Err(anyhow!("Expected string or number for int")),
+            };
+            Ok(DynSolValue::Int(I256::from_raw(n), *bits))
+        }
+        DynSolType::Bool => {
+            let b = value.as_bool().ok_or_else(|| anyhow!("Expected bool"))?;
+            Ok(DynSolValue::Bool(b))
+        }
+        DynSolType::Bytes => {
+            let s = value
+                .as_str()
+                .ok_or_else(|| anyhow!("Expected string for bytes"))?;
+            let hex_str = s.strip_prefix("0x").unwrap_or(s);
+            let bytes = hex::decode(hex_str).context("Invalid hex")?;
+            Ok(DynSolValue::Bytes(bytes))
+        }
+        DynSolType::String => {
+            let s = value.as_str().ok_or_else(|| anyhow!("Expected string"))?;
+            Ok(DynSolValue::String(s.to_string()))
+        }
+        DynSolType::FixedBytes(len) => {
+            let s = value
+                .as_str()
+                .ok_or_else(|| anyhow!("Expected string for bytes{}", len))?;
+            let hex_str = s.strip_prefix("0x").unwrap_or(s);
+            let bytes = hex::decode(hex_str).context("Invalid hex")?;
+            if bytes.len() > *len {
+                return Err(anyhow!(
+                    "bytes{}: got {} bytes, expected at most {}",
+                    len,
+                    bytes.len(),
+                    len
+                ));
+            }
+            // DynSolValue::FixedBytes wraps a full B256 — right-zero-pad.
+            let mut padded = [0u8; 32];
+            padded[..bytes.len()].copy_from_slice(&bytes);
+            Ok(DynSolValue::FixedBytes(B256::from(padded), *len))
+        }
+        DynSolType::Array(inner) => {
+            let arr = value
+                .as_array()
+                .ok_or_else(|| anyhow!("Expected JSON array for array type"))?;
+            let elements: Vec<DynSolValue> = arr
+                .iter()
+                .map(|elem| json_to_sol_value(inner, elem))
+                .collect::<Result<_>>()?;
+            Ok(DynSolValue::Array(elements))
+        }
+        DynSolType::FixedArray(inner, size) => {
+            let arr = value
+                .as_array()
+                .ok_or_else(|| anyhow!("Expected JSON array for fixed array type"))?;
+            ensure!(
+                arr.len() == *size,
+                "Fixed array expects {} elements, got {}",
+                size,
+                arr.len()
+            );
+            let elements: Vec<DynSolValue> = arr
+                .iter()
+                .map(|elem| json_to_sol_value(inner, elem))
+                .collect::<Result<_>>()?;
+            Ok(DynSolValue::FixedArray(elements))
+        }
+        DynSolType::Tuple(types) => {
+            let arr = value
+                .as_array()
+                .ok_or_else(|| anyhow!("Expected JSON array for tuple type (positional)"))?;
+            ensure!(
+                arr.len() == types.len(),
+                "Tuple expects {} elements, got {}",
+                types.len(),
+                arr.len()
+            );
+            let values: Vec<DynSolValue> = types
+                .iter()
+                .zip(arr.iter())
+                .map(|(ty, val)| json_to_sol_value(ty, val))
+                .collect::<Result<_>>()?;
+            Ok(DynSolValue::Tuple(values))
+        }
+        _ => Err(anyhow!("Unsupported type: {:?}", sol_type)),
+    }
+}
+
+/// Encode a Solidity value as a 32-byte EVM log topic.
+fn sol_value_to_topic(value: &DynSolValue) -> Result<B256> {
+    match value {
+        DynSolValue::Address(addr) => {
+            let mut bytes = [0u8; 32];
+            bytes[12..].copy_from_slice(addr.as_slice());
+            Ok(B256::from(bytes))
+        }
+        DynSolValue::Uint(n, _) => Ok(B256::from(*n)),
+        DynSolValue::Int(n, _) => Ok(B256::from(n.into_raw())),
+        DynSolValue::Bool(b) => {
+            let mut bytes = [0u8; 32];
+            if *b {
+                bytes[31] = 1;
+            }
+            Ok(B256::from(bytes))
+        }
+        DynSolValue::FixedBytes(b, _) => Ok(*b),
+        // Dynamic types are hashed per Solidity spec.
+        DynSolValue::Bytes(b) => Ok(keccak256(b)),
+        DynSolValue::String(s) => Ok(keccak256(s.as_bytes())),
+        _ => Err(anyhow!("Cannot convert {:?} to topic", value)),
+    }
+}
+
+/// Create a dummy transaction for block transaction lists.
+/// Graph-node requires matching transactions for log processing.
+fn dummy_transaction(
+    block_number: u64,
+    block_hash: B256,
+    transaction_index: u64,
+    transaction_hash: B256,
+) -> graph::components::ethereum::AnyTransaction {
+    use graph::components::ethereum::AnyTxEnvelope;
+    use graph::prelude::alloy::consensus::transaction::Recovered;
+    use graph::prelude::alloy::consensus::{Signed, TxEnvelope, TxLegacy};
+    use graph::prelude::alloy::primitives::{Address, Signature, U256};
+    use graph::prelude::alloy::rpc::types::Transaction;
+
+    let signed = Signed::new_unchecked(
+        TxLegacy::default(),
+        Signature::new(U256::from(1), U256::from(1), false),
+        transaction_hash,
+    );
+
+    let envelope = AnyTxEnvelope::Ethereum(TxEnvelope::Legacy(signed));
+
+    Transaction {
+        inner: Recovered::new_unchecked(envelope, Address::ZERO),
+        block_hash: Some(block_hash),
+        block_number: Some(block_number),
+        block_timestamp: None,
+        transaction_index: Some(transaction_index),
+        effective_gas_price: None,
+    }
+}
+
+fn create_block_with_triggers(
+    number: u64,
+    hash: B256,
+    parent_hash: B256,
+    timestamp: u64,
+    triggers: Vec<EthereumTrigger>,
+) -> Result<BlockWithTriggers<Chain>> {
+    use graph::components::ethereum::AnyHeader;
+    use graph::prelude::alloy::consensus::Header as ConsensusHeader;
+    use graph::prelude::alloy::rpc::types::{Block, BlockTransactions, Header};
+    use std::collections::HashSet;
+
+    // Collect unique transaction hashes from log triggers.
+    let mut tx_hashes: HashSet<B256> = HashSet::new();
+    for trigger in &triggers {
+        if let EthereumTrigger::Log(LogRef::FullLog(log, _)) = trigger
+            && let Some(tx_hash) = log.transaction_hash
+        {
+            tx_hashes.insert(tx_hash);
+        }
+    }
+
+    let transactions: Vec<_> = tx_hashes
+        .into_iter()
+        .enumerate()
+        .map(|(idx, tx_hash)| dummy_transaction(number, hash, idx as u64, tx_hash))
+        .collect();
+
+    let alloy_block = Block::empty(Header {
+        hash,
+        inner: AnyHeader::from(ConsensusHeader {
+            number,
+            parent_hash,
+            timestamp,
+            ..Default::default()
+        }),
+        total_difficulty: None,
+        size: None,
+    })
+    .with_transactions(BlockTransactions::Full(transactions));
+
+    let light_block = LightEthereumBlock::new(alloy_block);
+    let finality_block = BlockFinality::Final(Arc::new(light_block));
+
+    Ok(BlockWithTriggers::new(
+        finality_block,
+        triggers,
+        &graph::log::logger(false),
+    ))
+}
diff --git a/gnd/src/compiler/asc.rs b/gnd/src/compiler/asc.rs
new file mode 100644
index 00000000000..821adba699c
--- /dev/null
+++ b/gnd/src/compiler/asc.rs
@@ -0,0 +1,276 @@
+//! AssemblyScript compiler wrapper.
+//!
+//! This module provides a wrapper around the `asc` (AssemblyScript compiler)
+//! command-line tool for compiling subgraph mappings to WebAssembly.
+
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use anyhow::{Context, Result, anyhow};
+
+/// Options for compiling an AssemblyScript file.
+#[derive(Debug, Clone)]
+pub struct AscCompileOptions {
+    /// The input TypeScript/AssemblyScript file to compile.
+    pub input_file: PathBuf,
+    /// The base directory for resolving imports.
+    pub base_dir: PathBuf,
+    /// Comma-separated list of library directories (node_modules paths).
+    pub libs: String,
+    /// Path to the graph-ts global.ts file.
+    pub global_file: PathBuf,
+    /// Output file path.
+    pub output_file: PathBuf,
+    /// Output format: "wasm" or "wast".
+    pub output_format: String,
+    /// Skip the asc version check (use with caution).
+    pub skip_version_check: bool,
+}
+
+/// The required AssemblyScript compiler version.
+/// gnd functionality is very sensitive to asc version changes.
+const REQUIRED_ASC_VERSION: &str = "0.19.23";
+
+/// Compile an AssemblyScript mapping file to WebAssembly.
+///
+/// This shells out to the `asc` command-line tool with the appropriate flags
+/// to match the graph-cli behavior.
+///
+/// Requires asc version 0.19.23 to be installed.
+pub fn compile_mapping(options: &AscCompileOptions) -> Result<()> {
+    // Resolve the asc binary, checking global PATH and local node_modules/.bin
+    let asc_bin = find_asc_binary(&options.base_dir).ok_or_else(|| {
+        anyhow!(
+            "AssemblyScript compiler (asc) not found. Install it with:\n  \
+             npm install -g assemblyscript@{REQUIRED_ASC_VERSION}\n  \
+             or locally:\n  \
+             npm install --save-dev assemblyscript@{REQUIRED_ASC_VERSION}"
+        )
+    })?;
+
+    // Check version unless explicitly skipped
+    if !options.skip_version_check {
+        let version = get_asc_version(&asc_bin)?;
+        if version != REQUIRED_ASC_VERSION {
+            return Err(anyhow!(
+                "AssemblyScript compiler version mismatch: found {}, required {}.\n  \
+                 Please install the correct version with:\n  \
+                 npm install -g assemblyscript@{REQUIRED_ASC_VERSION}\n\n  \
+                 If you know what you're doing, use --skip-asc-version-check or set GND_SKIP_ASC_VERSION_CHECK=1 to bypass this check.",
+                version,
+                REQUIRED_ASC_VERSION
+            ));
+        }
+    }
+
+    // Determine input and output paths relative to base_dir
+    let input_rel = options
+        .input_file
+        .strip_prefix(&options.base_dir)
+        .unwrap_or(&options.input_file);
+    let global_rel = options
+        .global_file
+        .strip_prefix(&options.base_dir)
+        .unwrap_or(&options.global_file);
+    let output_rel = options
+        .output_file
+        .strip_prefix(&options.base_dir)
+        .unwrap_or(&options.output_file);
+
+    // Build the asc command
+    let mut cmd = Command::new(&asc_bin);
+
+    // Add compiler flags matching graph-cli behavior
+    cmd.arg("--explicitStart")
+        .arg("--exportRuntime")
+        .arg("--runtime")
+        .arg("stub")
+        .arg(input_rel)
+        .arg(global_rel)
+        .arg("--baseDir")
+        .arg(&options.base_dir)
+        .arg("--lib")
+        .arg(&options.libs)
+        .arg("--outFile")
+        .arg(output_rel)
+        .arg("--optimize")
+        .arg("--debug");
+
+    // Set working directory
+    cmd.current_dir(&options.base_dir);
+
+    // Execute the compiler
+    let output = cmd
+        .output()
+        .context("Failed to execute AssemblyScript compiler (asc). Is it installed?")?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+
+        let error_msg = if !stderr.is_empty() {
+            stderr.to_string()
+        } else if !stdout.is_empty() {
+            stdout.to_string()
+        } else {
+            "Unknown compilation error".to_string()
+        };
+
+        return Err(anyhow!(
+            "AssemblyScript compilation failed for {}:\n{}",
+            options.input_file.display(),
+            error_msg
+        ));
+    }
+
+    Ok(())
+}
+
+/// Find the graph-ts package in node_modules.
+///
+/// Searches upward from `source_dir` looking for `node_modules/@graphprotocol/graph-ts`.
+/// Returns the paths needed for compilation:
+/// - List of node_modules directories (for --lib flag)
+/// - Path to global/global.ts
+pub fn find_graph_ts(source_dir: &Path) -> Result<(Vec<PathBuf>, PathBuf)> {
+    let mut lib_dirs = Vec::new();
+    let mut graph_ts_dir: Option<PathBuf> = None;
+
+    let mut current = source_dir.canonicalize().ok();
+
+    while let Some(dir) = current {
+        let node_modules = dir.join("node_modules");
+
+        if node_modules.exists() {
+            lib_dirs.push(node_modules.clone());
+
+            // Check if this node_modules has graph-ts
+            let graph_ts_path = node_modules.join("@graphprotocol").join("graph-ts");
+
+            if graph_ts_path.exists() && graph_ts_dir.is_none() {
+                graph_ts_dir = Some(graph_ts_path);
+            }
+        }
+
+        // Move up to parent directory
+        current = dir.parent().map(|p| p.to_path_buf());
+    }
+
+    if lib_dirs.is_empty() {
+        return Err(anyhow!(
+            "Could not locate `node_modules` in parent directories of subgraph manifest"
+        ));
+    }
+
+    let graph_ts = graph_ts_dir.ok_or_else(|| {
+        anyhow!(
+            "Could not locate `@graphprotocol/graph-ts` package in parent directories of subgraph manifest"
+        )
+    })?;
+
+    let global_file = graph_ts.join("global").join("global.ts");
+    if !global_file.exists() {
+        return Err(anyhow!(
+            "Could not find global.ts in graph-ts package at {}",
+            graph_ts.display()
+        ));
+    }
+
+    Ok((lib_dirs, global_file))
+}
+
+/// Find the `asc` binary by checking the global PATH first, then the project's
+/// root `node_modules/.bin/asc`.
+pub fn find_asc_binary(base_dir: &Path) -> Option<PathBuf> {
+    // Check global PATH first
+    if Command::new("asc")
+        .arg("--version")
+        .output()
+        .map(|o| o.status.success())
+        .unwrap_or(false)
+    {
+        return Some(PathBuf::from("asc"));
+    }
+
+    // Backward compatibility with graph-cli: check local node_modules/.bin/asc
+    let local_asc = base_dir.join("node_modules").join(".bin").join("asc");
+    if local_asc.exists() {
+        return Some(local_asc);
+    }
+
+    None
+}
+
+/// Get the asc compiler version.
+fn get_asc_version(asc_bin: &Path) -> Result<String> {
+    let output = Command::new(asc_bin)
+        .arg("--version")
+        .output()
+        .context("Failed to execute asc --version")?;
+
+    if !output.status.success() {
+        return Err(anyhow!("asc --version failed"));
+    }
+
+    // Output is "Version X.Y.Z", extract just the version number
+    let version_output = String::from_utf8_lossy(&output.stdout);
+    let version = version_output
+        .trim()
+        .strip_prefix("Version ")
+        .unwrap_or(version_output.trim())
+        .to_string();
+    Ok(version)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_find_graph_ts_not_found() {
+        let temp_dir = TempDir::new().unwrap();
+        let result = find_graph_ts(temp_dir.path());
+        assert!(result.is_err());
+        assert!(result.unwrap_err().to_string().contains("node_modules"));
+    }
+
+    #[test]
+    fn test_find_graph_ts_found() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create the graph-ts directory structure
+        let graph_ts_dir = temp_dir
+            .path()
+            .join("node_modules")
+            .join("@graphprotocol")
+            .join("graph-ts")
+            .join("global");
+        std::fs::create_dir_all(&graph_ts_dir).unwrap();
+        std::fs::write(graph_ts_dir.join("global.ts"), "// global").unwrap();
+
+        let (lib_dirs, global_file) = find_graph_ts(temp_dir.path()).unwrap();
+
+        assert_eq!(lib_dirs.len(), 1);
+        assert!(lib_dirs[0].ends_with("node_modules"));
+        assert!(global_file.ends_with("global.ts"));
+    }
+
+    #[test]
+    fn test_asc_version_check() {
+        // Skip if asc is not installed
+        let temp_dir = TempDir::new().unwrap();
+        let asc_bin = match find_asc_binary(temp_dir.path()) {
+            Some(bin) => bin,
+            None => return,
+        };
+
+        let version = get_asc_version(&asc_bin).unwrap();
+        // Version should be a semver-like string (e.g., "0.19.23")
+        assert!(
+            version.split('.').count() >= 2,
+            "Version '{}' doesn't look like a semver",
+            version
+        );
+    }
+}
diff --git a/gnd/src/compiler/mod.rs b/gnd/src/compiler/mod.rs
new file mode 100644
index 00000000000..0c80a4aec89
--- /dev/null
+++ b/gnd/src/compiler/mod.rs
@@ -0,0 +1,8 @@
+//! Compiler module for building subgraph mappings.
+//!
+//! This module provides functionality to compile AssemblyScript mappings
+//! to WebAssembly using the AssemblyScript compiler (asc).
+
+mod asc;
+
+pub use asc::{AscCompileOptions, compile_mapping, find_asc_binary, find_graph_ts};
diff --git a/gnd/src/config/mod.rs b/gnd/src/config/mod.rs
new file mode 100644
index 00000000000..38b57baf6b4
--- /dev/null
+++ b/gnd/src/config/mod.rs
@@ -0,0 +1,13 @@
+//! Configuration file handling for gnd.
+//!
+//! This module provides parsers and utilities for various configuration files
+//! used by the gnd CLI:
+//!
+//! - `networks.json` - Network-specific contract addresses and start blocks
+
+pub mod networks;
+
+pub use networks::{
+    DataSourceNetworkConfig, NetworkConfig, NetworksConfig, apply_network_config,
+    get_network_config, init_networks_config, load_networks_config, update_networks_file,
+};
diff --git a/gnd/src/config/networks.rs b/gnd/src/config/networks.rs
new file mode 100644
index 00000000000..667d72745aa
--- /dev/null
+++ b/gnd/src/config/networks.rs
@@ -0,0 +1,543 @@
+//! Network configuration parsing for subgraph deployments.
+//!
+//! This module handles parsing and applying networks.json configuration files,
+//! which allow deploying the same subgraph to different networks with
+//! network-specific contract addresses and start blocks.
+
+use std::collections::HashMap;
+use std::fs;
+use std::path::Path;
+
+use anyhow::{Context, Result, anyhow};
+use serde::{Deserialize, Serialize};
+
+/// Network-specific configuration for a data source.
+///
+/// Contains the contract address and optional start block for a specific
+/// data source on a specific network.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DataSourceNetworkConfig {
+    /// Contract address (with or without 0x prefix)
+    pub address: Option<String>,
+
+    /// Block number to start indexing from
+    #[serde(rename = "startBlock")]
+    pub start_block: Option<u64>,
+}
+
+/// Configuration for a specific network.
+///
+/// Maps data source names to their network-specific configuration.
+pub type NetworkConfig = HashMap<String, DataSourceNetworkConfig>;
+
+/// Complete networks configuration file.
+///
+/// Maps network names to their configuration.
+pub type NetworksConfig = HashMap<String, NetworkConfig>;
+
+/// Load a networks.json configuration file.
+///
+/// # Arguments
+/// * `path` - Path to the networks.json file
+///
+/// # Returns
+/// The parsed networks configuration, or an error if the file doesn't exist
+/// or is malformed.
+pub fn load_networks_config(path: &Path) -> Result<NetworksConfig> {
+    let content = fs::read_to_string(path)
+        .with_context(|| format!("Failed to read networks config from {}", path.display()))?;
+
+    serde_json::from_str(&content)
+        .with_context(|| format!("Failed to parse networks config from {}", path.display()))
+}
+
+/// Get configuration for a specific network.
+///
+/// # Arguments
+/// * `config` - The full networks configuration
+/// * `network` - The network name to look up
+///
+/// # Returns
+/// The network configuration, or an error if the network is not found.
+pub fn get_network_config<'a>(
+    config: &'a NetworksConfig,
+    network: &str,
+) -> Result<&'a NetworkConfig> {
+    config
+        .get(network)
+        .ok_or_else(|| anyhow!("Network '{}' was not found in networks config", network))
+}
+
+/// Apply network configuration to a manifest YAML.
+///
+/// Updates data source addresses and start blocks based on the network configuration.
+///
+/// # Arguments
+/// * `manifest` - Mutable reference to the parsed manifest YAML
+/// * `network` - The target network name
+/// * `network_config` - Configuration for the target network
+///
+/// # Returns
+/// Ok(()) on success, or an error if a data source is missing from the config.
+pub fn apply_network_config(
+    manifest: &mut serde_yaml::Value,
+    network: &str,
+    network_config: &NetworkConfig,
+) -> Result<()> {
+    // Update data sources
+    if let Some(data_sources) = manifest.get_mut("dataSources")
+        && let Some(arr) = data_sources.as_sequence_mut()
+    {
+        for ds in arr.iter_mut() {
+            update_data_source(ds, network, network_config)?;
+        }
+    }
+
+    // Update templates to use the same network
+    if let Some(templates) = manifest.get_mut("templates")
+        && let Some(arr) = templates.as_sequence_mut()
+    {
+        for template in arr.iter_mut() {
+            if let Some(mapping) = template.as_mapping_mut() {
+                mapping.insert(
+                    serde_yaml::Value::String("network".to_string()),
+                    serde_yaml::Value::String(network.to_string()),
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
+/// Update a single data source with network configuration.
+fn update_data_source(
+    ds: &mut serde_yaml::Value,
+    network: &str,
+    network_config: &NetworkConfig,
+) -> Result<()> {
+    // Get data source name
+    let ds_name = ds
+        .get("name")
+        .and_then(|n| n.as_str())
+        .ok_or_else(|| anyhow!("Data source missing 'name' field"))?
+        .to_string();
+
+    // Look up config for this data source
+    let ds_config = network_config.get(&ds_name).ok_or_else(|| {
+        anyhow!(
+            "'{}' was not found in the '{}' network configuration",
+            ds_name,
+            network
+        )
+    })?;
+
+    // Update network field
+    if let Some(mapping) = ds.as_mapping_mut() {
+        mapping.insert(
+            serde_yaml::Value::String("network".to_string()),
+            serde_yaml::Value::String(network.to_string()),
+        );
+    }
+
+    // Update source section
+    if let Some(source) = ds.get_mut("source") {
+        // Preserve existing ABI reference if present
+        let abi = source.get("abi").cloned();
+
+        // Clear and rebuild source
+        if let Some(mapping) = source.as_mapping_mut() {
+            mapping.clear();
+
+            // Restore ABI if it existed
+            if let Some(abi_value) = abi {
+                mapping.insert(serde_yaml::Value::String("abi".to_string()), abi_value);
+            }
+
+            // Add address if configured
+            if let Some(address) = &ds_config.address {
+                mapping.insert(
+                    serde_yaml::Value::String("address".to_string()),
+                    serde_yaml::Value::String(address.clone()),
+                );
+            }
+
+            // Add start block if configured
+            if let Some(start_block) = ds_config.start_block {
+                mapping.insert(
+                    serde_yaml::Value::String("startBlock".to_string()),
+                    serde_yaml::Value::Number(start_block.into()),
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
+/// Initialize a networks.json file from an existing manifest.
+///
+/// Creates a networks.json with the current network configuration
+/// extracted from the manifest's data sources.
+///
+/// # Arguments
+/// * `manifest_path` - Path to the subgraph.yaml manifest
+/// * `output_path` - Path to write the networks.json file
+pub fn init_networks_config(manifest_path: &Path, output_path: &Path) -> Result<()> {
+    let content = fs::read_to_string(manifest_path)
+        .with_context(|| format!("Failed to read manifest from {}", manifest_path.display()))?;
+
+    let manifest: serde_yaml::Value = serde_yaml::from_str(&content)
+        .with_context(|| format!("Failed to parse manifest from {}", manifest_path.display()))?;
+
+    let mut networks_config: NetworksConfig = HashMap::new();
+
+    // Extract configuration from data sources
+    if let Some(data_sources) = manifest.get("dataSources").and_then(|ds| ds.as_sequence()) {
+        for ds in data_sources {
+            let name = ds.get("name").and_then(|n| n.as_str()).unwrap_or("unknown");
+            let network = ds
+                .get("network")
+                .and_then(|n| n.as_str())
+                .unwrap_or("mainnet");
+
+            let address = ds
+                .get("source")
+                .and_then(|s| s.get("address"))
+                .and_then(|a| a.as_str())
+                .map(String::from);
+
+            let start_block = ds
+                .get("source")
+                .and_then(|s| s.get("startBlock"))
+                .and_then(|b| b.as_u64());
+
+            let ds_config = DataSourceNetworkConfig {
+                address,
+                start_block,
+            };
+
+            networks_config
+                .entry(network.to_string())
+                .or_default()
+                .insert(name.to_string(), ds_config);
+        }
+    }
+
+    // Write the networks.json file
+    let json = serde_json::to_string_pretty(&networks_config)
+        .context("Failed to serialize networks config")?;
+
+    fs::write(output_path, json).with_context(|| {
+        format!(
+            "Failed to write networks config to {}",
+            output_path.display()
+        )
+    })?;
+
+    Ok(())
+}
+
+/// Update the networks.json file with a new data source entry.
+///
+/// # Arguments
+/// * `networks_path` - Path to the networks.json file
+/// * `network` - Network name
+/// * `data_source` - Data source name
+/// * `address` - Contract address
+/// * `start_block` - Optional start block
+pub fn update_networks_file(
+    networks_path: &Path,
+    network: &str,
+    data_source: &str,
+    address: &str,
+    start_block: Option<u64>,
+) -> Result<()> {
+    // Load existing config or create new
+    let mut config: NetworksConfig = if networks_path.exists() {
+        load_networks_config(networks_path)?
+    } else {
+        HashMap::new()
+    };
+
+    // Update or create entry
+    let ds_config = DataSourceNetworkConfig {
+        address: Some(address.to_string()),
+        start_block,
+    };
+
+    config
+        .entry(network.to_string())
+        .or_default()
+        .insert(data_source.to_string(), ds_config);
+
+    // Write back
+    let json =
+        serde_json::to_string_pretty(&config).context("Failed to serialize networks config")?;
+
+    fs::write(networks_path, json).with_context(|| {
+        format!(
+            "Failed to write networks config to {}",
+            networks_path.display()
+        )
+    })?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_load_networks_config() {
+        let temp_dir = TempDir::new().unwrap();
+        let path = temp_dir.path().join("networks.json");
+
+        let config = r#"{
+            "mainnet": {
+                "Token": {
+                    "address": "0x1234567890123456789012345678901234567890",
+                    "startBlock": 12345678
+                }
+            },
+            "goerli": {
+                "Token": {
+                    "address": "0x0987654321098765432109876543210987654321",
+                    "startBlock": 100
+                }
+            }
+        }"#;
+
+        fs::write(&path, config).unwrap();
+
+        let loaded = load_networks_config(&path).unwrap();
+
+        assert!(loaded.contains_key("mainnet"));
+        assert!(loaded.contains_key("goerli"));
+
+        let mainnet = &loaded["mainnet"];
+        let token = &mainnet["Token"];
+        assert_eq!(
+            token.address,
+            Some("0x1234567890123456789012345678901234567890".to_string())
+        );
+        assert_eq!(token.start_block, Some(12345678));
+    }
+
+    #[test]
+    fn test_load_networks_config_missing_optional_fields() {
+        let temp_dir = TempDir::new().unwrap();
+        let path = temp_dir.path().join("networks.json");
+
+        let config = r#"{
+            "mainnet": {
+                "Token": {
+                    "address": "0x1234567890123456789012345678901234567890"
+                }
+            }
+        }"#;
+
+        fs::write(&path, config).unwrap();
+
+        let loaded = load_networks_config(&path).unwrap();
+        let token = &loaded["mainnet"]["Token"];
+
+        assert_eq!(
+            token.address,
+            Some("0x1234567890123456789012345678901234567890".to_string())
+        );
+        assert_eq!(token.start_block, None);
+    }
+
+    #[test]
+    fn test_get_network_config() {
+        let mut config = NetworksConfig::new();
+        let mut mainnet = NetworkConfig::new();
+        mainnet.insert(
+            "Token".to_string(),
+            DataSourceNetworkConfig {
+                address: Some("0x123".to_string()),
+                start_block: Some(100),
+            },
+        );
+        config.insert("mainnet".to_string(), mainnet);
+
+        assert!(get_network_config(&config, "mainnet").is_ok());
+        assert!(get_network_config(&config, "goerli").is_err());
+    }
+
+    #[test]
+    fn test_apply_network_config() {
+        let manifest_yaml = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+      address: "0x0000000000000000000000000000000000000000"
+      startBlock: 0
+    mapping:
+      kind: ethereum/events
+      file: ./src/mapping.ts
+templates:
+  - kind: ethereum/contract
+    name: DynamicToken
+    network: mainnet
+"#;
+
+        let mut manifest: serde_yaml::Value = serde_yaml::from_str(manifest_yaml).unwrap();
+
+        let mut network_config = NetworkConfig::new();
+        network_config.insert(
+            "Token".to_string(),
+            DataSourceNetworkConfig {
+                address: Some("0x1234567890123456789012345678901234567890".to_string()),
+                start_block: Some(12345678),
+            },
+        );
+
+        apply_network_config(&mut manifest, "goerli", &network_config).unwrap();
+
+        // Check data source was updated
+        let ds = &manifest["dataSources"][0];
+        assert_eq!(ds["network"].as_str(), Some("goerli"));
+        assert_eq!(
+            ds["source"]["address"].as_str(),
+            Some("0x1234567890123456789012345678901234567890")
+        );
+        assert_eq!(ds["source"]["startBlock"].as_u64(), Some(12345678));
+        // ABI should be preserved
+        assert_eq!(ds["source"]["abi"].as_str(), Some("ERC20"));
+
+        // Check template was updated
+        let template = &manifest["templates"][0];
+        assert_eq!(template["network"].as_str(), Some("goerli"));
+    }
+
+    #[test]
+    fn test_apply_network_config_missing_data_source() {
+        let manifest_yaml = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      address: "0x0000000000000000000000000000000000000000"
+"#;
+
+        let mut manifest: serde_yaml::Value = serde_yaml::from_str(manifest_yaml).unwrap();
+
+        // Network config with different data source name
+        let mut network_config = NetworkConfig::new();
+        network_config.insert(
+            "OtherContract".to_string(),
+            DataSourceNetworkConfig {
+                address: Some("0x123".to_string()),
+                start_block: None,
+            },
+        );
+
+        let result = apply_network_config(&mut manifest, "goerli", &network_config);
+        assert!(result.is_err());
+        assert!(result.unwrap_err().to_string().contains("Token"));
+    }
+
+    #[test]
+    fn test_init_networks_config() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+        let networks_path = temp_dir.path().join("networks.json");
+
+        let manifest = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      address: "0x1234567890123456789012345678901234567890"
+      startBlock: 12345678
+  - kind: ethereum/contract
+    name: Factory
+    network: mainnet
+    source:
+      address: "0xabcdef0123456789abcdef0123456789abcdef01"
+      startBlock: 12340000
+"#;
+
+        fs::write(&manifest_path, manifest).unwrap();
+        init_networks_config(&manifest_path, &networks_path).unwrap();
+
+        let loaded = load_networks_config(&networks_path).unwrap();
+        assert!(loaded.contains_key("mainnet"));
+
+        let mainnet = &loaded["mainnet"];
+        assert!(mainnet.contains_key("Token"));
+        assert!(mainnet.contains_key("Factory"));
+
+        let token = &mainnet["Token"];
+        assert_eq!(
+            token.address,
+            Some("0x1234567890123456789012345678901234567890".to_string())
+        );
+        assert_eq!(token.start_block, Some(12345678));
+    }
+
+    #[test]
+    fn test_update_networks_file_new() {
+        let temp_dir = TempDir::new().unwrap();
+        let networks_path = temp_dir.path().join("networks.json");
+
+        update_networks_file(
+            &networks_path,
+            "mainnet",
+            "Token",
+            "0x1234567890123456789012345678901234567890",
+            Some(100),
+        )
+        .unwrap();
+
+        let loaded = load_networks_config(&networks_path).unwrap();
+        let token = &loaded["mainnet"]["Token"];
+        assert_eq!(
+            token.address,
+            Some("0x1234567890123456789012345678901234567890".to_string())
+        );
+        assert_eq!(token.start_block, Some(100));
+    }
+
+    #[test]
+    fn test_update_networks_file_existing() {
+        let temp_dir = TempDir::new().unwrap();
+        let networks_path = temp_dir.path().join("networks.json");
+
+        // Create initial config
+        let initial = r#"{
+            "mainnet": {
+                "Token": {
+                    "address": "0x0000000000000000000000000000000000000000"
+                }
+            }
+        }"#;
+        fs::write(&networks_path, initial).unwrap();
+
+        // Update with new data source
+        update_networks_file(
+            &networks_path,
+            "mainnet",
+            "Factory",
+            "0x1111111111111111111111111111111111111111",
+            None,
+        )
+        .unwrap();
+
+        let loaded = load_networks_config(&networks_path).unwrap();
+        assert!(loaded["mainnet"].contains_key("Token"));
+        assert!(loaded["mainnet"].contains_key("Factory"));
+    }
+}
diff --git a/gnd/src/formatter.rs b/gnd/src/formatter.rs
new file mode 100644
index 00000000000..58947e15519
--- /dev/null
+++ b/gnd/src/formatter.rs
@@ -0,0 +1,152 @@
+//! Code formatting utilities.
+//!
+//! This module provides formatting for generated TypeScript/AssemblyScript code
+//! using Prettier.
+
+use std::io::Write;
+use std::process::{Command, Stdio};
+
+use anyhow::{Context, Result, bail};
+
+/// Format TypeScript/AssemblyScript code using Prettier.
+///
+/// Returns the formatted code, or an error if formatting fails.
+/// Use `try_format_typescript` for graceful fallback.
+pub fn format_typescript(code: &str) -> Result<String> {
+    format_with_prettier(code, "typescript")
+}
+
+/// Format TypeScript/AssemblyScript code using Prettier.
+///
+/// If Prettier is not available or fails, the code is returned unformatted.
+pub fn try_format_typescript(code: &str) -> String {
+    match format_with_prettier(code, "typescript") {
+        Ok(formatted) => formatted,
+        Err(_) => code.to_string(),
+    }
+}
+
+/// Format code using Prettier with the specified parser.
+fn format_with_prettier(code: &str, parser: &str) -> Result<String> {
+    // Try npx prettier first (most common setup)
+    let result = run_prettier_command(code, parser, "npx", &["prettier", "--stdin-filepath"]);
+    if result.is_ok() {
+        return result;
+    }
+
+    // Try pnpx prettier
+    let result = run_prettier_command(code, parser, "pnpx", &["prettier", "--stdin-filepath"]);
+    if result.is_ok() {
+        return result;
+    }
+
+    // Try global prettier installation
+    run_prettier_command(code, parser, "prettier", &["--stdin-filepath"])
+}
+
+/// Run prettier command with the given program and arguments.
+fn run_prettier_command(code: &str, parser: &str, program: &str, args: &[&str]) -> Result<String> {
+    // Build command with stdin-filepath to hint the parser
+    let filepath = format!("file.{}", parser_to_extension(parser));
+
+    let mut cmd = Command::new(program);
+    for arg in args {
+        cmd.arg(arg);
+    }
+    cmd.arg(&filepath);
+
+    cmd.stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+
+    let mut child = cmd.spawn().context("Failed to spawn prettier process")?;
+
+    // Write code to stdin
+    if let Some(mut stdin) = child.stdin.take() {
+        stdin
+            .write_all(code.as_bytes())
+            .context("Failed to write to prettier stdin")?;
+    }
+
+    let output = child
+        .wait_with_output()
+        .context("Failed to read prettier output")?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        bail!("Prettier failed: {}", stderr);
+    }
+
+    String::from_utf8(output.stdout).context("Prettier output is not valid UTF-8")
+}
+
+/// Convert parser name to file extension.
+fn parser_to_extension(parser: &str) -> &str {
+    match parser {
+        "typescript" => "ts",
+        "json" => "json",
+        "yaml" => "yaml",
+        _ => "ts",
+    }
+}
+
+/// Check if Prettier is available on the system.
+pub fn is_prettier_available() -> bool {
+    // Check npx
+    if Command::new("npx")
+        .args(["prettier", "--version"])
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+        .map(|s| s.success())
+        .unwrap_or(false)
+    {
+        return true;
+    }
+
+    // Check pnpx
+    if Command::new("pnpx")
+        .args(["prettier", "--version"])
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+        .map(|s| s.success())
+        .unwrap_or(false)
+    {
+        return true;
+    }
+
+    // Check global prettier
+    Command::new("prettier")
+        .arg("--version")
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .status()
+        .map(|s| s.success())
+        .unwrap_or(false)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parser_to_extension() {
+        assert_eq!(parser_to_extension("typescript"), "ts");
+        assert_eq!(parser_to_extension("json"), "json");
+        assert_eq!(parser_to_extension("yaml"), "yaml");
+        assert_eq!(parser_to_extension("unknown"), "ts");
+    }
+
+    #[test]
+    fn test_format_typescript_graceful_fallback() {
+        // Even if prettier is not installed, format_typescript should return
+        // the original code without error
+        let code = "export class Foo { }";
+        let result = format_typescript(code);
+        assert!(result.is_ok());
+        // Result should either be formatted or the original code
+        let formatted = result.unwrap();
+        assert!(formatted.contains("class Foo") || formatted.contains("Foo"));
+    }
+}
diff --git a/gnd/src/lib.rs b/gnd/src/lib.rs
index 887d28c69de..ba5ba2c1147 100644
--- a/gnd/src/lib.rs
+++ b/gnd/src/lib.rs
@@ -1 +1,16 @@
+pub mod abi;
+pub mod codegen;
+pub mod commands;
+pub mod compiler;
+pub mod config;
+pub mod formatter;
+pub mod manifest;
+pub mod migrations;
+pub mod output;
+pub mod prompt;
+pub mod scaffold;
+pub mod services;
+pub mod shared;
+pub mod validation;
+pub mod watch;
 pub mod watcher;
diff --git a/gnd/src/main.rs b/gnd/src/main.rs
index fc79c707310..092674e5da0 100644
--- a/gnd/src/main.rs
+++ b/gnd/src/main.rs
@@ -1,310 +1,126 @@
-use std::{path::Path, sync::Arc};
+use std::ffi::OsString;
+use std::io;
+use std::process::Command;
 
-use anyhow::{Context, Result};
-use clap::Parser;
+use anyhow::{Result, bail};
+use clap::{CommandFactory, Parser, Subcommand, ValueEnum};
+use clap_complete::{Shell, generate};
 use git_testament::{git_testament, render_testament};
-use graph::{
-    components::link_resolver::FileLinkResolver,
-    env::EnvVars,
-    log::logger,
-    prelude::{CheapClone, DeploymentHash, LinkResolver, SubgraphName},
-    slog::{error, info, Logger},
-};
-use graph_core::polling_monitor::ipfs_service;
-use graph_node::{launcher, opt::Opt};
+use graph::log::logger;
 use lazy_static::lazy_static;
-use tokio::{self, sync::mpsc};
 use tokio_util::sync::CancellationToken;
 
-use gnd::watcher::{deploy_all_subgraphs, parse_manifest_args, watch_subgraphs};
-
-#[cfg(unix)]
-use pgtemp::{PgTempDB, PgTempDBBuilder};
-
-// Add an alias for the temporary Postgres DB handle. On non unix
-// targets we don't have pgtemp, but we still need the type to satisfy the
-// function signatures.
-#[cfg(unix)]
-type TempPgDB = PgTempDB;
-#[cfg(not(unix))]
-type TempPgDB = ();
+use gnd::commands::{
+    AddOpt, AuthOpt, BuildOpt, CleanOpt, CodegenOpt, CreateOpt, DeployOpt, DevOpt, InitOpt,
+    PublishOpt, RemoveOpt, TestOpt, run_add, run_auth, run_build, run_clean, run_codegen,
+    run_create, run_deploy, run_dev, run_init, run_publish, run_remove, run_test,
+};
 
 git_testament!(TESTAMENT);
 lazy_static! {
     static ref RENDERED_TESTAMENT: String = render_testament!(TESTAMENT);
+    static ref VERSION_STRING: String = format!(
+        "{} (graph-cli compatible: {})",
+        RENDERED_TESTAMENT.as_str(),
+        GRAPH_CLI_COMPAT_VERSION
+    );
+    static ref LONG_VERSION_STRING: String = format!(
+        "{}\ngraph-cli compatibility version: {}",
+        RENDERED_TESTAMENT.as_str(),
+        GRAPH_CLI_COMPAT_VERSION
+    );
 }
 
-#[derive(Clone, Debug, Parser)]
+/// The version of graph-cli that gnd emulates
+const GRAPH_CLI_COMPAT_VERSION: &str = "0.98.1";
+
+#[derive(Parser)]
 #[clap(
     name = "gnd",
-    about = "Graph Node Dev",
+    about = "Graph Node Dev - A drop-in replacement for graph-cli",
     author = "Graph Protocol, Inc.",
-    version = RENDERED_TESTAMENT.as_str()
+    version = VERSION_STRING.as_str(),
+    long_version = LONG_VERSION_STRING.as_str(),
 )]
-pub struct DevOpt {
-    #[clap(
-        long,
-        help = "Start a graph-node in dev mode watching a build directory for changes"
-    )]
-    pub watch: bool,
-
-    #[clap(
-        long,
-        value_name = "MANIFEST:[BUILD_DIR]",
-        help = "The location of the subgraph manifest file. If no build directory is provided, the default is 'build'. The file can be an alias, in the format '[BUILD_DIR:]manifest' where 'manifest' is the path to the manifest file, and 'BUILD_DIR' is the path to the build directory relative to the manifest file.",
-        default_value = "./subgraph.yaml",
-        value_delimiter = ','
-    )]
-    pub manifests: Vec<String>,
-
-    #[clap(
-        long,
-        value_name = "ALIAS:MANIFEST:[BUILD_DIR]",
-        value_delimiter = ',',
-        help = "The location of the source subgraph manifest files. This is used to resolve aliases in the manifest files for subgraph data sources. The format is ALIAS:MANIFEST:[BUILD_DIR], where ALIAS is the alias name, BUILD_DIR is the build directory relative to the manifest file, and MANIFEST is the manifest file location."
-    )]
-    pub sources: Vec<String>,
-
-    #[clap(
-        long,
-        help = "The location of the database directory.",
-        default_value = "./build"
-    )]
-    pub database_dir: String,
-
-    #[clap(
-        long,
-        value_name = "URL",
-        env = "POSTGRES_URL",
-        help = "Location of the Postgres database used for storing entities"
-    )]
-    pub postgres_url: Option<String>,
-
-    #[clap(
-        long,
-        allow_negative_numbers = false,
-        value_name = "NETWORK_NAME:[CAPABILITIES]:URL",
-        env = "ETHEREUM_RPC",
-        help = "Ethereum network name (e.g. 'mainnet'), optional comma-seperated capabilities (eg 'full,archive'), and an Ethereum RPC URL, separated by a ':'"
-    )]
-    pub ethereum_rpc: Vec<String>,
-
-    #[clap(
-        long,
-        value_name = "HOST:PORT",
-        env = "IPFS",
-        help = "HTTP addresses of IPFS servers (RPC, Gateway)",
-        default_value = "https://api.thegraph.com/ipfs"
-    )]
-    pub ipfs: Vec<String>,
-    #[clap(
-        long,
-        default_value = "8000",
-        value_name = "PORT",
-        help = "Port for the GraphQL HTTP server",
-        env = "GRAPH_GRAPHQL_HTTP_PORT"
-    )]
-    pub http_port: u16,
-    #[clap(
-        long,
-        default_value = "8030",
-        value_name = "PORT",
-        help = "Port for the index node server"
-    )]
-    pub index_node_port: u16,
-    #[clap(
-        long,
-        default_value = "8020",
-        value_name = "PORT",
-        help = "Port for the JSON-RPC admin server"
-    )]
-    pub admin_port: u16,
-    #[clap(
-        long,
-        default_value = "8040",
-        value_name = "PORT",
-        help = "Port for the Prometheus metrics server"
-    )]
-    pub metrics_port: u16,
-}
-
-/// Builds the Graph Node options from DevOpt
-fn build_args(dev_opt: &DevOpt, db_url: &str) -> Result<Opt> {
-    let mut args = vec!["gnd".to_string()];
-
-    if !dev_opt.ipfs.is_empty() {
-        args.push("--ipfs".to_string());
-        args.push(dev_opt.ipfs.join(","));
-    }
-
-    if !dev_opt.ethereum_rpc.is_empty() {
-        args.push("--ethereum-rpc".to_string());
-        args.push(dev_opt.ethereum_rpc.join(","));
-    }
-
-    args.push("--postgres-url".to_string());
-    args.push(db_url.to_string());
-
-    let mut opt = Opt::parse_from(args);
-
-    opt.http_port = dev_opt.http_port;
-    opt.admin_port = dev_opt.admin_port;
-    opt.metrics_port = dev_opt.metrics_port;
-    opt.index_node_port = dev_opt.index_node_port;
-
-    Ok(opt)
-}
-
-async fn run_graph_node(
-    logger: &Logger,
-    opt: Opt,
-    link_resolver: Arc<dyn LinkResolver>,
-    subgraph_updates_channel: mpsc::Receiver<(DeploymentHash, SubgraphName)>,
-    cancel_token: CancellationToken,
-) -> Result<()> {
-    let env_vars = Arc::new(EnvVars::from_env().context("Failed to load environment variables")?);
-
-    let (prometheus_registry, metrics_registry) = launcher::setup_metrics(logger);
-
-    let ipfs_client = graph::ipfs::new_ipfs_client(&opt.ipfs, &metrics_registry, logger)
-        .await
-        .unwrap_or_else(|err| panic!("Failed to create IPFS client: {err:#}"));
-
-    let ipfs_service = ipfs_service(
-        ipfs_client.cheap_clone(),
-        env_vars.mappings.max_ipfs_file_bytes,
-        env_vars.mappings.ipfs_timeout,
-        env_vars.mappings.ipfs_request_limit,
-    );
-
-    launcher::run(
-        logger.clone(),
-        opt,
-        env_vars,
-        ipfs_service,
-        link_resolver,
-        Some(subgraph_updates_channel),
-        prometheus_registry,
-        metrics_registry,
-        cancel_token,
-    )
-    .await;
-    Ok(())
+struct Cli {
+    #[command(subcommand)]
+    command: Commands,
 }
 
-/// Get the database URL, either from the provided option or by creating a temporary database
-fn get_database_url(
-    postgres_url: Option<&String>,
-    database_dir: &Path,
-) -> Result<(String, Option<TempPgDB>)> {
-    if let Some(url) = postgres_url {
-        Ok((url.clone(), None))
-    } else {
-        #[cfg(unix)]
-        {
-            // Check the database directory exists
-            if !database_dir.exists() {
-                anyhow::bail!(
-                    "Database directory does not exist: {}",
-                    database_dir.display()
-                );
-            }
-
-            let db = PgTempDBBuilder::new()
-                .with_data_dir_prefix(database_dir)
-                .persist_data(false)
-                .with_initdb_arg("-E", "UTF8")
-                .with_initdb_arg("--locale", "C")
-                .start();
-            let url = db.connection_uri().to_string();
-            // Return the handle so it lives for the lifetime of the program; dropping it will
-            // shut down Postgres and remove the temporary directory automatically.
-            Ok((url, Some(db)))
-        }
-
-        #[cfg(not(unix))]
-        {
-            anyhow::bail!(
-                "Please provide a postgres_url manually using the --postgres-url option."
-            );
-        }
-    }
-}
+#[derive(Subcommand)]
+enum Commands {
+    /// Run graph-node in dev mode
+    Dev(DevOpt),
 
-#[tokio::main]
-async fn main() -> Result<()> {
-    std::env::set_var("ETHEREUM_REORG_THRESHOLD", "10");
-    std::env::set_var("GRAPH_NODE_DISABLE_DEPLOYMENT_HASH_VALIDATION", "true");
-    env_logger::init();
-    let dev_opt = DevOpt::parse();
+    /// Generate AssemblyScript types from subgraph manifest
+    Codegen(CodegenOpt),
 
-    let database_dir = Path::new(&dev_opt.database_dir);
+    /// Compile subgraph to WASM
+    Build(BuildOpt),
 
-    let cancel_token = shutdown_token();
-    let logger = logger(true);
+    /// Deploy subgraph to a Graph Node
+    Deploy(DeployOpt),
 
-    info!(logger, "Starting Graph Node Dev 1");
-    info!(logger, "Database directory: {}", database_dir.display());
+    /// Scaffold a new subgraph project
+    Init(InitOpt),
 
-    // Get the database URL and keep the temporary database handle alive for the life of the
-    // program so that it is dropped (and cleaned up) on graceful shutdown.
-    let (db_url, mut temp_db_opt) = get_database_url(dev_opt.postgres_url.as_ref(), database_dir)?;
+    /// Add a datasource to an existing subgraph
+    Add(AddOpt),
 
-    let opt = build_args(&dev_opt, &db_url)?;
+    /// Register a subgraph name with a Graph Node
+    Create(CreateOpt),
 
-    let (manifests_paths, source_subgraph_aliases) =
-        parse_manifest_args(dev_opt.manifests, dev_opt.sources, &logger)?;
-    let file_link_resolver = Arc::new(FileLinkResolver::new(None, source_subgraph_aliases.clone()));
+    /// Unregister a subgraph name from a Graph Node
+    Remove(RemoveOpt),
 
-    let (tx, rx) = mpsc::channel(1);
+    /// Set the deploy key for a Graph Node
+    Auth(AuthOpt),
 
-    let logger_clone = logger.clone();
-    graph::spawn(async move {
-        let _ = run_graph_node(&logger_clone, opt, file_link_resolver, rx, cancel_token).await;
-    });
+    /// Publish subgraph to The Graph's decentralized network
+    Publish(PublishOpt),
 
-    if let Err(e) =
-        deploy_all_subgraphs(&logger, &manifests_paths, &source_subgraph_aliases, &tx).await
-    {
-        error!(logger, "Error deploying subgraphs"; "error" => e.to_string());
-        std::process::exit(1);
-    }
+    /// Run Matchstick tests
+    Test(TestOpt),
 
-    if dev_opt.watch {
-        let logger_clone_watch = logger.clone();
-        graph::spawn_blocking(async move {
-            if let Err(e) = watch_subgraphs(
-                &logger_clone_watch,
-                manifests_paths,
-                source_subgraph_aliases,
-                vec!["pgtemp-*".to_string()],
-                tx,
-            )
-            .await
-            {
-                error!(logger_clone_watch, "Error watching subgraphs"; "error" => e.to_string());
-                std::process::exit(1);
-            }
-        });
-    }
+    /// Remove build artifacts and generated files
+    Clean(CleanOpt),
 
-    // Wait for Ctrl+C so we can shut down cleanly and drop the temporary database, which removes
-    // the data directory.
-    tokio::signal::ctrl_c()
-        .await
-        .expect("Failed to listen for Ctrl+C signal");
-    info!(logger, "Received Ctrl+C, shutting down.");
+    /// Manage indexer operations. Requires `graph-indexer` to be installed and available on $PATH.
+    ///
+    /// Install it with:
+    ///
+    ///   npm install -g @graphprotocol/indexer-cli
+    ///
+    /// Arguments are forwarded to `graph-indexer`. For example:
+    ///
+    ///   gnd indexer allocations get --network arbitrum-one
+    ///
+    /// Use `gnd indexer help` for more details on available commands.
+    Indexer {
+        #[arg(trailing_var_arg = true, allow_hyphen_values = true)]
+        args: Vec<OsString>,
+    },
 
-    // Explicitly shut down and clean up the temporary database directory if we started one.
-    #[cfg(unix)]
-    if let Some(db) = temp_db_opt.take() {
-        db.shutdown();
-    }
+    /// Generate shell completions
+    Completions(CompletionsOpt),
+}
 
-    std::process::exit(0);
+/// Options for shell completion generation.
+#[derive(Parser, Debug)]
+pub struct CompletionsOpt {
+    /// Shell to generate completions for
+    #[clap(value_enum)]
+    pub shell: CompletionShell,
+}
 
-    #[allow(unreachable_code)]
-    Ok(())
+/// Supported shells for completion generation.
+#[derive(Copy, Clone, Debug, ValueEnum)]
+pub enum CompletionShell {
+    Bash,
+    Elvish,
+    Fish,
+    PowerShell,
+    Zsh,
 }
 
 fn shutdown_token() -> CancellationToken {
@@ -342,3 +158,114 @@ fn shutdown_token() -> CancellationToken {
 
     cancel_token
 }
+
+fn generate_completions(completions_opt: CompletionsOpt) -> Result<()> {
+    let shell = match completions_opt.shell {
+        CompletionShell::Bash => Shell::Bash,
+        CompletionShell::Elvish => Shell::Elvish,
+        CompletionShell::Fish => Shell::Fish,
+        CompletionShell::PowerShell => Shell::PowerShell,
+        CompletionShell::Zsh => Shell::Zsh,
+    };
+    generate(shell, &mut Cli::command(), "gnd", &mut io::stdout());
+    Ok(())
+}
+
+/// Delegates to the `graph-indexer` binary from the `indexer-cli` npm package.
+///
+/// The `graph-indexer` CLI expects all indexer management commands to be
+/// prefixed with `indexer` (e.g. `graph-indexer indexer allocations get ...`).
+/// This is because `graph-indexer` uses Gluegun's plugin system where `indexer`
+/// is the plugin namespace. We prepend it automatically so that users can write
+/// `gnd indexer allocations get` instead of the longer form.
+fn run_indexer(args: Vec<OsString>) -> Result<()> {
+    let mut cmd = Command::new("graph-indexer");
+    // `version` and `help` are top-level commands, but all other commands
+    // require the `indexer` namespace prefix (e.g. `graph-indexer indexer allocations get`).
+    let first = args.first().and_then(|s| s.to_str());
+    match first {
+        Some("version" | "--version" | "v" | "-v" | "help" | "h") => {}
+        // If no arguments are provided, default to showing top-level help
+        None => {
+            cmd.arg("help");
+        }
+        _ => {
+            cmd.arg("indexer");
+        }
+    }
+    cmd.args(&args);
+
+    #[cfg(unix)]
+    {
+        use std::os::unix::process::CommandExt;
+        let err = cmd.exec();
+        if err.kind() == io::ErrorKind::NotFound {
+            bail!(
+                "'graph-indexer' not found on $PATH. Install indexer-cli: npm install -g @graphprotocol/indexer-cli"
+            );
+        }
+        bail!("failed to exec 'graph-indexer': {err}");
+    }
+
+    #[cfg(not(unix))]
+    {
+        match cmd.status() {
+            Ok(status) if status.success() => Ok(()),
+            Ok(status) => std::process::exit(status.code().unwrap_or(1)),
+            Err(e) if e.kind() == io::ErrorKind::NotFound => {
+                bail!(
+                    "'graph-indexer' not found on $PATH. Install indexer-cli: npm install -g @graphprotocol/indexer-cli"
+                );
+            }
+            Err(e) => bail!("failed to run 'graph-indexer': {e}"),
+        }
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    graph::tls::install_default_crypto_provider();
+    unsafe {
+        std::env::set_var("ETHEREUM_REORG_THRESHOLD", "10");
+        std::env::set_var("GRAPH_NODE_DISABLE_DEPLOYMENT_HASH_VALIDATION", "true");
+    }
+    env_logger::init();
+
+    let cli = Cli::parse();
+    let logger = logger(true);
+    let cancel_token = shutdown_token();
+
+    let res = match cli.command {
+        Commands::Dev(dev_opt) => {
+            run_dev(dev_opt, logger, cancel_token).await?;
+            Ok(())
+        }
+        Commands::Codegen(codegen_opt) => run_codegen(codegen_opt).await,
+        Commands::Build(build_opt) => run_build(build_opt).await.map(|_| ()),
+        Commands::Deploy(deploy_opt) => run_deploy(deploy_opt).await,
+        Commands::Init(init_opt) => run_init(init_opt).await,
+        Commands::Add(add_opt) => run_add(add_opt).await,
+        Commands::Create(create_opt) => run_create(create_opt).await,
+        Commands::Remove(remove_opt) => run_remove(remove_opt).await,
+        Commands::Auth(auth_opt) => run_auth(auth_opt),
+        Commands::Publish(publish_opt) => run_publish(publish_opt).await,
+        Commands::Test(test_opt) => {
+            // Disable RPC retries so unmocked calls fail immediately.
+            // SAFETY: single-threaded here, before the Tokio runtime is built.
+            unsafe {
+                std::env::set_var("GRAPH_ETHEREUM_REQUEST_RETRIES", "1");
+            }
+            run_test(test_opt).await
+        }
+        Commands::Clean(clean_opt) => run_clean(clean_opt),
+        Commands::Indexer { args } => run_indexer(args),
+        Commands::Completions(completions_opt) => generate_completions(completions_opt),
+    };
+
+    if let Err(e) = res {
+        eprintln!("Error: {}", e);
+        std::process::exit(1);
+    }
+
+    Ok(())
+}
diff --git a/gnd/src/manifest.rs b/gnd/src/manifest.rs
new file mode 100644
index 00000000000..0221070edfe
--- /dev/null
+++ b/gnd/src/manifest.rs
@@ -0,0 +1,736 @@
+//! Shared manifest types and parsing for gnd commands.
+//!
+//! This module provides unified manifest loading and types used by build,
+//! codegen, and validation commands. Manifest parsing uses graph-node's
+//! `UnresolvedSubgraphManifest` types which enforce required fields via serde
+//! (e.g. `source.abi`, `mapping.abis`).
+
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use anyhow::{Context, Result};
+use graph::data::subgraph::UnresolvedSubgraphManifest;
+use graph::data_source::{
+    UnresolvedDataSource as GraphUnresolvedDS, UnresolvedDataSourceTemplate as GraphUnresolvedDST,
+};
+use graph::prelude::DeploymentHash;
+use graph_chain_ethereum::{BlockHandlerFilter, Chain};
+use semver::Version;
+
+use crate::output::{Step, step};
+
+/// Type alias for the graph-node unresolved manifest parameterized on Ethereum.
+type GraphManifest = UnresolvedSubgraphManifest<Chain>;
+
+/// A simplified subgraph manifest structure.
+///
+/// This unified struct contains all fields needed by build, codegen, and
+/// validation. Commands use only the fields they need.
+///
+/// Parsing uses graph-node's `UnresolvedSubgraphManifest::parse()` which
+/// enforces required fields via serde (e.g. `source.abi`, `mapping.abis`
+/// for Ethereum data sources).
+///
+/// # Data Source Organization
+///
+/// All data sources from the manifest are stored in the `data_sources` field,
+/// regardless of their kind. Subgraph data sources (kind: subgraph) are
+/// identified by `DataSource::is_subgraph_source()` and have the `source_address`
+/// field set to the IPFS deployment ID of the referenced subgraph.
+#[derive(Debug)]
+pub struct Manifest {
+    pub spec_version: Version,
+    pub schema: Option<String>,
+    pub features: Vec<String>,
+    pub graft: Option<GraftConfig>,
+    /// All data sources, including both contract-style sources and subgraph sources.
+    pub data_sources: Vec<DataSource>,
+    pub templates: Vec<Template>,
+}
+
+/// Graft configuration.
+#[derive(Debug)]
+pub struct GraftConfig {
+    pub base: String,
+    pub block: u64,
+}
+
+/// A data source in the manifest.
+#[derive(Debug)]
+pub struct DataSource {
+    pub name: String,
+    pub kind: String,
+    pub network: Option<String>,
+    pub mapping_file: Option<String>,
+    pub api_version: Option<Version>,
+    pub abis: Vec<Abi>,
+    /// For subgraph data sources: the IPFS deployment ID of the referenced subgraph.
+    pub source_address: Option<String>,
+    /// The ABI name referenced in `source.abi` (Ethereum data sources only).
+    pub source_abi: Option<String>,
+    /// The block number at which this data source starts indexing (from source.startBlock).
+    pub start_block: u64,
+    /// The block number at which this data source stops indexing (from source.endBlock).
+    pub end_block: Option<u64>,
+    /// Event handlers from the mapping.
+    pub event_handlers: Vec<EventHandler>,
+    /// Call handlers from the mapping.
+    pub call_handlers: Vec<CallHandler>,
+    /// Block handlers from the mapping (with filter info for validation).
+    pub block_handlers: Vec<BlockHandler>,
+}
+
+impl DataSource {
+    /// Returns true if this is a valid subgraph data source (kind: subgraph with address).
+    pub fn is_subgraph_source(&self) -> bool {
+        self.kind == "subgraph" && self.source_address.is_some()
+    }
+}
+
+/// A data source template in the manifest.
+#[derive(Debug)]
+pub struct Template {
+    pub name: String,
+    pub kind: String,
+    pub network: Option<String>,
+    pub mapping_file: Option<String>,
+    pub api_version: Option<Version>,
+    pub abis: Vec<Abi>,
+    /// The ABI name referenced in `source.abi` (Ethereum templates only).
+    pub source_abi: Option<String>,
+    /// Event handlers from the mapping.
+    pub event_handlers: Vec<EventHandler>,
+    /// Call handlers from the mapping.
+    pub call_handlers: Vec<CallHandler>,
+    /// Block handlers from the mapping (with filter info for validation).
+    pub block_handlers: Vec<BlockHandler>,
+}
+
+impl Manifest {
+    /// Returns the total count of all data sources.
+    pub fn total_source_count(&self) -> usize {
+        self.data_sources.len()
+    }
+}
+
+/// An ABI reference in a data source or template.
+#[derive(Debug)]
+pub struct Abi {
+    pub name: String,
+    pub file: String,
+}
+
+/// An event handler with metadata needed for validation.
+#[derive(Debug)]
+pub struct EventHandler {
+    /// The Solidity event signature, e.g. `Transfer(address,address,uint256)`.
+    pub event: String,
+    pub handler: String,
+    /// Whether this handler requires transaction receipts.
+    pub receipt: bool,
+    /// Whether this handler has eth call declarations.
+    pub has_call_decls: bool,
+}
+
+/// A call handler with metadata needed for validation.
+#[derive(Debug)]
+pub struct CallHandler {
+    /// The Solidity function signature, e.g. `approve(address,uint256)`.
+    pub function: String,
+    pub handler: String,
+}
+
+/// A block handler with filter info needed for validation.
+#[derive(Debug)]
+pub struct BlockHandler {
+    pub handler: String,
+    pub filter: Option<BlockHandlerFilterKind>,
+}
+
+/// The kind of filter on a block handler (simplified from graph-node's `BlockHandlerFilter`).
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BlockHandlerFilterKind {
+    Call,
+    Once,
+    Polling,
+}
+
+/// Load a subgraph manifest from a YAML file.
+///
+/// This uses graph-node's `UnresolvedSubgraphManifest::parse()` which
+/// enforces all required fields via serde deserialization. Missing required
+/// fields (e.g. `source.abi`, `mapping.abis`) produce clear parse errors.
+pub fn load_manifest(path: &Path) -> Result<Manifest> {
+    step(
+        Step::Load,
+        &format!("Load subgraph from {}", path.display()),
+    );
+
+    let manifest_str =
+        fs::read_to_string(path).with_context(|| format!("Failed to read manifest: {:?}", path))?;
+
+    let raw: serde_yaml::Mapping = serde_yaml::from_str(&manifest_str)
+        .with_context(|| format!("Failed to parse manifest YAML: {:?}", path))?;
+
+    // Use a dummy deployment hash for local CLI use
+    let id = DeploymentHash::new("QmLocalDev").unwrap();
+
+    let parsed: GraphManifest = GraphManifest::parse(id, raw)
+        .with_context(|| format!("Failed to parse manifest: {:?}", path))?;
+
+    Ok(convert_manifest(parsed))
+}
+
+/// Convert a graph-node `UnresolvedSubgraphManifest` into gnd's `Manifest`.
+fn convert_manifest(m: GraphManifest) -> Manifest {
+    let spec_version = m.spec_version;
+
+    let schema = m.schema.map(|s| s.file.link);
+
+    let features = m.features.into_iter().map(|f| f.to_string()).collect();
+
+    let graft = m.graft.map(|g| GraftConfig {
+        base: g.base.to_string(),
+        block: g.block.max(0) as u64,
+    });
+
+    let data_sources = m
+        .data_sources
+        .into_iter()
+        .map(convert_data_source)
+        .collect();
+
+    let templates = m.templates.into_iter().map(convert_template).collect();
+
+    Manifest {
+        spec_version,
+        schema,
+        features,
+        graft,
+        data_sources,
+        templates,
+    }
+}
+
+/// Convert a graph-node `UnresolvedDataSource` enum into gnd's `DataSource`.
+fn convert_data_source(ds: GraphUnresolvedDS<Chain>) -> DataSource {
+    match ds {
+        GraphUnresolvedDS::Onchain(eth) => DataSource {
+            name: eth.name.clone(),
+            kind: eth.kind.clone(),
+            network: eth.network.clone(),
+            mapping_file: Some(eth.mapping.file.link.clone()),
+            api_version: Version::parse(&eth.mapping.api_version).ok(),
+            abis: eth
+                .mapping
+                .abis
+                .iter()
+                .map(|a| Abi {
+                    name: a.name.clone(),
+                    file: a.file.link.clone(),
+                })
+                .collect(),
+            source_address: eth.source.address.map(|a| format!("{:?}", a)),
+            source_abi: Some(eth.source.abi.clone()),
+            start_block: eth.source.start_block as u64,
+            end_block: eth.source.end_block.map(|b| b as u64),
+            event_handlers: eth
+                .mapping
+                .event_handlers
+                .iter()
+                .map(|h| EventHandler {
+                    event: h.event.clone(),
+                    handler: h.handler.clone(),
+                    receipt: h.receipt,
+                    has_call_decls: !h.calls.raw_decls.is_empty(),
+                })
+                .collect(),
+            call_handlers: eth
+                .mapping
+                .call_handlers
+                .iter()
+                .map(|h| CallHandler {
+                    function: h.function.clone(),
+                    handler: h.handler.clone(),
+                })
+                .collect(),
+            block_handlers: eth
+                .mapping
+                .block_handlers
+                .iter()
+                .map(|h| BlockHandler {
+                    handler: h.handler.clone(),
+                    filter: h.filter.as_ref().map(convert_block_handler_filter),
+                })
+                .collect(),
+        },
+        GraphUnresolvedDS::Subgraph(sub) => DataSource {
+            name: sub.name.clone(),
+            kind: sub.kind.clone(),
+            network: Some(sub.network.clone()),
+            mapping_file: Some(sub.mapping.file.link.clone()),
+            api_version: Version::parse(&sub.mapping.api_version).ok(),
+            abis: sub
+                .mapping
+                .abis
+                .as_deref()
+                .unwrap_or(&[])
+                .iter()
+                .map(|a| Abi {
+                    name: a.name.clone(),
+                    file: a.file.link.clone(),
+                })
+                .collect(),
+            source_address: Some(sub.source.address().to_string()),
+            source_abi: None,
+            start_block: sub.source.start_block() as u64,
+            end_block: None, // Subgraph sources don't have end_block
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        },
+        GraphUnresolvedDS::Offchain(off) => DataSource {
+            name: off.name.clone(),
+            kind: off.kind.clone(),
+            network: None,
+            mapping_file: Some(off.mapping.file.link.clone()),
+            api_version: Version::parse(&off.mapping.api_version).ok(),
+            abis: vec![],
+            source_address: None,
+            source_abi: None,
+            start_block: 0, // Offchain data sources don't have start_block
+            end_block: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        },
+        GraphUnresolvedDS::Amp(amp) => DataSource {
+            name: amp.name.clone(),
+            kind: amp.kind.clone(),
+            network: Some(amp.network.clone()),
+            mapping_file: None,
+            api_version: None,
+            abis: vec![],
+            source_address: None,
+            source_abi: None,
+            start_block: amp.source.start_block.unwrap_or(0),
+            end_block: amp.source.end_block,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        },
+    }
+}
+
+/// Convert a graph-node `UnresolvedDataSourceTemplate` enum into gnd's `Template`.
+fn convert_template(t: GraphUnresolvedDST<Chain>) -> Template {
+    match t {
+        GraphUnresolvedDST::Onchain(eth) => Template {
+            name: eth.name.clone(),
+            kind: eth.kind.clone(),
+            network: eth.network.clone(),
+            mapping_file: Some(eth.mapping.file.link.clone()),
+            api_version: Version::parse(&eth.mapping.api_version).ok(),
+            abis: eth
+                .mapping
+                .abis
+                .iter()
+                .map(|a| Abi {
+                    name: a.name.clone(),
+                    file: a.file.link.clone(),
+                })
+                .collect(),
+            source_abi: Some(eth.source.abi.clone()),
+            event_handlers: eth
+                .mapping
+                .event_handlers
+                .iter()
+                .map(|h| EventHandler {
+                    event: h.event.clone(),
+                    handler: h.handler.clone(),
+                    receipt: h.receipt,
+                    has_call_decls: !h.calls.raw_decls.is_empty(),
+                })
+                .collect(),
+            call_handlers: eth
+                .mapping
+                .call_handlers
+                .iter()
+                .map(|h| CallHandler {
+                    function: h.function.clone(),
+                    handler: h.handler.clone(),
+                })
+                .collect(),
+            block_handlers: eth
+                .mapping
+                .block_handlers
+                .iter()
+                .map(|h| BlockHandler {
+                    handler: h.handler.clone(),
+                    filter: h.filter.as_ref().map(convert_block_handler_filter),
+                })
+                .collect(),
+        },
+        GraphUnresolvedDST::Offchain(off) => Template {
+            name: off.name.clone(),
+            kind: off.kind.clone(),
+            network: off.network.clone(),
+            mapping_file: Some(off.mapping.file.link.clone()),
+            api_version: Version::parse(&off.mapping.api_version).ok(),
+            abis: vec![],
+            source_abi: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        },
+        GraphUnresolvedDST::Subgraph(sub) => Template {
+            name: sub.name.clone(),
+            kind: sub.kind.clone(),
+            network: sub.network.clone(),
+            mapping_file: Some(sub.mapping.file.link.clone()),
+            api_version: Version::parse(&sub.mapping.api_version).ok(),
+            abis: sub
+                .mapping
+                .abis
+                .as_deref()
+                .unwrap_or(&[])
+                .iter()
+                .map(|a| Abi {
+                    name: a.name.clone(),
+                    file: a.file.link.clone(),
+                })
+                .collect(),
+            source_abi: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        },
+    }
+}
+
+/// Convert a graph-node `BlockHandlerFilter` to gnd's simplified `BlockHandlerFilterKind`.
+fn convert_block_handler_filter(filter: &BlockHandlerFilter) -> BlockHandlerFilterKind {
+    match filter {
+        BlockHandlerFilter::Call => BlockHandlerFilterKind::Call,
+        BlockHandlerFilter::Once => BlockHandlerFilterKind::Once,
+        BlockHandlerFilter::Polling { .. } => BlockHandlerFilterKind::Polling,
+    }
+}
+
+/// Get the directory containing a manifest file.
+///
+/// This handles the edge case where `manifest_path` is a bare filename
+/// like `"subgraph.yaml"` - in that case, `parent()` returns an empty
+/// path, so we fall back to `"."` (current directory).
+pub fn manifest_dir(manifest_path: &Path) -> &Path {
+    manifest_path
+        .parent()
+        .filter(|p| !p.as_os_str().is_empty())
+        .unwrap_or_else(|| Path::new("."))
+}
+
+/// Resolve a path relative to the manifest file.
+pub fn resolve_path(manifest: &Path, path: &str) -> PathBuf {
+    manifest_dir(manifest).join(path)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_manifest_dir_with_directory() {
+        let manifest = PathBuf::from("/home/user/project/subgraph.yaml");
+        assert_eq!(manifest_dir(&manifest), Path::new("/home/user/project"));
+    }
+
+    #[test]
+    fn test_manifest_dir_bare_filename() {
+        // When manifest_path is just "subgraph.yaml", parent() returns Some("")
+        // which is empty, so we should fall back to "."
+        let manifest = PathBuf::from("subgraph.yaml");
+        assert_eq!(manifest_dir(&manifest), Path::new("."));
+    }
+
+    #[test]
+    fn test_manifest_dir_relative_path() {
+        let manifest = PathBuf::from("./subgraph.yaml");
+        assert_eq!(manifest_dir(&manifest), Path::new("."));
+    }
+
+    #[test]
+    fn test_resolve_path() {
+        let manifest = PathBuf::from("/home/user/project/subgraph.yaml");
+        let path = "src/mapping.ts";
+        let resolved = resolve_path(&manifest, path);
+        assert_eq!(resolved, PathBuf::from("/home/user/project/src/mapping.ts"));
+    }
+
+    #[test]
+    fn test_resolve_path_bare_filename() {
+        // When manifest is just "subgraph.yaml", paths should resolve relative to "."
+        let manifest = PathBuf::from("subgraph.yaml");
+        let path = "src/mapping.ts";
+        let resolved = resolve_path(&manifest, path);
+        assert_eq!(resolved, PathBuf::from("./src/mapping.ts"));
+    }
+
+    #[test]
+    fn test_load_manifest_basic() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+templates:
+  - kind: ethereum/contract
+    name: DynamicToken
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/dynamic.ts
+      entities:
+        - MyEntity
+      abis: []
+"#;
+
+        fs::write(&manifest_path, manifest_content).unwrap();
+
+        let manifest = load_manifest(&manifest_path).unwrap();
+        assert_eq!(manifest.spec_version, Version::new(0, 0, 4));
+        assert_eq!(manifest.schema, Some("./schema.graphql".to_string()));
+        assert_eq!(manifest.data_sources.len(), 1);
+        assert_eq!(manifest.data_sources[0].name, "Token");
+        assert_eq!(manifest.data_sources[0].kind, "ethereum/contract");
+        assert_eq!(
+            manifest.data_sources[0].network,
+            Some("mainnet".to_string())
+        );
+        assert_eq!(
+            manifest.data_sources[0].api_version,
+            Some(Version::new(0, 0, 6))
+        );
+        assert_eq!(
+            manifest.data_sources[0].mapping_file,
+            Some("./src/mapping.ts".to_string())
+        );
+        assert_eq!(manifest.data_sources[0].abis.len(), 1);
+        assert_eq!(manifest.data_sources[0].abis[0].name, "ERC20");
+        assert_eq!(manifest.templates.len(), 1);
+        assert_eq!(manifest.templates[0].name, "DynamicToken");
+        assert_eq!(manifest.templates[0].kind, "ethereum/contract");
+        assert_eq!(manifest.templates[0].network, Some("mainnet".to_string()));
+        assert_eq!(
+            manifest.templates[0].api_version,
+            Some(Version::new(0, 0, 6))
+        );
+    }
+
+    #[test]
+    fn test_load_manifest_with_graft_and_features() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+
+        let manifest_content = r#"
+specVersion: 0.0.6
+features:
+  - nonFatalErrors
+  - fullTextSearch
+graft:
+  base: QmXYZ123abcdefghijklmnopqrstuvwxyz1234567890ab
+  block: 12345
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+"#;
+
+        fs::write(&manifest_path, manifest_content).unwrap();
+
+        let manifest = load_manifest(&manifest_path).unwrap();
+        assert_eq!(manifest.spec_version, Version::new(0, 0, 6));
+        assert_eq!(
+            manifest.features,
+            vec!["nonFatalErrors".to_string(), "fullTextSearch".to_string()]
+        );
+        assert!(manifest.graft.is_some());
+        let graft = manifest.graft.unwrap();
+        assert_eq!(graft.base, "QmXYZ123abcdefghijklmnopqrstuvwxyz1234567890ab");
+        assert_eq!(graft.block, 12345);
+    }
+
+    #[test]
+    fn test_load_manifest_with_subgraph_sources() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+
+        let manifest_content = r#"
+specVersion: 1.0.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: subgraph
+    name: SourceSubgraph
+    network: mainnet
+    source:
+      address: QmSourceHash1234567890abcdefghijklmnopqrstuvwx
+      startBlock: 0
+    mapping:
+      apiVersion: 0.0.7
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+      handlers:
+        - handler: handleEntity
+          entity: MyEntity
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.7
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+      abis: []
+"#;
+
+        fs::write(&manifest_path, manifest_content).unwrap();
+
+        let manifest = load_manifest(&manifest_path).unwrap();
+        // All data sources go to data_sources
+        assert_eq!(manifest.data_sources.len(), 2);
+        // First is the subgraph source
+        assert_eq!(manifest.data_sources[0].name, "SourceSubgraph");
+        assert_eq!(manifest.data_sources[0].kind, "subgraph");
+        assert!(manifest.data_sources[0].is_subgraph_source());
+        assert_eq!(
+            manifest.data_sources[0].source_address,
+            Some("QmSourceHash1234567890abcdefghijklmnopqrstuvwx".to_string())
+        );
+        // Second is the contract source
+        assert_eq!(manifest.data_sources[1].name, "Token");
+        assert_eq!(manifest.data_sources[1].kind, "ethereum/contract");
+        assert!(!manifest.data_sources[1].is_subgraph_source());
+        assert_eq!(manifest.data_sources[1].source_address, None);
+        // total_source_count includes both
+        assert_eq!(manifest.total_source_count(), 2);
+    }
+
+    #[test]
+    fn test_load_manifest_missing_source_abi_fails() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source: {}
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+"#;
+
+        fs::write(&manifest_path, manifest_content).unwrap();
+
+        let result = load_manifest(&manifest_path);
+        assert!(result.is_err(), "Missing source.abi should fail parsing");
+        let err = result.unwrap_err();
+        let err_chain = format!("{:#}", err);
+        assert!(
+            err_chain.contains("abi"),
+            "Error should mention missing abi field, got: {}",
+            err_chain
+        );
+    }
+
+    #[test]
+    fn test_load_manifest_missing_mapping_abis_fails() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+
+        let manifest_content = r#"
+specVersion: 0.0.4
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Token
+    network: mainnet
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      file: ./src/mapping.ts
+      entities:
+        - MyEntity
+"#;
+
+        fs::write(&manifest_path, manifest_content).unwrap();
+
+        let result = load_manifest(&manifest_path);
+        assert!(result.is_err(), "Missing mapping.abis should fail parsing");
+        let err = result.unwrap_err();
+        let err_chain = format!("{:#}", err);
+        assert!(
+            err_chain.contains("abis"),
+            "Error should mention missing abis field, got: {}",
+            err_chain
+        );
+    }
+}
diff --git a/gnd/src/migrations/api_version.rs b/gnd/src/migrations/api_version.rs
new file mode 100644
index 00000000000..f660d54ca5e
--- /dev/null
+++ b/gnd/src/migrations/api_version.rs
@@ -0,0 +1,323 @@
+//! API version migrations.
+//!
+//! These migrations update the `apiVersion` field in data source and template mappings.
+//! Each migration requires a minimum graph-ts version to be installed.
+
+use anyhow::Result;
+
+use super::{
+    Migration, MigrationCheck, MigrationContext, load_manifest, manifest_has_api_version,
+    replace_in_file, versions,
+};
+
+/// Helper to create an API version migration check.
+fn check_api_version(
+    ctx: &MigrationContext,
+    from_version: &str,
+    min_graph_ts: (u64, u64, u64),
+    use_gte: bool,
+) -> Result<MigrationCheck> {
+    // Check graph-ts version
+    match versions::get_graph_ts_version(ctx.source_dir) {
+        Ok(version) => {
+            let meets_requirement = if use_gte {
+                versions::version_gte(&version, min_graph_ts.0, min_graph_ts.1, min_graph_ts.2)
+            } else {
+                versions::version_gt(&version, min_graph_ts.0, min_graph_ts.1, min_graph_ts.2)
+            };
+
+            if !meets_requirement {
+                return Ok(MigrationCheck::Skip);
+            }
+        }
+        Err(_) => {
+            return Ok(MigrationCheck::SkipWithReason(
+                "graph-ts dependency not installed yet".to_string(),
+            ));
+        }
+    }
+
+    // Check if manifest has the old apiVersion
+    let manifest = load_manifest(ctx.manifest_path)?;
+    if manifest_has_api_version(&manifest, from_version) {
+        Ok(MigrationCheck::ShouldApply)
+    } else {
+        Ok(MigrationCheck::Skip)
+    }
+}
+
+/// Helper to apply an API version migration.
+fn apply_api_version(ctx: &MigrationContext, from: &str, to: &str) -> Result<()> {
+    // Escape dots in version string for regex
+    let from_escaped = from.replace('.', r"\.");
+    let to_str = to;
+
+    replace_in_file(
+        ctx.manifest_path,
+        &[
+            (
+                &format!(r"apiVersion: {}", from_escaped),
+                &format!("apiVersion: {}", to_str),
+            ),
+            (
+                &format!(r"apiVersion: '{}'", from_escaped),
+                &format!("apiVersion: '{}'", to_str),
+            ),
+            (
+                &format!(r#"apiVersion: "{}""#, from_escaped),
+                &format!(r#"apiVersion: "{}""#, to_str),
+            ),
+        ],
+    )
+}
+
+// =============================================================================
+// Migrations
+// =============================================================================
+
+/// Migration: apiVersion 0.0.1 -> 0.0.2
+///
+/// Requires graph-ts > 0.5.1
+pub struct ApiVersion0_0_1To0_0_2;
+
+impl Migration for ApiVersion0_0_1To0_0_2 {
+    fn name(&self) -> &'static str {
+        "Bump mapping apiVersion from 0.0.1 to 0.0.2"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        check_api_version(ctx, "0.0.1", (0, 5, 1), false)
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        apply_api_version(ctx, "0.0.1", "0.0.2")
+    }
+}
+
+/// Migration: apiVersion 0.0.2 -> 0.0.3
+///
+/// Requires graph-ts > 0.12.0
+pub struct ApiVersion0_0_2To0_0_3;
+
+impl Migration for ApiVersion0_0_2To0_0_3 {
+    fn name(&self) -> &'static str {
+        "Bump mapping apiVersion from 0.0.2 to 0.0.3"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        check_api_version(ctx, "0.0.2", (0, 12, 0), false)
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        apply_api_version(ctx, "0.0.2", "0.0.3")
+    }
+}
+
+/// Migration: apiVersion 0.0.3 -> 0.0.4
+///
+/// Requires graph-ts > 0.17.0
+pub struct ApiVersion0_0_3To0_0_4;
+
+impl Migration for ApiVersion0_0_3To0_0_4 {
+    fn name(&self) -> &'static str {
+        "Bump mapping apiVersion from 0.0.3 to 0.0.4"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        check_api_version(ctx, "0.0.3", (0, 17, 0), false)
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        apply_api_version(ctx, "0.0.3", "0.0.4")
+    }
+}
+
+/// Migration: apiVersion 0.0.4 -> 0.0.5
+///
+/// Requires graph-ts >= 0.22.0
+pub struct ApiVersion0_0_4To0_0_5;
+
+impl Migration for ApiVersion0_0_4To0_0_5 {
+    fn name(&self) -> &'static str {
+        "Bump mapping apiVersion from 0.0.4 to 0.0.5"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        check_api_version(ctx, "0.0.4", (0, 22, 0), true)
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        apply_api_version(ctx, "0.0.4", "0.0.5")
+    }
+}
+
+/// Migration: apiVersion 0.0.5 -> 0.0.6
+///
+/// Requires graph-ts >= 0.24.0
+pub struct ApiVersion0_0_5To0_0_6;
+
+impl Migration for ApiVersion0_0_5To0_0_6 {
+    fn name(&self) -> &'static str {
+        "Bump mapping apiVersion from 0.0.5 to 0.0.6"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        check_api_version(ctx, "0.0.5", (0, 24, 0), true)
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        apply_api_version(ctx, "0.0.5", "0.0.6")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    fn setup_with_graph_ts(
+        manifest_content: &str,
+        graph_ts_version: &str,
+    ) -> (TempDir, std::path::PathBuf) {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create manifest
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+        std::fs::write(&manifest_path, manifest_content).unwrap();
+
+        // Create graph-ts package.json
+        let graph_ts_dir = temp_dir
+            .path()
+            .join("node_modules")
+            .join("@graphprotocol")
+            .join("graph-ts");
+        std::fs::create_dir_all(&graph_ts_dir).unwrap();
+        std::fs::write(
+            graph_ts_dir.join("package.json"),
+            format!(
+                r#"{{"name": "@graphprotocol/graph-ts", "version": "{}"}}"#,
+                graph_ts_version
+            ),
+        )
+        .unwrap();
+
+        (temp_dir, manifest_path)
+    }
+
+    #[test]
+    fn test_api_version_0_0_4_to_0_0_5_check_should_apply() {
+        let manifest = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    mapping:
+      apiVersion: 0.0.4
+"#;
+        let (_temp_dir, manifest_path) = setup_with_graph_ts(manifest, "0.25.0");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = ApiVersion0_0_4To0_0_5;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::ShouldApply => {}
+            MigrationCheck::Skip => panic!("Expected ShouldApply, got Skip"),
+            MigrationCheck::SkipWithReason(r) => {
+                panic!("Expected ShouldApply, got SkipWithReason({})", r)
+            }
+        }
+    }
+
+    #[test]
+    fn test_api_version_0_0_4_to_0_0_5_skip_old_graph_ts() {
+        let manifest = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    mapping:
+      apiVersion: 0.0.4
+"#;
+        let (_temp_dir, manifest_path) = setup_with_graph_ts(manifest, "0.20.0");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = ApiVersion0_0_4To0_0_5;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::Skip => {}
+            _ => panic!("Expected Skip"),
+        }
+    }
+
+    #[test]
+    fn test_api_version_0_0_4_to_0_0_5_apply() {
+        let manifest = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    mapping:
+      apiVersion: 0.0.4
+templates:
+  - kind: ethereum/contract
+    mapping:
+      apiVersion: 0.0.4
+"#;
+        let (_temp_dir, manifest_path) = setup_with_graph_ts(manifest, "0.25.0");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = ApiVersion0_0_4To0_0_5;
+        migration.apply(&ctx).unwrap();
+
+        let content = std::fs::read_to_string(&manifest_path).unwrap();
+        assert!(content.contains("apiVersion: 0.0.5"));
+        assert!(!content.contains("apiVersion: 0.0.4"));
+    }
+
+    #[test]
+    fn test_api_version_no_graph_ts() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+        std::fs::write(&manifest_path, "specVersion: 0.0.4\ndataSources: []").unwrap();
+
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = ApiVersion0_0_4To0_0_5;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::SkipWithReason(reason) => {
+                assert!(reason.contains("not installed"));
+            }
+            _ => panic!("Expected SkipWithReason"),
+        }
+    }
+
+    #[test]
+    fn test_api_version_migration_with_quoted_versions() {
+        // Test with single quotes
+        let manifest_single = r#"
+specVersion: 0.0.4
+dataSources:
+  - kind: ethereum/contract
+    mapping:
+      apiVersion: '0.0.4'
+"#;
+        let (_temp_dir, manifest_path) = setup_with_graph_ts(manifest_single, "0.25.0");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = ApiVersion0_0_4To0_0_5;
+        migration.apply(&ctx).unwrap();
+
+        let content = std::fs::read_to_string(&manifest_path).unwrap();
+        assert!(content.contains("apiVersion: '0.0.5'"));
+    }
+}
diff --git a/gnd/src/migrations/mod.rs b/gnd/src/migrations/mod.rs
new file mode 100644
index 00000000000..0fa888e80e6
--- /dev/null
+++ b/gnd/src/migrations/mod.rs
@@ -0,0 +1,238 @@
+//! Subgraph manifest migrations.
+//!
+//! This module provides automatic migrations for updating subgraph manifests
+//! to newer versions. Migrations handle both:
+//! - `specVersion`: The manifest schema version
+//! - `apiVersion`: The mapping API version in data sources/templates
+//!
+//! The migration system checks graph-ts version compatibility when applicable
+//! and applies changes in-place using regex-based patching to preserve
+//! formatting.
+
+mod api_version;
+mod spec_version;
+mod versions;
+
+use std::path::Path;
+
+use anyhow::Result;
+use regex::Regex;
+
+use crate::output::{Step, step};
+
+pub use versions::get_graph_ts_version;
+
+/// Context for running migrations.
+pub struct MigrationContext<'a> {
+    /// Path to the manifest file.
+    pub manifest_path: &'a Path,
+    /// Directory containing the subgraph source (for finding graph-ts).
+    pub source_dir: &'a Path,
+}
+
+/// Result of checking whether a migration should be applied.
+pub enum MigrationCheck {
+    /// Migration should be applied.
+    ShouldApply,
+    /// Migration should be skipped (no changes needed).
+    Skip,
+    /// Migration should be skipped with an explanation.
+    SkipWithReason(String),
+}
+
+/// A single migration that can be applied to a manifest.
+pub trait Migration {
+    /// Human-readable name of the migration.
+    fn name(&self) -> &'static str;
+
+    /// Check if this migration should be applied.
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck>;
+
+    /// Apply the migration to the manifest file.
+    fn apply(&self, ctx: &MigrationContext) -> Result<()>;
+}
+
+/// All available migrations in order.
+fn all_migrations() -> Vec<Box<dyn Migration>> {
+    vec![
+        // Spec version migrations
+        Box::new(spec_version::SpecVersion0_0_1To0_0_2),
+        Box::new(spec_version::SpecVersion0_0_2To0_0_4),
+        // API version migrations
+        Box::new(api_version::ApiVersion0_0_1To0_0_2),
+        Box::new(api_version::ApiVersion0_0_2To0_0_3),
+        Box::new(api_version::ApiVersion0_0_3To0_0_4),
+        Box::new(api_version::ApiVersion0_0_4To0_0_5),
+        Box::new(api_version::ApiVersion0_0_5To0_0_6),
+    ]
+}
+
+/// Apply all applicable migrations to a manifest file.
+///
+/// Migrations are applied in order, with each migration checking if it should
+/// be applied before making changes. The manifest file is modified in-place.
+pub fn apply_migrations(manifest_path: &Path) -> Result<()> {
+    let mut apply_printed = false;
+    let mut print_apply = || {
+        if !apply_printed {
+            step(Step::Generate, "Applying migrations");
+            apply_printed = true;
+        }
+    };
+
+    let source_dir = crate::manifest::manifest_dir(manifest_path);
+
+    let ctx = MigrationContext {
+        manifest_path,
+        source_dir,
+    };
+
+    for migration in all_migrations() {
+        match migration.check(&ctx)? {
+            MigrationCheck::ShouldApply => {
+                print_apply();
+                step(
+                    Step::Generate,
+                    &format!("Apply migration: {}", migration.name()),
+                );
+                migration.apply(&ctx)?;
+            }
+            MigrationCheck::Skip => {
+                // No need to bother the user
+            }
+            MigrationCheck::SkipWithReason(reason) => {
+                print_apply();
+                step(
+                    Step::Skip,
+                    &format!("Skip migration: {} ({})", migration.name(), reason),
+                );
+            }
+        }
+    }
+
+    Ok(())
+}
+
+/// Replace all occurrences of a pattern in a file.
+///
+/// This handles the common case of replacing version strings that might be
+/// written with different quote styles (unquoted, single-quoted, double-quoted).
+fn replace_in_file(path: &Path, patterns: &[(&str, &str)]) -> Result<()> {
+    let content = std::fs::read_to_string(path)?;
+    let mut result = content;
+
+    for (pattern, replacement) in patterns {
+        let re = Regex::new(pattern)?;
+        result = re.replace_all(&result, *replacement).to_string();
+    }
+
+    std::fs::write(path, result)?;
+    Ok(())
+}
+
+/// Check if manifest has a specific apiVersion in dataSources or templates.
+fn manifest_has_api_version(manifest: &serde_json::Value, version: &str) -> bool {
+    // Check dataSources
+    if let Some(data_sources) = manifest.get("dataSources").and_then(|ds| ds.as_array()) {
+        for ds in data_sources {
+            if let Some(api_version) = ds
+                .get("mapping")
+                .and_then(|m| m.get("apiVersion"))
+                .and_then(|v| v.as_str())
+                && api_version == version
+            {
+                return true;
+            }
+        }
+    }
+
+    // Check templates
+    if let Some(templates) = manifest.get("templates").and_then(|t| t.as_array()) {
+        for template in templates {
+            if let Some(api_version) = template
+                .get("mapping")
+                .and_then(|m| m.get("apiVersion"))
+                .and_then(|v| v.as_str())
+                && api_version == version
+            {
+                return true;
+            }
+        }
+    }
+
+    false
+}
+
+/// Load manifest as serde_json::Value for inspection.
+fn load_manifest(path: &Path) -> Result<serde_json::Value> {
+    let content = std::fs::read_to_string(path)?;
+    let value: serde_json::Value = serde_yaml::from_str(&content)?;
+    Ok(value)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_manifest_has_api_version() {
+        let manifest: serde_json::Value = serde_json::json!({
+            "dataSources": [
+                {
+                    "mapping": {
+                        "apiVersion": "0.0.4"
+                    }
+                }
+            ]
+        });
+
+        assert!(manifest_has_api_version(&manifest, "0.0.4"));
+        assert!(!manifest_has_api_version(&manifest, "0.0.5"));
+    }
+
+    #[test]
+    fn test_manifest_has_api_version_in_templates() {
+        let manifest: serde_json::Value = serde_json::json!({
+            "dataSources": [],
+            "templates": [
+                {
+                    "mapping": {
+                        "apiVersion": "0.0.3"
+                    }
+                }
+            ]
+        });
+
+        assert!(manifest_has_api_version(&manifest, "0.0.3"));
+        assert!(!manifest_has_api_version(&manifest, "0.0.4"));
+    }
+
+    #[test]
+    fn test_replace_in_file() {
+        let temp_dir = TempDir::new().unwrap();
+        let file_path = temp_dir.path().join("test.yaml");
+
+        std::fs::write(
+            &file_path,
+            "apiVersion: 0.0.4\napiVersion: '0.0.4'\napiVersion: \"0.0.4\"\n",
+        )
+        .unwrap();
+
+        replace_in_file(
+            &file_path,
+            &[
+                (r"apiVersion: 0\.0\.4", "apiVersion: 0.0.5"),
+                (r"apiVersion: '0\.0\.4'", "apiVersion: '0.0.5'"),
+                (r#"apiVersion: "0\.0\.4""#, r#"apiVersion: "0.0.5""#),
+            ],
+        )
+        .unwrap();
+
+        let content = std::fs::read_to_string(&file_path).unwrap();
+        assert!(content.contains("apiVersion: 0.0.5"));
+        assert!(content.contains("apiVersion: '0.0.5'"));
+        assert!(content.contains("apiVersion: \"0.0.5\""));
+        assert!(!content.contains("0.0.4"));
+    }
+}
diff --git a/gnd/src/migrations/spec_version.rs b/gnd/src/migrations/spec_version.rs
new file mode 100644
index 00000000000..ffdb6f13ce7
--- /dev/null
+++ b/gnd/src/migrations/spec_version.rs
@@ -0,0 +1,202 @@
+//! Spec version migrations.
+//!
+//! These migrations update the manifest's `specVersion` field to newer versions.
+
+use anyhow::Result;
+
+use super::{Migration, MigrationCheck, MigrationContext, load_manifest, replace_in_file};
+
+/// Migration: specVersion 0.0.1 -> 0.0.2
+///
+/// Spec version 0.0.2 uses top-level templates. graph-cli no longer supports
+/// 0.0.1 which used nested templates.
+pub struct SpecVersion0_0_1To0_0_2;
+
+impl Migration for SpecVersion0_0_1To0_0_2 {
+    fn name(&self) -> &'static str {
+        "Bump manifest specVersion from 0.0.1 to 0.0.2"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        let manifest = load_manifest(ctx.manifest_path)?;
+
+        let spec_version = manifest
+            .get("specVersion")
+            .and_then(|v| v.as_str())
+            .unwrap_or("");
+
+        if spec_version == "0.0.1" {
+            Ok(MigrationCheck::ShouldApply)
+        } else {
+            Ok(MigrationCheck::Skip)
+        }
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        replace_in_file(
+            ctx.manifest_path,
+            &[
+                (r"specVersion: 0\.0\.1", "specVersion: 0.0.2"),
+                (r"specVersion: '0\.0\.1'", "specVersion: '0.0.2'"),
+                (r#"specVersion: "0\.0\.1""#, r#"specVersion: "0.0.2""#),
+            ],
+        )
+    }
+}
+
+/// Migration: specVersion 0.0.2/0.0.3 -> 0.0.4
+///
+/// Spec version 0.0.4 uses feature management, but features are detected
+/// and validated by the graph-node instance during subgraph deployment.
+///
+/// We skip spec version 0.0.3, which is considered invalid and non-canonical.
+pub struct SpecVersion0_0_2To0_0_4;
+
+impl Migration for SpecVersion0_0_2To0_0_4 {
+    fn name(&self) -> &'static str {
+        "Bump manifest specVersion from 0.0.2 to 0.0.4"
+    }
+
+    fn check(&self, ctx: &MigrationContext) -> Result<MigrationCheck> {
+        let manifest = load_manifest(ctx.manifest_path)?;
+
+        let spec_version = manifest
+            .get("specVersion")
+            .and_then(|v| v.as_str())
+            .unwrap_or("");
+
+        if spec_version == "0.0.2" || spec_version == "0.0.3" {
+            Ok(MigrationCheck::ShouldApply)
+        } else {
+            Ok(MigrationCheck::Skip)
+        }
+    }
+
+    fn apply(&self, ctx: &MigrationContext) -> Result<()> {
+        // Replace both 0.0.2 and 0.0.3 with 0.0.4
+        replace_in_file(
+            ctx.manifest_path,
+            &[(r#"specVersion: ['"]?0\.0\.[23]['"]?"#, "specVersion: 0.0.4")],
+        )
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    fn setup_manifest(content: &str) -> (TempDir, std::path::PathBuf) {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest_path = temp_dir.path().join("subgraph.yaml");
+        std::fs::write(&manifest_path, content).unwrap();
+        (temp_dir, manifest_path)
+    }
+
+    #[test]
+    fn test_spec_version_0_0_1_to_0_0_2_check() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.1\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_1To0_0_2;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::ShouldApply => {}
+            _ => panic!("Expected ShouldApply"),
+        }
+    }
+
+    #[test]
+    fn test_spec_version_0_0_1_to_0_0_2_skip() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.2\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_1To0_0_2;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::Skip => {}
+            _ => panic!("Expected Skip"),
+        }
+    }
+
+    #[test]
+    fn test_spec_version_0_0_1_to_0_0_2_apply() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.1\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_1To0_0_2;
+        migration.apply(&ctx).unwrap();
+
+        let content = std::fs::read_to_string(&manifest_path).unwrap();
+        assert!(content.contains("specVersion: 0.0.2"));
+        assert!(!content.contains("specVersion: 0.0.1"));
+    }
+
+    #[test]
+    fn test_spec_version_0_0_2_to_0_0_4_check() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.2\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_2To0_0_4;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::ShouldApply => {}
+            _ => panic!("Expected ShouldApply"),
+        }
+    }
+
+    #[test]
+    fn test_spec_version_0_0_3_to_0_0_4_check() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.3\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_2To0_0_4;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::ShouldApply => {}
+            _ => panic!("Expected ShouldApply"),
+        }
+    }
+
+    #[test]
+    fn test_spec_version_0_0_2_to_0_0_4_skip() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.4\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_2To0_0_4;
+        match migration.check(&ctx).unwrap() {
+            MigrationCheck::Skip => {}
+            _ => panic!("Expected Skip"),
+        }
+    }
+
+    #[test]
+    fn test_spec_version_0_0_2_to_0_0_4_apply() {
+        let (_temp_dir, manifest_path) = setup_manifest("specVersion: 0.0.2\ndataSources: []");
+        let ctx = MigrationContext {
+            manifest_path: &manifest_path,
+            source_dir: manifest_path.parent().unwrap(),
+        };
+
+        let migration = SpecVersion0_0_2To0_0_4;
+        migration.apply(&ctx).unwrap();
+
+        let content = std::fs::read_to_string(&manifest_path).unwrap();
+        assert!(content.contains("specVersion: 0.0.4"));
+        assert!(!content.contains("specVersion: 0.0.2"));
+    }
+}
diff --git a/gnd/src/migrations/versions.rs b/gnd/src/migrations/versions.rs
new file mode 100644
index 00000000000..f0cd6a3e221
--- /dev/null
+++ b/gnd/src/migrations/versions.rs
@@ -0,0 +1,144 @@
+//! Version detection utilities for migrations.
+//!
+//! Provides functions to detect the installed version of graph-ts
+//! by searching for its package.json in node_modules.
+
+use std::path::Path;
+
+use anyhow::{Result, anyhow};
+use semver::Version;
+
+/// Get the installed graph-ts version by searching node_modules.
+///
+/// Searches upward from `source_dir` looking for `node_modules/@graphprotocol/graph-ts/package.json`.
+/// Returns the version string from the package.json, or an error if not found.
+pub fn get_graph_ts_version(source_dir: &Path) -> Result<Version> {
+    let mut current = source_dir.canonicalize().ok();
+
+    while let Some(dir) = current {
+        let graph_ts_path = dir
+            .join("node_modules")
+            .join("@graphprotocol")
+            .join("graph-ts")
+            .join("package.json");
+
+        if graph_ts_path.exists() {
+            let content = std::fs::read_to_string(&graph_ts_path)?;
+            let pkg: serde_json::Value = serde_json::from_str(&content)?;
+
+            let version_str = pkg
+                .get("version")
+                .and_then(|v| v.as_str())
+                .ok_or_else(|| anyhow!("No version field in graph-ts package.json"))?;
+
+            // Parse version, handling prerelease versions by coercing
+            let version = parse_version(version_str)?;
+            return Ok(version);
+        }
+
+        // Move up to parent directory
+        current = dir.parent().map(|p| p.to_path_buf());
+    }
+
+    Err(anyhow!("graph-ts dependency not installed"))
+}
+
+/// Parse a version string, handling semver-incompatible formats.
+///
+/// Semver prerelease versions like "0.25.0-alpha.1" are valid, but we also
+/// handle cases where the version might have extra components.
+fn parse_version(version_str: &str) -> Result<Version> {
+    // Try direct parsing first
+    if let Ok(version) = Version::parse(version_str) {
+        return Ok(version);
+    }
+
+    // Try to extract just the major.minor.patch part
+    let parts: Vec<&str> = version_str
+        .split('-')
+        .next()
+        .unwrap_or(version_str)
+        .split('.')
+        .collect();
+    if parts.len() >= 3 {
+        let major: u64 = parts[0].parse()?;
+        let minor: u64 = parts[1].parse()?;
+        let patch: u64 = parts[2].parse()?;
+        return Ok(Version::new(major, minor, patch));
+    }
+
+    Err(anyhow!("Failed to parse version: {}", version_str))
+}
+
+/// Check if a version satisfies a minimum requirement.
+pub fn version_gte(version: &Version, major: u64, minor: u64, patch: u64) -> bool {
+    let requirement = Version::new(major, minor, patch);
+    version >= &requirement
+}
+
+/// Check if a version is greater than a reference.
+pub fn version_gt(version: &Version, major: u64, minor: u64, patch: u64) -> bool {
+    let requirement = Version::new(major, minor, patch);
+    version > &requirement
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_parse_version_simple() {
+        let v = parse_version("0.25.0").unwrap();
+        assert_eq!(v, Version::new(0, 25, 0));
+    }
+
+    #[test]
+    fn test_parse_version_prerelease() {
+        let v = parse_version("0.25.0-alpha.1").unwrap();
+        assert_eq!(v.major, 0);
+        assert_eq!(v.minor, 25);
+        assert_eq!(v.patch, 0);
+    }
+
+    #[test]
+    fn test_version_gte() {
+        let v = Version::new(0, 25, 0);
+        assert!(version_gte(&v, 0, 25, 0));
+        assert!(version_gte(&v, 0, 24, 0));
+        assert!(!version_gte(&v, 0, 26, 0));
+    }
+
+    #[test]
+    fn test_version_gt() {
+        let v = Version::new(0, 25, 0);
+        assert!(version_gt(&v, 0, 24, 0));
+        assert!(!version_gt(&v, 0, 25, 0));
+        assert!(!version_gt(&v, 0, 26, 0));
+    }
+
+    #[test]
+    fn test_get_graph_ts_version_not_found() {
+        let temp_dir = TempDir::new().unwrap();
+        let result = get_graph_ts_version(temp_dir.path());
+        assert!(result.is_err());
+        assert!(result.unwrap_err().to_string().contains("not installed"));
+    }
+
+    #[test]
+    fn test_get_graph_ts_version_found() {
+        let temp_dir = TempDir::new().unwrap();
+        let graph_ts_dir = temp_dir
+            .path()
+            .join("node_modules")
+            .join("@graphprotocol")
+            .join("graph-ts");
+        std::fs::create_dir_all(&graph_ts_dir).unwrap();
+
+        let package_json = r#"{"name": "@graphprotocol/graph-ts", "version": "0.32.0"}"#;
+        std::fs::write(graph_ts_dir.join("package.json"), package_json).unwrap();
+
+        let version = get_graph_ts_version(temp_dir.path()).unwrap();
+        assert_eq!(version, Version::new(0, 32, 0));
+    }
+}
diff --git a/gnd/src/output/mod.rs b/gnd/src/output/mod.rs
new file mode 100644
index 00000000000..e0cf8a356f5
--- /dev/null
+++ b/gnd/src/output/mod.rs
@@ -0,0 +1,58 @@
+mod spinner;
+
+pub use spinner::{Spinner, SpinnerResult, step as spinner_step, with_spinner};
+
+use console::style;
+
+/// Step type for standalone step printing (without spinner)
+#[derive(Debug, Clone, Copy)]
+pub enum Step {
+    /// Loading/reading a file
+    Load,
+    /// Generating code
+    Generate,
+    /// Writing a file
+    Write,
+    /// Skipping a step
+    Skip,
+    /// Deploying a subgraph
+    Deploy,
+    /// Done with all steps
+    Done,
+    /// Warning (non-fatal)
+    Warn,
+}
+
+/// Print a standalone step without a spinner.
+///
+/// This is used for code generation steps where we don't need
+/// the spinner animation but want consistent output formatting.
+pub fn step(step_type: Step, message: &str) {
+    let symbol = match step_type {
+        Step::Load => style("→").cyan(),
+        Step::Generate => style("→").cyan(),
+        Step::Write => style("→").cyan(),
+        Step::Skip => style("→").dim(),
+        Step::Deploy => style("→").cyan(),
+        Step::Done => style("✔").green(),
+        Step::Warn => style("⚠").yellow(),
+    };
+    println!("{} {}", symbol, message);
+}
+
+/// Print a standalone step result.
+pub struct StepResult;
+
+impl StepResult {
+    pub fn success(message: &str) {
+        println!("{} {}", style("✔").green(), message);
+    }
+
+    pub fn error(message: &str) {
+        eprintln!("{} {}", style("✖").red(), message);
+    }
+
+    pub fn warning(message: &str) {
+        println!("{} {}", style("⚠").yellow(), message);
+    }
+}
diff --git a/gnd/src/output/spinner.rs b/gnd/src/output/spinner.rs
new file mode 100644
index 00000000000..24822e294d3
--- /dev/null
+++ b/gnd/src/output/spinner.rs
@@ -0,0 +1,299 @@
+//! Spinner and progress output utilities.
+//!
+//! This module provides spinner functionality matching the output format of
+//! the TypeScript graph-cli, which uses gluegun's print.spin() (based on ora).
+//!
+//! # Examples
+//!
+//! ```ignore
+//! use gnd::output::{with_spinner, Spinner};
+//!
+//! // Simple usage with closure
+//! let result = with_spinner(
+//!     "Loading data",
+//!     "Failed to load data",
+//!     "Data loaded with warnings",
+//!     |spinner| {
+//!         // Do work...
+//!         Ok::<_, anyhow::Error>(42)
+//!     }
+//! )?;
+//!
+//! // Or use Spinner directly for more control
+//! let mut spinner = Spinner::new("Processing...");
+//! spinner.step("Step 1", Some("details"));
+//! spinner.succeed("Done!");
+//! ```
+
+use std::fmt::Display;
+use std::time::Duration;
+
+use console::{Term, style};
+use indicatif::{ProgressBar, ProgressStyle};
+
+/// The checkmark symbol used for successful steps (matches TS CLI)
+pub const SUCCESS_SYMBOL: &str = "✔";
+/// The cross symbol used for failed steps (matches TS CLI)
+pub const FAILURE_SYMBOL: &str = "✖";
+/// The warning symbol used for warnings
+pub const WARNING_SYMBOL: &str = "⚠";
+
+/// A command-line spinner for showing progress on long-running operations.
+///
+/// This matches the behavior of gluegun's `print.spin()` which is based on ora.
+pub struct Spinner {
+    progress: ProgressBar,
+    term: Term,
+}
+
+impl Spinner {
+    /// Create a new spinner with the given initial message.
+    pub fn new(message: impl Into<String>) -> Self {
+        let progress = ProgressBar::new_spinner();
+        progress.set_style(
+            ProgressStyle::default_spinner()
+                .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
+                .template("{spinner:.cyan} {msg}")
+                .expect("Invalid spinner template"),
+        );
+        progress.set_message(message.into());
+        progress.enable_steady_tick(Duration::from_millis(80));
+
+        Self {
+            progress,
+            term: Term::stderr(),
+        }
+    }
+
+    /// Update the spinner message.
+    pub fn set_message(&self, message: impl Into<String>) {
+        self.progress.set_message(message.into());
+    }
+
+    /// Stop the spinner and show a step with optional details.
+    ///
+    /// The spinner will continue after showing the step (matches TS CLI behavior).
+    pub fn step(&self, subject: impl Display, text: Option<impl Display>) {
+        self.progress.suspend(|| {
+            let msg = if let Some(text) = text {
+                format!("{} {}", style(subject).dim(), style(text).dim())
+            } else {
+                format!("{}", style(subject).dim())
+            };
+            let _ = self.term.write_line(&msg);
+        });
+    }
+
+    /// Stop the spinner with a success checkmark and message.
+    pub fn succeed(self, message: impl Display) {
+        self.progress.finish_and_clear();
+        let _ = self
+            .term
+            .write_line(&format!("{} {}", style(SUCCESS_SYMBOL).green(), message));
+    }
+
+    /// Stop the spinner with a failure X and message.
+    pub fn fail(self, message: impl Display) {
+        self.progress.finish_and_clear();
+        let _ = self
+            .term
+            .write_line(&format!("{} {}", style(FAILURE_SYMBOL).red(), message));
+    }
+
+    /// Stop the spinner with a warning symbol and message.
+    pub fn warn(self, message: impl Display) {
+        self.progress.finish_and_clear();
+        let _ = self
+            .term
+            .write_line(&format!("{} {}", style(WARNING_SYMBOL).yellow(), message));
+    }
+
+    /// Stop the spinner, clearing the line without any message.
+    pub fn stop(self) {
+        self.progress.finish_and_clear();
+    }
+
+    /// Stop the spinner and persist with a custom symbol and text.
+    pub fn stop_and_persist(self, symbol: impl Display, message: impl Display) {
+        self.progress.finish_and_clear();
+        let _ = self.term.write_line(&format!("{} {}", symbol, message));
+    }
+}
+
+/// Result type for spinner operations that can have warnings.
+#[derive(Debug)]
+pub enum SpinnerResult<T> {
+    /// Operation succeeded without warnings
+    Ok(T),
+    /// Operation succeeded with a warning
+    Warning { result: T, warning: String },
+    /// Operation failed with an error message
+    Error { result: Option<T>, error: String },
+}
+
+impl<T> SpinnerResult<T> {
+    /// Create a successful result
+    pub fn ok(result: T) -> Self {
+        SpinnerResult::Ok(result)
+    }
+
+    /// Create a result with a warning
+    pub fn warning(result: T, warning: impl Into<String>) -> Self {
+        SpinnerResult::Warning {
+            result,
+            warning: warning.into(),
+        }
+    }
+
+    /// Create an error result
+    pub fn error(error: impl Into<String>) -> Self {
+        SpinnerResult::Error {
+            result: None,
+            error: error.into(),
+        }
+    }
+
+    /// Create an error result with a partial result
+    pub fn error_with_result(result: T, error: impl Into<String>) -> Self {
+        SpinnerResult::Error {
+            result: Some(result),
+            error: error.into(),
+        }
+    }
+}
+
+/// Execute a function with a spinner, showing progress and handling errors.
+///
+/// This matches the TS CLI's `withSpinner` function behavior:
+/// - Shows `text` while the operation is in progress
+/// - On success, shows `text` with a checkmark
+/// - On error, shows `error_text: <error message>` with an X
+/// - If the function returns `SpinnerResult::Warning`, shows the warning but still succeeds
+///
+/// # Arguments
+///
+/// * `text` - The text to show while the operation is in progress (and on success)
+/// * `error_text` - The prefix for error messages
+/// * `warning_text` - The prefix for warning messages
+/// * `f` - The function to execute
+///
+/// # Returns
+///
+/// The result of the function, or an error if the function failed.
+///
+/// # Examples
+///
+/// ```ignore
+/// let result = with_spinner(
+///     "Uploading files",
+///     "Failed to upload",
+///     "Uploaded with warnings",
+///     |spinner| {
+///         spinner.step("Preparing", Some("files"));
+///         // Do work...
+///         Ok::<_, anyhow::Error>(42)
+///     }
+/// )?;
+/// ```
+pub fn with_spinner<T, E>(
+    text: impl Into<String>,
+    error_text: impl Into<String>,
+    _warning_text: impl Into<String>,
+    f: impl FnOnce(&Spinner) -> Result<T, E>,
+) -> Result<T, E>
+where
+    E: Display,
+{
+    let text = text.into();
+    let error_text = error_text.into();
+
+    let spinner = Spinner::new(&text);
+
+    match f(&spinner) {
+        Ok(result) => {
+            spinner.succeed(&text);
+            Ok(result)
+        }
+        Err(e) => {
+            spinner.fail(format!("{}: {}", error_text, e));
+            Err(e)
+        }
+    }
+}
+
+/// Execute a step as part of a spinner, showing the step description.
+///
+/// This matches the TS CLI's `step` function which shows a muted step
+/// description while continuing the spinner.
+pub fn step(spinner: &Spinner, subject: impl Display, text: Option<impl Display>) {
+    spinner.step(subject, text);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_spinner_result_ok() {
+        let result: SpinnerResult<i32> = SpinnerResult::ok(42);
+        match result {
+            SpinnerResult::Ok(v) => assert_eq!(v, 42),
+            _ => panic!("Expected Ok"),
+        }
+    }
+
+    #[test]
+    fn test_spinner_result_warning() {
+        let result: SpinnerResult<i32> = SpinnerResult::warning(42, "some warning");
+        match result {
+            SpinnerResult::Warning { result, warning } => {
+                assert_eq!(result, 42);
+                assert_eq!(warning, "some warning");
+            }
+            _ => panic!("Expected Warning"),
+        }
+    }
+
+    #[test]
+    fn test_spinner_result_error() {
+        let result: SpinnerResult<i32> = SpinnerResult::error("some error");
+        match result {
+            SpinnerResult::Error { result, error } => {
+                assert!(result.is_none());
+                assert_eq!(error, "some error");
+            }
+            _ => panic!("Expected Error"),
+        }
+    }
+
+    #[test]
+    fn test_spinner_result_error_with_result() {
+        let result: SpinnerResult<i32> = SpinnerResult::error_with_result(42, "partial error");
+        match result {
+            SpinnerResult::Error { result, error } => {
+                assert_eq!(result, Some(42));
+                assert_eq!(error, "partial error");
+            }
+            _ => panic!("Expected Error"),
+        }
+    }
+
+    #[test]
+    fn test_with_spinner_success() {
+        let result: Result<i32, &str> =
+            with_spinner("Testing", "Test failed", "Test warning", |_spinner| {
+                Ok::<_, &str>(42)
+            });
+        assert_eq!(result.unwrap(), 42);
+    }
+
+    #[test]
+    fn test_with_spinner_error() {
+        let result: Result<i32, &str> =
+            with_spinner("Testing", "Test failed", "Test warning", |_spinner| {
+                Err::<i32, _>("error occurred")
+            });
+        assert!(result.is_err());
+        assert_eq!(result.unwrap_err(), "error occurred");
+    }
+}
diff --git a/gnd/src/prompt.rs b/gnd/src/prompt.rs
new file mode 100644
index 00000000000..ed2a2037f98
--- /dev/null
+++ b/gnd/src/prompt.rs
@@ -0,0 +1,771 @@
+//! Interactive prompt utilities for CLI commands.
+//!
+//! This module provides wrappers around the `inquire` crate to provide
+//! consistent prompting behavior similar to the TypeScript graph-cli.
+
+use std::path::Path;
+
+use anyhow::Result;
+use console::{Term, style};
+use inquire::parser::CustomTypeParser;
+use inquire::validator::Validation;
+use inquire::{Autocomplete, Confirm, CustomType, CustomUserError, Select, Text};
+
+use crate::output::{Step, step};
+use crate::services::{ContractInfo, ContractService, Network, NetworksRegistry};
+
+/// Format a network for display.
+fn format_network(network: &Network) -> String {
+    let full_name = network.full_name.as_deref().unwrap_or(&network.id);
+    format!("{} ({})", full_name, network.id)
+}
+
+/// A network autocompleter that works with owned data.
+#[derive(Clone)]
+struct SimpleNetworkCompleter {
+    entries: Vec<NetworkEntry>,
+}
+
+#[derive(Clone)]
+struct NetworkEntry {
+    display: String,
+    search_terms: String,
+}
+
+impl SimpleNetworkCompleter {
+    fn new(registry: &NetworksRegistry) -> Self {
+        let entries: Vec<NetworkEntry> = registry
+            .networks
+            .iter()
+            .map(|n| {
+                let display = format_network(n);
+                let search_terms = format!(
+                    "{} {} {} {}",
+                    n.id,
+                    n.full_name.as_deref().unwrap_or(""),
+                    n.short_name.as_deref().unwrap_or(""),
+                    n.aliases.join(" ")
+                )
+                .to_lowercase();
+                NetworkEntry {
+                    display,
+                    search_terms,
+                }
+            })
+            .collect();
+        Self { entries }
+    }
+}
+
+impl Autocomplete for SimpleNetworkCompleter {
+    fn get_suggestions(&mut self, input: &str) -> Result<Vec<String>, CustomUserError> {
+        let input_lower = input.to_lowercase();
+        let matches: Vec<String> = self
+            .entries
+            .iter()
+            .filter(|e| {
+                e.search_terms.contains(&input_lower)
+                    || e.display.to_lowercase().contains(&input_lower)
+            })
+            .take(15)
+            .map(|e| e.display.clone())
+            .collect();
+        Ok(matches)
+    }
+
+    fn get_completion(
+        &mut self,
+        _input: &str,
+        highlighted_suggestion: Option<String>,
+    ) -> Result<inquire::autocompletion::Replacement, CustomUserError> {
+        Ok(highlighted_suggestion)
+    }
+}
+
+/// Prompt for the subgraph slug/name.
+pub fn prompt_subgraph_name(default: Option<&str>) -> Result<String> {
+    let mut prompt = Text::new("Subgraph slug:")
+        .with_help_message("e.g., my-subgraph or myorg/my-subgraph")
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Invalid("Subgraph slug cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        });
+
+    if let Some(d) = default {
+        prompt = prompt.with_default(d);
+    }
+
+    let name = prompt.prompt()?;
+    Ok(format_subgraph_name(&name))
+}
+
+/// Prompt for the directory to create the subgraph in.
+pub fn prompt_directory(default: Option<&str>) -> Result<String> {
+    let mut prompt = Text::new("Directory:")
+        .with_help_message("Directory to create the subgraph in")
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Invalid("Directory cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        });
+
+    if let Some(d) = default {
+        prompt = prompt.with_default(d);
+    }
+
+    Ok(prompt.prompt()?)
+}
+
+/// Prompt for a contract address.
+pub fn prompt_contract_address() -> Result<String> {
+    Text::new("Contract address:")
+        .with_help_message("0x... address of the contract")
+        .with_validator(|input: &str| {
+            if !input.starts_with("0x") || input.len() != 42 {
+                Ok(Validation::Invalid(
+                    "Address must start with 0x and be 42 characters".into(),
+                ))
+            } else if !input[2..].chars().all(|c| c.is_ascii_hexdigit()) {
+                Ok(Validation::Invalid(
+                    "Address must contain only hex characters".into(),
+                ))
+            } else {
+                Ok(Validation::Valid)
+            }
+        })
+        .prompt()
+        .map_err(Into::into)
+}
+
+/// Prompt for the contract name.
+pub fn prompt_contract_name(default: Option<&str>) -> Result<String> {
+    let mut prompt = Text::new("Contract name:")
+        .with_help_message("Name for the contract (used in generated code)")
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Invalid("Contract name cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        });
+
+    if let Some(d) = default {
+        prompt = prompt.with_default(d);
+    } else {
+        prompt = prompt.with_default("Contract");
+    }
+
+    Ok(prompt.prompt()?)
+}
+
+/// Prompt for the start block.
+pub fn prompt_start_block(default: Option<u64>) -> Result<Option<u64>> {
+    let default_str = default
+        .map(|b| b.to_string())
+        .unwrap_or_else(|| "0".to_string());
+
+    let input = Text::new("Start block:")
+        .with_help_message("Block number to start indexing from")
+        .with_default(&default_str)
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Valid)
+            } else if input.parse::<u64>().is_err() {
+                Ok(Validation::Invalid("Must be a valid block number".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        })
+        .prompt()?;
+
+    if input.trim().is_empty() {
+        Ok(None)
+    } else {
+        Ok(input.parse().ok())
+    }
+}
+
+/// Prompt for whether to index events.
+pub fn prompt_index_events() -> Result<bool> {
+    Confirm::new("Index contract events as entities?")
+        .with_default(true)
+        .with_help_message("Generate entities for each event in the contract ABI")
+        .prompt()
+        .map_err(Into::into)
+}
+
+/// Prompt for whether to add another contract to the subgraph.
+pub fn prompt_add_another_contract(network: &str) -> Result<bool> {
+    Confirm::new(&format!("Add another contract from {}?", network))
+        .with_default(false)
+        .prompt()
+        .map_err(Into::into)
+}
+
+/// Prompt for the source type (contract, example, subgraph).
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum SourceType {
+    Contract,
+    Example,
+    // Subgraph support is not yet implemented
+}
+
+impl std::fmt::Display for SourceType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SourceType::Contract => write!(f, "Smart contract"),
+            SourceType::Example => write!(f, "Example subgraph"),
+        }
+    }
+}
+
+/// Prompt for the scaffold source type.
+pub fn prompt_source_type() -> Result<SourceType> {
+    let options = vec![SourceType::Contract, SourceType::Example];
+
+    Select::new("Source:", options)
+        .with_help_message("How to initialize the subgraph")
+        .prompt()
+        .map_err(Into::into)
+}
+
+/// Prompt for ABI file path.
+pub fn prompt_abi_path() -> Result<Option<String>> {
+    let has_abi = Confirm::new("Do you have an ABI file?")
+        .with_default(false)
+        .with_help_message("If not, we'll try to fetch it from Etherscan/Sourcify")
+        .prompt()?;
+
+    if has_abi {
+        let path = Text::new("ABI file path:")
+            .with_help_message("Path to the contract ABI JSON file")
+            .prompt()?;
+        Ok(Some(path))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Prompt for subgraph slug with graph-cli style confirmation output.
+///
+/// After the user enters a value, clears the prompt line and shows:
+/// `✔ Subgraph slug · <value>`
+pub fn prompt_subgraph_slug_with_confirm(default: Option<&str>) -> Result<String> {
+    let term = Term::stderr();
+    let mut prompt = Text::new("Subgraph slug")
+        .with_help_message("e.g., my-subgraph or myorg/my-subgraph")
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Invalid("Subgraph slug cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        });
+
+    if let Some(d) = default {
+        prompt = prompt.with_default(d);
+    }
+
+    let name = prompt.prompt()?;
+    let formatted = format_subgraph_name(&name);
+
+    // Clear the previous line and print confirmation
+    let _ = term.clear_last_lines(1);
+    let label = "Subgraph slug";
+    println!(
+        "{} {} {} {}",
+        style("✔").green(),
+        label,
+        style("·").dim(),
+        formatted
+    );
+
+    Ok(formatted)
+}
+
+/// Prompt for directory with graph-cli style confirmation output.
+///
+/// After the user enters a value, clears the prompt line and shows:
+/// `✔ Directory to create the subgraph in · <value>`
+pub fn prompt_directory_with_confirm(default: Option<&str>) -> Result<String> {
+    let term = Term::stderr();
+    let mut prompt = Text::new("Directory to create the subgraph in")
+        .with_help_message("Directory name for the new subgraph")
+        .with_validator(|input: &str| {
+            if input.trim().is_empty() {
+                Ok(Validation::Invalid("Directory cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        });
+
+    if let Some(d) = default {
+        prompt = prompt.with_default(d);
+    }
+
+    let dir = prompt.prompt()?;
+
+    // Clear the previous line and print confirmation
+    let _ = term.clear_last_lines(1);
+    let label = "Directory to create the subgraph in";
+    println!(
+        "{} {} {} {}",
+        style("✔").green(),
+        label,
+        style("·").dim(),
+        dir
+    );
+
+    Ok(dir)
+}
+
+/// Resolve directory collision by prompting for a new directory name.
+///
+/// If the given directory already exists, asks the user for an alternative
+/// directory name instead of failing with an error. Continues prompting
+/// until a non-existent directory is chosen.
+///
+/// Returns the resolved directory path as a String.
+pub fn resolve_directory_collision(initial_dir: &Path) -> Result<String> {
+    if !initial_dir.exists() {
+        return Ok(initial_dir.to_str().unwrap_or("subgraph").to_string());
+    }
+
+    // Directory exists, warn and prompt for a new name
+    eprintln!(
+        "{} Directory '{}' already exists",
+        style("!").yellow(),
+        initial_dir.display()
+    );
+
+    loop {
+        let dir = Text::new("Enter a different directory name:")
+            .with_help_message("Choose a directory that doesn't exist")
+            .with_validator(|input: &str| {
+                if input.trim().is_empty() {
+                    Ok(Validation::Invalid("Directory cannot be empty".into()))
+                } else {
+                    Ok(Validation::Valid)
+                }
+            })
+            .prompt()?;
+
+        let path = Path::new(&dir);
+        if path.exists() {
+            eprintln!(
+                "{} Directory '{}' also exists, please try another name",
+                style("!").yellow(),
+                dir
+            );
+        } else {
+            return Ok(dir);
+        }
+    }
+}
+
+/// Format a subgraph name to be valid.
+fn format_subgraph_name(name: &str) -> String {
+    name.trim()
+        .to_lowercase()
+        .chars()
+        .map(|c| {
+            if c.is_alphanumeric() || c == '-' || c == '/' {
+                c
+            } else {
+                '-'
+            }
+        })
+        .collect()
+}
+
+/// Extract the directory name from a subgraph name.
+pub fn get_subgraph_basename(name: &str) -> String {
+    name.split('/').next_back().unwrap_or(name).to_string()
+}
+
+/// Normalize a version label from either a flag or interactive prompt.
+pub fn normalize_version_label(label: &str) -> String {
+    label.trim_matches(|c| c == '"' || c == ' ').to_string()
+}
+
+/// Prompt for a version label for deployment.
+/// Uses CustomType instead of Text to normalize the input before validation
+pub fn prompt_version_label() -> Result<String> {
+    let parser: CustomTypeParser<String> = &|val| {
+        let normalized = normalize_version_label(val);
+        Ok(normalized)
+    };
+    let label = CustomType::<String>::new("Which version label to use? (e.g. v0.0.1):")
+        .with_parser(parser)
+        .with_validator(|input: &String| {
+            if input.is_empty() {
+                Ok(Validation::Invalid("Version label cannot be empty".into()))
+            } else {
+                Ok(Validation::Valid)
+            }
+        })
+        .prompt()?;
+
+    Ok(label)
+}
+
+/// Interactive init form for when options are not fully provided.
+pub struct InitForm {
+    pub network: String,
+    pub subgraph_name: String,
+    pub directory: String,
+    pub source_type: SourceType,
+    pub contract_address: Option<String>,
+    pub contract_name: String,
+    /// User-confirmed start block. May differ from the fetched default in
+    /// `contract_info` if the user modified it when prompted.
+    pub start_block: Option<u64>,
+    pub index_events: bool,
+    pub abi_path: Option<String>,
+    /// Cached contract info fetched during interactive prompts, to avoid
+    /// re-fetching. Primarily used for the ABI; the `start_block` here is
+    /// the original fetched value before user confirmation (use
+    /// `self.start_block` for the final value).
+    pub contract_info: Option<ContractInfo>,
+}
+
+impl InitForm {
+    /// Run the interactive form, filling in missing values.
+    ///
+    /// The flow for contract mode is:
+    /// 1. Prompt for network (if not provided)
+    /// 2. Prompt for contract address (if not provided)
+    /// 3. Fetch contract info from Etherscan/Sourcify (ABI, name, start block)
+    /// 4. Use fetched values as defaults for remaining prompts
+    #[allow(clippy::too_many_arguments)]
+    pub async fn run_interactive(
+        registry: &NetworksRegistry,
+        // Pre-filled values from CLI args
+        network: Option<String>,
+        subgraph_name: Option<String>,
+        directory: Option<String>,
+        from_contract: Option<String>,
+        from_example: bool,
+        contract_name: Option<String>,
+        start_block: Option<u64>,
+        index_events: bool,
+        abi_path: Option<String>,
+    ) -> Result<Self> {
+        // Determine source type from flags or prompt
+        let source_type = if from_contract.is_some() {
+            SourceType::Contract
+        } else if from_example {
+            SourceType::Example
+        } else {
+            prompt_source_type()?
+        };
+
+        // For example mode, we only need subgraph name and directory
+        if source_type == SourceType::Example {
+            let subgraph_name = match subgraph_name {
+                Some(n) => n,
+                None => prompt_subgraph_name(None)?,
+            };
+
+            let default_dir = get_subgraph_basename(&subgraph_name);
+            let directory = match directory {
+                Some(d) => d,
+                None => prompt_directory(Some(&default_dir))?,
+            };
+
+            return Ok(Self {
+                network: "mainnet".to_string(), // Not used for example
+                subgraph_name,
+                directory,
+                source_type,
+                contract_address: None,
+                contract_name: "Contract".to_string(),
+                start_block: None,
+                index_events: false,
+                abi_path: None,
+                contract_info: None,
+            });
+        }
+
+        // For contract mode, we need network, address, etc.
+
+        // Step 1: Network
+        let network = match network {
+            Some(n) => n,
+            None => prompt_network_interactive(registry)?,
+        };
+
+        // Step 2: Contract address
+        let contract_address = match from_contract {
+            Some(addr) => addr,
+            None => prompt_contract_address()?,
+        };
+
+        // Step 3: Fetch contract info immediately after getting address
+        // This allows us to use fetched values as defaults for remaining prompts
+        let fetched_info = if abi_path.is_none() {
+            fetch_contract_info_interactive(&network, &contract_address).await
+        } else {
+            None
+        };
+
+        // Step 4: Contract name (use fetched name as default)
+        let default_contract_name = fetched_info
+            .as_ref()
+            .map(|info| info.name.clone())
+            .or_else(|| contract_name.clone());
+        let contract_name = match contract_name {
+            Some(n) => n,
+            None => prompt_contract_name(default_contract_name.as_deref())?,
+        };
+
+        // Subgraph name
+        let default_subgraph_name = contract_name.to_lowercase();
+        let subgraph_name = match subgraph_name {
+            Some(n) => n,
+            None => prompt_subgraph_name(Some(&default_subgraph_name))?,
+        };
+
+        // Directory
+        let default_dir = get_subgraph_basename(&subgraph_name);
+        let directory = match directory {
+            Some(d) => d,
+            None => prompt_directory(Some(&default_dir))?,
+        };
+
+        // ABI path - only prompt if we didn't fetch it successfully
+        let abi_path = match abi_path {
+            Some(p) => Some(p),
+            None => {
+                if fetched_info.is_some() {
+                    // We successfully fetched the ABI, no need to prompt
+                    None
+                } else {
+                    prompt_abi_path()?
+                }
+            }
+        };
+
+        // Start block (use fetched start block as default)
+        let default_start_block = fetched_info
+            .as_ref()
+            .and_then(|info| info.start_block)
+            .or(start_block);
+        let start_block = if start_block.is_some() {
+            start_block
+        } else {
+            prompt_start_block(default_start_block)?
+        };
+
+        // Index events
+        let index_events = if index_events {
+            true
+        } else {
+            prompt_index_events()?
+        };
+
+        Ok(Self {
+            network,
+            subgraph_name,
+            directory,
+            source_type,
+            contract_address: Some(contract_address),
+            contract_name,
+            start_block,
+            index_events,
+            abi_path,
+            contract_info: fetched_info,
+        })
+    }
+}
+
+/// Fetch contract info from Etherscan/Sourcify with status feedback.
+///
+/// Returns None if fetching fails (the prompts will fall back to manual entry).
+async fn fetch_contract_info_interactive(network: &str, address: &str) -> Option<ContractInfo> {
+    step(
+        Step::Load,
+        &format!("Fetching contract info for {} on {}", address, network),
+    );
+
+    // Load the contract service
+    let service = match ContractService::load().await {
+        Ok(s) => s,
+        Err(e) => {
+            step(
+                Step::Warn,
+                &format!("Could not load contract service: {}", e),
+            );
+            return None;
+        }
+    };
+
+    // Fetch the contract info
+    match service.get_contract_info(network, address).await {
+        Ok(info) => {
+            step(Step::Done, &format!("Found contract: {}", info.name));
+            Some(info)
+        }
+        Err(e) => {
+            step(
+                Step::Warn,
+                &format!(
+                    "Could not fetch contract info: {}. You'll need to provide an ABI file.",
+                    e
+                ),
+            );
+            None
+        }
+    }
+}
+
+/// Prompt for network selection using the simple completer.
+fn prompt_network_interactive(registry: &NetworksRegistry) -> Result<String> {
+    let completer = SimpleNetworkCompleter::new(registry);
+
+    let input = Text::new("Network:")
+        .with_autocomplete(completer)
+        .with_help_message("Type to search (mainnet, polygon, arbitrum-one, etc.)")
+        .prompt()?;
+
+    // Extract network ID from the selection
+    // Format is "Full Name (id)"
+    if let Some(start) = input.rfind('(')
+        && let Some(end) = input.rfind(')')
+    {
+        let id = &input[start + 1..end];
+        if registry.get_network(id).is_some() {
+            return Ok(id.to_string());
+        }
+    }
+
+    // Try the input as-is
+    if registry.get_network(&input).is_some() {
+        return Ok(input);
+    }
+
+    anyhow::bail!(
+        "Network '{}' not found in registry. Check available networks at https://thegraph.com/docs/en/supported-networks/",
+        input
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_format_subgraph_name() {
+        assert_eq!(format_subgraph_name("My Subgraph"), "my-subgraph");
+        assert_eq!(format_subgraph_name("org/my-subgraph"), "org/my-subgraph");
+        assert_eq!(format_subgraph_name("  test  "), "test");
+        assert_eq!(format_subgraph_name("Test_123"), "test-123");
+        assert_eq!(format_subgraph_name("a/b/c"), "a/b/c");
+    }
+
+    #[test]
+    fn test_get_subgraph_basename() {
+        assert_eq!(get_subgraph_basename("my-subgraph"), "my-subgraph");
+        assert_eq!(get_subgraph_basename("org/my-subgraph"), "my-subgraph");
+        assert_eq!(get_subgraph_basename("a/b/c"), "c");
+        assert_eq!(get_subgraph_basename(""), "");
+    }
+
+    #[test]
+    fn test_normalize_version_label() {
+        assert_eq!(normalize_version_label("v1.0.0"), "v1.0.0");
+        assert_eq!(normalize_version_label("  v1.0.0  "), "v1.0.0");
+        assert_eq!(normalize_version_label("\"v1.0.0\""), "v1.0.0");
+        assert_eq!(normalize_version_label(" \"v1.0.0\" "), "v1.0.0");
+        assert_eq!(normalize_version_label("v1.0.0-beta"), "v1.0.0-beta");
+        assert_eq!(normalize_version_label(" my version "), "my version");
+    }
+
+    #[test]
+    fn test_format_network() {
+        let network = Network {
+            id: "mainnet".to_string(),
+            short_name: Some("Ethereum".to_string()),
+            full_name: Some("Ethereum Mainnet".to_string()),
+            aliases: vec!["ethereum".to_string()],
+            caip2_id: "eip155:1".to_string(),
+            api_urls: vec![],
+            rpc_urls: vec![],
+        };
+        assert_eq!(format_network(&network), "Ethereum Mainnet (mainnet)");
+
+        let network_no_full_name = Network {
+            id: "custom".to_string(),
+            short_name: None,
+            full_name: None,
+            aliases: vec![],
+            caip2_id: "eip155:999".to_string(),
+            api_urls: vec![],
+            rpc_urls: vec![],
+        };
+        assert_eq!(format_network(&network_no_full_name), "custom (custom)");
+    }
+
+    #[test]
+    fn test_source_type_display() {
+        assert_eq!(SourceType::Contract.to_string(), "Smart contract");
+        assert_eq!(SourceType::Example.to_string(), "Example subgraph");
+    }
+
+    #[test]
+    fn test_simple_network_completer() {
+        let registry = NetworksRegistry {
+            networks: vec![
+                Network {
+                    id: "mainnet".to_string(),
+                    short_name: Some("Ethereum".to_string()),
+                    full_name: Some("Ethereum Mainnet".to_string()),
+                    aliases: vec!["ethereum".to_string(), "eth".to_string()],
+                    caip2_id: "eip155:1".to_string(),
+                    api_urls: vec![],
+                    rpc_urls: vec![],
+                },
+                Network {
+                    id: "polygon".to_string(),
+                    short_name: Some("Polygon".to_string()),
+                    full_name: Some("Polygon Mainnet".to_string()),
+                    aliases: vec!["matic".to_string()],
+                    caip2_id: "eip155:137".to_string(),
+                    api_urls: vec![],
+                    rpc_urls: vec![],
+                },
+            ],
+        };
+
+        let mut completer = SimpleNetworkCompleter::new(&registry);
+
+        // Test suggestions for "mainnet" (exact ID match)
+        let suggestions = completer.get_suggestions("mainnet").unwrap();
+        assert!(!suggestions.is_empty());
+        assert!(suggestions[0].contains("Ethereum Mainnet"));
+
+        // Test suggestions for "eth" (matches "ethereum" alias)
+        let suggestions = completer.get_suggestions("eth").unwrap();
+        assert!(!suggestions.is_empty());
+        // Should match the network with "ethereum" in aliases
+        assert!(suggestions.iter().any(|s| s.contains("Ethereum")));
+
+        // Test suggestions for "matic" (only matches polygon)
+        let suggestions = completer.get_suggestions("matic").unwrap();
+        assert_eq!(suggestions.len(), 1);
+        assert!(suggestions[0].contains("Polygon"));
+
+        // Test suggestions for empty string (should return all)
+        let suggestions = completer.get_suggestions("").unwrap();
+        assert_eq!(suggestions.len(), 2);
+
+        // Test no matches
+        let suggestions = completer.get_suggestions("nonexistent").unwrap();
+        assert!(suggestions.is_empty());
+    }
+}
diff --git a/gnd/src/scaffold/manifest.rs b/gnd/src/scaffold/manifest.rs
new file mode 100644
index 00000000000..b0b731ff4be
--- /dev/null
+++ b/gnd/src/scaffold/manifest.rs
@@ -0,0 +1,416 @@
+//! Manifest (subgraph.yaml) generation for scaffold.
+
+use std::collections::HashMap;
+
+use super::ScaffoldOptions;
+use crate::shared::handle_reserved_word;
+
+/// Generate the subgraph.yaml manifest content.
+pub fn generate_manifest(options: &ScaffoldOptions) -> String {
+    let contract_name = &options.contract_name;
+    let network = &options.network;
+    let mapping_file = format!("./src/{}.ts", super::to_kebab_case(contract_name));
+    let abi_file = format!("./abis/{}.json", contract_name);
+
+    let mut source = String::new();
+
+    if let Some(address) = &options.address {
+        source.push_str(&format!("      address: \"{}\"\n", address));
+    }
+
+    source.push_str(&format!("      abi: {contract_name}\n"));
+
+    if let Some(start_block) = options.start_block {
+        source.push_str(&format!("      startBlock: {}\n", start_block));
+    }
+
+    // Resolve events once (disambiguating overloaded names) so the handlers and
+    // entities lists stay consistent.
+    let events = disambiguate_events(extract_events_from_abi(options));
+    let event_handlers = get_event_handlers(contract_name, &events);
+
+    format!(
+        r#"specVersion: {spec_version}
+indexerHints:
+  prune: auto
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum
+    name: {contract_name}
+    network: {network}
+    source:
+{source}    mapping:
+      kind: ethereum/events
+      apiVersion: {api_version}
+      language: wasm/assemblyscript
+      entities:{entities}
+      abis:
+        - name: {contract_name}
+          file: {abi_file}
+      eventHandlers:{event_handlers}
+      file: {mapping_file}
+"#,
+        spec_version = super::SPEC_VERSION,
+        api_version = super::MAPPING_API_VERSION,
+        entities = get_entities(&events),
+    )
+}
+
+/// Get event handlers for the manifest.
+fn get_event_handlers(contract_name: &str, events: &[ResolvedEvent]) -> String {
+    if events.is_empty() {
+        // Default placeholder handler
+        return format!(
+            r#"
+        - event: ExampleEvent(indexed address,uint256)
+          handler: handle{contract_name}ExampleEvent"#
+        );
+    }
+
+    let mut handlers = String::new();
+    for event in events {
+        handlers.push_str(&format!(
+            "\n        - event: {}\n          handler: handle{}",
+            event.event.signature, event.alias
+        ));
+    }
+
+    handlers
+}
+
+/// Get entities list for the manifest.
+fn get_entities(events: &[ResolvedEvent]) -> String {
+    if events.is_empty() {
+        return "\n        - ExampleEntity".to_string();
+    }
+
+    let mut entities = String::new();
+    for event in events {
+        entities.push_str(&format!("\n        - {}", event.entity_name));
+    }
+    entities
+}
+
+/// Event info extracted from ABI.
+#[derive(Debug, Clone)]
+pub struct EventInfo {
+    pub name: String,
+    pub signature: String,
+    pub inputs: Vec<EventInput>,
+}
+
+/// An event resolved to the concrete names the generators render.
+///
+/// Decided once (here / by collision resolution) so the schema, mapping and
+/// manifest generators never derive names independently:
+/// - `alias` names the handler function and the ABI event-type import; it is
+///   disambiguated for events overloaded within a single ABI.
+/// - `entity_name` names the GraphQL entity type, the `new` expression and the
+///   schema import; it gains a contract prefix when it collides with an entity
+///   that already exists in the subgraph.
+/// - `declare_in_schema` is false when the event reuses an entity that already
+///   exists (a merge), so the type must not be redeclared.
+#[derive(Debug, Clone)]
+pub struct ResolvedEvent {
+    pub event: EventInfo,
+    pub alias: String,
+    pub entity_name: String,
+    pub declare_in_schema: bool,
+}
+
+/// Resolve events for a fresh scaffold, disambiguating names that are overloaded
+/// within one ABI by suffixing repeats (`Transfer`, `Transfer1`, ...). There are
+/// no existing entities to collide with, so each entity is declared as-is.
+pub fn disambiguate_events(events: Vec<EventInfo>) -> Vec<ResolvedEvent> {
+    let mut seen: HashMap<String, usize> = HashMap::new();
+    events
+        .into_iter()
+        .map(|event| {
+            let count = seen.entry(event.name.clone()).or_insert(0);
+            let alias = if *count == 0 {
+                event.name.clone()
+            } else {
+                format!("{}{}", event.name, count)
+            };
+            *count += 1;
+            let entity_name = alias.clone();
+            ResolvedEvent {
+                event,
+                alias,
+                entity_name,
+                declare_in_schema: true,
+            }
+        })
+        .collect()
+}
+
+/// The `event.params.<name>` accessor for each input, mirroring the names the
+/// ABI codegen gives the generated getters: reserved words are escaped and
+/// unnamed params become `param<index>`, with a counter for any collisions.
+/// Keeps the mapping's right-hand side in sync with the generated bindings.
+pub fn event_param_accessors(inputs: &[EventInput]) -> Vec<String> {
+    let mut seen: HashMap<String, u32> = HashMap::new();
+    inputs
+        .iter()
+        .enumerate()
+        .map(|(index, input)| {
+            let base = if input.name.is_empty() {
+                format!("param{index}")
+            } else {
+                handle_reserved_word(&input.name)
+            };
+            let count = seen.entry(base.clone()).or_insert(0);
+            let name = if *count == 0 {
+                base.clone()
+            } else {
+                format!("{base}{count}")
+            };
+            *count += 1;
+            name
+        })
+        .collect()
+}
+
+/// Event input parameter.
+#[derive(Debug, Clone)]
+pub struct EventInput {
+    pub name: String,
+    pub solidity_type: String,
+    pub indexed: bool,
+}
+
+/// Extract events from ABI JSON.
+pub fn extract_events_from_abi(options: &ScaffoldOptions) -> Vec<EventInfo> {
+    let Some(abi) = &options.abi else {
+        return vec![];
+    };
+
+    let Some(items) = abi.as_array() else {
+        return vec![];
+    };
+
+    let mut events = Vec::new();
+
+    for item in items {
+        if item.get("type").and_then(|t| t.as_str()) != Some("event") {
+            continue;
+        }
+
+        let Some(name) = item.get("name").and_then(|n| n.as_str()) else {
+            continue;
+        };
+
+        let inputs = item
+            .get("inputs")
+            .and_then(|i| i.as_array())
+            .map(|arr| {
+                arr.iter()
+                    .filter_map(|input| {
+                        let name = input.get("name").and_then(|n| n.as_str())?.to_string();
+                        let solidity_type = input.get("type").and_then(|t| t.as_str())?.to_string();
+                        let indexed = input
+                            .get("indexed")
+                            .and_then(|i| i.as_bool())
+                            .unwrap_or(false);
+                        Some(EventInput {
+                            name,
+                            solidity_type,
+                            indexed,
+                        })
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .unwrap_or_default();
+
+        let signature = format_event_signature(name, &inputs);
+
+        events.push(EventInfo {
+            name: name.to_string(),
+            signature,
+            inputs,
+        });
+    }
+
+    events
+}
+
+/// Format an event signature string.
+fn format_event_signature(name: &str, inputs: &[EventInput]) -> String {
+    let params: Vec<String> = inputs
+        .iter()
+        .map(|input| {
+            if input.indexed {
+                format!("indexed {}", input.solidity_type)
+            } else {
+                input.solidity_type.clone()
+            }
+        })
+        .collect();
+
+    format!("{}({})", name, params.join(","))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_generate_manifest_minimal() {
+        let options = ScaffoldOptions::default();
+        let manifest = generate_manifest(&options);
+
+        assert!(manifest.contains("specVersion: 1.3.0"));
+        assert!(manifest.contains("kind: ethereum"));
+        assert!(manifest.contains("network: mainnet"));
+        assert!(manifest.contains("kind: ethereum/events"));
+    }
+
+    #[test]
+    fn test_generate_manifest_with_address() {
+        let options = ScaffoldOptions {
+            address: Some("0x1234567890123456789012345678901234567890".to_string()),
+            network: "goerli".to_string(),
+            contract_name: "MyToken".to_string(),
+            start_block: Some(12345678),
+            ..Default::default()
+        };
+
+        let manifest = generate_manifest(&options);
+
+        assert!(manifest.contains("network: goerli"));
+        assert!(manifest.contains("name: MyToken"));
+        assert!(manifest.contains("0x1234567890123456789012345678901234567890"));
+        assert!(manifest.contains("startBlock: 12345678"));
+
+        // Verify address comes before abi
+        let address_pos = manifest.find("address:").unwrap();
+        let abi_pos = manifest.find("abi: MyToken").unwrap();
+        assert!(address_pos < abi_pos, "address should come before abi");
+    }
+
+    #[test]
+    fn test_get_entities_uses_event_names() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": []
+            },
+            {
+                "type": "event",
+                "name": "Approval",
+                "inputs": []
+            }
+        ]);
+
+        // Even with index_events=false, entities should be event names
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            index_events: false,
+            ..Default::default()
+        };
+
+        let manifest = generate_manifest(&options);
+        assert!(manifest.contains("- Transfer"));
+        assert!(manifest.contains("- Approval"));
+        // Should NOT contain ExampleEntity
+        assert!(!manifest.contains("ExampleEntity"));
+    }
+
+    #[test]
+    fn test_event_handlers_no_blank_lines() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": []
+            },
+            {
+                "type": "event",
+                "name": "Approval",
+                "inputs": []
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            ..Default::default()
+        };
+
+        let manifest = generate_manifest(&options);
+
+        // Check there are no double newlines in the eventHandlers section
+        assert!(!manifest.contains("handler: handleTransfer\n\n"));
+    }
+
+    #[test]
+    fn test_extract_events_from_abi() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            },
+            {
+                "type": "function",
+                "name": "transfer"
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            ..Default::default()
+        };
+
+        let events = extract_events_from_abi(&options);
+        assert_eq!(events.len(), 1);
+        assert_eq!(events[0].name, "Transfer");
+        assert_eq!(
+            events[0].signature,
+            "Transfer(indexed address,indexed address,uint256)"
+        );
+        assert_eq!(events[0].inputs.len(), 3);
+    }
+
+    #[test]
+    fn test_format_event_signature() {
+        let inputs = vec![
+            EventInput {
+                name: "from".to_string(),
+                solidity_type: "address".to_string(),
+                indexed: true,
+            },
+            EventInput {
+                name: "value".to_string(),
+                solidity_type: "uint256".to_string(),
+                indexed: false,
+            },
+        ];
+
+        let sig = format_event_signature("Transfer", &inputs);
+        assert_eq!(sig, "Transfer(indexed address,uint256)");
+    }
+
+    #[test]
+    fn test_disambiguate_events() {
+        let ev = |name: &str| EventInfo {
+            name: name.to_string(),
+            signature: format!("{}()", name),
+            inputs: vec![],
+        };
+        let resolved = disambiguate_events(vec![ev("Transfer"), ev("Transfer"), ev("Approval")]);
+        // Repeated names are suffixed; the first occurrence is unchanged.
+        assert_eq!(resolved[0].alias, "Transfer");
+        assert_eq!(resolved[0].entity_name, "Transfer");
+        assert_eq!(resolved[1].alias, "Transfer1");
+        assert_eq!(resolved[1].entity_name, "Transfer1");
+        assert_eq!(resolved[2].alias, "Approval");
+        assert!(resolved.iter().all(|r| r.declare_in_schema));
+    }
+}
diff --git a/gnd/src/scaffold/mapping.rs b/gnd/src/scaffold/mapping.rs
new file mode 100644
index 00000000000..8749c91ab2b
--- /dev/null
+++ b/gnd/src/scaffold/mapping.rs
@@ -0,0 +1,438 @@
+//! Mapping (AssemblyScript) generation for scaffold.
+
+use super::ScaffoldOptions;
+use super::manifest::{EventInfo, ResolvedEvent, extract_events_from_abi};
+use super::sanitize_field_name;
+
+/// Generate the mapping.ts content.
+pub fn generate_mapping(options: &ScaffoldOptions) -> String {
+    let events = extract_events_from_abi(options);
+    let contract_name = &options.contract_name;
+
+    if events.is_empty() {
+        return generate_fallback_mapping(contract_name);
+    }
+
+    if !options.index_events {
+        return generate_placeholder_mapping(contract_name, &events, options);
+    }
+
+    let resolved = super::disambiguate_events(events);
+    generate_event_handlers(contract_name, &resolved)
+}
+
+/// Generate a fallback mapping when no events are found in ABI.
+fn generate_fallback_mapping(contract_name: &str) -> String {
+    format!(
+        r#"import {{ BigInt, Bytes }} from "@graphprotocol/graph-ts"
+import {{ ExampleEvent as ExampleEventEvent }} from "../generated/{contract_name}/{contract_name}"
+import {{ ExampleEntity }} from "../generated/schema"
+
+export function handle{contract_name}ExampleEvent(event: ExampleEventEvent): void {{
+  let entity = ExampleEntity.load(
+    event.transaction.hash.concat(Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex)))
+  )
+
+  if (!entity) {{
+    entity = new ExampleEntity(
+      event.transaction.hash.concat(Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex)))
+    )
+    entity.count = BigInt.fromI32(0)
+  }}
+
+  entity.count = entity.count + BigInt.fromI32(1)
+  entity.save()
+}}
+"#
+    )
+}
+
+/// Generate placeholder mapping when events are found but index_events is false.
+fn generate_placeholder_mapping(
+    contract_name: &str,
+    events: &[EventInfo],
+    options: &ScaffoldOptions,
+) -> String {
+    let resolved = super::disambiguate_events(events.to_vec());
+
+    let mut output = String::new();
+
+    // Import graph-ts types
+    output.push_str("import {\n  BigInt,\n  Bytes\n} from \"@graphprotocol/graph-ts\"\n");
+
+    // Import contract class and all events (by disambiguated alias).
+    output.push_str(&format!("import {{\n  {contract_name},\n"));
+    for (i, event) in resolved.iter().enumerate() {
+        let suffix = if i < resolved.len() - 1 { ",\n" } else { "\n" };
+        output.push_str(&format!(
+            "  {} as {}Event{}",
+            event.alias, event.alias, suffix
+        ));
+    }
+    output.push_str(&format!(
+        "}} from \"../generated/{contract_name}/{contract_name}\"\n"
+    ));
+
+    // Import entity
+    output.push_str("import { ExampleEntity } from \"../generated/schema\"\n");
+
+    // Generate first handler with full example code
+    output.push_str(&generate_first_placeholder_handler(
+        &resolved[0],
+        contract_name,
+        options,
+    ));
+
+    // Generate empty stub handlers for remaining events
+    for event in resolved.iter().skip(1) {
+        output.push_str(&format!(
+            "\nexport function handle{}(event: {}Event): void {{}}\n",
+            event.alias, event.alias
+        ));
+    }
+
+    output
+}
+
+/// Generate the first handler with full example code.
+fn generate_first_placeholder_handler(
+    event: &ResolvedEvent,
+    contract_name: &str,
+    options: &ScaffoldOptions,
+) -> String {
+    let event_name = &event.alias;
+
+    // Generate field assignments for first 2 event params
+    let mut field_assignments = String::new();
+    let accessors = super::event_param_accessors(&event.event.inputs);
+    for (input, accessor) in event.event.inputs.iter().zip(&accessors).take(2) {
+        let field_name = sanitize_field_name(&input.name);
+        field_assignments.push_str(&format!(
+            "  entity.{} = event.params.{}\n",
+            field_name, accessor
+        ));
+    }
+
+    // Extract callable functions from ABI for comments
+    let callable_functions = extract_callable_functions(options);
+
+    format!(
+        r#"
+export function handle{event_name}(event: {event_name}Event): void {{
+  // Entities can be loaded from the store using their id; using 'Bytes' as
+  // the id type is more efficient than 'ID' or 'String' and should be used
+  // whenever possible.
+  const id = event.transaction.hash.concat(
+    Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex))
+  )
+  let entity = ExampleEntity.load(id)
+
+  // Entities only exist after they have been saved to the store;
+  // `null` checks allow to create entities on demand
+  if (!entity) {{
+    entity = new ExampleEntity(id)
+
+    // Entity fields can be set using simple assignments
+    entity.count = BigInt.fromI32(0)
+  }}
+
+  // BigInt and BigDecimal math are supported
+  entity.count = entity.count + BigInt.fromI32(1)
+
+  // Entity fields can be set based on event parameters
+{field_assignments}
+  entity.save()
+
+  // It is also possible to access smart contracts from mappings. For
+  // example, the contract that has emitted the event can be connected to
+  // with:
+  //
+  // let contract = {contract_name}.bind(event.address)
+  //
+  // The following functions can then be called on this contract to access
+  // state variables and other data:
+  //{callable_functions}
+}}
+"#
+    )
+}
+
+/// Generate event handlers for all resolved events.
+pub fn generate_event_handlers(contract_name: &str, events: &[ResolvedEvent]) -> String {
+    let mut imports = String::from("import { BigInt, Bytes } from \"@graphprotocol/graph-ts\"\n");
+
+    if events.is_empty() {
+        return imports;
+    }
+
+    // Import event types (by ABI alias).
+    let event_imports: Vec<String> = events
+        .iter()
+        .map(|e| format!("{} as {}Event", e.alias, e.alias))
+        .collect();
+
+    imports.push_str(&format!(
+        "import {{ {} }} from \"../generated/{}/{}\"\n",
+        event_imports.join(", "),
+        contract_name,
+        contract_name
+    ));
+
+    // Import entity types.
+    let entity_imports: Vec<String> = events.iter().map(|e| e.entity_name.clone()).collect();
+
+    imports.push_str(&format!(
+        "import {{ {} }} from \"../generated/schema\"\n",
+        entity_imports.join(", ")
+    ));
+
+    // Generate handler for each event.
+    let mut handlers = String::new();
+    for event in events {
+        handlers.push('\n');
+        handlers.push_str(&generate_single_handler(event));
+    }
+
+    format!("{}\n{}", imports, handlers)
+}
+
+/// Generate a handler function for a single resolved event.
+fn generate_single_handler(resolved: &ResolvedEvent) -> String {
+    let alias = &resolved.alias;
+    let entity_name = &resolved.entity_name;
+
+    // Generate field assignments from event parameters. The accessor mirrors the
+    // generated binding getter (escaped reserved words, param<index> for unnamed).
+    let mut field_assignments = String::new();
+    let accessors = super::event_param_accessors(&resolved.event.inputs);
+    for (input, accessor) in resolved.event.inputs.iter().zip(&accessors) {
+        let field_name = sanitize_field_name(&input.name);
+        field_assignments.push_str(&format!(
+            "  entity.{} = event.params.{}\n",
+            field_name, accessor
+        ));
+    }
+
+    format!(
+        r#"export function handle{alias}(event: {alias}Event): void {{
+  let entity = new {entity_name}(
+    event.transaction.hash.concatI32(event.logIndex.toI32())
+  )
+
+{field_assignments}  entity.blockNumber = event.block.number
+  entity.blockTimestamp = event.block.timestamp
+  entity.transactionHash = event.transaction.hash
+
+  entity.save()
+}}
+"#
+    )
+}
+
+/// Extract callable functions from ABI for documentation comments.
+fn extract_callable_functions(options: &ScaffoldOptions) -> String {
+    let Some(abi) = &options.abi else {
+        return "\n  // - None found".to_string();
+    };
+
+    let Some(items) = abi.as_array() else {
+        return "\n  // - None found".to_string();
+    };
+
+    let mut functions = Vec::new();
+
+    for item in items {
+        let item_type = item.get("type").and_then(|t| t.as_str());
+
+        // Include functions that are view/pure (callable without state change)
+        if item_type == Some("function") {
+            let state = item
+                .get("stateMutability")
+                .and_then(|s| s.as_str())
+                .unwrap_or("");
+
+            // Only include view and pure functions (callable from mappings)
+            if (state == "view" || state == "pure")
+                && let Some(name) = item.get("name").and_then(|n| n.as_str())
+            {
+                functions.push(format!("\n  // - contract.{}(...)", name));
+            }
+        }
+    }
+
+    if functions.is_empty() {
+        "\n  //\n  // - None".to_string()
+    } else {
+        functions.join("")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_generate_fallback_mapping() {
+        let mapping = generate_fallback_mapping("MyContract");
+
+        assert!(mapping.contains("handleMyContractExampleEvent"));
+        assert!(mapping.contains("ExampleEntity"));
+        assert!(mapping.contains("@graphprotocol/graph-ts"));
+        // Check for the correct ID pattern
+        assert!(mapping.contains("Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex))"));
+    }
+
+    #[test]
+    fn test_generate_placeholder_mapping_with_events() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            },
+            {
+                "type": "event",
+                "name": "Approval",
+                "inputs": [
+                    {"name": "owner", "type": "address", "indexed": true},
+                    {"name": "spender", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            },
+            {
+                "type": "function",
+                "name": "balanceOf",
+                "stateMutability": "view",
+                "inputs": [{"name": "owner", "type": "address"}]
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            contract_name: "Token".to_string(),
+            abi: Some(abi),
+            index_events: false, // placeholder mode
+            ..Default::default()
+        };
+
+        let mapping = generate_mapping(&options);
+
+        // Check imports
+        assert!(mapping.contains("Token,"));
+        assert!(mapping.contains("Transfer as TransferEvent"));
+        assert!(mapping.contains("Approval as ApprovalEvent"));
+        assert!(mapping.contains("ExampleEntity"));
+
+        // First handler has full implementation
+        assert!(mapping.contains("export function handleTransfer(event: TransferEvent): void {"));
+        assert!(mapping.contains("entity.from = event.params.from"));
+        assert!(mapping.contains("entity.to = event.params.to"));
+        // Check for correct ID pattern
+        assert!(mapping.contains("Bytes.fromByteArray(Bytes.fromBigInt(event.logIndex))"));
+        // Check for callable functions comment
+        assert!(mapping.contains("contract.balanceOf(...)"));
+
+        // Second handler is empty stub
+        assert!(mapping.contains("export function handleApproval(event: ApprovalEvent): void {}"));
+    }
+
+    #[test]
+    fn test_generate_mapping_with_events() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            contract_name: "Token".to_string(),
+            abi: Some(abi),
+            index_events: true,
+            ..Default::default()
+        };
+
+        let mapping = generate_mapping(&options);
+
+        assert!(mapping.contains("handleTransfer"));
+        assert!(mapping.contains("Transfer as TransferEvent"));
+        assert!(mapping.contains("event.params.from"));
+        assert!(mapping.contains("event.params.to"));
+        assert!(mapping.contains("event.params.value"));
+    }
+
+    #[test]
+    fn test_extract_callable_functions() {
+        let abi = json!([
+            {
+                "type": "function",
+                "name": "balanceOf",
+                "stateMutability": "view"
+            },
+            {
+                "type": "function",
+                "name": "totalSupply",
+                "stateMutability": "pure"
+            },
+            {
+                "type": "function",
+                "name": "transfer",
+                "stateMutability": "nonpayable"
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            ..Default::default()
+        };
+
+        let functions = extract_callable_functions(&options);
+        assert!(functions.contains("balanceOf"));
+        assert!(functions.contains("totalSupply"));
+        // transfer is nonpayable, should not be included
+        assert!(!functions.contains("transfer"));
+    }
+
+    #[test]
+    fn test_generate_mapping_reserved_and_unnamed_params() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Act",
+                "inputs": [
+                    {"name": "new", "type": "uint256", "indexed": false},
+                    {"name": "", "type": "address", "indexed": false}
+                ]
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            contract_name: "RW".to_string(),
+            abi: Some(abi),
+            index_events: true,
+            ..Default::default()
+        };
+
+        let mapping = generate_mapping(&options);
+        // The RHS must match the generated getter: `new` -> `new_`, unnamed -> `param1`.
+        assert!(
+            mapping.contains("event.params.new_"),
+            "reserved param accessor should be escaped, got:\n{}",
+            mapping
+        );
+        assert!(
+            mapping.contains("event.params.param1"),
+            "unnamed param accessor should be param<index>, got:\n{}",
+            mapping
+        );
+    }
+}
diff --git a/gnd/src/scaffold/mod.rs b/gnd/src/scaffold/mod.rs
new file mode 100644
index 00000000000..72cb5d70a37
--- /dev/null
+++ b/gnd/src/scaffold/mod.rs
@@ -0,0 +1,288 @@
+//! Scaffold generation for new subgraphs.
+//!
+//! This module provides functionality to generate the scaffolding files for a new
+//! subgraph project, including manifest, schema, mappings, and configuration files.
+
+pub mod manifest;
+mod mapping;
+mod naming;
+mod schema;
+
+pub use manifest::{
+    EventInfo, EventInput, ResolvedEvent, disambiguate_events, event_param_accessors,
+    extract_events_from_abi, generate_manifest,
+};
+pub use mapping::{generate_event_handlers, generate_mapping};
+pub(crate) use naming::sanitize_field_name;
+pub use schema::{generate_event_entity, generate_schema};
+
+use std::fs;
+use std::path::Path;
+use std::process::{Command, Stdio};
+
+use anyhow::{Context, Result, anyhow};
+use inflector::Inflector;
+use serde_json::Value as JsonValue;
+
+use crate::formatter::format_typescript;
+use crate::output::{Step, step, with_spinner};
+
+/// Options for scaffold generation.
+#[derive(Debug, Clone)]
+pub struct ScaffoldOptions {
+    /// Contract address
+    pub address: Option<String>,
+    /// Network name
+    pub network: String,
+    /// Contract name
+    pub contract_name: String,
+    /// Subgraph name
+    pub subgraph_name: String,
+    /// Start block for indexing
+    pub start_block: Option<u64>,
+    /// Contract ABI as JSON
+    pub abi: Option<JsonValue>,
+    /// Whether to index all events
+    pub index_events: bool,
+}
+
+impl Default for ScaffoldOptions {
+    fn default() -> Self {
+        Self {
+            address: None,
+            network: "mainnet".to_string(),
+            contract_name: "Contract".to_string(),
+            subgraph_name: "my-subgraph".to_string(),
+            start_block: None,
+            abi: None,
+            index_events: false,
+        }
+    }
+}
+
+/// Graph-ts and graph-cli versions for package.json.
+const GRAPH_CLI_VERSION: &str = "0.98.0";
+const GRAPH_TS_VERSION: &str = "0.37.0";
+const MATCHSTICK_VERSION: &str = "0.6.0";
+
+/// Manifest format versions emitted by the scaffolder.
+pub(crate) const SPEC_VERSION: &str = "1.3.0";
+pub(crate) const MAPPING_API_VERSION: &str = "0.0.9";
+
+/// Generate all scaffold files and write to directory.
+pub fn generate_scaffold(dir: &Path, options: &ScaffoldOptions) -> Result<()> {
+    step(Step::Generate, "Generating scaffold files");
+
+    // Create directory structure
+    fs::create_dir_all(dir).context("Failed to create project directory")?;
+    fs::create_dir_all(dir.join("src")).context("Failed to create src directory")?;
+    fs::create_dir_all(dir.join("abis")).context("Failed to create abis directory")?;
+
+    // Generate and write files
+    let manifest = generate_manifest(options);
+    fs::write(dir.join("subgraph.yaml"), manifest).context("Failed to write subgraph.yaml")?;
+
+    let schema = generate_schema(options);
+    fs::write(dir.join("schema.graphql"), schema).context("Failed to write schema.graphql")?;
+
+    let mapping = generate_mapping(options);
+    let mapping_formatted = format_typescript(&mapping).unwrap_or(mapping);
+    let mapping_file = format!("{}.ts", to_kebab_case(&options.contract_name));
+    fs::write(dir.join("src").join(&mapping_file), mapping_formatted)
+        .context("Failed to write mapping file")?;
+
+    // Write ABI if provided
+    if let Some(abi) = &options.abi {
+        let abi_str = serde_json::to_string_pretty(abi).context("Failed to serialize ABI")?;
+        let abi_file = format!("{}.json", options.contract_name);
+        fs::write(dir.join("abis").join(&abi_file), abi_str).context("Failed to write ABI file")?;
+    }
+
+    // Generate package.json
+    let package_json = generate_package_json(options);
+    fs::write(dir.join("package.json"), package_json).context("Failed to write package.json")?;
+
+    // Generate tsconfig.json
+    let tsconfig = generate_tsconfig();
+    fs::write(dir.join("tsconfig.json"), tsconfig).context("Failed to write tsconfig.json")?;
+
+    // Generate .gitignore
+    let gitignore = generate_gitignore();
+    fs::write(dir.join(".gitignore"), gitignore).context("Failed to write .gitignore")?;
+
+    Ok(())
+}
+
+/// Initialize git repository in directory.
+pub fn init_git(dir: &Path) -> Result<()> {
+    step(Step::Generate, "Initializing Git repository");
+
+    let status = Command::new("git")
+        .current_dir(dir)
+        .arg("init")
+        .status()
+        .context("Failed to run git init")?;
+
+    if !status.success() {
+        return Err(anyhow!("git init failed"));
+    }
+
+    Ok(())
+}
+
+/// Install npm dependencies with spinner and suppressed output.
+pub fn install_dependencies(dir: &Path) -> Result<()> {
+    // Detect which package manager to use
+    let pkg_manager = detect_package_manager(dir);
+
+    with_spinner(
+        format!("Install dependencies with {}", pkg_manager),
+        "Failed to install dependencies",
+        "Installed with warnings",
+        |_spinner| {
+            let status = Command::new(&pkg_manager)
+                .current_dir(dir)
+                .arg("install")
+                .stdout(Stdio::null())
+                .stderr(Stdio::null())
+                .status()
+                .map_err(|e| anyhow!("{}: {}", pkg_manager, e))?;
+
+            if status.success() {
+                return Ok(());
+            }
+
+            // If pnpm failed, try npm as fallback
+            if pkg_manager == "pnpm" {
+                let npm_status = Command::new("npm")
+                    .current_dir(dir)
+                    .arg("install")
+                    .stdout(Stdio::null())
+                    .stderr(Stdio::null())
+                    .status()
+                    .map_err(|e| anyhow!("npm: {}", e))?;
+
+                if npm_status.success() {
+                    return Ok(());
+                }
+            }
+
+            Err(anyhow!(
+                "Failed to install dependencies. Please run 'npm install' manually."
+            ))
+        },
+    )
+}
+
+/// Detect the package manager to use based on lock files.
+fn detect_package_manager(dir: &Path) -> String {
+    if dir.join("pnpm-lock.yaml").exists() {
+        "pnpm".to_string()
+    } else if dir.join("yarn.lock").exists() {
+        "yarn".to_string()
+    } else if dir.join("package-lock.json").exists() {
+        "npm".to_string()
+    } else {
+        // Default to pnpm
+        "pnpm".to_string()
+    }
+}
+
+/// Generate package.json content.
+fn generate_package_json(options: &ScaffoldOptions) -> String {
+    let basename = options
+        .subgraph_name
+        .split('/')
+        .next_back()
+        .unwrap_or(&options.subgraph_name);
+
+    serde_json::to_string_pretty(&serde_json::json!({
+        "name": basename,
+        "license": "UNLICENSED",
+        "scripts": {
+            "codegen": "graph codegen",
+            "build": "graph build",
+            "deploy": format!("graph deploy --node https://api.studio.thegraph.com/deploy/ {}", options.subgraph_name),
+            "create-local": format!("graph create --node http://localhost:8020/ {}", options.subgraph_name),
+            "remove-local": format!("graph remove --node http://localhost:8020/ {}", options.subgraph_name),
+            "deploy-local": format!("graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 {}", options.subgraph_name),
+            "test": "graph test"
+        },
+        "dependencies": {
+            "@graphprotocol/graph-cli": GRAPH_CLI_VERSION,
+            "@graphprotocol/graph-ts": GRAPH_TS_VERSION
+        },
+        "devDependencies": {
+            "matchstick-as": MATCHSTICK_VERSION
+        }
+    }))
+    .unwrap_or_default()
+}
+
+/// Generate tsconfig.json content.
+fn generate_tsconfig() -> String {
+    serde_json::to_string_pretty(&serde_json::json!({
+        "extends": "@graphprotocol/graph-ts/types/tsconfig.base.json",
+        "include": ["src", "tests"]
+    }))
+    .unwrap_or_default()
+}
+
+/// Generate .gitignore content.
+fn generate_gitignore() -> String {
+    r#"node_modules/
+build/
+generated/
+.env
+.env.local
+"#
+    .to_string()
+}
+
+/// Convert a string to kebab-case.
+/// Uses Inflector which correctly handles acronyms (ERC20 → erc20, not e-r-c20).
+pub(crate) fn to_kebab_case(s: &str) -> String {
+    s.to_kebab_case()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_to_kebab_case() {
+        // Inflector correctly handles acronyms - consecutive uppercase letters stay together
+        assert_eq!(to_kebab_case("MyContract"), "my-contract");
+        assert_eq!(to_kebab_case("ERC20"), "erc20");
+        assert_eq!(to_kebab_case("contract"), "contract");
+        assert_eq!(to_kebab_case("ABCToken"), "abc-token");
+        assert_eq!(to_kebab_case("ERC20Token"), "erc20-token");
+    }
+
+    #[test]
+    fn test_generate_package_json() {
+        let options = ScaffoldOptions {
+            subgraph_name: "user/my-subgraph".to_string(),
+            ..Default::default()
+        };
+
+        let json = generate_package_json(&options);
+        assert!(json.contains(r#""name": "my-subgraph""#));
+        assert!(json.contains("@graphprotocol/graph-cli"));
+        assert!(json.contains("@graphprotocol/graph-ts"));
+    }
+
+    #[test]
+    fn test_generate_tsconfig() {
+        let json = generate_tsconfig();
+        assert!(json.contains("@graphprotocol/graph-ts/types/tsconfig.base.json"));
+    }
+
+    #[test]
+    fn test_generate_gitignore() {
+        let gitignore = generate_gitignore();
+        assert!(gitignore.contains("node_modules/"));
+        assert!(gitignore.contains("build/"));
+        assert!(gitignore.contains("generated/"));
+    }
+}
diff --git a/gnd/src/scaffold/naming.rs b/gnd/src/scaffold/naming.rs
new file mode 100644
index 00000000000..54d4563f2cb
--- /dev/null
+++ b/gnd/src/scaffold/naming.rs
@@ -0,0 +1,86 @@
+//! Shared name sanitization for scaffold code generation.
+//!
+//! A single source of truth for turning ABI parameter names into valid GraphQL
+//! field / AssemblyScript identifiers, used by both the schema and mapping
+//! generators so the two never disagree.
+
+/// Sanitize a parameter name into a valid GraphQL/AssemblyScript field identifier.
+pub(crate) fn sanitize_field_name(name: &str) -> String {
+    if name.is_empty() {
+        return "value".to_string();
+    }
+
+    // Identifiers must start with a letter or underscore; replace anything else.
+    let mut result = String::new();
+    for (i, c) in name.chars().enumerate() {
+        if i == 0 && c.is_ascii_digit() {
+            result.push('_');
+        }
+        if c.is_alphanumeric() || c == '_' {
+            result.push(c);
+        } else {
+            result.push('_');
+        }
+    }
+
+    // Convert a leading uppercase to camelCase.
+    if result
+        .chars()
+        .next()
+        .map(|c| c.is_uppercase())
+        .unwrap_or(false)
+    {
+        let mut chars = result.chars();
+        if let Some(first) = chars.next() {
+            result = first.to_lowercase().collect::<String>() + chars.as_str();
+        }
+    }
+
+    // Avoid clashing with the entity `id` field and the GraphQL `type` keyword.
+    let result = match result.as_str() {
+        "id" => "eventId".to_string(),
+        "type" => "eventType".to_string(),
+        _ => result,
+    };
+
+    // Escape reserved words via the shared list, so the entity field name
+    // matches the member the schema/ABI codegen generates from the same list.
+    crate::shared::handle_reserved_word(&result)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_sanitize_field_name() {
+        // Normal names pass through.
+        assert_eq!(sanitize_field_name("owner"), "owner");
+        assert_eq!(sanitize_field_name("from"), "from");
+        // Empty -> placeholder.
+        assert_eq!(sanitize_field_name(""), "value");
+        // Leading uppercase -> camelCase.
+        assert_eq!(sanitize_field_name("Owner"), "owner");
+        assert_eq!(sanitize_field_name("TokenId"), "tokenId");
+        // Names that clash with the entity id / GraphQL keyword.
+        assert_eq!(sanitize_field_name("id"), "eventId");
+        assert_eq!(sanitize_field_name("type"), "eventType");
+        // Reserved words are suffixed so the generated code compiles. These use
+        // the shared list, so words only in it (for/default/null/void/instanceof)
+        // are covered too — and stay consistent with the schema/ABI codegen.
+        assert_eq!(sanitize_field_name("new"), "new_");
+        assert_eq!(sanitize_field_name("class"), "class_");
+        assert_eq!(sanitize_field_name("return"), "return_");
+        assert_eq!(sanitize_field_name("for"), "for_");
+        assert_eq!(sanitize_field_name("default"), "default_");
+        assert_eq!(sanitize_field_name("null"), "null_");
+        assert_eq!(sanitize_field_name("void"), "void_");
+        assert_eq!(sanitize_field_name("instanceof"), "instanceof_");
+        // Leading uppercase reserved word still resolves after camelCasing.
+        assert_eq!(sanitize_field_name("New"), "new_");
+        // Leading digit -> underscore prefix.
+        assert_eq!(sanitize_field_name("0value"), "_0value");
+        // Non-alphanumeric -> underscore.
+        assert_eq!(sanitize_field_name("a-b"), "a_b");
+    }
+}
diff --git a/gnd/src/scaffold/schema.rs b/gnd/src/scaffold/schema.rs
new file mode 100644
index 00000000000..ed47de3e041
--- /dev/null
+++ b/gnd/src/scaffold/schema.rs
@@ -0,0 +1,280 @@
+//! Schema (schema.graphql) generation for scaffold.
+
+use super::ScaffoldOptions;
+use super::manifest::{EventInput, extract_events_from_abi};
+use super::sanitize_field_name;
+
+/// Generate the schema.graphql content.
+pub fn generate_schema(options: &ScaffoldOptions) -> String {
+    let events = extract_events_from_abi(options);
+
+    if events.is_empty() {
+        // Generate example entity with no event params
+        return generate_example_entity(&[]);
+    }
+
+    if !options.index_events {
+        // Generate example entity with first event's params
+        return generate_example_entity(&events[0].inputs);
+    }
+
+    // Generate an entity for each event, disambiguating overloaded names.
+    let mut schema = String::new();
+
+    for resolved in super::disambiguate_events(events) {
+        let entity = generate_event_entity(&resolved.entity_name, &resolved.event.inputs);
+        schema.push_str(&entity);
+        schema.push_str("\n\n");
+    }
+
+    schema.trim_end().to_string()
+}
+
+/// Generate an example entity for placeholder mode.
+/// Uses first 2 event params if available, with type comments.
+fn generate_example_entity(inputs: &[EventInput]) -> String {
+    let mut fields = String::new();
+    fields.push_str("  # Use Bytes when possible for better performance\n");
+    fields.push_str("  id: Bytes!\n");
+    fields.push_str("  count: BigInt!\n");
+
+    // Include first 2 event params with type comments
+    for input in inputs.iter().take(2) {
+        let field_name = sanitize_field_name(&input.name);
+        let graphql_type = solidity_to_graphql(&input.solidity_type);
+        fields.push_str(&format!(
+            "  {}: {}! # {}\n",
+            field_name, graphql_type, input.solidity_type
+        ));
+    }
+
+    format!(
+        "# Declare entity types as immutable when possible for better performance\n\
+         type ExampleEntity @entity(immutable: true) {{\n{}}}\n",
+        fields
+    )
+}
+
+/// Generate an entity type for an event.
+pub fn generate_event_entity(entity_name: &str, inputs: &[EventInput]) -> String {
+    let mut fields = String::new();
+
+    // ID field
+    fields.push_str("  id: Bytes!\n");
+
+    // Fields from event inputs
+    for input in inputs {
+        let field_name = sanitize_field_name(&input.name);
+        let graphql_type = solidity_to_graphql(&input.solidity_type);
+        fields.push_str(&format!("  {}: {}!\n", field_name, graphql_type));
+    }
+
+    // Standard blockchain fields
+    fields.push_str("  blockNumber: BigInt!\n");
+    fields.push_str("  blockTimestamp: BigInt!\n");
+    fields.push_str("  transactionHash: Bytes!");
+
+    format!(
+        "# Declare entity types as immutable when possible for better performance\n\
+         type {} @entity(immutable: true) {{\n{}\n}}",
+        entity_name, fields
+    )
+}
+
+/// Convert Solidity type to GraphQL type.
+fn solidity_to_graphql(solidity_type: &str) -> &'static str {
+    // Handle arrays
+    if solidity_type.ends_with("[]") {
+        let inner = &solidity_type.strip_suffix("[]").unwrap();
+        return match solidity_to_graphql(inner) {
+            "Bytes" => "[Bytes!]",
+            "BigInt" => "[BigInt!]",
+            "Int" => "[Int!]",
+            "String" => "[String!]",
+            "Boolean" => "[Boolean!]",
+            _ => "[Bytes!]",
+        };
+    }
+
+    match solidity_type {
+        // Address types
+        "address" => "Bytes",
+
+        // Boolean
+        "bool" => "Boolean",
+
+        // String
+        "string" => "String",
+
+        // Bytes types
+        "bytes" => "Bytes",
+        "bytes1" | "bytes2" | "bytes3" | "bytes4" | "bytes5" | "bytes6" | "bytes7" | "bytes8"
+        | "bytes9" | "bytes10" | "bytes11" | "bytes12" | "bytes13" | "bytes14" | "bytes15"
+        | "bytes16" | "bytes17" | "bytes18" | "bytes19" | "bytes20" | "bytes21" | "bytes22"
+        | "bytes23" | "bytes24" | "bytes25" | "bytes26" | "bytes27" | "bytes28" | "bytes29"
+        | "bytes30" | "bytes31" | "bytes32" => "Bytes",
+
+        // Integers: small widths fit in an i32 (GraphQL Int), the rest need BigInt.
+        t if t.starts_with("uint") || t.starts_with("int") => int_to_graphql(t),
+
+        // Default to Bytes for unknown types
+        _ => "Bytes",
+    }
+}
+
+/// Map a Solidity integer type to GraphQL `Int` when it fits in an i32, else
+/// `BigInt`. An i32 holds signed ints up to 32 bits and unsigned ints up to 24
+/// bits, matching graph-cli's AssemblyScript type conversion.
+fn int_to_graphql(solidity_type: &str) -> &'static str {
+    let (signed, width) = match solidity_type.strip_prefix("uint") {
+        Some(rest) => (false, rest),
+        None => match solidity_type.strip_prefix("int") {
+            Some(rest) => (true, rest),
+            None => return "BigInt",
+        },
+    };
+
+    // A bare `int` / `uint` is 256 bits.
+    let bits: u32 = if width.is_empty() {
+        256
+    } else {
+        width.parse().unwrap_or(256)
+    };
+
+    let fits_i32 = if signed { bits <= 32 } else { bits <= 24 };
+    if fits_i32 { "Int" } else { "BigInt" }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn test_generate_example_entity_no_inputs() {
+        let schema = generate_example_entity(&[]);
+        assert!(schema.contains("type ExampleEntity @entity(immutable: true)"));
+        assert!(schema.contains("id: Bytes!"));
+        assert!(schema.contains("count: BigInt!"));
+        // Should not contain block fields
+        assert!(!schema.contains("blockNumber"));
+        assert!(!schema.contains("blockTimestamp"));
+        assert!(!schema.contains("transactionHash"));
+    }
+
+    #[test]
+    fn test_generate_example_entity_with_inputs() {
+        let inputs = vec![
+            EventInput {
+                name: "from".to_string(),
+                solidity_type: "address".to_string(),
+                indexed: true,
+            },
+            EventInput {
+                name: "to".to_string(),
+                solidity_type: "address".to_string(),
+                indexed: true,
+            },
+            EventInput {
+                name: "value".to_string(),
+                solidity_type: "uint256".to_string(),
+                indexed: false,
+            },
+        ];
+
+        let schema = generate_example_entity(&inputs);
+        assert!(schema.contains("type ExampleEntity @entity(immutable: true)"));
+        assert!(schema.contains("id: Bytes!"));
+        assert!(schema.contains("count: BigInt!"));
+        // First 2 params with type comments
+        assert!(schema.contains("from: Bytes! # address"));
+        assert!(schema.contains("to: Bytes! # address"));
+        // Third param should NOT be included (only first 2)
+        assert!(!schema.contains("value: BigInt!"));
+    }
+
+    #[test]
+    fn test_generate_schema_placeholder_mode() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            index_events: false, // placeholder mode
+            ..Default::default()
+        };
+
+        let schema = generate_schema(&options);
+
+        assert!(schema.contains("type ExampleEntity @entity(immutable: true)"));
+        // First 2 event params with type comments
+        assert!(schema.contains("from: Bytes! # address"));
+        assert!(schema.contains("to: Bytes! # address"));
+    }
+
+    #[test]
+    fn test_generate_schema_with_events() {
+        let abi = json!([
+            {
+                "type": "event",
+                "name": "Transfer",
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            }
+        ]);
+
+        let options = ScaffoldOptions {
+            abi: Some(abi),
+            index_events: true,
+            ..Default::default()
+        };
+
+        let schema = generate_schema(&options);
+
+        assert!(schema.contains("type Transfer @entity(immutable: true)"));
+        assert!(schema.contains("from: Bytes!"));
+        assert!(schema.contains("to: Bytes!"));
+        assert!(schema.contains("value: BigInt!"));
+    }
+
+    #[test]
+    fn test_solidity_to_graphql() {
+        assert_eq!(solidity_to_graphql("address"), "Bytes");
+        assert_eq!(solidity_to_graphql("bool"), "Boolean");
+        assert_eq!(solidity_to_graphql("string"), "String");
+        assert_eq!(solidity_to_graphql("bytes32"), "Bytes");
+        assert_eq!(solidity_to_graphql("bytes"), "Bytes");
+        assert_eq!(solidity_to_graphql("address[]"), "[Bytes!]");
+        assert_eq!(solidity_to_graphql("uint256[]"), "[BigInt!]");
+    }
+
+    #[test]
+    fn test_integer_width_mapping() {
+        // Small widths that fit in an i32 map to Int.
+        assert_eq!(solidity_to_graphql("int8"), "Int");
+        assert_eq!(solidity_to_graphql("int32"), "Int");
+        assert_eq!(solidity_to_graphql("uint8"), "Int");
+        assert_eq!(solidity_to_graphql("uint24"), "Int");
+        // Wider integers need BigInt (uint32 does not fit an i32).
+        assert_eq!(solidity_to_graphql("uint32"), "BigInt");
+        assert_eq!(solidity_to_graphql("int40"), "BigInt");
+        assert_eq!(solidity_to_graphql("uint256"), "BigInt");
+        assert_eq!(solidity_to_graphql("int"), "BigInt");
+        assert_eq!(solidity_to_graphql("uint"), "BigInt");
+        // Arrays follow the element type.
+        assert_eq!(solidity_to_graphql("int8[]"), "[Int!]");
+        assert_eq!(solidity_to_graphql("uint64[]"), "[BigInt!]");
+    }
+}
diff --git a/gnd/src/services/contract.rs b/gnd/src/services/contract.rs
new file mode 100644
index 00000000000..d6dea4376c2
--- /dev/null
+++ b/gnd/src/services/contract.rs
@@ -0,0 +1,724 @@
+//! Contract ABI fetching service.
+//!
+//! This module provides functionality to fetch verified contract ABIs and metadata
+//! from block explorer APIs (Etherscan, Blockscout) and Sourcify.
+
+use std::env;
+use std::time::Duration;
+
+use anyhow::{Context, Result, anyhow};
+use reqwest::Client;
+use serde::Deserialize;
+use serde_json::Value as JsonValue;
+
+/// Timeout for HTTP requests to external APIs.
+const REQUEST_TIMEOUT: Duration = Duration::from_secs(10);
+
+/// Contract service for fetching ABIs and metadata.
+pub struct ContractService {
+    client: Client,
+    registry: NetworksRegistry,
+}
+
+/// A network definition from the registry.
+#[derive(Debug, Clone, Deserialize)]
+pub struct Network {
+    /// Network identifier (e.g., "mainnet", "goerli")
+    pub id: String,
+    /// Short display name
+    #[serde(rename = "shortName")]
+    pub short_name: Option<String>,
+    /// Full display name
+    #[serde(rename = "fullName")]
+    pub full_name: Option<String>,
+    /// Alternative names for the network
+    #[serde(default)]
+    pub aliases: Vec<String>,
+    /// CAIP-2 chain identifier (e.g., "eip155:1")
+    #[serde(rename = "caip2Id")]
+    pub caip2_id: String,
+    /// Block explorer API URLs
+    #[serde(rename = "apiUrls", default)]
+    pub api_urls: Vec<ApiUrl>,
+    /// JSON-RPC URLs
+    #[serde(rename = "rpcUrls", default)]
+    pub rpc_urls: Vec<String>,
+}
+
+/// An API URL entry from the registry.
+#[derive(Debug, Clone, Deserialize)]
+pub struct ApiUrl {
+    /// The API URL (may contain {ENVVAR} placeholders)
+    pub url: String,
+    /// The type of API (etherscan, blockscout, etc.)
+    pub kind: String,
+}
+
+/// The networks registry.
+#[derive(Debug, Clone, Deserialize)]
+pub struct NetworksRegistry {
+    /// List of networks
+    pub networks: Vec<Network>,
+}
+
+impl NetworksRegistry {
+    /// Load the registry from the default URL.
+    pub async fn load() -> Result<Self> {
+        let client = Client::builder()
+            .timeout(REQUEST_TIMEOUT)
+            .build()
+            .context("Failed to create HTTP client")?;
+
+        let url = "https://networks-registry.thegraph.com/TheGraphNetworksRegistry.json";
+        let response = client
+            .get(url)
+            .send()
+            .await
+            .context("Failed to fetch networks registry")?;
+
+        if !response.status().is_success() {
+            return Err(anyhow!(
+                "Failed to fetch networks registry: {}",
+                response.status()
+            ));
+        }
+
+        response
+            .json::<NetworksRegistry>()
+            .await
+            .context("Failed to parse networks registry")
+    }
+
+    /// Load from a JSON string (for testing).
+    pub fn from_json(json: &str) -> Result<Self> {
+        serde_json::from_str(json).context("Failed to parse networks registry JSON")
+    }
+
+    /// Get a network by ID or alias.
+    pub fn get_network(&self, id: &str) -> Option<&Network> {
+        let id_lower = id.to_lowercase();
+        self.networks.iter().find(|n| {
+            n.id.to_lowercase() == id_lower
+                || n.aliases.iter().any(|a| a.to_lowercase() == id_lower)
+        })
+    }
+}
+
+/// Result of fetching contract info from Sourcify.
+#[derive(Debug)]
+pub struct SourcifyResult {
+    /// The contract ABI as JSON
+    pub abi: JsonValue,
+    /// The contract name
+    pub name: String,
+    /// The deployment block number
+    pub start_block: u64,
+}
+
+/// Response from Etherscan getabi API.
+#[derive(Debug, Deserialize)]
+struct EtherscanResponse {
+    status: String,
+    message: String,
+    result: Option<JsonValue>,
+}
+
+/// Response from Etherscan getsourcecode API.
+#[derive(Debug, Deserialize)]
+struct SourceCodeResponse {
+    status: String,
+    #[allow(dead_code)]
+    message: String,
+    result: Option<Vec<SourceCodeResult>>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SourceCodeResult {
+    #[serde(rename = "ContractName")]
+    contract_name: Option<String>,
+}
+
+/// Response from Etherscan getcontractcreation API.
+#[derive(Debug, Deserialize)]
+struct ContractCreationResponse {
+    status: String,
+    #[allow(dead_code)]
+    message: String,
+    result: Option<Vec<ContractCreationResult>>,
+}
+
+#[derive(Debug, Deserialize)]
+struct ContractCreationResult {
+    #[serde(rename = "blockNumber")]
+    block_number: Option<String>,
+    #[serde(rename = "txHash")]
+    tx_hash: Option<String>,
+}
+
+/// Response from Sourcify API.
+#[derive(Debug, Deserialize)]
+struct SourcifyResponse {
+    abi: Option<JsonValue>,
+    compilation: Option<SourcifyCompilation>,
+    deployment: Option<SourcifyDeployment>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SourcifyCompilation {
+    name: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct SourcifyDeployment {
+    #[serde(rename = "blockNumber")]
+    block_number: Option<String>,
+}
+
+/// Response from eth_getTransactionByHash RPC.
+#[derive(Debug, Deserialize)]
+struct RpcResponse {
+    result: Option<TransactionResult>,
+}
+
+#[derive(Debug, Deserialize)]
+struct TransactionResult {
+    #[serde(rename = "blockNumber")]
+    block_number: Option<String>,
+}
+
+impl ContractService {
+    /// Create a new contract service with the given registry.
+    pub fn new(registry: NetworksRegistry) -> Self {
+        let client = Client::builder()
+            .timeout(REQUEST_TIMEOUT)
+            .build()
+            .expect("Failed to create HTTP client");
+
+        Self { client, registry }
+    }
+
+    /// Create a new contract service, loading the registry from the default URL.
+    pub async fn load() -> Result<Self> {
+        let registry = NetworksRegistry::load().await?;
+        Ok(Self::new(registry))
+    }
+
+    /// Get the contract ABI for a given network and address.
+    pub async fn get_abi(&self, network_id: &str, address: &str) -> Result<JsonValue> {
+        let urls = self.get_etherscan_urls(network_id)?;
+        if urls.is_empty() {
+            return Err(anyhow!(
+                "No contract API available for {} in the registry",
+                network_id
+            ));
+        }
+
+        let mut last_error = None;
+
+        for url in urls {
+            let api_url = format!("{}?module=contract&action=getabi&address={}", url, address);
+
+            match self.fetch_from_etherscan(&api_url).await {
+                Ok(response) => {
+                    if response.status == "1"
+                        && let Some(result) = response.result
+                    {
+                        // The result is a JSON string containing the ABI
+                        if let Some(abi_str) = result.as_str() {
+                            return serde_json::from_str(abi_str)
+                                .context("Failed to parse ABI JSON");
+                        }
+                        return Ok(result);
+                    }
+                    last_error = Some(anyhow!(
+                        "{} - {}",
+                        response.message,
+                        response.result.unwrap_or(JsonValue::Null)
+                    ));
+                }
+                Err(e) => {
+                    last_error = Some(e);
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow!("No API URLs available")))
+    }
+
+    /// Get the contract name for a given network and address.
+    pub async fn get_contract_name(&self, network_id: &str, address: &str) -> Result<String> {
+        let urls = self.get_etherscan_urls(network_id)?;
+        if urls.is_empty() {
+            return Err(anyhow!(
+                "No contract API available for {} in the registry",
+                network_id
+            ));
+        }
+
+        let mut last_error = None;
+
+        for url in urls {
+            let api_url = format!(
+                "{}?module=contract&action=getsourcecode&address={}",
+                url, address
+            );
+
+            let response = self
+                .client
+                .get(&api_url)
+                .send()
+                .await
+                .context("Contract API is unreachable")?;
+
+            if response.status().is_success() {
+                match response.json::<SourceCodeResponse>().await {
+                    Ok(data) => {
+                        if data.status == "1"
+                            && let Some(results) = data.result
+                            && let Some(first) = results.first()
+                            && let Some(name) = &first.contract_name
+                            && !name.is_empty()
+                        {
+                            return Ok(name.clone());
+                        }
+                        last_error = Some(anyhow!("Contract name is empty"));
+                    }
+                    Err(e) => {
+                        last_error = Some(anyhow!("Invalid JSON: {}", e));
+                    }
+                }
+            } else {
+                last_error = Some(anyhow!(
+                    "{} {}",
+                    response.status(),
+                    response.status().canonical_reason().unwrap_or("")
+                ));
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow!("Name not found")))
+    }
+
+    /// Get the deployment block number for a contract.
+    pub async fn get_start_block(&self, network_id: &str, address: &str) -> Result<u64> {
+        let urls = self.get_etherscan_urls(network_id)?;
+        if urls.is_empty() {
+            return Err(anyhow!(
+                "No contract API available for {} in the registry",
+                network_id
+            ));
+        }
+
+        let mut last_error = None;
+
+        for url in urls {
+            let api_url = format!(
+                "{}?module=contract&action=getcontractcreation&contractaddresses={}",
+                url, address
+            );
+
+            let response = self
+                .client
+                .get(&api_url)
+                .send()
+                .await
+                .context("Contract API is unreachable")?;
+
+            if response.status().is_success() {
+                match response.json::<ContractCreationResponse>().await {
+                    Ok(data) => {
+                        if data.status == "1"
+                            && let Some(results) = data.result
+                            && let Some(first) = results.first()
+                        {
+                            // Try direct block number first
+                            if let Some(block) = &first.block_number
+                                && let Ok(num) = block.parse::<u64>()
+                            {
+                                return Ok(num);
+                            }
+                            // Fall back to fetching transaction
+                            if let Some(tx_hash) = &first.tx_hash
+                                && let Ok(block) = self.get_block_from_tx(network_id, tx_hash).await
+                            {
+                                return Ok(block);
+                            }
+                        }
+                        last_error = Some(anyhow!("No contract creation info found"));
+                    }
+                    Err(e) => {
+                        last_error = Some(anyhow!("Invalid JSON: {}", e));
+                    }
+                }
+            } else {
+                last_error = Some(anyhow!(
+                    "{} {}",
+                    response.status(),
+                    response.status().canonical_reason().unwrap_or("")
+                ));
+            }
+        }
+
+        Err(last_error
+            .unwrap_or_else(|| anyhow!("Failed to fetch contract deployment transaction")))
+    }
+
+    /// Fetch contract info from Sourcify.
+    pub async fn get_from_sourcify(
+        &self,
+        network_id: &str,
+        address: &str,
+    ) -> Result<SourcifyResult> {
+        let network = self
+            .registry
+            .get_network(network_id)
+            .ok_or_else(|| anyhow!("Invalid network {}", network_id))?;
+
+        // Sourcify only supports EVM chains
+        if !network.caip2_id.starts_with("eip155") {
+            return Err(anyhow!(
+                "Invalid chainId, Sourcify API only supports EVM chains"
+            ));
+        }
+
+        // Validate address
+        if !address.starts_with("0x") || address.len() != 42 {
+            return Err(anyhow!(
+                "Invalid address, must start with 0x prefix and be 20 bytes long"
+            ));
+        }
+
+        let chain_id = network
+            .caip2_id
+            .split(':')
+            .nth(1)
+            .ok_or_else(|| anyhow!("Invalid CAIP-2 ID"))?;
+
+        let url = format!(
+            "https://sourcify.dev/server/v2/contract/{}/{}?fields=abi,compilation,deployment",
+            chain_id, address
+        );
+
+        let response = self
+            .client
+            .get(&url)
+            .send()
+            .await
+            .context("Sourcify API is unreachable")?;
+
+        if response.status().as_u16() == 404 {
+            return Err(anyhow!("Contract is not verified on Sourcify"));
+        }
+
+        if !response.status().is_success() {
+            return Err(anyhow!(
+                "Sourcify API returned status {}",
+                response.status()
+            ));
+        }
+
+        let data: SourcifyResponse = response.json().await.context("Invalid Sourcify response")?;
+
+        let abi = data.abi.ok_or_else(|| anyhow!("Contract ABI is missing"))?;
+
+        let name = data
+            .compilation
+            .and_then(|c| c.name)
+            .ok_or_else(|| anyhow!("Contract name is missing"))?;
+
+        let start_block = data
+            .deployment
+            .and_then(|d| d.block_number)
+            .and_then(|b| b.parse::<u64>().ok())
+            .ok_or_else(|| anyhow!("Contract deployment block is missing"))?;
+
+        Ok(SourcifyResult {
+            abi,
+            name,
+            start_block,
+        })
+    }
+
+    /// Get all contract info (ABI, name, start block), trying Sourcify first.
+    pub async fn get_contract_info(&self, network_id: &str, address: &str) -> Result<ContractInfo> {
+        // Try Sourcify first (more reliable for verified contracts)
+        if let Ok(sourcify) = self.get_from_sourcify(network_id, address).await {
+            return Ok(ContractInfo {
+                abi: sourcify.abi,
+                name: sourcify.name,
+                start_block: Some(sourcify.start_block),
+            });
+        }
+
+        // Fall back to Etherscan-compatible APIs
+        let abi = self.get_abi(network_id, address).await?;
+        let name = self.get_contract_name(network_id, address).await.ok();
+        let start_block = self.get_start_block(network_id, address).await.ok();
+
+        Ok(ContractInfo {
+            abi,
+            name: name.unwrap_or_else(|| "Contract".to_string()),
+            start_block,
+        })
+    }
+
+    /// Get Etherscan-compatible API URLs for a network.
+    fn get_etherscan_urls(&self, network_id: &str) -> Result<Vec<String>> {
+        let network = self
+            .registry
+            .get_network(network_id)
+            .ok_or_else(|| anyhow!("Invalid network {}", network_id))?;
+
+        let urls: Vec<String> = network
+            .api_urls
+            .iter()
+            .filter(|url| url.kind == "etherscan" || url.kind == "blockscout")
+            .map(|url| self.apply_env_vars(&url.url))
+            .filter(|url| !url.is_empty())
+            .collect();
+
+        Ok(urls)
+    }
+
+    /// Get JSON-RPC URLs for a network.
+    fn get_rpc_urls(&self, network_id: &str) -> Result<Vec<String>> {
+        let network = self
+            .registry
+            .get_network(network_id)
+            .ok_or_else(|| anyhow!("Invalid network {}", network_id))?;
+
+        let urls: Vec<String> = network
+            .rpc_urls
+            .iter()
+            .map(|url| self.apply_env_vars(url))
+            .filter(|url| !url.is_empty())
+            .collect();
+
+        Ok(urls)
+    }
+
+    /// Replace {ENVVAR} placeholders with environment variable values.
+    fn apply_env_vars(&self, url: &str) -> String {
+        // Find {ENVVAR} pattern
+        let re = regex::Regex::new(r"\{([^}]+)\}").unwrap();
+        if let Some(caps) = re.captures(url) {
+            let var_name = &caps[1];
+            if let Ok(value) = env::var(var_name) {
+                return url.replace(&format!("{{{}}}", var_name), &value);
+            }
+            // If env var not found, return empty string (skip this URL)
+            return String::new();
+        }
+        url.to_string()
+    }
+
+    /// Fetch from an Etherscan-compatible API.
+    async fn fetch_from_etherscan(&self, url: &str) -> Result<EtherscanResponse> {
+        let response = self
+            .client
+            .get(url)
+            .send()
+            .await
+            .context("Contract API is unreachable")?;
+
+        if !response.status().is_success() {
+            return Err(anyhow!(
+                "{} {}",
+                response.status(),
+                response.status().canonical_reason().unwrap_or("")
+            ));
+        }
+
+        response
+            .json::<EtherscanResponse>()
+            .await
+            .context("Invalid JSON response")
+    }
+
+    /// Get block number from transaction hash via JSON-RPC.
+    async fn get_block_from_tx(&self, network_id: &str, tx_hash: &str) -> Result<u64> {
+        let urls = self.get_rpc_urls(network_id)?;
+        if urls.is_empty() {
+            return Err(anyhow!("No JSON-RPC available for {}", network_id));
+        }
+
+        let mut last_error = None;
+
+        let body = serde_json::json!({
+            "jsonrpc": "2.0",
+            "method": "eth_getTransactionByHash",
+            "params": [tx_hash],
+            "id": 1
+        });
+
+        for url in urls {
+            match self
+                .client
+                .post(&url)
+                .header("Content-Type", "application/json")
+                .json(&body)
+                .send()
+                .await
+            {
+                Ok(response) => {
+                    if response.status().is_success() {
+                        match response.json::<RpcResponse>().await {
+                            Ok(data) => {
+                                if let Some(result) = data.result
+                                    && let Some(block_hex) = result.block_number
+                                {
+                                    // Parse hex block number
+                                    let block_str = block_hex.trim_start_matches("0x");
+                                    if let Ok(block) = u64::from_str_radix(block_str, 16) {
+                                        return Ok(block);
+                                    }
+                                }
+                                last_error = Some(anyhow!("No block number in transaction"));
+                            }
+                            Err(e) => {
+                                last_error = Some(anyhow!("Invalid JSON: {}", e));
+                            }
+                        }
+                    } else {
+                        last_error = Some(anyhow!("RPC returned {}", response.status()));
+                    }
+                }
+                Err(e) => {
+                    last_error = Some(anyhow!("RPC request failed: {}", e));
+                }
+            }
+        }
+
+        Err(last_error.unwrap_or_else(|| anyhow!("Failed to fetch transaction {}", tx_hash)))
+    }
+}
+
+/// Information about a verified contract.
+#[derive(Debug)]
+pub struct ContractInfo {
+    /// The contract ABI as JSON
+    pub abi: JsonValue,
+    /// The contract name
+    pub name: String,
+    /// The deployment block number (if available)
+    pub start_block: Option<u64>,
+}
+
+/// Well-known Etherscan API URLs for common networks (fallback if registry unavailable).
+pub fn get_fallback_etherscan_url(network: &str) -> Option<&'static str> {
+    // Note: These require API keys for high-volume usage
+    static ETHERSCAN_URLS: &[(&str, &str)] = &[
+        ("mainnet", "https://api.etherscan.io/api"),
+        ("goerli", "https://api-goerli.etherscan.io/api"),
+        ("sepolia", "https://api-sepolia.etherscan.io/api"),
+        ("polygon", "https://api.polygonscan.com/api"),
+        ("arbitrum-one", "https://api.arbiscan.io/api"),
+        ("optimism", "https://api-optimistic.etherscan.io/api"),
+        ("base", "https://api.basescan.org/api"),
+        ("bnb", "https://api.bscscan.com/api"),
+        ("avalanche", "https://api.snowtrace.io/api"),
+        ("gnosis", "https://api.gnosisscan.io/api"),
+    ];
+
+    ETHERSCAN_URLS
+        .iter()
+        .find(|(n, _)| *n == network)
+        .map(|(_, url)| *url)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const TEST_REGISTRY_JSON: &str = r#"{
+        "networks": [
+            {
+                "id": "mainnet",
+                "shortName": "Ethereum",
+                "fullName": "Ethereum Mainnet",
+                "aliases": ["ethereum", "eth"],
+                "caip2Id": "eip155:1",
+                "apiUrls": [
+                    {"url": "https://api.etherscan.io/api", "kind": "etherscan"},
+                    {"url": "https://eth.blockscout.com/api", "kind": "blockscout"}
+                ],
+                "rpcUrls": ["https://ethereum-rpc.publicnode.com"]
+            },
+            {
+                "id": "goerli",
+                "aliases": [],
+                "caip2Id": "eip155:5",
+                "apiUrls": [],
+                "rpcUrls": []
+            }
+        ]
+    }"#;
+
+    #[test]
+    fn test_parse_registry() {
+        let registry = NetworksRegistry::from_json(TEST_REGISTRY_JSON).unwrap();
+        assert_eq!(registry.networks.len(), 2);
+
+        let mainnet = registry.get_network("mainnet").unwrap();
+        assert_eq!(mainnet.id, "mainnet");
+        assert_eq!(mainnet.caip2_id, "eip155:1");
+        assert_eq!(mainnet.api_urls.len(), 2);
+        assert_eq!(mainnet.rpc_urls.len(), 1);
+    }
+
+    #[test]
+    fn test_get_network_by_alias() {
+        let registry = NetworksRegistry::from_json(TEST_REGISTRY_JSON).unwrap();
+
+        assert!(registry.get_network("eth").is_some());
+        assert!(registry.get_network("ethereum").is_some());
+        assert!(registry.get_network("MAINNET").is_some());
+        assert!(registry.get_network("invalid").is_none());
+    }
+
+    #[test]
+    fn test_apply_env_vars() {
+        let registry = NetworksRegistry::from_json(TEST_REGISTRY_JSON).unwrap();
+        let service = ContractService::new(registry);
+
+        // URL without env var
+        assert_eq!(
+            service.apply_env_vars("https://api.etherscan.io/api"),
+            "https://api.etherscan.io/api"
+        );
+
+        // URL with non-existent env var should return empty string
+        let url_with_var = "https://api.etherscan.io/api?apikey={NONEXISTENT_VAR}";
+        assert_eq!(service.apply_env_vars(url_with_var), "");
+    }
+
+    #[test]
+    fn test_get_etherscan_urls() {
+        let registry = NetworksRegistry::from_json(TEST_REGISTRY_JSON).unwrap();
+        let service = ContractService::new(registry);
+
+        let urls = service.get_etherscan_urls("mainnet").unwrap();
+        assert_eq!(urls.len(), 2);
+        assert!(urls.contains(&"https://api.etherscan.io/api".to_string()));
+
+        // Network without API URLs
+        let urls = service.get_etherscan_urls("goerli").unwrap();
+        assert!(urls.is_empty());
+
+        // Invalid network
+        assert!(service.get_etherscan_urls("invalid").is_err());
+    }
+
+    #[test]
+    fn test_fallback_etherscan_urls() {
+        assert_eq!(
+            get_fallback_etherscan_url("mainnet"),
+            Some("https://api.etherscan.io/api")
+        );
+        assert_eq!(
+            get_fallback_etherscan_url("polygon"),
+            Some("https://api.polygonscan.com/api")
+        );
+        assert_eq!(get_fallback_etherscan_url("unknown"), None);
+    }
+}
diff --git a/gnd/src/services/graph_node.rs b/gnd/src/services/graph_node.rs
new file mode 100644
index 00000000000..9d3faa07d2b
--- /dev/null
+++ b/gnd/src/services/graph_node.rs
@@ -0,0 +1,258 @@
+//! JSON-RPC client for communicating with Graph Node admin API.
+//!
+//! This client is used by the `create`, `remove`, and `deploy` commands to
+//! interact with a Graph Node instance.
+
+use reqwest::header::{AUTHORIZATION, HeaderMap, HeaderValue, USER_AGENT};
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+use url::Url;
+
+/// Version string for User-Agent header
+const GND_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+/// Errors that can occur when communicating with a Graph Node
+#[derive(Debug, Error)]
+pub enum GraphNodeError {
+    #[error("Invalid node URL: {0}")]
+    InvalidUrl(#[from] url::ParseError),
+
+    #[error("Unsupported protocol: {protocol}. The Graph Node URL must be http:// or https://")]
+    UnsupportedProtocol { protocol: String },
+
+    #[error("HTTP error: {0}")]
+    Http(#[from] reqwest::Error),
+
+    #[error("JSON-RPC error: {message}")]
+    JsonRpc { code: i64, message: String },
+}
+
+/// A client for communicating with a Graph Node's JSON-RPC admin API
+#[derive(Debug, Clone)]
+pub struct GraphNodeClient {
+    client: reqwest::Client,
+    url: Url,
+}
+
+impl GraphNodeClient {
+    /// Create a new client for the given Graph Node URL.
+    ///
+    /// The URL should be the admin JSON-RPC endpoint (e.g., `http://localhost:8020`).
+    /// An optional access token can be provided for authentication.
+    pub fn new(node_url: &str, access_token: Option<&str>) -> Result<Self, GraphNodeError> {
+        let url = Url::parse(node_url)?;
+
+        // Validate protocol
+        match url.scheme() {
+            "http" | "https" => {}
+            other => {
+                return Err(GraphNodeError::UnsupportedProtocol {
+                    protocol: other.to_string(),
+                });
+            }
+        }
+
+        // Build headers
+        let mut headers = HeaderMap::new();
+        headers.insert(
+            USER_AGENT,
+            HeaderValue::from_str(&format!("gnd/{}", GND_VERSION))
+                .expect("valid user agent string"),
+        );
+
+        if let Some(token) = access_token {
+            headers.insert(
+                AUTHORIZATION,
+                HeaderValue::from_str(&format!("Bearer {}", token))
+                    .expect("valid authorization header"),
+            );
+        }
+
+        let client = reqwest::Client::builder()
+            .default_headers(headers)
+            .timeout(std::time::Duration::from_secs(120))
+            .build()?;
+
+        Ok(Self { client, url })
+    }
+
+    /// Create a subgraph with the given name.
+    ///
+    /// This registers the subgraph name with the Graph Node but does not deploy any code.
+    pub async fn create_subgraph(&self, name: &str) -> Result<(), GraphNodeError> {
+        let request = JsonRpcRequest::name_only("subgraph_create", name);
+        self.call::<serde_json::Value>(request).await?;
+        Ok(())
+    }
+
+    /// Remove a subgraph with the given name.
+    ///
+    /// This unregisters the subgraph name from the Graph Node.
+    pub async fn remove_subgraph(&self, name: &str) -> Result<(), GraphNodeError> {
+        let request = JsonRpcRequest::name_only("subgraph_remove", name);
+        self.call::<serde_json::Value>(request).await?;
+        Ok(())
+    }
+
+    /// Deploy a subgraph to the Graph Node.
+    ///
+    /// This deploys the subgraph with the given name using the provided IPFS hash.
+    /// Returns the deployment result containing playground and queries URLs.
+    pub async fn deploy_subgraph(
+        &self,
+        name: &str,
+        ipfs_hash: &str,
+        version_label: Option<&str>,
+        debug_fork: Option<&str>,
+    ) -> Result<DeployResult, GraphNodeError> {
+        let request = JsonRpcRequest::deploy(name, ipfs_hash, version_label, debug_fork);
+        self.call::<DeployResult>(request).await
+    }
+
+    /// Make a JSON-RPC call to the Graph Node
+    async fn call<T: for<'de> Deserialize<'de>>(
+        &self,
+        request: JsonRpcRequest,
+    ) -> Result<T, GraphNodeError> {
+        let response = self
+            .client
+            .post(self.url.clone())
+            .json(&request)
+            .send()
+            .await?
+            .json::<JsonRpcResponse<T>>()
+            .await?;
+
+        if let Some(error) = response.error {
+            return Err(GraphNodeError::JsonRpc {
+                code: error.code,
+                message: error.message,
+            });
+        }
+
+        // If there's no error, there should be a result
+        response.result.ok_or_else(|| GraphNodeError::JsonRpc {
+            code: -1,
+            message: "No result in response".to_string(),
+        })
+    }
+}
+
+/// Result from a successful subgraph deployment.
+#[derive(Debug, Deserialize)]
+pub struct DeployResult {
+    /// URL to the GraphQL playground for this subgraph
+    pub playground: String,
+    /// URL to the GraphQL queries endpoint for this subgraph
+    pub queries: String,
+}
+
+#[derive(Debug, Serialize)]
+struct JsonRpcRequest {
+    jsonrpc: &'static str,
+    id: u32,
+    method: &'static str,
+    params: JsonRpcParams,
+}
+
+impl JsonRpcRequest {
+    fn name_only(method: &'static str, name: &str) -> Self {
+        Self {
+            jsonrpc: "2.0",
+            id: 1,
+            method,
+            params: JsonRpcParams::NameOnly {
+                name: name.to_string(),
+            },
+        }
+    }
+
+    fn deploy(
+        name: &str,
+        ipfs_hash: &str,
+        version_label: Option<&str>,
+        debug_fork: Option<&str>,
+    ) -> Self {
+        Self {
+            jsonrpc: "2.0",
+            id: 1,
+            method: "subgraph_deploy",
+            params: JsonRpcParams::Deploy {
+                name: name.to_string(),
+                ipfs_hash: ipfs_hash.to_string(),
+                version_label: version_label.map(|s| s.to_string()),
+                debug_fork: debug_fork.map(|s| s.to_string()),
+            },
+        }
+    }
+}
+
+#[derive(Debug, Serialize)]
+#[serde(untagged)]
+enum JsonRpcParams {
+    NameOnly {
+        name: String,
+    },
+    Deploy {
+        name: String,
+        ipfs_hash: String,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        version_label: Option<String>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        debug_fork: Option<String>,
+    },
+}
+
+#[derive(Debug, Deserialize)]
+struct JsonRpcResponse<T> {
+    #[allow(dead_code)]
+    jsonrpc: String,
+    #[allow(dead_code)]
+    id: u32,
+    result: Option<T>,
+    error: Option<JsonRpcError>,
+}
+
+#[derive(Debug, Deserialize)]
+struct JsonRpcError {
+    code: i64,
+    message: String,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_invalid_url() {
+        let result = GraphNodeClient::new("not-a-valid-url", None);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_unsupported_protocol() {
+        let result = GraphNodeClient::new("ftp://example.com", None);
+        assert!(matches!(
+            result,
+            Err(GraphNodeError::UnsupportedProtocol { protocol }) if protocol == "ftp"
+        ));
+    }
+
+    #[test]
+    fn test_valid_http_url() {
+        let result = GraphNodeClient::new("http://localhost:8020", None);
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn test_valid_https_url() {
+        let result = GraphNodeClient::new("https://example.com/admin", None);
+        assert!(result.is_ok());
+    }
+
+    #[test]
+    fn test_with_access_token() {
+        let result = GraphNodeClient::new("http://localhost:8020", Some("test-token"));
+        assert!(result.is_ok());
+    }
+}
diff --git a/gnd/src/services/ipfs.rs b/gnd/src/services/ipfs.rs
new file mode 100644
index 00000000000..54070dbac2b
--- /dev/null
+++ b/gnd/src/services/ipfs.rs
@@ -0,0 +1,273 @@
+//! IPFS client for uploading and fetching subgraph files.
+//!
+//! This module provides an IPFS client that uses the Kubo RPC API to upload
+//! files, get their IPFS hashes, and fetch content by CID. It's used by the
+//! build, deploy, and init commands.
+
+use std::collections::HashMap;
+use std::path::Path;
+
+use anyhow::{Context, Result, anyhow};
+use reqwest::multipart::{Form, Part};
+use serde::Deserialize;
+use url::Url;
+
+/// Version string for User-Agent header
+const GND_VERSION: &str = env!("CARGO_PKG_VERSION");
+
+/// IPFS client for uploading files to an IPFS node.
+#[derive(Debug, Clone)]
+pub struct IpfsClient {
+    client: reqwest::Client,
+    api_url: Url,
+}
+
+impl IpfsClient {
+    /// Create a new IPFS client for the given IPFS node URL.
+    ///
+    /// The URL should be the IPFS HTTP API endpoint (e.g., `http://localhost:5001`
+    /// or `https://api.thegraph.com/ipfs/api/v0`).
+    pub fn new(url: &str) -> Result<Self> {
+        let mut api_url = Url::parse(url).context("Invalid IPFS URL")?;
+
+        // Ensure the URL ends with /api/v0 for the Kubo API
+        let path = api_url.path();
+        if !path.ends_with("/api/v0") && !path.ends_with("/api/v0/") {
+            // Append /api/v0 if needed
+            let new_path = if path.ends_with('/') {
+                format!("{}api/v0", path)
+            } else if path.contains("/api/v0") {
+                path.to_string()
+            } else {
+                format!("{}/api/v0", path.trim_end_matches('/'))
+            };
+            api_url.set_path(&new_path);
+        }
+
+        let client = reqwest::Client::builder()
+            .user_agent(format!("gnd/{}", GND_VERSION))
+            .timeout(std::time::Duration::from_secs(300)) // 5 minutes for large uploads
+            .build()
+            .context("Failed to create HTTP client")?;
+
+        Ok(Self { client, api_url })
+    }
+
+    /// Add a file to IPFS and return its CID (content identifier).
+    ///
+    /// The file is uploaded using the IPFS `add` API endpoint.
+    pub async fn add(&self, filename: &str, content: Vec<u8>) -> Result<String> {
+        let mut url = self.api_url.clone();
+        url.set_path(&format!("{}/add", url.path().trim_end_matches('/')));
+
+        // Add query parameters
+        url.query_pairs_mut()
+            .append_pair("pin", "true")
+            .append_pair("wrap-with-directory", "false");
+
+        let part = Part::bytes(content)
+            .file_name(filename.to_string())
+            .mime_str("application/octet-stream")
+            .context("Failed to create multipart form")?;
+
+        let form = Form::new().part("file", part);
+
+        let response = self
+            .client
+            .post(url)
+            .multipart(form)
+            .send()
+            .await
+            .context("Failed to send request to IPFS")?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            let body = response.text().await.unwrap_or_default();
+            return Err(anyhow!("IPFS add failed with status {}: {}", status, body));
+        }
+
+        // IPFS returns newline-delimited JSON (one object per line).
+        // When the filename contains a path separator, IPFS returns multiple lines:
+        // first the file itself, then any parent directories. We want the first
+        // line which is the actual file CID.
+        let body = response
+            .text()
+            .await
+            .context("Failed to read IPFS response body")?;
+
+        // Parse the first non-empty line as the result (the actual file)
+        let first_line = body
+            .lines()
+            .find(|line| !line.is_empty())
+            .ok_or_else(|| anyhow!("Empty response from IPFS"))?;
+
+        let result: AddResponse =
+            serde_json::from_str(first_line).context("Failed to parse IPFS response JSON")?;
+
+        Ok(result.hash)
+    }
+
+    /// Add multiple files to IPFS and return a map of filenames to CIDs.
+    ///
+    /// This is more efficient than calling `add` multiple times for many files.
+    pub async fn add_all(&self, files: Vec<(String, Vec<u8>)>) -> Result<HashMap<String, String>> {
+        let mut results = HashMap::new();
+
+        for (filename, content) in files {
+            let hash = self.add(&filename, content).await?;
+            results.insert(filename, hash);
+        }
+
+        Ok(results)
+    }
+
+    /// Pin an existing CID to ensure it's not garbage collected.
+    pub async fn pin(&self, cid: &str) -> Result<()> {
+        let mut url = self.api_url.clone();
+        url.set_path(&format!("{}/pin/add", url.path().trim_end_matches('/')));
+        url.query_pairs_mut().append_pair("arg", cid);
+
+        let response = self
+            .client
+            .post(url)
+            .send()
+            .await
+            .context("Failed to send pin request to IPFS")?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            let body = response.text().await.unwrap_or_default();
+            return Err(anyhow!("IPFS pin failed with status {}: {}", status, body));
+        }
+
+        Ok(())
+    }
+
+    /// Fetch content from IPFS by CID.
+    ///
+    /// Returns the content as a string. The CID can be with or without the
+    /// `/ipfs/` prefix.
+    pub async fn cat(&self, cid: &str) -> Result<String> {
+        // Normalize CID: strip /ipfs/ prefix if present
+        let normalized_cid = cid.strip_prefix("/ipfs/").unwrap_or(cid);
+
+        let mut url = self.api_url.clone();
+        url.set_path(&format!("{}/cat", url.path().trim_end_matches('/')));
+        url.query_pairs_mut().append_pair("arg", normalized_cid);
+
+        let response = self
+            .client
+            .post(url)
+            .send()
+            .await
+            .context("Failed to send cat request to IPFS")?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            let body = response.text().await.unwrap_or_default();
+            return Err(anyhow!(
+                "Failed to fetch {} from IPFS (status {}): {}",
+                normalized_cid,
+                status,
+                body
+            ));
+        }
+
+        response
+            .text()
+            .await
+            .context("Failed to read response body from IPFS")
+    }
+
+    /// Fetch a subgraph manifest from IPFS by deployment ID.
+    ///
+    /// The deployment ID is the CID of the manifest (typically starts with `Qm`).
+    /// Returns the raw manifest YAML content.
+    pub async fn fetch_manifest(&self, deployment_id: &str) -> Result<String> {
+        self.cat(deployment_id)
+            .await
+            .with_context(|| format!("Failed to fetch manifest for deployment {}", deployment_id))
+    }
+
+    /// Fetch the schema from IPFS using a manifest's schema CID.
+    ///
+    /// The schema CID is extracted from the manifest YAML at `schema.file["/"]`.
+    pub async fn fetch_schema(&self, schema_cid: &str) -> Result<String> {
+        self.cat(schema_cid)
+            .await
+            .with_context(|| format!("Failed to fetch schema {}", schema_cid))
+    }
+
+    /// Fetch the GraphQL schema for a subgraph deployment.
+    ///
+    /// This fetches the manifest from IPFS, extracts the schema CID, and then
+    /// fetches the schema content. Used for generating types for subgraph data sources.
+    pub async fn fetch_subgraph_schema(&self, deployment_id: &str) -> Result<String> {
+        // Fetch the manifest
+        let manifest_content = self.fetch_manifest(deployment_id).await?;
+
+        // Parse manifest YAML to extract schema CID
+        let manifest: serde_json::Value = serde_yaml::from_str(&manifest_content)
+            .with_context(|| format!("Failed to parse manifest YAML for {}", deployment_id))?;
+
+        // Extract schema CID from schema.file["/"]
+        let schema_cid = manifest
+            .get("schema")
+            .and_then(|s| s.get("file"))
+            .and_then(|f| f.get("/"))
+            .and_then(|c| c.as_str())
+            .ok_or_else(|| {
+                anyhow!(
+                    "Failed to extract schema CID from manifest {}",
+                    deployment_id
+                )
+            })?;
+
+        // Normalize schema CID - strip /ipfs/ prefix if present
+        let normalized_cid = schema_cid.strip_prefix("/ipfs/").unwrap_or(schema_cid);
+
+        // Fetch and return the schema
+        self.fetch_schema(normalized_cid).await
+    }
+}
+
+/// Response from the IPFS add endpoint.
+#[derive(Debug, Deserialize)]
+struct AddResponse {
+    #[serde(rename = "Hash")]
+    hash: String,
+    #[serde(rename = "Name")]
+    #[allow(dead_code)]
+    name: String,
+    #[serde(rename = "Size")]
+    #[allow(dead_code)]
+    size: String,
+}
+
+/// Read a file and return its contents as bytes.
+pub fn read_file(path: &Path) -> Result<Vec<u8>> {
+    std::fs::read(path).with_context(|| format!("Failed to read file: {}", path.display()))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_url_normalization_no_api() {
+        let client = IpfsClient::new("http://localhost:5001").unwrap();
+        assert!(client.api_url.path().contains("/api/v0"));
+    }
+
+    #[test]
+    fn test_url_normalization_with_api() {
+        let client = IpfsClient::new("https://api.thegraph.com/ipfs/api/v0").unwrap();
+        assert!(client.api_url.path().contains("/api/v0"));
+    }
+
+    #[test]
+    fn test_url_normalization_thegraph() {
+        let client = IpfsClient::new("https://api.thegraph.com/ipfs").unwrap();
+        assert!(client.api_url.path().ends_with("/api/v0"));
+    }
+}
diff --git a/gnd/src/services/mod.rs b/gnd/src/services/mod.rs
new file mode 100644
index 00000000000..27fa4942c99
--- /dev/null
+++ b/gnd/src/services/mod.rs
@@ -0,0 +1,10 @@
+mod contract;
+mod graph_node;
+mod ipfs;
+
+pub use contract::{
+    ContractInfo, ContractService, Network, NetworksRegistry, SourcifyResult,
+    get_fallback_etherscan_url,
+};
+pub use graph_node::{DeployResult, GraphNodeClient, GraphNodeError};
+pub use ipfs::{IpfsClient, read_file};
diff --git a/gnd/src/shared/mod.rs b/gnd/src/shared/mod.rs
new file mode 100644
index 00000000000..4421dbd4645
--- /dev/null
+++ b/gnd/src/shared/mod.rs
@@ -0,0 +1,8 @@
+//! Shared utilities for gnd code generation.
+//!
+//! This module contains common utilities used across multiple codegen
+//! and scaffold modules to reduce duplication.
+
+pub mod sanitize;
+
+pub use sanitize::{RESERVED_WORDS, capitalize, handle_reserved_word};
diff --git a/gnd/src/shared/sanitize.rs b/gnd/src/shared/sanitize.rs
new file mode 100644
index 00000000000..a0b22eeaead
--- /dev/null
+++ b/gnd/src/shared/sanitize.rs
@@ -0,0 +1,111 @@
+//! Shared sanitization utilities for code generation.
+//!
+//! Contains reserved word handling and name sanitization used by both
+//! schema codegen and ABI codegen.
+
+/// Reserved words in AssemblyScript that need to be escaped.
+///
+/// This is a superset of reserved words from ECMAScript plus AssemblyScript-specific
+/// additions. When a field or parameter name matches one of these, it gets
+/// an underscore appended.
+pub const RESERVED_WORDS: &[&str] = &[
+    "await",
+    "break",
+    "case",
+    "catch",
+    "class",
+    "const",
+    "continue",
+    "debugger",
+    "default",
+    "delete",
+    "do",
+    "else",
+    "enum",
+    "export",
+    "extends",
+    "false",
+    "finally",
+    "for",
+    "function",
+    "if",
+    "implements",
+    "import",
+    "in",
+    "instanceof",
+    "interface",
+    "let",
+    "new",
+    "null",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "return",
+    "static",
+    "super",
+    "switch",
+    "this",
+    "throw",
+    "true",
+    "try",
+    "typeof",
+    "var",
+    "void",
+    "while",
+    "with",
+    "yield",
+];
+
+/// Handle reserved words by appending an underscore.
+///
+/// If the given name is a reserved word in AssemblyScript, returns the name
+/// with an underscore appended. Otherwise returns the name unchanged.
+pub fn handle_reserved_word(name: &str) -> String {
+    if RESERVED_WORDS.contains(&name) {
+        format!("{}_", name)
+    } else {
+        name.to_string()
+    }
+}
+
+/// Capitalize the first letter of a string.
+///
+/// Returns an empty string if the input is empty, otherwise returns the
+/// string with the first character uppercased.
+pub fn capitalize(s: &str) -> String {
+    let mut chars = s.chars();
+    match chars.next() {
+        None => String::new(),
+        Some(c) => c.to_uppercase().collect::<String>() + chars.as_str(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_handle_reserved_word_reserved() {
+        assert_eq!(handle_reserved_word("class"), "class_");
+        assert_eq!(handle_reserved_word("return"), "return_");
+        assert_eq!(handle_reserved_word("await"), "await_");
+        assert_eq!(handle_reserved_word("default"), "default_");
+    }
+
+    #[test]
+    fn test_handle_reserved_word_not_reserved() {
+        assert_eq!(handle_reserved_word("myField"), "myField");
+        assert_eq!(handle_reserved_word("amount"), "amount");
+        assert_eq!(handle_reserved_word("value"), "value");
+    }
+
+    #[test]
+    fn test_capitalize() {
+        assert_eq!(capitalize("hello"), "Hello");
+        assert_eq!(capitalize("world"), "World");
+        assert_eq!(capitalize(""), "");
+        assert_eq!(capitalize("a"), "A");
+        assert_eq!(capitalize("ALREADY"), "ALREADY");
+    }
+}
diff --git a/gnd/src/validation/mod.rs b/gnd/src/validation/mod.rs
new file mode 100644
index 00000000000..8991df4fba5
--- /dev/null
+++ b/gnd/src/validation/mod.rs
@@ -0,0 +1,2373 @@
+//! Schema and manifest validation using graph-node's validation logic.
+//!
+//! This module provides validation functions that use the same validation
+//! logic as graph-node, ensuring developers get early feedback about issues
+//! that would cause deployment failures.
+
+use std::collections::HashSet;
+use std::path::Path;
+
+use anyhow::{Context, Result};
+use graph::abi::{Event, Function, JsonAbi};
+use graph::data::subgraph::SubgraphManifestValidationError;
+use graph::data::subgraph::api_version::{LATEST_VERSION, MIN_SPEC_VERSION};
+use graph::data::subgraph::manifest_validation;
+use graph::prelude::DeploymentHash;
+use graph::schema::{InputSchema, SchemaValidationError};
+use semver::Version;
+
+use crate::manifest::{Abi, BlockHandlerFilterKind, CallHandler, DataSource, Manifest, Template};
+
+/// Validate a GraphQL schema using graph-node's InputSchema validation.
+///
+/// Returns a list of validation errors. An empty list means the schema is valid.
+pub fn validate_schema(
+    schema_path: &Path,
+    spec_version: &Version,
+) -> Result<Vec<SchemaValidationError>> {
+    let schema_str = std::fs::read_to_string(schema_path)
+        .with_context(|| format!("Failed to read schema: {}", schema_path.display()))?;
+
+    // Use a dummy deployment hash for local validation
+    // The hash must be alphanumeric only (no dashes or special chars)
+    let id = DeploymentHash::new("QmLocalValidation").unwrap();
+
+    Ok(InputSchema::validate(spec_version, &schema_str, id))
+}
+
+/// Format validation errors for display.
+pub fn format_schema_errors(errors: &[SchemaValidationError]) -> String {
+    errors
+        .iter()
+        .map(|e| format!("  - {}", e))
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+/// Errors that can occur during manifest validation in gnd.
+#[derive(Debug)]
+pub enum ManifestValidationError {
+    /// Error from shared validation logic.
+    Shared(Box<SubgraphManifestValidationError>),
+    /// Unsupported spec version.
+    UnsupportedSpecVersion {
+        version: Version,
+        min: Version,
+        max: Version,
+    },
+    /// File not found.
+    FileNotFound { path: String, description: String },
+    /// File could not be parsed.
+    InvalidFile { path: String, reason: String },
+    /// source.abi references an ABI name not listed in mapping.abis.
+    SourceAbiNotInMappingAbis {
+        data_source: String,
+        source_abi: String,
+        available: Vec<String>,
+    },
+    /// Duplicate data source or template name.
+    DuplicateName { kind: &'static str, name: String },
+    /// Ethereum data source has no handlers defined.
+    NoHandlers { data_source: String },
+    /// Invalid data source kind (not a valid Ethereum kind).
+    InvalidKind { data_source: String, kind: String },
+    /// Call or block handlers require a source address.
+    SourceAddressRequired { data_source: String },
+    /// Block handler constraint violation.
+    BlockHandlerConstraint { data_source: String, reason: String },
+    /// Event handler receipt requires apiVersion >= 0.0.7.
+    ReceiptRequiresApiVersion { data_source: String },
+    /// Eth call declarations require specVersion >= 1.2.0.
+    CallDeclsRequireSpecVersion { data_source: String },
+    /// Handler names from the manifest are missing as exports in the compiled WASM.
+    MissingWasmHandlers {
+        data_source: String,
+        missing: Vec<String>,
+    },
+    /// Failed to parse a compiled WASM file.
+    InvalidWasm { path: String, reason: String },
+    /// Event handler references an event signature not found in the ABI.
+    EventNotInAbi {
+        data_source: String,
+        event: String,
+        abi_name: String,
+    },
+    /// Call handler references a function signature not found in the ABI.
+    FunctionNotInAbi {
+        data_source: String,
+        function: String,
+        abi_name: String,
+    },
+}
+
+impl std::fmt::Display for ManifestValidationError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ManifestValidationError::Shared(e) => write!(f, "{}", e),
+            ManifestValidationError::UnsupportedSpecVersion { version, min, max } => {
+                write!(
+                    f,
+                    "unsupported spec version {}: must be between {} and {}",
+                    version, min, max
+                )
+            }
+            ManifestValidationError::FileNotFound { path, description } => {
+                write!(f, "{} not found: {}", description, path)
+            }
+            ManifestValidationError::InvalidFile { path, reason } => {
+                write!(f, "invalid file {}: {}", path, reason)
+            }
+            ManifestValidationError::SourceAbiNotInMappingAbis {
+                data_source,
+                source_abi,
+                available,
+            } => {
+                if available.is_empty() {
+                    write!(
+                        f,
+                        "data source '{}': source.abi '{}' not found in mapping.abis (no ABIs defined)",
+                        data_source, source_abi
+                    )
+                } else {
+                    write!(
+                        f,
+                        "data source '{}': source.abi '{}' not found in mapping.abis (available: {})",
+                        data_source,
+                        source_abi,
+                        available.join(", ")
+                    )
+                }
+            }
+            ManifestValidationError::DuplicateName { kind, name } => {
+                write!(f, "duplicate {} name: '{}'", kind, name)
+            }
+            ManifestValidationError::NoHandlers { data_source } => {
+                write!(
+                    f,
+                    "data source '{}': no event, call, or block handlers defined",
+                    data_source
+                )
+            }
+            ManifestValidationError::InvalidKind { data_source, kind } => {
+                write!(
+                    f,
+                    "data source '{}': invalid kind '{}', expected 'ethereum' or 'ethereum/contract'",
+                    data_source, kind
+                )
+            }
+            ManifestValidationError::SourceAddressRequired { data_source } => {
+                write!(
+                    f,
+                    "data source '{}': source address is required when using call or block handlers",
+                    data_source
+                )
+            }
+            ManifestValidationError::BlockHandlerConstraint {
+                data_source,
+                reason,
+            } => {
+                write!(f, "data source '{}': {}", data_source, reason)
+            }
+            ManifestValidationError::ReceiptRequiresApiVersion { data_source } => {
+                write!(
+                    f,
+                    "data source '{}': event handlers that require transaction receipts need apiVersion >= 0.0.7",
+                    data_source
+                )
+            }
+            ManifestValidationError::CallDeclsRequireSpecVersion { data_source } => {
+                write!(
+                    f,
+                    "data source '{}': eth call declarations on event handlers require specVersion >= 1.2.0",
+                    data_source
+                )
+            }
+            ManifestValidationError::MissingWasmHandlers {
+                data_source,
+                missing,
+            } => {
+                write!(
+                    f,
+                    "data source '{}': missing WASM handlers: {}",
+                    data_source,
+                    missing.join(", ")
+                )
+            }
+            ManifestValidationError::InvalidWasm { path, reason } => {
+                write!(f, "invalid WASM file {}: {}", path, reason)
+            }
+            ManifestValidationError::EventNotInAbi {
+                data_source,
+                event,
+                abi_name,
+            } => {
+                write!(
+                    f,
+                    "data source '{}': event '{}' not found in ABI '{}'",
+                    data_source, event, abi_name
+                )
+            }
+            ManifestValidationError::FunctionNotInAbi {
+                data_source,
+                function,
+                abi_name,
+            } => {
+                write!(
+                    f,
+                    "data source '{}': function '{}' not found in ABI '{}'",
+                    data_source, function, abi_name
+                )
+            }
+        }
+    }
+}
+
+impl From<SubgraphManifestValidationError> for ManifestValidationError {
+    fn from(e: SubgraphManifestValidationError) -> Self {
+        ManifestValidationError::Shared(Box::new(e))
+    }
+}
+
+/// Validate manifest file references.
+///
+/// Checks that all referenced files exist, ABI files are valid JSON,
+/// source.abi cross-references mapping.abis, names are unique,
+/// Ethereum data sources have at least one handler, and handler
+/// signatures match events/functions in the ABI. This validation
+/// runs before codegen to catch errors early.
+///
+/// Note: Ethereum structural constraints (kind, address, block handler
+/// combos, receipt/call-decl version requirements) are validated separately
+/// in `validate_manifest` which runs during build.
+pub(crate) fn validate_manifest_files(
+    manifest: &Manifest,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    // Validate file existence
+    errors.extend(validate_file_existence(manifest, manifest_dir));
+
+    // Validate ABIs are valid JSON
+    errors.extend(validate_abis(manifest, manifest_dir));
+
+    // Validate source.abi references an ABI in mapping.abis
+    errors.extend(validate_source_abi_references(manifest));
+
+    // Validate unique data source and template names
+    errors.extend(validate_unique_names(manifest));
+
+    // Validate Ethereum data sources have at least one handler
+    errors.extend(validate_handler_presence(manifest));
+
+    // Validate event/call handler signatures match ABI definitions
+    errors.extend(validate_handler_signatures(manifest, manifest_dir));
+
+    errors
+}
+
+/// Validate a subgraph manifest.
+///
+/// This performs several validation checks:
+/// - At least one data source exists
+/// - All data sources use the same network
+/// - All data sources use consistent API versions
+/// - Spec version is within supported range
+/// - Referenced files exist (schema, mappings, ABIs)
+/// - ABI files are valid JSON
+/// - source.abi references an ABI in mapping.abis
+/// - Data source and template names are unique
+/// - Ethereum data sources have at least one handler
+pub(crate) fn validate_manifest(
+    manifest: &Manifest,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    // Validate using shared validation functions
+    if let Err(e) = manifest_validation::validate_has_data_sources(manifest.total_source_count()) {
+        errors.push(e.into());
+    }
+
+    // Validate spec version (gnd-specific check)
+    if manifest.spec_version < MIN_SPEC_VERSION || manifest.spec_version > *LATEST_VERSION {
+        errors.push(ManifestValidationError::UnsupportedSpecVersion {
+            version: manifest.spec_version.clone(),
+            min: MIN_SPEC_VERSION.clone(),
+            max: LATEST_VERSION.clone(),
+        });
+    }
+
+    // Collect networks from data sources and templates
+    let networks: Vec<Option<&str>> = manifest
+        .data_sources
+        .iter()
+        .map(|ds| ds.network.as_deref())
+        .chain(manifest.templates.iter().map(|t| t.network.as_deref()))
+        .collect();
+
+    // Only validate networks if there are data sources
+    if !manifest.data_sources.is_empty()
+        && let Err(e) = manifest_validation::validate_single_network(&networks)
+    {
+        errors.push(e.into());
+    }
+
+    // Collect API versions from data sources and templates
+    let api_versions: Vec<Version> = manifest
+        .data_sources
+        .iter()
+        .filter_map(|ds| ds.api_version.clone())
+        .chain(
+            manifest
+                .templates
+                .iter()
+                .filter_map(|t| t.api_version.clone()),
+        )
+        .collect();
+
+    if let Err(e) = manifest_validation::validate_api_versions(&api_versions) {
+        errors.push(e.into());
+    }
+
+    // Validate file existence
+    errors.extend(validate_file_existence(manifest, manifest_dir));
+
+    // Validate ABIs are valid JSON
+    errors.extend(validate_abis(manifest, manifest_dir));
+
+    // Validate source.abi references an ABI in mapping.abis
+    errors.extend(validate_source_abi_references(manifest));
+
+    // Validate unique data source and template names
+    errors.extend(validate_unique_names(manifest));
+
+    // Validate Ethereum data sources have at least one handler
+    errors.extend(validate_handler_presence(manifest));
+
+    // Validate Ethereum-specific structural constraints
+    errors.extend(validate_ethereum_constraints(manifest));
+
+    // Validate event/call handler signatures match ABI definitions
+    errors.extend(validate_handler_signatures(manifest, manifest_dir));
+
+    errors
+}
+
+/// Validate that all referenced files exist.
+fn validate_file_existence(
+    manifest: &Manifest,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    // Check schema file
+    if let Some(schema_path) = &manifest.schema {
+        let full_path = manifest_dir.join(schema_path.as_str());
+        if !full_path.exists() {
+            errors.push(ManifestValidationError::FileNotFound {
+                path: schema_path.to_string(),
+                description: "Schema file".to_string(),
+            });
+        }
+    }
+
+    // Check data source files
+    for ds in &manifest.data_sources {
+        errors.extend(validate_data_source_files(ds, manifest_dir));
+    }
+
+    // Check template files
+    for template in &manifest.templates {
+        errors.extend(validate_template_files(template, manifest_dir));
+    }
+
+    errors
+}
+
+/// Validate data source file references.
+fn validate_data_source_files(
+    ds: &DataSource,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    // Check mapping file
+    if let Some(mapping_path) = &ds.mapping_file {
+        let full_path = manifest_dir.join(mapping_path.as_str());
+        if !full_path.exists() {
+            errors.push(ManifestValidationError::FileNotFound {
+                path: mapping_path.to_string(),
+                description: format!("Mapping file for data source '{}'", ds.name),
+            });
+        }
+    }
+
+    // Check ABI files
+    for abi in &ds.abis {
+        let full_path = manifest_dir.join(&abi.file);
+        if !full_path.exists() {
+            errors.push(ManifestValidationError::FileNotFound {
+                path: abi.file.clone(),
+                description: format!("ABI '{}' for data source '{}'", abi.name, ds.name),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Validate template file references.
+fn validate_template_files(
+    template: &Template,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    // Check mapping file
+    if let Some(mapping_path) = &template.mapping_file {
+        let full_path = manifest_dir.join(mapping_path.as_str());
+        if !full_path.exists() {
+            errors.push(ManifestValidationError::FileNotFound {
+                path: mapping_path.to_string(),
+                description: format!("Mapping file for template '{}'", template.name),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Validate that ABI files are valid JSON.
+fn validate_abis(manifest: &Manifest, manifest_dir: &Path) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for ds in &manifest.data_sources {
+        errors.extend(validate_data_source_abis(ds, manifest_dir));
+    }
+
+    errors
+}
+
+/// Validate ABIs for a data source.
+fn validate_data_source_abis(ds: &DataSource, manifest_dir: &Path) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for abi in &ds.abis {
+        if let Err(e) = validate_abi_file(abi, manifest_dir) {
+            errors.push(e);
+        }
+    }
+
+    errors
+}
+
+/// Validate a single ABI file.
+fn validate_abi_file(abi: &Abi, manifest_dir: &Path) -> Result<(), ManifestValidationError> {
+    let full_path = manifest_dir.join(&abi.file);
+
+    // Only validate if file exists (file existence is checked separately)
+    if !full_path.exists() {
+        return Ok(());
+    }
+
+    let content =
+        std::fs::read_to_string(&full_path).map_err(|e| ManifestValidationError::InvalidFile {
+            path: abi.file.clone(),
+            reason: format!("failed to read: {}", e),
+        })?;
+
+    // Try to parse as JSON
+    let _: serde_json::Value =
+        serde_json::from_str(&content).map_err(|e| ManifestValidationError::InvalidFile {
+            path: abi.file.clone(),
+            reason: format!("invalid JSON: {}", e),
+        })?;
+
+    Ok(())
+}
+
+/// Validate that each data source's `source.abi` references an ABI listed in `mapping.abis`.
+fn validate_source_abi_references(manifest: &Manifest) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for ds in &manifest.data_sources {
+        if let Some(source_abi) = &ds.source_abi
+            && !ds.abis.iter().any(|a| a.name == *source_abi)
+        {
+            errors.push(ManifestValidationError::SourceAbiNotInMappingAbis {
+                data_source: ds.name.clone(),
+                source_abi: source_abi.clone(),
+                available: ds.abis.iter().map(|a| a.name.clone()).collect(),
+            });
+        }
+    }
+
+    for t in &manifest.templates {
+        if let Some(source_abi) = &t.source_abi
+            && !t.abis.iter().any(|a| a.name == *source_abi)
+        {
+            errors.push(ManifestValidationError::SourceAbiNotInMappingAbis {
+                data_source: t.name.clone(),
+                source_abi: source_abi.clone(),
+                available: t.abis.iter().map(|a| a.name.clone()).collect(),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Validate that data source and template names are unique.
+fn validate_unique_names(manifest: &Manifest) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+    let mut seen_ds_names = std::collections::HashSet::new();
+    let mut seen_template_names = std::collections::HashSet::new();
+
+    for ds in &manifest.data_sources {
+        if !seen_ds_names.insert(&ds.name) {
+            errors.push(ManifestValidationError::DuplicateName {
+                kind: "data source",
+                name: ds.name.clone(),
+            });
+        }
+    }
+
+    for t in &manifest.templates {
+        if !seen_template_names.insert(&t.name) {
+            errors.push(ManifestValidationError::DuplicateName {
+                kind: "template",
+                name: t.name.clone(),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Validate that Ethereum data sources have at least one handler defined.
+fn validate_handler_presence(manifest: &Manifest) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for ds in &manifest.data_sources {
+        // Only check Ethereum data sources (which have source_abi set)
+        if ds.source_abi.is_some()
+            && ds.event_handlers.is_empty()
+            && ds.call_handlers.is_empty()
+            && ds.block_handlers.is_empty()
+        {
+            errors.push(ManifestValidationError::NoHandlers {
+                data_source: ds.name.clone(),
+            });
+        }
+    }
+
+    for t in &manifest.templates {
+        if t.source_abi.is_some()
+            && t.event_handlers.is_empty()
+            && t.call_handlers.is_empty()
+            && t.block_handlers.is_empty()
+        {
+            errors.push(ManifestValidationError::NoHandlers {
+                data_source: t.name.clone(),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Valid Ethereum data source kinds (matches graph-node's `ETHEREUM_KINDS`).
+const ETHEREUM_KINDS: &[&str] = &["ethereum/contract", "ethereum"];
+
+/// Validate Ethereum-specific structural constraints on data sources and templates.
+///
+/// This covers:
+/// - Data source kind must be `ethereum` or `ethereum/contract`
+/// - Source address is required when call or block handlers are present
+/// - Block handler filter constraints (no duplicates, no invalid combos)
+/// - Event handler receipt requires apiVersion >= 0.0.7
+/// - Eth call declarations on event handlers require specVersion >= 1.2.0
+fn validate_ethereum_constraints(manifest: &Manifest) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for ds in &manifest.data_sources {
+        // Only validate Ethereum data sources (identified by having source_abi)
+        if ds.source_abi.is_none() {
+            continue;
+        }
+        errors.extend(validate_ethereum_kind(&ds.name, &ds.kind));
+        errors.extend(validate_source_address_required(
+            &ds.name,
+            ds.source_address.is_some(),
+            &ds.call_handlers,
+            &ds.block_handlers,
+        ));
+        errors.extend(validate_block_handler_constraints(
+            &ds.name,
+            &ds.block_handlers,
+        ));
+        errors.extend(validate_receipt_api_version(
+            &ds.name,
+            ds.api_version.as_ref(),
+            &ds.event_handlers,
+        ));
+        errors.extend(validate_call_decls_spec_version(
+            &ds.name,
+            &manifest.spec_version,
+            &ds.event_handlers,
+        ));
+    }
+
+    for t in &manifest.templates {
+        if t.source_abi.is_none() {
+            continue;
+        }
+        errors.extend(validate_ethereum_kind(&t.name, &t.kind));
+        // Templates don't have source addresses — skip address validation
+        errors.extend(validate_block_handler_constraints(
+            &t.name,
+            &t.block_handlers,
+        ));
+        errors.extend(validate_receipt_api_version(
+            &t.name,
+            t.api_version.as_ref(),
+            &t.event_handlers,
+        ));
+        errors.extend(validate_call_decls_spec_version(
+            &t.name,
+            &manifest.spec_version,
+            &t.event_handlers,
+        ));
+    }
+
+    errors
+}
+
+/// Validate that an Ethereum data source has a valid kind.
+fn validate_ethereum_kind(name: &str, kind: &str) -> Vec<ManifestValidationError> {
+    if ETHEREUM_KINDS.contains(&kind) {
+        vec![]
+    } else {
+        vec![ManifestValidationError::InvalidKind {
+            data_source: name.to_string(),
+            kind: kind.to_string(),
+        }]
+    }
+}
+
+/// Validate that a source address is present when call or block handlers are used.
+fn validate_source_address_required(
+    name: &str,
+    has_address: bool,
+    call_handlers: &[CallHandler],
+    block_handlers: &[crate::manifest::BlockHandler],
+) -> Vec<ManifestValidationError> {
+    if !has_address && (!call_handlers.is_empty() || !block_handlers.is_empty()) {
+        vec![ManifestValidationError::SourceAddressRequired {
+            data_source: name.to_string(),
+        }]
+    } else {
+        vec![]
+    }
+}
+
+/// Validate block handler constraints:
+/// - At most one handler of each filter type
+/// - Non-filtered handlers cannot be mixed with polling or once handlers
+fn validate_block_handler_constraints(
+    name: &str,
+    block_handlers: &[crate::manifest::BlockHandler],
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    let mut non_filtered = 0u32;
+    let mut call_filtered = 0u32;
+    let mut polling_filtered = 0u32;
+    let mut once_filtered = 0u32;
+
+    for handler in block_handlers {
+        match &handler.filter {
+            None => non_filtered += 1,
+            Some(BlockHandlerFilterKind::Call) => call_filtered += 1,
+            Some(BlockHandlerFilterKind::Once) => once_filtered += 1,
+            Some(BlockHandlerFilterKind::Polling) => polling_filtered += 1,
+        }
+    }
+
+    // Check for duplicates of any type
+    if non_filtered > 1 || call_filtered > 1 || once_filtered > 1 || polling_filtered > 1 {
+        errors.push(ManifestValidationError::BlockHandlerConstraint {
+            data_source: name.to_string(),
+            reason: "duplicated block handlers".to_string(),
+        });
+    }
+
+    // Non-filtered handlers cannot be mixed with polling or once handlers
+    // (mixing with call filter is allowed)
+    if non_filtered > 0 && (polling_filtered > 0 || once_filtered > 0) {
+        errors.push(ManifestValidationError::BlockHandlerConstraint {
+            data_source: name.to_string(),
+            reason: "combination of non-filtered and polling/once block handlers is not allowed"
+                .to_string(),
+        });
+    }
+
+    errors
+}
+
+/// Validate that event handlers requiring receipts have apiVersion >= 0.0.7.
+fn validate_receipt_api_version(
+    name: &str,
+    api_version: Option<&Version>,
+    event_handlers: &[crate::manifest::EventHandler],
+) -> Vec<ManifestValidationError> {
+    let api_version = match api_version {
+        Some(v) => v,
+        None => return vec![],
+    };
+
+    if *api_version >= Version::new(0, 0, 7) {
+        return vec![];
+    }
+
+    if event_handlers.iter().any(|h| h.receipt) {
+        vec![ManifestValidationError::ReceiptRequiresApiVersion {
+            data_source: name.to_string(),
+        }]
+    } else {
+        vec![]
+    }
+}
+
+/// Validate that event handlers with eth call declarations have specVersion >= 1.2.0.
+fn validate_call_decls_spec_version(
+    name: &str,
+    spec_version: &Version,
+    event_handlers: &[crate::manifest::EventHandler],
+) -> Vec<ManifestValidationError> {
+    if *spec_version >= Version::new(1, 2, 0) {
+        return vec![];
+    }
+
+    if event_handlers.iter().any(|h| h.has_call_decls) {
+        vec![ManifestValidationError::CallDeclsRequireSpecVersion {
+            data_source: name.to_string(),
+        }]
+    } else {
+        vec![]
+    }
+}
+
+/// Validate that event and call handler signatures match events/functions in the ABI.
+///
+/// For each Ethereum data source (and template) with a `source.abi`, loads the
+/// corresponding ABI file and checks:
+/// - Each event handler's `event` signature matches an event in the ABI
+/// - Each call handler's `function` signature matches a function in the ABI
+fn validate_handler_signatures(
+    manifest: &Manifest,
+    manifest_dir: &Path,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    for ds in &manifest.data_sources {
+        if let Some(source_abi) = &ds.source_abi
+            && let Some(abi_entry) = ds.abis.iter().find(|a| a.name == *source_abi)
+        {
+            let abi_path = manifest_dir.join(&abi_entry.file);
+            if let Some(contract) = load_abi(&abi_path) {
+                errors.extend(validate_event_signatures(
+                    &ds.name,
+                    source_abi,
+                    &ds.event_handlers,
+                    &contract,
+                ));
+                errors.extend(validate_function_signatures(
+                    &ds.name,
+                    source_abi,
+                    &ds.call_handlers,
+                    &contract,
+                ));
+            }
+        }
+    }
+
+    for t in &manifest.templates {
+        if let Some(source_abi) = &t.source_abi
+            && let Some(abi_entry) = t.abis.iter().find(|a| a.name == *source_abi)
+        {
+            let abi_path = manifest_dir.join(&abi_entry.file);
+            if let Some(contract) = load_abi(&abi_path) {
+                errors.extend(validate_event_signatures(
+                    &t.name,
+                    source_abi,
+                    &t.event_handlers,
+                    &contract,
+                ));
+                errors.extend(validate_function_signatures(
+                    &t.name,
+                    source_abi,
+                    &t.call_handlers,
+                    &contract,
+                ));
+            }
+        }
+    }
+
+    errors
+}
+
+/// Try to load an ABI file as a `JsonAbi`.
+///
+/// Returns `None` if the file doesn't exist or can't be parsed (those errors
+/// are reported separately by file existence and ABI JSON validation).
+fn load_abi(abi_path: &Path) -> Option<JsonAbi> {
+    let content = std::fs::read_to_string(abi_path).ok()?;
+    let normalized = crate::abi::normalize_abi_json(&content).ok()?;
+    let json_str = normalized.to_string();
+    serde_json::from_str(&json_str).ok()
+}
+
+/// Build the event signature with `indexed` hints: `Name(indexed type1,type2,...)`.
+fn event_signature_with_indexed(event: &Event) -> String {
+    let params: Vec<String> = event
+        .inputs
+        .iter()
+        .map(|p| {
+            let ty = p.selector_type();
+            if p.indexed {
+                format!("indexed {}", ty)
+            } else {
+                ty.into_owned()
+            }
+        })
+        .collect();
+    format!("{}({})", event.name, params.join(","))
+}
+
+/// Validate that each event handler's event signature matches an event in the ABI.
+///
+/// Matching follows the same logic as graph-node's `contract_event_with_signature`:
+/// 1. Try exact match with `indexed` hints
+/// 2. Fall back to matching without `indexed` if only one event variant exists
+fn validate_event_signatures(
+    ds_name: &str,
+    abi_name: &str,
+    event_handlers: &[crate::manifest::EventHandler],
+    abi: &JsonAbi,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    let all_events: Vec<&Event> = abi.events.values().flatten().collect();
+
+    for handler in event_handlers {
+        let signature = &handler.event;
+
+        // Try exact match with indexed hints
+        let exact_match = all_events
+            .iter()
+            .any(|e| event_signature_with_indexed(e) == *signature);
+
+        if exact_match {
+            continue;
+        }
+
+        // Fallback: match without indexed if only one event variant with that name
+        let event_name = signature.split('(').next().unwrap_or("");
+        let matching_by_name: Vec<&&Event> =
+            all_events.iter().filter(|e| e.name == event_name).collect();
+
+        let fallback_match =
+            matching_by_name.len() == 1 && matching_by_name[0].signature() == *signature;
+
+        if !fallback_match {
+            errors.push(ManifestValidationError::EventNotInAbi {
+                data_source: ds_name.to_string(),
+                event: signature.clone(),
+                abi_name: abi_name.to_string(),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Validate that each call handler's function signature matches a function in the ABI.
+fn validate_function_signatures(
+    ds_name: &str,
+    abi_name: &str,
+    call_handlers: &[CallHandler],
+    abi: &JsonAbi,
+) -> Vec<ManifestValidationError> {
+    let mut errors = Vec::new();
+
+    let all_functions: Vec<&Function> = abi.functions.values().flatten().collect();
+
+    for handler in call_handlers {
+        let target = &handler.function;
+
+        let found = all_functions.iter().any(|f| f.signature() == *target);
+
+        if !found {
+            errors.push(ManifestValidationError::FunctionNotInAbi {
+                data_source: ds_name.to_string(),
+                function: target.clone(),
+                abi_name: abi_name.to_string(),
+            });
+        }
+    }
+
+    errors
+}
+
+/// Format manifest validation errors for display.
+pub(crate) fn format_manifest_errors(errors: &[ManifestValidationError]) -> String {
+    errors
+        .iter()
+        .map(|e| format!("  - {}", e))
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
+/// Extract exported function names from a WASM binary.
+fn wasm_exported_functions(wasm_bytes: &[u8]) -> Result<HashSet<String>> {
+    use wasmparser::Payload;
+
+    let mut exports = HashSet::new();
+    for payload in wasmparser::Parser::new(0).parse_all(wasm_bytes) {
+        if let Payload::ExportSection(s) = payload? {
+            for export in s {
+                let export = export?;
+                if export.kind == wasmparser::ExternalKind::Func {
+                    exports.insert(export.name.to_string());
+                }
+            }
+        }
+    }
+    Ok(exports)
+}
+
+/// Validate that all handler names from a data source exist as exports in the
+/// compiled WASM file. Returns errors for any handlers missing from the WASM.
+pub(crate) fn validate_wasm_handlers(
+    wasm_path: &Path,
+    ds_name: &str,
+    handler_names: &[&str],
+) -> Vec<ManifestValidationError> {
+    let wasm_bytes = match std::fs::read(wasm_path) {
+        Ok(bytes) => bytes,
+        Err(e) => {
+            return vec![ManifestValidationError::InvalidWasm {
+                path: wasm_path.display().to_string(),
+                reason: format!("failed to read: {}", e),
+            }];
+        }
+    };
+
+    let exports = match wasm_exported_functions(&wasm_bytes) {
+        Ok(exports) => exports,
+        Err(e) => {
+            return vec![ManifestValidationError::InvalidWasm {
+                path: wasm_path.display().to_string(),
+                reason: format!("failed to parse: {}", e),
+            }];
+        }
+    };
+
+    let missing: Vec<String> = handler_names
+        .iter()
+        .filter(|name| !exports.contains(**name))
+        .map(|name| name.to_string())
+        .collect();
+
+    if missing.is_empty() {
+        vec![]
+    } else {
+        vec![ManifestValidationError::MissingWasmHandlers {
+            data_source: ds_name.to_string(),
+            missing,
+        }]
+    }
+}
+
+/// Collect all handler names from a data source.
+pub(crate) fn collect_handler_names(ds: &DataSource) -> Vec<&str> {
+    let mut names = Vec::new();
+    for h in &ds.event_handlers {
+        names.push(h.handler.as_str());
+    }
+    for h in &ds.call_handlers {
+        names.push(h.handler.as_str());
+    }
+    for h in &ds.block_handlers {
+        names.push(h.handler.as_str());
+    }
+    names
+}
+
+/// Collect all handler names from a template.
+pub(crate) fn collect_template_handler_names(t: &Template) -> Vec<&str> {
+    let mut names = Vec::new();
+    for h in &t.event_handlers {
+        names.push(h.handler.as_str());
+    }
+    for h in &t.call_handlers {
+        names.push(h.handler.as_str());
+    }
+    for h in &t.block_handlers {
+        names.push(h.handler.as_str());
+    }
+    names
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::manifest::{BlockHandler, EventHandler};
+    use std::fs;
+    use tempfile::TempDir;
+
+    fn event_handler(name: &str) -> EventHandler {
+        EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: name.to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }
+    }
+
+    fn call_handler(name: &str) -> CallHandler {
+        CallHandler {
+            function: "approve(address,uint256)".to_string(),
+            handler: name.to_string(),
+        }
+    }
+
+    fn block_handler(name: &str) -> BlockHandler {
+        BlockHandler {
+            handler: name.to_string(),
+            filter: None,
+        }
+    }
+
+    fn block_handler_with_filter(name: &str, filter: BlockHandlerFilterKind) -> BlockHandler {
+        BlockHandler {
+            handler: name.to_string(),
+            filter: Some(filter),
+        }
+    }
+
+    #[test]
+    fn test_validate_valid_schema() {
+        let temp_dir = TempDir::new().unwrap();
+        let schema_path = temp_dir.path().join("schema.graphql");
+
+        let schema_content = r#"
+type MyEntity @entity {
+  id: ID!
+  name: String!
+}
+"#;
+        fs::write(&schema_path, schema_content).unwrap();
+
+        let spec_version = Version::new(0, 0, 4);
+        let errors = validate_schema(&schema_path, &spec_version).unwrap();
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_missing_entity_directive() {
+        let temp_dir = TempDir::new().unwrap();
+        let schema_path = temp_dir.path().join("schema.graphql");
+
+        // Schema without @entity directive
+        let schema_content = r#"
+type MyEntity {
+  id: ID!
+  name: String!
+}
+"#;
+        fs::write(&schema_path, schema_content).unwrap();
+
+        let spec_version = Version::new(0, 0, 4);
+        let errors = validate_schema(&schema_path, &spec_version).unwrap();
+        assert!(!errors.is_empty(), "Expected validation errors");
+    }
+
+    #[test]
+    fn test_validate_missing_id_field() {
+        let temp_dir = TempDir::new().unwrap();
+        let schema_path = temp_dir.path().join("schema.graphql");
+
+        // Schema without id field
+        let schema_content = r#"
+type MyEntity @entity {
+  name: String!
+}
+"#;
+        fs::write(&schema_path, schema_content).unwrap();
+
+        let spec_version = Version::new(0, 0, 4);
+        let errors = validate_schema(&schema_path, &spec_version).unwrap();
+        assert!(!errors.is_empty(), "Expected validation errors");
+        let formatted = format_schema_errors(&errors);
+        assert!(
+            formatted.contains("id"),
+            "Error should mention missing id field"
+        );
+    }
+
+    #[test]
+    fn test_validate_invalid_derived_from() {
+        let temp_dir = TempDir::new().unwrap();
+        let schema_path = temp_dir.path().join("schema.graphql");
+
+        // Schema with invalid @derivedFrom
+        let schema_content = r#"
+type User @entity {
+  id: ID!
+  posts: [Post!]! @derivedFrom(field: "nonexistent")
+}
+
+type Post @entity {
+  id: ID!
+  author: User!
+}
+"#;
+        fs::write(&schema_path, schema_content).unwrap();
+
+        let spec_version = Version::new(0, 0, 4);
+        let errors = validate_schema(&schema_path, &spec_version).unwrap();
+        assert!(!errors.is_empty(), "Expected validation errors");
+    }
+
+    #[test]
+    fn test_format_schema_errors() {
+        let errors = vec![
+            SchemaValidationError::IdFieldMissing("TestEntity".to_string()),
+            SchemaValidationError::InterfaceUndefined("IFoo".to_string()),
+        ];
+
+        let formatted = format_schema_errors(&errors);
+        assert!(formatted.contains("TestEntity"));
+        assert!(formatted.contains("IFoo"));
+        assert!(formatted.contains("  - ")); // Check indent
+    }
+
+    // Helper to create a test manifest
+    fn create_test_manifest(data_sources: Vec<DataSource>, templates: Vec<Template>) -> Manifest {
+        Manifest {
+            spec_version: Version::new(0, 0, 4),
+            schema: Some("schema.graphql".to_string()),
+            features: vec![],
+            graft: None,
+            data_sources,
+            templates,
+        }
+    }
+
+    fn create_data_source(
+        name: &str,
+        network: Option<&str>,
+        api_version: Option<Version>,
+    ) -> DataSource {
+        DataSource {
+            name: name.to_string(),
+            kind: "ethereum/contract".to_string(),
+            network: network.map(String::from),
+            mapping_file: Some(format!("src/{}.ts", name)),
+            api_version,
+            abis: vec![],
+            source_address: None,
+            source_abi: None,
+            start_block: 0,
+            end_block: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        }
+    }
+
+    fn create_subgraph_data_source(name: &str, address: &str) -> DataSource {
+        DataSource {
+            name: name.to_string(),
+            kind: "subgraph".to_string(),
+            network: None,
+            mapping_file: None,
+            api_version: None,
+            abis: vec![],
+            source_address: Some(address.to_string()),
+            source_abi: None,
+            start_block: 0,
+            end_block: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        }
+    }
+
+    #[test]
+    fn test_validate_manifest_no_data_sources() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest = create_test_manifest(vec![], vec![]);
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::Shared(e) if matches!(e.as_ref(), SubgraphManifestValidationError::NoDataSources)
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_only_subgraph_sources() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create schema file
+        fs::write(
+            temp_dir.path().join("schema.graphql"),
+            "type T @entity { id: ID! }",
+        )
+        .unwrap();
+
+        // Manifest with only subgraph sources (no regular data sources)
+        let data_sources = vec![create_subgraph_data_source(
+            "SourceSubgraph",
+            "QmSourceHash123",
+        )];
+        let manifest = Manifest {
+            spec_version: Version::new(1, 0, 0),
+            schema: Some("schema.graphql".to_string()),
+            features: vec![],
+            graft: None,
+            data_sources,
+            templates: vec![],
+        };
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        // Should NOT have "no data sources" error since we have subgraph sources
+        assert!(
+            !errors.iter().any(|e| matches!(
+                e,
+                ManifestValidationError::Shared(e) if matches!(e.as_ref(), SubgraphManifestValidationError::NoDataSources)
+            )),
+            "Manifest with subgraph sources should not fail 'no data sources' validation"
+        );
+    }
+
+    #[test]
+    fn test_validate_manifest_multiple_networks() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest = create_test_manifest(
+            vec![
+                create_data_source("ds1", Some("mainnet"), None),
+                create_data_source("ds2", Some("ropsten"), None),
+            ],
+            vec![],
+        );
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::Shared(e) if matches!(e.as_ref(), SubgraphManifestValidationError::MultipleEthereumNetworks)
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_different_api_versions() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest = create_test_manifest(
+            vec![
+                create_data_source("ds1", Some("mainnet"), Some(Version::new(0, 0, 5))),
+                create_data_source("ds2", Some("mainnet"), Some(Version::new(0, 0, 6))),
+            ],
+            vec![],
+        );
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::Shared(e) if matches!(e.as_ref(), SubgraphManifestValidationError::DifferentApiVersions(_))
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_missing_schema_file() {
+        let temp_dir = TempDir::new().unwrap();
+        let manifest = create_test_manifest(
+            vec![create_data_source("ds1", Some("mainnet"), None)],
+            vec![],
+        );
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::FileNotFound { description, .. } if description.contains("Schema")
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_missing_mapping_file() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create schema file
+        fs::write(
+            temp_dir.path().join("schema.graphql"),
+            "type T @entity { id: ID! }",
+        )
+        .unwrap();
+
+        let manifest = create_test_manifest(
+            vec![create_data_source("ds1", Some("mainnet"), None)],
+            vec![],
+        );
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::FileNotFound { description, .. } if description.contains("Mapping")
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_invalid_abi_json() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create schema and mapping files
+        fs::write(
+            temp_dir.path().join("schema.graphql"),
+            "type T @entity { id: ID! }",
+        )
+        .unwrap();
+        fs::create_dir_all(temp_dir.path().join("src")).unwrap();
+        fs::write(temp_dir.path().join("src/ds1.ts"), "// mapping").unwrap();
+
+        // Create invalid ABI file
+        fs::create_dir_all(temp_dir.path().join("abis")).unwrap();
+        fs::write(temp_dir.path().join("abis/ERC20.json"), "not valid json").unwrap();
+
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.iter().any(|e| matches!(
+            e,
+            ManifestValidationError::InvalidFile { reason, .. } if reason.contains("JSON")
+        )));
+    }
+
+    #[test]
+    fn test_validate_manifest_valid() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create all required files
+        fs::write(
+            temp_dir.path().join("schema.graphql"),
+            "type T @entity { id: ID! }",
+        )
+        .unwrap();
+        fs::create_dir_all(temp_dir.path().join("src")).unwrap();
+        fs::write(temp_dir.path().join("src/ds1.ts"), "// mapping").unwrap();
+        fs::create_dir_all(temp_dir.path().join("abis")).unwrap();
+        fs::write(temp_dir.path().join("abis/ERC20.json"), erc20_abi_json()).unwrap();
+
+        let mut ds = create_data_source("ds1", Some("mainnet"), Some(Version::new(0, 0, 6)));
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+        ds.source_abi = Some("ERC20".to_string());
+        ds.event_handlers = vec![event_handler("handleTransfer")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+
+        let errors = validate_manifest(&manifest, temp_dir.path());
+
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_format_manifest_errors() {
+        let errors = vec![
+            ManifestValidationError::Shared(Box::new(
+                SubgraphManifestValidationError::NoDataSources,
+            )),
+            ManifestValidationError::FileNotFound {
+                path: "schema.graphql".to_string(),
+                description: "Schema file".to_string(),
+            },
+        ];
+
+        let formatted = format_manifest_errors(&errors);
+        assert!(formatted.contains("no data sources"));
+        assert!(formatted.contains("schema.graphql"));
+        assert!(formatted.contains("  - "));
+    }
+
+    // --- source.abi cross-reference tests ---
+
+    #[test]
+    fn test_validate_source_abi_found_in_mapping_abis() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+        ds.event_handlers = vec![event_handler("handleTransfer")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_source_abi_references(&manifest);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_source_abi_not_in_mapping_abis() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC721".to_string());
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_source_abi_references(&manifest);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::SourceAbiNotInMappingAbis {
+                data_source,
+                source_abi,
+                available,
+            } if data_source == "ds1" && source_abi == "ERC721" && available == &["ERC20"]
+        ));
+    }
+
+    #[test]
+    fn test_validate_source_abi_no_abis_defined() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        // abis is empty (default from create_data_source)
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_source_abi_references(&manifest);
+        assert_eq!(errors.len(), 1);
+        let msg = format!("{}", errors[0]);
+        assert!(msg.contains("no ABIs defined"));
+    }
+
+    #[test]
+    fn test_validate_source_abi_skips_non_ethereum() {
+        // Subgraph data sources have no source_abi, should be skipped
+        let ds = create_subgraph_data_source("sub1", "QmHash123");
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_source_abi_references(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    // --- unique names tests ---
+
+    #[test]
+    fn test_validate_unique_data_source_names() {
+        let ds1 = create_data_source("Token", Some("mainnet"), None);
+        let ds2 = create_data_source("Token", Some("mainnet"), None);
+        let manifest = create_test_manifest(vec![ds1, ds2], vec![]);
+
+        let errors = validate_unique_names(&manifest);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::DuplicateName { kind, name }
+                if *kind == "data source" && name == "Token"
+        ));
+    }
+
+    #[test]
+    fn test_validate_unique_template_names() {
+        let t1 = Template {
+            name: "DynToken".to_string(),
+            kind: "ethereum/contract".to_string(),
+            network: Some("mainnet".to_string()),
+            mapping_file: Some("src/dyn.ts".to_string()),
+            api_version: None,
+            abis: vec![],
+            source_abi: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        };
+        let t2 = Template {
+            name: "DynToken".to_string(),
+            kind: "ethereum/contract".to_string(),
+            network: Some("mainnet".to_string()),
+            mapping_file: Some("src/dyn2.ts".to_string()),
+            api_version: None,
+            abis: vec![],
+            source_abi: None,
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        };
+
+        let manifest = create_test_manifest(vec![], vec![t1, t2]);
+        let errors = validate_unique_names(&manifest);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::DuplicateName { kind, name }
+                if *kind == "template" && name == "DynToken"
+        ));
+    }
+
+    #[test]
+    fn test_validate_unique_names_all_distinct() {
+        let ds1 = create_data_source("TokenA", Some("mainnet"), None);
+        let ds2 = create_data_source("TokenB", Some("mainnet"), None);
+        let manifest = create_test_manifest(vec![ds1, ds2], vec![]);
+
+        let errors = validate_unique_names(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    // --- handler presence tests ---
+
+    #[test]
+    fn test_validate_handler_presence_with_event_handler() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        ds.event_handlers = vec![event_handler("handleTransfer")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_presence(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_handler_presence_with_call_handler() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        ds.call_handlers = vec![call_handler("handleApprove")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_presence(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_handler_presence_with_block_handler() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        ds.block_handlers = vec![block_handler("handleBlock")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_presence(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_handler_presence_no_handlers() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.source_abi = Some("ERC20".to_string());
+        // No handlers set
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_presence(&manifest);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::NoHandlers { data_source } if data_source == "ds1"
+        ));
+    }
+
+    #[test]
+    fn test_validate_handler_presence_skips_non_ethereum() {
+        // Subgraph data sources have no source_abi, should be skipped
+        let ds = create_subgraph_data_source("sub1", "QmHash123");
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_presence(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_handler_presence_template_no_handlers() {
+        let t = Template {
+            name: "DynToken".to_string(),
+            kind: "ethereum/contract".to_string(),
+            network: Some("mainnet".to_string()),
+            mapping_file: Some("src/dyn.ts".to_string()),
+            api_version: None,
+            abis: vec![],
+            source_abi: Some("ERC20".to_string()),
+            event_handlers: vec![],
+            call_handlers: vec![],
+            block_handlers: vec![],
+        };
+
+        let manifest = create_test_manifest(vec![], vec![t]);
+        let errors = validate_handler_presence(&manifest);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::NoHandlers { data_source } if data_source == "DynToken"
+        ));
+    }
+
+    // --- Ethereum kind validation tests ---
+
+    #[test]
+    fn test_validate_valid_ethereum_kind() {
+        assert!(validate_ethereum_kind("ds1", "ethereum/contract").is_empty());
+        assert!(validate_ethereum_kind("ds1", "ethereum").is_empty());
+    }
+
+    #[test]
+    fn test_validate_invalid_ethereum_kind() {
+        let errors = validate_ethereum_kind("ds1", "ethereum/invalid");
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::InvalidKind { data_source, kind }
+                if data_source == "ds1" && kind == "ethereum/invalid"
+        ));
+    }
+
+    // --- Source address required tests ---
+
+    #[test]
+    fn test_validate_address_not_required_for_event_handlers_only() {
+        let errors = validate_source_address_required("ds1", false, &[], &[]);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_address_required_for_call_handlers() {
+        let call_handlers = vec![call_handler("handleCall")];
+        let errors = validate_source_address_required("ds1", false, &call_handlers, &[]);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::SourceAddressRequired { data_source } if data_source == "ds1"
+        ));
+    }
+
+    #[test]
+    fn test_validate_address_required_for_block_handlers() {
+        let block_handlers = vec![block_handler("handleBlock")];
+        let errors = validate_source_address_required("ds1", false, &[], &block_handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::SourceAddressRequired { data_source } if data_source == "ds1"
+        ));
+    }
+
+    #[test]
+    fn test_validate_address_present_with_call_handlers() {
+        let call_handlers = vec![call_handler("handleCall")];
+        let errors = validate_source_address_required("ds1", true, &call_handlers, &[]);
+        assert!(errors.is_empty());
+    }
+
+    // --- Block handler constraint tests ---
+
+    #[test]
+    fn test_validate_block_handlers_single_non_filtered() {
+        let handlers = vec![block_handler("handleBlock")];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_block_handlers_single_call_filtered() {
+        let handlers = vec![block_handler_with_filter(
+            "handleBlock",
+            BlockHandlerFilterKind::Call,
+        )];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_block_handlers_non_filtered_with_call_filter_allowed() {
+        // Non-filtered + call filter is allowed
+        let handlers = vec![
+            block_handler("handleBlock"),
+            block_handler_with_filter("handleCallBlock", BlockHandlerFilterKind::Call),
+        ];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_block_handlers_duplicate_non_filtered() {
+        let handlers = vec![block_handler("handleBlock1"), block_handler("handleBlock2")];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::BlockHandlerConstraint { data_source, reason }
+                if data_source == "ds1" && reason.contains("duplicated")
+        ));
+    }
+
+    #[test]
+    fn test_validate_block_handlers_duplicate_call_filtered() {
+        let handlers = vec![
+            block_handler_with_filter("h1", BlockHandlerFilterKind::Call),
+            block_handler_with_filter("h2", BlockHandlerFilterKind::Call),
+        ];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::BlockHandlerConstraint { reason, .. }
+                if reason.contains("duplicated")
+        ));
+    }
+
+    #[test]
+    fn test_validate_block_handlers_non_filtered_with_polling_not_allowed() {
+        let handlers = vec![
+            block_handler("handleBlock"),
+            block_handler_with_filter("handlePolling", BlockHandlerFilterKind::Polling),
+        ];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::BlockHandlerConstraint { reason, .. }
+                if reason.contains("combination")
+        ));
+    }
+
+    #[test]
+    fn test_validate_block_handlers_non_filtered_with_once_not_allowed() {
+        let handlers = vec![
+            block_handler("handleBlock"),
+            block_handler_with_filter("handleInit", BlockHandlerFilterKind::Once),
+        ];
+        let errors = validate_block_handler_constraints("ds1", &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::BlockHandlerConstraint { reason, .. }
+                if reason.contains("combination")
+        ));
+    }
+
+    // --- Receipt API version tests ---
+
+    #[test]
+    fn test_validate_receipt_api_version_ok() {
+        let handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: true,
+            has_call_decls: false,
+        }];
+        let errors = validate_receipt_api_version("ds1", Some(&Version::new(0, 0, 7)), &handlers);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_receipt_api_version_too_low() {
+        let handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: true,
+            has_call_decls: false,
+        }];
+        let errors = validate_receipt_api_version("ds1", Some(&Version::new(0, 0, 6)), &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::ReceiptRequiresApiVersion { data_source }
+                if data_source == "ds1"
+        ));
+    }
+
+    #[test]
+    fn test_validate_receipt_no_receipt_any_version() {
+        let handlers = vec![event_handler("handleTransfer")];
+        let errors = validate_receipt_api_version("ds1", Some(&Version::new(0, 0, 5)), &handlers);
+        assert!(errors.is_empty());
+    }
+
+    // --- Call declarations spec version tests ---
+
+    #[test]
+    fn test_validate_call_decls_spec_version_ok() {
+        let handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: true,
+        }];
+        let errors = validate_call_decls_spec_version("ds1", &Version::new(1, 2, 0), &handlers);
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_call_decls_spec_version_too_low() {
+        let handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: true,
+        }];
+        let errors = validate_call_decls_spec_version("ds1", &Version::new(1, 1, 0), &handlers);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::CallDeclsRequireSpecVersion { data_source }
+                if data_source == "ds1"
+        ));
+    }
+
+    #[test]
+    fn test_validate_call_decls_no_decls_any_version() {
+        let handlers = vec![event_handler("handleTransfer")];
+        let errors = validate_call_decls_spec_version("ds1", &Version::new(0, 0, 4), &handlers);
+        assert!(errors.is_empty());
+    }
+
+    // --- Integration test: validate_ethereum_constraints ---
+
+    #[test]
+    fn test_validate_ethereum_constraints_valid() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), Some(Version::new(0, 0, 7)));
+        ds.source_abi = Some("ERC20".to_string());
+        ds.source_address = Some("0x1234".to_string());
+        ds.event_handlers = vec![event_handler("handleTransfer")];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_ethereum_constraints(&manifest);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_ethereum_constraints_skips_non_ethereum() {
+        let ds = create_subgraph_data_source("sub1", "QmHash123");
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_ethereum_constraints(&manifest);
+        assert!(errors.is_empty());
+    }
+
+    // --- ABI signature validation tests ---
+
+    /// Build a minimal ERC20-like ABI JSON with Transfer event and approve function.
+    fn erc20_abi_json() -> String {
+        r#"[
+            {
+                "type": "event",
+                "name": "Transfer",
+                "anonymous": false,
+                "inputs": [
+                    {"name": "from", "type": "address", "indexed": true},
+                    {"name": "to", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            },
+            {
+                "type": "event",
+                "name": "Approval",
+                "anonymous": false,
+                "inputs": [
+                    {"name": "owner", "type": "address", "indexed": true},
+                    {"name": "spender", "type": "address", "indexed": true},
+                    {"name": "value", "type": "uint256", "indexed": false}
+                ]
+            },
+            {
+                "type": "function",
+                "name": "approve",
+                "inputs": [
+                    {"name": "spender", "type": "address"},
+                    {"name": "amount", "type": "uint256"}
+                ],
+                "outputs": [{"name": "", "type": "bool"}],
+                "stateMutability": "nonpayable"
+            },
+            {
+                "type": "function",
+                "name": "transfer",
+                "inputs": [
+                    {"name": "to", "type": "address"},
+                    {"name": "amount", "type": "uint256"}
+                ],
+                "outputs": [{"name": "", "type": "bool"}],
+                "stateMutability": "nonpayable"
+            }
+        ]"#
+        .to_string()
+    }
+
+    fn parse_abi(json: &str) -> JsonAbi {
+        serde_json::from_str(json).unwrap()
+    }
+
+    #[test]
+    fn test_validate_event_signatures_exact_match_with_indexed() {
+        let contract = parse_abi(&erc20_abi_json());
+        let handlers = vec![EventHandler {
+            event: "Transfer(indexed address,indexed address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        let errors = validate_event_signatures("ds1", "ERC20", &handlers, &contract);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_event_signatures_fallback_without_indexed() {
+        let contract = parse_abi(&erc20_abi_json());
+        // Signature without indexed hints — should match via fallback
+        let handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        let errors = validate_event_signatures("ds1", "ERC20", &handlers, &contract);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_event_signatures_nonexistent_event() {
+        let contract = parse_abi(&erc20_abi_json());
+        let handlers = vec![EventHandler {
+            event: "Mint(address,uint256)".to_string(),
+            handler: "handleMint".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        let errors = validate_event_signatures("ds1", "ERC20", &handlers, &contract);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::EventNotInAbi {
+                data_source,
+                event,
+                abi_name,
+            } if data_source == "ds1" && event == "Mint(address,uint256)" && abi_name == "ERC20"
+        ));
+    }
+
+    #[test]
+    fn test_validate_event_signatures_wrong_param_types() {
+        let contract = parse_abi(&erc20_abi_json());
+        // Transfer exists but with wrong param types
+        let handlers = vec![EventHandler {
+            event: "Transfer(uint256,uint256,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        let errors = validate_event_signatures("ds1", "ERC20", &handlers, &contract);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::EventNotInAbi { .. }
+        ));
+    }
+
+    #[test]
+    fn test_validate_function_signatures_valid() {
+        let contract = parse_abi(&erc20_abi_json());
+        let handlers = vec![CallHandler {
+            function: "approve(address,uint256)".to_string(),
+            handler: "handleApprove".to_string(),
+        }];
+        let errors = validate_function_signatures("ds1", "ERC20", &handlers, &contract);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_function_signatures_nonexistent() {
+        let contract = parse_abi(&erc20_abi_json());
+        let handlers = vec![CallHandler {
+            function: "mint(address,uint256)".to_string(),
+            handler: "handleMint".to_string(),
+        }];
+        let errors = validate_function_signatures("ds1", "ERC20", &handlers, &contract);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::FunctionNotInAbi {
+                data_source,
+                function,
+                abi_name,
+            } if data_source == "ds1" && function == "mint(address,uint256)" && abi_name == "ERC20"
+        ));
+    }
+
+    #[test]
+    fn test_validate_function_signatures_wrong_params() {
+        let contract = parse_abi(&erc20_abi_json());
+        // approve exists but with wrong param types
+        let handlers = vec![CallHandler {
+            function: "approve(uint256,uint256)".to_string(),
+            handler: "handleApprove".to_string(),
+        }];
+        let errors = validate_function_signatures("ds1", "ERC20", &handlers, &contract);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::FunctionNotInAbi { .. }
+        ));
+    }
+
+    #[test]
+    fn test_validate_handler_signatures_integration() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create ABI file
+        fs::create_dir_all(temp_dir.path().join("abis")).unwrap();
+        fs::write(temp_dir.path().join("abis/ERC20.json"), erc20_abi_json()).unwrap();
+
+        let mut ds = create_data_source("ds1", Some("mainnet"), Some(Version::new(0, 0, 6)));
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+        ds.source_abi = Some("ERC20".to_string());
+        ds.event_handlers = vec![EventHandler {
+            event: "Transfer(address,address,uint256)".to_string(),
+            handler: "handleTransfer".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        ds.call_handlers = vec![CallHandler {
+            function: "approve(address,uint256)".to_string(),
+            handler: "handleApprove".to_string(),
+        }];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_signatures(&manifest, temp_dir.path());
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_handler_signatures_bad_event_good_function() {
+        let temp_dir = TempDir::new().unwrap();
+
+        fs::create_dir_all(temp_dir.path().join("abis")).unwrap();
+        fs::write(temp_dir.path().join("abis/ERC20.json"), erc20_abi_json()).unwrap();
+
+        let mut ds = create_data_source("ds1", Some("mainnet"), Some(Version::new(0, 0, 6)));
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+        ds.source_abi = Some("ERC20".to_string());
+        ds.event_handlers = vec![EventHandler {
+            event: "Mint(address,uint256)".to_string(),
+            handler: "handleMint".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+        ds.call_handlers = vec![CallHandler {
+            function: "approve(address,uint256)".to_string(),
+            handler: "handleApprove".to_string(),
+        }];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_signatures(&manifest, temp_dir.path());
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::EventNotInAbi { event, .. } if event == "Mint(address,uint256)"
+        ));
+    }
+
+    #[test]
+    fn test_validate_handler_signatures_skips_missing_abi_file() {
+        let temp_dir = TempDir::new().unwrap();
+
+        // Don't create the ABI file — validation should silently skip
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.abis = vec![Abi {
+            name: "ERC20".to_string(),
+            file: "abis/ERC20.json".to_string(),
+        }];
+        ds.source_abi = Some("ERC20".to_string());
+        ds.event_handlers = vec![EventHandler {
+            event: "Nonexistent(uint256)".to_string(),
+            handler: "handleNonexistent".to_string(),
+            receipt: false,
+            has_call_decls: false,
+        }];
+
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        // Should produce no errors (file not found is reported elsewhere)
+        let errors = validate_handler_signatures(&manifest, temp_dir.path());
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_validate_handler_signatures_skips_non_ethereum() {
+        let temp_dir = TempDir::new().unwrap();
+
+        let ds = create_subgraph_data_source("sub1", "QmHash123");
+        let manifest = create_test_manifest(vec![ds], vec![]);
+        let errors = validate_handler_signatures(&manifest, temp_dir.path());
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn test_event_signature() {
+        let abi = parse_abi(&erc20_abi_json());
+        let transfer = abi.events.get("Transfer").unwrap().first().unwrap();
+        assert_eq!(transfer.signature(), "Transfer(address,address,uint256)");
+        assert_eq!(
+            event_signature_with_indexed(transfer),
+            "Transfer(indexed address,indexed address,uint256)"
+        );
+    }
+
+    #[test]
+    fn test_function_signature() {
+        let abi = parse_abi(&erc20_abi_json());
+        let approve = abi.functions.get("approve").unwrap().first().unwrap();
+        assert_eq!(approve.signature(), "approve(address,uint256)");
+    }
+
+    #[test]
+    fn test_event_not_in_abi_display() {
+        let err = ManifestValidationError::EventNotInAbi {
+            data_source: "Token".to_string(),
+            event: "Mint(address,uint256)".to_string(),
+            abi_name: "ERC20".to_string(),
+        };
+        assert_eq!(
+            format!("{}", err),
+            "data source 'Token': event 'Mint(address,uint256)' not found in ABI 'ERC20'"
+        );
+    }
+
+    #[test]
+    fn test_function_not_in_abi_display() {
+        let err = ManifestValidationError::FunctionNotInAbi {
+            data_source: "Token".to_string(),
+            function: "mint(address,uint256)".to_string(),
+            abi_name: "ERC20".to_string(),
+        };
+        assert_eq!(
+            format!("{}", err),
+            "data source 'Token': function 'mint(address,uint256)' not found in ABI 'ERC20'"
+        );
+    }
+
+    // --- WASM handler export validation tests ---
+
+    /// Build a minimal valid WASM module that exports the given function names.
+    ///
+    /// The module defines one function type `() -> ()`, one function per export
+    /// name, and exports each function by name.
+    fn build_wasm_with_exports(export_names: &[&str]) -> Vec<u8> {
+        let mut wasm = Vec::new();
+
+        // Magic number + version
+        wasm.extend_from_slice(b"\0asm");
+        wasm.extend_from_slice(&1u32.to_le_bytes());
+
+        let n = export_names.len();
+
+        // Type section: one type `() -> ()`
+        {
+            let section = vec![
+                1,    // count: 1 type
+                0x60, // func type
+                0,    // 0 params
+                0,    // 0 results
+            ];
+            wasm.push(1); // section id: Type
+            leb128_encode(&mut wasm, section.len() as u32);
+            wasm.extend_from_slice(&section);
+        }
+
+        // Function section: n functions, all type index 0
+        {
+            let mut section = Vec::new();
+            leb128_encode(&mut section, n as u32);
+            section.extend(std::iter::repeat_n(0u8, n)); // type index 0 for each
+            wasm.push(3); // section id: Function
+            leb128_encode(&mut wasm, section.len() as u32);
+            wasm.extend_from_slice(&section);
+        }
+
+        // Export section: export each function
+        {
+            let mut section = Vec::new();
+            leb128_encode(&mut section, n as u32);
+            for (i, name) in export_names.iter().enumerate() {
+                leb128_encode(&mut section, name.len() as u32);
+                section.extend_from_slice(name.as_bytes());
+                section.push(0x00); // export kind: func
+                leb128_encode(&mut section, i as u32); // func index
+            }
+            wasm.push(7); // section id: Export
+            leb128_encode(&mut wasm, section.len() as u32);
+            wasm.extend_from_slice(&section);
+        }
+
+        // Code section: n function bodies, each is just `end`
+        {
+            let mut section = Vec::new();
+            leb128_encode(&mut section, n as u32);
+            for _ in 0..n {
+                // Function body: size=2, 0 locals, end
+                section.push(2); // body size
+                section.push(0); // 0 local declarations
+                section.push(0x0b); // end
+            }
+            wasm.push(10); // section id: Code
+            leb128_encode(&mut wasm, section.len() as u32);
+            wasm.extend_from_slice(&section);
+        }
+
+        wasm
+    }
+
+    /// Encode a u32 as unsigned LEB128.
+    fn leb128_encode(buf: &mut Vec<u8>, mut value: u32) {
+        loop {
+            let mut byte = (value & 0x7f) as u8;
+            value >>= 7;
+            if value != 0 {
+                byte |= 0x80;
+            }
+            buf.push(byte);
+            if value == 0 {
+                break;
+            }
+        }
+    }
+
+    #[test]
+    fn test_wasm_exported_functions_extracts_exports() {
+        let wasm = build_wasm_with_exports(&["handleTransfer", "handleApproval"]);
+        let exports = wasm_exported_functions(&wasm).unwrap();
+        assert!(exports.contains("handleTransfer"));
+        assert!(exports.contains("handleApproval"));
+        assert_eq!(exports.len(), 2);
+    }
+
+    #[test]
+    fn test_wasm_exported_functions_empty_module() {
+        let wasm = build_wasm_with_exports(&[]);
+        let exports = wasm_exported_functions(&wasm).unwrap();
+        assert!(exports.is_empty());
+    }
+
+    #[test]
+    fn test_validate_wasm_handlers_all_present() {
+        let temp_dir = TempDir::new().unwrap();
+        let wasm_path = temp_dir.path().join("test.wasm");
+        let wasm = build_wasm_with_exports(&["handleTransfer", "handleBlock"]);
+        fs::write(&wasm_path, wasm).unwrap();
+
+        let errors = validate_wasm_handlers(&wasm_path, "ds1", &["handleTransfer", "handleBlock"]);
+        assert!(errors.is_empty(), "Expected no errors, got: {:?}", errors);
+    }
+
+    #[test]
+    fn test_validate_wasm_handlers_missing_handlers() {
+        let temp_dir = TempDir::new().unwrap();
+        let wasm_path = temp_dir.path().join("test.wasm");
+        let wasm = build_wasm_with_exports(&["handleTransfer"]);
+        fs::write(&wasm_path, wasm).unwrap();
+
+        let errors = validate_wasm_handlers(
+            &wasm_path,
+            "ds1",
+            &["handleTransfer", "handleFoo", "handleBar"],
+        );
+        assert_eq!(errors.len(), 1);
+        match &errors[0] {
+            ManifestValidationError::MissingWasmHandlers {
+                data_source,
+                missing,
+            } => {
+                assert_eq!(data_source, "ds1");
+                assert_eq!(missing, &["handleFoo", "handleBar"]);
+            }
+            other => panic!("Expected MissingWasmHandlers, got: {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_validate_wasm_handlers_file_not_found() {
+        let errors = validate_wasm_handlers(
+            Path::new("/nonexistent/path.wasm"),
+            "ds1",
+            &["handleTransfer"],
+        );
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::InvalidWasm { .. }
+        ));
+    }
+
+    #[test]
+    fn test_validate_wasm_handlers_invalid_wasm() {
+        let temp_dir = TempDir::new().unwrap();
+        let wasm_path = temp_dir.path().join("bad.wasm");
+        fs::write(&wasm_path, b"not a wasm file").unwrap();
+
+        let errors = validate_wasm_handlers(&wasm_path, "ds1", &["handleTransfer"]);
+        assert_eq!(errors.len(), 1);
+        assert!(matches!(
+            &errors[0],
+            ManifestValidationError::InvalidWasm { reason, .. } if reason.contains("parse")
+        ));
+    }
+
+    #[test]
+    fn test_validate_wasm_handlers_display_format() {
+        let err = ManifestValidationError::MissingWasmHandlers {
+            data_source: "Token".to_string(),
+            missing: vec!["handleFoo".to_string(), "handleBar".to_string()],
+        };
+        let msg = format!("{}", err);
+        assert_eq!(
+            msg,
+            "data source 'Token': missing WASM handlers: handleFoo, handleBar"
+        );
+    }
+
+    #[test]
+    fn test_collect_handler_names() {
+        let mut ds = create_data_source("ds1", Some("mainnet"), None);
+        ds.event_handlers = vec![event_handler("handleTransfer")];
+        ds.call_handlers = vec![call_handler("handleApprove")];
+        ds.block_handlers = vec![block_handler("handleBlock")];
+
+        let names = collect_handler_names(&ds);
+        assert_eq!(
+            names,
+            vec!["handleTransfer", "handleApprove", "handleBlock"]
+        );
+    }
+
+    #[test]
+    fn test_collect_handler_names_empty() {
+        let ds = create_data_source("ds1", Some("mainnet"), None);
+        let names = collect_handler_names(&ds);
+        assert!(names.is_empty());
+    }
+}
diff --git a/gnd/src/watch.rs b/gnd/src/watch.rs
new file mode 100644
index 00000000000..cf1d3e4ea31
--- /dev/null
+++ b/gnd/src/watch.rs
@@ -0,0 +1,124 @@
+//! File watching utilities for build and codegen commands.
+//!
+//! This module provides a unified watch loop implementation used by both
+//! the build and codegen commands when running with the --watch flag.
+
+use std::collections::HashSet;
+use std::future::Future;
+use std::path::PathBuf;
+use std::sync::mpsc;
+use std::time::Duration;
+
+use anyhow::{Result, anyhow};
+use notify::{RecursiveMode, Watcher, recommended_watcher};
+
+/// Delay between file change detection and callback execution to batch multiple events.
+pub const WATCH_DEBOUNCE: Duration = Duration::from_millis(500);
+
+/// Watch files and run a callback when changes are detected.
+///
+/// This function:
+/// - Sets up a file watcher for all directories containing the specified files
+/// - Debounces file change events (waits 500ms and drains pending events)
+/// - Calls the callback when relevant files change
+/// - Runs forever until interrupted or an error occurs
+///
+/// The callback is called once initially before entering the watch loop.
+///
+/// # Type Parameters
+///
+/// * `F` - The callback closure type
+/// * `Fut` - The future returned by the callback
+///
+/// # Arguments
+///
+/// * `files_to_watch` - List of file paths to watch for changes
+/// * `initial_msg` - Message to print after initial run before entering watch mode
+/// * `on_change` - Async callback to run when files change
+pub async fn watch_and_run<F, Fut>(
+    files_to_watch: Vec<PathBuf>,
+    initial_msg: &str,
+    on_change: F,
+) -> Result<()>
+where
+    F: Fn() -> Fut,
+    Fut: Future<Output = Result<()>>,
+{
+    // Do initial run
+    if let Err(e) = on_change().await {
+        eprintln!("Error during initial run: {}", e);
+    }
+
+    println!("\n{}", initial_msg);
+    println!("Press Ctrl+C to stop.\n");
+
+    // Set up file watcher
+    let (tx, rx) = mpsc::channel();
+
+    let mut watcher = recommended_watcher(move |res| {
+        if let Ok(event) = res {
+            let _ = tx.send(event);
+        }
+    })
+    .map_err(|e| anyhow!("Failed to create file watcher: {}", e))?;
+
+    // Watch directories containing the files
+    let mut watched_dirs = HashSet::new();
+    for file in &files_to_watch {
+        if let Some(dir) = file.parent()
+            && watched_dirs.insert(dir.to_path_buf())
+        {
+            watcher
+                .watch(dir, RecursiveMode::NonRecursive)
+                .map_err(|e| anyhow!("Failed to watch {}: {}", dir.display(), e))?;
+        }
+    }
+
+    // Event loop
+    loop {
+        match rx.recv() {
+            Ok(event) => {
+                // Check if the event is for a file we care about
+                let relevant = event.paths.iter().any(|p| {
+                    files_to_watch.iter().any(|f| {
+                        p.file_name() == f.file_name()
+                            || p.ends_with(f.file_name().unwrap_or_default())
+                    })
+                });
+
+                if relevant {
+                    // Debounce: wait a bit and drain any pending events
+                    std::thread::sleep(WATCH_DEBOUNCE);
+                    while rx.try_recv().is_ok() {}
+
+                    // Get the changed file for logging
+                    let changed = event
+                        .paths
+                        .first()
+                        .map(|p| p.display().to_string())
+                        .unwrap_or_else(|| "unknown".to_string());
+
+                    println!("\nFile change detected: {}\n", changed);
+
+                    if let Err(e) = on_change().await {
+                        eprintln!("Error during rebuild: {}", e);
+                    }
+                }
+            }
+            Err(_) => {
+                return Err(anyhow!("File watcher channel closed"));
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_watch_debounce_duration() {
+        // Verify the debounce duration is 500ms
+        assert_eq!(WATCH_DEBOUNCE, Duration::from_millis(500));
+    }
+}
diff --git a/gnd/src/watcher.rs b/gnd/src/watcher.rs
index 63e920ddbd8..4f07df8b37e 100644
--- a/gnd/src/watcher.rs
+++ b/gnd/src/watcher.rs
@@ -1,8 +1,8 @@
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use graph::prelude::{DeploymentHash, SubgraphName};
-use graph::slog::{self, error, info, Logger};
-use notify::{recommended_watcher, Event, RecursiveMode, Watcher};
+use graph::slog::{self, Logger, error, info};
+use notify::{Event, RecursiveMode, Watcher, recommended_watcher};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::mpsc;
diff --git a/gnd/tests/cli_commands.rs b/gnd/tests/cli_commands.rs
new file mode 100644
index 00000000000..192d201c3be
--- /dev/null
+++ b/gnd/tests/cli_commands.rs
@@ -0,0 +1,902 @@
+//! Standalone command tests for `gnd` CLI.
+//!
+//! These tests verify commands that don't require a running Graph Node:
+//! - `gnd init` - Scaffold new subgraph
+//! - `gnd add` - Add datasource to existing subgraph
+//! - `gnd build` - Compile subgraph to WASM
+//!
+//! # Prerequisites
+//!
+//! - Build the gnd binary: `cargo build -p gnd`
+//! - IPFS running on localhost:5001 (for some tests)
+//!
+//! # Running
+//!
+//! ```bash
+//! just test-gnd-commands
+//! ```
+
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use tempfile::TempDir;
+
+/// Get the path to the gnd binary
+fn gnd_binary_path() -> PathBuf {
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    PathBuf::from(manifest_dir)
+        .parent()
+        .unwrap()
+        .join("target")
+        .join("debug")
+        .join("gnd")
+}
+
+/// Get the path to test ABIs
+fn test_abis_path() -> PathBuf {
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    PathBuf::from(manifest_dir)
+        .parent()
+        .unwrap()
+        .join("tests")
+        .join("contracts")
+        .join("abis")
+}
+
+/// Verify the gnd binary exists
+fn verify_gnd_binary() -> PathBuf {
+    let gnd_path = gnd_binary_path();
+    if !gnd_path.exists() {
+        panic!(
+            "gnd binary not found at {}. Run `cargo build -p gnd` first.",
+            gnd_path.display()
+        );
+    }
+    gnd_path
+}
+
+/// Run gnd command and return output
+fn run_gnd(args: &[&str], cwd: &Path) -> std::process::Output {
+    let gnd = verify_gnd_binary();
+    Command::new(&gnd)
+        .args(args)
+        .current_dir(cwd)
+        .output()
+        .expect("Failed to execute gnd")
+}
+
+/// Run gnd command and assert it succeeds
+fn run_gnd_success(args: &[&str], cwd: &Path) -> std::process::Output {
+    let output = run_gnd(args, cwd);
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        panic!(
+            "gnd {:?} failed:\nstdout: {}\nstderr: {}",
+            args, stdout, stderr
+        );
+    }
+    output
+}
+
+// ============================================================================
+// gnd indexer tests
+// ============================================================================
+
+#[test]
+fn test_indexer_missing_binary_error() {
+    let gnd = verify_gnd_binary();
+
+    // Run with an empty PATH so graph-indexer cannot be found.
+    let output = Command::new(&gnd)
+        .args(["indexer", "status", "--network", "mainnet"])
+        .env("PATH", "")
+        .output()
+        .expect("Failed to execute gnd");
+
+    assert!(
+        !output.status.success(),
+        "gnd indexer should fail when graph-indexer is not on $PATH"
+    );
+
+    let stderr = String::from_utf8_lossy(&output.stderr);
+    assert!(
+        stderr.contains("graph-indexer") && stderr.contains("not found"),
+        "Error should mention graph-indexer not found. Got:\n{stderr}"
+    );
+    assert!(
+        stderr.contains("indexer-cli"),
+        "Error should mention indexer-cli install instructions. Got:\n{stderr}"
+    );
+}
+
+#[test]
+fn test_indexer_clap_help() {
+    let gnd = verify_gnd_binary();
+
+    // `--help` is intercepted by clap, not forwarded to graph-indexer.
+    let output = Command::new(&gnd)
+        .args(["indexer", "--help"])
+        .env("PATH", "")
+        .output()
+        .expect("Failed to execute gnd");
+
+    assert!(output.status.success(), "gnd indexer --help should succeed");
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    assert!(
+        stdout.contains("indexer-cli"),
+        "Help should mention indexer-cli. Got:\n{stdout}"
+    );
+    assert!(
+        stdout.contains("graph-indexer"),
+        "Help should mention graph-indexer. Got:\n{stdout}"
+    );
+}
+
+// ============================================================================
+// gnd init tests
+// ============================================================================
+
+#[test]
+fn test_init_from_example() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("my-subgraph");
+
+    // Run gnd init --from-example. We pass --skip-install since `pnpm
+    // install` for the example will ask for github credentials (unclear
+    // why)
+    let output = run_gnd(
+        &[
+            "init",
+            "--skip-install",
+            "--from-example",
+            "ethereum-gravatar",
+            "my-subgraph",
+        ],
+        temp_dir.path(),
+    );
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        // Example downloads from GitHub, may fail in CI without network
+        // Skip test if it fails due to network issues
+        if stderr.contains("network")
+            || stderr.contains("fetch")
+            || stderr.contains("download")
+            || stderr.contains("Failed to fetch")
+        {
+            eprintln!("Skipping test_init_from_example: network unavailable");
+            return;
+        }
+        panic!(
+            "gnd init --from-example failed:\nstdout: {}\nstderr: {}",
+            stdout, stderr
+        );
+    }
+
+    // Verify scaffold was created
+    assert!(subgraph_dir.exists(), "Subgraph directory should exist");
+    assert!(
+        subgraph_dir.join("subgraph.yaml").exists(),
+        "subgraph.yaml should exist"
+    );
+    assert!(
+        subgraph_dir.join("schema.graphql").exists(),
+        "schema.graphql should exist"
+    );
+    assert!(
+        subgraph_dir.join("package.json").exists(),
+        "package.json should exist"
+    );
+
+    // Verify it's actually the ethereum-gravatar example (contains Gravatar entity)
+    let schema = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        schema.contains("Gravatar"),
+        "schema.graphql should contain Gravatar entity"
+    );
+}
+
+#[test]
+fn test_init_from_example_invalid_name() {
+    let temp_dir = TempDir::new().unwrap();
+    let output = run_gnd(
+        &[
+            "init",
+            "--skip-install",
+            "--from-example",
+            "nonexistent-example-12345",
+            "test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Command should fail
+    assert!(!output.status.success());
+
+    let stderr = String::from_utf8_lossy(&output.stderr);
+
+    // Skip test if it fails due to network issues (can't verify example doesn't exist)
+    if stderr.contains("Failed to fetch from graph-tooling") {
+        eprintln!("Skipping test_init_from_example_invalid_name: network unavailable");
+        return;
+    }
+
+    // Should show helpful error message
+    assert!(
+        stderr.contains("not found") || stderr.contains("graph-tooling"),
+        "Error should mention example not found or link to graph-tooling. Got: {}",
+        stderr
+    );
+}
+
+#[test]
+fn test_init_from_example_aggregations() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("my-agg");
+
+    let output = run_gnd(
+        &[
+            "init",
+            "--skip-install",
+            "--from-example",
+            "aggregations",
+            "my-agg",
+        ],
+        temp_dir.path(),
+    );
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        // Example downloads from GitHub, may fail in CI without network
+        if stderr.contains("network")
+            || stderr.contains("fetch")
+            || stderr.contains("download")
+            || stderr.contains("Failed to fetch")
+        {
+            eprintln!("Skipping test_init_from_example_aggregations: network unavailable");
+            return;
+        }
+        panic!(
+            "gnd init --from-example aggregations failed:\nstdout: {}\nstderr: {}",
+            stdout, stderr
+        );
+    }
+
+    // Verify scaffold was created
+    assert!(subgraph_dir.exists(), "Subgraph directory should exist");
+
+    // Verify it's actually the aggregations example, not ethereum-gravatar
+    let manifest = fs::read_to_string(subgraph_dir.join("subgraph.yaml")).unwrap();
+
+    // The aggregations example uses specVersion 1.1.0 and has blockHandlers,
+    // whereas ethereum-gravatar uses 0.0.5 and has eventHandlers
+    assert!(
+        manifest.contains("specVersion: 1.1.0") || manifest.contains("blockHandlers"),
+        "Manifest should be the aggregations example (expected specVersion 1.1.0 or blockHandlers)"
+    );
+}
+
+#[test]
+fn test_init_from_contract_with_abi() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("simple-subgraph");
+
+    // Get the path to SimpleContract ABI
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    assert!(abi_path.exists(), "SimpleContract.json ABI should exist");
+
+    // Run gnd init with --from-contract and --abi
+    let output = run_gnd(
+        &[
+            "init",
+            "--from-contract",
+            "0x5fbdb2315678afecb367f032d93f642f64180aa3",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "SimpleContract",
+            "simple-subgraph",
+        ],
+        temp_dir.path(),
+    );
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        panic!(
+            "gnd init --from-contract failed:\nstdout: {}\nstderr: {}",
+            stdout, stderr
+        );
+    }
+
+    // Verify scaffold was created
+    assert!(subgraph_dir.exists(), "Subgraph directory should exist");
+    assert!(
+        subgraph_dir.join("subgraph.yaml").exists(),
+        "subgraph.yaml should exist"
+    );
+    assert!(
+        subgraph_dir.join("schema.graphql").exists(),
+        "schema.graphql should exist"
+    );
+
+    // Verify manifest contains the contract
+    let manifest = fs::read_to_string(subgraph_dir.join("subgraph.yaml")).unwrap();
+    assert!(
+        manifest.contains("0x5fbdb2315678afecb367f032d93f642f64180aa3"),
+        "Manifest should contain contract address"
+    );
+    assert!(
+        manifest.contains("SimpleContract"),
+        "Manifest should contain contract name"
+    );
+
+    // Verify networks.json was created with contract config
+    let networks_path = subgraph_dir.join("networks.json");
+    assert!(networks_path.exists(), "networks.json should exist");
+
+    let networks: serde_json::Value =
+        serde_json::from_str(&fs::read_to_string(&networks_path).unwrap()).unwrap();
+    assert!(
+        networks["mainnet"]["SimpleContract"]["address"]
+            .as_str()
+            .unwrap()
+            .contains("0x5fbdb2315678afecb367f032d93f642f64180aa3"),
+        "networks.json should contain contract address"
+    );
+}
+
+#[test]
+fn test_init_creates_mapping_file() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("mapping-test");
+
+    // Get the path to SimpleContract ABI
+    let abi_path = test_abis_path().join("SimpleContract.json");
+
+    // Run gnd init
+    let output = run_gnd(
+        &[
+            "init",
+            "--from-contract",
+            "0x1234567890123456789012345678901234567890",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "TestContract",
+            "--index-events",
+            "mapping-test",
+        ],
+        temp_dir.path(),
+    );
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        panic!("gnd init failed:\nstdout: {}\nstderr: {}", stdout, stderr);
+    }
+
+    // Verify mapping file was created
+    let mapping_path = subgraph_dir.join("src").join("test-contract.ts");
+    assert!(
+        mapping_path.exists() || subgraph_dir.join("src").join("mapping.ts").exists(),
+        "Mapping file should exist"
+    );
+}
+
+// ============================================================================
+// gnd add tests
+// ============================================================================
+
+#[test]
+fn test_add_datasource() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("add-test");
+
+    // First create a subgraph with init
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1111111111111111111111111111111111111111",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "FirstContract",
+            "add-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Verify initial manifest
+    let manifest_before = fs::read_to_string(subgraph_dir.join("subgraph.yaml")).unwrap();
+    assert!(
+        manifest_before.contains("FirstContract"),
+        "Initial manifest should have FirstContract"
+    );
+    assert!(
+        !manifest_before.contains("SecondContract"),
+        "Initial manifest should not have SecondContract"
+    );
+
+    // The added contract's event entity should not exist in the schema yet.
+    let schema_before = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        !schema_before.contains("type Trigger"),
+        "Initial schema should not have the Trigger entity"
+    );
+
+    // Now add another datasource
+    let second_abi_path = test_abis_path().join("LimitedContract.json");
+    let output = run_gnd(
+        &[
+            "add",
+            "0x2222222222222222222222222222222222222222",
+            "--abi",
+            second_abi_path.to_str().unwrap(),
+            "--contract-name",
+            "SecondContract",
+        ],
+        &subgraph_dir,
+    );
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        panic!("gnd add failed:\nstdout: {}\nstderr: {}", stdout, stderr);
+    }
+
+    // Verify manifest was updated
+    let manifest_after = fs::read_to_string(subgraph_dir.join("subgraph.yaml")).unwrap();
+    assert!(
+        manifest_after.contains("FirstContract"),
+        "Updated manifest should still have FirstContract"
+    );
+    assert!(
+        manifest_after.contains("SecondContract"),
+        "Updated manifest should have SecondContract"
+    );
+    assert!(
+        manifest_after.contains("0x2222222222222222222222222222222222222222"),
+        "Updated manifest should have second contract address"
+    );
+
+    // The added Trigger event collides with the first contract's Trigger entity;
+    // without --merge-entities it is renamed with the contract prefix so both
+    // can coexist, and declared in the schema.
+    let schema_after = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        schema_after.contains("type SecondContractTrigger @entity"),
+        "Updated schema should declare the renamed entity, got:\n{}",
+        schema_after
+    );
+}
+
+#[test]
+fn test_add_merge_entities_reuses_existing() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("merge-test");
+
+    // Init with --index-events so the schema actually declares the event entities.
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1111111111111111111111111111111111111111",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "FirstContract",
+            "--index-events",
+            "merge-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Add a contract whose Trigger event collides, with --merge-entities.
+    let second_abi_path = test_abis_path().join("LimitedContract.json");
+    run_gnd_success(
+        &[
+            "add",
+            "0x2222222222222222222222222222222222222222",
+            "--abi",
+            second_abi_path.to_str().unwrap(),
+            "--contract-name",
+            "SecondContract",
+            "--merge-entities",
+        ],
+        &subgraph_dir,
+    );
+
+    // Merge reuses the existing Trigger entity: no renamed type is declared...
+    let schema_after = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        !schema_after.contains("SecondContractTrigger"),
+        "merge should reuse Trigger, not declare a renamed entity, got:\n{}",
+        schema_after
+    );
+
+    // ...but the handler is still generated, writing into the shared entity.
+    let mapping = fs::read_to_string(subgraph_dir.join("src").join("second-contract.ts")).unwrap();
+    assert!(
+        mapping.contains("new Trigger("),
+        "merged handler should write into the existing Trigger entity, got:\n{}",
+        mapping
+    );
+}
+
+#[test]
+fn test_add_overloaded_events_disambiguate() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("over-test");
+
+    // A base subgraph without overloaded events.
+    let abi_path = test_abis_path().join("LimitedContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1111111111111111111111111111111111111111",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "Base",
+            "over-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // An ABI with two events of the same name (a Solidity overload).
+    let overloaded_abi = temp_dir.path().join("Overloaded.json");
+    fs::write(
+        &overloaded_abi,
+        r#"[
+          {"type":"event","name":"Ping","inputs":[{"name":"account","type":"address","indexed":true}]},
+          {"type":"event","name":"Ping","inputs":[{"name":"amount","type":"uint256","indexed":false}]}
+        ]"#,
+    )
+    .unwrap();
+
+    run_gnd_success(
+        &[
+            "add",
+            "0x2222222222222222222222222222222222222222",
+            "--abi",
+            overloaded_abi.to_str().unwrap(),
+            "--contract-name",
+            "Over",
+        ],
+        &subgraph_dir,
+    );
+
+    // The two Ping events get distinct entities and handlers.
+    let schema = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        schema.contains("type Ping @entity") && schema.contains("type Ping1 @entity"),
+        "overloaded events should produce Ping and Ping1 entities, got:\n{}",
+        schema
+    );
+
+    let mapping = fs::read_to_string(subgraph_dir.join("src").join("over.ts")).unwrap();
+    assert!(
+        mapping.contains("handlePing(") && mapping.contains("handlePing1("),
+        "overloaded events should produce handlePing and handlePing1, got:\n{}",
+        mapping
+    );
+}
+
+#[test]
+fn test_init_overloaded_events_disambiguate() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("over-init");
+
+    // An ABI with two events of the same name (a Solidity overload).
+    let overloaded_abi = temp_dir.path().join("Overloaded.json");
+    fs::write(
+        &overloaded_abi,
+        r#"[
+          {"type":"event","name":"Ping","inputs":[{"name":"account","type":"address","indexed":true}]},
+          {"type":"event","name":"Ping","inputs":[{"name":"amount","type":"uint256","indexed":false}]}
+        ]"#,
+    )
+    .unwrap();
+
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1111111111111111111111111111111111111111",
+            "--abi",
+            overloaded_abi.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "Over",
+            "--index-events",
+            "over-init",
+        ],
+        temp_dir.path(),
+    );
+
+    // init must disambiguate too, or it emits duplicate types / handlers.
+    let schema = fs::read_to_string(subgraph_dir.join("schema.graphql")).unwrap();
+    assert!(
+        schema.contains("type Ping @entity") && schema.contains("type Ping1 @entity"),
+        "init should disambiguate overloaded events, got:\n{}",
+        schema
+    );
+
+    let mapping = fs::read_to_string(subgraph_dir.join("src").join("over.ts")).unwrap();
+    assert!(
+        mapping.contains("handlePing(") && mapping.contains("handlePing1("),
+        "init mapping should disambiguate overloaded handlers, got:\n{}",
+        mapping
+    );
+}
+
+#[test]
+fn test_add_duplicate_name_errors() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("dup-test");
+
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1111111111111111111111111111111111111111",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "FirstContract",
+            "dup-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Adding a data source whose name already exists must fail.
+    let second_abi_path = test_abis_path().join("LimitedContract.json");
+    let output = run_gnd(
+        &[
+            "add",
+            "0x2222222222222222222222222222222222222222",
+            "--abi",
+            second_abi_path.to_str().unwrap(),
+            "--contract-name",
+            "FirstContract",
+        ],
+        &subgraph_dir,
+    );
+
+    assert!(
+        !output.status.success(),
+        "gnd add should fail when the data source name already exists"
+    );
+    let stderr = String::from_utf8_lossy(&output.stderr);
+    assert!(
+        stderr.contains("already exists"),
+        "error should mention the name already exists, got: {}",
+        stderr
+    );
+}
+
+// ============================================================================
+// gnd codegen tests
+// ============================================================================
+
+#[test]
+fn test_codegen_generates_types() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("codegen-test");
+
+    // Create a subgraph
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1234567890123456789012345678901234567890",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "SimpleContract",
+            "--index-events",
+            "codegen-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Run codegen
+    let output = run_gnd(&["codegen", "--skip-migrations"], &subgraph_dir);
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        panic!(
+            "gnd codegen failed:\nstdout: {}\nstderr: {}",
+            stdout, stderr
+        );
+    }
+
+    // Verify generated directory exists
+    let generated_dir = subgraph_dir.join("generated");
+    assert!(generated_dir.exists(), "generated/ directory should exist");
+
+    // Verify schema.ts was generated
+    assert!(
+        generated_dir.join("schema.ts").exists(),
+        "generated/schema.ts should exist"
+    );
+}
+
+// ============================================================================
+// gnd build tests
+// ============================================================================
+
+#[test]
+fn test_build_after_codegen() {
+    // Skip this test if asc is not installed
+    if Command::new("asc").arg("--version").output().is_err() {
+        eprintln!("Skipping test_build_after_codegen: asc not installed");
+        return;
+    }
+
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("build-test");
+
+    // Create a subgraph
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1234567890123456789012345678901234567890",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "SimpleContract",
+            "--index-events",
+            "build-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Install dependencies (required for codegen and build)
+    let npm_install = Command::new("npm")
+        .arg("install")
+        .current_dir(&subgraph_dir)
+        .output();
+
+    if npm_install.is_err() || !npm_install.unwrap().status.success() {
+        eprintln!("Skipping test_build_after_codegen: npm install failed");
+        return;
+    }
+
+    // Run codegen first to generate types
+    let codegen_output = run_gnd(&["codegen", "--skip-migrations"], &subgraph_dir);
+    if !codegen_output.status.success() {
+        let stdout = String::from_utf8_lossy(&codegen_output.stdout);
+        let stderr = String::from_utf8_lossy(&codegen_output.stderr);
+        if stderr.contains("Cannot find module") || stderr.contains("graph-ts") {
+            eprintln!("Skipping test_build_after_codegen: dependencies not available");
+            return;
+        }
+        panic!(
+            "gnd codegen failed:\nstdout: {}\nstderr: {}",
+            stdout, stderr
+        );
+    }
+
+    // Run build (codegen already done)
+    let output = run_gnd(&["build", "--skip-migrations"], &subgraph_dir);
+
+    if !output.status.success() {
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        // Build may fail if dependencies aren't set up correctly
+        // This is expected in some CI environments
+        if stderr.contains("Cannot find module") || stderr.contains("graph-ts") {
+            eprintln!("Skipping test_build_after_codegen: dependencies not available");
+            return;
+        }
+        panic!("gnd build failed:\nstdout: {}\nstderr: {}", stdout, stderr);
+    }
+
+    // Verify build directory exists
+    let build_dir = subgraph_dir.join("build");
+    assert!(build_dir.exists(), "build/ directory should exist");
+
+    // Verify WASM was generated
+    let wasm_files: Vec<_> = fs::read_dir(&build_dir)
+        .unwrap()
+        .filter_map(|e| e.ok())
+        .filter(|e| {
+            e.path()
+                .extension()
+                .map(|ext| ext == "wasm")
+                .unwrap_or(false)
+        })
+        .collect();
+
+    assert!(
+        !wasm_files.is_empty(),
+        "build/ should contain at least one .wasm file"
+    );
+}
+
+// ============================================================================
+// gnd clean tests
+// ============================================================================
+
+#[test]
+fn test_clean_removes_artifacts() {
+    let temp_dir = TempDir::new().unwrap();
+    let subgraph_dir = temp_dir.path().join("clean-test");
+
+    // Create a subgraph
+    let abi_path = test_abis_path().join("SimpleContract.json");
+    run_gnd_success(
+        &[
+            "init",
+            "--from-contract",
+            "0x1234567890123456789012345678901234567890",
+            "--abi",
+            abi_path.to_str().unwrap(),
+            "--network",
+            "mainnet",
+            "--contract-name",
+            "SimpleContract",
+            "clean-test",
+        ],
+        temp_dir.path(),
+    );
+
+    // Run codegen to create generated/
+    run_gnd_success(&["codegen", "--skip-migrations"], &subgraph_dir);
+
+    // Verify generated/ exists
+    assert!(
+        subgraph_dir.join("generated").exists(),
+        "generated/ should exist after codegen"
+    );
+
+    // Create a fake build/ directory
+    fs::create_dir(subgraph_dir.join("build")).unwrap();
+    assert!(subgraph_dir.join("build").exists(), "build/ should exist");
+
+    // Run clean
+    run_gnd_success(&["clean"], &subgraph_dir);
+
+    // Verify directories were removed
+    assert!(
+        !subgraph_dir.join("generated").exists(),
+        "generated/ should be removed after clean"
+    );
+    assert!(
+        !subgraph_dir.join("build").exists(),
+        "build/ should be removed after clean"
+    );
+}
diff --git a/gnd/tests/codegen_verification.rs b/gnd/tests/codegen_verification.rs
new file mode 100644
index 00000000000..e17730a75ce
--- /dev/null
+++ b/gnd/tests/codegen_verification.rs
@@ -0,0 +1,493 @@
+//! Integration tests that verify `gnd codegen` produces compatible output
+//! to `graph-cli codegen` using golden test fixtures.
+//!
+//! Fixtures are stored locally in `tests/fixtures/codegen_verification/`.
+//! To regenerate fixtures after graph-cli changes, run:
+//! ```sh
+//! ./tests/fixtures/regenerate.sh
+//! ```
+//!
+//! # Known Differences
+//!
+//! Some differences between gnd and graph-cli output are intentional:
+//!
+//! 1. **Int8 import**: gnd always imports Int8 for simplicity
+//! 2. **Trailing commas**: gnd uses trailing commas in multi-line constructs
+//! 3. **2D array accessors**: gnd uses correct `toStringMatrix()` while graph-cli
+//!    has a bug using `toStringArray()` for 2D GraphQL array types
+//!
+//! These differences are documented and accepted in the test comparisons.
+
+use regex::Regex;
+use similar::{ChangeTag, TextDiff};
+use std::collections::HashSet;
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use tempfile::TempDir;
+use walkdir::WalkDir;
+
+/// Fixtures to test - these are directories under graph-cli's validation test folder
+/// that have a `generated/` directory with expected output.
+const FIXTURES: &[&str] = &[
+    "2d-array-is-valid",
+    "3d-array-is-valid",
+    "big-decimal-is-valid",
+    "block-handler-filters",
+    "call-handler-with-tuple",
+    "derived-from-with-interface",
+    "example-values-found",
+    "invalid-graphql-schema",
+    "no-network-names",
+    "source-without-address-is-valid",
+    "topic0-is-valid",
+];
+
+/// Get the path to the fixtures directory
+fn fixtures_path() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("tests")
+        .join("fixtures")
+        .join("codegen_verification")
+}
+
+/// Get the path to the gnd binary
+fn gnd_binary_path() -> PathBuf {
+    // Use the binary built by cargo test
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    PathBuf::from(manifest_dir)
+        .parent()
+        .unwrap()
+        .join("target")
+        .join("debug")
+        .join("gnd")
+}
+
+/// Copy a fixture directory to a temporary directory, excluding the generated/ folder
+fn copy_fixture_to_temp(fixture_path: &Path, temp_dir: &Path) -> std::io::Result<()> {
+    for entry in WalkDir::new(fixture_path).min_depth(1) {
+        let entry = entry?;
+        let relative_path = entry.path().strip_prefix(fixture_path).unwrap();
+
+        // Skip the generated directory
+        if relative_path.starts_with("generated") {
+            continue;
+        }
+
+        let dest_path = temp_dir.join(relative_path);
+
+        if entry.file_type().is_dir() {
+            fs::create_dir_all(&dest_path)?;
+        } else {
+            if let Some(parent) = dest_path.parent() {
+                fs::create_dir_all(parent)?;
+            }
+            fs::copy(entry.path(), &dest_path)?;
+        }
+    }
+    Ok(())
+}
+
+/// Collect all files in a directory recursively
+fn collect_files(dir: &Path) -> std::io::Result<HashSet<PathBuf>> {
+    let mut files = HashSet::new();
+    if !dir.exists() {
+        return Ok(files);
+    }
+    for entry in WalkDir::new(dir) {
+        let entry = entry?;
+        if entry.file_type().is_file() {
+            let relative_path = entry.path().strip_prefix(dir).unwrap();
+            files.insert(relative_path.to_path_buf());
+        }
+    }
+    Ok(files)
+}
+
+/// Normalize content to remove known acceptable differences between gnd and graph-cli.
+///
+/// Known differences:
+/// 1. Int8 import - gnd always includes it
+/// 2. Trailing commas - gnd uses them, graph-cli doesn't
+/// 3. toStringMatrix vs toStringArray - gnd correctly uses Matrix for 2D arrays
+/// 4. Import order - may differ between implementations
+fn normalize_content(content: &str) -> String {
+    let mut normalized = content.to_string();
+
+    // Remove Int8 from imports (gnd always includes it, graph-cli doesn't)
+    // Handles both "Int8," and ",\n  Int8"
+    normalized = normalized.replace(",\n  Int8,", ",");
+    normalized = normalized.replace("  Int8,\n", "");
+
+    // Normalize trailing commas using regex
+    // Match patterns like: `])\n` -> `],)\n`, `)\n  }` -> `),\n  }`
+    // gnd uses trailing commas, graph-cli doesn't - normalize TO having them
+
+    // Trailing comma before closing bracket in arrays: `])\n` -> `],)\n`
+    let re_array_close = Regex::new(r"\]\)(\s*\n)").unwrap();
+    normalized = re_array_close.replace_all(&normalized, "],)$1").to_string();
+
+    // Trailing comma before closing paren in multi-line: `)\n    );` -> `),\n    );`
+    let re_call_close = Regex::new(r"\)(\s*\n\s*\);)").unwrap();
+    normalized = re_call_close.replace_all(&normalized, "),$1").to_string();
+
+    // Trailing comma in function arguments that end with )
+    let re_func_arg = Regex::new(r"\)(\s*\n\s+\])").unwrap();
+    normalized = re_func_arg.replace_all(&normalized, "),$1").to_string();
+
+    // Trailing comma before new statement
+    let re_stmt = Regex::new(r"([^\s,])(\s*\n\s*\);)").unwrap();
+    normalized = re_stmt.replace_all(&normalized, "$1,$2").to_string();
+
+    // Handle specific patterns that regex doesn't catch well
+    // Multi-line changetype call
+    normalized = normalized.replace(")\n    );", "),\n    );");
+
+    // Multi-line GravatarLoader call
+    normalized = normalized.replace("\"gravatars\"\n    );", "\"gravatars\",\n    );");
+
+    // Normalize trailing commas in imports
+    // graph-cli: doesn't use trailing commas
+    // gnd: uses trailing commas
+    normalized = normalized.replace("BigDecimal\n}", "BigDecimal,\n}");
+    normalized = normalized.replace("BigInt\n}", "BigInt,\n}");
+    normalized = normalized.replace("Address\n}", "Address,\n}");
+
+    // Normalize template imports
+    normalized = normalized.replace("DataSourceContext\n}", "DataSourceContext,\n}");
+
+    // Normalize trailing commas in multi-line constructs
+    normalized = normalized.replace("displayKind()}`\n", "displayKind()}`,\n");
+    normalized = normalized.replace(".toTuple()\n", ".toTuple(),\n");
+    normalized = normalized.replace("context\n    );", "context,\n    );");
+
+    // Normalize 2D array accessors - gnd correctly uses Matrix
+    // graph-cli has a bug using toStringArray for 2D arrays
+    normalized = normalized.replace(".toStringArray()", ".toStringMatrix()");
+    normalized = normalized.replace(".toBytesArray()", ".toBytesMatrix()");
+    normalized = normalized.replace(".toBooleanArray()", ".toBooleanMatrix()");
+    normalized = normalized.replace(".toI32Array()", ".toI32Matrix()");
+    normalized = normalized.replace(".toBigIntArray()", ".toBigIntMatrix()");
+    normalized = normalized.replace(".toBigDecimalArray()", ".toBigDecimalMatrix()");
+
+    // Normalize import order by sorting import lines
+    // This handles: import { A, B, C } and import { C, B, A } becoming equivalent
+    normalized = normalize_imports(&normalized);
+
+    normalized
+}
+
+/// Normalize import statements by sorting the imported items.
+/// This makes `import { B, A }` equivalent to `import { A, B }`.
+fn normalize_imports(content: &str) -> String {
+    let re = Regex::new(r"import \{\s*\n?([\s\S]*?)\n?\} from").unwrap();
+    re.replace_all(content, |caps: &regex::Captures| {
+        let items_str = &caps[1];
+        let mut items: Vec<&str> = items_str
+            .split(',')
+            .map(|s| s.trim())
+            .filter(|s| !s.is_empty())
+            .collect();
+        items.sort();
+        format!("import {{\n  {},\n}} from", items.join(",\n  "))
+    })
+    .to_string()
+}
+
+/// Final normalization pass that removes all stylistic differences.
+fn normalize_final(content: &str) -> String {
+    let mut normalized = content.to_string();
+
+    // Remove all trailing commas before closing ) or ]
+    // Pattern: comma followed by whitespace and closing paren/bracket
+    let re_trailing_comma = Regex::new(r",(\s*[\)\]])").unwrap();
+    normalized = re_trailing_comma.replace_all(&normalized, "$1").to_string();
+
+    // Remove trailing commas at end of function parameters
+    // Pattern: comma, optional whitespace, newline, spaces, closing paren
+    let re_param_comma = Regex::new(r",\s*\n(\s*\))").unwrap();
+    normalized = re_param_comma.replace_all(&normalized, "\n$1").to_string();
+
+    // Remove multiple consecutive blank lines (keep single blank lines)
+    let re_blank_lines = Regex::new(r"\n\n\n+").unwrap();
+    normalized = re_blank_lines.replace_all(&normalized, "\n\n").to_string();
+
+    // Ensure consistent blank line before export class (one blank line)
+    let re_class_blank = Regex::new(r"\n+export class").unwrap();
+    normalized = re_class_blank
+        .replace_all(&normalized, "\n\nexport class")
+        .to_string();
+
+    normalized
+}
+
+/// Sort methods within the SmartContract class to normalize method ordering.
+/// Methods within a class may be in different order between gnd and graph-cli.
+fn sort_methods_in_contract(content: &str) -> String {
+    // Find contract class and sort its methods
+    let contract_re =
+        Regex::new(r"(?s)(export class \w+ extends ethereum\.SmartContract \{)(.*?)(\n\})")
+            .unwrap();
+
+    contract_re
+        .replace(content, |caps: &regex::Captures| {
+            let class_header = &caps[1];
+            let body = &caps[2];
+            let class_footer = &caps[3];
+
+            // Extract methods from body
+            let method_re = Regex::new(r"(?s)\n  (\w+\([^)]*\)[^}]*\})").unwrap();
+            let mut methods: Vec<String> = method_re
+                .captures_iter(body)
+                .map(|c| c[0].to_string())
+                .collect();
+
+            // Also capture static methods and try_ methods
+            let static_re = Regex::new(r"(?s)\n  (static \w+\([^)]*\)[^}]*\})").unwrap();
+            let static_methods: Vec<String> = static_re
+                .captures_iter(body)
+                .map(|c| c[0].to_string())
+                .collect();
+
+            // Sort methods alphabetically
+            methods.sort();
+
+            format!(
+                "{}\n{}{}{}",
+                class_header,
+                static_methods.join(""),
+                methods.join(""),
+                class_footer
+            )
+        })
+        .to_string()
+}
+
+/// Sort class declarations to normalize ordering differences.
+/// gnd outputs classes in alphabetical order, graph-cli may use a different order.
+fn sort_classes(content: &str) -> String {
+    // Find positions where "export class" appears at start of line
+    let mut class_starts: Vec<usize> = Vec::new();
+    let mut current_pos = 0usize;
+
+    for line in content.lines() {
+        if line.starts_with("export class ") {
+            class_starts.push(current_pos);
+        }
+        current_pos += line.len() + 1; // +1 for newline
+    }
+
+    if class_starts.is_empty() {
+        return content.to_string();
+    }
+
+    let header = &content[..class_starts[0]];
+
+    // Extract each class
+    let mut classes: Vec<&str> = Vec::new();
+    for i in 0..class_starts.len() {
+        let start = class_starts[i];
+        let end = if i + 1 < class_starts.len() {
+            class_starts[i + 1]
+        } else {
+            content.len()
+        };
+        classes.push(&content[start..end]);
+    }
+
+    // Sort classes alphabetically by their names
+    classes.sort_by(|a, b| {
+        fn get_name(s: &str) -> &str {
+            s.split_whitespace()
+                .nth(2)
+                .unwrap_or("")
+                .trim_end_matches(['{', ' '])
+        }
+        get_name(a).cmp(get_name(b))
+    });
+
+    format!("{}{}", header, classes.join(""))
+}
+
+/// Compare two files and return a diff if they differ
+fn compare_files(expected: &Path, actual: &Path) -> Result<Option<String>, std::io::Error> {
+    let expected_content = fs::read_to_string(expected)?;
+    let actual_content = fs::read_to_string(actual)?;
+
+    // Normalize both contents to remove known acceptable differences
+    let expected_normalized = normalize_final(&sort_methods_in_contract(&sort_classes(
+        &normalize_content(&expected_content),
+    )));
+    let actual_normalized = normalize_final(&sort_methods_in_contract(&sort_classes(
+        &normalize_content(&actual_content),
+    )));
+
+    if expected_normalized == actual_normalized {
+        return Ok(None);
+    }
+
+    let diff = TextDiff::from_lines(&expected_normalized, &actual_normalized);
+    let mut diff_output = String::new();
+
+    for change in diff.iter_all_changes() {
+        let sign = match change.tag() {
+            ChangeTag::Delete => "-",
+            ChangeTag::Insert => "+",
+            ChangeTag::Equal => " ",
+        };
+        diff_output.push_str(&format!("{}{}", sign, change));
+    }
+
+    Ok(Some(diff_output))
+}
+
+/// Run codegen verification for a single fixture
+fn verify_fixture(fixture_name: &str) -> Result<(), String> {
+    let fixtures_dir = fixtures_path();
+    let fixture_path = fixtures_dir.join(fixture_name);
+
+    if !fixture_path.exists() {
+        return Err(format!(
+            "Fixture directory not found: {}",
+            fixture_path.display()
+        ));
+    }
+
+    let expected_dir = fixture_path.join("generated");
+    if !expected_dir.exists() {
+        return Err(format!(
+            "Expected generated/ directory not found in fixture: {}",
+            fixture_name
+        ));
+    }
+
+    // Create temp directory and copy fixture files
+    let temp_dir = TempDir::new().map_err(|e| format!("Failed to create temp dir: {}", e))?;
+
+    copy_fixture_to_temp(&fixture_path, temp_dir.path())
+        .map_err(|e| format!("Failed to copy fixture: {}", e))?;
+
+    // Run gnd codegen
+    let gnd_binary = gnd_binary_path();
+    if !gnd_binary.exists() {
+        return Err(format!(
+            "gnd binary not found at {}. Run `cargo build -p gnd` first.",
+            gnd_binary.display()
+        ));
+    }
+
+    let output = Command::new(&gnd_binary)
+        .arg("codegen")
+        .arg("--skip-migrations")
+        .current_dir(temp_dir.path())
+        .output()
+        .map_err(|e| format!("Failed to run gnd codegen: {}", e))?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        return Err(format!(
+            "gnd codegen failed for {}:\nstdout: {}\nstderr: {}",
+            fixture_name, stdout, stderr
+        ));
+    }
+
+    // Compare generated files
+    let actual_dir = temp_dir.path().join("generated");
+
+    let expected_files = collect_files(&expected_dir)
+        .map_err(|e| format!("Failed to collect expected files: {}", e))?;
+    let actual_files =
+        collect_files(&actual_dir).map_err(|e| format!("Failed to collect actual files: {}", e))?;
+
+    let mut errors = Vec::new();
+
+    // Check for missing files (in expected but not in actual)
+    for file in expected_files.difference(&actual_files) {
+        errors.push(format!("Missing file: {}", file.display()));
+    }
+
+    // Check for extra files (in actual but not in expected)
+    for file in actual_files.difference(&expected_files) {
+        errors.push(format!("Extra file: {}", file.display()));
+    }
+
+    // Compare common files
+    for file in expected_files.intersection(&actual_files) {
+        let expected_file = expected_dir.join(file);
+        let actual_file = actual_dir.join(file);
+
+        match compare_files(&expected_file, &actual_file) {
+            Ok(Some(diff)) => {
+                errors.push(format!("File {} differs:\n{}", file.display(), diff));
+            }
+            Ok(None) => {}
+            Err(e) => {
+                errors.push(format!("Failed to compare {}: {}", file.display(), e));
+            }
+        }
+    }
+
+    if errors.is_empty() {
+        Ok(())
+    } else {
+        Err(errors.join("\n\n"))
+    }
+}
+
+// Generate individual test functions for each fixture
+macro_rules! fixture_test {
+    ($name:ident, $fixture:expr) => {
+        #[test]
+        fn $name() {
+            match verify_fixture($fixture) {
+                Ok(()) => {}
+                Err(e) => panic!("Fixture '{}' verification failed:\n{}", $fixture, e),
+            }
+        }
+    };
+}
+
+fixture_test!(test_2d_array_is_valid, "2d-array-is-valid");
+fixture_test!(test_3d_array_is_valid, "3d-array-is-valid");
+fixture_test!(test_big_decimal_is_valid, "big-decimal-is-valid");
+fixture_test!(test_block_handler_filters, "block-handler-filters");
+fixture_test!(test_call_handler_with_tuple, "call-handler-with-tuple");
+fixture_test!(
+    test_derived_from_with_interface,
+    "derived-from-with-interface"
+);
+fixture_test!(test_example_values_found, "example-values-found");
+fixture_test!(test_invalid_graphql_schema, "invalid-graphql-schema");
+fixture_test!(test_no_network_names, "no-network-names");
+fixture_test!(
+    test_source_without_address_is_valid,
+    "source-without-address-is-valid"
+);
+fixture_test!(test_topic0_is_valid, "topic0-is-valid");
+
+/// Run all fixtures and report summary
+#[test]
+fn test_all_fixtures() {
+    let mut passed = Vec::new();
+    let mut failed = Vec::new();
+
+    for fixture in FIXTURES {
+        match verify_fixture(fixture) {
+            Ok(()) => passed.push(*fixture),
+            Err(e) => failed.push((*fixture, e)),
+        }
+    }
+
+    println!("\n=== Codegen Verification Summary ===");
+    println!("Passed: {}/{}", passed.len(), FIXTURES.len());
+
+    if !failed.is_empty() {
+        println!("\nFailed fixtures:");
+        for (fixture, error) in &failed {
+            println!("\n--- {} ---", fixture);
+            println!("{}", error);
+        }
+        panic!("{} fixture(s) failed verification", failed.len());
+    }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/Abi.json b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/schema.ts
new file mode 100644
index 00000000000..c785093d200
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/generated/schema.ts
@@ -0,0 +1,65 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get childTokenURIs(): Array<Array<string>> {
+    let value = this.get("childTokenURIs");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toStringArray();
+    }
+  }
+
+  set childTokenURIs(value: Array<Array<string>>) {
+    this.set("childTokenURIs", Value.fromStringMatrix(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/mapping.ts b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/schema.graphql b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/schema.graphql
new file mode 100644
index 00000000000..91dad2a14e6
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/schema.graphql
@@ -0,0 +1,4 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  childTokenURIs: [[String!]!]! # string[][]
+}
diff --git a/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/subgraph.yaml
new file mode 100644
index 00000000000..fa916d5b6c3
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/2d-array-is-valid/subgraph.yaml
@@ -0,0 +1,23 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/test-subgraph
+description: Test subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/Abi.json b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/schema.ts
new file mode 100644
index 00000000000..bb926318dd2
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/generated/schema.ts
@@ -0,0 +1,65 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get childTokenURIs(): Array<Array<Array<string>>> {
+    let value = this.get("childTokenURIs");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toStringArray();
+    }
+  }
+
+  set childTokenURIs(value: Array<Array<Array<string>>>) {
+    this.set("childTokenURIs", Value.fromStringMatrix(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/mapping.ts b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/schema.graphql b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/schema.graphql
new file mode 100644
index 00000000000..6b4e8719678
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/schema.graphql
@@ -0,0 +1,4 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  childTokenURIs: [[[String!]!]!]! # string[][][]
+}
diff --git a/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/subgraph.yaml
new file mode 100644
index 00000000000..fa916d5b6c3
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/3d-array-is-valid/subgraph.yaml
@@ -0,0 +1,23 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/test-subgraph
+description: Test subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/Abi.json b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/schema.ts
new file mode 100644
index 00000000000..faf8087b1cf
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/generated/schema.ts
@@ -0,0 +1,65 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get x(): BigDecimal {
+    let value = this.get("x");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigDecimal();
+    }
+  }
+
+  set x(value: BigDecimal) {
+    this.set("x", Value.fromBigDecimal(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/mapping.ts b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/schema.graphql b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/schema.graphql
new file mode 100644
index 00000000000..1edfc3c6c18
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/schema.graphql
@@ -0,0 +1,4 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  x: BigDecimal!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/subgraph.yaml
new file mode 100644
index 00000000000..fa916d5b6c3
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/big-decimal-is-valid/subgraph.yaml
@@ -0,0 +1,23 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/test-subgraph
+description: Test subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/Abi.json b/gnd/tests/fixtures/codegen_verification/block-handler-filters/Abi.json
new file mode 100644
index 00000000000..0637a088a01
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/block-handler-filters/Abi.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/DataSource/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/DataSource/ExampleContract.ts
new file mode 100644
index 00000000000..9109534743f
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/DataSource/ExampleContract.ts
@@ -0,0 +1,17 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/schema.ts
new file mode 100644
index 00000000000..570565361ea
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/block-handler-filters/generated/schema.ts
@@ -0,0 +1,52 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class A extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save A entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type A must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("A", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): A | null {
+    return changetype<A | null>(store.get_in_block("A", id));
+  }
+
+  static load(id: string): A | null {
+    return changetype<A | null>(store.get("A", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/mapping.ts b/gnd/tests/fixtures/codegen_verification/block-handler-filters/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/schema.graphql b/gnd/tests/fixtures/codegen_verification/block-handler-filters/schema.graphql
new file mode 100644
index 00000000000..98b9b177aca
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/block-handler-filters/schema.graphql
@@ -0,0 +1,3 @@
+type A @entity(immutable: true) {
+  id: ID!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/block-handler-filters/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/block-handler-filters/subgraph.yaml
new file mode 100644
index 00000000000..de252559ed9
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/block-handler-filters/subgraph.yaml
@@ -0,0 +1,29 @@
+specVersion: 0.0.1
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: DataSource
+    source:
+      address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - A
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      blockHandlers:
+        - handler: handleBlock0
+        - handler: handleBlock1
+          filter:
+            kind: polling
+            every: 2
+        - handler: handleBlock2
+          filter:
+            kind: once
+
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/Abi.json b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/Abi.json
new file mode 100644
index 00000000000..3cc71a06ca8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/Abi.json
@@ -0,0 +1,24 @@
+[
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "", "type": "uint256" },
+      {
+        "type": "tuple",
+        "components": [
+          { "type": "bytes32" },
+          { "type": "bytes32" },
+          { "type": "uint256" }
+        ]
+      },
+      {
+        "type": "bool"
+      }
+    ],
+    "name": "doSomething",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..34692aeba31
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,71 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
+
+export class DoSomethingCall extends ethereum.Call {
+  get inputs(): DoSomethingCall__Inputs {
+    return new DoSomethingCall__Inputs(this);
+  }
+
+  get outputs(): DoSomethingCall__Outputs {
+    return new DoSomethingCall__Outputs(this);
+  }
+}
+
+export class DoSomethingCall__Inputs {
+  _call: DoSomethingCall;
+
+  constructor(call: DoSomethingCall) {
+    this._call = call;
+  }
+
+  get value0(): BigInt {
+    return this._call.inputValues[0].value.toBigInt();
+  }
+
+  get value1(): DoSomethingCallValue1Struct {
+    return changetype<DoSomethingCallValue1Struct>(
+      this._call.inputValues[1].value.toTuple()
+    );
+  }
+
+  get value2(): boolean {
+    return this._call.inputValues[2].value.toBoolean();
+  }
+}
+
+export class DoSomethingCall__Outputs {
+  _call: DoSomethingCall;
+
+  constructor(call: DoSomethingCall) {
+    this._call = call;
+  }
+}
+
+export class DoSomethingCallValue1Struct extends ethereum.Tuple {
+  get value0(): Bytes {
+    return this[0].toBytes();
+  }
+
+  get value1(): Bytes {
+    return this[1].toBytes();
+  }
+
+  get value2(): BigInt {
+    return this[2].toBigInt();
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/schema.ts
new file mode 100644
index 00000000000..64ee920ecd1
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/generated/schema.ts
@@ -0,0 +1,53 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal,
+  Int8,
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`,
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/mapping.ts b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/schema.graphql b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/schema.graphql
new file mode 100644
index 00000000000..d5a41952be6
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/schema.graphql
@@ -0,0 +1,3 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/subgraph.yaml
new file mode 100644
index 00000000000..93c21a2969a
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/call-handler-with-tuple/subgraph.yaml
@@ -0,0 +1,22 @@
+specVersion: 0.0.2
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      address: '22843e74c59580b3eaf6c233fa67d8b7c561a835'
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      callHandlers:
+        - function: doSomething(uint256,(bytes32,bytes32,uint256),bool)
+          handler: handleDoSomething
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/Gravity.json b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/Gravity.json
new file mode 100644
index 00000000000..d9412537c13
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/Gravity.json
@@ -0,0 +1 @@
+[{"constant":false,"inputs":[{"name":"_imageUrl","type":"string"}],"name":"updateGravatarImage","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"setMythicalGravatar","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"}],"name":"getGravatar","outputs":[{"name":"","type":"string"},{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"gravatarToOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"ownerToGravatar","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_displayName","type":"string"}],"name":"updateGravatarName","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_displayName","type":"string"},{"name":"_imageUrl","type":"string"}],"name":"createGravatar","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"gravatars","outputs":[{"name":"owner","type":"address"},{"name":"displayName","type":"string"},{"name":"imageUrl","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"id","type":"uint256"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"displayName","type":"string"},{"indexed":false,"name":"imageUrl","type":"string"}],"name":"NewGravatar","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"id","type":"uint256"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"displayName","type":"string"},{"indexed":false,"name":"imageUrl","type":"string"}],"name":"UpdatedGravatar","type":"event"}]
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/Gravity/Gravity.ts b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/Gravity/Gravity.ts
new file mode 100644
index 00000000000..55ae85a6b33
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/Gravity/Gravity.ts
@@ -0,0 +1,363 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class NewGravatar extends ethereum.Event {
+  get params(): NewGravatar__Params {
+    return new NewGravatar__Params(this);
+  }
+}
+
+export class NewGravatar__Params {
+  _event: NewGravatar;
+
+  constructor(event: NewGravatar) {
+    this._event = event;
+  }
+
+  get id(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get owner(): Address {
+    return this._event.parameters[1].value.toAddress();
+  }
+
+  get displayName(): string {
+    return this._event.parameters[2].value.toString();
+  }
+
+  get imageUrl(): string {
+    return this._event.parameters[3].value.toString();
+  }
+}
+
+export class UpdatedGravatar extends ethereum.Event {
+  get params(): UpdatedGravatar__Params {
+    return new UpdatedGravatar__Params(this);
+  }
+}
+
+export class UpdatedGravatar__Params {
+  _event: UpdatedGravatar;
+
+  constructor(event: UpdatedGravatar) {
+    this._event = event;
+  }
+
+  get id(): BigInt {
+    return this._event.parameters[0].value.toBigInt();
+  }
+
+  get owner(): Address {
+    return this._event.parameters[1].value.toAddress();
+  }
+
+  get displayName(): string {
+    return this._event.parameters[2].value.toString();
+  }
+
+  get imageUrl(): string {
+    return this._event.parameters[3].value.toString();
+  }
+}
+
+export class Gravity__getGravatarResult {
+  value0: string;
+  value1: string;
+
+  constructor(value0: string, value1: string) {
+    this.value0 = value0;
+    this.value1 = value1;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromString(this.value0));
+    map.set("value1", ethereum.Value.fromString(this.value1));
+    return map;
+  }
+
+  getValue0(): string {
+    return this.value0;
+  }
+
+  getValue1(): string {
+    return this.value1;
+  }
+}
+
+export class Gravity__gravatarsResult {
+  value0: Address;
+  value1: string;
+  value2: string;
+
+  constructor(value0: Address, value1: string, value2: string) {
+    this.value0 = value0;
+    this.value1 = value1;
+    this.value2 = value2;
+  }
+
+  toMap(): TypedMap<string, ethereum.Value> {
+    let map = new TypedMap<string, ethereum.Value>();
+    map.set("value0", ethereum.Value.fromAddress(this.value0));
+    map.set("value1", ethereum.Value.fromString(this.value1));
+    map.set("value2", ethereum.Value.fromString(this.value2));
+    return map;
+  }
+
+  getOwner(): Address {
+    return this.value0;
+  }
+
+  getDisplayName(): string {
+    return this.value1;
+  }
+
+  getImageUrl(): string {
+    return this.value2;
+  }
+}
+
+export class Gravity extends ethereum.SmartContract {
+  static bind(address: Address): Gravity {
+    return new Gravity("Gravity", address);
+  }
+
+  getGravatar(owner: Address): Gravity__getGravatarResult {
+    let result = super.call(
+      "getGravatar",
+      "getGravatar(address):(string,string)",
+      [ethereum.Value.fromAddress(owner)]
+    );
+
+    return new Gravity__getGravatarResult(
+      result[0].toString(),
+      result[1].toString()
+    );
+  }
+
+  try_getGravatar(
+    owner: Address
+  ): ethereum.CallResult<Gravity__getGravatarResult> {
+    let result = super.tryCall(
+      "getGravatar",
+      "getGravatar(address):(string,string)",
+      [ethereum.Value.fromAddress(owner)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new Gravity__getGravatarResult(value[0].toString(), value[1].toString())
+    );
+  }
+
+  gravatarToOwner(param0: BigInt): Address {
+    let result = super.call(
+      "gravatarToOwner",
+      "gravatarToOwner(uint256):(address)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return result[0].toAddress();
+  }
+
+  try_gravatarToOwner(param0: BigInt): ethereum.CallResult<Address> {
+    let result = super.tryCall(
+      "gravatarToOwner",
+      "gravatarToOwner(uint256):(address)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toAddress());
+  }
+
+  ownerToGravatar(param0: Address): BigInt {
+    let result = super.call(
+      "ownerToGravatar",
+      "ownerToGravatar(address):(uint256)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+
+    return result[0].toBigInt();
+  }
+
+  try_ownerToGravatar(param0: Address): ethereum.CallResult<BigInt> {
+    let result = super.tryCall(
+      "ownerToGravatar",
+      "ownerToGravatar(address):(uint256)",
+      [ethereum.Value.fromAddress(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(value[0].toBigInt());
+  }
+
+  gravatars(param0: BigInt): Gravity__gravatarsResult {
+    let result = super.call(
+      "gravatars",
+      "gravatars(uint256):(address,string,string)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+
+    return new Gravity__gravatarsResult(
+      result[0].toAddress(),
+      result[1].toString(),
+      result[2].toString()
+    );
+  }
+
+  try_gravatars(param0: BigInt): ethereum.CallResult<Gravity__gravatarsResult> {
+    let result = super.tryCall(
+      "gravatars",
+      "gravatars(uint256):(address,string,string)",
+      [ethereum.Value.fromUnsignedBigInt(param0)]
+    );
+    if (result.reverted) {
+      return new ethereum.CallResult();
+    }
+    let value = result.value;
+    return ethereum.CallResult.fromValue(
+      new Gravity__gravatarsResult(
+        value[0].toAddress(),
+        value[1].toString(),
+        value[2].toString()
+      )
+    );
+  }
+}
+
+export class UpdateGravatarImageCall extends ethereum.Call {
+  get inputs(): UpdateGravatarImageCall__Inputs {
+    return new UpdateGravatarImageCall__Inputs(this);
+  }
+
+  get outputs(): UpdateGravatarImageCall__Outputs {
+    return new UpdateGravatarImageCall__Outputs(this);
+  }
+}
+
+export class UpdateGravatarImageCall__Inputs {
+  _call: UpdateGravatarImageCall;
+
+  constructor(call: UpdateGravatarImageCall) {
+    this._call = call;
+  }
+
+  get _imageUrl(): string {
+    return this._call.inputValues[0].value.toString();
+  }
+}
+
+export class UpdateGravatarImageCall__Outputs {
+  _call: UpdateGravatarImageCall;
+
+  constructor(call: UpdateGravatarImageCall) {
+    this._call = call;
+  }
+}
+
+export class SetMythicalGravatarCall extends ethereum.Call {
+  get inputs(): SetMythicalGravatarCall__Inputs {
+    return new SetMythicalGravatarCall__Inputs(this);
+  }
+
+  get outputs(): SetMythicalGravatarCall__Outputs {
+    return new SetMythicalGravatarCall__Outputs(this);
+  }
+}
+
+export class SetMythicalGravatarCall__Inputs {
+  _call: SetMythicalGravatarCall;
+
+  constructor(call: SetMythicalGravatarCall) {
+    this._call = call;
+  }
+}
+
+export class SetMythicalGravatarCall__Outputs {
+  _call: SetMythicalGravatarCall;
+
+  constructor(call: SetMythicalGravatarCall) {
+    this._call = call;
+  }
+}
+
+export class UpdateGravatarNameCall extends ethereum.Call {
+  get inputs(): UpdateGravatarNameCall__Inputs {
+    return new UpdateGravatarNameCall__Inputs(this);
+  }
+
+  get outputs(): UpdateGravatarNameCall__Outputs {
+    return new UpdateGravatarNameCall__Outputs(this);
+  }
+}
+
+export class UpdateGravatarNameCall__Inputs {
+  _call: UpdateGravatarNameCall;
+
+  constructor(call: UpdateGravatarNameCall) {
+    this._call = call;
+  }
+
+  get _displayName(): string {
+    return this._call.inputValues[0].value.toString();
+  }
+}
+
+export class UpdateGravatarNameCall__Outputs {
+  _call: UpdateGravatarNameCall;
+
+  constructor(call: UpdateGravatarNameCall) {
+    this._call = call;
+  }
+}
+
+export class CreateGravatarCall extends ethereum.Call {
+  get inputs(): CreateGravatarCall__Inputs {
+    return new CreateGravatarCall__Inputs(this);
+  }
+
+  get outputs(): CreateGravatarCall__Outputs {
+    return new CreateGravatarCall__Outputs(this);
+  }
+}
+
+export class CreateGravatarCall__Inputs {
+  _call: CreateGravatarCall;
+
+  constructor(call: CreateGravatarCall) {
+    this._call = call;
+  }
+
+  get _displayName(): string {
+    return this._call.inputValues[0].value.toString();
+  }
+
+  get _imageUrl(): string {
+    return this._call.inputValues[1].value.toString();
+  }
+}
+
+export class CreateGravatarCall__Outputs {
+  _call: CreateGravatarCall;
+
+  constructor(call: CreateGravatarCall) {
+    this._call = call;
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/schema.ts
new file mode 100644
index 00000000000..2029cb57397
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/generated/schema.ts
@@ -0,0 +1,159 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class Gravatar extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save Gravatar entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type Gravatar must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("Gravatar", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): Gravatar | null {
+    return changetype<Gravatar | null>(store.get_in_block("Gravatar", id));
+  }
+
+  static load(id: string): Gravatar | null {
+    return changetype<Gravatar | null>(store.get("Gravatar", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get owner(): string {
+    let value = this.get("owner");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set owner(value: string) {
+    this.set("owner", Value.fromString(value));
+  }
+
+  get imageUrl(): string {
+    let value = this.get("imageUrl");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set imageUrl(value: string) {
+    this.set("imageUrl", Value.fromString(value));
+  }
+}
+
+export class UserAccount extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save UserAccount entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type UserAccount must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("UserAccount", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): UserAccount | null {
+    return changetype<UserAccount | null>(
+      store.get_in_block("UserAccount", id)
+    );
+  }
+
+  static load(id: string): UserAccount | null {
+    return changetype<UserAccount | null>(store.get("UserAccount", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get name(): string {
+    let value = this.get("name");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set name(value: string) {
+    this.set("name", Value.fromString(value));
+  }
+
+  get gravatars(): GravatarLoader {
+    return new GravatarLoader(
+      "UserAccount",
+      this.get("id")!.toString(),
+      "gravatars"
+    );
+  }
+}
+
+export class GravatarLoader extends Entity {
+  _entity: string;
+  _field: string;
+  _id: string;
+
+  constructor(entity: string, id: string, field: string) {
+    super();
+    this._entity = entity;
+    this._id = id;
+    this._field = field;
+  }
+
+  load(): Gravatar[] {
+    let value = store.loadRelated(this._entity, this._id, this._field);
+    return changetype<Gravatar[]>(value);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/mapping.ts b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/mapping.ts
new file mode 100644
index 00000000000..0a1bad999e7
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/mapping.ts
@@ -0,0 +1,22 @@
+import { NewGravatar, UpdatedGravatar } from '../generated/Gravity/Gravity'
+import { Gravatar } from '../generated/schema'
+
+export function handleNewGravatar(event: NewGravatar): void {
+  let gravatar = new Gravatar(event.params.id.toHex())
+  gravatar.owner = event.params.owner
+  gravatar.displayName = event.params.displayName
+  gravatar.imageUrl = event.params.imageUrl
+  gravatar.save()
+}
+
+export function handleUpdatedGravatar(event: UpdatedGravatar): void {
+  let id = event.params.id.toHex()
+  let gravatar = Gravatar.load(id)
+  if (gravatar == null) {
+    gravatar = new Gravatar(id)
+  }
+  gravatar.owner = event.params.owner
+  gravatar.displayName = event.params.displayName
+  gravatar.imageUrl = event.params.imageUrl
+  gravatar.save()
+}
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/schema.graphql b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/schema.graphql
new file mode 100644
index 00000000000..cfe420f39d1
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/schema.graphql
@@ -0,0 +1,19 @@
+type Gravatar @entity(immutable: false) {
+  id: ID!
+  # This field points at an interface; we allow that a derived field
+  # in a type that implements the interface derives from this field
+  # The test checks that this construct is accepted
+  owner: Account!
+  imageUrl: String!
+}
+
+interface Account {
+  id: ID!
+  gravatars: [Gravatar!]! @derivedFrom(field: "owner")
+}
+
+type UserAccount implements Account @entity(immutable: true) {
+  id: ID!
+  name: String!
+  gravatars: [Gravatar!]! @derivedFrom(field: "owner")
+}
diff --git a/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/subgraph.yaml
new file mode 100644
index 00000000000..04e378d590f
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/derived-from-with-interface/subgraph.yaml
@@ -0,0 +1,25 @@
+specVersion: 0.0.2
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Gravity
+    network: mainnet
+    source:
+      address: '0x2E645469f354BB4F5c8a05B3b30A929361cf77eC'
+      abi: Gravity
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      entities:
+        - Gravatar
+      abis:
+        - name: Gravity
+          file: ./Gravity.json
+      eventHandlers:
+        - event: NewGravatar(uint256,address,string,string)
+          handler: handleNewGravatar
+        - event: UpdatedGravatar(uint256,address,string,string)
+          handler: handleUpdatedGravatar
+      file: ./mapping.ts
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/Abi.json b/gnd/tests/fixtures/codegen_verification/example-values-found/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/example-values-found/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/example-values-found/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6c9108fe3db
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/example-values-found/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt,
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/example-values-found/generated/schema.ts
new file mode 100644
index 00000000000..64ee920ecd1
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/example-values-found/generated/schema.ts
@@ -0,0 +1,53 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal,
+  Int8,
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`,
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/mapping.ts b/gnd/tests/fixtures/codegen_verification/example-values-found/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/schema.graphql b/gnd/tests/fixtures/codegen_verification/example-values-found/schema.graphql
new file mode 100644
index 00000000000..d5a41952be6
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/example-values-found/schema.graphql
@@ -0,0 +1,3 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/example-values-found/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/example-values-found/subgraph.yaml
new file mode 100644
index 00000000000..8eeefd554e9
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/example-values-found/subgraph.yaml
@@ -0,0 +1,24 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/graph-tooling
+description: Gravatar for Ethereum
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      address: '22843e74c59580b3eaf6c233fa67d8b7c561a835'
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/Abi.json b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/mapping.ts b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/schema.graphql b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/schema.graphql
new file mode 100644
index 00000000000..350d9b0936a
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/schema.graphql
@@ -0,0 +1,8 @@
+type Something @entity(immutable: true) {
+  id: ID!
+}
+
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  invalidField: [Something]!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/subgraph.yaml
new file mode 100644
index 00000000000..b8f7166ae2a
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/invalid-graphql-schema/subgraph.yaml
@@ -0,0 +1,22 @@
+specVersion: 0.0.1
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      address: '22843e74c59580b3eaf6c233fa67d8b7c561a835'
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/Abi.json b/gnd/tests/fixtures/codegen_verification/no-network-names/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/schema.ts
new file mode 100644
index 00000000000..4dea4256e51
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/schema.ts
@@ -0,0 +1,52 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates.ts b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates.ts
new file mode 100644
index 00000000000..73242b4dde7
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates.ts
@@ -0,0 +1,21 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  Address,
+  DataSourceTemplate,
+  DataSourceContext
+} from "@graphprotocol/graph-ts";
+
+export class ExampleTemplate extends DataSourceTemplate {
+  static create(address: Address): void {
+    DataSourceTemplate.create("ExampleTemplate", [address.toHex()]);
+  }
+
+  static createWithContext(address: Address, context: DataSourceContext): void {
+    DataSourceTemplate.createWithContext(
+      "ExampleTemplate",
+      [address.toHex()],
+      context
+    );
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates/ExampleTemplate/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates/ExampleTemplate/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/generated/templates/ExampleTemplate/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/mapping.ts b/gnd/tests/fixtures/codegen_verification/no-network-names/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/schema.graphql b/gnd/tests/fixtures/codegen_verification/no-network-names/schema.graphql
new file mode 100644
index 00000000000..d5a41952be6
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/schema.graphql
@@ -0,0 +1,3 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/no-network-names/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/no-network-names/subgraph.yaml
new file mode 100644
index 00000000000..1812193aa94
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/no-network-names/subgraph.yaml
@@ -0,0 +1,40 @@
+specVersion: 0.0.1
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      address: '22843e74c59580b3eaf6c233fa67d8b7c561a835'
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
+templates:
+  - kind: ethereum/contract
+    name: ExampleTemplate
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/Abi.json b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6c9108fe3db
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt,
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/schema.ts
new file mode 100644
index 00000000000..4dea4256e51
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/generated/schema.ts
@@ -0,0 +1,52 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/mapping.ts b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/schema.graphql b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/schema.graphql
new file mode 100644
index 00000000000..d5a41952be6
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/schema.graphql
@@ -0,0 +1,3 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/subgraph.yaml
new file mode 100644
index 00000000000..fa916d5b6c3
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/source-without-address-is-valid/subgraph.yaml
@@ -0,0 +1,23 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/test-subgraph
+description: Test subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/Abi.json b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/Abi.json
new file mode 100644
index 00000000000..4d05f5839f8
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/Abi.json
@@ -0,0 +1,7 @@
+[
+  {
+    "type": "event",
+    "name": "ExampleEvent",
+    "inputs": [{ "type": "string" }]
+  }
+]
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/ExampleSubgraph/ExampleContract.ts b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/ExampleSubgraph/ExampleContract.ts
new file mode 100644
index 00000000000..6b59c48fbac
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/ExampleSubgraph/ExampleContract.ts
@@ -0,0 +1,35 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  ethereum,
+  JSONValue,
+  TypedMap,
+  Entity,
+  Bytes,
+  Address,
+  BigInt
+} from "@graphprotocol/graph-ts";
+
+export class ExampleEvent extends ethereum.Event {
+  get params(): ExampleEvent__Params {
+    return new ExampleEvent__Params(this);
+  }
+}
+
+export class ExampleEvent__Params {
+  _event: ExampleEvent;
+
+  constructor(event: ExampleEvent) {
+    this._event = event;
+  }
+
+  get param0(): string {
+    return this._event.parameters[0].value.toString();
+  }
+}
+
+export class ExampleContract extends ethereum.SmartContract {
+  static bind(address: Address): ExampleContract {
+    return new ExampleContract("ExampleContract", address);
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/schema.ts b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/schema.ts
new file mode 100644
index 00000000000..faf8087b1cf
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/generated/schema.ts
@@ -0,0 +1,65 @@
+// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+
+import {
+  TypedMap,
+  Entity,
+  Value,
+  ValueKind,
+  store,
+  Bytes,
+  BigInt,
+  BigDecimal
+} from "@graphprotocol/graph-ts";
+
+export class MyEntity extends Entity {
+  constructor(id: string) {
+    super();
+    this.set("id", Value.fromString(id));
+  }
+
+  save(): void {
+    let id = this.get("id");
+    assert(id != null, "Cannot save MyEntity entity without an ID");
+    if (id) {
+      assert(
+        id.kind == ValueKind.STRING,
+        `Entities of type MyEntity must have an ID of type String but the id '${id.displayData()}' is of type ${id.displayKind()}`
+      );
+      store.set("MyEntity", id.toString(), this);
+    }
+  }
+
+  static loadInBlock(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get_in_block("MyEntity", id));
+  }
+
+  static load(id: string): MyEntity | null {
+    return changetype<MyEntity | null>(store.get("MyEntity", id));
+  }
+
+  get id(): string {
+    let value = this.get("id");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toString();
+    }
+  }
+
+  set id(value: string) {
+    this.set("id", Value.fromString(value));
+  }
+
+  get x(): BigDecimal {
+    let value = this.get("x");
+    if (!value || value.kind == ValueKind.NULL) {
+      throw new Error("Cannot return null for a required field.");
+    } else {
+      return value.toBigDecimal();
+    }
+  }
+
+  set x(value: BigDecimal) {
+    this.set("x", Value.fromBigDecimal(value));
+  }
+}
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/mapping.ts b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/mapping.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/schema.graphql b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/schema.graphql
new file mode 100644
index 00000000000..1edfc3c6c18
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/schema.graphql
@@ -0,0 +1,4 @@
+type MyEntity @entity(immutable: true) {
+  id: ID!
+  x: BigDecimal!
+}
diff --git a/gnd/tests/fixtures/codegen_verification/topic0-is-valid/subgraph.yaml b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/subgraph.yaml
new file mode 100644
index 00000000000..eb8721b6280
--- /dev/null
+++ b/gnd/tests/fixtures/codegen_verification/topic0-is-valid/subgraph.yaml
@@ -0,0 +1,24 @@
+specVersion: 0.0.1
+repository: https://github.com/graphprotocol/test-subgraph
+description: Test subgraph
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: ExampleSubgraph
+    source:
+      abi: ExampleContract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.5
+      language: wasm/assemblyscript
+      file: ./mapping.ts
+      entities:
+        - ExampleEntity
+      abis:
+        - name: ExampleContract
+          file: ./Abi.json
+      eventHandlers:
+        - event: ExampleEvent(string)
+          topic0: b74a38eb2ebca56512a2bb0283f335555a4a4dac46ab998d65fd76f9027dca70
+          handler: handleExampleEvent
diff --git a/gnd/tests/fixtures/gnd_test/blocks/abis/ERC20.json b/gnd/tests/fixtures/gnd_test/blocks/abis/ERC20.json
new file mode 100644
index 00000000000..405d6b36486
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/abis/ERC20.json
@@ -0,0 +1,222 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_spender",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_from",
+        "type": "address"
+      },
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      },
+      {
+        "name": "_spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "fallback"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  }
+]
diff --git a/gnd/tests/fixtures/gnd_test/blocks/package.json b/gnd/tests/fixtures/gnd_test/blocks/package.json
new file mode 100644
index 00000000000..8f9d6327502
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "gnd-test-blocks",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.98.1",
+    "@graphprotocol/graph-ts": "0.38.2",
+    "assemblyscript": "0.19.23"
+  }
+}
diff --git a/gnd/tests/fixtures/gnd_test/blocks/schema.graphql b/gnd/tests/fixtures/gnd_test/blocks/schema.graphql
new file mode 100644
index 00000000000..53154f2b1d3
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/schema.graphql
@@ -0,0 +1,14 @@
+type Block @entity(immutable: true) {
+  id: Bytes!
+  number: BigInt!
+}
+
+type OnceBlock @entity(immutable: true) {
+  id: Bytes!
+  msg: String!
+}
+
+type PollingBlock @entity(immutable: true) {
+  id: Bytes!
+  number: BigInt!
+}
diff --git a/gnd/tests/fixtures/gnd_test/blocks/src/blocks.ts b/gnd/tests/fixtures/gnd_test/blocks/src/blocks.ts
new file mode 100644
index 00000000000..f9a271681ad
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/src/blocks.ts
@@ -0,0 +1,23 @@
+import { Bytes, ethereum, log } from "@graphprotocol/graph-ts";
+import {Block, OnceBlock, PollingBlock} from "../generated/schema";
+
+export function handleEveryBlock(block: ethereum.Block): void {
+  log.warning("Handling every block event for block number: {}", [block.number.toString()]);
+  let blockEntity = new Block(block.hash);
+  blockEntity.number = block.number;
+  blockEntity.save();
+}
+
+export function handleOnce(block: ethereum.Block): void {
+  log.warning("Handling a one-time block event for block number: {}", [block.number.toString()]);
+  let blockOnceEntity = new OnceBlock(block.hash.concat(Bytes.fromUTF8("-once")));
+  blockOnceEntity.msg = "This is a one-time block entity";
+  blockOnceEntity.save();
+}
+
+export function handlePolling(block: ethereum.Block): void {
+  log.warning("Handling a polling block event for block number: {}", [block.number.toString()]);
+  let blockEntity = new PollingBlock(block.hash);
+  blockEntity.number = block.number;
+  blockEntity.save();
+}
diff --git a/gnd/tests/fixtures/gnd_test/blocks/subgraph.yaml b/gnd/tests/fixtures/gnd_test/blocks/subgraph.yaml
new file mode 100644
index 00000000000..a5f727da28d
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/subgraph.yaml
@@ -0,0 +1,64 @@
+specVersion: 1.3.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - name: EveryBlock
+    kind: ethereum
+    network: arbitrum
+    source:
+      abi: ERC20
+      address: "0x0000000000000000000000000000000000000000"
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/blocks.ts
+      entities:
+        - Block
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      blockHandlers:
+        - handler: handleEveryBlock
+  - name: BlockOnce
+    kind: ethereum
+    network: arbitrum
+    source:
+      abi: ERC20
+      address: "0x0000000000000000000000000000000000000000"
+      startBlock: 1000
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/blocks.ts
+      entities:
+        - OnceBlock
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      blockHandlers:
+        - handler: handleOnce
+          filter:
+            kind: once
+  - name: BlockPolling
+    kind: ethereum
+    network: arbitrum
+    source:
+      abi: ERC20
+      address: "0x0000000000000000000000000000000000000000"
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/blocks.ts
+      entities:
+        - PollingBlock
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      blockHandlers:
+        - handler: handlePolling
+          filter:
+            kind: polling
+            every: 5
diff --git a/gnd/tests/fixtures/gnd_test/blocks/tests/blocks.json b/gnd/tests/fixtures/gnd_test/blocks/tests/blocks.json
new file mode 100644
index 00000000000..8065b6aa398
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/blocks/tests/blocks.json
@@ -0,0 +1,43 @@
+{
+  "name": "Example Block Handler Testing",
+  "blocks": [
+    {"number": 1000},
+    {"number": 1001},
+    {"number": 1002},
+    {"number": 1003},
+    {"number": 1004},
+    {"number": 1005}
+  ],
+  "assertions": [
+    {
+      "query": "{ blocks { number } }",
+      "expected": {
+        "blocks": [
+          {"number": "1000"},
+          {"number": "1001"},
+          {"number": "1002"},
+          {"number": "1003"},
+          {"number": "1004"},
+          {"number": "1005"}
+        ]
+      }
+    },
+    {
+      "query": "{ onceBlocks { msg } }",
+      "expected": {
+        "onceBlocks": [
+          {"msg": "This is a one-time block entity"}
+        ]
+      }
+    },
+    {
+      "query": "{ pollingBlocks { number } }",
+      "expected": {
+        "pollingBlocks": [
+          {"number":"1000"},
+          {"number": "1005"}
+        ]
+      }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/abis/FileEvents.json b/gnd/tests/fixtures/gnd_test/file-data-sources/abis/FileEvents.json
new file mode 100644
index 00000000000..8a1a3861982
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/abis/FileEvents.json
@@ -0,0 +1,28 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "cid",
+        "type": "string"
+      }
+    ],
+    "name": "IpfsFileCreated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "txId",
+        "type": "string"
+      }
+    ],
+    "name": "ArweaveFileCreated",
+    "type": "event"
+  }
+]
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/package.json b/gnd/tests/fixtures/gnd_test/file-data-sources/package.json
new file mode 100644
index 00000000000..6154ce4bee6
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "gnd-test-file-data-sources",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.98.1",
+    "@graphprotocol/graph-ts": "0.38.2",
+    "assemblyscript": "0.19.23"
+  }
+}
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/schema.graphql b/gnd/tests/fixtures/gnd_test/file-data-sources/schema.graphql
new file mode 100644
index 00000000000..1966b71c61c
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/schema.graphql
@@ -0,0 +1,9 @@
+type IpfsFile @entity {
+  id: ID!
+  content: String!
+}
+
+type ArweaveFile @entity {
+  id: ID!
+  content: String!
+}
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/src/files.ts b/gnd/tests/fixtures/gnd_test/file-data-sources/src/files.ts
new file mode 100644
index 00000000000..a5bd9ee7e7e
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/src/files.ts
@@ -0,0 +1,26 @@
+import { dataSource, Bytes } from "@graphprotocol/graph-ts";
+import {
+  IpfsFileCreated,
+  ArweaveFileCreated,
+} from "../generated/FileEvents/FileEvents";
+import { IpfsFile, ArweaveFile } from "../generated/schema";
+
+export function handleIpfsFileCreated(event: IpfsFileCreated): void {
+  dataSource.create("IpfsFile", [event.params.cid]);
+}
+
+export function handleArweaveFileCreated(event: ArweaveFileCreated): void {
+  dataSource.create("ArweaveFile", [event.params.txId]);
+}
+
+export function handleIpfsFile(data: Bytes): void {
+  let entity = new IpfsFile(dataSource.stringParam());
+  entity.content = data.toString();
+  entity.save();
+}
+
+export function handleArweaveFile(data: Bytes): void {
+  let entity = new ArweaveFile(dataSource.stringParam());
+  entity.content = data.toString();
+  entity.save();
+}
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/subgraph.yaml b/gnd/tests/fixtures/gnd_test/file-data-sources/subgraph.yaml
new file mode 100644
index 00000000000..3a898f9f8d6
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/subgraph.yaml
@@ -0,0 +1,53 @@
+specVersion: 1.3.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - name: FileEvents
+    kind: ethereum/contract
+    network: arbitrum
+    source:
+      abi: FileEvents
+      address: "0x0000000000000000000000000000000000000002"
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/files.ts
+      entities:
+        - IpfsFile
+        - ArweaveFile
+      abis:
+        - name: FileEvents
+          file: ./abis/FileEvents.json
+      eventHandlers:
+        - event: IpfsFileCreated(string)
+          handler: handleIpfsFileCreated
+        - event: ArweaveFileCreated(string)
+          handler: handleArweaveFileCreated
+templates:
+  - name: IpfsFile
+    kind: file/ipfs
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/files.ts
+      entities:
+        - IpfsFile
+      abis:
+        - name: FileEvents
+          file: ./abis/FileEvents.json
+      handler: handleIpfsFile
+  - name: ArweaveFile
+    kind: file/arweave
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/files.ts
+      entities:
+        - ArweaveFile
+      abis:
+        - name: FileEvents
+          file: ./abis/FileEvents.json
+      handler: handleArweaveFile
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_arweave.json b/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_arweave.json
new file mode 100644
index 00000000000..708ca1a5865
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_arweave.json
@@ -0,0 +1,36 @@
+{
+  "name": "Arweave file data source creates entity from fetched content",
+  "arweaveFiles": [
+    {
+      "txId": "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8",
+      "content": "Hello from Arweave"
+    }
+  ],
+  "blocks": [
+    {
+      "events": [
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "event": "ArweaveFileCreated(string txId)",
+          "params": {
+            "txId": "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8"
+          }
+        }
+      ]
+    },
+    {}
+  ],
+  "assertions": [
+    {
+      "query": "{ arweaveFiles { id content } }",
+      "expected": {
+        "arweaveFiles": [
+          {
+            "id": "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8",
+            "content": "Hello from Arweave"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_ipfs.json b/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_ipfs.json
new file mode 100644
index 00000000000..8fee92571b4
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/file-data-sources/tests/file_ipfs.json
@@ -0,0 +1,36 @@
+{
+  "name": "IPFS file data source creates entity from fetched content",
+  "files": [
+    {
+      "cid": "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG",
+      "content": "Hello from IPFS"
+    }
+  ],
+  "blocks": [
+    {
+      "events": [
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "event": "IpfsFileCreated(string cid)",
+          "params": {
+            "cid": "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG"
+          }
+        }
+      ]
+    },
+    {}
+  ],
+  "assertions": [
+    {
+      "query": "{ ipfsFiles { id content } }",
+      "expected": {
+        "ipfsFiles": [
+          {
+            "id": "QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG",
+            "content": "Hello from IPFS"
+          }
+        ]
+      }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/receipts/abis/ERC20.json b/gnd/tests/fixtures/gnd_test/receipts/abis/ERC20.json
new file mode 100644
index 00000000000..405d6b36486
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/abis/ERC20.json
@@ -0,0 +1,222 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_spender",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_from",
+        "type": "address"
+      },
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      },
+      {
+        "name": "_spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "fallback"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  }
+]
diff --git a/gnd/tests/fixtures/gnd_test/receipts/package.json b/gnd/tests/fixtures/gnd_test/receipts/package.json
new file mode 100644
index 00000000000..c04018dd36c
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "gnd-test-receipts",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.98.1",
+    "@graphprotocol/graph-ts": "0.38.2",
+    "assemblyscript": "0.19.23"
+  }
+}
diff --git a/gnd/tests/fixtures/gnd_test/receipts/schema.graphql b/gnd/tests/fixtures/gnd_test/receipts/schema.graphql
new file mode 100644
index 00000000000..009205bf890
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/schema.graphql
@@ -0,0 +1,13 @@
+type Transfer @entity(immutable: true) {
+  id: Bytes!
+  from: Bytes!
+  to: Bytes!
+  value: BigInt!
+}
+
+type Approval @entity(immutable: true) {
+  id: Bytes!
+  owner: Bytes!
+  spender: Bytes!
+  value: BigInt!
+}
diff --git a/gnd/tests/fixtures/gnd_test/receipts/src/receipts.ts b/gnd/tests/fixtures/gnd_test/receipts/src/receipts.ts
new file mode 100644
index 00000000000..3a7934c6d55
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/src/receipts.ts
@@ -0,0 +1,40 @@
+import { Transfer as TransferEvent } from '../generated/Receipts/ERC20'
+import { Transfer, Approval } from '../generated/schema'
+import { Bytes, ethereum, log } from "@graphprotocol/graph-ts";
+
+const APPROVAL_TOPIC0 = "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"
+
+export function handleEventsWithReceipts(event: TransferEvent): void {
+  let receipt = event.receipt;
+
+  if (!receipt) {
+    log.error("No receipt found for transaction {}", [event.transaction.hash.toHexString()]);
+    return;
+  }
+
+  // iterate over the logs in the receipt and find the Approval event
+  for (let i = 0; i < receipt.logs.length; i++) {
+    let logEntry = receipt.logs[i];
+
+    if (logEntry.topics[0].toHexString() == APPROVAL_TOPIC0) {
+      let approval = new Approval(event.transaction.hash);
+      // trim the padding from the topics to get the actual address
+      approval.owner = changetype<Bytes>(logEntry.topics[1].subarray(12, 32));
+      approval.spender = changetype<Bytes>(logEntry.topics[2].subarray(12, 32));
+      let data = ethereum.decode("uint256", logEntry.data);
+      if (data) {
+        approval.value = data.toBigInt();
+      } else {
+        log.error("Failed to decode approval value for transaction {}", [event.transaction.hash.toHexString()]);
+        return;
+      }
+      approval.save();
+    }
+  }
+
+  let transfer = new Transfer(event.transaction.hash);
+  transfer.from = event.params.from;
+  transfer.to = event.params.to;
+  transfer.value = event.params.value;
+  transfer.save();
+}
diff --git a/gnd/tests/fixtures/gnd_test/receipts/subgraph.yaml b/gnd/tests/fixtures/gnd_test/receipts/subgraph.yaml
new file mode 100644
index 00000000000..5913550c427
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/subgraph.yaml
@@ -0,0 +1,25 @@
+specVersion: 1.3.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - name: Receipts
+    kind: ethereum/contract
+    network: arbitrum
+    source:
+      abi: ERC20
+      address: "0x000000000000000000000000000000000000000a"
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/receipts.ts
+      entities:
+        - Transfer
+        - Approval
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      eventHandlers:
+        - event: Transfer(indexed address,indexed address,uint256)
+          handler: handleEventsWithReceipts
+          receipt: true
diff --git a/gnd/tests/fixtures/gnd_test/receipts/tests/receipts.json b/gnd/tests/fixtures/gnd_test/receipts/tests/receipts.json
new file mode 100644
index 00000000000..67388f6faa8
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/receipts/tests/receipts.json
@@ -0,0 +1,39 @@
+{
+  "name": "Test events and eth_call mocking",
+  "blocks": [
+    {
+      "events": [
+        {
+          "address": "0x000000000000000000000000000000000000000a",
+          "event": "Approval(address indexed owner, address indexed spender, uint256 value)",
+          "params": {
+            "owner": "0xaaaa000000000000000000000000000000000000",
+            "spender": "0xbbbb000000000000000000000000000000000000",
+            "value": "1000000000000000000"
+          },
+          "txHash": "0xdeadbeef00000000000000000000000000000000000000000000000000000000"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000000a",
+          "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+          "params": {
+            "from": "0xbbbb000000000000000000000000000000000000",
+            "to": "0xcccc000000000000000000000000000000000000",
+            "value": "1000000000000000000"
+          },
+          "txHash": "0xdeadbeef00000000000000000000000000000000000000000000000000000000"
+        }
+      ]
+    }
+  ],
+  "assertions": [
+    {
+      "query": "{ transfers { id from to value } }",
+      "expected": { "transfers": [ { "id": "0xdeadbeef00000000000000000000000000000000000000000000000000000000", "from": "0xbbbb000000000000000000000000000000000000", "to": "0xcccc000000000000000000000000000000000000", "value": "1000000000000000000"} ] }
+    },
+    {
+      "query": "{ approvals {id owner spender value } }",
+      "expected": { "approvals": [ { "id": "0xdeadbeef00000000000000000000000000000000000000000000000000000000", "owner": "0xaaaa000000000000000000000000000000000000", "spender": "0xbbbb000000000000000000000000000000000000", "value": "1000000000000000000" } ] }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/abis/ERC20.json b/gnd/tests/fixtures/gnd_test/token/abis/ERC20.json
new file mode 100644
index 00000000000..405d6b36486
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/abis/ERC20.json
@@ -0,0 +1,222 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_spender",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_from",
+        "type": "address"
+      },
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "name": "_value",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      },
+      {
+        "name": "_spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "fallback"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  }
+]
diff --git a/gnd/tests/fixtures/gnd_test/token/abis/TokenFactory.json b/gnd/tests/fixtures/gnd_test/token/abis/TokenFactory.json
new file mode 100644
index 00000000000..d23f24c8ae2
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/abis/TokenFactory.json
@@ -0,0 +1,28 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "addr",
+        "type": "address"
+      }
+    ],
+    "name": "FactoryTokenCreated",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "addr",
+        "type": "address"
+      }
+    ],
+    "name": "createToken",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
diff --git a/gnd/tests/fixtures/gnd_test/token/package.json b/gnd/tests/fixtures/gnd_test/token/package.json
new file mode 100644
index 00000000000..69ecc1c9311
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "gnd-test-token",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.98.1",
+    "@graphprotocol/graph-ts": "0.38.2",
+    "assemblyscript": "0.19.23"
+  }
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/schema.graphql b/gnd/tests/fixtures/gnd_test/token/schema.graphql
new file mode 100644
index 00000000000..4f4885fe848
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/schema.graphql
@@ -0,0 +1,18 @@
+type Token @entity(immutable: true) {
+  id: Bytes! # Address
+  name: String!
+  symbol: String!
+  decimals: Int!
+}
+
+type Account @entity(immutable: false) {
+  id: Bytes! # Address
+  balances: [Balance!]! @derivedFrom(field: "account")
+}
+
+type Balance @entity(immutable: false) {
+  id: Bytes! # Account address + token address
+  token: Token!
+  account: Account!
+  amount: BigInt
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/src/factory.ts b/gnd/tests/fixtures/gnd_test/token/src/factory.ts
new file mode 100644
index 00000000000..9b00e6a0b74
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/src/factory.ts
@@ -0,0 +1,21 @@
+import { FactoryTokenCreated } from '../generated/Factory/TokenFactory'
+import { Token } from '../generated/schema'
+import { FactoryToken } from '../generated/templates';
+import { ERC20 } from '../generated/templates/FactoryToken/ERC20';
+
+export function handleTokenCreated(event: FactoryTokenCreated): void {
+  FactoryToken.create(event.params.addr);
+  let token = new Token(event.params.addr);
+
+  // Try to fetch token details using ERC20 interface
+  let erc20 = ERC20.bind(event.params.addr);
+  let nameResult = erc20.try_name();
+  let symbolResult = erc20.try_symbol();
+  let decimalsResult = erc20.try_decimals();
+
+  // If the calls revert, we can set default values
+  token.name = nameResult.reverted ? "Unknown" : nameResult.value;
+  token.symbol = symbolResult.reverted ? "Unknown" : symbolResult.value;
+  token.decimals = decimalsResult.reverted ? 18 : decimalsResult.value;
+  token.save();
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/src/token.ts b/gnd/tests/fixtures/gnd_test/token/src/token.ts
new file mode 100644
index 00000000000..21b09f43de6
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/src/token.ts
@@ -0,0 +1,86 @@
+import { Transfer } from '../generated/StandardToken/ERC20'
+import { Token, Account, Balance } from '../generated/schema'
+import { ERC20 } from '../generated/StandardToken/ERC20';
+import { log } from "@graphprotocol/graph-ts";
+
+export function handleTransfer(event: Transfer): void {
+  let token = Token.load(event.address);
+  let from = Account.load(event.params.from);
+  let to = Account.load(event.params.to);
+  let balanceFrom = Balance.load(event.params.from.concat(event.address));
+  let balanceTo = Balance.load(event.params.to.concat(event.address));
+
+  let erc20 = ERC20.bind(event.address);
+
+  if (!token) {
+    token = new Token(event.address);
+
+    // Try to fetch token details using ERC20 interface
+    let nameResult = erc20.try_name();
+    let symbolResult = erc20.try_symbol();
+    let decimalsResult = erc20.try_decimals();
+
+    // If the calls revert, we can set default values
+    token.name = nameResult.reverted ? "Unknown" : nameResult.value;
+    token.symbol = symbolResult.reverted ? "Unknown" : symbolResult.value;
+    token.decimals = decimalsResult.reverted ? 18 : decimalsResult.value;
+    token.save();
+  }
+
+  if (!from) {
+    from = new Account(event.params.from);
+    from.save();
+  }
+
+  if (!to) {
+    to = new Account(event.params.to);
+    to.save();
+  }
+
+  if (!balanceFrom) {
+    log.warning("Balance for account {} and token {} does not exist. Creating new balance entity.", [event.params.from.toHexString(), event.address.toHexString()]);
+    balanceFrom = new Balance(event.params.from.concat(event.address));
+    balanceFrom.account = event.params.from;
+    balanceFrom.token = event.address;
+    let balanceFromResult = erc20.try_balanceOf(event.params.from);
+    balanceFrom.amount = balanceFromResult.reverted ? null : balanceFromResult.value;
+  } else {
+    log.warning("Balance for account {} and token {} already exists. Updating balance based on transfer value.", [event.params.from.toHexString(), event.address.toHexString()]);
+    // If the balance already exists, we need to update it based on the transfer value
+    // We will fetch the current balance and then update it after the transfer
+    let currentBalance = balanceFrom.amount;
+
+    if (currentBalance) {
+      let newBalance = currentBalance.minus(event.params.value);
+      balanceFrom.amount = newBalance;
+    } else {
+      // Try to fetch the balance if it was not previously set
+      let balanceFromResult = erc20.try_balanceOf(event.params.from);
+      balanceFrom.amount = balanceFromResult.reverted ? null : balanceFromResult.value;
+    }
+  }
+
+  if (!balanceTo) {
+    balanceTo = new Balance(event.params.to.concat(event.address));
+    balanceTo.account = event.params.to;
+    balanceTo.token = event.address;
+    let balanceToResult = erc20.try_balanceOf(event.params.to);
+    balanceTo.amount = balanceToResult.reverted ? null : balanceToResult.value;
+  } else {
+    // If the balance already exists, we need to update it based on the transfer value
+    // We will fetch the current balance and then update it after the transfer
+    let currentBalance = balanceTo.amount;
+
+    if (currentBalance) {
+      let newBalance = currentBalance.plus(event.params.value);
+      balanceTo.amount = newBalance;
+    } else {
+      // Try to fetch the balance if it was not previously set
+      let balanceToResult = erc20.try_balanceOf(event.params.to);
+      balanceTo.amount = balanceToResult.reverted ? null : balanceToResult.value;
+    }
+  }
+
+  balanceFrom.save();
+  balanceTo.save();
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/subgraph.yaml b/gnd/tests/fixtures/gnd_test/token/subgraph.yaml
new file mode 100644
index 00000000000..081b071704b
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/subgraph.yaml
@@ -0,0 +1,68 @@
+specVersion: 1.3.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - name: StandardToken
+    kind: ethereum/contract
+    network: arbitrum
+    source:
+      abi: ERC20
+      address: "0x9623063377AD1B27544C965cCd7342f7EA7e88C7"
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/token.ts
+      entities:
+        - Token
+        - Account
+        - Balance
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      eventHandlers:
+        - event: Transfer(indexed address,indexed address,uint256)
+          handler: handleTransfer
+  - name: Factory
+    kind: ethereum/contract
+    network: arbitrum
+    source:
+      abi: TokenFactory
+      address: "0x0000000000000000000000000000000000000001"
+      startBlock: 2000
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/factory.ts
+      entities:
+        - Token
+      abis:
+        - name: TokenFactory
+          file: ./abis/TokenFactory.json
+        - name: ERC20
+          file: ./abis/ERC20.json
+      eventHandlers:
+        - event: FactoryTokenCreated(indexed address)
+          handler: handleTokenCreated
+templates:
+  - name: FactoryToken
+    kind: ethereum/contract
+    network: arbitrum
+    source:
+      abi: ERC20
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.9
+      language: wasm/assemblyscript
+      file: ./src/token.ts
+      entities:
+        - Token
+        - Account
+        - Balance
+      abis:
+        - name: ERC20
+          file: ./abis/ERC20.json
+      eventHandlers:
+        - event: Transfer(indexed address,indexed address,uint256)
+          handler: handleTransfer
diff --git a/gnd/tests/fixtures/gnd_test/token/tests/failing.json b/gnd/tests/fixtures/gnd_test/token/tests/failing.json
new file mode 100644
index 00000000000..e9970588221
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/tests/failing.json
@@ -0,0 +1,12 @@
+{
+  "name": "Deliberately failing test (wrong expected value)",
+  "blocks": [
+    {}
+  ],
+  "assertions": [
+    {
+      "query": "{ tokens { id name symbol } }",
+      "expected": { "tokens": [ { "id": "0x731a10897d267e19b34503ad902d0a29173ba4b1", "name": "TheGraph", "symbol": "GRT" } ] }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/tests/templates.json b/gnd/tests/fixtures/gnd_test/token/tests/templates.json
new file mode 100644
index 00000000000..dc78dfc4c28
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/tests/templates.json
@@ -0,0 +1,80 @@
+{
+  "name": "Test dynamic datasources support",
+  "blocks": [
+    {
+      "number": 2001,
+      "events": [
+        {
+          "address": "0x0000000000000000000000000000000000000001",
+          "event": "FactoryTokenCreated(address indexed addr)",
+          "params": {
+            "addr": "0x0000000000000000000000000000000000000002"
+          }
+        }
+      ],
+      "ethCalls": [
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "function": "symbol()(string)",
+          "params": [],
+          "returns": ["FT1"]
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "function": "name()(string)",
+          "params": [],
+          "returns": ["FactoryToken1"]
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "function": "decimals()(uint8)",
+          "params": [],
+          "returns": ["18"]
+        }
+      ]
+    },
+    {
+      "number": 2002,
+      "events": [
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+          "params": {
+            "from": "0xaaaa000000000000000000000000000000000000",
+            "to": "0xbbbb000000000000000000000000000000000000",
+            "value": "1000000000000000000"
+          }
+        }
+      ],
+      "ethCalls": [
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "function": "balanceOf(address)(uint256)",
+          "params": ["0xaaaa000000000000000000000000000000000000"],
+          "returns": ["3000000000000000000"]
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000002",
+          "function": "balanceOf(address)(uint256)",
+          "params": ["0xbbbb000000000000000000000000000000000000"],
+          "returns": ["5000000000000000000"]
+        }
+      ]
+    }
+  ],
+  "assertions": [
+    {
+      "query": "{ tokens { id name symbol decimals } }",
+      "expected": { "tokens": [ { "id": "0x0000000000000000000000000000000000000002", "name": "FactoryToken1", "symbol": "FT1", "decimals": 18 } ] }
+    },
+    {
+      "query": "{ accounts { id balances { token { symbol } amount } } }",
+      "expected": {
+        "accounts": [
+          {"id": "0xbbbb000000000000000000000000000000000000", "balances": [{"token": { "symbol": "FT1" }, "amount": "5000000000000000000"}]},
+          {"id": "0xaaaa000000000000000000000000000000000000", "balances": [{"token": { "symbol": "FT1" }, "amount": "3000000000000000000"}]}
+        ]
+      }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/gnd_test/token/tests/transfer.json b/gnd/tests/fixtures/gnd_test/token/tests/transfer.json
new file mode 100644
index 00000000000..d8693d89590
--- /dev/null
+++ b/gnd/tests/fixtures/gnd_test/token/tests/transfer.json
@@ -0,0 +1,65 @@
+{
+  "name": "Test events and eth_call mocking",
+  "blocks": [
+    {
+      "events": [
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "event": "Transfer(address indexed from, address indexed to, uint256 value)",
+          "params": {
+            "from": "0xaaaa000000000000000000000000000000000000",
+            "to": "0xbbbb000000000000000000000000000000000000",
+            "value": "1000000000000000000"
+          }
+        }
+      ],
+      "ethCalls": [
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "function": "symbol()(string)",
+          "params": [],
+          "returns": ["GRT"]
+        },
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "function": "name()(string)",
+          "params": [],
+          "returns": ["TheGraph"]
+        },
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "function": "decimals()(uint8)",
+          "params": [],
+          "returns": ["18"]
+        },
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "function": "balanceOf(address)(uint256)",
+          "params": ["0xaaaa000000000000000000000000000000000000"],
+          "returns": ["3000000000000000000"]
+        },
+        {
+          "address": "0x9623063377AD1B27544C965cCd7342f7EA7e88C7",
+          "function": "balanceOf(address)(uint256)",
+          "params": ["0xbbbb000000000000000000000000000000000000"],
+          "returns": ["5000000000000000000"]
+        }
+      ]
+    }
+  ],
+  "assertions": [
+    {
+      "query": "{ tokens { id name symbol decimals } }",
+      "expected": { "tokens": [ { "id": "0x9623063377ad1b27544c965ccd7342f7ea7e88c7", "name": "TheGraph", "symbol": "GRT", "decimals": 18 } ] }
+    },
+    {
+      "query": "{ accounts { id balances { token { symbol } amount } } }",
+      "expected": {
+        "accounts": [
+          {"id": "0xbbbb000000000000000000000000000000000000", "balances": [{"token": { "symbol": "GRT" }, "amount": "5000000000000000000"}]},
+          {"id": "0xaaaa000000000000000000000000000000000000", "balances": [{"token": { "symbol": "GRT" }, "amount": "3000000000000000000"}]}
+        ]
+      }
+    }
+  ]
+}
diff --git a/gnd/tests/fixtures/regenerate.sh b/gnd/tests/fixtures/regenerate.sh
new file mode 100755
index 00000000000..c423342b42c
--- /dev/null
+++ b/gnd/tests/fixtures/regenerate.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+#
+# Regenerate codegen fixtures using graph-cli.
+#
+# This script regenerates the `generated/` directories in the codegen_verification
+# fixtures using the `graph` CLI. Run this when you need to update the expected
+# output after changes to graph-cli codegen.
+#
+# Prerequisites:
+#   - graph CLI must be installed (`pnpm install -g @graphprotocol/graph-cli`)
+#   - Or use npx: GRAPH_CMD="npx graph" ./regenerate.sh
+#
+# Usage:
+#   ./regenerate.sh              # Regenerate all fixtures
+#   ./regenerate.sh fixture-name # Regenerate specific fixture
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+FIXTURES_DIR="$SCRIPT_DIR/codegen_verification"
+
+# Allow overriding the graph command (e.g., GRAPH_CMD="npx graph")
+GRAPH_CMD="${GRAPH_CMD:-graph}"
+
+FIXTURES=(
+    "2d-array-is-valid"
+    "3d-array-is-valid"
+    "big-decimal-is-valid"
+    "block-handler-filters"
+    "call-handler-with-tuple"
+    "derived-from-with-interface"
+    "example-values-found"
+    "invalid-graphql-schema"
+    "no-network-names"
+    "source-without-address-is-valid"
+    "topic0-is-valid"
+)
+
+# Check if graph CLI is available
+if ! command -v $GRAPH_CMD &> /dev/null; then
+    echo "Error: '$GRAPH_CMD' command not found."
+    echo ""
+    echo "Install graph-cli with one of these methods:"
+    echo "  pnpm install -g @graphprotocol/graph-cli"
+    echo "  npm install -g @graphprotocol/graph-cli"
+    echo ""
+    echo "Or use npx to run without installing:"
+    echo "  GRAPH_CMD=\"npx graph\" $0"
+    exit 1
+fi
+
+regenerate_fixture() {
+    local fixture="$1"
+    local fixture_path="$FIXTURES_DIR/$fixture"
+
+    if [[ ! -d "$fixture_path" ]]; then
+        echo "Error: Fixture directory not found: $fixture_path"
+        return 1
+    fi
+
+    echo "Regenerating: $fixture"
+
+    # Remove existing generated directory
+    rm -rf "$fixture_path/generated"
+
+    # Run graph codegen
+    pushd "$fixture_path" > /dev/null
+    if $GRAPH_CMD codegen --skip-migrations 2>/dev/null; then
+        echo "  OK"
+    else
+        echo "  FAILED (this may be expected for invalid fixtures)"
+    fi
+    popd > /dev/null
+}
+
+if [[ $# -gt 0 ]]; then
+    # Regenerate specific fixture(s)
+    for fixture in "$@"; do
+        regenerate_fixture "$fixture"
+    done
+else
+    # Regenerate all fixtures
+    echo "Regenerating all codegen fixtures..."
+    echo ""
+    for fixture in "${FIXTURES[@]}"; do
+        regenerate_fixture "$fixture"
+    done
+    echo ""
+    echo "Done! Review changes with: git diff gnd/tests/fixtures/"
+fi
diff --git a/gnd/tests/gnd_test.rs b/gnd/tests/gnd_test.rs
new file mode 100644
index 00000000000..74f9d4ce522
--- /dev/null
+++ b/gnd/tests/gnd_test.rs
@@ -0,0 +1,276 @@
+//! Integration tests for `gnd test` — the mock-based subgraph test runner.
+//!
+//! Each fixture under `tests/fixtures/gnd_test/` covers one focused area:
+//!
+//! - `token/`             — ERC20 event handling, eth_call mocking, dynamic templates
+//! - `blocks/`            — Block handlers (`every`, `once`, `polling` filters)
+//! - `receipts/`          — Transaction receipts (`receipt: true` handlers)
+//! - `file-data-sources/` — IPFS and Arweave file data sources
+//!
+//! # Prerequisites
+//!
+//! - Build the gnd binary: `cargo build -p gnd`
+//! - AssemblyScript compiler (`asc`) in PATH or local `node_modules/.bin`
+//! - pnpm available for dependency installation
+//!
+//! # Running
+//!
+//! ```bash
+//! just test-gnd-test
+//! ```
+//!
+//! Tests run with `--test-threads=1` to avoid races when sharing a Postgres
+//! instance via `--postgres-url` (CI). With pgtemp (default) each test gets
+//! its own isolated database, but serial execution keeps things simple.
+
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use tempfile::TempDir;
+use walkdir::WalkDir;
+
+// ============================================================================
+// Shared helpers
+// ============================================================================
+
+fn fixtures_root() -> PathBuf {
+    PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+        .join("tests")
+        .join("fixtures")
+        .join("gnd_test")
+}
+
+/// Copy a named fixture into a fresh temp directory, install pnpm dependencies,
+/// and run `gnd codegen`. Returns the temp dir handle (to keep it alive) and
+/// the path to the prepared subgraph directory.
+fn setup_fixture(name: &str) -> (TempDir, PathBuf) {
+    let temp_dir = TempDir::new().expect("Failed to create temp directory");
+    let subgraph_dir = temp_dir.path().join(name);
+    fs::create_dir_all(&subgraph_dir).unwrap();
+
+    let fixture = fixtures_root().join(name);
+    assert!(
+        fixture.exists(),
+        "Fixture '{}' not found at {}",
+        name,
+        fixture.display()
+    );
+
+    copy_dir_recursive(&fixture, &subgraph_dir).expect("Failed to copy fixture to temp directory");
+
+    let npm_output = Command::new("pnpm")
+        .arg("install")
+        .current_dir(&subgraph_dir)
+        .output()
+        .expect("Failed to run `pnpm install`. Is pnpm available?");
+
+    assert!(
+        npm_output.status.success(),
+        "pnpm install failed in fixture '{}':\nstdout: {}\nstderr: {}",
+        name,
+        String::from_utf8_lossy(&npm_output.stdout),
+        String::from_utf8_lossy(&npm_output.stderr),
+    );
+
+    verify_asc_available(&subgraph_dir);
+
+    let gnd = verify_gnd_binary();
+    let codegen_output = Command::new(&gnd)
+        .args(["codegen", "--skip-migrations"])
+        .current_dir(&subgraph_dir)
+        .output()
+        .expect("Failed to run `gnd codegen`");
+
+    assert!(
+        codegen_output.status.success(),
+        "gnd codegen failed in fixture '{}':\nstdout: {}\nstderr: {}",
+        name,
+        String::from_utf8_lossy(&codegen_output.stdout),
+        String::from_utf8_lossy(&codegen_output.stderr),
+    );
+
+    (temp_dir, subgraph_dir)
+}
+
+fn gnd_binary_path() -> PathBuf {
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    PathBuf::from(manifest_dir)
+        .parent()
+        .unwrap()
+        .join("target")
+        .join("debug")
+        .join("gnd")
+}
+
+fn verify_gnd_binary() -> PathBuf {
+    let gnd_path = gnd_binary_path();
+    assert!(
+        gnd_path.exists(),
+        "gnd binary not found at {}. Run `cargo build -p gnd` first.",
+        gnd_path.display()
+    );
+    gnd_path
+}
+
+fn verify_asc_available(subgraph_dir: &Path) {
+    assert!(
+        gnd::compiler::find_asc_binary(subgraph_dir).is_some(),
+        "asc compiler not found globally or in {}/node_modules/.bin. \
+         Install it with: npm install -g assemblyscript@0.19.23",
+        subgraph_dir.display()
+    );
+}
+
+fn copy_dir_recursive(src: &Path, dst: &Path) -> std::io::Result<()> {
+    for entry in WalkDir::new(src).min_depth(1) {
+        let entry = entry?;
+        let relative_path = entry.path().strip_prefix(src).unwrap();
+        let dest_path = dst.join(relative_path);
+
+        if entry.file_type().is_dir() {
+            fs::create_dir_all(&dest_path)?;
+        } else {
+            fs::copy(entry.path(), &dest_path)?;
+        }
+    }
+    Ok(())
+}
+
+fn run_gnd_test(args: &[&str], cwd: &Path) -> std::process::Output {
+    let gnd = verify_gnd_binary();
+    let mut cmd = Command::new(&gnd);
+    cmd.arg("test");
+
+    // When a database URL is provided via env var (e.g. in CI), pass it through
+    // to skip pgtemp which may not be available.
+    if let Ok(db_url) = std::env::var("THEGRAPH_STORE_POSTGRES_DIESEL_URL") {
+        cmd.arg("--postgres-url").arg(db_url);
+    }
+
+    cmd.args(args)
+        .current_dir(cwd)
+        .output()
+        .expect("Failed to execute gnd test")
+}
+
+// ============================================================================
+// token — ERC20 events, eth_call mocking, dynamic templates
+// ============================================================================
+
+#[test]
+fn test_token_transfer() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("token");
+
+    let output = run_gnd_test(&["tests/transfer.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for token fixture\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+#[test]
+fn test_templates() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("token");
+
+    let output = run_gnd_test(&["tests/templates.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for token fixture\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+/// Verifies that `gnd test` exits with a non-zero code when an assertion fails.
+#[test]
+fn test_token_failing_assertion() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("token");
+
+    let output = run_gnd_test(&["tests/failing.json"], &subgraph_dir);
+
+    assert!(
+        !output.status.success(),
+        "gnd test should have failed for failing.json but exited with code 0\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+// ============================================================================
+// blocks — block handlers with every/once/polling filters
+// ============================================================================
+
+#[test]
+fn test_blocks() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("blocks");
+
+    let output = run_gnd_test(&["tests/blocks.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for blocks fixture\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+// ============================================================================
+// receipts — receipt: true event handlers
+// ============================================================================
+
+#[test]
+fn test_receipts() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("receipts");
+
+    let output = run_gnd_test(&["tests/receipts.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for receipts fixture\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+// ============================================================================
+// file-data-sources — IPFS and Arweave file data sources
+// ============================================================================
+
+/// Verifies that an event handler can spawn a `file/ipfs` data source, the mock
+/// IPFS client serves the pre-loaded content, and the file handler writes an
+/// entity whose content matches the mocked bytes.
+#[test]
+fn test_file_ipfs() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("file-data-sources");
+
+    let output = run_gnd_test(&["tests/file_ipfs.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for file_ipfs.json\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
+
+/// Verifies that an event handler can spawn a `file/arweave` data source, the
+/// mock Arweave resolver serves the pre-loaded content, and the file handler
+/// writes an entity whose content matches the mocked bytes.
+#[test]
+fn test_file_arweave() {
+    let (_temp_dir, subgraph_dir) = setup_fixture("file-data-sources");
+
+    let output = run_gnd_test(&["tests/file_arweave.json"], &subgraph_dir);
+
+    assert!(
+        output.status.success(),
+        "gnd test failed for file_arweave.json\nstdout: {}\nstderr: {}",
+        String::from_utf8_lossy(&output.stdout),
+        String::from_utf8_lossy(&output.stderr),
+    );
+}
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
index 4b53cbee452..13364f1a9fd 100644
--- a/graph/Cargo.toml
+++ b/graph/Cargo.toml
@@ -5,11 +5,11 @@ edition.workspace = true
 
 [dependencies]
 alloy = { workspace = true }
-base64 = "=0.21.7"
+base64 = "=0.22.1"
 anyhow = "1.0"
 async-trait = { workspace = true }
 async-stream = "0.3"
-atomic_refcell = "0.1.13"
+atomic_refcell = "0.1.14"
 # We require this precise version of bigdecimal. Updating to later versions
 # has caused PoI differences; if you update this version, you will need to
 # make sure that it does not cause PoI changes
@@ -18,17 +18,16 @@ old_bigdecimal = { version = "=0.1.2", features = [
 ], package = "bigdecimal" }
 bytes = "1.0.1"
 bs58 = { workspace = true }
-cid = "0.11.1"
-derivative = { workspace = true }
+cid = "0.11.3"
+derive_more = { workspace = true, features = ["debug"] }
 graph_derive = { path = "./derive" }
 diesel = { workspace = true }
 diesel_derives = { workspace = true }
-chrono = "0.4.43"
+chrono = "0.4.44"
 envconfig = { workspace = true }
 Inflector = "0.11.3"
-atty = "0.2"
-reqwest = { version = "0.12.23", features = ["json", "stream", "multipart"] }
-ethabi = "17.2"
+reqwest = { version = "0.12.23", features = ["json", "stream", "multipart", "gzip", "brotli", "deflate"] }
+rustls = { workspace = true }
 hex = "0.4.3"
 http0 = { version = "0", package = "http" }
 http = "1"
@@ -38,38 +37,37 @@ hyper-util = { version = "0.1", features = ["full"] }
 futures01 = { package = "futures", version = "0.1.31" }
 lru_time_cache = "0.11"
 graphql-tools = { workspace = true }
-lazy_static = "1.5.0"
+lazy_static = { workspace = true }
 num-bigint = { version = "=0.2.6", features = ["serde"] }
 num-integer = { version = "=0.1.46" }
 num-traits = "=0.2.19"
 rand.workspace = true
 redis = { workspace = true }
-regex = "1.5.4"
-semver = { version = "1.0.27", features = ["serde"] }
+regex = { workspace = true }
+semver = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
 serde_regex = { workspace = true }
 serde_yaml = { workspace = true }
-sha2 = "0.10.9"
+sha2 = "0.11.0"
 slog = { workspace = true }
 sqlparser = { workspace = true }
 # TODO: This should be reverted to the latest version once it's published
 # stable-hash_legacy = { version = "0.3.3", package = "stable-hash" }
 # stable-hash = { version = "0.4.2" }
-stable-hash = { git = "https://github.com/graphprotocol/stable-hash", branch = "main" }
-stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }
-strum_macros = "0.27.2"
+stable-hash = { git = "https://github.com/graphprotocol/stable-hash", rev = "70300f974e61529675aef3f20803f26a23f0e0ea" }
+stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", rev = "42b85d936c6b9f1b7a4b8385d2f081d5564daa69", package = "stable-hash" }
+strum_macros = "0.28.0"
 slog-async = "2.5.0"
 slog-envlogger = "2.1.0"
 slog-term = "2.7.0"
 petgraph = "0.8.3"
-tiny-keccak = "1.5.0"
 tokio = { workspace = true}
 tokio-stream = { workspace = true }
 tokio-retry = { workspace = true }
-toml = "0.9.11"
-url = "2.5.8"
+toml = "1.1.2"
+url = { workspace = true }
 prometheus = "0.14.0"
 priority-queue = "2.7.0"
 tonic = { workspace = true }
@@ -81,13 +79,13 @@ futures03 = { version = "0.3.31", package = "futures", features = ["compat"] }
 wasmparser = "0.118.1"
 thiserror = { workspace = true }
 parking_lot = "0.12.5"
-portable-atomic = { version = "1.11", features = ["fallback"] }
-itertools = "0.14.0"
+portable-atomic = { version = "1.13", features = ["fallback"] }
+itertools = "0.15.0"
 defer = "0.2"
 
 serde_plain = "1.0.2"
 csv = "1.4.0"
-object_store = { version = "0.12.4", features = ["gcp"] }
+object_store = { version = "0.14.0", features = ["gcp"] }
 
 # Dependencies related to Amp subgraphs
 ahash.workspace = true
@@ -104,6 +102,7 @@ clap.workspace = true
 maplit = "1.0.2"
 hex-literal = "1.1"
 wiremock = "0.6.5"
+tempfile = "3.8"
 
 [build-dependencies]
 tonic-prost-build = { workspace = true }
diff --git a/graph/derive/Cargo.toml b/graph/derive/Cargo.toml
index cfa5296efe9..405eb648a8a 100644
--- a/graph/derive/Cargo.toml
+++ b/graph/derive/Cargo.toml
@@ -14,7 +14,7 @@ proc-macro = true
 [dependencies]
 syn = { workspace = true }
 quote = "1.0"
-proc-macro2 = "1.0.105"
+proc-macro2 = "1.0.106"
 
 [dev-dependencies]
 proc-macro-utils = "0.10.0"
diff --git a/graph/derive/src/lib.rs b/graph/derive/src/lib.rs
index be7e5364032..8cbf79b3825 100644
--- a/graph/derive/src/lib.rs
+++ b/graph/derive/src/lib.rs
@@ -4,7 +4,7 @@ use proc_macro::TokenStream;
 use proc_macro2::{Span, TokenStream as TokenStream2};
 use quote::quote;
 use syn::{
-    parse_macro_input, Data, DeriveInput, Fields, Generics, Ident, Index, ItemFn, TypeParamBound,
+    Data, DeriveInput, Fields, Generics, Ident, Index, ItemFn, TypeParamBound, parse_macro_input,
 };
 
 #[proc_macro_derive(CheapClone)]
diff --git a/graph/examples/append_row.rs b/graph/examples/append_row.rs
index f272c07cf82..61509d33349 100644
--- a/graph/examples/append_row.rs
+++ b/graph/examples/append_row.rs
@@ -12,7 +12,7 @@ use graph::{
     schema::{EntityType, InputSchema},
 };
 use lazy_static::lazy_static;
-use rand::{rng, Rng};
+use rand::{Rng, rng};
 
 #[derive(Parser)]
 #[clap(
@@ -104,7 +104,7 @@ pub fn main() -> anyhow::Result<()> {
             };
             mods.push(md);
         }
-        let mut group = RowGroup::new(THING_TYPE.clone(), false);
+        let mut group = RowGroup::new(THING_TYPE.clone());
 
         let start = Instant::now();
         for md in mods {
diff --git a/graph/examples/stress.rs b/graph/examples/stress.rs
index 7a50df521d4..253ee501e7b 100644
--- a/graph/examples/stress.rs
+++ b/graph/examples/stress.rs
@@ -1,15 +1,15 @@
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::collections::{BTreeMap, HashMap};
 use std::iter::FromIterator;
-use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use std::time::{Duration, Instant};
 
 use clap::Parser;
 use graph::data::value::{Object, Word};
 use graph::object;
-use graph::prelude::{lazy_static, q, r, BigDecimal, BigInt, QueryResult};
-use rand::{rngs::SmallRng, Rng};
+use graph::prelude::{BigDecimal, BigInt, QueryResult, lazy_static, q, r};
+use rand::{Rng, rngs::SmallRng};
 use rand::{RngCore, SeedableRng};
 
 use graph::util::cache_weight::CacheWeight;
@@ -166,7 +166,7 @@ impl<K: CacheWeight, V: CacheWeight> CacheWeight for MapMeasure<K, V> {
 
 unsafe impl GlobalAlloc for Counter {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let ret = System.alloc(layout);
+        let ret = unsafe { System.alloc(layout) };
         if !ret.is_null() {
             ALLOCATED.fetch_add(layout.size(), SeqCst);
         }
@@ -174,7 +174,7 @@ unsafe impl GlobalAlloc for Counter {
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        System.dealloc(ptr, layout);
+        unsafe { System.dealloc(ptr, layout) };
         ALLOCATED.fetch_sub(layout.size(), SeqCst);
     }
 }
@@ -240,11 +240,7 @@ impl Template for BigInt {
         let f = match rng {
             Some(rng) => {
                 let mag = rng.random_range(1..100);
-                if rng.random_bool(0.5) {
-                    mag
-                } else {
-                    -mag
-                }
+                if rng.random_bool(0.5) { mag } else { -mag }
             }
             None => 1,
         };
@@ -261,11 +257,7 @@ impl Template for BigDecimal {
         let f = match rng.as_deref_mut() {
             Some(rng) => {
                 let mag = rng.random_range(1i32..100);
-                if rng.random_bool(0.5) {
-                    mag
-                } else {
-                    -mag
-                }
+                if rng.random_bool(0.5) { mag } else { -mag }
             }
             None => 1,
         };
@@ -564,11 +556,7 @@ struct Opt {
 }
 
 fn maybe_rng<'a>(opt: &'a Opt, rng: &'a mut SmallRng) -> Option<&'a mut SmallRng> {
-    if opt.seed == Some(0) {
-        None
-    } else {
-        Some(rng)
-    }
+    if opt.seed == Some(0) { None } else { Some(rng) }
 }
 
 fn stress<T: Template>(opt: &Opt) {
diff --git a/graph/examples/validate.rs b/graph/examples/validate.rs
index b94c00b999d..87888ef155b 100644
--- a/graph/examples/validate.rs
+++ b/graph/examples/validate.rs
@@ -29,12 +29,12 @@
 /// ```
 use clap::Parser;
 
-use graph::data::graphql::ext::DirectiveFinder;
 use graph::data::graphql::DirectiveExt;
 use graph::data::graphql::DocumentExt;
+use graph::data::graphql::ext::DirectiveFinder;
 use graph::data::subgraph::SPEC_VERSION_1_1_0;
-use graph::prelude::s;
 use graph::prelude::DeploymentHash;
+use graph::prelude::s;
 use graph::schema::InputSchema;
 use serde::Deserialize;
 use std::alloc::GlobalAlloc;
@@ -50,7 +50,7 @@ use std::sync::atomic::AtomicBool;
 use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 use std::time::{Duration, Instant};
 
-use graph::anyhow::{anyhow, bail, Result};
+use graph::anyhow::{Result, anyhow, bail};
 
 // Install an allocator that tracks allocation sizes
 
@@ -60,7 +60,7 @@ struct Counter;
 
 unsafe impl GlobalAlloc for Counter {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let ret = System.alloc(layout);
+        let ret = unsafe { System.alloc(layout) };
         if !ret.is_null() {
             ALLOCATED.fetch_add(layout.size(), SeqCst);
         }
@@ -68,7 +68,7 @@ unsafe impl GlobalAlloc for Counter {
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        System.dealloc(ptr, layout);
+        unsafe { System.dealloc(ptr, layout) };
         ALLOCATED.fetch_sub(layout.size(), SeqCst);
     }
 }
@@ -278,7 +278,9 @@ impl Runner for Sizer {
 
 pub fn main() {
     // Allow fulltext search in schemas
-    std::env::set_var("GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH", "true");
+    unsafe {
+        std::env::set_var("GRAPH_ALLOW_NON_DETERMINISTIC_FULLTEXT_SEARCH", "true");
+    }
 
     let opt = Opts::parse();
 
diff --git a/graph/src/abi/event_ext.rs b/graph/src/abi/event_ext.rs
index 383252a379f..9083f44b931 100644
--- a/graph/src/abi/event_ext.rs
+++ b/graph/src/abi/event_ext.rs
@@ -2,8 +2,8 @@ use std::collections::VecDeque;
 
 use alloy::json_abi::Event;
 use alloy::rpc::types::Log;
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 
 use crate::abi::{DynSolParam, DynSolValue};
 
diff --git a/graph/src/abi/function_ext.rs b/graph/src/abi/function_ext.rs
index 52696beac23..ab17e0d9b55 100644
--- a/graph/src/abi/function_ext.rs
+++ b/graph/src/abi/function_ext.rs
@@ -5,8 +5,8 @@ use alloy::dyn_abi::DynSolValue;
 use alloy::dyn_abi::Specifier;
 use alloy::json_abi::Function;
 use alloy::json_abi::Param;
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 use itertools::Itertools;
 
 use crate::abi::DynSolValueExt;
diff --git a/graph/src/abi/mod.rs b/graph/src/abi/mod.rs
index 9bedeb0e3b2..12c0bc8e71b 100644
--- a/graph/src/abi/mod.rs
+++ b/graph/src/abi/mod.rs
@@ -7,8 +7,10 @@ pub use alloy::dyn_abi::DynSolType;
 pub use alloy::dyn_abi::DynSolValue;
 
 pub use alloy::json_abi::Event;
+pub use alloy::json_abi::EventParam;
 pub use alloy::json_abi::Function;
 pub use alloy::json_abi::JsonAbi;
+pub use alloy::json_abi::Param;
 pub use alloy::json_abi::StateMutability;
 
 pub use alloy::primitives::I256;
diff --git a/graph/src/abi/value_ext.rs b/graph/src/abi/value_ext.rs
index cb0f220e036..cf0d36006af 100644
--- a/graph/src/abi/value_ext.rs
+++ b/graph/src/abi/value_ext.rs
@@ -1,7 +1,7 @@
 use alloy::dyn_abi::DynSolType;
 use alloy::dyn_abi::DynSolValue;
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 use itertools::Itertools;
 
 pub trait DynSolValueExt {
@@ -258,16 +258,26 @@ mod tests {
         assert!(!Array(vec![Bool(true)]).type_check(&T::Array(Box::new(T::String))));
         assert!(!Array(vec![Bool(true)]).type_check(&T::FixedArray(Box::new(T::Bool), 1)));
 
-        assert!(!FixedArray(vec![String("".to_owned())])
-            .type_check(&T::FixedArray(Box::new(T::Bool), 1)));
-        assert!(!FixedArray(vec![Bool(true), Bool(false)])
-            .type_check(&T::FixedArray(Box::new(T::Bool), 1)));
-        assert!(FixedArray(vec![Bool(true), Bool(false)])
-            .type_check(&T::FixedArray(Box::new(T::Bool), 2)));
-        assert!(!FixedArray(vec![Bool(true), Bool(false)])
-            .type_check(&T::FixedArray(Box::new(T::Bool), 3)));
-        assert!(!FixedArray(vec![Bool(true), Bool(false)])
-            .type_check(&T::Tuple(vec![T::Bool, T::Bool])));
+        assert!(
+            !FixedArray(vec![String("".to_owned())])
+                .type_check(&T::FixedArray(Box::new(T::Bool), 1))
+        );
+        assert!(
+            !FixedArray(vec![Bool(true), Bool(false)])
+                .type_check(&T::FixedArray(Box::new(T::Bool), 1))
+        );
+        assert!(
+            FixedArray(vec![Bool(true), Bool(false)])
+                .type_check(&T::FixedArray(Box::new(T::Bool), 2))
+        );
+        assert!(
+            !FixedArray(vec![Bool(true), Bool(false)])
+                .type_check(&T::FixedArray(Box::new(T::Bool), 3))
+        );
+        assert!(
+            !FixedArray(vec![Bool(true), Bool(false)])
+                .type_check(&T::Tuple(vec![T::Bool, T::Bool]))
+        );
 
         assert!(!Tuple(vec![Bool(true), Bool(false)]).type_check(&T::Tuple(vec![T::Bool])));
         assert!(Tuple(vec![Bool(true), Bool(false)]).type_check(&T::Tuple(vec![T::Bool, T::Bool])));
diff --git a/graph/src/amp/client/flight_client.rs b/graph/src/amp/client/flight_client.rs
index d2046b96e29..bda2c783fd9 100644
--- a/graph/src/amp/client/flight_client.rs
+++ b/graph/src/amp/client/flight_client.rs
@@ -2,17 +2,17 @@ use std::{collections::HashMap, ops::RangeInclusive, time::Duration};
 
 use ahash::RandomState;
 use alloy::primitives::{BlockHash, BlockNumber};
-use arrow::{datatypes::Schema, error::ArrowError};
+use arrow::datatypes::Schema;
 use arrow_flight::{
     decode::DecodedPayload, error::FlightError, flight_service_client::FlightServiceClient,
     sql::client::FlightSqlServiceClient,
 };
 use async_stream::try_stream;
 use bytes::Bytes;
-use futures03::{future::BoxFuture, stream::BoxStream, StreamExt};
+use futures03::{StreamExt, future::BoxFuture, stream::BoxStream};
 use http::Uri;
 use serde::{Deserialize, Serialize};
-use slog::{debug, trace, Logger};
+use slog::{Logger, debug, trace};
 use thiserror::Error;
 use tonic::transport::{Channel, ClientTlsConfig, Endpoint};
 
@@ -22,7 +22,7 @@ use crate::{
             Client, LatestBlockBeforeReorg, RequestMetadata, ResponseBatch, ResumeStreamingQuery,
         },
         error,
-        log::{one_line, Logger as _},
+        log::{Logger as _, one_line},
     },
     prelude::CheapClone,
 };
@@ -103,9 +103,9 @@ impl Client for FlightClient {
             let flight_info = raw_client
                 .execute(query, TXN_ID)
                 .await
-                .map_err(Error::Service)?;
+                .map_err(Error::service)?;
 
-            flight_info.try_decode_schema().map_err(Error::Service)
+            flight_info.try_decode_schema().map_err(Error::service)
         })
     }
 
@@ -163,14 +163,14 @@ impl Client for FlightClient {
             let flight_info = raw_client
                 .execute(query, TXN_ID)
                 .await
-                .map_err(Error::Service)?;
+                .map_err(Error::service)?;
 
             for (endpoint_index, endpoint) in flight_info.endpoint.into_iter().enumerate() {
                 let Some(ticket) = endpoint.ticket else {
                     continue;
                 };
 
-                let mut stream = raw_client.do_get(ticket).await.map_err(Error::Service)?.into_inner();
+                let mut stream = raw_client.do_get(ticket).await.map_err(Error::service)?.into_inner();
                 let mut batch_index = 0u32;
                 let mut prev_block_ranges = prev_block_ranges.clone();
 
@@ -232,12 +232,18 @@ pub enum Error {
     Connection(#[source] tonic::transport::Error),
 
     #[error("service failed: {0:#}")]
-    Service(#[source] ArrowError),
+    Service(#[source] Box<dyn std::error::Error + Sync + Send>),
 
     #[error("stream failed: {0:#}")]
     Stream(#[source] FlightError),
 }
 
+impl Error {
+    pub fn service<T: std::error::Error + Sync + Send + 'static>(e: T) -> Self {
+        Self::Service(Box::new(e))
+    }
+}
+
 impl error::IsDeterministic for Error {
     fn is_deterministic(&self) -> bool {
         let msg = match self {
diff --git a/graph/src/amp/codec/array_decoder.rs b/graph/src/amp/codec/array_decoder.rs
index f7a480f38d0..3c261554ff3 100644
--- a/graph/src/amp/codec/array_decoder.rs
+++ b/graph/src/amp/codec/array_decoder.rs
@@ -1,15 +1,15 @@
 use std::{fmt::Display, sync::LazyLock};
 
 use alloy::primitives::B256;
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use arrow::{
     array::{
-        timezone::Tz, Array, ArrayAccessor, BinaryArray, BinaryViewArray, BooleanArray,
-        Decimal128Array, Decimal256Array, FixedSizeBinaryArray, Float16Array, Float32Array,
-        Float64Array, Int16Array, Int32Array, Int64Array, Int8Array, LargeBinaryArray,
-        LargeStringArray, PrimitiveArray, StringArray, StringViewArray, TimestampMicrosecondArray,
-        TimestampMillisecondArray, TimestampNanosecondArray, TimestampSecondArray, UInt16Array,
-        UInt32Array, UInt64Array, UInt8Array,
+        Array, ArrayAccessor, BinaryArray, BinaryViewArray, BooleanArray, Decimal128Array,
+        Decimal256Array, FixedSizeBinaryArray, Float16Array, Float32Array, Float64Array, Int8Array,
+        Int16Array, Int32Array, Int64Array, LargeBinaryArray, LargeStringArray, PrimitiveArray,
+        StringArray, StringViewArray, TimestampMicrosecondArray, TimestampMillisecondArray,
+        TimestampNanosecondArray, TimestampSecondArray, UInt8Array, UInt16Array, UInt32Array,
+        UInt64Array, timezone::Tz,
     },
     datatypes::ArrowTemporalType,
 };
diff --git a/graph/src/amp/codec/mod.rs b/graph/src/amp/codec/mod.rs
index b642d0377c9..f259ae528d8 100644
--- a/graph/src/amp/codec/mod.rs
+++ b/graph/src/amp/codec/mod.rs
@@ -15,7 +15,7 @@ use std::{
     sync::Arc,
 };
 
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use arrow::array::{Array, RecordBatch};
 
 use self::{list_decoder::ListDecoder, mapping_decoder::MappingDecoder, name_cache::NameCache};
@@ -244,7 +244,7 @@ impl Codec {
 mod tests {
     use std::sync::LazyLock;
 
-    use arrow::array::{BinaryArray, BooleanArray, Int64Array, Int8Array};
+    use arrow::array::{BinaryArray, BooleanArray, Int8Array, Int64Array};
     use arrow::datatypes::{DataType, Field, Schema};
 
     use crate::data::subgraph::DeploymentHash;
diff --git a/graph/src/amp/codec/test_fixtures.rs b/graph/src/amp/codec/test_fixtures.rs
index a8a6882ff88..4b4bdc3e627 100644
--- a/graph/src/amp/codec/test_fixtures.rs
+++ b/graph/src/amp/codec/test_fixtures.rs
@@ -4,14 +4,14 @@ use arrow::{
     array::{
         BinaryArray, BinaryViewArray, BooleanArray, BooleanBuilder, Decimal128Builder,
         Decimal256Builder, FixedSizeBinaryArray, FixedSizeListBuilder, Float16Array, Float32Array,
-        Float64Array, Int16Array, Int32Array, Int64Array, Int8Array, LargeBinaryArray,
+        Float64Array, Int8Array, Int16Array, Int32Array, Int64Array, LargeBinaryArray,
         LargeListBuilder, LargeListViewBuilder, LargeStringArray, ListBuilder, ListViewBuilder,
         RecordBatch, StringArray, StringViewArray, TimestampMicrosecondArray,
-        TimestampMillisecondArray, TimestampNanosecondArray, TimestampSecondArray, UInt16Array,
-        UInt32Array, UInt64Array, UInt8Array,
+        TimestampMillisecondArray, TimestampNanosecondArray, TimestampSecondArray, UInt8Array,
+        UInt16Array, UInt32Array, UInt64Array,
     },
     datatypes::{
-        i256, DataType, Field, Schema, TimeUnit, DECIMAL128_MAX_PRECISION, DECIMAL256_MAX_PRECISION,
+        DECIMAL128_MAX_PRECISION, DECIMAL256_MAX_PRECISION, DataType, Field, Schema, TimeUnit, i256,
     },
 };
 use chrono::{TimeZone, Utc};
@@ -282,10 +282,10 @@ pub static BINARY_RECORD_BATCH: LazyLock<RecordBatch> = LazyLock::new(|| {
         vec![
             Arc::new(BinaryArray::from(vec![b"aa".as_ref(), b"bb", b"cc"])),
             Arc::new(BinaryViewArray::from(vec![b"aa".as_ref(), b"bb", b"cc"])),
-            Arc::new(FixedSizeBinaryArray::from(vec![b"aa", b"bb", b"cc"])),
-            Arc::new(FixedSizeBinaryArray::from(vec![
-                &[10; 32], &[20; 32], &[30; 32],
-            ])),
+            Arc::new(FixedSizeBinaryArray::try_from(vec![b"aa", b"bb", b"cc"]).unwrap()),
+            Arc::new(
+                FixedSizeBinaryArray::try_from(vec![&[10; 32], &[20; 32], &[30; 32]]).unwrap(),
+            ),
             Arc::new(LargeBinaryArray::from(vec![b"aa".as_ref(), b"bb", b"cc"])),
         ],
     )
diff --git a/graph/src/amp/codec/utils.rs b/graph/src/amp/codec/utils.rs
index 9811f661f7b..78e8857fa6a 100644
--- a/graph/src/amp/codec/utils.rs
+++ b/graph/src/amp/codec/utils.rs
@@ -1,5 +1,5 @@
 use alloy::primitives::{BlockHash, BlockNumber};
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use arrow::array::{
     Array, FixedSizeBinaryArray, RecordBatch, TimestampNanosecondArray, UInt64Array,
 };
diff --git a/graph/src/amp/codec/value_decoder.rs b/graph/src/amp/codec/value_decoder.rs
index c6e4e7162a2..72073c31887 100644
--- a/graph/src/amp/codec/value_decoder.rs
+++ b/graph/src/amp/codec/value_decoder.rs
@@ -1,13 +1,13 @@
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use arrow::{
     array::{
         Array, BinaryArray, BinaryViewArray, BooleanArray, Decimal128Array, Decimal256Array,
         FixedSizeBinaryArray, FixedSizeListArray, Float16Array, Float32Array, Float64Array,
-        Int16Array, Int32Array, Int64Array, Int8Array, LargeBinaryArray, LargeListArray,
+        Int8Array, Int16Array, Int32Array, Int64Array, LargeBinaryArray, LargeListArray,
         LargeListViewArray, LargeStringArray, ListArray, ListViewArray, StringArray,
         StringViewArray, TimestampMicrosecondArray, TimestampMillisecondArray,
-        TimestampNanosecondArray, TimestampSecondArray, UInt16Array, UInt32Array, UInt64Array,
-        UInt8Array,
+        TimestampNanosecondArray, TimestampSecondArray, UInt8Array, UInt16Array, UInt32Array,
+        UInt64Array,
     },
     datatypes::{DataType, TimeUnit},
 };
@@ -15,8 +15,8 @@ use chrono::{DateTime, Utc};
 
 use super::{ArrayDecoder, Decoder, ListDecoder, MappingDecoder};
 use crate::data::store::{
-    scalar::{BigDecimal, BigInt, Bytes, Timestamp},
     Value, ValueType,
+    scalar::{BigDecimal, BigInt, Bytes, Timestamp},
 };
 
 /// Returns a decoder that converts an Arrow array into subgraph store values.
diff --git a/graph/src/amp/manifest/data_source/raw.rs b/graph/src/amp/manifest/data_source/raw.rs
index 3369eebc54d..91d792293be 100644
--- a/graph/src/amp/manifest/data_source/raw.rs
+++ b/graph/src/amp/manifest/data_source/raw.rs
@@ -11,7 +11,7 @@ use itertools::Itertools;
 use lazy_regex::regex_is_match;
 use semver::Version;
 use serde::Deserialize;
-use slog::{debug, error, Logger};
+use slog::{Logger, debug, error};
 use thiserror::Error;
 
 use super::{Abi, DataSource, Source, Table, Transformer};
@@ -698,9 +698,9 @@ impl IsDeterministic for Error {
 
 fn validate_ident(s: &str) -> Result<(), Error> {
     if !regex_is_match!("^[a-zA-Z_][a-zA-Z0-9_-]{0,100}$", s) {
-        return Err(Error::InvalidValue(
-            anyhow!("invalid identifier '{s}': must start with a letter or an underscore, and contain only letters, numbers, hyphens, and underscores")
-        ));
+        return Err(Error::InvalidValue(anyhow!(
+            "invalid identifier '{s}': must start with a letter or an underscore, and contain only letters, numbers, hyphens, and underscores"
+        )));
     }
     Ok(())
 }
diff --git a/graph/src/amp/manifest/mod.rs b/graph/src/amp/manifest/mod.rs
index 028d567332c..520f2ebcee5 100644
--- a/graph/src/amp/manifest/mod.rs
+++ b/graph/src/amp/manifest/mod.rs
@@ -2,7 +2,7 @@ pub mod data_source;
 
 use std::sync::Arc;
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use itertools::Itertools;
 use semver::Version;
 use slog::Logger;
diff --git a/graph/src/amp/mod.rs b/graph/src/amp/mod.rs
index 9541d450626..21f3e064c58 100644
--- a/graph/src/amp/mod.rs
+++ b/graph/src/amp/mod.rs
@@ -11,7 +11,7 @@ pub mod sql;
 pub mod stream_aggregator;
 
 pub use self::{
-    client::{flight_client::FlightClient, Client},
+    client::{Client, flight_client::FlightClient},
     codec::Codec,
     manifest::Manifest,
 };
diff --git a/graph/src/amp/schema/generator/entity.rs b/graph/src/amp/schema/generator/entity.rs
index e3204abc623..5655df21a48 100644
--- a/graph/src/amp/schema/generator/entity.rs
+++ b/graph/src/amp/schema/generator/entity.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use inflector::Inflector;
 
 use crate::data::store::ValueType;
diff --git a/graph/src/amp/sql/query_builder/block_range_query.rs b/graph/src/amp/sql/query_builder/block_range_query.rs
index dde44d803ad..2c22336d379 100644
--- a/graph/src/amp/sql/query_builder/block_range_query.rs
+++ b/graph/src/amp/sql/query_builder/block_range_query.rs
@@ -1,14 +1,12 @@
 use std::{
     collections::BTreeMap,
-    hash::{BuildHasher, Hash, Hasher},
     ops::{ControlFlow, RangeInclusive},
 };
 
-use ahash::RandomState;
 use alloy::primitives::BlockNumber;
 use sqlparser_latest::ast::{self, VisitMut, VisitorMut};
 
-use super::{extract_tables, parse_query, TableReference};
+use super::{TableReference, extract_tables, parse_query};
 
 /// Limits the query execution to the specified block range.
 ///
@@ -23,11 +21,8 @@ pub(super) fn new_block_range_query(
     block_range: &RangeInclusive<BlockNumber>,
 ) -> ast::Query {
     // CTE names are unique within a SQL query.
-    // The hasher ensures that CTEs created for block range do not collide with user-defined CTEs.
-    // Constant seeds ensure consistent block range queries for the same input parameters.
-    let mut hasher = RandomState::with_seeds(0, 0, 0, 0).build_hasher();
 
-    let tables_to_ctes_mapping = new_tables_to_ctes_mapping(query, &mut hasher);
+    let tables_to_ctes_mapping = new_tables_to_ctes_mapping(query);
     assert!(!tables_to_ctes_mapping.is_empty());
 
     let mut cte_tables = Vec::with_capacity(tables_to_ctes_mapping.len());
@@ -46,24 +41,18 @@ pub(super) fn new_block_range_query(
     let block_range_query = format!(
         "WITH {cte_tables}, {source} AS ({query}) SELECT {source}.* FROM {source} ORDER BY {source}.{block_number_column}",
         cte_tables = cte_tables.join(", "),
-        source = format!("source_{}", hasher.finish())
+        source = format!("amp_src")
     );
 
     parse_query(block_range_query).unwrap()
 }
 
 /// Creates unique CTE names for every table referenced by the SQL query.
-fn new_tables_to_ctes_mapping(
-    query: &ast::Query,
-    hasher: &mut impl Hasher,
-) -> BTreeMap<TableReference, String> {
+fn new_tables_to_ctes_mapping(query: &ast::Query) -> BTreeMap<TableReference, String> {
     extract_tables(query)
         .into_iter()
-        .map(|table| {
-            table.hash(hasher);
-
-            (table, format!("block_range_{}", hasher.finish()))
-        })
+        .enumerate()
+        .map(|(idx, table)| (table, format!("amp_br{}", idx + 1)))
         .collect()
 }
 
@@ -137,18 +126,18 @@ mod tests {
             block_range_query.to_string(),
             parse_query(
                 r#"
-                WITH block_range_14621009630487609643 AS (
+                WITH amp_br1 AS (
                     SELECT * FROM d WHERE _block_num BETWEEN 0 AND 1000000
                 ),
-                source_14621009630487609643 AS (
-                    SELECT a, b, c FROM block_range_14621009630487609643 AS d
+                amp_src AS (
+                    SELECT a, b, c FROM amp_br1 AS d
                 )
                 SELECT
-                    source_14621009630487609643.*
+                    amp_src.*
                 FROM
-                    source_14621009630487609643
+                    amp_src
                 ORDER BY
-                    source_14621009630487609643.b
+                    amp_src.b
                 "#
             )
             .unwrap()
@@ -167,21 +156,21 @@ mod tests {
             block_range_query.to_string(),
             parse_query(
                 r#"
-                WITH block_range_14621009630487609643 AS (
+                WITH amp_br1 AS (
                     SELECT * FROM d WHERE _block_num BETWEEN 0 AND 1000000
                 ),
-                block_range_12377422807768256314 AS (
+                amp_br2 AS (
                     SELECT * FROM e WHERE _block_num BETWEEN 0 AND 1000000
                 ),
-                source_12377422807768256314 AS (
-                    SELECT a, b, c FROM block_range_14621009630487609643 AS d JOIN block_range_12377422807768256314 AS e ON e.e = d.d
+                amp_src AS (
+                    SELECT a, b, c FROM amp_br1 AS d JOIN amp_br2 AS e ON e.e = d.d
                 )
                 SELECT
-                    source_12377422807768256314.*
+                    amp_src.*
                 FROM
-                    source_12377422807768256314
+                    amp_src
                 ORDER BY
-                    source_12377422807768256314.b
+                    amp_src.b
                 "#
             )
             .unwrap()
diff --git a/graph/src/amp/sql/query_builder/context_query.rs b/graph/src/amp/sql/query_builder/context_query.rs
index cdff33ca4a3..00cb60a4eac 100644
--- a/graph/src/amp/sql/query_builder/context_query.rs
+++ b/graph/src/amp/sql/query_builder/context_query.rs
@@ -1,4 +1,3 @@
-use ahash::RandomState;
 use itertools::Itertools;
 use sqlparser_latest::ast;
 
@@ -19,16 +18,11 @@ pub(super) fn new_context_query<'a>(
     context_columns: impl IntoIterator<Item = &'a str>,
 ) -> ast::Query {
     // CTE names are unique within a SQL query.
-    // The hasher ensures that CTEs created for context do not collide with user-defined CTEs.
-    // Constant seeds ensure consistent context queries for the same input parameters.
-    let hasher = RandomState::with_seeds(0, 0, 0, 0);
-    let query_hash = hasher.hash_one(query);
-
     let context_columns = context_columns.into_iter().collect_vec();
     assert!(!context_columns.is_empty());
 
-    let context_cte = format!("context_{query_hash}");
-    let source_cte = format!("source_{query_hash}");
+    let context_cte = "amp_ctx";
+    let source_cte = "amp_src";
 
     let context_query = format!(
         "
@@ -81,21 +75,13 @@ mod tests {
             context_query,
             parse_query(
                 "
-                WITH context_10500256449332496249 AS (
-                    SELECT DISTINCT _block_num, cx_c, cx_d FROM cx_a.cx_b
-                ),
-                source_10500256449332496249 AS (
-                    SELECT a, b, c FROM d
-                )
-                SELECT
-                    context_10500256449332496249.cx_c,
-                    context_10500256449332496249.cx_d,
-                    source_10500256449332496249.*
-                FROM
-                    source_10500256449332496249
-                INNER JOIN context_10500256449332496249 ON
-                    context_10500256449332496249._block_num = source_10500256449332496249.b
-                "
+                WITH amp_ctx AS (
+                       SELECT DISTINCT _block_num, cx_c, cx_d FROM cx_a.cx_b
+                     ),
+                     amp_src AS (SELECT a, b, c FROM d)
+              SELECT amp_ctx.cx_c, amp_ctx.cx_d, amp_src.*
+                FROM amp_src
+                INNER JOIN amp_ctx ON amp_ctx._block_num = amp_src.b"
             )
             .unwrap()
         )
diff --git a/graph/src/amp/sql/query_builder/event_signature_resolver.rs b/graph/src/amp/sql/query_builder/event_signature_resolver.rs
index ac37068ea3d..27a1bdcf2bd 100644
--- a/graph/src/amp/sql/query_builder/event_signature_resolver.rs
+++ b/graph/src/amp/sql/query_builder/event_signature_resolver.rs
@@ -1,7 +1,7 @@
 use std::ops::ControlFlow;
 
 use alloy::json_abi::JsonAbi;
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use sqlparser_latest::ast::{self, visit_expressions_mut};
 
 static FUNCTION_NAME: &str = "sg_event_signature";
@@ -43,7 +43,9 @@ fn visit_expr(expr: &mut ast::Expr, abis: &[(&str, &JsonAbi)]) -> Result<()> {
     }
 
     let Some((contract_name, event_name)) = get_args(function) else {
-        bail!("invalid function call: expected `{FUNCTION_NAME}('CONTRACT_NAME', 'EVENT_NAME')`, found: `{function}`");
+        bail!(
+            "invalid function call: expected `{FUNCTION_NAME}('CONTRACT_NAME', 'EVENT_NAME')`, found: `{function}`"
+        );
     };
 
     let Some(event) = get_event(abis, contract_name, event_name) else {
diff --git a/graph/src/amp/sql/query_builder/mod.rs b/graph/src/amp/sql/query_builder/mod.rs
index 5f5458ec092..c71c6ef5baf 100644
--- a/graph/src/amp/sql/query_builder/mod.rs
+++ b/graph/src/amp/sql/query_builder/mod.rs
@@ -12,7 +12,7 @@ use alloy::{
     json_abi::JsonAbi,
     primitives::{Address, BlockNumber},
 };
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use itertools::Itertools;
 use sqlparser_latest::ast;
 
@@ -22,7 +22,7 @@ use self::{
     event_signature_resolver::resolve_event_signatures,
     parser::parse_query,
     source_address_resolver::resolve_source_address,
-    table_extractor::{extract_tables, TableReference},
+    table_extractor::{TableReference, extract_tables},
     table_validator::validate_tables,
 };
 
diff --git a/graph/src/amp/sql/query_builder/parser.rs b/graph/src/amp/sql/query_builder/parser.rs
index 2e40b0e53a3..9b25e8431f6 100644
--- a/graph/src/amp/sql/query_builder/parser.rs
+++ b/graph/src/amp/sql/query_builder/parser.rs
@@ -1,6 +1,6 @@
 use std::ops::ControlFlow;
 
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use itertools::Itertools;
 use sqlparser_latest::{
     ast::{self, Visit, Visitor},
diff --git a/graph/src/amp/sql/query_builder/source_address_resolver.rs b/graph/src/amp/sql/query_builder/source_address_resolver.rs
index 579e0873bb6..e0d908deb24 100644
--- a/graph/src/amp/sql/query_builder/source_address_resolver.rs
+++ b/graph/src/amp/sql/query_builder/source_address_resolver.rs
@@ -1,7 +1,7 @@
 use std::ops::ControlFlow;
 
 use alloy::primitives::Address;
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use sqlparser_latest::ast::{self, visit_expressions_mut};
 
 static FUNCTION_NAME: &str = "sg_source_address";
diff --git a/graph/src/amp/sql/query_builder/table_validator.rs b/graph/src/amp/sql/query_builder/table_validator.rs
index 25bf2c8da30..43e7fa9c128 100644
--- a/graph/src/amp/sql/query_builder/table_validator.rs
+++ b/graph/src/amp/sql/query_builder/table_validator.rs
@@ -1,9 +1,9 @@
 use std::collections::BTreeSet;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use sqlparser_latest::ast;
 
-use super::{extract_tables, TableReference};
+use super::{TableReference, extract_tables};
 
 /// Validates that SQL query references only allowed dataset and tables.
 ///
diff --git a/graph/src/amp/stream_aggregator/mod.rs b/graph/src/amp/stream_aggregator/mod.rs
index e2f0892252f..df990fa20d6 100644
--- a/graph/src/amp/stream_aggregator/mod.rs
+++ b/graph/src/amp/stream_aggregator/mod.rs
@@ -7,10 +7,10 @@ use std::{
     task::{self, Poll},
 };
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use arrow::array::RecordBatch;
-use futures03::{stream::BoxStream, Stream, StreamExt, TryStreamExt};
-use slog::{debug, info, Logger};
+use futures03::{Stream, StreamExt, TryStreamExt, stream::BoxStream};
+use slog::{Logger, debug, info};
 
 use self::record_batch::Buffer;
 use crate::{
@@ -60,7 +60,7 @@ impl StreamAggregator {
     pub fn new<E>(
         logger: &Logger,
         named_streams: impl IntoIterator<Item = (String, BoxStream<'static, Result<ResponseBatch, E>>)>,
-        max_buffer_size: usize,
+        buffer_size: usize,
     ) -> Self
     where
         E: std::error::Error + IsDeterministic + Send + Sync + 'static,
@@ -101,14 +101,9 @@ impl StreamAggregator {
 
         let num_streams = named_streams.len();
 
-        info!(logger, "Initializing stream aggregator";
-            "num_streams" => num_streams,
-            "max_buffer_size" => max_buffer_size
-        );
-
         Self {
             named_streams,
-            buffer: Buffer::new(num_streams, max_buffer_size),
+            buffer: Buffer::new(num_streams, buffer_size),
             logger,
             is_finalized: false,
             is_failed: false,
@@ -120,6 +115,7 @@ impl StreamAggregator {
         cx: &mut task::Context<'_>,
     ) -> Poll<Option<Result<RecordBatchGroups, Error>>> {
         let mut made_progress = false;
+        let mut needs_repoll = false;
 
         for (stream_index, (stream_name, stream)) in self.named_streams.iter_mut().enumerate() {
             let logger = self.logger.new(slog::o!(
@@ -157,6 +153,7 @@ impl StreamAggregator {
                     match buffer_result {
                         Ok(()) => {
                             made_progress = true;
+                            needs_repoll = true;
 
                             debug!(logger, "Buffered record batch";
                                 "buffer_size" => self.buffer.size(stream_index),
@@ -172,6 +169,7 @@ impl StreamAggregator {
                 }
                 Poll::Ready(Some(Ok(_empty_record_batch))) => {
                     debug!(logger, "Received an empty record batch");
+                    needs_repoll = true;
                 }
                 Poll::Ready(Some(Err(e))) => {
                     self.is_failed = true;
@@ -197,16 +195,15 @@ impl StreamAggregator {
             }
         }
 
-        if made_progress {
-            if let Some(completed_groups) =
+        if made_progress
+            && let Some(completed_groups) =
                 self.buffer.completed_groups().map_err(Error::Aggregation)?
-            {
-                debug!(self.logger, "Sending completed record batch groups";
-                    "num_completed_groups" => completed_groups.len()
-                );
+        {
+            debug!(self.logger, "Sending completed record batch groups";
+                "num_completed_groups" => completed_groups.len()
+            );
 
-                return Poll::Ready(Some(Ok(completed_groups)));
-            }
+            return Poll::Ready(Some(Ok(completed_groups)));
         }
 
         if self.is_finalized {
@@ -214,6 +211,16 @@ impl StreamAggregator {
             return Poll::Ready(None);
         }
 
+        // When any stream returned `Poll::Ready` but we couldn't produce
+        // output (e.g. empty batch, or data buffered but no completed
+        // groups yet), the waker was consumed by that stream's poll call
+        // and won't be re-registered until we poll it again. Schedule an
+        // immediate re-poll so those streams get polled again and their
+        // wakers are properly re-registered.
+        if needs_repoll {
+            cx.waker().wake_by_ref();
+        }
+
         Poll::Pending
     }
 }
diff --git a/graph/src/amp/stream_aggregator/record_batch/aggregator.rs b/graph/src/amp/stream_aggregator/record_batch/aggregator.rs
index f2c9cff13e0..acce58ebdeb 100644
--- a/graph/src/amp/stream_aggregator/record_batch/aggregator.rs
+++ b/graph/src/amp/stream_aggregator/record_batch/aggregator.rs
@@ -1,10 +1,10 @@
 use std::{
-    collections::{btree_map::Entry, BTreeMap, HashSet},
+    collections::{BTreeMap, HashSet, btree_map::Entry},
     sync::{Arc, Weak},
 };
 
 use alloy::primitives::{BlockHash, BlockNumber};
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use arrow::array::RecordBatch;
 
 use super::{Decoder, GroupData};
@@ -146,11 +146,11 @@ impl Aggregator {
         let incomplete_groups = self.buffer.split_off(max_block_ptr);
         let mut completed_groups = std::mem::replace(&mut self.buffer, incomplete_groups);
 
-        if let Some((block_ptr, _)) = self.buffer.first_key_value() {
-            if block_ptr == max_block_ptr {
-                let (block_ptr, group_data) = self.buffer.pop_first().unwrap();
-                completed_groups.insert(block_ptr, group_data);
-            }
+        if let Some((block_ptr, _)) = self.buffer.first_key_value()
+            && block_ptr == max_block_ptr
+        {
+            let (block_ptr, group_data) = self.buffer.pop_first().unwrap();
+            completed_groups.insert(block_ptr, group_data);
         }
 
         if completed_groups.is_empty() {
diff --git a/graph/src/amp/stream_aggregator/record_batch/buffer.rs b/graph/src/amp/stream_aggregator/record_batch/buffer.rs
index 4b45680636c..476da79f0fc 100644
--- a/graph/src/amp/stream_aggregator/record_batch/buffer.rs
+++ b/graph/src/amp/stream_aggregator/record_batch/buffer.rs
@@ -1,7 +1,7 @@
-use std::collections::{btree_map::Entry, BTreeMap};
+use std::collections::{BTreeMap, btree_map::Entry};
 
 use alloy::primitives::{BlockHash, BlockNumber};
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use arrow::array::RecordBatch;
 
 use super::{Aggregator, RecordBatchGroup, RecordBatchGroups, StreamRecordBatch};
@@ -11,21 +11,21 @@ use super::{Aggregator, RecordBatchGroup, RecordBatchGroups, StreamRecordBatch};
 pub(in super::super) struct Buffer {
     aggregators: Vec<Aggregator>,
     num_streams: usize,
-    max_buffer_size: usize,
+    buffer_size: usize,
 }
 
 impl Buffer {
     /// Creates a new buffer that can handle exactly `num_streams` number of streams.
     ///
     /// Creates a new associated `Aggregator` for each stream.
-    /// The `max_buffer_size` specifies how many record batches for each stream can be buffered at most.
-    pub(in super::super) fn new(num_streams: usize, max_buffer_size: usize) -> Self {
+    /// The `buffer_size` specifies how many record batches for each stream can be buffered at most.
+    pub(in super::super) fn new(num_streams: usize, buffer_size: usize) -> Self {
         let aggregators = (0..num_streams).map(|_| Aggregator::new()).collect();
 
         Self {
             aggregators,
             num_streams,
-            max_buffer_size,
+            buffer_size,
         }
     }
 
@@ -130,7 +130,7 @@ impl Buffer {
     /// Panics if the `stream_index` is greater than the initialized number of streams.
     pub(in super::super) fn has_capacity(&self, stream_index: usize) -> bool {
         assert!(stream_index < self.num_streams);
-        self.aggregators[stream_index].len() < self.max_buffer_size
+        self.aggregators[stream_index].len() < self.buffer_size
     }
 
     /// Returns `true` if the stream `stream_index` is not allowed to make progress and
@@ -190,7 +190,8 @@ impl Buffer {
                 }
                 Entry::Occupied(entry) => {
                     if *entry.get() != max_completed_block_hash {
-                        bail!("aggregated data is corrupted: stream {} produced block hash '0x{}' for block {}, but a previous stream set the block hash to '0x{}'",
+                        bail!(
+                            "aggregated data is corrupted: stream {} produced block hash '0x{}' for block {}, but a previous stream set the block hash to '0x{}'",
                             stream_index,
                             hex::encode(max_completed_block_hash),
                             max_completed_block_number,
diff --git a/graph/src/amp/stream_aggregator/record_batch/decoder.rs b/graph/src/amp/stream_aggregator/record_batch/decoder.rs
index a2c5cf92daf..14e5410910a 100644
--- a/graph/src/amp/stream_aggregator/record_batch/decoder.rs
+++ b/graph/src/amp/stream_aggregator/record_batch/decoder.rs
@@ -1,5 +1,5 @@
 use alloy::primitives::{BlockHash, BlockNumber};
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use arrow::array::RecordBatch;
 
 use crate::amp::codec::{
diff --git a/graph/src/blockchain/block_stream.rs b/graph/src/blockchain/block_stream.rs
index 7de4222efe2..8098cfea664 100644
--- a/graph/src/blockchain/block_stream.rs
+++ b/graph/src/blockchain/block_stream.rs
@@ -1,5 +1,5 @@
 use crate::blockchain::SubgraphFilter;
-use crate::data_source::{subgraph, CausalityRegion};
+use crate::data_source::{CausalityRegion, subgraph};
 use anyhow::Error;
 use async_stream::stream;
 use async_trait::async_trait;
@@ -66,7 +66,7 @@ impl<C: Blockchain + 'static> BufferedBlockStream<C> {
                     return Err(anyhow!(
                         "buffered blockstream channel is closed, stopping. Err: {}",
                         err
-                    ))
+                    ));
                 }
             }
         }
@@ -705,14 +705,6 @@ pub enum BlockStreamError {
     ProtobufDecodingError(#[from] prost::DecodeError),
     #[error("block stream error {0}")]
     Unknown(#[from] anyhow::Error),
-    #[error("block stream fatal error {0}")]
-    Fatal(String),
-}
-
-impl BlockStreamError {
-    pub fn is_deterministic(&self) -> bool {
-        matches!(self, Self::Fatal(_))
-    }
 }
 
 #[derive(Debug)]
diff --git a/graph/src/blockchain/firehose_block_ingestor.rs b/graph/src/blockchain/firehose_block_ingestor.rs
index 774785fa2f5..1a0ff0f2c06 100644
--- a/graph/src/blockchain/firehose_block_ingestor.rs
+++ b/graph/src/blockchain/firehose_block_ingestor.rs
@@ -3,8 +3,8 @@ use std::{marker::PhantomData, sync::Arc, time::Duration};
 use crate::{
     blockchain::Block as BlockchainBlock,
     components::store::ChainHeadStore,
-    firehose::{self, decode_firehose_block, HeaderOnly},
-    prelude::{error, info, Logger},
+    firehose::{self, HeaderOnly, decode_firehose_block},
+    prelude::{Logger, error, info},
     util::backoff::ExponentialBackoff,
 };
 use anyhow::{Context, Error};
@@ -15,7 +15,7 @@ use prost_types::Any;
 use slog::{o, trace};
 use tonic::Streaming;
 
-use super::{client::ChainClient, BlockIngestor, Blockchain, BlockchainKind};
+use super::{BlockIngestor, Blockchain, BlockchainKind, client::ChainClient};
 use crate::components::network_provider::ChainName;
 
 const TRANSFORM_ETHEREUM_HEADER_ONLY: &str =
diff --git a/graph/src/blockchain/firehose_block_stream.rs b/graph/src/blockchain/firehose_block_stream.rs
index 90e985ff44d..9ad0f2aa6e5 100644
--- a/graph/src/blockchain/firehose_block_stream.rs
+++ b/graph/src/blockchain/firehose_block_stream.rs
@@ -1,10 +1,10 @@
+use super::Blockchain;
 use super::block_stream::{
-    BlockStream, BlockStreamError, BlockStreamEvent, FirehoseMapper, FIREHOSE_BUFFER_STREAM_SIZE,
+    BlockStream, BlockStreamError, BlockStreamEvent, FIREHOSE_BUFFER_STREAM_SIZE, FirehoseMapper,
 };
 use super::client::ChainClient;
-use super::Blockchain;
-use crate::blockchain::block_stream::FirehoseCursor;
 use crate::blockchain::TriggerFilter;
+use crate::blockchain::block_stream::FirehoseCursor;
 use crate::prelude::*;
 use crate::util::backoff::ExponentialBackoff;
 use crate::{firehose, firehose::FirehoseEndpoint};
@@ -360,7 +360,10 @@ async fn process_firehose_response<C: Blockchain, F: FirehoseMapper<C>>(
         .context("Mapping block to BlockStreamEvent failed")?;
 
     if *check_subgraph_continuity {
-        info!(logger, "Firehose started from a subgraph pointer without an existing cursor, ensuring chain continuity");
+        info!(
+            logger,
+            "Firehose started from a subgraph pointer without an existing cursor, ensuring chain continuity"
+        );
 
         if let BlockStreamEvent::ProcessBlock(ref block, _) = event {
             let previous_block_ptr = block.parent_ptr();
@@ -380,7 +383,10 @@ async fn process_firehose_response<C: Blockchain, F: FirehoseMapper<C>>(
                     .context("Could not fetch final block to revert to")?;
 
                 if revert_to.number < manifest_start_block_num {
-                    warn!(&logger, "We would return before subgraph manifest's start block, limiting rewind to manifest's start block");
+                    warn!(
+                        &logger,
+                        "We would return before subgraph manifest's start block, limiting rewind to manifest's start block"
+                    );
 
                     // We must revert up to parent's of manifest start block to ensure we delete everything "including" the start
                     // block that was processed.
@@ -445,10 +451,10 @@ fn must_check_subgraph_continuity(
 #[cfg(test)]
 mod tests {
     use crate::blockchain::{
-        block_stream::FirehoseCursor, firehose_block_stream::must_check_subgraph_continuity,
-        BlockPtr,
+        BlockPtr, block_stream::FirehoseCursor,
+        firehose_block_stream::must_check_subgraph_continuity,
     };
-    use slog::{o, Logger};
+    use slog::{Logger, o};
 
     #[test]
     fn check_continuity() {
diff --git a/graph/src/blockchain/mock.rs b/graph/src/blockchain/mock.rs
index 31980a996f2..a87e3da1fc3 100644
--- a/graph/src/blockchain/mock.rs
+++ b/graph/src/blockchain/mock.rs
@@ -1,26 +1,26 @@
 use crate::{
     bail,
     components::{
+        ethereum::CachedBlock,
         link_resolver::LinkResolver,
         network_provider::ChainName,
         store::{
             BlockNumber, ChainHeadStore, ChainIdStore, DeploymentCursorTracker, DeploymentLocator,
-            SourceableStore,
+            SourceableStore, StaleCallCacheResult,
         },
         subgraph::InstanceDSTemplateInfo,
     },
     data::subgraph::{DeploymentHash, UnifiedMappingApiVersion},
     data_source,
     prelude::{
-        transaction_receipt::LightTransactionReceipt, BlockHash, ChainStore,
-        DataSourceTemplateInfo, StoreError,
+        BlockHash, ChainStore, DataSourceTemplateInfo, StoreError,
+        transaction_receipt::LightTransactionReceipt,
     },
 };
 use alloy::primitives::{B256, U256};
 use anyhow::{Error, Result};
 use async_trait::async_trait;
 use serde::Deserialize;
-use serde_json::Value;
 use slog::Logger;
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap, HashSet},
@@ -29,17 +29,17 @@ use std::{
 };
 
 use super::{
-    block_stream::{self, BlockStream, FirehoseCursor},
-    client::ChainClient,
     BlockIngestor, BlockTime, ChainIdentifier, EmptyNodeCapabilities, ExtendedBlockPtr, HostFn,
     IngestorError, MappingTriggerTrait, NoopDecoderHook, Trigger, TriggerFilterWrapper,
     TriggerWithHandler,
+    block_stream::{self, BlockStream, FirehoseCursor},
+    client::ChainClient,
 };
 
 use super::{
-    block_stream::BlockWithTriggers, Block, BlockPtr, Blockchain, BlockchainKind, DataSource,
-    DataSourceTemplate, RuntimeAdapter, TriggerData, TriggerFilter, TriggersAdapter,
-    UnresolvedDataSource, UnresolvedDataSourceTemplate,
+    Block, BlockPtr, Blockchain, BlockchainKind, DataSource, DataSourceTemplate, RuntimeAdapter,
+    TriggerData, TriggerFilter, TriggersAdapter, UnresolvedDataSource,
+    UnresolvedDataSourceTemplate, block_stream::BlockWithTriggers,
 };
 
 #[derive(Debug)]
@@ -527,7 +527,13 @@ impl ChainStore for MockChainStore {
     ) -> Result<Option<B256>, Error> {
         unimplemented!()
     }
-    async fn blocks(self: Arc<Self>, _hashes: Vec<BlockHash>) -> Result<Vec<Value>, Error> {
+    async fn blocks(self: Arc<Self>, _hashes: Vec<BlockHash>) -> Result<Vec<CachedBlock>, Error> {
+        unimplemented!()
+    }
+    async fn block_parent_ptr(
+        self: Arc<Self>,
+        _hash: &BlockHash,
+    ) -> Result<Option<BlockPtr>, Error> {
         unimplemented!()
     }
     async fn ancestor_block(
@@ -535,7 +541,15 @@ impl ChainStore for MockChainStore {
         _block_ptr: BlockPtr,
         _offset: BlockNumber,
         _root: Option<BlockHash>,
-    ) -> Result<Option<(Value, BlockPtr)>, Error> {
+    ) -> Result<Option<(CachedBlock, BlockPtr)>, Error> {
+        unimplemented!()
+    }
+    async fn ancestor_block_ptr(
+        self: Arc<Self>,
+        _block_ptr: BlockPtr,
+        _offset: BlockNumber,
+        _root: Option<BlockHash>,
+    ) -> Result<Option<BlockPtr>, Error> {
         unimplemented!()
     }
     async fn cleanup_cached_blocks(
@@ -580,9 +594,9 @@ impl ChainStore for MockChainStore {
     }
     async fn clear_stale_call_cache(
         &self,
-        _ttl_days: i32,
-        _ttl_max_contracts: Option<i64>,
-    ) -> Result<(), Error> {
+        _ttl_days: usize,
+        _max_contracts: Option<usize>,
+    ) -> Result<StaleCallCacheResult, Error> {
         unimplemented!()
     }
     async fn chain_identifier(&self) -> Result<ChainIdentifier, Error> {
diff --git a/graph/src/blockchain/mod.rs b/graph/src/blockchain/mod.rs
index f65fcea2e5b..df942d19910 100644
--- a/graph/src/blockchain/mod.rs
+++ b/graph/src/blockchain/mod.rs
@@ -22,17 +22,17 @@ use crate::{
         subgraph::{HostMetrics, InstanceDSTemplateInfo, MappingError},
         trigger_processor::RunnableTriggers,
     },
-    data::subgraph::{UnifiedMappingApiVersion, MIN_SPEC_VERSION},
-    data_source::{self, subgraph, DataSourceTemplateInfo},
+    data::subgraph::{MIN_SPEC_VERSION, UnifiedMappingApiVersion},
+    data_source::{self, DataSourceTemplateInfo, subgraph},
     prelude::{DataSourceContext, DeploymentHash},
-    runtime::{gas::GasCounter, AscHeap, HostExportError},
+    runtime::{AscHeap, HostExportError, gas::GasCounter},
 };
 use crate::{
     components::store::BlockNumber,
-    prelude::{thiserror::Error, LinkResolver},
+    prelude::{LinkResolver, thiserror::Error},
 };
 use alloy::primitives::B256;
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use async_trait::async_trait;
 use futures03::future::BoxFuture;
 use graph_derive::CheapClone;
diff --git a/graph/src/blockchain/types.rs b/graph/src/blockchain/types.rs
index f3f3fff58f1..dc88bd91841 100644
--- a/graph/src/blockchain/types.rs
+++ b/graph/src/blockchain/types.rs
@@ -19,8 +19,8 @@ use crate::data::graphql::IntoValue;
 use crate::data::store::scalar::Timestamp;
 use crate::derive::CheapClone;
 use crate::object;
-use crate::prelude::{r, Value};
-use crate::util::stable_hash_glue::{impl_stable_hash, AsBytes};
+use crate::prelude::{Value, r};
+use crate::util::stable_hash_glue::{AsBytes, impl_stable_hash};
 
 /// A simple marker for byte arrays that are really block hashes
 #[derive(Clone, Default, PartialEq, Eq, Hash, FromSqlRow, AsExpression)]
diff --git a/graph/src/components/ethereum/json_patch.rs b/graph/src/components/ethereum/json_patch.rs
new file mode 100644
index 00000000000..13859c8f4a7
--- /dev/null
+++ b/graph/src/components/ethereum/json_patch.rs
@@ -0,0 +1,123 @@
+//! JSON patching utilities for Ethereum blocks and receipts.
+//!
+//! Some cached blocks are missing the transaction `type` field because
+//! graph-node's rust-web3 fork didn't capture it. Alloy requires this field for
+//! deserialization. These utilities patch the JSON to add `type: "0x0"` (legacy
+//! transaction) where missing.
+//!
+//! Also used by `PatchingHttp` for chains that don't support EIP-2718 typed transactions.
+
+use serde_json::Value;
+
+pub fn patch_type_field(obj: &mut Value) -> bool {
+    if let Value::Object(map) = obj
+        && !map.contains_key("type")
+    {
+        map.insert("type".to_string(), Value::String("0x0".to_string()));
+        return true;
+    }
+    false
+}
+
+pub fn patch_block_transactions(block: &mut Value) -> bool {
+    let Some(txs) = block.get_mut("transactions").and_then(|t| t.as_array_mut()) else {
+        return false;
+    };
+    let mut patched = false;
+    for tx in txs {
+        patched |= patch_type_field(tx);
+    }
+    patched
+}
+
+pub fn patch_receipts(result: &mut Value) -> bool {
+    match result {
+        Value::Object(_) => patch_type_field(result),
+        Value::Array(arr) => {
+            let mut patched = false;
+            for r in arr {
+                patched |= patch_type_field(r);
+            }
+            patched
+        }
+        _ => false,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+
+    #[test]
+    fn patch_type_field_adds_missing_type() {
+        let mut obj = json!({"status": "0x1", "gasUsed": "0x5208"});
+        assert!(patch_type_field(&mut obj));
+        assert_eq!(obj["type"], "0x0");
+    }
+
+    #[test]
+    fn patch_type_field_preserves_existing_type() {
+        let mut obj = json!({"status": "0x1", "type": "0x2"});
+        assert!(!patch_type_field(&mut obj));
+        assert_eq!(obj["type"], "0x2");
+    }
+
+    #[test]
+    fn patch_type_field_handles_non_object() {
+        let mut val = json!("not an object");
+        assert!(!patch_type_field(&mut val));
+    }
+
+    #[test]
+    fn patch_block_transactions_patches_all() {
+        let mut block = json!({
+            "hash": "0x123",
+            "transactions": [
+                {"hash": "0xabc", "nonce": "0x1"},
+                {"hash": "0xdef", "nonce": "0x2", "type": "0x2"},
+                {"hash": "0xghi", "nonce": "0x3"}
+            ]
+        });
+        assert!(patch_block_transactions(&mut block));
+        assert_eq!(block["transactions"][0]["type"], "0x0");
+        assert_eq!(block["transactions"][1]["type"], "0x2");
+        assert_eq!(block["transactions"][2]["type"], "0x0");
+    }
+
+    #[test]
+    fn patch_block_transactions_handles_empty() {
+        let mut block = json!({"hash": "0x123", "transactions": []});
+        assert!(!patch_block_transactions(&mut block));
+    }
+
+    #[test]
+    fn patch_block_transactions_handles_missing_field() {
+        let mut block = json!({"hash": "0x123"});
+        assert!(!patch_block_transactions(&mut block));
+    }
+
+    #[test]
+    fn patch_receipts_single() {
+        let mut receipt = json!({"status": "0x1"});
+        assert!(patch_receipts(&mut receipt));
+        assert_eq!(receipt["type"], "0x0");
+    }
+
+    #[test]
+    fn patch_receipts_array() {
+        let mut receipts = json!([
+            {"status": "0x1"},
+            {"status": "0x1", "type": "0x2"}
+        ]);
+        assert!(patch_receipts(&mut receipts));
+        assert_eq!(receipts[0]["type"], "0x0");
+        assert_eq!(receipts[1]["type"], "0x2");
+    }
+
+    #[test]
+    fn patch_receipts_handles_null() {
+        let mut val = Value::Null;
+        assert!(!patch_receipts(&mut val));
+    }
+}
diff --git a/graph/src/components/ethereum/mod.rs b/graph/src/components/ethereum/mod.rs
index 0c068c24dee..bda1ef5c32b 100644
--- a/graph/src/components/ethereum/mod.rs
+++ b/graph/src/components/ethereum/mod.rs
@@ -1,9 +1,12 @@
+pub mod json_patch;
+mod network;
 mod types;
 
+pub use self::network::AnyNetworkBare;
 pub use self::types::{
-    AnyBlock, AnyTransaction, EthereumBlock, EthereumBlockWithCalls, EthereumCall,
-    LightEthereumBlock, LightEthereumBlockExt,
+    AnyBlock, AnyTransaction, AnyTransactionReceiptBare, CachedBlock, EthereumBlock,
+    EthereumBlockWithCalls, EthereumCall, LightEthereumBlock, LightEthereumBlockExt,
 };
 
 // Re-export Alloy network types for convenience
-pub use alloy::network::{AnyHeader, AnyRpcBlock, AnyRpcHeader, AnyRpcTransaction, AnyTxEnvelope};
+pub use alloy::network::{AnyHeader, AnyRpcHeader, AnyTxEnvelope};
diff --git a/graph/src/components/ethereum/network.rs b/graph/src/components/ethereum/network.rs
new file mode 100644
index 00000000000..8460ad7bdf1
--- /dev/null
+++ b/graph/src/components/ethereum/network.rs
@@ -0,0 +1,310 @@
+use alloy::consensus::BlobTransactionSidecarVariant;
+use alloy::eips::eip7702::SignedAuthorization;
+use alloy::network::{
+    AnyHeader, AnyReceiptEnvelope, AnyRpcTransaction, AnyTxEnvelope, AnyTxType,
+    AnyTypedTransaction, BuildResult, Network, NetworkTransactionBuilder, NetworkWallet,
+    TransactionBuilder, TransactionBuilder4844, TransactionBuilder7702, TransactionBuilderError,
+};
+use alloy::primitives::{Address, Bytes, ChainId, TxKind, U256};
+use alloy::providers::fillers::{
+    BlobGasFiller, ChainIdFiller, GasFiller, JoinFill, NonceFiller, RecommendedFillers,
+};
+use alloy::rpc::types::{
+    AccessList, Block, Header, Log, Transaction, TransactionInputKind, TransactionReceipt,
+    TransactionRequest,
+};
+use alloy::serde::WithOtherFields;
+use serde::{Deserialize, Serialize};
+use std::ops::{Deref, DerefMut};
+
+use super::types::AnyTransaction;
+
+/// Like alloy's [`AnyNetwork`] but without [`WithOtherFields`] on response types.
+///
+/// `AnyNetwork` wraps every response (block, transaction, receipt) in `WithOtherFields<T>`,
+/// which captures unknown JSON keys into a `BTreeMap`. This requires `#[serde(flatten)]`,
+/// forcing serde to buffer entire JSON objects into intermediate `Value` maps and
+/// re-serialize them to diff keys — on every block and every transaction.
+/// graph-node never uses these extra fields, so we define a bare network that deserializes
+/// directly into the inner types.
+///
+/// Uses `AnyTxEnvelope` (not `TxEnvelope`) to support non-standard transaction types from
+/// L2s and sidechains. `TransactionRequest` retains `WithOtherFields` because upstream
+/// `From` impls for `AnyTxEnvelope` only exist on `WithOtherFields<TransactionRequest>`.
+///
+/// [`AnyNetwork`]: alloy::network::AnyNetwork
+/// [`WithOtherFields`]: alloy::serde::WithOtherFields
+#[derive(Clone, Copy, Debug)]
+pub struct AnyNetworkBare;
+
+/// Newtype around `WithOtherFields<TransactionRequest>` needed because
+/// `Network::TransactionRequest` requires `From<Self::TransactionResponse>` and our
+/// `TransactionResponse` is `Transaction<AnyTxEnvelope>` (not wrapped in `WithOtherFields`).
+/// Upstream only provides `From<WithOtherFields<Transaction<AnyTxEnvelope>>>`, so we need
+/// this local type to bridge the conversion. Additionally, `NetworkTransactionBuilder`
+/// requires `TransactionBuilder + TransactionBuilder4844 + TransactionBuilder7702` as
+/// supertraits, so we must re-implement those by delegation since Rust doesn't auto-delegate
+/// trait impls through `Deref`.
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+#[serde(transparent)]
+pub struct AnyTransactionRequest(WithOtherFields<TransactionRequest>);
+
+impl Deref for AnyTransactionRequest {
+    type Target = WithOtherFields<TransactionRequest>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for AnyTransactionRequest {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl From<AnyTxEnvelope> for AnyTransactionRequest {
+    fn from(value: AnyTxEnvelope) -> Self {
+        Self(value.into())
+    }
+}
+
+impl From<TransactionRequest> for AnyTransactionRequest {
+    fn from(value: TransactionRequest) -> Self {
+        Self(value.into())
+    }
+}
+
+impl From<AnyTypedTransaction> for AnyTransactionRequest {
+    fn from(value: AnyTypedTransaction) -> Self {
+        Self(value.into())
+    }
+}
+
+impl From<AnyTransaction> for AnyTransactionRequest {
+    fn from(value: AnyTransaction) -> Self {
+        // Upstream only has From<AnyRpcTransaction> for WithOtherFields<TransactionRequest>,
+        // so we wrap in WithOtherFields first to match that impl.
+        let tx = WithOtherFields::<Transaction<AnyTxEnvelope>>::new(value);
+        Self(AnyRpcTransaction::from(tx).into())
+    }
+}
+
+impl Network for AnyNetworkBare {
+    type TxType = AnyTxType;
+    type TxEnvelope = AnyTxEnvelope;
+    type UnsignedTx = AnyTypedTransaction;
+    type ReceiptEnvelope = AnyReceiptEnvelope;
+    type Header = AnyHeader;
+
+    type TransactionRequest = AnyTransactionRequest;
+    type TransactionResponse = AnyTransaction;
+    type ReceiptResponse = TransactionReceipt<AnyReceiptEnvelope<Log>>;
+    type HeaderResponse = Header<AnyHeader>;
+    type BlockResponse = Block<AnyTransaction, Header<AnyHeader>>;
+}
+
+impl RecommendedFillers for AnyNetworkBare {
+    type RecommendedFillers =
+        JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>;
+
+    fn recommended_fillers() -> Self::RecommendedFillers {
+        Default::default()
+    }
+}
+
+// Delegate `TransactionBuilder` to the inner `WithOtherFields<TransactionRequest>`.
+// Required as a supertrait of `NetworkTransactionBuilder`.
+impl TransactionBuilder for AnyTransactionRequest {
+    fn chain_id(&self) -> Option<ChainId> {
+        self.0.chain_id()
+    }
+
+    fn set_chain_id(&mut self, chain_id: ChainId) {
+        self.0.set_chain_id(chain_id)
+    }
+
+    fn nonce(&self) -> Option<u64> {
+        self.0.nonce()
+    }
+
+    fn set_nonce(&mut self, nonce: u64) {
+        self.0.set_nonce(nonce)
+    }
+
+    fn take_nonce(&mut self) -> Option<u64> {
+        self.0.deref_mut().nonce.take()
+    }
+
+    fn input(&self) -> Option<&Bytes> {
+        self.0.input()
+    }
+
+    fn set_input<T: Into<Bytes>>(&mut self, input: T) {
+        self.0.set_input(input);
+    }
+
+    fn set_input_kind<T: Into<Bytes>>(&mut self, input: T, kind: TransactionInputKind) {
+        self.0.set_input_kind(input, kind)
+    }
+
+    fn from(&self) -> Option<Address> {
+        self.0.from()
+    }
+
+    fn set_from(&mut self, from: Address) {
+        self.0.set_from(from);
+    }
+
+    fn kind(&self) -> Option<TxKind> {
+        self.0.kind()
+    }
+
+    fn clear_kind(&mut self) {
+        self.0.clear_kind()
+    }
+
+    fn set_kind(&mut self, kind: TxKind) {
+        self.0.set_kind(kind)
+    }
+
+    fn value(&self) -> Option<U256> {
+        self.0.value()
+    }
+
+    fn set_value(&mut self, value: U256) {
+        self.0.set_value(value)
+    }
+
+    fn gas_price(&self) -> Option<u128> {
+        self.0.gas_price()
+    }
+
+    fn set_gas_price(&mut self, gas_price: u128) {
+        self.0.set_gas_price(gas_price);
+    }
+
+    fn max_fee_per_gas(&self) -> Option<u128> {
+        self.0.max_fee_per_gas()
+    }
+
+    fn set_max_fee_per_gas(&mut self, max_fee_per_gas: u128) {
+        self.0.set_max_fee_per_gas(max_fee_per_gas);
+    }
+
+    fn max_priority_fee_per_gas(&self) -> Option<u128> {
+        self.0.max_priority_fee_per_gas()
+    }
+
+    fn set_max_priority_fee_per_gas(&mut self, max_priority_fee_per_gas: u128) {
+        self.0
+            .set_max_priority_fee_per_gas(max_priority_fee_per_gas);
+    }
+
+    fn gas_limit(&self) -> Option<u64> {
+        self.0.gas_limit()
+    }
+
+    fn set_gas_limit(&mut self, gas_limit: u64) {
+        self.0.set_gas_limit(gas_limit);
+    }
+
+    fn access_list(&self) -> Option<&AccessList> {
+        self.0.access_list()
+    }
+
+    fn set_access_list(&mut self, access_list: AccessList) {
+        self.0.set_access_list(access_list)
+    }
+}
+
+// Delegate `TransactionBuilder4844` — required as a supertrait of `NetworkTransactionBuilder`.
+impl TransactionBuilder4844 for AnyTransactionRequest {
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        self.0.max_fee_per_blob_gas()
+    }
+
+    fn set_max_fee_per_blob_gas(&mut self, max_fee_per_blob_gas: u128) {
+        self.0.set_max_fee_per_blob_gas(max_fee_per_blob_gas)
+    }
+
+    fn blob_sidecar(&self) -> Option<&BlobTransactionSidecarVariant> {
+        self.0.blob_sidecar()
+    }
+
+    fn has_blob_sidecar(&self) -> bool {
+        self.0.has_blob_sidecar()
+    }
+
+    fn set_blob_sidecar(&mut self, sidecar: BlobTransactionSidecarVariant) {
+        self.0.set_blob_sidecar(sidecar)
+    }
+}
+
+// Delegate `TransactionBuilder7702` — required as a supertrait of `NetworkTransactionBuilder`.
+impl TransactionBuilder7702 for AnyTransactionRequest {
+    fn authorization_list(&self) -> Option<&Vec<SignedAuthorization>> {
+        self.0.authorization_list()
+    }
+
+    fn set_authorization_list(&mut self, authorization_list: Vec<SignedAuthorization>) {
+        self.0.set_authorization_list(authorization_list)
+    }
+}
+
+impl NetworkTransactionBuilder<AnyNetworkBare> for AnyTransactionRequest {
+    fn complete_type(
+        &self,
+        ty: <AnyNetworkBare as Network>::TxType,
+    ) -> Result<(), Vec<&'static str>> {
+        self.0
+            .deref()
+            .complete_type(ty.try_into().map_err(|_| vec!["supported tx type"])?)
+    }
+
+    fn can_submit(&self) -> bool {
+        self.0.deref().can_submit()
+    }
+
+    fn can_build(&self) -> bool {
+        self.0.deref().can_build()
+    }
+
+    fn output_tx_type(&self) -> <AnyNetworkBare as Network>::TxType {
+        self.0.deref().output_tx_type().into()
+    }
+
+    fn output_tx_type_checked(&self) -> Option<<AnyNetworkBare as Network>::TxType> {
+        self.0.deref().output_tx_type_checked().map(Into::into)
+    }
+
+    fn prep_for_submission(&mut self) {
+        self.0.deref_mut().prep_for_submission()
+    }
+
+    fn build_unsigned(
+        self,
+    ) -> BuildResult<<AnyNetworkBare as Network>::UnsignedTx, AnyNetworkBare> {
+        if let Err((tx_type, missing)) = self.0.missing_keys() {
+            return Err(TransactionBuilderError::InvalidTransactionRequest(
+                tx_type.into(),
+                missing,
+            )
+            .into_unbuilt(self));
+        }
+        Ok(self
+            .0
+            .inner
+            .build_typed_tx()
+            .expect("checked by missing_keys")
+            .into())
+    }
+
+    async fn build<W: NetworkWallet<AnyNetworkBare>>(
+        self,
+        wallet: &W,
+    ) -> Result<<AnyNetworkBare as Network>::TxEnvelope, TransactionBuilderError<AnyNetworkBare>>
+    {
+        Ok(wallet.sign_request(self).await?)
+    }
+}
diff --git a/graph/src/components/ethereum/types.rs b/graph/src/components/ethereum/types.rs
index a6c21aacb8a..104f6dbe036 100644
--- a/graph/src/components/ethereum/types.rs
+++ b/graph/src/components/ethereum/types.rs
@@ -1,9 +1,12 @@
 use alloy::{
-    network::{AnyRpcBlock, AnyRpcHeader, AnyRpcTransaction, ReceiptResponse, TransactionResponse},
-    primitives::{Address, Bytes, B256, U256},
+    network::{
+        AnyHeader, AnyReceiptEnvelope, AnyRpcHeader, AnyTxEnvelope, ReceiptResponse,
+        TransactionResponse,
+    },
+    primitives::{Address, B256, Bytes, U256},
     rpc::types::{
+        Block, Header, Log, Transaction, TransactionReceipt,
         trace::parity::{Action, LocalizedTransactionTrace, TraceOutput},
-        Log,
     },
 };
 use serde::{Deserialize, Serialize};
@@ -14,26 +17,28 @@ use crate::{
     prelude::BlockNumber,
 };
 
-// Use Alloy's official types for handling any transaction type
-pub type AnyTransaction = AnyRpcTransaction;
-pub type AnyBlock = AnyRpcBlock;
+use super::json_patch;
+
+pub type AnyTransaction = Transaction<AnyTxEnvelope>;
+pub type AnyBlock = Block<AnyTransaction, Header<AnyHeader>>;
+/// Like alloy's `AnyTransactionReceipt` but without the `WithOtherFields` wrapper,
+/// avoiding `#[serde(flatten)]` overhead during deserialization.
+pub type AnyTransactionReceiptBare = TransactionReceipt<AnyReceiptEnvelope<Log>>;
 
 #[allow(dead_code)]
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct LightEthereumBlock(AnyBlock);
 
 impl Default for LightEthereumBlock {
     fn default() -> Self {
-        use alloy::rpc::types::{Block, BlockTransactions};
-        use alloy::serde::WithOtherFields;
+        use alloy::rpc::types::BlockTransactions;
 
-        let default_block = Block {
+        Self(Block {
             header: AnyRpcHeader::default(),
             transactions: BlockTransactions::Full(vec![]),
             uncles: vec![],
             withdrawals: None,
-        };
-        Self(AnyBlock::new(WithOtherFields::new(default_block)))
+        })
     }
 }
 
@@ -186,7 +191,7 @@ impl EthereumBlockWithCalls {
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct EthereumBlock {
     pub block: Arc<LightEthereumBlock>,
-    pub transaction_receipts: Vec<Arc<alloy::network::AnyTransactionReceipt>>,
+    pub transaction_receipts: Vec<Arc<AnyTransactionReceiptBare>>,
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -256,3 +261,93 @@ impl<'a> From<&'a EthereumCall> for BlockPtr {
         BlockPtr::from((call.block_hash, call.block_number))
     }
 }
+
+/// Typed cached block for Ethereum. Stores the deserialized block so that
+/// repeated reads from the in-memory cache avoid `serde_json::from_value()`.
+#[derive(Clone, Debug)]
+pub enum CachedBlock {
+    Full(EthereumBlock),
+    Light(Arc<LightEthereumBlock>),
+}
+
+impl CachedBlock {
+    pub fn light_block(&self) -> &LightEthereumBlock {
+        match self {
+            CachedBlock::Full(block) => &block.block,
+            CachedBlock::Light(block) => block,
+        }
+    }
+
+    pub fn to_light_block(&self) -> Arc<LightEthereumBlock> {
+        match self {
+            CachedBlock::Full(block) => block.block.clone(),
+            CachedBlock::Light(block) => block.clone(),
+        }
+    }
+
+    pub fn into_full_block(self) -> Option<EthereumBlock> {
+        match self {
+            CachedBlock::Full(block) => Some(block),
+            CachedBlock::Light(_) => None,
+        }
+    }
+
+    /// Serializes the block data directly. Note: the output shape differs
+    /// from the store format (which wraps in a `{"block": ..}` envelope).
+    pub fn to_json(&self) -> serde_json::Result<serde_json::Value> {
+        match self {
+            CachedBlock::Full(b) => serde_json::to_value(b),
+            CachedBlock::Light(b) => serde_json::to_value(b),
+        }
+    }
+
+    /// Deserializes a JSON block from the store into a typed `CachedBlock`.
+    /// Returns `None` for shallow (header-only) blocks.
+    ///
+    /// Patches missing `type` fields in transactions/receipts before
+    /// deserialization for compatibility with blocks cached by older
+    /// graph-node versions.
+    pub fn from_json(mut value: serde_json::Value) -> Option<Self> {
+        // Shallow blocks have no body, only a null `data` field.
+        if value.get("data") == Some(&serde_json::Value::Null) {
+            return None;
+        }
+
+        let has_receipts = value
+            .get("transaction_receipts")
+            .is_some_and(|v| !v.is_null());
+
+        if has_receipts {
+            // Full block: patch in place then deserialize the entire value.
+            if let Some(block) = value.get_mut("block") {
+                json_patch::patch_block_transactions(block);
+            }
+            if let Some(receipts) = value.get_mut("transaction_receipts") {
+                json_patch::patch_receipts(receipts);
+            }
+            serde_json::from_value(value).ok().map(CachedBlock::Full)
+        } else {
+            // Light block: extract the inner `block` field, patch, and deserialize.
+            let mut inner = value
+                .as_object_mut()
+                .and_then(|obj| obj.remove("block"))
+                .unwrap_or(value);
+            json_patch::patch_block_transactions(&mut inner);
+            serde_json::from_value(inner)
+                .ok()
+                .map(|b| CachedBlock::Light(Arc::new(b)))
+        }
+    }
+
+    pub fn timestamp(&self) -> Option<u64> {
+        Some(self.light_block().timestamp_u64())
+    }
+
+    pub fn parent_ptr(&self) -> Option<BlockPtr> {
+        self.light_block().parent_ptr()
+    }
+
+    pub fn ptr(&self) -> BlockPtr {
+        self.light_block().block_ptr()
+    }
+}
diff --git a/graph/src/components/link_resolver/arweave.rs b/graph/src/components/link_resolver/arweave.rs
index abd3d80a503..e42263c9fe1 100644
--- a/graph/src/components/link_resolver/arweave.rs
+++ b/graph/src/components/link_resolver/arweave.rs
@@ -4,7 +4,7 @@ use async_trait::async_trait;
 use futures03::prelude::Stream;
 use reqwest::Client;
 use serde_json::Value;
-use slog::{debug, Logger};
+use slog::{Logger, debug};
 use thiserror::Error;
 
 use crate::data_source::offchain::Base64;
@@ -42,7 +42,7 @@ impl Default for ArweaveClient {
 
         Self {
             base_url: "https://arweave.net".parse().unwrap(),
-            client: Client::default(),
+            client: Client::builder().gzip(false).build().unwrap(),
             logger: Logger::root(slog::Discard, o!()),
         }
     }
@@ -53,7 +53,26 @@ impl ArweaveClient {
         Self {
             base_url,
             logger,
-            client: Client::default(),
+            client: Client::builder().gzip(false).build().unwrap(),
+        }
+    }
+
+    /// Make a request to arweave.net to fetch the content of the file with
+    /// the given txid/filename. Returns `None` if `arweave.net` is not
+    /// reachable.
+    #[cfg(debug_assertions)]
+    pub async fn get_test(file: &Base64) -> Option<Vec<u8>> {
+        let client = Self::default();
+
+        match client.get(file).await {
+            Ok(resp) => Some(resp),
+            Err(ArweaveClientError::ServerUnavailable(_)) => {
+                eprintln!("arweave.net is not reachable, skipping arweave tests");
+                None
+            }
+            Err(e) => {
+                panic!("Failed to fetch from arweave.net: {:?}", e);
+            }
         }
     }
 }
@@ -77,10 +96,17 @@ impl ArweaveResolver for ArweaveClient {
             .await
             .map_err(ArweaveClientError::from)?;
 
+        println!("Got response from arweave.net with status {}", rsp.status());
+        if rsp.status() == reqwest::StatusCode::GATEWAY_TIMEOUT {
+            return Err(ArweaveClientError::ServerUnavailable(
+                self.base_url.to_string(),
+            ));
+        }
+
         match (&limit, rsp.content_length()) {
             (_, None) => return Err(ArweaveClientError::UnableToCheckFileSize),
             (FileSizeLimit::MaxBytes(max), Some(cl)) if cl > *max => {
-                return Err(ArweaveClientError::FileTooLarge { got: cl, max: *max })
+                return Err(ArweaveClientError::FileTooLarge { got: cl, max: *max });
             }
             _ => {}
         };
@@ -114,21 +140,22 @@ pub enum ArweaveClientError {
     FileTooLarge { got: u64, max: u64 },
     #[error("Unknown error")]
     Unknown(#[from] reqwest::Error),
+    #[error("Server {0} unavailable")]
+    ServerUnavailable(String),
 }
 
 #[cfg(test)]
 mod test {
     use serde_derive::Deserialize;
 
-    use crate::{
-        components::link_resolver::{ArweaveClient, ArweaveResolver},
-        data_source::offchain::Base64,
-    };
+    use crate::{components::link_resolver::ArweaveClient, data_source::offchain::Base64};
 
     // This test ensures that passing txid/filename works when the txid refers to manifest.
     // the actual data seems to have some binary header and footer so these ranges were found
     // by inspecting the data with hexdump.
     #[crate::test]
+    // Ignored because arweave.net is unreliable right now
+    #[ignore]
     async fn fetch_bundler_url() {
         let url = Base64::from("Rtdn3QWEzM88MPC2dpWyV5waO7Vuz3VwPl_usS2WoHM/DriveManifest.json");
         #[derive(Deserialize, Debug, PartialEq)]
@@ -136,8 +163,11 @@ mod test {
             pub manifest: String,
         }
 
-        let client = ArweaveClient::default();
-        let no_header = &client.get(&url).await.unwrap()[1295..320078];
+        let Some(body) = ArweaveClient::get_test(&url).await else {
+            return;
+        };
+
+        let no_header = &body[1295..320078];
         let content: Manifest = serde_json::from_slice(no_header).unwrap();
         assert_eq!(
             content,
diff --git a/graph/src/components/link_resolver/ipfs.rs b/graph/src/components/link_resolver/ipfs.rs
index 37e22c12994..c1b866c9994 100644
--- a/graph/src/components/link_resolver/ipfs.rs
+++ b/graph/src/components/link_resolver/ipfs.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use anyhow::anyhow;
 use async_trait::async_trait;
 use bytes::BytesMut;
-use derivative::Derivative;
+use derive_more::Debug;
 use futures03::compat::Stream01CompatExt;
 use futures03::stream::StreamExt;
 use futures03::stream::TryStreamExt;
@@ -12,20 +12,19 @@ use serde_json::Value;
 
 use crate::derive::CheapClone;
 use crate::env::EnvVars;
-use crate::futures01::stream::poll_fn;
-use crate::futures01::stream::Stream;
-use crate::futures01::try_ready;
 use crate::futures01::Async;
 use crate::futures01::Poll;
+use crate::futures01::stream::Stream;
+use crate::futures01::stream::poll_fn;
+use crate::futures01::try_ready;
 use crate::ipfs::{ContentPath, IpfsClient, IpfsContext, RetryPolicy};
 use crate::prelude::*;
 
 use super::{LinkResolver, LinkResolverContext};
 
-#[derive(Clone, CheapClone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, CheapClone, Debug)]
 pub struct IpfsResolver {
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     client: Arc<dyn IpfsClient>,
 
     timeout: Duration,
@@ -262,7 +261,7 @@ mod tests {
         let logger = crate::log::discard();
 
         let client = IpfsRpcClient::new_unchecked(
-            ServerAddress::local_rpc_api(),
+            ServerAddress::test_rpc_api(),
             IpfsMetrics::test(),
             &logger,
         )
@@ -290,7 +289,7 @@ mod tests {
 
         let logger = crate::log::discard();
         let client = IpfsRpcClient::new_unchecked(
-            ServerAddress::local_rpc_api(),
+            ServerAddress::test_rpc_api(),
             IpfsMetrics::test(),
             &logger,
         )?;
diff --git a/graph/src/components/log_store/elasticsearch.rs b/graph/src/components/log_store/elasticsearch.rs
new file mode 100644
index 00000000000..4b1353690fe
--- /dev/null
+++ b/graph/src/components/log_store/elasticsearch.rs
@@ -0,0 +1,233 @@
+use async_trait::async_trait;
+use reqwest::Client;
+use serde::Deserialize;
+use serde_json::json;
+use slog::{Logger, warn};
+use std::collections::HashMap;
+use std::time::Duration;
+
+use crate::log::elastic::ElasticLoggingConfig;
+use crate::prelude::DeploymentHash;
+
+use super::{LogEntry, LogMeta, LogQuery, LogStore, LogStoreError};
+
+pub struct ElasticsearchLogStore {
+    endpoint: String,
+    username: Option<String>,
+    password: Option<String>,
+    client: Client,
+    index: String,
+    timeout: Duration,
+    logger: Logger,
+}
+
+impl ElasticsearchLogStore {
+    pub fn new(config: ElasticLoggingConfig, index: String, timeout: Duration) -> Self {
+        Self {
+            logger: crate::log::logger(false),
+            endpoint: config.endpoint,
+            username: config.username,
+            password: config.password,
+            client: config.client,
+            index,
+            timeout,
+        }
+    }
+
+    fn build_query(&self, query: &LogQuery) -> serde_json::Value {
+        let mut must_clauses = Vec::new();
+
+        // Filter by subgraph ID
+        must_clauses.push(json!({
+            "term": {
+                "subgraphId": query.subgraph_id.to_string()
+            }
+        }));
+
+        // Filter by log level
+        if let Some(level) = &query.level {
+            must_clauses.push(json!({
+                "term": {
+                    "level": level.as_str().to_ascii_lowercase()
+                }
+            }));
+        }
+
+        // Filter by time range
+        if query.from.is_some() || query.to.is_some() {
+            let mut range = serde_json::Map::new();
+            if let Some(from) = &query.from {
+                range.insert("gte".to_string(), json!(from));
+            }
+            if let Some(to) = &query.to {
+                range.insert("lte".to_string(), json!(to));
+            }
+            must_clauses.push(json!({
+                "range": {
+                    "timestamp": range
+                }
+            }));
+        }
+
+        // Filter by text search
+        if let Some(search) = &query.search {
+            must_clauses.push(json!({
+                "match": {
+                    "text": search
+                }
+            }));
+        }
+
+        json!({
+            "query": {
+                "bool": {
+                    "must": must_clauses
+                }
+            },
+            "from": query.skip,
+            "size": query.first,
+            "sort": [
+                { "timestamp": { "order": query.order_direction.as_str() } }
+            ]
+        })
+    }
+
+    async fn execute_search(
+        &self,
+        query_body: serde_json::Value,
+    ) -> Result<Vec<LogEntry>, LogStoreError> {
+        let url = format!("{}/{}/_search", self.endpoint, self.index);
+
+        let mut request = self
+            .client
+            .post(&url)
+            .json(&query_body)
+            .timeout(self.timeout);
+
+        // Add basic auth if credentials provided
+        if let (Some(username), Some(password)) = (&self.username, &self.password) {
+            request = request.basic_auth(username, Some(password));
+        }
+
+        let response = request.send().await.map_err(|e| {
+            LogStoreError::QueryFailed(
+                anyhow::Error::from(e).context("Elasticsearch request failed"),
+            )
+        })?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            // Include response body in error context for debugging
+            // The body is part of the error chain but not the main error message to avoid
+            // leaking sensitive Elasticsearch internals in logs
+            let body_text = response
+                .text()
+                .await
+                .unwrap_or_else(|_| "<failed to read response body>".to_string());
+            return Err(LogStoreError::QueryFailed(
+                anyhow::anyhow!("Elasticsearch query failed with status {}", status)
+                    .context(format!("Response body: {}", body_text)),
+            ));
+        }
+
+        let response_body: ElasticsearchResponse = response.json().await.map_err(|e| {
+            LogStoreError::QueryFailed(
+                anyhow::Error::from(e).context(
+                    "failed to parse Elasticsearch search response: response format may have changed or be invalid",
+                ),
+            )
+        })?;
+
+        let entries = response_body
+            .hits
+            .hits
+            .into_iter()
+            .filter_map(|hit| self.parse_log_entry(hit.source))
+            .collect();
+
+        Ok(entries)
+    }
+
+    fn parse_log_entry(&self, source: ElasticsearchLogDocument) -> Option<LogEntry> {
+        let level = match source.level.parse() {
+            Ok(l) => l,
+            Err(_) => {
+                warn!(self.logger, "Invalid log level in Elasticsearch entry"; "level" => &source.level);
+                return None;
+            }
+        };
+
+        let subgraph_id = match DeploymentHash::new(&source.subgraph_id) {
+            Ok(id) => id,
+            Err(_) => {
+                warn!(self.logger, "Invalid subgraph ID in Elasticsearch entry"; "subgraph_id" => &source.subgraph_id);
+                return None;
+            }
+        };
+
+        // Convert arguments HashMap to Vec<(String, String)>
+        let arguments: Vec<(String, String)> = source.arguments.into_iter().collect();
+
+        Some(LogEntry {
+            id: source.id,
+            subgraph_id,
+            timestamp: source.timestamp,
+            level,
+            text: source.text,
+            arguments,
+            meta: LogMeta {
+                module: source.meta.module,
+                line: source.meta.line,
+                column: source.meta.column,
+            },
+        })
+    }
+}
+
+#[async_trait]
+impl LogStore for ElasticsearchLogStore {
+    async fn query_logs(&self, query: LogQuery) -> Result<Vec<LogEntry>, LogStoreError> {
+        let query_body = self.build_query(&query);
+        self.execute_search(query_body).await
+    }
+
+    fn is_available(&self) -> bool {
+        true
+    }
+}
+
+// Elasticsearch response types
+#[derive(Debug, Deserialize)]
+struct ElasticsearchResponse {
+    hits: ElasticsearchHits,
+}
+
+#[derive(Debug, Deserialize)]
+struct ElasticsearchHits {
+    hits: Vec<ElasticsearchHit>,
+}
+
+#[derive(Debug, Deserialize)]
+struct ElasticsearchHit {
+    #[serde(rename = "_source")]
+    source: ElasticsearchLogDocument,
+}
+
+#[derive(Debug, Deserialize)]
+struct ElasticsearchLogDocument {
+    id: String,
+    #[serde(rename = "subgraphId")]
+    subgraph_id: String,
+    timestamp: String,
+    level: String,
+    text: String,
+    arguments: HashMap<String, String>,
+    meta: ElasticsearchLogMeta,
+}
+
+#[derive(Debug, Deserialize)]
+struct ElasticsearchLogMeta {
+    module: String,
+    line: i64,
+    column: i64,
+}
diff --git a/graph/src/components/log_store/file.rs b/graph/src/components/log_store/file.rs
new file mode 100644
index 00000000000..55899dedd72
--- /dev/null
+++ b/graph/src/components/log_store/file.rs
@@ -0,0 +1,637 @@
+use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
+use slog::{Logger, warn};
+use std::cmp::Reverse;
+use std::collections::BinaryHeap;
+use std::fs::File;
+use std::io::{BufRead, BufReader};
+use std::path::PathBuf;
+
+use crate::prelude::DeploymentHash;
+
+use super::{LogEntry, LogMeta, LogQuery, LogStore, LogStoreError};
+
+pub struct FileLogStore {
+    directory: PathBuf,
+    retention_hours: u32,
+    logger: Logger,
+}
+
+impl FileLogStore {
+    pub fn new(directory: PathBuf, retention_hours: u32) -> Result<Self, LogStoreError> {
+        // Create directory if it doesn't exist
+        std::fs::create_dir_all(&directory)
+            .map_err(|e| LogStoreError::InitializationFailed(e.into()))?;
+
+        let store = Self {
+            directory,
+            retention_hours,
+            logger: crate::log::logger(false),
+        };
+
+        // Run cleanup on startup for all existing log files
+        if retention_hours > 0
+            && let Ok(entries) = std::fs::read_dir(&store.directory)
+        {
+            for entry in entries.filter_map(Result::ok) {
+                let path = entry.path();
+
+                // Only process .jsonl files
+                if path.extension().and_then(|s| s.to_str()) == Some("jsonl") {
+                    // Run cleanup, but don't fail initialization if cleanup fails
+                    if let Err(e) = store.cleanup_old_logs(&path) {
+                        eprintln!("Warning: Failed to cleanup old logs for {:?}: {}", path, e);
+                    }
+                }
+            }
+        }
+
+        Ok(store)
+    }
+
+    /// Get log file path for a subgraph
+    fn log_file_path(&self, subgraph_id: &DeploymentHash) -> PathBuf {
+        self.directory.join(format!("{}.jsonl", subgraph_id))
+    }
+
+    /// Parse a JSON line into a LogEntry
+    fn parse_line(&self, line: &str) -> Option<LogEntry> {
+        let doc: FileLogDocument = match serde_json::from_str(line) {
+            Ok(doc) => doc,
+            Err(e) => {
+                warn!(self.logger, "Failed to parse log line"; "error" => e.to_string());
+                return None;
+            }
+        };
+
+        let level = match doc.level.parse() {
+            Ok(l) => l,
+            Err(_) => {
+                warn!(self.logger, "Invalid log level"; "level" => &doc.level);
+                return None;
+            }
+        };
+
+        let subgraph_id = match DeploymentHash::new(&doc.subgraph_id) {
+            Ok(id) => id,
+            Err(_) => {
+                warn!(self.logger, "Invalid subgraph ID"; "subgraph_id" => &doc.subgraph_id);
+                return None;
+            }
+        };
+
+        Some(LogEntry {
+            id: doc.id,
+            subgraph_id,
+            timestamp: doc.timestamp,
+            level,
+            text: doc.text,
+            arguments: doc.arguments,
+            meta: LogMeta {
+                module: doc.meta.module,
+                line: doc.meta.line,
+                column: doc.meta.column,
+            },
+        })
+    }
+
+    /// Check if an entry matches the query filters
+    fn matches_filters(&self, entry: &LogEntry, query: &LogQuery) -> bool {
+        // Level filter
+        if let Some(level) = query.level
+            && entry.level != level
+        {
+            return false;
+        }
+
+        // Time range filters
+        if let Some(ref from) = query.from
+            && entry.timestamp < *from
+        {
+            return false;
+        }
+
+        if let Some(ref to) = query.to
+            && entry.timestamp > *to
+        {
+            return false;
+        }
+
+        // Text search (case-insensitive)
+        if let Some(ref search) = query.search
+            && !entry.text.to_lowercase().contains(&search.to_lowercase())
+        {
+            return false;
+        }
+
+        true
+    }
+
+    /// Delete log entries older than retention_hours
+    fn cleanup_old_logs(&self, file_path: &std::path::Path) -> Result<(), LogStoreError> {
+        if self.retention_hours == 0 {
+            return Ok(()); // Cleanup disabled, keep all logs
+        }
+
+        use chrono::{DateTime, Duration, Utc};
+        use std::io::Write;
+
+        // Calculate cutoff time
+        let cutoff = Utc::now() - Duration::hours(self.retention_hours as i64);
+
+        // Read all log entries
+        let file = File::open(file_path).map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+        let reader = BufReader::new(file);
+
+        let kept_entries: Vec<String> = reader
+            .lines()
+            .map_while(Result::ok)
+            .filter(|line| {
+                // Parse timestamp from log entry
+                if let Some(entry) = self.parse_line(line) {
+                    // Parse RFC3339 timestamp
+                    if let Ok(timestamp) = DateTime::parse_from_rfc3339(&entry.timestamp) {
+                        return timestamp.with_timezone(&Utc) >= cutoff;
+                    }
+                }
+                // Keep if we can't parse (don't delete on error)
+                true
+            })
+            .collect();
+
+        // Write filtered file atomically
+        let temp_path = file_path.with_extension("jsonl.tmp");
+        let mut temp_file =
+            File::create(&temp_path).map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+
+        for entry in kept_entries {
+            writeln!(temp_file, "{}", entry).map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+        }
+
+        temp_file
+            .sync_all()
+            .map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+
+        // Atomic rename
+        std::fs::rename(&temp_path, file_path).map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+
+        Ok(())
+    }
+}
+
+/// Helper struct to enable timestamp-based comparisons for BinaryHeap
+/// Implements Ord based on timestamp field for maintaining a min-heap of recent entries
+struct TimestampedEntry {
+    entry: LogEntry,
+}
+
+impl PartialEq for TimestampedEntry {
+    fn eq(&self, other: &Self) -> bool {
+        self.entry.timestamp == other.entry.timestamp
+    }
+}
+
+impl Eq for TimestampedEntry {}
+
+impl PartialOrd for TimestampedEntry {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for TimestampedEntry {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.entry.timestamp.cmp(&other.entry.timestamp)
+    }
+}
+
+#[async_trait]
+impl LogStore for FileLogStore {
+    async fn query_logs(&self, query: LogQuery) -> Result<Vec<LogEntry>, LogStoreError> {
+        let file_path = self.log_file_path(&query.subgraph_id);
+
+        if !file_path.exists() {
+            return Ok(vec![]);
+        }
+
+        let file = File::open(&file_path).map_err(|e| LogStoreError::QueryFailed(e.into()))?;
+        let reader = BufReader::new(file);
+
+        // Calculate how many entries we need to keep in memory
+        // We need skip + first entries to handle pagination
+        let needed_entries = (query.skip + query.first) as usize;
+
+        // Use a min-heap (via Reverse) to maintain only the top N most recent entries
+        // This bounds memory usage to O(skip + first) instead of O(total_log_entries)
+        let mut top_entries: BinaryHeap<Reverse<TimestampedEntry>> =
+            BinaryHeap::with_capacity(needed_entries + 1);
+
+        // Stream through the file line-by-line, applying filters and maintaining bounded collection
+        for line in reader.lines() {
+            // Skip malformed lines
+            let line = match line {
+                Ok(l) => l,
+                Err(_) => continue,
+            };
+
+            // Parse the line into a LogEntry
+            let entry = match self.parse_line(&line) {
+                Some(e) => e,
+                None => continue,
+            };
+
+            // Apply filters early to avoid keeping filtered-out entries in memory
+            if !self.matches_filters(&entry, &query) {
+                continue;
+            }
+
+            let timestamped = TimestampedEntry { entry };
+
+            // Maintain only the top N most recent entries by timestamp
+            // BinaryHeap with Reverse creates a min-heap, so we can efficiently
+            // keep the N largest (most recent) timestamps
+            if top_entries.len() < needed_entries {
+                top_entries.push(Reverse(timestamped));
+            } else if let Some(Reverse(oldest)) = top_entries.peek() {
+                // If this entry is more recent than the oldest in our heap, replace it
+                if timestamped.entry.timestamp > oldest.entry.timestamp {
+                    top_entries.pop();
+                    top_entries.push(Reverse(timestamped));
+                }
+            }
+        }
+
+        // Convert heap to sorted vector (most recent first)
+        let mut result: Vec<LogEntry> = top_entries
+            .into_iter()
+            .map(|Reverse(te)| te.entry)
+            .collect();
+
+        // Sort by timestamp (direction based on query)
+        match query.order_direction {
+            super::OrderDirection::Desc => result.sort_by(|a, b| b.timestamp.cmp(&a.timestamp)),
+            super::OrderDirection::Asc => result.sort_by(|a, b| a.timestamp.cmp(&b.timestamp)),
+        }
+
+        // Apply skip and take to get the final page
+        Ok(result
+            .into_iter()
+            .skip(query.skip as usize)
+            .take(query.first as usize)
+            .collect())
+    }
+
+    fn is_available(&self) -> bool {
+        self.directory.exists() && self.directory.is_dir()
+    }
+}
+
+// File log document format (JSON Lines)
+#[derive(Debug, Serialize, Deserialize)]
+struct FileLogDocument {
+    id: String,
+    #[serde(rename = "subgraphId")]
+    subgraph_id: String,
+    timestamp: String,
+    level: String,
+    text: String,
+    arguments: Vec<(String, String)>,
+    meta: FileLogMeta,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct FileLogMeta {
+    module: String,
+    line: i64,
+    column: i64,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use slog::Level;
+    use std::io::Write;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_file_log_store_initialization() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 0);
+        assert!(store.is_ok());
+
+        let store = store.unwrap();
+        assert!(store.is_available());
+    }
+
+    #[test]
+    fn test_log_file_path() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 0).unwrap();
+
+        let subgraph_id = DeploymentHash::new("QmTest").unwrap();
+        let path = store.log_file_path(&subgraph_id);
+
+        assert_eq!(path, temp_dir.path().join("QmTest.jsonl"));
+    }
+
+    #[tokio::test]
+    async fn test_query_nonexistent_file() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 0).unwrap();
+
+        let query = LogQuery {
+            subgraph_id: DeploymentHash::new("QmNonexistent").unwrap(),
+            level: None,
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: super::super::OrderDirection::Desc,
+        };
+
+        let result = store.query_logs(query).await;
+        assert!(result.is_ok());
+        assert_eq!(result.unwrap().len(), 0);
+    }
+
+    #[tokio::test]
+    async fn test_query_with_sample_data() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 0).unwrap();
+
+        let subgraph_id = DeploymentHash::new("QmTest").unwrap();
+        let file_path = store.log_file_path(&subgraph_id);
+
+        // Write some test data
+        let mut file = File::create(&file_path).unwrap();
+        let log_entry = FileLogDocument {
+            id: "log-1".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: "2024-01-15T10:30:00Z".to_string(),
+            level: "error".to_string(),
+            text: "Test error message".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 42,
+                column: 10,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&log_entry).unwrap()).unwrap();
+
+        // Query
+        let query = LogQuery {
+            subgraph_id,
+            level: None,
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: super::super::OrderDirection::Desc,
+        };
+
+        let result = store.query_logs(query).await;
+        assert!(result.is_ok());
+
+        let entries = result.unwrap();
+        assert_eq!(entries.len(), 1);
+        assert_eq!(entries[0].id, "log-1");
+        assert_eq!(entries[0].text, "Test error message");
+        assert_eq!(entries[0].level, Level::Error);
+    }
+
+    #[tokio::test]
+    async fn test_query_with_level_filter() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 0).unwrap();
+
+        let subgraph_id = DeploymentHash::new("QmTest").unwrap();
+        let file_path = store.log_file_path(&subgraph_id);
+
+        // Write test data with different levels
+        let mut file = File::create(&file_path).unwrap();
+        for (id, level) in [("log-1", "error"), ("log-2", "info"), ("log-3", "error")] {
+            let log_entry = FileLogDocument {
+                id: id.to_string(),
+                subgraph_id: "QmTest".to_string(),
+                timestamp: format!("2024-01-15T10:30:{}Z", id),
+                level: level.to_string(),
+                text: format!("Test {} message", level),
+                arguments: vec![],
+                meta: FileLogMeta {
+                    module: "test.ts".to_string(),
+                    line: 42,
+                    column: 10,
+                },
+            };
+            writeln!(file, "{}", serde_json::to_string(&log_entry).unwrap()).unwrap();
+        }
+
+        // Query for errors only
+        let query = LogQuery {
+            subgraph_id,
+            level: Some(Level::Error),
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: super::super::OrderDirection::Desc,
+        };
+
+        let result = store.query_logs(query).await;
+        assert!(result.is_ok());
+
+        let entries = result.unwrap();
+        assert_eq!(entries.len(), 2);
+        assert!(entries.iter().all(|e| e.level == Level::Error));
+    }
+
+    #[tokio::test]
+    async fn test_cleanup_old_logs() {
+        use chrono::{Duration, Utc};
+
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 24).unwrap();
+
+        let subgraph_id = DeploymentHash::new("QmTest").unwrap();
+        let file_path = store.log_file_path(&subgraph_id);
+
+        // Create test data with old and new entries
+        let mut file = File::create(&file_path).unwrap();
+
+        // Old entry (48 hours ago)
+        let old_timestamp =
+            (Utc::now() - Duration::hours(48)).to_rfc3339_opts(chrono::SecondsFormat::Secs, true);
+        let old_entry = FileLogDocument {
+            id: "log-old".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: old_timestamp,
+            level: "info".to_string(),
+            text: "Old log entry".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 1,
+                column: 1,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&old_entry).unwrap()).unwrap();
+
+        // New entry (12 hours ago)
+        let new_timestamp =
+            (Utc::now() - Duration::hours(12)).to_rfc3339_opts(chrono::SecondsFormat::Secs, true);
+        let new_entry = FileLogDocument {
+            id: "log-new".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: new_timestamp,
+            level: "info".to_string(),
+            text: "New log entry".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 2,
+                column: 1,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&new_entry).unwrap()).unwrap();
+        drop(file);
+
+        // Run cleanup
+        store.cleanup_old_logs(&file_path).unwrap();
+
+        // Query to verify only new entry remains
+        let query = LogQuery {
+            subgraph_id,
+            level: None,
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: super::super::OrderDirection::Desc,
+        };
+
+        let result = store.query_logs(query).await.unwrap();
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].id, "log-new");
+    }
+
+    #[tokio::test]
+    async fn test_cleanup_keeps_unparseable_entries() {
+        let temp_dir = TempDir::new().unwrap();
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 24).unwrap();
+
+        let subgraph_id = DeploymentHash::new("QmTest").unwrap();
+        let file_path = store.log_file_path(&subgraph_id);
+
+        // Create test data with valid and unparseable entries
+        let mut file = File::create(&file_path).unwrap();
+
+        // Valid entry
+        let valid_entry = FileLogDocument {
+            id: "log-valid".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: chrono::Utc::now().to_rfc3339_opts(chrono::SecondsFormat::Secs, true),
+            level: "info".to_string(),
+            text: "Valid entry".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 1,
+                column: 1,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&valid_entry).unwrap()).unwrap();
+
+        // Unparseable entry (invalid JSON)
+        writeln!(file, "{{invalid json}}").unwrap();
+
+        // Entry with invalid timestamp
+        writeln!(
+            file,
+            r#"{{"id":"log-bad-time","subgraphId":"QmTest","timestamp":"not-a-timestamp","level":"info","text":"Bad timestamp","arguments":[],"meta":{{"module":"test.ts","line":2,"column":1}}}}"#
+        )
+        .unwrap();
+        drop(file);
+
+        // Run cleanup
+        store.cleanup_old_logs(&file_path).unwrap();
+
+        // Read file contents directly
+        let file_contents = std::fs::read_to_string(&file_path).unwrap();
+        let lines: Vec<&str> = file_contents.lines().collect();
+
+        // All 3 entries should be kept (don't delete on error)
+        assert_eq!(lines.len(), 3);
+    }
+
+    #[tokio::test]
+    async fn test_startup_cleanup() {
+        use chrono::{Duration, Utc};
+
+        let temp_dir = TempDir::new().unwrap();
+
+        // Create a log file with old entries before initializing the store
+        let file_path = temp_dir.path().join("QmTestStartup.jsonl");
+        let mut file = File::create(&file_path).unwrap();
+
+        // Old entry (48 hours ago)
+        let old_timestamp =
+            (Utc::now() - Duration::hours(48)).to_rfc3339_opts(chrono::SecondsFormat::Secs, true);
+        let old_entry = FileLogDocument {
+            id: "log-old".to_string(),
+            subgraph_id: "QmTestStartup".to_string(),
+            timestamp: old_timestamp,
+            level: "info".to_string(),
+            text: "Old log entry".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 1,
+                column: 1,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&old_entry).unwrap()).unwrap();
+
+        // New entry (12 hours ago)
+        let new_timestamp =
+            (Utc::now() - Duration::hours(12)).to_rfc3339_opts(chrono::SecondsFormat::Secs, true);
+        let new_entry = FileLogDocument {
+            id: "log-new".to_string(),
+            subgraph_id: "QmTestStartup".to_string(),
+            timestamp: new_timestamp,
+            level: "info".to_string(),
+            text: "New log entry".to_string(),
+            arguments: vec![],
+            meta: FileLogMeta {
+                module: "test.ts".to_string(),
+                line: 2,
+                column: 1,
+            },
+        };
+        writeln!(file, "{}", serde_json::to_string(&new_entry).unwrap()).unwrap();
+        drop(file);
+
+        // Initialize store with 24-hour retention - should cleanup on startup
+        let store = FileLogStore::new(temp_dir.path().to_path_buf(), 24).unwrap();
+
+        // Verify old entry was cleaned up
+        let query = LogQuery {
+            subgraph_id: DeploymentHash::new("QmTestStartup").unwrap(),
+            level: None,
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: super::super::OrderDirection::Desc,
+        };
+
+        let result = store.query_logs(query).await.unwrap();
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].id, "log-new");
+    }
+}
diff --git a/graph/src/components/log_store/loki.rs b/graph/src/components/log_store/loki.rs
new file mode 100644
index 00000000000..562ef42feb6
--- /dev/null
+++ b/graph/src/components/log_store/loki.rs
@@ -0,0 +1,332 @@
+use async_trait::async_trait;
+use reqwest::Client;
+use serde::Deserialize;
+use slog::{Logger, warn};
+use std::collections::HashMap;
+use std::time::Duration;
+
+use crate::prelude::DeploymentHash;
+
+use super::{LogEntry, LogMeta, LogQuery, LogStore, LogStoreError};
+
+pub struct LokiLogStore {
+    endpoint: String,
+    tenant_id: Option<String>,
+    username: Option<String>,
+    password: Option<String>,
+    client: Client,
+    logger: Logger,
+}
+
+impl LokiLogStore {
+    pub fn new(
+        endpoint: String,
+        tenant_id: Option<String>,
+        username: Option<String>,
+        password: Option<String>,
+    ) -> Result<Self, LogStoreError> {
+        let client = Client::builder()
+            .timeout(Duration::from_secs(10))
+            .build()
+            .map_err(|e| LogStoreError::InitializationFailed(e.into()))?;
+
+        Ok(Self {
+            endpoint,
+            tenant_id,
+            username,
+            password,
+            client,
+            logger: crate::log::logger(false),
+        })
+    }
+
+    fn build_logql_query(&self, query: &LogQuery) -> String {
+        let mut selectors = vec![format!("subgraphId=\"{}\"", query.subgraph_id)];
+
+        // Add log level selector if specified
+        if let Some(level) = &query.level {
+            selectors.push(format!("level=\"{}\"", level.as_str().to_ascii_lowercase()));
+        }
+
+        // Base selector
+        let selector = format!("{{{}}}", selectors.join(","));
+
+        // Add line filter for text search if specified
+        if let Some(search) = &query.search {
+            format!("{} |~ \"(?i){}\"", selector, regex::escape(search))
+        } else {
+            selector
+        }
+    }
+
+    async fn execute_query(
+        &self,
+        query_str: &str,
+        from: &str,
+        to: &str,
+        limit: u32,
+        order_direction: super::OrderDirection,
+    ) -> Result<Vec<LogEntry>, LogStoreError> {
+        let url = format!("{}/loki/api/v1/query_range", self.endpoint);
+
+        // Map order direction to Loki's direction parameter
+        let direction = match order_direction {
+            super::OrderDirection::Desc => "backward", // Most recent first
+            super::OrderDirection::Asc => "forward",   // Oldest first
+        };
+
+        let mut request = self
+            .client
+            .get(&url)
+            .query(&[
+                ("query", query_str),
+                ("start", from),
+                ("end", to),
+                ("limit", &limit.to_string()),
+                ("direction", direction),
+            ])
+            .timeout(Duration::from_secs(10));
+
+        // Add X-Scope-OrgID header for multi-tenancy if configured
+        if let Some(tenant_id) = &self.tenant_id {
+            request = request.header("X-Scope-OrgID", tenant_id);
+        }
+
+        // Add basic auth if configured
+        if let Some(username) = &self.username {
+            request = request.basic_auth(username, self.password.as_ref());
+        }
+
+        let response = request.send().await.map_err(|e| {
+            LogStoreError::QueryFailed(anyhow::Error::from(e).context("Loki request failed"))
+        })?;
+
+        if !response.status().is_success() {
+            let status = response.status();
+            return Err(LogStoreError::QueryFailed(anyhow::anyhow!(
+                "Loki query failed with status {}",
+                status
+            )));
+        }
+
+        let response_body: LokiResponse = response.json().await.map_err(|e| {
+            LogStoreError::QueryFailed(
+                anyhow::Error::from(e)
+                    .context("failed to parse Loki response: response format may have changed"),
+            )
+        })?;
+
+        if response_body.status != "success" {
+            return Err(LogStoreError::QueryFailed(anyhow::anyhow!(
+                "Loki query failed with status: {}",
+                response_body.status
+            )));
+        }
+
+        // Parse results
+        let entries = response_body
+            .data
+            .result
+            .into_iter()
+            .flat_map(|stream| {
+                let stream_labels = stream.stream; // Take ownership
+                stream
+                    .values
+                    .into_iter()
+                    .filter_map(move |value| self.parse_log_entry(value, &stream_labels))
+            })
+            .collect();
+
+        Ok(entries)
+    }
+
+    fn parse_log_entry(
+        &self,
+        value: LokiValue,
+        _labels: &HashMap<String, String>,
+    ) -> Option<LogEntry> {
+        // value is [timestamp_ns, log_line]
+        // We expect the log line to be JSON with our log entry structure
+        let log_data: LokiLogDocument = match serde_json::from_str(&value.1) {
+            Ok(doc) => doc,
+            Err(e) => {
+                warn!(self.logger, "Failed to parse Loki log entry"; "error" => e.to_string());
+                return None;
+            }
+        };
+
+        let level = match log_data.level.parse() {
+            Ok(l) => l,
+            Err(_) => {
+                warn!(self.logger, "Invalid log level in Loki entry"; "level" => &log_data.level);
+                return None;
+            }
+        };
+
+        let subgraph_id = match DeploymentHash::new(&log_data.subgraph_id) {
+            Ok(id) => id,
+            Err(_) => {
+                warn!(self.logger, "Invalid subgraph ID in Loki entry"; "subgraph_id" => &log_data.subgraph_id);
+                return None;
+            }
+        };
+
+        Some(LogEntry {
+            id: log_data.id,
+            subgraph_id,
+            timestamp: log_data.timestamp,
+            level,
+            text: log_data.text,
+            arguments: log_data.arguments.into_iter().collect(),
+            meta: LogMeta {
+                module: log_data.meta.module,
+                line: log_data.meta.line,
+                column: log_data.meta.column,
+            },
+        })
+    }
+}
+
+#[async_trait]
+impl LogStore for LokiLogStore {
+    async fn query_logs(&self, query: LogQuery) -> Result<Vec<LogEntry>, LogStoreError> {
+        let logql_query = self.build_logql_query(&query);
+
+        // Calculate time range
+        let from = query.from.as_deref().unwrap_or("now-1h");
+        let to = query.to.as_deref().unwrap_or("now");
+
+        // Execute query with limit + skip to handle pagination
+        let limit = query.first + query.skip;
+
+        let mut entries = self
+            .execute_query(&logql_query, from, to, limit, query.order_direction)
+            .await?;
+
+        // Apply skip/first pagination
+        if query.skip > 0 {
+            entries = entries.into_iter().skip(query.skip as usize).collect();
+        }
+        entries.truncate(query.first as usize);
+
+        Ok(entries)
+    }
+
+    fn is_available(&self) -> bool {
+        true
+    }
+}
+
+// Loki response types
+#[derive(Debug, Deserialize)]
+struct LokiResponse {
+    status: String,
+    data: LokiData,
+}
+
+#[derive(Debug, Deserialize)]
+struct LokiData {
+    // Part of Loki API response, required for deserialization
+    #[allow(dead_code)]
+    #[serde(rename = "resultType")]
+    result_type: String,
+    result: Vec<LokiStream>,
+}
+
+#[derive(Debug, Deserialize)]
+struct LokiStream {
+    stream: HashMap<String, String>, // Labels
+    values: Vec<LokiValue>,
+}
+
+#[derive(Debug, Deserialize)]
+struct LokiValue(
+    // Timestamp in nanoseconds since epoch (part of Loki API, not currently used)
+    #[allow(dead_code)] String,
+    // Log line (JSON document)
+    String,
+);
+
+#[derive(Debug, Deserialize)]
+struct LokiLogDocument {
+    id: String,
+    #[serde(rename = "subgraphId")]
+    subgraph_id: String,
+    timestamp: String,
+    level: String,
+    text: String,
+    arguments: HashMap<String, String>,
+    meta: LokiLogMeta,
+}
+
+#[derive(Debug, Deserialize)]
+struct LokiLogMeta {
+    module: String,
+    line: i64,
+    column: i64,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use slog::Level;
+
+    #[test]
+    fn test_build_logql_query_basic() {
+        let store =
+            LokiLogStore::new("http://localhost:3100".to_string(), None, None, None).unwrap();
+        let query = LogQuery {
+            subgraph_id: DeploymentHash::new("QmTest").unwrap(),
+            level: None,
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: crate::components::log_store::OrderDirection::Desc,
+        };
+
+        let logql = store.build_logql_query(&query);
+        assert_eq!(logql, "{subgraphId=\"QmTest\"}");
+    }
+
+    #[test]
+    fn test_build_logql_query_with_level() {
+        let store =
+            LokiLogStore::new("http://localhost:3100".to_string(), None, None, None).unwrap();
+        let query = LogQuery {
+            subgraph_id: DeploymentHash::new("QmTest").unwrap(),
+            level: Some(Level::Error),
+            from: None,
+            to: None,
+            search: None,
+            first: 100,
+            skip: 0,
+            order_direction: crate::components::log_store::OrderDirection::Desc,
+        };
+
+        let logql = store.build_logql_query(&query);
+        assert_eq!(logql, "{subgraphId=\"QmTest\",level=\"error\"}");
+    }
+
+    #[test]
+    fn test_build_logql_query_with_text_filter() {
+        let store =
+            LokiLogStore::new("http://localhost:3100".to_string(), None, None, None).unwrap();
+        let query = LogQuery {
+            subgraph_id: DeploymentHash::new("QmTest").unwrap(),
+            level: None,
+            from: None,
+            to: None,
+            search: Some("transaction failed".to_string()),
+            first: 100,
+            skip: 0,
+            order_direction: crate::components::log_store::OrderDirection::Desc,
+        };
+
+        let logql = store.build_logql_query(&query);
+        assert!(logql.contains("{subgraphId=\"QmTest\"}"));
+        assert!(logql.contains("|~"));
+        assert!(logql.contains("transaction failed"));
+    }
+}
diff --git a/graph/src/components/log_store/mod.rs b/graph/src/components/log_store/mod.rs
new file mode 100644
index 00000000000..a1db6b6aed5
--- /dev/null
+++ b/graph/src/components/log_store/mod.rs
@@ -0,0 +1,195 @@
+pub mod elasticsearch;
+pub mod file;
+pub mod loki;
+
+use async_trait::async_trait;
+use slog::Level;
+use std::fmt;
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::sync::Arc;
+use thiserror::Error;
+
+use crate::prelude::DeploymentHash;
+
+#[derive(Error, Debug)]
+pub enum LogStoreError {
+    #[error("log store query failed: {0}")]
+    QueryFailed(#[from] anyhow::Error),
+
+    #[error("log store initialization failed: {0}")]
+    InitializationFailed(anyhow::Error),
+
+    #[error("log store configuration error: {0}")]
+    ConfigurationError(anyhow::Error),
+}
+
+/// Configuration for different log store backends
+#[derive(Debug, Clone)]
+pub enum LogStoreConfig {
+    /// No logging - returns empty results
+    Disabled,
+
+    /// Elasticsearch backend
+    Elasticsearch {
+        endpoint: String,
+        username: Option<String>,
+        password: Option<String>,
+        index: String,
+        timeout_secs: u64,
+    },
+
+    /// Loki (Grafana's log aggregation system)
+    Loki {
+        endpoint: String,
+        tenant_id: Option<String>,
+        username: Option<String>,
+        password: Option<String>,
+    },
+
+    /// File-based logs (JSON lines format)
+    File {
+        directory: PathBuf,
+        retention_hours: u32,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum OrderDirection {
+    Asc,
+    Desc,
+}
+
+impl OrderDirection {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            OrderDirection::Asc => "asc",
+            OrderDirection::Desc => "desc",
+        }
+    }
+}
+
+impl FromStr for OrderDirection {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "asc" | "ascending" => Ok(OrderDirection::Asc),
+            "desc" | "descending" => Ok(OrderDirection::Desc),
+            _ => Err(format!("Invalid order direction: {}", s)),
+        }
+    }
+}
+
+impl fmt::Display for OrderDirection {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct LogMeta {
+    pub module: String,
+    pub line: i64,
+    pub column: i64,
+}
+
+#[derive(Debug, Clone)]
+pub struct LogEntry {
+    pub id: String,
+    pub subgraph_id: DeploymentHash,
+    pub timestamp: String,
+    pub level: Level,
+    pub text: String,
+    pub arguments: Vec<(String, String)>,
+    pub meta: LogMeta,
+}
+
+#[derive(Debug, Clone)]
+pub struct LogQuery {
+    pub subgraph_id: DeploymentHash,
+    pub level: Option<Level>,
+    pub from: Option<String>,
+    pub to: Option<String>,
+    pub search: Option<String>,
+    pub first: u32,
+    pub skip: u32,
+    pub order_direction: OrderDirection,
+}
+
+#[async_trait]
+pub trait LogStore: Send + Sync + 'static {
+    async fn query_logs(&self, query: LogQuery) -> Result<Vec<LogEntry>, LogStoreError>;
+    fn is_available(&self) -> bool;
+}
+
+/// Factory for creating LogStore instances from configuration
+pub struct LogStoreFactory;
+
+impl LogStoreFactory {
+    /// Create a LogStore from configuration
+    pub fn from_config(config: LogStoreConfig) -> Result<Arc<dyn LogStore>, LogStoreError> {
+        match config {
+            LogStoreConfig::Disabled => Ok(Arc::new(NoOpLogStore)),
+
+            LogStoreConfig::Elasticsearch {
+                endpoint,
+                username,
+                password,
+                index,
+                timeout_secs,
+            } => {
+                let timeout = std::time::Duration::from_secs(timeout_secs);
+                let client = reqwest::Client::builder()
+                    .timeout(timeout)
+                    .build()
+                    .map_err(|e| LogStoreError::InitializationFailed(e.into()))?;
+
+                let config = crate::log::elastic::ElasticLoggingConfig {
+                    endpoint,
+                    username,
+                    password,
+                    client,
+                };
+
+                Ok(Arc::new(elasticsearch::ElasticsearchLogStore::new(
+                    config, index, timeout,
+                )))
+            }
+
+            LogStoreConfig::Loki {
+                endpoint,
+                tenant_id,
+                username,
+                password,
+            } => Ok(Arc::new(loki::LokiLogStore::new(
+                endpoint, tenant_id, username, password,
+            )?)),
+
+            LogStoreConfig::File {
+                directory,
+                retention_hours,
+            } => Ok(Arc::new(file::FileLogStore::new(
+                directory,
+                retention_hours,
+            )?)),
+        }
+    }
+}
+
+/// A no-op LogStore that returns empty results.
+///
+/// Used when log storage is disabled (the default). Note that subgraph logs
+/// still appear in stdout/stderr - they're just not stored in a queryable format.
+pub struct NoOpLogStore;
+
+#[async_trait]
+impl LogStore for NoOpLogStore {
+    async fn query_logs(&self, _query: LogQuery) -> Result<Vec<LogEntry>, LogStoreError> {
+        Ok(vec![])
+    }
+
+    fn is_available(&self) -> bool {
+        false
+    }
+}
diff --git a/graph/src/components/metrics/block_state.rs b/graph/src/components/metrics/block_state.rs
index 2a6ffb3fc64..93c9f9a8302 100644
--- a/graph/src/components/metrics/block_state.rs
+++ b/graph/src/components/metrics/block_state.rs
@@ -1,10 +1,10 @@
 use std::collections::HashMap;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use futures03::future::join_all;
-use object_store::{gcp::GoogleCloudStorageBuilder, path::Path, ObjectStore};
+use object_store::{ObjectStoreExt as _, gcp::GoogleCloudStorageBuilder, path::Path};
 use serde::Serialize;
-use slog::{error, info, Logger};
+use slog::{Logger, error, info};
 use url::Url;
 
 use crate::{
diff --git a/graph/src/components/metrics/mod.rs b/graph/src/components/metrics/mod.rs
index ea5cf5d9ea5..f028c8aa515 100644
--- a/graph/src/components/metrics/mod.rs
+++ b/graph/src/components/metrics/mod.rs
@@ -1,7 +1,7 @@
 pub use prometheus::core::Collector;
 pub use prometheus::{
-    labels, Counter, CounterVec, Error as PrometheusError, Gauge, GaugeVec, Histogram,
-    HistogramOpts, HistogramVec, Opts, Registry,
+    Counter, CounterVec, Error as PrometheusError, Gauge, GaugeVec, Histogram, HistogramOpts,
+    HistogramVec, Opts, Registry, labels,
 };
 
 pub mod registry;
diff --git a/graph/src/components/metrics/registry.rs b/graph/src/components/metrics/registry.rs
index 4777ea6f62f..5efb6564ef7 100644
--- a/graph/src/components/metrics/registry.rs
+++ b/graph/src/components/metrics/registry.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 
 use crate::parking_lot::RwLock;
 
-use prometheus::{labels, Histogram, IntCounterVec};
+use prometheus::{Histogram, IntCounterVec, labels};
 use prometheus::{IntCounter, IntGauge};
 use slog::debug;
 
@@ -13,7 +13,7 @@ use crate::prometheus::{
     Counter, CounterVec, Error as PrometheusError, Gauge, GaugeVec, HistogramOpts, HistogramVec,
     Opts, Registry,
 };
-use crate::slog::{self, error, o, Logger};
+use crate::slog::{self, Logger, error, o};
 
 pub struct MetricsRegistry {
     logger: Logger,
diff --git a/graph/src/components/metrics/stopwatch.rs b/graph/src/components/metrics/stopwatch.rs
index f9eb5ff78dc..ce6ddfd0ff8 100644
--- a/graph/src/components/metrics/stopwatch.rs
+++ b/graph/src/components/metrics/stopwatch.rs
@@ -1,4 +1,4 @@
-use std::sync::{atomic::AtomicBool, atomic::Ordering, Mutex};
+use std::sync::{Mutex, atomic::AtomicBool, atomic::Ordering};
 use std::time::Instant;
 
 use crate::derive::CheapClone;
diff --git a/graph/src/components/metrics/subgraph.rs b/graph/src/components/metrics/subgraph.rs
index abcf2810e6a..e45e7bd33a5 100644
--- a/graph/src/components/metrics/subgraph.rs
+++ b/graph/src/components/metrics/subgraph.rs
@@ -6,8 +6,8 @@ use indoc::indoc;
 use prometheus::Counter;
 use prometheus::IntGauge;
 
-use super::stopwatch::StopwatchMetrics;
 use super::MetricsRegistry;
+use super::stopwatch::StopwatchMetrics;
 use crate::blockchain::block_stream::BlockStreamMetrics;
 use crate::components::store::DeploymentLocator;
 use crate::prelude::{Gauge, Histogram, HostMetrics};
diff --git a/graph/src/components/mod.rs b/graph/src/components/mod.rs
index 8abdc96f0b0..2dfc34f6373 100644
--- a/graph/src/components/mod.rs
+++ b/graph/src/components/mod.rs
@@ -50,6 +50,9 @@ pub mod server;
 /// Components dealing with storing entities.
 pub mod store;
 
+/// Components dealing with log storage.
+pub mod log_store;
+
 pub mod link_resolver;
 
 pub mod trigger_processor;
diff --git a/graph/src/components/network_provider/chain_identifier_validator.rs b/graph/src/components/network_provider/chain_identifier_validator.rs
index c275e4e31bc..8eabe44edc7 100644
--- a/graph/src/components/network_provider/chain_identifier_validator.rs
+++ b/graph/src/components/network_provider/chain_identifier_validator.rs
@@ -35,14 +35,18 @@ pub enum ChainIdentifierValidationError {
     #[error("identifier not set for chain '{0}'")]
     IdentifierNotSet(ChainName),
 
-    #[error("net version mismatch on chain '{chain_name}'; expected '{store_net_version}', found '{chain_net_version}'")]
+    #[error(
+        "net version mismatch on chain '{chain_name}'; expected '{store_net_version}', found '{chain_net_version}'"
+    )]
     NetVersionMismatch {
         chain_name: ChainName,
         store_net_version: String,
         chain_net_version: String,
     },
 
-    #[error("genesis block hash mismatch on chain '{chain_name}'; expected '{store_genesis_block_hash}', found '{chain_genesis_block_hash}'")]
+    #[error(
+        "genesis block hash mismatch on chain '{chain_name}'; expected '{store_genesis_block_hash}', found '{chain_genesis_block_hash}'"
+    )]
     GenesisBlockHashMismatch {
         chain_name: ChainName,
         store_genesis_block_hash: BlockHash,
diff --git a/graph/src/components/network_provider/extended_blocks_check.rs b/graph/src/components/network_provider/extended_blocks_check.rs
index f4d412795bc..a7ef879990d 100644
--- a/graph/src/components/network_provider/extended_blocks_check.rs
+++ b/graph/src/components/network_provider/extended_blocks_check.rs
@@ -2,9 +2,9 @@ use std::collections::HashSet;
 use std::time::Instant;
 
 use async_trait::async_trait;
+use slog::Logger;
 use slog::error;
 use slog::warn;
-use slog::Logger;
 
 use crate::components::network_provider::ChainName;
 use crate::components::network_provider::NetworkDetails;
@@ -82,8 +82,8 @@ impl ProviderCheck for ExtendedBlocksCheck {
 mod tests {
     use std::sync::Mutex;
 
-    use anyhow::anyhow;
     use anyhow::Result;
+    use anyhow::anyhow;
 
     use super::*;
     use crate::blockchain::ChainIdentifier;
@@ -102,11 +102,12 @@ mod tests {
 
     impl Drop for TestAdapter {
         fn drop(&mut self) {
-            assert!(self
-                .provides_extended_blocks_calls
-                .lock()
-                .unwrap()
-                .is_empty());
+            assert!(
+                self.provides_extended_blocks_calls
+                    .lock()
+                    .unwrap()
+                    .is_empty()
+            );
         }
     }
 
diff --git a/graph/src/components/network_provider/genesis_hash_check.rs b/graph/src/components/network_provider/genesis_hash_check.rs
index b92d4602315..50b895913c6 100644
--- a/graph/src/components/network_provider/genesis_hash_check.rs
+++ b/graph/src/components/network_provider/genesis_hash_check.rs
@@ -2,11 +2,10 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use async_trait::async_trait;
+use slog::Logger;
 use slog::error;
 use slog::warn;
-use slog::Logger;
 
-use crate::components::network_provider::chain_id_validator;
 use crate::components::network_provider::ChainIdentifierValidationError;
 use crate::components::network_provider::ChainIdentifierValidator;
 use crate::components::network_provider::ChainName;
@@ -14,6 +13,7 @@ use crate::components::network_provider::NetworkDetails;
 use crate::components::network_provider::ProviderCheck;
 use crate::components::network_provider::ProviderCheckStatus;
 use crate::components::network_provider::ProviderName;
+use crate::components::network_provider::chain_id_validator;
 use crate::components::store::ChainIdStore;
 
 /// Requires providers to have the same network version and genesis hash as one
@@ -155,8 +155,8 @@ mod tests {
     use std::sync::Arc;
     use std::sync::Mutex;
 
-    use anyhow::anyhow;
     use anyhow::Result;
+    use anyhow::anyhow;
 
     use super::*;
     use crate::blockchain::ChainIdentifier;
diff --git a/graph/src/components/network_provider/mod.rs b/graph/src/components/network_provider/mod.rs
index d4023e4237d..e6b239360c5 100644
--- a/graph/src/components/network_provider/mod.rs
+++ b/graph/src/components/network_provider/mod.rs
@@ -5,9 +5,9 @@ mod network_details;
 mod provider_check;
 mod provider_manager;
 
-pub use self::chain_identifier_validator::chain_id_validator;
 pub use self::chain_identifier_validator::ChainIdentifierValidationError;
 pub use self::chain_identifier_validator::ChainIdentifierValidator;
+pub use self::chain_identifier_validator::chain_id_validator;
 pub use self::extended_blocks_check::ExtendedBlocksCheck;
 pub use self::genesis_hash_check::GenesisHashCheck;
 pub use self::network_details::NetworkDetails;
@@ -16,6 +16,8 @@ pub use self::provider_check::ProviderCheckStatus;
 pub use self::provider_manager::ProviderCheckStrategy;
 pub use self::provider_manager::ProviderManager;
 
+use std::collections::HashMap;
+
 // Used to increase memory efficiency.
 // Currently, there is no need to create a separate type for this.
 pub type ChainName = crate::data::value::Word;
@@ -23,3 +25,51 @@ pub type ChainName = crate::data::value::Word;
 // Used to increase memory efficiency.
 // Currently, there is no need to create a separate type for this.
 pub type ProviderName = crate::data::value::Word;
+
+/// Maps AMP network names to internal graph-node chain names.
+///
+/// AMP-powered subgraphs may use different network names than graph-node
+/// (e.g., AMP uses `"ethereum-mainnet"` while graph-node uses `"mainnet"`).
+/// This type provides a config-driven translation layer.
+#[derive(Clone, Debug, Default)]
+pub struct AmpChainNames(HashMap<ChainName, ChainName>);
+
+impl AmpChainNames {
+    pub fn new(mapping: HashMap<ChainName, ChainName>) -> Self {
+        AmpChainNames(mapping)
+    }
+
+    /// Returns the internal chain name for an AMP alias, or the input
+    /// unchanged if no alias matches.
+    pub fn resolve(&self, name: &ChainName) -> ChainName {
+        self.0.get(name).cloned().unwrap_or_else(|| name.clone())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn amp_chain_names_resolve_known_alias() {
+        let mut map = HashMap::new();
+        map.insert(
+            ChainName::from("ethereum-mainnet"),
+            ChainName::from("mainnet"),
+        );
+        let names = AmpChainNames::new(map);
+        assert_eq!(
+            names.resolve(&ChainName::from("ethereum-mainnet")),
+            ChainName::from("mainnet")
+        );
+    }
+
+    #[test]
+    fn amp_chain_names_resolve_unknown_passthrough() {
+        let names = AmpChainNames::default();
+        assert_eq!(
+            names.resolve(&ChainName::from("mainnet")),
+            ChainName::from("mainnet")
+        );
+    }
+}
diff --git a/graph/src/components/network_provider/provider_manager.rs b/graph/src/components/network_provider/provider_manager.rs
index 54454df40f6..c94f71563ec 100644
--- a/graph/src/components/network_provider/provider_manager.rs
+++ b/graph/src/components/network_provider/provider_manager.rs
@@ -3,11 +3,11 @@ use std::sync::Arc;
 use std::sync::OnceLock;
 use std::time::Duration;
 
-use derivative::Derivative;
+use derive_more::Debug;
 use itertools::Itertools;
+use slog::Logger;
 use slog::info;
 use slog::warn;
-use slog::Logger;
 use thiserror::Error;
 use tokio::sync::RwLock;
 
@@ -24,10 +24,9 @@ const VALIDATION_MAX_DURATION: Duration = Duration::from_secs(30);
 const VALIDATION_RETRY_INTERVAL: Duration = Duration::from_secs(300);
 
 /// ProviderManager is responsible for validating providers before they are returned to consumers.
-#[derive(Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Debug)]
 pub struct ProviderManager<T: NetworkDetails> {
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     inner: Arc<Inner<T>>,
 
     validation_max_duration: Duration,
diff --git a/graph/src/components/server/query.rs b/graph/src/components/server/query.rs
index 4a9fe1557c2..d20a7dcb6c0 100644
--- a/graph/src/components/server/query.rs
+++ b/graph/src/components/server/query.rs
@@ -1,6 +1,6 @@
 use http_body_util::Full;
-use hyper::body::Bytes;
 use hyper::Response;
+use hyper::body::Bytes;
 
 use crate::data::query::QueryError;
 use std::error::Error;
diff --git a/graph/src/components/server/server.rs b/graph/src/components/server/server.rs
index b746848c86b..e17e4d5897a 100644
--- a/graph/src/components/server/server.rs
+++ b/graph/src/components/server/server.rs
@@ -1,10 +1,10 @@
 use std::future::Future;
 use std::net::SocketAddr;
-use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
 
-use hyper::body::Incoming;
 use hyper::Request;
+use hyper::body::Incoming;
 use tokio::net::TcpListener;
 use tokio::task::JoinHandle;
 
diff --git a/graph/src/components/store/entity_cache.rs b/graph/src/components/store/entity_cache.rs
index 4993339831a..0bc3f17efef 100644
--- a/graph/src/components/store/entity_cache.rs
+++ b/graph/src/components/store/entity_cache.rs
@@ -1,14 +1,15 @@
 use anyhow::{anyhow, bail};
 use std::borrow::Borrow;
-use std::collections::HashMap;
+use std::collections::{BTreeSet, HashMap};
 use std::fmt::{self, Debug};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU32, Ordering};
 
 use crate::cheap_clone::CheapClone;
 use crate::components::store::write::EntityModification;
 use crate::components::store::{self as s, Entity, EntityOperation};
 use crate::data::store::{EntityValidationError, Id, IdType, IntoEntityIterator};
-use crate::prelude::{CacheWeight, ENV_VARS};
+use crate::prelude::{CacheWeight, ENV_VARS, StopwatchMetrics};
 use crate::schema::{EntityKey, InputSchema};
 use crate::util::intern::Error as InternError;
 use crate::util::lfu_cache::{EvictStats, LfuCache};
@@ -21,6 +22,52 @@ pub type EntityLfuCache = LfuCache<EntityKey, Option<Arc<Entity>>>;
 // Currently none is used, but lets reserve a few more.
 const RESERVED_VIDS: u32 = 100;
 
+/// Shared generator for VID and entity ID sequences within a block.
+///
+/// Created once per block and shared (via `Arc`) across all `EntityCache`
+/// instances that operate on the same block. This prevents VID collisions
+/// when multiple isolated caches (e.g. ipfs.map callbacks, offchain
+/// triggers) write entities in the same block.
+#[derive(Clone, Debug)]
+pub struct SeqGenerator {
+    block: BlockNumber,
+    vid_seq: Arc<AtomicU32>,
+    id_seq: Arc<AtomicU32>,
+}
+
+impl CheapClone for SeqGenerator {
+    fn cheap_clone(&self) -> Self {
+        self.clone()
+    }
+}
+
+impl SeqGenerator {
+    pub fn new(block: BlockNumber) -> Self {
+        SeqGenerator {
+            block,
+            vid_seq: Arc::new(AtomicU32::new(RESERVED_VIDS)),
+            id_seq: Arc::new(AtomicU32::new(0)),
+        }
+    }
+
+    /// Return the next VID. The VID encodes the block number in the upper
+    /// 32 bits and a monotonically increasing sequence in the lower 32
+    /// bits.
+    pub fn vid(&self) -> i64 {
+        let seq = self.vid_seq.fetch_add(1, Ordering::Relaxed);
+        ((self.block as i64) << 32) + seq as i64
+    }
+
+    /// Generate the next entity ID for the given ID type. The ID encodes
+    /// the block number in the upper 32 bits and a monotonically
+    /// increasing sequence in the lower 32 bits.
+    pub fn id(&self, id_type: IdType) -> anyhow::Result<Id> {
+        let seq = self.id_seq.fetch_add(1, Ordering::Relaxed);
+
+        id_type.generate_id(self.block, seq)
+    }
+}
+
 /// The scope in which the `EntityCache` should perform a `get` operation
 pub enum GetScope {
     /// Get from all previously stored entities in the store
@@ -103,16 +150,8 @@ pub struct EntityCache {
 
     pub schema: InputSchema,
 
-    /// A sequence number for generating entity IDs. We use one number for
-    /// all id's as the id's are scoped by block and a u32 has plenty of
-    /// room for all changes in one block. To ensure reproducability of
-    /// generated IDs, the `EntityCache` needs to be newly instantiated for
-    /// each block
-    seq: u32,
-
-    // Sequence number of the next VID value for this block. The value written
-    // in the database consist of a block number and this SEQ number.
-    pub vid_seq: u32,
+    /// Shared sequence generator for VIDs and entity IDs within a block.
+    pub seq_gen: SeqGenerator,
 }
 
 impl Debug for EntityCache {
@@ -131,7 +170,7 @@ pub struct ModificationsAndCache {
 }
 
 impl EntityCache {
-    pub fn new(store: Arc<dyn s::ReadStore>) -> Self {
+    pub fn new(store: Arc<dyn s::ReadStore>, seq_gen: SeqGenerator) -> Self {
         Self {
             current: LfuCache::new(),
             updates: HashMap::new(),
@@ -139,8 +178,7 @@ impl EntityCache {
             in_handler: false,
             schema: store.input_schema(),
             store,
-            seq: 0,
-            vid_seq: RESERVED_VIDS,
+            seq_gen,
         }
     }
 
@@ -152,7 +190,11 @@ impl EntityCache {
         self.schema.make_entity(iter)
     }
 
-    pub fn with_current(store: Arc<dyn s::ReadStore>, current: EntityLfuCache) -> EntityCache {
+    pub fn with_current(
+        store: Arc<dyn s::ReadStore>,
+        current: EntityLfuCache,
+        seq_gen: SeqGenerator,
+    ) -> EntityCache {
         EntityCache {
             current,
             updates: HashMap::new(),
@@ -160,11 +202,14 @@ impl EntityCache {
             in_handler: false,
             schema: store.input_schema(),
             store,
-            seq: 0,
-            vid_seq: RESERVED_VIDS,
+            seq_gen,
         }
     }
 
+    pub fn seq_gen(&self) -> SeqGenerator {
+        self.seq_gen.cheap_clone()
+    }
+
     pub(crate) fn enter_handler(&mut self) {
         assert!(!self.in_handler);
         self.in_handler = true;
@@ -246,113 +291,52 @@ impl EntityCache {
             causality_region: eref.causality_region,
         };
 
-        let mut entity_map = self.store.get_derived(&query).await?;
+        // Entities that satisfied the query at the start of this block.
+        let stored = self.store.get_derived(&query).await?;
 
-        for (key, entity) in entity_map.iter() {
-            // Only insert to the cache if it's not already there
+        for (key, entity) in &stored {
             if !self.current.contains_key(key) {
                 self.current
                     .insert(key.clone(), Some(Arc::new(entity.clone())));
             }
         }
 
-        let mut keys_to_remove = Vec::new();
-
-        // Apply updates from `updates` and `handler_updates` directly to entities in `entity_map` that match the query
-        for (key, entity) in entity_map.iter_mut() {
-            let op = match (
-                self.updates.get(key).cloned(),
-                self.handler_updates.get(key).cloned(),
-            ) {
-                (Some(op), None) | (None, Some(op)) => op,
-                (Some(mut op), Some(op2)) => {
-                    op.accumulate(op2);
-                    op
-                }
-                (None, None) => continue,
-            };
-
-            let updated_entity = op
-                .apply_to(&Some(&*entity))
-                .map_err(|e| key.unknown_attribute(e))?;
-
-            if let Some(updated_entity) = updated_entity {
-                *entity = updated_entity;
-            } else {
-                // if entity_arc is None, it means that the entity was removed by an update
-                // mark the key for removal from the map
-                keys_to_remove.push(key.clone());
+        // Candidate set: keys that were matching at baseline, plus keys
+        // any in-block write has touched whose entity_type and causality
+        // region are compatible with the query. The latter catches
+        // entities an in-block write has moved into the matching set or
+        // created fresh in this block.
+        let mut candidates: BTreeSet<&EntityKey> = stored.keys().collect();
+        for key in self.updates.keys().chain(self.handler_updates.keys()) {
+            if key.entity_type == query.entity_type
+                && key.causality_region == query.causality_region
+            {
+                candidates.insert(key);
             }
         }
 
-        // A helper function that checks if an update matches the query and returns the updated entity if it does
-        fn matches_query(
-            op: &EntityOp,
-            query: &DerivedEntityQuery,
-            key: &EntityKey,
-        ) -> Result<Option<Entity>, anyhow::Error> {
-            match op {
-                EntityOp::Update(entity) | EntityOp::Overwrite(entity)
-                    if query.matches(key, entity) =>
-                {
-                    Ok(Some(entity.clone()))
-                }
-                EntityOp::Remove => Ok(None),
-                _ => Ok(None),
+        let mut result = Vec::new();
+        for key in candidates {
+            // Resolve the entity's final in-block state by layering
+            // store baseline, then self.updates, then self.handler_updates.
+            // Each layer's op may mutate, replace, or remove the entity.
+            let mut entity: Option<Entity> = stored.get(key).cloned();
+            if let Some(op) = self.updates.get(key).cloned() {
+                entity = op.apply_to(&entity).map_err(|e| key.unknown_attribute(e))?;
             }
-        }
-
-        // Iterate over self.updates to find entities that:
-        // - Aren't already present in the entity_map
-        // - Match the query
-        // If these conditions are met:
-        // - Check if there's an update for the same entity in handler_updates and apply it.
-        // - Add the entity to entity_map.
-        for (key, op) in self.updates.iter() {
-            if !entity_map.contains_key(key) {
-                if let Some(entity) = matches_query(op, &query, key)? {
-                    if let Some(handler_op) = self.handler_updates.get(key).cloned() {
-                        // If there's a corresponding update in handler_updates, apply it to the entity
-                        // and insert the updated entity into entity_map
-                        let mut entity = Some(entity);
-                        entity = handler_op
-                            .apply_to(&entity)
-                            .map_err(|e| key.unknown_attribute(e))?;
-
-                        if let Some(updated_entity) = entity {
-                            entity_map.insert(key.clone(), updated_entity);
-                        }
-                    } else {
-                        // If there isn't a corresponding update in handler_updates or the update doesn't match the query, just insert the entity from self.updates
-                        entity_map.insert(key.clone(), entity);
-                    }
-                }
+            if let Some(op) = self.handler_updates.get(key).cloned() {
+                entity = op.apply_to(&entity).map_err(|e| key.unknown_attribute(e))?;
             }
-        }
 
-        // Iterate over handler_updates to find entities that:
-        // - Aren't already present in the entity_map.
-        // - Aren't present in self.updates.
-        // - Match the query.
-        // If these conditions are met, add the entity to entity_map.
-        for (key, handler_op) in self.handler_updates.iter() {
-            if !entity_map.contains_key(key) && !self.updates.contains_key(key) {
-                if let Some(entity) = matches_query(handler_op, &query, key)? {
-                    entity_map.insert(key.clone(), entity);
-                }
+            // Include the entity only if its final state still matches the query.
+            if let Some(entity) = entity
+                && query.matches(key, &entity)
+            {
+                result.push(entity);
             }
         }
 
-        // Remove entities that are in the store but have been removed by an update.
-        // We do this last since the loops over updates and handler_updates are only
-        // concerned with entities that are not in the store yet and by leaving removed
-        // keys in entity_map we avoid processing these updates a second time when we
-        // already looked at them when we went through entity_map
-        for key in keys_to_remove {
-            entity_map.remove(&key);
-        }
-
-        Ok(entity_map.into_values().collect())
+        Ok(result)
     }
 
     pub fn remove(&mut self, key: EntityKey) {
@@ -368,7 +352,6 @@ impl EntityCache {
         &mut self,
         key: EntityKey,
         entity: Entity,
-        block: BlockNumber,
         write_capacity_remaining: Option<&mut usize>,
     ) -> Result<(), anyhow::Error> {
         // check the validate for derived fields
@@ -386,9 +369,7 @@ impl EntityCache {
             *write_capacity_remaining -= weight;
         }
 
-        // The next VID is based on a block number and a sequence within the block
-        let vid = ((block as i64) << 32) + self.vid_seq as i64;
-        self.vid_seq += 1;
+        let vid = self.seq_gen.vid();
         let mut entity = entity;
         let old_vid = entity.set_vid(vid).expect("the vid should be set");
         // Make sure that there was no VID previously set for this entity.
@@ -459,13 +440,6 @@ impl EntityCache {
         }
     }
 
-    /// Generate an id.
-    pub fn generate_id(&mut self, id_type: IdType, block: BlockNumber) -> anyhow::Result<Id> {
-        let id = id_type.generate_id(block, self.seq)?;
-        self.seq += 1;
-        Ok(id)
-    }
-
     /// Return the changes that have been made via `set` and `remove` as
     /// `EntityModification`, making sure to only produce one when a change
     /// to the current state is actually needed.
@@ -474,6 +448,7 @@ impl EntityCache {
     pub async fn as_modifications(
         mut self,
         block: BlockNumber,
+        stopwatch: &StopwatchMetrics,
     ) -> Result<ModificationsAndCache, StoreError> {
         assert!(!self.in_handler);
 
@@ -491,10 +466,14 @@ impl EntityCache {
         // is wrong and the store already has a version of the entity from a
         // previous block, the attempt to insert will trigger a constraint
         // violation in the database, ensuring correctness
-        let missing = missing.filter(|key| !key.entity_type.is_immutable());
+        {
+            let _section = stopwatch.start_section("as_modifications_load");
+
+            let missing = missing.filter(|key| !key.entity_type.is_immutable());
 
-        for (entity_key, entity) in self.store.get_many(missing.cloned().collect()).await? {
-            self.current.insert(entity_key, Some(Arc::new(entity)));
+            for (entity_key, entity) in self.store.get_many(missing.cloned().collect()).await? {
+                self.current.insert(entity_key, Some(Arc::new(entity)));
+            }
         }
 
         let mut mods = Vec::new();
@@ -518,12 +497,14 @@ impl EntityCache {
                 }
                 // Entity may have been changed
                 (Some(current), EntityOp::Update(updates)) => {
-                    let mut data = current.as_ref().clone();
-                    data.merge_remove_null_fields(updates)
+                    let mut data =
+                        Arc::try_unwrap(current).unwrap_or_else(|arc| arc.as_ref().clone());
+                    let changed = data
+                        .merge_remove_null_fields(updates)
                         .map_err(|e| key.unknown_attribute(e))?;
                     let data = Arc::new(data);
                     self.current.insert(key.clone(), Some(data.cheap_clone()));
-                    if current != data {
+                    if changed {
                         Some(Overwrite {
                             key,
                             data,
diff --git a/graph/src/components/store/err.rs b/graph/src/components/store/err.rs
index dcf92f6f461..9e94342cb34 100644
--- a/graph/src/components/store/err.rs
+++ b/graph/src/components/store/err.rs
@@ -2,7 +2,7 @@ use super::{BlockNumber, DeploymentSchemaVersion};
 use crate::prelude::DeploymentHash;
 use crate::prelude::QueryExecutionError;
 
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use diesel::result::Error as DieselError;
 use thiserror::Error;
 use tokio::task::JoinError;
@@ -56,8 +56,6 @@ pub enum StoreError {
     ForkFailure(String),
     #[error("subgraph writer poisoned by previous error")]
     Poisoned,
-    #[error("subgraph not found: {0}")]
-    SubgraphNotFound(String),
     #[error("panic in subgraph writer: {0}")]
     WriterPanic(JoinError),
     #[error(
@@ -76,6 +74,10 @@ pub enum StoreError {
     StatementTimeout,
     #[error("database constraint violated: {0}")]
     ConstraintViolation(String),
+    /// The input to some operation, usually user input, makes it impossible
+    /// to complete the operation. This must be a deterministic error
+    #[error("{0}")]
+    Input(String),
 }
 
 // Convenience to report an internal error
@@ -121,7 +123,6 @@ impl Clone for StoreError {
             Self::DatabaseUnavailable => Self::DatabaseUnavailable,
             Self::ForkFailure(arg0) => Self::ForkFailure(arg0.clone()),
             Self::Poisoned => Self::Poisoned,
-            Self::SubgraphNotFound(arg0) => Self::SubgraphNotFound(arg0.clone()),
             Self::WriterPanic(arg0) => Self::Unknown(anyhow!("writer panic: {}", arg0)),
             Self::UnsupportedDeploymentSchemaVersion(arg0) => {
                 Self::UnsupportedDeploymentSchemaVersion(*arg0)
@@ -135,6 +136,7 @@ impl Clone for StoreError {
             }
             Self::StatementTimeout => Self::StatementTimeout,
             Self::ConstraintViolation(arg0) => Self::ConstraintViolation(arg0.clone()),
+            Self::Input(arg0) => Self::Input(arg0.clone()),
         }
     }
 }
@@ -190,7 +192,8 @@ impl StoreError {
             | UnknownAttribute(_, _)
             | InvalidIdentifier(_)
             | UnsupportedFilter(_, _)
-            | ConstraintViolation(_) => true,
+            | ConstraintViolation(_)
+            | Input(_) => true,
 
             // non-deterministic errors
             Unknown(_)
@@ -205,7 +208,6 @@ impl StoreError {
             | Canceled
             | DatabaseUnavailable
             | ForkFailure(_)
-            | SubgraphNotFound(_)
             | Poisoned
             | WriterPanic(_)
             | UnsupportedDeploymentSchemaVersion(_)
diff --git a/graph/src/components/store/mod.rs b/graph/src/components/store/mod.rs
index b2b6783349b..a3a85b51cc2 100644
--- a/graph/src/components/store/mod.rs
+++ b/graph/src/components/store/mod.rs
@@ -9,7 +9,9 @@ use diesel::pg::Pg;
 use diesel::serialize::{Output, ToSql};
 use diesel::sql_types::Integer;
 use diesel_derives::{AsExpression, FromSqlRow};
-pub use entity_cache::{EntityCache, EntityLfuCache, GetScope, ModificationsAndCache};
+pub use entity_cache::{
+    EntityCache, EntityLfuCache, GetScope, ModificationsAndCache, SeqGenerator,
+};
 use slog::Logger;
 use tokio_stream::wrappers::ReceiverStream;
 
@@ -25,8 +27,8 @@ use std::collections::btree_map::Entry;
 use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::fmt;
 use std::fmt::Display;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 
 use async_trait::async_trait;
@@ -41,8 +43,8 @@ use crate::data_source::CausalityRegion;
 use crate::derive::CheapClone;
 use crate::env::ENV_VARS;
 use crate::internal_error;
-use crate::prelude::{s, Attribute, DeploymentHash, ValueType};
-use crate::schema::{ast as sast, EntityKey, EntityType, InputSchema};
+use crate::prelude::{Attribute, DeploymentHash, ValueType, s};
+use crate::schema::{EntityKey, EntityType, InputSchema, ast as sast};
 use crate::util::stats::AtomicMovingStats;
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -466,6 +468,8 @@ pub struct EntityQuery {
     pub query_id: Option<String>,
 
     pub trace: bool,
+
+    pub aggregation_current: Option<AggregationCurrent>,
 }
 
 impl EntityQuery {
@@ -484,6 +488,7 @@ impl EntityQuery {
             logger: None,
             query_id: None,
             trace: false,
+            aggregation_current: None,
         }
     }
 
@@ -516,26 +521,26 @@ impl EntityQuery {
         // If there is one window, with one id, in a direct relation to the
         // entities, we can simplify the query by changing the filter and
         // getting rid of the window
-        if let EntityCollection::Window(windows) = &self.collection {
-            if windows.len() == 1 {
-                let window = windows.first().expect("we just checked");
-                if window.ids.len() == 1 {
-                    let id = window.ids.first().expect("we just checked").to_value();
-                    if let EntityLink::Direct(attribute, _) = &window.link {
-                        let filter = match attribute {
-                            WindowAttribute::Scalar(name) => {
-                                EntityFilter::Equal(name.clone(), id.into())
-                            }
-                            WindowAttribute::List(name) => {
-                                EntityFilter::Contains(name.clone(), Value::from(vec![id]))
-                            }
-                        };
-                        self.filter = Some(filter.and_maybe(self.filter));
-                        self.collection = EntityCollection::All(vec![(
-                            window.child_type.clone(),
-                            window.column_names.clone(),
-                        )]);
-                    }
+        if let EntityCollection::Window(windows) = &self.collection
+            && windows.len() == 1
+        {
+            let window = windows.first().expect("we just checked");
+            if window.ids.len() == 1 {
+                let id = window.ids.first().expect("we just checked").to_value();
+                if let EntityLink::Direct(attribute, _) = &window.link {
+                    let filter = match attribute {
+                        WindowAttribute::Scalar(name) => {
+                            EntityFilter::Equal(name.clone(), id.into())
+                        }
+                        WindowAttribute::List(name) => {
+                            EntityFilter::Contains(name.clone(), Value::from(vec![id]))
+                        }
+                    };
+                    self.filter = Some(filter.and_maybe(self.filter));
+                    self.collection = EntityCollection::All(vec![(
+                        window.child_type.clone(),
+                        window.column_names.clone(),
+                    )]);
                 }
             }
         }
@@ -543,6 +548,19 @@ impl EntityQuery {
     }
 }
 
+/// Indicates whether the current, partially filled bucket should be included in the response.
+///
+/// This is only relevant for aggregation entity queries.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum AggregationCurrent {
+    /// Exclude the current, partially filled bucket from the response.
+    #[default]
+    Exclude,
+
+    /// Include the current, partially filled bucket in the response.
+    Include,
+}
+
 /// Operation types that lead to changes in assignments
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 #[serde(rename_all = "lowercase")]
@@ -650,8 +668,12 @@ pub enum EntityOperation {
 
 #[derive(Debug, PartialEq)]
 pub enum UnfailOutcome {
+    /// Nothing to do - no error exists, or error is of wrong type (e.g., deterministic).
     Noop,
+    /// Successfully unfailed the subgraph.
     Unfailed,
+    /// The deployment head is still behind the error block, retry on subsequent blocks.
+    BehindErrorBlock,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -962,6 +984,75 @@ pub trait PruneReporter: Send + 'static {
     fn finish(&mut self) {}
 }
 
+/// Callbacks for `SubgraphStore.dump` so that callers can report progress
+/// of the dump procedure to users
+#[allow(unused_variables)]
+pub trait DumpReporter: Send + 'static {
+    /// Called at the start with deployment hash and total entity table count.
+    fn start(&mut self, deployment: &str, table_count: usize) {}
+
+    /// Called before dumping an entity table. `rows_approx` is estimated
+    /// from the vid range (max_vid - min_vid + 1), 0 if empty.
+    fn start_table(&mut self, table: &str, rows_approx: usize) {}
+
+    /// Called after a batch of rows has been written to Parquet.
+    fn batch_dumped(&mut self, table: &str, rows: usize) {}
+
+    /// Called after an entity table has been fully dumped.
+    fn finish_table(&mut self, table: &str, rows: usize) {}
+
+    /// Called before dumping data_sources$.
+    fn start_data_sources(&mut self) {}
+
+    /// Called after data_sources$ has been dumped.
+    fn finish_data_sources(&mut self, rows: usize) {}
+
+    /// Called before dumping clamps for a table.
+    fn start_clamps(&mut self, _table: &str, _rows_approx: usize) {}
+
+    /// Called after clamps have been dumped for a table.
+    fn finish_clamps(&mut self, _table: &str, _rows: usize) {}
+
+    /// Called when the entire dump has completed.
+    fn finish(&mut self) {}
+}
+
+/// Callbacks for `SubgraphStore.restore` so that callers can report
+/// progress of the restore procedure to users
+#[allow(unused_variables)]
+pub trait RestoreReporter: Send + 'static {
+    /// Called at the start with deployment hash and total entity table count.
+    fn start(&mut self, deployment: &str, table_count: usize) {}
+
+    /// Called when creating the schema.
+    fn start_create_schema(&mut self, namespace: &str, shard: &str) {}
+    fn finish_create_schema(&mut self) {}
+
+    /// Called before importing an entity table. `total_rows` is the sum
+    /// of row counts across all chunks for this table.
+    fn start_table(&mut self, table: &str, total_rows: usize) {}
+
+    /// Called after a batch of rows has been inserted.
+    fn batch_imported(&mut self, table: &str, rows: usize) {}
+
+    /// Called when a table is skipped because it was already restored.
+    fn skip_table(&mut self, table: &str) {}
+
+    /// Called after an entity table has been fully imported.
+    fn finish_table(&mut self, table: &str, rows: usize) {}
+
+    /// Called before/after importing data_sources$.
+    fn start_data_sources(&mut self, total_rows: usize) {}
+    fn finish_data_sources(&mut self, rows: usize) {}
+
+    /// Called during finalization (sequence resets, head block set).
+    fn start_finalize(&mut self) {}
+    fn finish_finalize(&mut self) {}
+
+    /// Called when the entire restore has completed.
+    fn finish(&mut self) {}
+}
+
 /// Select how pruning should be done
 #[derive(Clone, Copy, Debug, Display, PartialEq)]
 pub enum PruningStrategy {
@@ -1043,6 +1134,15 @@ impl PruneRequest {
             ));
         }
 
+        // Note: this intentionally keeps `history_blocks + 1` blocks on disk.
+        // The range [earliest_block, latest_block] is inclusive on both ends,
+        // so it contains `history_blocks + 1` entries. The extra block is a
+        // required buffer: `revert_block_ptr` requires at least
+        // `reorg_threshold + 2` actual blocks on disk to allow even a
+        // single-block reorg after pruning, and `strategy` requires
+        // `earliest_block < final_block`. Both conditions are satisfied when
+        // `history_blocks >= reorg_threshold + 1`, which gives
+        // `reorg_threshold + 2` blocks on disk.
         let earliest_block = latest_block - history_blocks;
         let final_block = latest_block - reorg_threshold;
 
diff --git a/graph/src/components/store/traits.rs b/graph/src/components/store/traits.rs
index 658baa8be3e..0249e999da6 100644
--- a/graph/src/components/store/traits.rs
+++ b/graph/src/components/store/traits.rs
@@ -7,6 +7,7 @@ use async_trait::async_trait;
 use super::*;
 use crate::blockchain::block_stream::{EntitySourceOperation, FirehoseCursor};
 use crate::blockchain::{BlockTime, ChainIdentifier, ExtendedBlockPtr};
+use crate::components::ethereum::CachedBlock;
 use crate::components::metrics::stopwatch::StopwatchMetrics;
 use crate::components::network_provider::ChainName;
 use crate::components::server::index_node::VersionInfo;
@@ -16,11 +17,11 @@ use crate::components::versions::ApiVersion;
 use crate::data::query::Trace;
 use crate::data::store::ethereum::call;
 use crate::data::store::{QueryObject, SqlQueryObject};
-use crate::data::subgraph::{status, DeploymentFeatures};
+use crate::data::subgraph::{DeploymentFeatures, status};
 use crate::data::{query::QueryTarget, subgraph::schema::*};
 use crate::prelude::{
-    alloy::primitives::{Address, B256},
     DeploymentState, NodeId, QueryExecutionError, SubgraphName,
+    alloy::primitives::{Address, B256},
 };
 use crate::schema::{ApiSchema, InputSchema};
 
@@ -103,10 +104,13 @@ pub trait SubgraphStore: Send + Sync + 'static {
     /// subgraph
     async fn create_subgraph(&self, name: SubgraphName) -> Result<String, StoreError>;
 
-    /// Remove a subgraph and all its versions; if deployments that were used
-    /// by this subgraph do not need to be indexed anymore, also remove
+    /// Remove a subgraph and all its versions; if deployments that were
+    /// used by this subgraph do not need to be indexed anymore, also remove
     /// their assignment, but keep the deployments themselves around
-    async fn remove_subgraph(&self, name: SubgraphName) -> Result<(), StoreError>;
+    ///
+    /// Returns the hashes of all deployments that were associated with the
+    /// removed name
+    async fn remove_subgraph(&self, name: SubgraphName) -> Result<Vec<DeploymentHash>, StoreError>;
 
     /// Assign the subgraph with `id` to the node `node_id`. If there is no
     /// assignment for the given deployment, report an error.
@@ -138,7 +142,7 @@ pub trait SubgraphStore: Send + Sync + 'static {
 
     /// Returns assignments that are not paused
     async fn active_assignments(&self, node: &NodeId)
-        -> Result<Vec<DeploymentLocator>, StoreError>;
+    -> Result<Vec<DeploymentLocator>, StoreError>;
 
     /// Return `true` if a subgraph `name` exists, regardless of whether the
     /// subgraph has any deployments attached to it
@@ -215,6 +219,12 @@ pub trait SubgraphStore: Send + Sync + 'static {
     /// being set up
     async fn least_block_ptr(&self, id: &DeploymentHash) -> Result<Option<BlockPtr>, StoreError>;
 
+    /// Return the earliest block for which the deployment with the given
+    /// `id` still has entity data. Blocks below this are either pre-`startBlock`
+    /// or have been removed by pruning, and cannot serve as a graft or copy
+    /// source.
+    async fn earliest_block_number(&self, id: &DeploymentHash) -> Result<BlockNumber, StoreError>;
+
     async fn is_healthy(&self, id: &DeploymentHash) -> Result<bool, StoreError>;
 
     /// Find all deployment locators for the subgraph with the given hash.
@@ -443,6 +453,12 @@ pub trait WritableStore: ReadStore + DeploymentCursorTracker {
 
     async fn health(&self) -> Result<SubgraphHealth, StoreError>;
 
+    /// Create indexes whose creation was postponed at deployment time.
+    /// This should be called when a subgraph gets close to the chain
+    /// head. Calling it when all postponed indexes already exist is safe
+    /// and a no-op.
+    async fn create_postponed_indexes(&self) -> Result<(), StoreError>;
+
     /// Wait for the background writer to finish processing its queue
     async fn flush(&self) -> Result<(), StoreError>;
 
@@ -521,6 +537,23 @@ pub trait ChainIdStore: Send + Sync + 'static {
     ) -> Result<(), Error>;
 }
 
+/// The default size for the block cache, i.e., how many blocks behind
+/// the chain head we should keep in the database cache. The
+/// configuration can change this for individual chains
+pub const BLOCK_CACHE_SIZE: BlockNumber = i32::MAX;
+
+/// Result of clearing stale call cache entries.
+pub struct StaleCallCacheResult {
+    /// The effective TTL in days that was actually used for deletion.
+    /// This may be larger than the requested TTL if `max_contracts`
+    /// was set and caused the cutoff to be adjusted.
+    pub effective_ttl_days: usize,
+    /// Number of cache entries deleted from the call cache.
+    pub cache_entries_deleted: usize,
+    /// Number of contract entries deleted from call meta.
+    pub contracts_deleted: usize,
+}
+
 /// Common trait for blockchain store implementations.
 #[async_trait]
 pub trait ChainStore: ChainHeadStore {
@@ -553,11 +586,15 @@ pub trait ChainStore: ChainHeadStore {
         ancestor_count: BlockNumber,
     ) -> Result<Option<B256>, Error>;
 
-    /// Returns the blocks present in the store.
-    async fn blocks(
-        self: Arc<Self>,
-        hashes: Vec<BlockHash>,
-    ) -> Result<Vec<serde_json::Value>, Error>;
+    /// Returns the blocks present in the store as typed cached blocks.
+    async fn blocks(self: Arc<Self>, hashes: Vec<BlockHash>) -> Result<Vec<CachedBlock>, Error>;
+
+    /// Return the parent block pointer for the block with the given hash.
+    /// Only reads header columns (hash, number, parent_hash), not the data
+    /// column. More efficient than `blocks` when only the parent pointer is
+    /// needed.
+    async fn block_parent_ptr(self: Arc<Self>, hash: &BlockHash)
+    -> Result<Option<BlockPtr>, Error>;
 
     /// Returns the blocks present in the store for the given block numbers.
     async fn block_ptrs_by_numbers(
@@ -584,7 +621,17 @@ pub trait ChainStore: ChainHeadStore {
         block_ptr: BlockPtr,
         offset: BlockNumber,
         root: Option<BlockHash>,
-    ) -> Result<Option<(serde_json::Value, BlockPtr)>, Error>;
+    ) -> Result<Option<(CachedBlock, BlockPtr)>, Error>;
+
+    /// Like `ancestor_block` but returns only the block pointer, not the
+    /// block data. More efficient when callers only need to identify which
+    /// block is the ancestor without reading the full block body.
+    async fn ancestor_block_ptr(
+        self: Arc<Self>,
+        block_ptr: BlockPtr,
+        offset: BlockNumber,
+        root: Option<BlockHash>,
+    ) -> Result<Option<BlockPtr>, Error>;
 
     /// Remove old blocks from the cache we maintain in the database and
     /// return a pair containing the number of the oldest block retained
@@ -634,12 +681,14 @@ pub trait ChainStore: ChainHeadStore {
     /// Clears call cache of the chain for the given `from` and `to` block number.
     async fn clear_call_cache(&self, from: BlockNumber, to: BlockNumber) -> Result<(), Error>;
 
-    /// Clears stale call cache entries for the given TTL in days.
+    /// Clears stale call cache entries for the given TTL in days. If
+    /// `max_contracts` is set, increase the effective TTL so that at
+    /// most `max_contracts` contracts are evicted.
     async fn clear_stale_call_cache(
         &self,
-        ttl_days: i32,
-        ttl_max_contracts: Option<i64>,
-    ) -> Result<(), Error>;
+        ttl_days: usize,
+        max_contracts: Option<usize>,
+    ) -> Result<StaleCallCacheResult, Error>;
 
     /// Return the chain identifier for this store.
     async fn chain_identifier(&self) -> Result<ChainIdentifier, Error>;
@@ -703,7 +752,7 @@ pub trait QueryStore: Send + Sync {
     async fn block_ptr(&self) -> Result<Option<BlockPtr>, StoreError>;
 
     async fn block_number(&self, block_hash: &BlockHash)
-        -> Result<Option<BlockNumber>, StoreError>;
+    -> Result<Option<BlockNumber>, StoreError>;
 
     async fn block_numbers(
         &self,
diff --git a/graph/src/components/store/write.rs b/graph/src/components/store/write.rs
index fb123b9a012..1a29714e51e 100644
--- a/graph/src/components/store/write.rs
+++ b/graph/src/components/store/write.rs
@@ -4,8 +4,10 @@ use std::{
     sync::Arc,
 };
 
+use slog::Logger;
+
 use crate::{
-    blockchain::{block_stream::FirehoseCursor, BlockPtr, BlockTime},
+    blockchain::{BlockPtr, BlockTime, block_stream::FirehoseCursor},
     cheap_clone::CheapClone,
     components::subgraph::Entity,
     data::{store::Id, subgraph::schema::SubgraphError},
@@ -200,7 +202,7 @@ impl EntityModification {
                     "can not clamp block range for removal of {:?} to {}",
                     self,
                     block
-                ))
+                ));
             }
         }
         Ok(())
@@ -303,29 +305,58 @@ impl EntityModification {
     }
 }
 
+/// A map from entity ids to the index of the last modification for that id.
+/// If `ENV_VARS.store.write_batch_memoize` is `false`, this map is never
+/// written to and always empty
+#[derive(Debug, CacheWeight)]
+struct LastMod {
+    /// If `ENV_VARS.store.write_batch_memoize` is `false`, we never write
+    /// into this map
+    map: HashMap<Id, usize>,
+}
+
+impl LastMod {
+    fn new() -> LastMod {
+        LastMod {
+            map: HashMap::new(),
+        }
+    }
+
+    fn get(&self, id: &Id) -> Option<&usize> {
+        if ENV_VARS.store.write_batch_memoize {
+            return self.map.get(id);
+        }
+        None
+    }
+
+    fn insert(&mut self, id: Id, idx: usize) {
+        if ENV_VARS.store.write_batch_memoize {
+            self.map.insert(id, idx);
+        }
+    }
+}
+
 /// A list of entity changes grouped by the entity type
 #[derive(Debug, CacheWeight)]
 pub struct RowGroup {
     pub entity_type: EntityType,
+
     /// All changes for this entity type, ordered by block; i.e., if `i < j`
     /// then `rows[i].block() <= rows[j].block()`. Several methods on this
     /// struct rely on the fact that this ordering is observed.
     rows: Vec<EntityModification>,
 
-    immutable: bool,
-
     /// Map the `key.entity_id` of all entries in `rows` to the index with
-    /// the most recent entry for that id to speed up lookups
-    last_mod: HashMap<Id, usize>,
+    /// the most recent entry for that id to speed up lookups.
+    last_mod: LastMod,
 }
 
 impl RowGroup {
-    pub fn new(entity_type: EntityType, immutable: bool) -> Self {
+    pub fn new(entity_type: EntityType) -> Self {
         Self {
             entity_type,
             rows: Vec::new(),
-            immutable,
-            last_mod: HashMap::new(),
+            last_mod: LastMod::new(),
         }
     }
 
@@ -382,17 +413,18 @@ impl RowGroup {
     }
 
     pub fn last_op(&self, key: &EntityKey, at: BlockNumber) -> Option<EntityOp<'_>> {
-        if ENV_VARS.store.write_batch_memoize {
-            let idx = *self.last_mod.get(&key.entity_id)?;
-            if let Some(op) = self.rows.get(idx).and_then(|emod| {
+        // If we have `key` in `last_mod`, use that and return the
+        // corresponding op. If not, fall through to a more expensive search
+        if let Some(&idx) = self.last_mod.get(&key.entity_id)
+            && let Some(op) = self.rows.get(idx).and_then(|emod| {
                 if emod.block() <= at {
                     Some(emod.as_entity_op(at))
                 } else {
                     None
                 }
-            }) {
-                return Some(op);
-            }
+            })
+        {
+            return Some(op);
         }
         // We are looking for the change at a block `at` that is before the
         // change we remember in `last_mod`, and therefore have to scan
@@ -430,23 +462,51 @@ impl RowGroup {
 
     /// Find the most recent entry for `id`
     fn prev_row_mut(&mut self, id: &Id) -> Option<&mut EntityModification> {
-        if ENV_VARS.store.write_batch_memoize {
-            let idx = *self.last_mod.get(id)?;
-            self.rows.get_mut(idx)
-        } else {
-            self.rows.iter_mut().rfind(|emod| emod.id() == id)
+        if let Some(&idx) = self.last_mod.get(id) {
+            return self.rows.get_mut(idx);
         }
+        self.rows.iter_mut().rfind(|emod| emod.id() == id)
     }
 
     /// Append `row` to `self.rows` by combining it with a previously
     /// existing row, if that is possible
     fn append_row(&mut self, row: EntityModification) -> Result<(), StoreError> {
-        if self.immutable {
+        if self.entity_type.is_immutable() {
             match row {
                 EntityModification::Insert { .. } => {
+                    // Check if this is an attempt to overwrite an immutable
+                    // entity. We allow overwriting immutable entities in
+                    // the same block, but not across blocks; if such an
+                    // attempt happens across two batches, it would result
+                    // in a database constraint violation. This check is
+                    // simply here to provide a friendlier error message and
+                    // to raise the error earlier, before we actually write
+                    // to the database
+                    match self
+                        .last_mod
+                        .get(row.id())
+                        .and_then(|&idx| self.rows.get(idx))
+                    {
+                        Some(prev) if prev.block() != row.block() => {
+                            if self.entity_type.skip_duplicates() {
+                                return Ok(());
+                            }
+                            return Err(StoreError::Input(format!(
+                                "entity {} is immutable; inserting it at block {} is not possible as it was already inserted at block {}",
+                                row.key(),
+                                row.block(),
+                                prev.block()
+                            )));
+                        }
+                        _ => { /* nothing to check */ }
+                    }
+
                     self.push_row(row);
                 }
                 EntityModification::Overwrite { .. } | EntityModification::Remove { .. } => {
+                    if self.entity_type.skip_duplicates() {
+                        return Ok(());
+                    }
                     return Err(internal_error!(
                         "immutable entity type {} only allows inserts, not {:?}",
                         self.entity_type,
@@ -491,7 +551,7 @@ impl RowGroup {
                         "impossible combination of entity operations: {:?} and then {:?}",
                         prev_row,
                         row
-                    ))
+                    ));
                 }
                 (Remove { .. }, Remove { .. }) => {
                     // Ignore the new row, since prev_row is already a
@@ -553,8 +613,8 @@ impl RowGroup {
 pub struct RowGroupForPerfTest(RowGroup);
 
 impl RowGroupForPerfTest {
-    pub fn new(entity_type: EntityType, immutable: bool) -> Self {
-        Self(RowGroup::new(entity_type, immutable))
+    pub fn new(entity_type: EntityType) -> Self {
+        Self(RowGroup::new(entity_type))
     }
 
     pub fn push(&mut self, emod: EntityModification, block: BlockNumber) -> Result<(), StoreError> {
@@ -610,11 +670,15 @@ impl<'a> Iterator for ClampsByBlockIterator<'a> {
 #[derive(Debug, CacheWeight)]
 pub struct RowGroups {
     pub groups: Vec<RowGroup>,
+    logger: Logger,
 }
 
 impl RowGroups {
-    fn new() -> Self {
-        Self { groups: Vec::new() }
+    fn new(logger: Logger) -> Self {
+        Self {
+            groups: Vec::new(),
+            logger,
+        }
     }
 
     fn group(&self, entity_type: &EntityType) -> Option<&RowGroup> {
@@ -633,9 +697,7 @@ impl RowGroups {
         match pos {
             Some(pos) => &mut self.groups[pos],
             None => {
-                let immutable = entity_type.is_immutable();
-                self.groups
-                    .push(RowGroup::new(entity_type.clone(), immutable));
+                self.groups.push(RowGroup::new(entity_type.clone()));
                 // unwrap: we just pushed an entry
                 self.groups.last_mut().unwrap()
             }
@@ -733,6 +795,7 @@ impl Batch {
         deterministic_errors: Vec<SubgraphError>,
         offchain_to_remove: Vec<StoredDynamicDataSource>,
         is_non_fatal_errors_active: bool,
+        logger: Logger,
     ) -> Result<Self, StoreError> {
         let block = block_ptr.number;
 
@@ -746,7 +809,7 @@ impl Batch {
             EntityModification::Remove { .. } => 0,
         });
 
-        let mut mods = RowGroups::new();
+        let mut mods = RowGroups::new(logger);
 
         for m in raw_mods {
             mods.group_entry(&m.key().entity_type).push(m, block)?;
@@ -775,7 +838,11 @@ impl Batch {
 
     fn append_inner(&mut self, mut batch: Batch) -> Result<(), StoreError> {
         if batch.block_ptr.number <= self.block_ptr.number {
-            return Err(internal_error!("Batches must go forward. Can't append a batch with block pointer {} to one with block pointer {}", batch.block_ptr, self.block_ptr));
+            return Err(internal_error!(
+                "Batches must go forward. Can't append a batch with block pointer {} to one with block pointer {}",
+                batch.block_ptr,
+                self.block_ptr
+            ));
         }
 
         self.block_ptr = batch.block_ptr;
@@ -988,7 +1055,7 @@ mod test {
 
     use crate::{
         components::store::{
-            write::EntityModification, write::EntityOp, BlockNumber, EntityType, StoreError,
+            BlockNumber, EntityType, StoreError, write::EntityModification, write::EntityOp,
         },
         data::{store::Id, value::Word},
         entity,
@@ -997,7 +1064,7 @@ mod test {
     };
     use lazy_static::lazy_static;
 
-    use super::RowGroup;
+    use super::{LastMod, RowGroup};
 
     #[track_caller]
     fn check_runs(values: &[usize], blocks: &[BlockNumber], exp: &[(BlockNumber, &[usize])]) {
@@ -1015,18 +1082,19 @@ mod test {
                 block: *block,
             })
             .collect();
-        let last_mod = rows
-            .iter()
-            .enumerate()
-            .fold(HashMap::new(), |mut map, (idx, emod)| {
-                map.insert(emod.id().clone(), idx);
-                map
-            });
+        let last_mod = LastMod {
+            map: rows
+                .iter()
+                .enumerate()
+                .fold(HashMap::new(), |mut map, (idx, emod)| {
+                    map.insert(emod.id().clone(), idx);
+                    map
+                }),
+        };
 
         let group = RowGroup {
             entity_type: ENTRY_TYPE.clone(),
             rows,
-            immutable: false,
             last_mod,
         };
         let act = group
@@ -1067,6 +1135,8 @@ mod test {
       type Thing @entity { id: ID!, count: Int! }
       type RowGroup @entity { id: ID! }
       type Entry @entity { id: ID! }
+      type ImmThing @entity(immutable: true) { id: ID!, count: Int! }
+      type SkipDupThing @entity(immutable: true, skipDuplicates: true) { id: ID!, count: Int! }
     "#;
     lazy_static! {
         static ref DEPLOYMENT: DeploymentHash = DeploymentHash::new("batchAppend").unwrap();
@@ -1075,6 +1145,8 @@ mod test {
         static ref THING_TYPE: EntityType = SCHEMA.entity_type("Thing").unwrap();
         static ref ROW_GROUP_TYPE: EntityType = SCHEMA.entity_type("RowGroup").unwrap();
         static ref ENTRY_TYPE: EntityType = SCHEMA.entity_type("Entry").unwrap();
+        static ref IMM_THING_TYPE: EntityType = SCHEMA.entity_type("ImmThing").unwrap();
+        static ref SKIP_DUP_THING_TYPE: EntityType = SCHEMA.entity_type("SkipDupThing").unwrap();
     }
 
     /// Convenient notation for changes to a fixed entity
@@ -1134,7 +1206,7 @@ mod test {
     impl Group {
         fn new() -> Self {
             Self {
-                group: RowGroup::new(THING_TYPE.clone(), false),
+                group: RowGroup::new(THING_TYPE.clone()),
             }
         }
 
@@ -1239,4 +1311,76 @@ mod test {
         let op = group.last_op(&key, 0);
         assert_eq!(None, op);
     }
+
+    fn make_insert(entity_type: &EntityType, id: &str, block: BlockNumber) -> EntityModification {
+        EntityModification::Insert {
+            key: entity_type.parse_key(id).unwrap(),
+            data: Arc::new(entity! { SCHEMA => id: id, count: block }),
+            block,
+            end: None,
+        }
+    }
+
+    fn make_overwrite(
+        entity_type: &EntityType,
+        id: &str,
+        block: BlockNumber,
+    ) -> EntityModification {
+        EntityModification::Overwrite {
+            key: entity_type.parse_key(id).unwrap(),
+            data: Arc::new(entity! { SCHEMA => id: id, count: block }),
+            block,
+            end: None,
+        }
+    }
+
+    fn make_remove(entity_type: &EntityType, id: &str, block: BlockNumber) -> EntityModification {
+        EntityModification::Remove {
+            key: entity_type.parse_key(id).unwrap(),
+            block,
+        }
+    }
+
+    #[test]
+    fn append_row_immutable_default_rejects_cross_block_duplicate() {
+        let mut group = RowGroup::new(IMM_THING_TYPE.clone());
+        let res = group.push(make_insert(&IMM_THING_TYPE, "one", 1), 1);
+        assert!(res.is_ok());
+        let res = group.push(make_insert(&IMM_THING_TYPE, "one", 2), 2);
+        assert!(res.is_err());
+    }
+
+    #[test]
+    fn append_row_skip_duplicates_allows_cross_block_duplicate() {
+        let mut group = RowGroup::new(SKIP_DUP_THING_TYPE.clone());
+        let res = group.push(make_insert(&SKIP_DUP_THING_TYPE, "one", 1), 1);
+        assert!(res.is_ok());
+        let res = group.push(make_insert(&SKIP_DUP_THING_TYPE, "one", 2), 2);
+        assert!(res.is_ok());
+        assert_eq!(group.row_count(), 1);
+    }
+
+    #[test]
+    fn append_row_skip_duplicates_allows_overwrite() {
+        let mut group = RowGroup::new(SKIP_DUP_THING_TYPE.clone());
+        let res = group.append_row(make_overwrite(&SKIP_DUP_THING_TYPE, "one", 1));
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn append_row_skip_duplicates_allows_remove() {
+        let mut group = RowGroup::new(SKIP_DUP_THING_TYPE.clone());
+        let res = group.append_row(make_remove(&SKIP_DUP_THING_TYPE, "one", 1));
+        assert!(res.is_ok());
+    }
+
+    #[test]
+    fn append_row_skip_duplicates_same_block_still_pushes() {
+        let mut group = RowGroup::new(SKIP_DUP_THING_TYPE.clone());
+        let res = group.push(make_insert(&SKIP_DUP_THING_TYPE, "one", 1), 1);
+        assert!(res.is_ok());
+        let res = group.push(make_insert(&SKIP_DUP_THING_TYPE, "one", 1), 1);
+        assert!(res.is_ok());
+        assert_eq!(group.row_count(), 2);
+    }
 }
diff --git a/graph/src/components/subgraph/instance.rs b/graph/src/components/subgraph/instance.rs
index 6ee720a10c0..ae4a91ed540 100644
--- a/graph/src/components/subgraph/instance.rs
+++ b/graph/src/components/subgraph/instance.rs
@@ -2,7 +2,7 @@ use crate::{
     blockchain::{Blockchain, DataSourceTemplate as _},
     components::{
         metrics::block_state::BlockStateMetrics,
-        store::{EntityLfuCache, ReadStore, StoredDynamicDataSource},
+        store::{EntityLfuCache, ReadStore, SeqGenerator, StoredDynamicDataSource},
     },
     data::subgraph::schema::SubgraphError,
     data_source::{DataSourceTemplate, DataSourceTemplateInfo},
@@ -87,9 +87,9 @@ pub struct BlockState {
 }
 
 impl BlockState {
-    pub fn new(store: impl ReadStore, lfu_cache: EntityLfuCache) -> Self {
+    pub fn new(store: impl ReadStore, lfu_cache: EntityLfuCache, vid_gen: SeqGenerator) -> Self {
         BlockState {
-            entity_cache: EntityCache::with_current(Arc::new(store), lfu_cache),
+            entity_cache: EntityCache::with_current(Arc::new(store), lfu_cache, vid_gen),
             deterministic_errors: Vec::new(),
             created_data_sources: Vec::new(),
             persisted_data_sources: Vec::new(),
@@ -100,6 +100,10 @@ impl BlockState {
             write_capacity_remaining: ENV_VARS.block_write_capacity,
         }
     }
+
+    pub fn seq_gen(&self) -> SeqGenerator {
+        self.entity_cache.seq_gen()
+    }
 }
 
 impl BlockState {
@@ -178,4 +182,48 @@ impl BlockState {
     pub fn persist_data_source(&mut self, ds: StoredDynamicDataSource) {
         self.persisted_data_sources.push(ds)
     }
+
+    /// Create a lightweight checkpoint for rollback.
+    ///
+    /// This captures the current counts of created and persisted data sources,
+    /// allowing a partial rollback via `restore()`. Note that entity cache changes
+    /// cannot be easily checkpointed; rollback clears the cache (acceptable per
+    /// current behavior).
+    pub fn checkpoint(&self) -> BlockStateCheckpoint {
+        assert!(!self.in_handler);
+        BlockStateCheckpoint {
+            created_data_sources_count: self.created_data_sources.len(),
+            persisted_data_sources_count: self.persisted_data_sources.len(),
+            processed_data_sources_count: self.processed_data_sources.len(),
+            deterministic_errors_count: self.deterministic_errors.len(),
+        }
+    }
+
+    /// Restore state to a previously captured checkpoint (partial rollback).
+    ///
+    /// This truncates the data source vectors to their checkpoint sizes.
+    /// Entity cache is NOT restored - caller should handle cache state if needed.
+    pub fn restore(&mut self, checkpoint: BlockStateCheckpoint) {
+        assert!(!self.in_handler);
+        self.created_data_sources
+            .truncate(checkpoint.created_data_sources_count);
+        self.persisted_data_sources
+            .truncate(checkpoint.persisted_data_sources_count);
+        self.processed_data_sources
+            .truncate(checkpoint.processed_data_sources_count);
+        self.deterministic_errors
+            .truncate(checkpoint.deterministic_errors_count);
+    }
+}
+
+/// A lightweight checkpoint for `BlockState` rollback.
+///
+/// Captures counts of mutable vectors in `BlockState` to enable partial rollback.
+/// Used before processing dynamic data sources to allow recovery if needed.
+#[derive(Debug, Clone, Copy)]
+pub struct BlockStateCheckpoint {
+    created_data_sources_count: usize,
+    persisted_data_sources_count: usize,
+    processed_data_sources_count: usize,
+    deterministic_errors_count: usize,
 }
diff --git a/graph/src/components/subgraph/mod.rs b/graph/src/components/subgraph/mod.rs
index 02b6486b953..45ab3b16ac4 100644
--- a/graph/src/components/subgraph/mod.rs
+++ b/graph/src/components/subgraph/mod.rs
@@ -8,7 +8,9 @@ mod settings;
 pub use crate::prelude::Entity;
 
 pub use self::host::{HostMetrics, MappingError, RuntimeHost, RuntimeHostBuilder};
-pub use self::instance::{BlockState, InstanceDSTemplate, InstanceDSTemplateInfo};
+pub use self::instance::{
+    BlockState, BlockStateCheckpoint, InstanceDSTemplate, InstanceDSTemplateInfo,
+};
 pub use self::instance_manager::SubgraphInstanceManager;
 pub use self::proof_of_indexing::{
     PoICausalityRegion, ProofOfIndexing, ProofOfIndexingEvent, ProofOfIndexingFinisher,
diff --git a/graph/src/components/subgraph/proof_of_indexing/event.rs b/graph/src/components/subgraph/proof_of_indexing/event.rs
index 4fc2e90c171..227a7a6c561 100644
--- a/graph/src/components/subgraph/proof_of_indexing/event.rs
+++ b/graph/src/components/subgraph/proof_of_indexing/event.rs
@@ -60,8 +60,8 @@ pub enum ProofOfIndexingEvent<'a> {
 
 impl stable_hash_legacy::StableHash for ProofOfIndexingEvent<'_> {
     fn stable_hash<H: StableHasher>(&self, mut sequence_number: H::Seq, state: &mut H) {
-        use stable_hash_legacy::prelude::*;
         use ProofOfIndexingEvent::*;
+        use stable_hash_legacy::prelude::*;
 
         let str: &'static str = self.into();
         str.stable_hash(sequence_number.next_child(), state);
diff --git a/graph/src/components/subgraph/proof_of_indexing/mod.rs b/graph/src/components/subgraph/proof_of_indexing/mod.rs
index 78bbaf6255f..58ec37e04f3 100644
--- a/graph/src/components/subgraph/proof_of_indexing/mod.rs
+++ b/graph/src/components/subgraph/proof_of_indexing/mod.rs
@@ -81,7 +81,7 @@ impl SharedProofOfIndexing {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::util::stable_hash_glue::{impl_stable_hash, AsBytes};
+    use crate::util::stable_hash_glue::{AsBytes, impl_stable_hash};
     use crate::{
         data::store::Id,
         prelude::{BlockPtr, DeploymentHash, Value},
@@ -91,7 +91,7 @@ mod tests {
     use maplit::hashmap;
     use online::ProofOfIndexingFinisher;
     use reference::*;
-    use slog::{o, Discard, Logger};
+    use slog::{Discard, Logger, o};
     use stable_hash::{fast_stable_hash, utils::check_for_child_errors};
     use stable_hash_legacy::crypto::SetHasher;
     use stable_hash_legacy::utils::stable_hash as stable_hash_legacy;
@@ -134,7 +134,8 @@ mod tests {
         // return the same result.
         check_for_child_errors(&case.data).expect("Found child errors");
 
-        let offline_fast = tiny_keccak::keccak256(&fast_stable_hash(&case.data).to_le_bytes());
+        let offline_fast =
+            alloy::primitives::keccak256(fast_stable_hash(&case.data).to_le_bytes()).0;
         let offline_legacy = stable_hash_legacy::<SetHasher, _>(&case.data);
 
         for (version, offline, hardcoded) in [
diff --git a/graph/src/components/subgraph/proof_of_indexing/online.rs b/graph/src/components/subgraph/proof_of_indexing/online.rs
index f9bd8b5f18d..b3043e12473 100644
--- a/graph/src/components/subgraph/proof_of_indexing/online.rs
+++ b/graph/src/components/subgraph/proof_of_indexing/online.rs
@@ -6,12 +6,12 @@ use super::{ProofOfIndexingEvent, ProofOfIndexingVersion};
 use crate::{
     blockchain::BlockPtr,
     data::store::Id,
-    prelude::{debug, BlockNumber, DeploymentHash, Logger, ENV_VARS},
+    prelude::{BlockNumber, DeploymentHash, ENV_VARS, Logger, debug},
     util::stable_hash_glue::AsBytes,
 };
 use alloy::primitives::Address;
 use sha2::{Digest, Sha256};
-use stable_hash::{fast::FastStableHasher, FieldAddress, StableHash, StableHasher};
+use stable_hash::{FieldAddress, StableHash, StableHasher, fast::FastStableHasher};
 use stable_hash_legacy::crypto::{Blake3SeqNo, SetHasher};
 use stable_hash_legacy::prelude::{
     StableHash as StableHashLegacy, StableHasher as StableHasherLegacy, *,
@@ -324,7 +324,7 @@ impl ProofOfIndexingFinisher {
 
         match self.state {
             Hashers::Legacy(legacy) => legacy.finish(),
-            Hashers::Fast(fast) => tiny_keccak::keccak256(&fast.finish().to_le_bytes()),
+            Hashers::Fast(fast) => alloy::primitives::keccak256(fast.finish().to_le_bytes()).0,
         }
     }
 }
diff --git a/graph/src/components/subgraph/settings.rs b/graph/src/components/subgraph/settings.rs
index f1ad9459b37..3e4db56c9ed 100644
--- a/graph/src/components/subgraph/settings.rs
+++ b/graph/src/components/subgraph/settings.rs
@@ -3,7 +3,7 @@ use std::fs::read_to_string;
 
 use crate::{
     anyhow,
-    prelude::{regex::Regex, SubgraphName},
+    prelude::{SubgraphName, regex::Regex},
 };
 use serde::{Deserialize, Serialize};
 
diff --git a/graph/src/components/transaction_receipt.rs b/graph/src/components/transaction_receipt.rs
index 526a0487180..52d3730ddc0 100644
--- a/graph/src/components/transaction_receipt.rs
+++ b/graph/src/components/transaction_receipt.rs
@@ -16,8 +16,8 @@ pub struct LightTransactionReceipt {
     pub status: bool,
 }
 
-impl From<alloy::network::AnyTransactionReceipt> for LightTransactionReceipt {
-    fn from(receipt: alloy::network::AnyTransactionReceipt) -> Self {
+impl From<super::ethereum::AnyTransactionReceiptBare> for LightTransactionReceipt {
+    fn from(receipt: super::ethereum::AnyTransactionReceiptBare) -> Self {
         LightTransactionReceipt {
             transaction_hash: receipt.transaction_hash,
             transaction_index: receipt.transaction_index.unwrap(), // unwrap is safe because its None only for pending transactions, graph-node does not ingest pending transactions
diff --git a/graph/src/data/graphql/ext.rs b/graph/src/data/graphql/ext.rs
index e9f3828e169..4177da59eae 100644
--- a/graph/src/data/graphql/ext.rs
+++ b/graph/src/data/graphql/ext.rs
@@ -6,7 +6,7 @@ use crate::prelude::s::{
     self, Definition, Directive, Document, EnumType, Field, InterfaceType, ObjectType, Type,
     TypeDefinition, Value,
 };
-use crate::prelude::{ValueType, ENV_VARS};
+use crate::prelude::{ENV_VARS, ValueType};
 use crate::schema::{META_FIELD_TYPE, SCHEMA_TYPE_NAME};
 use std::collections::{BTreeMap, HashMap};
 
diff --git a/graph/src/data/graphql/load_manager.rs b/graph/src/data/graphql/load_manager.rs
index e1053360e18..79655e25629 100644
--- a/graph/src/data/graphql/load_manager.rs
+++ b/graph/src/data/graphql/load_manager.rs
@@ -14,7 +14,7 @@ use crate::components::store::{DeploymentId, PoolWaitStats};
 use crate::data::graphql::shape_hash::shape_hash;
 use crate::data::query::{CacheStatus, QueryExecutionError};
 use crate::prelude::q;
-use crate::prelude::{debug, info, o, warn, Logger, ENV_VARS};
+use crate::prelude::{ENV_VARS, Logger, debug, info, o, warn};
 use crate::util::stats::MovingStats;
 
 const SHARD_LABEL: [&str; 1] = ["shard"];
@@ -417,24 +417,25 @@ impl LoadManager {
         let total_effort = total_effort.as_millis() as f64;
 
         // When this variable is not set, we never jail any queries.
-        if let Some(jail_threshold) = ENV_VARS.load_jail_threshold {
-            if known_query && query_effort / total_effort > jail_threshold {
-                // Any single query that causes at least JAIL_THRESHOLD of the
-                // effort in an overload situation gets killed
-                warn!(self.logger, "Jailing query";
+        if let Some(jail_threshold) = ENV_VARS.load_jail_threshold
+            && known_query
+            && query_effort / total_effort > jail_threshold
+        {
+            // Any single query that causes at least JAIL_THRESHOLD of the
+            // effort in an overload situation gets killed
+            warn!(self.logger, "Jailing query";
                 "query" => query,
                 "sgd" => format!("sgd{}", qref.id),
                 "wait_ms" => wait_ms.as_millis(),
                 "query_effort_ms" => query_effort,
                 "total_effort_ms" => total_effort,
                 "ratio" => format!("{:.4}", query_effort/total_effort));
-                self.jailed_queries.write().insert(qref);
-                return if ENV_VARS.load_simulate {
-                    Proceed
-                } else {
-                    TooExpensive
-                };
-            }
+            self.jailed_queries.write().insert(qref);
+            return if ENV_VARS.load_simulate {
+                Proceed
+            } else {
+                TooExpensive
+            };
         }
 
         // Kill random queries in case we have no queries, or not enough queries
diff --git a/graph/src/data/graphql/mod.rs b/graph/src/data/graphql/mod.rs
index 1bb2c691411..fe6b6d8707d 100644
--- a/graph/src/data/graphql/mod.rs
+++ b/graph/src/data/graphql/mod.rs
@@ -30,4 +30,4 @@ pub use object_or_interface::ObjectOrInterface;
 
 pub mod object_macro;
 pub use crate::object;
-pub use object_macro::{object_value, IntoValue};
+pub use object_macro::{IntoValue, object_value};
diff --git a/graph/src/data/graphql/values.rs b/graph/src/data/graphql/values.rs
index b4923d6ce26..6e493675e48 100644
--- a/graph/src/data/graphql/values.rs
+++ b/graph/src/data/graphql/values.rs
@@ -1,12 +1,12 @@
 use alloy::primitives::Address;
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::str::FromStr;
 
 use crate::blockchain::BlockHash;
 use crate::data::value::Object;
-use crate::prelude::{r, BigInt};
+use crate::prelude::{BigInt, r};
 
 pub trait TryFromValue: Sized {
     fn try_from_value(value: &r::Value) -> Result<Self, Error>;
diff --git a/graph/src/data/query/error.rs b/graph/src/data/query/error.rs
index ac01da52df7..aa6f84b2591 100644
--- a/graph/src/data/query/error.rs
+++ b/graph/src/data/query/error.rs
@@ -191,7 +191,11 @@ impl fmt::Display for QueryExecutionError {
                 write!(f, "Failed to get entities from store: {}", e)
             }
             OrderByNotSupportedError(entity, field) => {
-                write!(f, "Ordering by `{}` is not supported for type `{}`", field, entity)
+                write!(
+                    f,
+                    "Ordering by `{}` is not supported for type `{}`",
+                    field, entity
+                )
             }
             OrderByNotSupportedForType(field_type) => {
                 write!(f, "Ordering by `{}` fields is not supported", field_type)
@@ -200,7 +204,11 @@ impl fmt::Display for QueryExecutionError {
                 write!(f, "Filter not supported by value `{}`: `{}`", value, filter)
             }
             ChildFilterNestingNotSupportedError(value, filter) => {
-                write!(f, "Child filter nesting not supported by value `{}`: `{}`", value, filter)
+                write!(
+                    f,
+                    "Child filter nesting not supported by value `{}`: `{}`",
+                    value, filter
+                )
             }
             UnknownField(_, t, s) => {
                 write!(f, "Type `{}` has no field `{}`", t, s)
@@ -210,12 +218,20 @@ impl fmt::Display for QueryExecutionError {
                 write!(f, "Failed to get subgraph ID from type: `{}`", s)
             }
             RangeArgumentsError(arg, max, actual) => {
-                write!(f, "The `{}` argument must be between 0 and {}, but is {}", arg, max, actual)
+                write!(
+                    f,
+                    "The `{}` argument must be between 0 and {}, but is {}",
+                    arg, max, actual
+                )
             }
             InvalidFilterError => write!(f, "Filter must by an object"),
             InvalidOrFilterStructure(fields, example) => {
-                write!(f, "Cannot mix column filters with 'or' operator at the same level. Found column filter(s) {} alongside 'or' operator.\n\n{}",
-                    fields.join(", "), example)
+                write!(
+                    f,
+                    "Cannot mix column filters with 'or' operator at the same level. Found column filter(s) {} alongside 'or' operator.\n\n{}",
+                    fields.join(", "),
+                    example
+                )
             }
             EntityFieldError(e, a) => {
                 write!(f, "Entity `{}` has no attribute `{}`", e, a)
@@ -234,7 +250,11 @@ impl fmt::Display for QueryExecutionError {
                 write!(f, "Failed to decode `{}` value: `{}`", t, e)
             }
             AttributeTypeError(value, ty) => {
-                write!(f, "Query contains value with invalid type `{}`: `{}`", ty, value)
+                write!(
+                    f,
+                    "Query contains value with invalid type `{}`: `{}`",
+                    ty, value
+                )
             }
             EntityParseError(s) => {
                 write!(f, "Broken entity found in store: {}", s)
@@ -247,38 +267,78 @@ impl fmt::Display for QueryExecutionError {
                 write!(f, "Selection set for type `{}` is empty", entity_type)
             }
             AmbiguousDerivedFromResult(_, field, target_type, target_field) => {
-                write!(f, "Ambiguous result for derived field `{}`: \
+                write!(
+                    f,
+                    "Ambiguous result for derived field `{}`: \
                            Multiple `{}` entities refer back via `{}`",
-                       field, target_type, target_field)
+                    field, target_type, target_field
+                )
             }
             Unimplemented(feature) => {
                 write!(f, "Feature `{}` is not yet implemented", feature)
             }
             EnumCoercionError(_, field, value, enum_type, values) => {
-                write!(f, "Failed to coerce value `{}` of field `{}` to enum type `{}`. Possible values are: {}", value, field, enum_type, values.join(", "))
+                write!(
+                    f,
+                    "Failed to coerce value `{}` of field `{}` to enum type `{}`. Possible values are: {}",
+                    value,
+                    field,
+                    enum_type,
+                    values.join(", ")
+                )
             }
             ScalarCoercionError(_, field, value, scalar_type) => {
-                write!(f, "Failed to coerce value `{}` of field `{}` to scalar type `{}`", value, field, scalar_type)
+                write!(
+                    f,
+                    "Failed to coerce value `{}` of field `{}` to scalar type `{}`",
+                    value, field, scalar_type
+                )
             }
             TooComplex(complexity, max_complexity) => {
-                write!(f, "query potentially returns `{}` entities or more and thereby exceeds \
+                write!(
+                    f,
+                    "query potentially returns `{}` entities or more and thereby exceeds \
                            the limit of `{}` entities. Possible solutions are reducing the depth \
                            of the query, querying fewer relationships or using `first` to \
-                           return smaller collections", complexity, max_complexity)
+                           return smaller collections",
+                    complexity, max_complexity
+                )
             }
-            TooDeep(max_depth) => write!(f, "query has a depth that exceeds the limit of `{}`", max_depth),
-            CyclicalFragment(name) =>write!(f, "query has fragment cycle including `{}`", name),
+            TooDeep(max_depth) => write!(
+                f,
+                "query has a depth that exceeds the limit of `{}`",
+                max_depth
+            ),
+            CyclicalFragment(name) => write!(f, "query has fragment cycle including `{}`", name),
             UndefinedFragment(frag_name) => write!(f, "fragment `{}` is not defined", frag_name),
             Panic(msg) => write!(f, "panic processing query: {}", msg),
-            FulltextQueryRequiresFilter => write!(f, "fulltext search queries can only use EntityFilter::Equal"),
-            FulltextQueryInvalidSyntax(msg) => write!(f, "Invalid fulltext search query syntax. Error: {}. Hint: Search terms with spaces need to be enclosed in single quotes", msg),
+            FulltextQueryRequiresFilter => write!(
+                f,
+                "fulltext search queries can only use EntityFilter::Equal"
+            ),
+            FulltextQueryInvalidSyntax(msg) => write!(
+                f,
+                "Invalid fulltext search query syntax. Error: {}. Hint: Search terms with spaces need to be enclosed in single quotes",
+                msg
+            ),
             TooExpensive => write!(f, "query is too expensive"),
-            Throttled => write!(f, "service is overloaded and can not run the query right now. Please try again in a few minutes"),
+            Throttled => write!(
+                f,
+                "service is overloaded and can not run the query right now. Please try again in a few minutes"
+            ),
             DeploymentReverted => write!(f, "the chain was reorganized while executing the query"),
-            SubgraphManifestResolveError(e) => write!(f, "failed to resolve subgraph manifest: {}", e),
+            SubgraphManifestResolveError(e) => {
+                write!(f, "failed to resolve subgraph manifest: {}", e)
+            }
             InvalidSubgraphManifest => write!(f, "invalid subgraph manifest file"),
-            ResultTooBig(actual, limit) => write!(f, "the result size of {} is larger than the allowed limit of {}", actual, limit),
-            DeploymentNotFound(id_or_name) => write!(f, "deployment `{}` does not exist", id_or_name),
+            ResultTooBig(actual, limit) => write!(
+                f,
+                "the result size of {} is larger than the allowed limit of {}",
+                actual, limit
+            ),
+            DeploymentNotFound(id_or_name) => {
+                write!(f, "deployment `{}` does not exist", id_or_name)
+            }
             IdMissing => write!(f, "entity is missing an `id` attribute"),
             IdNotString => write!(f, "entity `id` attribute is not a string"),
             InternalError(msg) => write!(f, "internal error: {}", msg),
diff --git a/graph/src/data/query/query.rs b/graph/src/data/query/query.rs
index cb35f6ccca0..ab069852374 100644
--- a/graph/src/data/query/query.rs
+++ b/graph/src/data/query/query.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
 
 use crate::{
     data::graphql::shape_hash::shape_hash,
-    prelude::{q, r, ApiVersion, DeploymentHash, SubgraphName, ENV_VARS},
+    prelude::{ApiVersion, DeploymentHash, ENV_VARS, SubgraphName, q, r},
 };
 
 fn deserialize_number<'de, D>(deserializer: D) -> Result<q::Number, D::Error>
diff --git a/graph/src/data/query/result.rs b/graph/src/data/query/result.rs
index 787c1b2524c..5694bf3fcd9 100644
--- a/graph/src/data/query/result.rs
+++ b/graph/src/data/query/result.rs
@@ -4,15 +4,15 @@ use crate::cheap_clone::CheapClone;
 use crate::components::server::query::ServerResponse;
 use crate::data::value::Object;
 use crate::derive::CacheWeight;
-use crate::prelude::{r, BlockHash, BlockNumber, CacheWeight, DeploymentHash};
+use crate::prelude::{BlockHash, BlockNumber, CacheWeight, DeploymentHash, r};
 use http_body_util::Full;
+use hyper::Response;
 use hyper::header::{
     ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
     CONTENT_TYPE,
 };
-use hyper::Response;
-use serde::ser::*;
 use serde::Serialize;
+use serde::ser::*;
 use std::convert::TryFrom;
 use std::sync::Arc;
 use std::time::Instant;
diff --git a/graph/src/data/query/trace.rs b/graph/src/data/query/trace.rs
index c6682274100..369c36a5435 100644
--- a/graph/src/data/query/trace.rs
+++ b/graph/src/data/query/trace.rs
@@ -1,11 +1,11 @@
 use std::{sync::Arc, time::Duration};
 
-use serde::{ser::SerializeMap, Serialize};
+use serde::{Serialize, ser::SerializeMap};
 
 use crate::{
     components::store::{BlockNumber, QueryPermit},
     derive::CacheWeight,
-    prelude::{lazy_static, CheapClone},
+    prelude::{CheapClone, lazy_static},
 };
 
 use super::{CacheStatus, QueryExecutionError};
diff --git a/graph/src/data/store/ethereum.rs b/graph/src/data/store/ethereum.rs
index 469b4b14551..29f4544c71c 100644
--- a/graph/src/data/store/ethereum.rs
+++ b/graph/src/data/store/ethereum.rs
@@ -1,7 +1,7 @@
 use super::scalar;
 use crate::derive::CheapClone;
 use crate::prelude::*;
-use alloy::primitives::{aliases::B2048, Address, Bytes, B256, B64, U64};
+use alloy::primitives::{Address, B64, B256, Bytes, U64, aliases::B2048};
 
 impl From<Address> for Value {
     fn from(address: Address) -> Value {
diff --git a/graph/src/data/store/id.rs b/graph/src/data/store/id.rs
index 222a11fefdf..8391da53b76 100644
--- a/graph/src/data/store/id.rs
+++ b/graph/src/data/store/id.rs
@@ -1,11 +1,11 @@
 //! Types and helpers to deal with entity IDs which support a subset of the
 //! types that more general values support
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use diesel::{
+    QueryResult,
     pg::Pg,
     query_builder::AstPass,
     sql_types::{BigInt, Binary, Text},
-    QueryResult,
 };
 use stable_hash::{StableHash, StableHasher};
 use std::convert::TryFrom;
@@ -27,7 +27,7 @@ use crate::{
     runtime::gas::{Gas, GasSizeOf},
 };
 
-use super::{scalar, Value, ValueType, ID};
+use super::{ID, Value, ValueType, scalar};
 
 /// The types that can be used for the `id` of an entity
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
diff --git a/graph/src/data/store/mod.rs b/graph/src/data/store/mod.rs
index cdd9be06a37..d0b3ff7edd1 100644
--- a/graph/src/data/store/mod.rs
+++ b/graph/src/data/store/mod.rs
@@ -1,11 +1,11 @@
 use crate::{
     derive::CacheWeight,
-    prelude::{lazy_static, q, r, s, CacheWeight, QueryExecutionError},
+    prelude::{CacheWeight, QueryExecutionError, lazy_static, q, r, s},
     runtime::gas::{Gas, GasSizeOf},
-    schema::{input::VID_FIELD, EntityKey},
+    schema::{EntityKey, input::VID_FIELD},
     util::intern::{self, AtomPool, Error as InternError, NullValue, Object},
 };
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use itertools::Itertools;
 use serde::de;
 use serde::{Deserialize, Serialize};
@@ -33,6 +33,12 @@ pub mod ethereum;
 /// Conversion of values to/from SQL
 pub mod sql;
 
+lazy_static! {
+    /// The name of the default node is `"default"`. This is used when no
+    /// node is specified for a deployment.
+    pub static ref DEFAULT_NODE_ID: NodeId = NodeId::new("default").unwrap();
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct NodeId(String);
 
@@ -222,8 +228,8 @@ impl stable_hash_legacy::StableHash for Value {
         mut sequence_number: H::Seq,
         state: &mut H,
     ) {
-        use stable_hash_legacy::prelude::*;
         use Value::*;
+        use stable_hash_legacy::prelude::*;
 
         // This is the default, so write nothing.
         if self == &Null {
@@ -365,7 +371,7 @@ impl Value {
                         Value::Timestamp(scalar::Timestamp::parse_timestamp(s).map_err(|_| {
                             QueryExecutionError::ValueParseError(
                                 "Timestamp".to_string(),
-                                format!("xxx{}", s),
+                                s.to_string(),
                             )
                         })?)
                     }
@@ -519,10 +525,10 @@ impl fmt::Display for Value {
                 Value::BigDecimal(d) => d.to_string(),
                 Value::Bool(b) => b.to_string(),
                 Value::Null => "null".to_string(),
-                Value::List(ref values) =>
+                Value::List(values) =>
                     format!("[{}]", values.iter().map(ToString::to_string).join(", ")),
-                Value::Bytes(ref bytes) => bytes.to_string(),
-                Value::BigInt(ref number) => number.to_string(),
+                Value::Bytes(bytes) => bytes.to_string(),
+                Value::BigInt(number) => number.to_string(),
             }
         )
     }
@@ -827,7 +833,9 @@ pub enum EntityValidationErrorInner {
     #[error("Entity {entity}[{id}]: unknown entity type `{entity}`")]
     UnknownEntityType { entity: String, id: String },
 
-    #[error("Entity {entity}[{entity_id}]: field `{field}` is of type {expected_type}, but the value `{value}` contains a {actual_type} at index {index}")]
+    #[error(
+        "Entity {entity}[{entity_id}]: field `{field}` is of type {expected_type}, but the value `{value}` contains a {actual_type} at index {index}"
+    )]
     MismatchedElementTypeInList {
         entity: String,
         entity_id: String,
@@ -838,7 +846,9 @@ pub enum EntityValidationErrorInner {
         index: usize,
     },
 
-    #[error("Entity {entity}[{entity_id}]: the value `{value}` for field `{field}` must have type {expected_type} but has type {actual_type}")]
+    #[error(
+        "Entity {entity}[{entity_id}]: the value `{value}` for field `{field}` must have type {expected_type} but has type {actual_type}"
+    )]
     InvalidFieldType {
         entity: String,
         entity_id: String,
@@ -962,7 +972,7 @@ impl Entity {
 
     pub fn sorted_ref(&self) -> Vec<(&str, &Value)> {
         let mut v: Vec<_> = self.0.iter().filter(|(k, _)| !k.eq(&VID_FIELD)).collect();
-        v.sort_by(|(k1, _), (k2, _)| k1.cmp(k2));
+        v.sort_by_key(|(k1, _)| *k1);
         v
     }
 
@@ -1014,14 +1024,29 @@ impl Entity {
     /// If a key exists in both entities, the value from `update` is chosen.
     /// If a key only exists on one entity, the value from that entity is chosen.
     /// If a key is set to `Value::Null` in `update`, the key/value pair is removed.
-    pub fn merge_remove_null_fields(&mut self, update: Entity) -> Result<(), InternError> {
+    pub fn merge_remove_null_fields(&mut self, update: Entity) -> Result<bool, InternError> {
+        let mut changed = false;
         for (key, value) in update.0.into_iter() {
+            // A change in VID, which changes on every save, does not count
+            // as a change to the entity's data; this avoids spurious
+            // `Overwrite` modifications.
+            let is_vid = key.as_str() == VID_FIELD;
             match value {
-                Value::Null => self.0.remove(&key),
-                _ => self.0.insert(&key, value)?,
-            };
+                Value::Null => {
+                    if self.0.remove(&key).is_some() && !is_vid {
+                        changed = true;
+                    }
+                }
+                _ => {
+                    let different = self.0.get(key.as_str()).is_none_or(|old| *old != value);
+                    self.0.insert(&key, value)?;
+                    if different && !is_vid {
+                        changed = true;
+                    }
+                }
+            }
         }
-        Ok(())
+        Ok(changed)
     }
 
     /// Remove all entries with value `Value::Null` from `self`
@@ -1187,7 +1212,9 @@ fn value_bytes() {
     assert_eq!(
         from_query,
         Value::Bytes(scalar::Bytes::from(
-            &[143, 73, 76, 102, 175, 193, 211, 248, 172, 27, 69, 223, 33, 240, 42, 70][..]
+            &[
+                143, 73, 76, 102, 175, 193, 211, 248, 172, 27, 69, 223, 33, 240, 42, 70
+            ][..]
         ))
     );
     assert_eq!(r::Value::from(from_query), graphql_value);
@@ -1377,3 +1404,32 @@ fn entity_hidden_vid() {
     _ = entity2.set_vid(7i64);
     assert_eq!(entity2.vid(), 7i64);
 }
+
+#[test]
+fn merge_remove_null_fields_ignores_vid() {
+    use crate::schema::InputSchema;
+    let schema = InputSchema::raw("type Thing @entity {id: ID!, name: String!}", "test");
+
+    let mut current = entity! { schema => id: "1", name: "alice", vid: 3i64 };
+    let update = entity! { schema => id: "1", name: "alice", vid: 99i64 };
+
+    // Merging an identical entity with a different VID must report no change.
+    let changed = current.merge_remove_null_fields(update).unwrap();
+    assert!(!changed, "VID-only difference must not count as a change");
+    // The VID must still be updated to the new value.
+    assert_eq!(current.vid(), 99i64);
+}
+
+#[test]
+fn merge_remove_null_fields_detects_real_change() {
+    use crate::schema::InputSchema;
+    let schema = InputSchema::raw("type Thing @entity {id: ID!, name: String!}", "test");
+
+    let mut current = entity! { schema => id: "1", name: "alice", vid: 3i64 };
+    let update = entity! { schema => id: "1", name: "bob", vid: 99i64 };
+
+    let changed = current.merge_remove_null_fields(update).unwrap();
+    assert!(changed, "data change must be detected");
+    assert_eq!(current.get("name"), Some(&Value::String("bob".to_string())));
+    assert_eq!(current.vid(), 99i64);
+}
diff --git a/graph/src/data/store/scalar/bigdecimal.rs b/graph/src/data/store/scalar/bigdecimal.rs
index baba57a2d4e..3d038682471 100644
--- a/graph/src/data/store/scalar/bigdecimal.rs
+++ b/graph/src/data/store/scalar/bigdecimal.rs
@@ -304,7 +304,7 @@ mod pg {
                     ref digits,
                 } => (Sign::Minus, weight, scale, digits),
                 PgNumeric::NaN => {
-                    return Err(Box::from("NaN is not (yet) supported in BigDecimal"))
+                    return Err(Box::from("NaN is not (yet) supported in BigDecimal"));
                 }
             };
 
@@ -604,8 +604,8 @@ mod pg {
 #[cfg(test)]
 mod test {
     use super::{
-        super::test::{crypto_stable_hash, same_stable_hash},
         super::Bytes,
+        super::test::{crypto_stable_hash, same_stable_hash},
         BigDecimal, BigInt, OldBigDecimal,
     };
     use std::str::FromStr;
diff --git a/graph/src/data/store/scalar/bigint.rs b/graph/src/data/store/scalar/bigint.rs
index 0b6ae34e025..9ede6e08a4d 100644
--- a/graph/src/data/store/scalar/bigint.rs
+++ b/graph/src/data/store/scalar/bigint.rs
@@ -1,11 +1,12 @@
+use alloy::primitives::I256;
 use anyhow::bail;
 use num_bigint;
 use serde::{self, Deserialize, Serialize};
-use stable_hash::utils::AsInt;
 use stable_hash::StableHash;
+use stable_hash::utils::AsInt;
 use thiserror::Error;
 
-use crate::prelude::alloy::primitives::{U128, U256, U64};
+use crate::prelude::alloy::primitives::{U64, U128, U256};
 use std::convert::{TryFrom, TryInto};
 use std::fmt;
 use std::ops::{Add, BitAnd, BitOr, Div, Mul, Rem, Shl, Shr, Sub};
@@ -185,24 +186,27 @@ impl BigInt {
         BigInt::from_unsigned_bytes_le(&bytes).unwrap()
     }
 
-    pub fn from_signed_u256(n: &U256) -> Self {
-        let bytes: [u8; U256::BYTES] = n.to_le_bytes();
+    pub fn from_i256(n: &I256) -> Self {
+        let bytes: [u8; I256::BYTES] = n.to_le_bytes();
+        // Unwrap: 256 bits is much less than BigInt::MAX_BITS
         BigInt::from_signed_bytes_le(&bytes).unwrap()
     }
 
-    pub fn to_signed_u256(&self) -> U256 {
+    pub fn to_i256(&self) -> Result<I256, anyhow::Error> {
         let bytes = self.to_signed_bytes_le();
-        if self < &BigInt::from(0) {
-            assert!(
-                bytes.len() <= 32,
-                "BigInt value does not fit into signed U256"
-            );
-            let mut i_bytes: [u8; 32] = [255; 32];
-            i_bytes[..bytes.len()].copy_from_slice(&bytes);
-            U256::from_le_slice(&i_bytes)
+        anyhow::ensure!(
+            bytes.len() <= I256::BYTES,
+            "BigInt value `{}` does not fit into int256",
+            self
+        );
+        let fill: u8 = if self.sign() == BigIntSign::Minus {
+            0xFF
         } else {
-            U256::from_le_slice(&bytes)
-        }
+            0x00
+        };
+        let mut buf = [fill; I256::BYTES];
+        buf[..bytes.len()].copy_from_slice(&bytes);
+        Ok(I256::from_le_bytes(buf))
     }
 
     pub fn to_unsigned_u256(&self) -> Result<U256, anyhow::Error> {
@@ -213,6 +217,11 @@ impl BigInt {
                 self
             );
         }
+        anyhow::ensure!(
+            bytes.len() <= U256::BYTES,
+            "BigInt value `{}` does not fit into uint256",
+            self
+        );
         Ok(U256::from_le_slice(&bytes))
     }
 
@@ -410,6 +419,71 @@ mod test {
 
     use super::{super::test::same_stable_hash, BigInt};
 
+    /// Compute 2^n via repeated doubling so we can build values larger than
+    /// `BigInt::pow`'s u8 exponent limit.
+    fn pow2(n: u32) -> BigInt {
+        let mut acc = BigInt::from(1u64);
+        for _ in 0..n {
+            acc = acc * BigInt::from(2u64);
+        }
+        acc
+    }
+
+    #[test]
+    fn to_i256_succeeds_at_boundaries() {
+        let one = BigInt::from(1u64);
+        let i256_max = pow2(255) - one.clone();
+        let i256_min = BigInt::from(0) - pow2(255);
+
+        for v in &[
+            BigInt::from(0),
+            BigInt::from(1),
+            BigInt::from(-1),
+            i256_max.clone(),
+            i256_min.clone(),
+        ] {
+            let i = v.to_i256().expect("in-range value should convert");
+            let back = BigInt::from_i256(&i);
+            assert_eq!(&back, v, "round-trip failed for {}", v);
+        }
+    }
+
+    #[test]
+    fn to_i256_errors_outside_range() {
+        let one = BigInt::from(1u64);
+        let just_above_max = pow2(255);
+        let just_below_min = BigInt::from(0) - pow2(255) - one;
+        let way_above = pow2(300);
+        let way_below = BigInt::from(0) - pow2(300);
+
+        for v in &[just_above_max, just_below_min, way_above, way_below] {
+            assert!(
+                v.to_i256().is_err(),
+                "out-of-range value {} should error, not panic",
+                v
+            );
+        }
+    }
+
+    #[test]
+    fn to_unsigned_u256_errors_outside_range() {
+        let just_above_max = pow2(256);
+        let way_above = pow2(300);
+
+        for v in &[just_above_max, way_above] {
+            assert!(
+                v.to_unsigned_u256().is_err(),
+                "value {} above u256::MAX should error, not panic",
+                v
+            );
+        }
+
+        assert!(
+            BigInt::from(-1).to_unsigned_u256().is_err(),
+            "negative value should error"
+        );
+    }
+
     #[test]
     fn bigint_to_from_u64() {
         for n in 0..100 {
diff --git a/graph/src/data/store/scalar/bytes.rs b/graph/src/data/store/scalar/bytes.rs
index 0df3aa3bdae..62a50d3cb49 100644
--- a/graph/src/data/store/scalar/bytes.rs
+++ b/graph/src/data/store/scalar/bytes.rs
@@ -11,7 +11,7 @@ use std::str::FromStr;
 
 use crate::blockchain::BlockHash;
 use crate::derive::CacheWeight;
-use crate::util::stable_hash_glue::{impl_stable_hash, AsBytes};
+use crate::util::stable_hash_glue::{AsBytes, impl_stable_hash};
 
 /// A byte array that's serialized as a hex string prefixed by `0x`.
 #[derive(Clone, CacheWeight, PartialEq, Eq, PartialOrd, Ord)]
diff --git a/graph/src/data/store/sql.rs b/graph/src/data/store/sql.rs
index aa78e01a182..7124927ee74 100644
--- a/graph/src/data/store/sql.rs
+++ b/graph/src/data/store/sql.rs
@@ -5,7 +5,7 @@ use diesel::sql_types::{Binary, Bool, Int8, Integer, Text, Timestamptz};
 
 use std::str::FromStr;
 
-use super::{scalar, Value};
+use super::{Value, scalar};
 
 impl ToSql<Bool, Pg> for Value {
     fn to_sql(&self, out: &mut Output<Pg>) -> serialize::Result {
diff --git a/graph/src/data/subgraph/api_version.rs b/graph/src/data/subgraph/api_version.rs
index 163909adabb..f0e7a213af2 100644
--- a/graph/src/data/subgraph/api_version.rs
+++ b/graph/src/data/subgraph/api_version.rs
@@ -24,6 +24,9 @@ pub const API_VERSION_0_0_8: Version = Version::new(0, 0, 8);
 /// Enables new host function `eth_get_balance`
 pub const API_VERSION_0_0_9: Version = Version::new(0, 0, 9);
 
+/// Enables new host function `ethereum.decodeParams`
+pub const API_VERSION_0_0_10: Version = Version::new(0, 0, 10);
+
 /// Before this check was introduced, there were already subgraphs in the wild with spec version
 /// 0.0.3, due to confusion with the api version. To avoid breaking those, we accept 0.0.3 though it
 /// doesn't exist.
@@ -92,15 +95,26 @@ impl UnifiedMappingApiVersion {
     pub(super) fn try_from_versions(
         versions: impl Iterator<Item = Version>,
     ) -> Result<Self, DifferentMappingApiVersions> {
-        let unique_versions: BTreeSet<Version> = versions.collect();
+        use super::SubgraphManifestValidationError;
+        use super::manifest_validation::validate_api_versions;
+
+        let versions_vec: Vec<Version> = versions.collect();
+
+        // Use shared validation logic
+        if let Err(SubgraphManifestValidationError::DifferentApiVersions(e)) =
+            validate_api_versions(&versions_vec)
+        {
+            return Err(e);
+        }
 
+        // Extract the unified version
+        let unique_versions: BTreeSet<Version> = versions_vec.into_iter().collect();
         let all_below_referential_version = unique_versions.iter().all(|v| *v < API_VERSION_0_0_5);
-        let all_the_same = unique_versions.len() == 1;
 
-        let unified_version: Option<Version> = match (all_below_referential_version, all_the_same) {
-            (false, false) => return Err(DifferentMappingApiVersions(unique_versions)),
-            (false, true) => Some(unique_versions.iter().next().unwrap().clone()),
-            (true, _) => None,
+        let unified_version: Option<Version> = if all_below_referential_version {
+            None
+        } else {
+            unique_versions.into_iter().next()
         };
 
         Ok(UnifiedMappingApiVersion(unified_version))
diff --git a/graph/src/data/subgraph/manifest_validation.rs b/graph/src/data/subgraph/manifest_validation.rs
new file mode 100644
index 00000000000..d2ed1eb8414
--- /dev/null
+++ b/graph/src/data/subgraph/manifest_validation.rs
@@ -0,0 +1,125 @@
+//! Pure manifest validation functions.
+//!
+//! This module provides pure validation functions that can be used by both
+//! graph-node and external tools (like gnd) without requiring database access
+//! or other heavy dependencies.
+
+use semver::Version;
+use std::collections::BTreeSet;
+
+use super::api_version::API_VERSION_0_0_5;
+use super::{DifferentMappingApiVersions, SubgraphManifestValidationError};
+
+/// Validate that the manifest has at least one data source.
+pub fn validate_has_data_sources(count: usize) -> Result<(), SubgraphManifestValidationError> {
+    if count == 0 {
+        Err(SubgraphManifestValidationError::NoDataSources)
+    } else {
+        Ok(())
+    }
+}
+
+/// Validate that all data sources use the same network.
+///
+/// Returns Ok(()) if:
+/// - All data sources use the same network, or
+/// - No data sources specify a network (for non-chain data sources)
+///
+/// Returns an error if data sources use different networks.
+pub fn validate_single_network(
+    networks: &[Option<&str>],
+) -> Result<(), SubgraphManifestValidationError> {
+    let unique_networks: BTreeSet<&str> = networks.iter().filter_map(|n| *n).collect();
+
+    match unique_networks.len() {
+        0 => Err(SubgraphManifestValidationError::EthereumNetworkRequired),
+        1 => Ok(()),
+        _ => Err(SubgraphManifestValidationError::MultipleEthereumNetworks),
+    }
+}
+
+/// Validate that all data sources use the same API version when any version >= 0.0.5.
+///
+/// For API versions < 0.0.5, different versions are allowed.
+/// For API versions >= 0.0.5, all data sources must use the same version.
+pub fn validate_api_versions(versions: &[Version]) -> Result<(), SubgraphManifestValidationError> {
+    let unique_versions: BTreeSet<Version> = versions.iter().cloned().collect();
+
+    let all_below_005 = unique_versions.iter().all(|v| *v < API_VERSION_0_0_5);
+    let all_the_same = unique_versions.len() <= 1;
+
+    if all_below_005 || all_the_same {
+        Ok(())
+    } else {
+        Err(SubgraphManifestValidationError::DifferentApiVersions(
+            DifferentMappingApiVersions(unique_versions),
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_validate_has_data_sources() {
+        assert!(validate_has_data_sources(0).is_err());
+        assert!(validate_has_data_sources(1).is_ok());
+        assert!(validate_has_data_sources(5).is_ok());
+    }
+
+    #[test]
+    fn test_validate_single_network() {
+        // All same network - ok
+        assert!(validate_single_network(&[Some("mainnet"), Some("mainnet")]).is_ok());
+
+        // Single network - ok
+        assert!(validate_single_network(&[Some("mainnet")]).is_ok());
+
+        // No network specified - error
+        assert!(matches!(
+            validate_single_network(&[]),
+            Err(SubgraphManifestValidationError::EthereumNetworkRequired)
+        ));
+
+        // All None - error (no network)
+        assert!(matches!(
+            validate_single_network(&[None, None]),
+            Err(SubgraphManifestValidationError::EthereumNetworkRequired)
+        ));
+
+        // Different networks - error
+        let result = validate_single_network(&[Some("mainnet"), Some("ropsten")]);
+        assert!(matches!(
+            result,
+            Err(SubgraphManifestValidationError::MultipleEthereumNetworks)
+        ));
+
+        // Mixed with None - ok if all specified networks are the same
+        assert!(validate_single_network(&[Some("mainnet"), None, Some("mainnet")]).is_ok());
+    }
+
+    #[test]
+    fn test_validate_api_versions() {
+        // All same version >= 0.0.5 - ok
+        assert!(validate_api_versions(&[Version::new(0, 0, 5), Version::new(0, 0, 5)]).is_ok());
+
+        // All same version >= 0.0.6 - ok
+        assert!(validate_api_versions(&[Version::new(0, 0, 6), Version::new(0, 0, 6)]).is_ok());
+
+        // All below 0.0.5 - ok (even if different)
+        assert!(validate_api_versions(&[Version::new(0, 0, 3), Version::new(0, 0, 4)]).is_ok());
+
+        // Mixed with version >= 0.0.5 and different - error
+        assert!(validate_api_versions(&[Version::new(0, 0, 3), Version::new(0, 0, 5)]).is_err());
+
+        // Different versions both >= 0.0.5 - error
+        assert!(validate_api_versions(&[Version::new(0, 0, 5), Version::new(0, 0, 6)]).is_err());
+
+        // Empty - ok
+        assert!(validate_api_versions(&[]).is_ok());
+
+        // Single version - ok
+        assert!(validate_api_versions(&[Version::new(0, 0, 5)]).is_ok());
+    }
+}
diff --git a/graph/src/data/subgraph/mod.rs b/graph/src/data/subgraph/mod.rs
index 0f621f9b2dd..0c20405cdf1 100644
--- a/graph/src/data/subgraph/mod.rs
+++ b/graph/src/data/subgraph/mod.rs
@@ -6,13 +6,16 @@ pub mod api_version;
 use alloy::primitives::Address;
 pub use api_version::*;
 
+/// Pure manifest validation functions for use by external tools.
+pub mod manifest_validation;
+
 pub mod features;
 pub mod status;
 
 pub use features::{SubgraphFeature, SubgraphFeatureValidationError};
 
 use crate::{cheap_clone::CheapClone, components::store::BLOCK_NUMBER_MAX, object};
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use futures03::future::try_join_all;
 use itertools::Itertools;
 use semver::Version;
@@ -43,16 +46,16 @@ use crate::{
         subgraph::features::validate_subgraph_features,
     },
     data_source::{
-        offchain::OFFCHAIN_KINDS, DataSource, DataSourceTemplate, UnresolvedDataSource,
-        UnresolvedDataSourceTemplate,
+        DataSource, DataSourceTemplate, UnresolvedDataSource, UnresolvedDataSourceTemplate,
+        offchain::OFFCHAIN_KINDS,
     },
     derive::CacheWeight,
     ensure,
-    prelude::{r, Value, ENV_VARS},
+    prelude::{ENV_VARS, Value, r},
     schema::{InputSchema, SchemaValidationError},
 };
 
-use crate::prelude::{impl_slog_value, BlockNumber, Deserialize, Serialize};
+use crate::prelude::{BlockNumber, Deserialize, Serialize, impl_slog_value};
 
 use std::fmt;
 use std::ops::Deref;
@@ -577,10 +580,15 @@ impl Graft {
             // The graft point must be at least `reorg_threshold` blocks
             // behind the subgraph head so that a reorg can not affect the
             // data that we copy for grafting
-            (Some(ptr), true) if self.block + ENV_VARS.reorg_threshold() > ptr.number => Err(GraftBaseInvalid(format!(
-                "failed to graft onto `{}` at block {} since it's only at block {} which is within the reorg threshold of {} blocks",
-                self.base, self.block, ptr.number, ENV_VARS.reorg_threshold()
-            ))),
+            (Some(ptr), true) if self.block + ENV_VARS.reorg_threshold() > ptr.number => {
+                Err(GraftBaseInvalid(format!(
+                    "failed to graft onto `{}` at block {} since it's only at block {} which is within the reorg threshold of {} blocks",
+                    self.base,
+                    self.block,
+                    ptr.number,
+                    ENV_VARS.reorg_threshold()
+                )))
+            }
             // If the base deployment is failed *and* the `graft.block` is not
             // less than the `base.block`, the graft shouldn't be permitted.
             //
@@ -588,9 +596,28 @@ impl Graft {
             // to `base.block - 1` or less.
             (Some(ptr), false) if self.block >= ptr.number => Err(GraftBaseInvalid(format!(
                 "failed to graft onto `{}` at block {} since it's not healthy. You can graft it starting at block {} backwards",
-                self.base, self.block, ptr.number - 1
+                self.base,
+                self.block,
+                ptr.number - 1
             ))),
-            (Some(_), _) => Ok(()),
+            (Some(_), _) => {
+                // The graft block must be at or above the base's earliest
+                // available block. Below that the base store no longer has
+                // the entity versions the copy step would need: either the
+                // base started above the graft block, or pruning has
+                // removed the history.
+                let earliest_block = store
+                    .earliest_block_number(&self.base)
+                    .await
+                    .map_err(|e| GraftBaseInvalid(e.to_string()))?;
+                if self.block < earliest_block {
+                    return Err(GraftBaseInvalid(format!(
+                        "failed to graft onto `{}` at block {} since its earliest available block is {}",
+                        self.base, self.block, earliest_block
+                    )));
+                }
+                Ok(())
+            }
         }
     }
 }
@@ -843,11 +870,13 @@ impl<C: Blockchain> UnvalidatedSubgraphManifest<C> {
         store: Arc<S>,
         validate_graft_base: bool,
     ) -> Result<SubgraphManifest<C>, Vec<SubgraphManifestValidationError>> {
+        use manifest_validation::{validate_has_data_sources, validate_single_network};
+
         let mut errors: Vec<SubgraphManifestValidationError> = vec![];
 
         // Validate that the manifest has at least one data source
-        if self.0.data_sources.is_empty() {
-            errors.push(SubgraphManifestValidationError::NoDataSources);
+        if let Err(e) = validate_has_data_sources(self.0.data_sources.len()) {
+            errors.push(e);
         }
 
         for ds in &self.0.data_sources {
@@ -861,33 +890,24 @@ impl<C: Blockchain> UnvalidatedSubgraphManifest<C> {
             errors.push(different_api_versions.into());
         };
 
-        let mut networks = self
-            .0
-            .data_sources
-            .iter()
-            .filter_map(|d| Some(d.network()?.to_string()))
-            .collect::<Vec<String>>();
-        networks.sort();
-        networks.dedup();
-        match networks.len() {
-            0 => errors.push(SubgraphManifestValidationError::EthereumNetworkRequired),
-            1 => (),
-            _ => errors.push(SubgraphManifestValidationError::MultipleEthereumNetworks),
+        // Validate single network using shared validation
+        let networks: Vec<Option<&str>> = self.0.data_sources.iter().map(|d| d.network()).collect();
+        if let Err(e) = validate_single_network(&networks) {
+            errors.push(e);
         }
 
-        if let Some(graft) = &self.0.graft {
-            if validate_graft_base {
-                if let Err(graft_err) = graft.validate(store).await {
-                    errors.push(graft_err);
-                }
-            }
+        if let Some(graft) = &self.0.graft
+            && validate_graft_base
+            && let Err(graft_err) = graft.validate(store).await
+        {
+            errors.push(graft_err);
         }
 
         // Validate subgraph feature usage and declaration.
-        if self.0.spec_version >= SPEC_VERSION_0_0_4 {
-            if let Err(feature_validation_error) = validate_subgraph_features(&self.0) {
-                errors.push(feature_validation_error.into())
-            }
+        if self.0.spec_version >= SPEC_VERSION_0_0_4
+            && let Err(feature_validation_error) = validate_subgraph_features(&self.0)
+        {
+            errors.push(feature_validation_error.into())
         }
 
         // Validate subgraph datasource constraints
diff --git a/graph/src/data/subgraph/schema.rs b/graph/src/data/subgraph/schema.rs
index 75922d810f2..c65dfad88e2 100644
--- a/graph/src/data/subgraph/schema.rs
+++ b/graph/src/data/subgraph/schema.rs
@@ -1,10 +1,10 @@
 //! Entity types that contain the graph-node state.
 
-use anyhow::{anyhow, bail, Error};
+use anyhow::{Error, anyhow, bail};
 use chrono::{DateTime, Utc};
 use hex;
-use rand::rngs::OsRng;
 use rand::TryRngCore as _;
+use rand::rngs::OsRng;
 use std::collections::BTreeSet;
 use std::str::FromStr;
 use std::{fmt, fmt::Display};
diff --git a/graph/src/data/subgraph/status.rs b/graph/src/data/subgraph/status.rs
index 5d78311249d..86c45fc193f 100644
--- a/graph/src/data/subgraph/status.rs
+++ b/graph/src/data/subgraph/status.rs
@@ -3,8 +3,8 @@
 use super::schema::{SubgraphError, SubgraphHealth};
 use crate::blockchain::BlockHash;
 use crate::components::store::{BlockNumber, DeploymentId};
-use crate::data::graphql::{object, IntoValue};
-use crate::prelude::{r, BlockPtr, Value};
+use crate::data::graphql::{IntoValue, object};
+use crate::prelude::{BlockPtr, Value, r};
 
 pub enum Filter {
     /// Get all versions for the named subgraph
diff --git a/graph/src/data/value.rs b/graph/src/data/value.rs
index 7abf8fec47e..6dce081aa7b 100644
--- a/graph/src/data/value.rs
+++ b/graph/src/data/value.rs
@@ -4,8 +4,8 @@ use crate::runtime::gas::{Gas, GasSizeOf, SaturatingInto};
 use diesel::pg::Pg;
 use diesel::serialize::{self, Output, ToSql};
 use diesel::sql_types::Text;
-use serde::ser::{SerializeMap, SerializeSeq, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeMap, SerializeSeq, Serializer};
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::iter::FromIterator;
diff --git a/graph/src/data_source/causality_region.rs b/graph/src/data_source/causality_region.rs
index 489247c1b9b..5755657f157 100644
--- a/graph/src/data_source/causality_region.rs
+++ b/graph/src/data_source/causality_region.rs
@@ -45,6 +45,12 @@ impl ToSql<Integer, Pg> for CausalityRegion {
     }
 }
 
+impl From<i32> for CausalityRegion {
+    fn from(value: i32) -> Self {
+        CausalityRegion(value)
+    }
+}
+
 impl CausalityRegion {
     /// The causality region of all onchain data sources.
     pub const ONCHAIN: CausalityRegion = CausalityRegion(0);
diff --git a/graph/src/data_source/common.rs b/graph/src/data_source/common.rs
index bc9b27b5bd6..f23c8d3d849 100644
--- a/graph/src/data_source/common.rs
+++ b/graph/src/data_source/common.rs
@@ -12,13 +12,13 @@ use crate::{
 };
 use alloy::primitives::{Address, U256};
 use alloy::rpc::types::Log;
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use graph_derive::CheapClone;
 use lazy_static::lazy_static;
 use num_bigint::Sign;
 use regex::Regex;
-use serde::de;
 use serde::Deserialize;
+use serde::de;
 use serde_json;
 use slog::Logger;
 use std::collections::HashMap;
@@ -55,12 +55,11 @@ fn normalize_abi_json(json_bytes: &[u8]) -> Result<Vec<u8>, anyhow::Error> {
 
         for (index, item) in array.iter_mut().enumerate() {
             if let Some(obj) = item.as_object_mut() {
-                if let Some(state_mutability) = obj.get_mut("stateMutability") {
-                    if let Some(s) = state_mutability.as_str() {
-                        if s == "undefined" {
-                            *state_mutability = serde_json::Value::String("nonpayable".to_string());
-                        }
-                    }
+                if let Some(state_mutability) = obj.get_mut("stateMutability")
+                    && let Some(s) = state_mutability.as_str()
+                    && s == "undefined"
+                {
+                    *state_mutability = serde_json::Value::String("nonpayable".to_string());
                 }
 
                 let item_type = obj.get("type").and_then(|t| t.as_str());
@@ -183,43 +182,37 @@ impl AbiJson {
 
         for item in abi_array {
             // Only process events
-            if item.get("type").and_then(|t| t.as_str()) == Some("event") {
-                if let Some(item_event_name) = item.get("name").and_then(|n| n.as_str()) {
-                    if item_event_name == event_name {
-                        // Found the event, now look for the parameter
-                        if let Some(inputs) = item.get("inputs").and_then(|i| i.as_array()) {
-                            for input in inputs {
-                                if let Some(input_param_name) =
-                                    input.get("name").and_then(|n| n.as_str())
-                                {
-                                    if input_param_name == param_name {
-                                        // Found the parameter, check if it's a struct
-                                        if let Some(param_type) =
-                                            input.get("type").and_then(|t| t.as_str())
-                                        {
-                                            if param_type == "tuple" {
-                                                if let Some(components) = input.get("components") {
-                                                    // Parse the ParamType from the JSON (simplified for now)
-                                                    let param_type = abi::DynSolType::Tuple(vec![]);
-                                                    return StructFieldInfo::from_components(
-                                                        param_name.to_string(),
-                                                        param_type,
-                                                        components,
-                                                    )
-                                                    .map(Some);
-                                                }
-                                            }
-                                        }
-                                        // Parameter found but not a struct
-                                        return Ok(None);
-                                    }
-                                }
+            if item.get("type").and_then(|t| t.as_str()) == Some("event")
+                && let Some(item_event_name) = item.get("name").and_then(|n| n.as_str())
+                && item_event_name == event_name
+            {
+                // Found the event, now look for the parameter
+                if let Some(inputs) = item.get("inputs").and_then(|i| i.as_array()) {
+                    for input in inputs {
+                        if let Some(input_param_name) = input.get("name").and_then(|n| n.as_str())
+                            && input_param_name == param_name
+                        {
+                            // Found the parameter, check if it's a struct
+                            if let Some(param_type) = input.get("type").and_then(|t| t.as_str())
+                                && param_type == "tuple"
+                                && let Some(components) = input.get("components")
+                            {
+                                // Parse the ParamType from the JSON (simplified for now)
+                                let param_type = abi::DynSolType::Tuple(vec![]);
+                                return StructFieldInfo::from_components(
+                                    param_name.to_string(),
+                                    param_type,
+                                    components,
+                                )
+                                .map(Some);
                             }
+                            // Parameter found but not a struct
+                            return Ok(None);
                         }
-                        // Event found but parameter not found
-                        return Ok(None);
                     }
                 }
+                // Event found but parameter not found
+                return Ok(None);
             }
         }
 
@@ -249,45 +242,35 @@ impl AbiJson {
 
         for item in abi_array {
             // Only process events
-            if item.get("type").and_then(|t| t.as_str()) == Some("event") {
-                if let Some(item_event_name) = item.get("name").and_then(|n| n.as_str()) {
-                    if item_event_name == event_name {
-                        // Found the event, now look for the parameter
-                        if let Some(inputs) = item.get("inputs").and_then(|i| i.as_array()) {
-                            for input in inputs {
-                                if let Some(input_param_name) =
-                                    input.get("name").and_then(|n| n.as_str())
-                                {
-                                    if input_param_name == param_name {
-                                        // Found the parameter, check if it's a struct
-                                        if let Some(param_type) =
-                                            input.get("type").and_then(|t| t.as_str())
-                                        {
-                                            if param_type == "tuple" {
-                                                if let Some(components) = input.get("components") {
-                                                    // If no nested path, this is the end
-                                                    if nested_path.is_empty() {
-                                                        return Ok(Some(vec![]));
-                                                    }
-                                                    // Recursively resolve the nested path
-                                                    return Self::resolve_field_path(
-                                                        components,
-                                                        nested_path,
-                                                    )
-                                                    .map(Some);
-                                                }
-                                            }
-                                        }
-                                        // Parameter found but not a struct
-                                        return Ok(None);
-                                    }
+            if item.get("type").and_then(|t| t.as_str()) == Some("event")
+                && let Some(item_event_name) = item.get("name").and_then(|n| n.as_str())
+                && item_event_name == event_name
+            {
+                // Found the event, now look for the parameter
+                if let Some(inputs) = item.get("inputs").and_then(|i| i.as_array()) {
+                    for input in inputs {
+                        if let Some(input_param_name) = input.get("name").and_then(|n| n.as_str())
+                            && input_param_name == param_name
+                        {
+                            // Found the parameter, check if it's a struct
+                            if let Some(param_type) = input.get("type").and_then(|t| t.as_str())
+                                && param_type == "tuple"
+                                && let Some(components) = input.get("components")
+                            {
+                                // If no nested path, this is the end
+                                if nested_path.is_empty() {
+                                    return Ok(Some(vec![]));
                                 }
+                                // Recursively resolve the nested path
+                                return Self::resolve_field_path(components, nested_path).map(Some);
                             }
+                            // Parameter found but not a struct
+                            return Ok(None);
                         }
-                        // Event found but parameter not found
-                        return Ok(None);
                     }
                 }
+                // Event found but parameter not found
+                return Ok(None);
             }
         }
 
@@ -361,40 +344,37 @@ impl AbiJson {
 
         // It's a field name - find it in the current level
         for (index, component) in components_array.iter().enumerate() {
-            if let Some(component_name) = component.get("name").and_then(|n| n.as_str()) {
-                if component_name == field_accessor {
-                    // Found the field
-                    if remaining_path.is_empty() {
-                        // This is the final field, return its index
-                        return Ok(vec![index]);
-                    } else {
-                        // We need to go deeper - check if this component is a tuple
-                        if let Some(component_type) = component.get("type").and_then(|t| t.as_str())
-                        {
-                            if component_type == "tuple" {
-                                if let Some(nested_components) = component.get("components") {
-                                    // Recursively resolve the remaining path
-                                    let mut result = vec![index];
-                                    let nested_result = Self::resolve_field_path(
-                                        nested_components,
-                                        remaining_path,
-                                    )?;
-                                    result.extend(nested_result);
-                                    return Ok(result);
-                                } else {
-                                    return Err(anyhow!(
-                                        "Tuple field '{}' has no components",
-                                        field_accessor
-                                    ));
-                                }
+            if let Some(component_name) = component.get("name").and_then(|n| n.as_str())
+                && component_name == field_accessor
+            {
+                // Found the field
+                if remaining_path.is_empty() {
+                    // This is the final field, return its index
+                    return Ok(vec![index]);
+                } else {
+                    // We need to go deeper - check if this component is a tuple
+                    if let Some(component_type) = component.get("type").and_then(|t| t.as_str()) {
+                        if component_type == "tuple" {
+                            if let Some(nested_components) = component.get("components") {
+                                // Recursively resolve the remaining path
+                                let mut result = vec![index];
+                                let nested_result =
+                                    Self::resolve_field_path(nested_components, remaining_path)?;
+                                result.extend(nested_result);
+                                return Ok(result);
                             } else {
                                 return Err(anyhow!(
-                                    "Field '{}' is not a struct (type: {}), cannot access nested field '{}'",
-                                    field_accessor,
-                                    component_type,
-                                    remaining_path[0]
+                                    "Tuple field '{}' has no components",
+                                    field_accessor
                                 ));
                             }
+                        } else {
+                            return Err(anyhow!(
+                                "Field '{}' is not a struct (type: {}), cannot access nested field '{}'",
+                                field_accessor,
+                                component_type,
+                                remaining_path[0]
+                            ));
                         }
                     }
                 }
@@ -557,9 +537,9 @@ impl CallDecl {
             },
             CallArg::Subgraph(_) => {
                 return Err(anyhow!(
-                "In declarative call '{}': Subgraph params are not supported for event handlers",
-                self.label
-            ))
+                    "In declarative call '{}': Subgraph params are not supported for event handlers",
+                    self.label
+                ));
             }
         };
         Ok(address)
@@ -782,8 +762,7 @@ impl CallDecl {
                 Ok(DynSolValue::Int(x, x.bits() as usize))
             }
             (DynSolType::Int(_), Value::BigInt(i)) => {
-                let x =
-                    abi::I256::from_le_bytes(i.to_signed_u256().to_le_bytes::<{ U256::BYTES }>());
+                let x = i.to_i256()?;
                 Ok(DynSolValue::Int(x, x.bits() as usize))
             }
             (DynSolType::Uint(_), Value::Int(i)) if *i >= 0 => {
@@ -874,7 +853,9 @@ impl CallDecl {
                 _ => {
                     return Err(anyhow!(
                         "In declarative call '{}': cannot access field on non-struct/tuple at access step {} (field path: {:?})",
-                        call_label, index, field_accesses
+                        call_label,
+                        index,
+                        field_accesses
                     ));
                 }
             }
@@ -1187,10 +1168,10 @@ impl CallArg {
         spec_version: &semver::Version,
     ) -> Result<Self, anyhow::Error> {
         // Handle hex addresses first
-        if ADDR_RE.is_match(s) {
-            if let Ok(parsed_address) = Address::from_str(s) {
-                return Ok(CallArg::HexAddress(parsed_address));
-            }
+        if ADDR_RE.is_match(s)
+            && let Ok(parsed_address) = Address::from_str(s)
+        {
+            return Ok(CallArg::HexAddress(parsed_address));
         }
 
         // Context validation
@@ -1235,11 +1216,11 @@ impl CallArg {
                     // Validate spec version before allowing any struct field access
                     if spec_version < &SPEC_VERSION_1_4_0 {
                         return Err(anyhow!(
-                                "Struct field access 'event.params.{}.*' in declarative calls is only supported for specVersion >= 1.4.0, current version is {}. Event: '{}'",
-                                param,
-                                spec_version,
-                                event_signature.unwrap_or("unknown")
-                            ));
+                            "Struct field access 'event.params.{}.*' in declarative calls is only supported for specVersion >= 1.4.0, current version is {}. Event: '{}'",
+                            param,
+                            spec_version,
+                            event_signature.unwrap_or("unknown")
+                        ));
                     }
 
                     // Resolve field path - supports both numeric and named fields
@@ -2401,8 +2382,6 @@ mod tests {
             }
         ]"#;
 
-        let abi_json_helper = AbiJson::new(ABI_JSON.as_bytes()).unwrap();
-
-        abi_json_helper
+        AbiJson::new(ABI_JSON.as_bytes()).unwrap()
     }
 }
diff --git a/graph/src/data_source/mod.rs b/graph/src/data_source/mod.rs
index cd34ca62857..016903ab55f 100644
--- a/graph/src/data_source/mod.rs
+++ b/graph/src/data_source/mod.rs
@@ -25,9 +25,9 @@ use crate::{
     prelude::{CheapClone as _, DataSourceContext},
     schema::{EntityType, InputSchema},
 };
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use semver::Version;
-use serde::{de::IntoDeserializer as _, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, de::IntoDeserializer as _};
 use slog::{Logger, SendSyncRefUnwindSafeKV};
 use std::{
     collections::{BTreeMap, HashSet},
diff --git a/graph/src/data_source/offchain.rs b/graph/src/data_source/offchain.rs
index 35e62a3cdcc..b21b52a6e3a 100644
--- a/graph/src/data_source/offchain.rs
+++ b/graph/src/data_source/offchain.rs
@@ -16,16 +16,16 @@ use crate::{
     prelude::{DataSourceContext, Link},
     schema::{EntityType, InputSchema},
 };
-use anyhow::{anyhow, Context, Error};
+use anyhow::{Context, Error, anyhow};
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use serde::Deserialize;
-use slog::{info, warn, Logger};
+use slog::{Logger, info, warn};
 use std::{
     collections::HashMap,
     fmt,
     str::FromStr,
-    sync::{atomic::AtomicI32, Arc},
+    sync::{Arc, atomic::AtomicI32},
 };
 
 use super::{CausalityRegion, DataSourceCreationError, DataSourceTemplateInfo, TriggerWithHandler};
@@ -326,8 +326,8 @@ impl Source {
     ///    the `source` of the data source is equal the `source` of the `TriggerData`.
     pub fn address(&self) -> Option<Vec<u8>> {
         match self {
-            Source::Ipfs(ref path) => Some(path.to_string().as_bytes().to_vec()),
-            Source::Arweave(ref base64) => Some(base64.as_bytes().to_vec()),
+            Source::Ipfs(path) => Some(path.to_string().as_bytes().to_vec()),
+            Source::Arweave(base64) => Some(base64.as_bytes().to_vec()),
         }
     }
 }
@@ -335,8 +335,8 @@ impl Source {
 impl From<Source> for Bytes {
     fn from(val: Source) -> Self {
         match val {
-            Source::Ipfs(ref path) => Bytes::from(path.to_string().as_bytes().to_vec()),
-            Source::Arweave(ref base64) => Bytes::from(base64.as_bytes()),
+            Source::Ipfs(path) => Bytes::from(path.to_string().as_bytes().to_vec()),
+            Source::Arweave(base64) => Bytes::from(base64.as_bytes()),
         }
     }
 }
diff --git a/graph/src/data_source/subgraph.rs b/graph/src/data_source/subgraph.rs
index b2a1d34f4e6..e7b6319b942 100644
--- a/graph/src/data_source/subgraph.rs
+++ b/graph/src/data_source/subgraph.rs
@@ -1,13 +1,13 @@
 use crate::{
-    blockchain::{block_stream::EntitySourceOperation, Block, Blockchain},
+    blockchain::{Block, Blockchain, block_stream::EntitySourceOperation},
     components::{
         link_resolver::{LinkResolver, LinkResolverContext},
         store::BlockNumber,
     },
     data::{
         subgraph::{
-            calls_host_fn, SubgraphManifest, UnresolvedSubgraphManifest, LATEST_VERSION,
-            SPEC_VERSION_1_3_0,
+            LATEST_VERSION, SPEC_VERSION_1_3_0, SubgraphManifest, UnresolvedSubgraphManifest,
+            calls_host_fn,
         },
         value::Word,
     },
@@ -16,17 +16,17 @@ use crate::{
     prelude::{CheapClone, DataSourceContext, DeploymentHash, Link},
     schema::TypeKind,
 };
-use anyhow::{anyhow, Context, Error, Result};
-use futures03::{stream::FuturesOrdered, TryStreamExt};
+use anyhow::{Context, Error, Result, anyhow};
+use futures03::{TryStreamExt, stream::FuturesOrdered};
 use serde::Deserialize;
-use slog::{info, Logger};
+use slog::{Logger, info};
 use std::{fmt, sync::Arc};
 
 use super::{
+    DataSourceTemplateInfo, TriggerWithHandler,
     common::{
         AbiJson, CallDecls, FindMappingABI, MappingABI, UnresolvedCallDecls, UnresolvedMappingABI,
     },
-    DataSourceTemplateInfo, TriggerWithHandler,
 };
 use crate::amp;
 
@@ -233,6 +233,16 @@ pub struct UnresolvedSource {
     start_block: BlockNumber,
 }
 
+impl UnresolvedSource {
+    pub fn address(&self) -> &DeploymentHash {
+        &self.address
+    }
+
+    pub fn start_block(&self) -> BlockNumber {
+        self.start_block
+    }
+}
+
 #[derive(Clone, Debug, Default, Eq, PartialEq, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UnresolvedMapping {
diff --git a/graph/src/data_source/tests.rs b/graph/src/data_source/tests.rs
index 500c8cdb403..93818f5bb8f 100644
--- a/graph/src/data_source/tests.rs
+++ b/graph/src/data_source/tests.rs
@@ -51,10 +51,12 @@ fn data_source_helpers() {
     let offchain = new_datasource();
     let offchain_ds = DataSource::<MockBlockchain>::Offchain(offchain.clone());
     assert!(offchain_ds.causality_region() == offchain.causality_region);
-    assert!(offchain_ds
-        .as_offchain()
-        .unwrap()
-        .is_duplicate_of(&offchain));
+    assert!(
+        offchain_ds
+            .as_offchain()
+            .unwrap()
+            .is_duplicate_of(&offchain)
+    );
 
     let onchain = DataSource::<MockBlockchain>::Onchain(MockDataSource {
         api_version: Version::new(1, 0, 0),
diff --git a/graph/src/endpoint.rs b/graph/src/endpoint.rs
index 1b563fb52f0..a62dc07f2ba 100644
--- a/graph/src/endpoint.rs
+++ b/graph/src/endpoint.rs
@@ -1,13 +1,13 @@
 use std::{
     collections::HashMap,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc,
+        atomic::{AtomicU64, Ordering},
     },
 };
 
 use prometheus::IntCounterVec;
-use slog::{warn, Logger};
+use slog::{Logger, warn};
 
 use crate::components::network_provider::ProviderName;
 use crate::{components::metrics::MetricsRegistry, data::value::Word};
@@ -100,7 +100,7 @@ impl EndpointMetrics {
 
     /// This should only be used for testing.
     pub fn mock() -> Self {
-        use slog::{o, Discard};
+        use slog::{Discard, o};
         let providers: &[&str] = &[];
         Self::new(
             Logger::root(Discard, o!()),
@@ -169,7 +169,7 @@ impl EndpointMetrics {
 mod test {
     use std::sync::Arc;
 
-    use slog::{o, Discard, Logger};
+    use slog::{Discard, Logger, o};
 
     use crate::{
         components::metrics::MetricsRegistry,
diff --git a/graph/src/env/amp.rs b/graph/src/env/amp.rs
index a6a02b194c3..93cf5868f2b 100644
--- a/graph/src/env/amp.rs
+++ b/graph/src/env/amp.rs
@@ -7,13 +7,13 @@ pub struct AmpEnv {
     /// This is the maximum number of record batches that can be output by a single block.
     ///
     /// Defaults to `1,000`.
-    pub max_buffer_size: usize,
+    pub buffer_size: usize,
 
     /// Maximum number of blocks to request per stream for each SQL query.
     /// Limiting this value reduces load on the Amp server when processing heavy queries.
     ///
-    /// Defaults to `2,000,000`.
-    pub max_block_range: usize,
+    /// Defaults to `100,000`.
+    pub block_range: usize,
 
     /// Minimum time to wait before retrying a failed SQL query to the Amp server.
     ///
@@ -32,31 +32,31 @@ pub struct AmpEnv {
 }
 
 impl AmpEnv {
-    const DEFAULT_MAX_BUFFER_SIZE: usize = 1_000;
-    const DEFAULT_MAX_BLOCK_RANGE: usize = 2_000_000;
+    const DEFAULT_BUFFER_SIZE: usize = 1_000;
+    const DEFAULT_BLOCK_RANGE: usize = 100_000;
     const DEFAULT_QUERY_RETRY_MIN_DELAY: Duration = Duration::from_secs(1);
     const DEFAULT_QUERY_RETRY_MAX_DELAY: Duration = Duration::from_secs(600);
 
     pub(super) fn new(raw_env: &super::Inner) -> Self {
         Self {
-            max_buffer_size: raw_env
-                .amp_max_buffer_size
+            buffer_size: raw_env
+                .amp_buffer_size
                 .and_then(|value| {
                     if value == 0 {
                         return None;
                     }
                     Some(value)
                 })
-                .unwrap_or(Self::DEFAULT_MAX_BUFFER_SIZE),
-            max_block_range: raw_env
-                .amp_max_block_range
+                .unwrap_or(Self::DEFAULT_BUFFER_SIZE),
+            block_range: raw_env
+                .amp_block_range
                 .map(|mut value| {
                     if value == 0 {
                         value = usize::MAX;
                     }
                     value
                 })
-                .unwrap_or(Self::DEFAULT_MAX_BLOCK_RANGE),
+                .unwrap_or(Self::DEFAULT_BLOCK_RANGE),
             query_retry_min_delay: raw_env
                 .amp_query_retry_min_delay_seconds
                 .map(Duration::from_secs)
diff --git a/graph/src/env/graphql.rs b/graph/src/env/graphql.rs
index 4f1f9896488..f4563155493 100644
--- a/graph/src/env/graphql.rs
+++ b/graph/src/env/graphql.rs
@@ -139,8 +139,8 @@ impl From<InnerGraphQl> for EnvVarsGraphQl {
             max_first: x.max_first,
             max_skip: x.max_skip.0,
             allow_deployment_change: x.allow_deployment_change.0,
-            warn_result_size: x.warn_result_size.0 .0,
-            error_result_size: x.error_result_size.0 .0,
+            warn_result_size: x.warn_result_size.0.0,
+            error_result_size: x.error_result_size.0.0,
             disable_bool_filters: x.disable_bool_filters.0,
             disable_child_sorting: x.disable_child_sorting.0,
             query_trace_token: x.query_trace_token,
diff --git a/graph/src/env/mappings.rs b/graph/src/env/mappings.rs
index 66a01d6cb6f..8acab1b5d05 100644
--- a/graph/src/env/mappings.rs
+++ b/graph/src/env/mappings.rs
@@ -82,6 +82,22 @@ pub struct EnvVarsMapping {
     /// Maximum backoff time for FDS requests. Set by
     /// `GRAPH_FDS_MAX_BACKOFF` in seconds, defaults to 600.
     pub fds_max_backoff: Duration,
+
+    /// Cranelift optimization level for WASM compilation.
+    ///
+    /// Set by the environment variable `GRAPH_WASM_OPT_LEVEL`. Valid values
+    /// are `none`, `speed`, and `speed_and_size`. The default value is
+    /// `speed`.
+    pub wasm_opt_level: WasmOptLevel,
+}
+
+/// Cranelift optimization level for WASM compilation. Maps to
+/// `wasmtime::OptLevel` without introducing a dependency on wasmtime.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum WasmOptLevel {
+    None,
+    Speed,
+    SpeedAndSize,
 }
 
 // This does not print any values avoid accidentally leaking any sensitive env vars
@@ -91,6 +107,32 @@ impl fmt::Debug for EnvVarsMapping {
     }
 }
 
+impl fmt::Display for WasmOptLevel {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            WasmOptLevel::None => write!(f, "none"),
+            WasmOptLevel::Speed => write!(f, "speed"),
+            WasmOptLevel::SpeedAndSize => write!(f, "speed_and_size"),
+        }
+    }
+}
+
+impl FromStr for WasmOptLevel {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "none" => Ok(WasmOptLevel::None),
+            "speed" => Ok(WasmOptLevel::Speed),
+            "speed_and_size" => Ok(WasmOptLevel::SpeedAndSize),
+            _ => Err(format!(
+                "invalid GRAPH_WASM_OPT_LEVEL '{}', expected 'none', 'speed', or 'speed_and_size'",
+                s
+            )),
+        }
+    }
+}
+
 impl TryFrom<InnerMappingHandlers> for EnvVarsMapping {
     type Error = anyhow::Error;
 
@@ -107,7 +149,7 @@ impl TryFrom<InnerMappingHandlers> for EnvVarsMapping {
 
             max_api_version: x.max_api_version,
             timeout: x.mapping_handler_timeout_in_secs.map(Duration::from_secs),
-            max_stack_size: x.runtime_max_stack_size.0 .0,
+            max_stack_size: x.runtime_max_stack_size.0.0,
 
             max_ipfs_cache_file_size: x.max_ipfs_cache_file_size.0,
             max_ipfs_cache_size: x.max_ipfs_cache_size,
@@ -121,6 +163,7 @@ impl TryFrom<InnerMappingHandlers> for EnvVarsMapping {
             disable_declared_calls: x.disable_declared_calls.0,
             store_errors_are_nondeterministic: x.store_errors_are_nondeterministic.0,
             fds_max_backoff: Duration::from_secs(x.fds_max_backoff),
+            wasm_opt_level: x.wasm_opt_level,
         };
         Ok(vars)
     }
@@ -132,7 +175,7 @@ pub struct InnerMappingHandlers {
     entity_cache_dead_weight: EnvVarBoolean,
     #[envconfig(from = "GRAPH_ENTITY_CACHE_SIZE", default = "10000")]
     entity_cache_size_in_kb: usize,
-    #[envconfig(from = "GRAPH_MAX_API_VERSION", default = "0.0.9")]
+    #[envconfig(from = "GRAPH_MAX_API_VERSION", default = "0.0.10")]
     max_api_version: Version,
     #[envconfig(from = "GRAPH_MAPPING_HANDLER_TIMEOUT")]
     mapping_handler_timeout_in_secs: Option<u64>,
@@ -164,6 +207,8 @@ pub struct InnerMappingHandlers {
     store_errors_are_nondeterministic: EnvVarBoolean,
     #[envconfig(from = "GRAPH_FDS_MAX_BACKOFF", default = "600")]
     fds_max_backoff: u64,
+    #[envconfig(from = "GRAPH_WASM_OPT_LEVEL", default = "speed")]
+    wasm_opt_level: WasmOptLevel,
 }
 
 fn validate_ipfs_cache_location(path: PathBuf) -> Result<PathBuf, anyhow::Error> {
diff --git a/graph/src/env/mod.rs b/graph/src/env/mod.rs
index 76e2c612565..54c585d5ab3 100644
--- a/graph/src/env/mod.rs
+++ b/graph/src/env/mod.rs
@@ -11,6 +11,8 @@ use semver::Version;
 
 use self::graphql::*;
 use self::mappings::*;
+
+pub use self::mappings::WasmOptLevel;
 use self::store::*;
 use crate::{
     components::{store::BlockNumber, subgraph::SubgraphVersionSwitchingMode},
@@ -170,6 +172,14 @@ pub struct EnvVars {
     ///
     /// Set the flag `GRAPH_POSTPONE_ATTRIBUTE_INDEX_CREATION`. Off by default.
     pub postpone_attribute_index_creation: bool,
+    /// When a subgraph gets within this many blocks of the chain head,
+    /// create any indexes whose creation was postponed. Only has an effect
+    /// when `postpone_attribute_index_creation` is set.
+    ///
+    /// Set by the environment variable
+    /// `GRAPH_POSTPONE_INDEXES_CREATION_THRESHOLD`. The default value is
+    /// 10000.
+    pub postpone_indexes_creation_threshold: BlockNumber,
     /// Verbose logging of mapping inputs.
     ///
     /// Set by the flag `GRAPH_LOG_TRIGGER_DATA`. Off by
@@ -320,7 +330,7 @@ impl EnvVars {
             lock_contention_log_threshold: Duration::from_millis(
                 inner.lock_contention_log_threshold_in_ms,
             ),
-            max_gas_per_handler: inner.max_gas_per_handler.0 .0,
+            max_gas_per_handler: inner.max_gas_per_handler.0.0,
             log_query_timing: inner
                 .log_query_timing
                 .split(',')
@@ -343,6 +353,7 @@ impl EnvVars {
             enable_select_by_specific_attributes: inner.enable_select_by_specific_attributes.0,
             postpone_attribute_index_creation: inner.postpone_attribute_index_creation.0
                 || cfg!(debug_assertions),
+            postpone_indexes_creation_threshold: inner.postpone_indexes_creation_threshold,
             log_trigger_data: inner.log_trigger_data.0,
             explorer_ttl: Duration::from_secs(inner.explorer_ttl_in_secs),
             explorer_lock_threshold: Duration::from_millis(inner.explorer_lock_threshold_in_msec),
@@ -547,6 +558,8 @@ struct Inner {
     enable_select_by_specific_attributes: EnvVarBoolean,
     #[envconfig(from = "GRAPH_POSTPONE_ATTRIBUTE_INDEX_CREATION", default = "false")]
     postpone_attribute_index_creation: EnvVarBoolean,
+    #[envconfig(from = "GRAPH_POSTPONE_INDEXES_CREATION_THRESHOLD", default = "10000")]
+    postpone_indexes_creation_threshold: i32,
     #[envconfig(from = "GRAPH_LOG_TRIGGER_DATA", default = "false")]
     log_trigger_data: EnvVarBoolean,
     #[envconfig(from = "GRAPH_EXPLORER_TTL", default = "10")]
@@ -606,10 +619,10 @@ struct Inner {
     )]
     disable_deployment_hash_validation: EnvVarBoolean,
 
-    #[envconfig(from = "GRAPH_AMP_MAX_BUFFER_SIZE")]
-    amp_max_buffer_size: Option<usize>,
-    #[envconfig(from = "GRAPH_AMP_MAX_BLOCK_RANGE")]
-    amp_max_block_range: Option<usize>,
+    #[envconfig(from = "GRAPH_AMP_BUFFER_SIZE")]
+    amp_buffer_size: Option<usize>,
+    #[envconfig(from = "GRAPH_AMP_BLOCK_RANGE")]
+    amp_block_range: Option<usize>,
     #[envconfig(from = "GRAPH_AMP_QUERY_RETRY_MIN_DELAY_SECONDS")]
     amp_query_retry_min_delay_seconds: Option<u64>,
     #[envconfig(from = "GRAPH_AMP_QUERY_RETRY_MAX_DELAY_SECONDS")]
diff --git a/graph/src/env/store.rs b/graph/src/env/store.rs
index cc29cb107bf..92c5564d17f 100644
--- a/graph/src/env/store.rs
+++ b/graph/src/env/store.rs
@@ -63,6 +63,10 @@ pub struct EnvVarsStore {
     /// Set by the environment variable `GRAPH_STORE_CONNECTION_TIMEOUT` (expressed
     /// in milliseconds). The default value is 5000ms.
     pub connection_timeout: Duration,
+    /// Set by `GRAPH_STORE_SETUP_TIMEOUT` (in milliseconds). Default: 30000ms.
+    /// Used during database setup (migrations, schema creation) which can
+    /// legitimately take longer than normal operations.
+    pub setup_timeout: Duration,
     /// Set by the environment variable `GRAPH_STORE_CONNECTION_MIN_IDLE`. No
     /// default value is provided.
     pub connection_min_idle: Option<u32>,
@@ -141,6 +145,10 @@ pub struct EnvVarsStore {
     pub use_brin_for_all_query_types: bool,
     /// Temporary env var to disable certain lookups in the chain store
     pub disable_block_cache_for_lookup: bool,
+    /// When set, block reads for blocks that are more than `cache_size`
+    /// blocks behind the chain head will act as if the data field in
+    /// the database was null. Set by `GRAPH_STORE_IGNORE_BLOCK_CACHE`.
+    pub ignore_block_cache: bool,
     /// Safety switch to increase the number of columns used when
     /// calculating the chunk size in `InsertQuery::chunk_size`. This can be
     /// used to work around Postgres errors complaining 'number of
@@ -214,6 +222,7 @@ impl TryFrom<InnerStore> for EnvVarsStore {
             ),
             recent_blocks_cache_capacity: x.recent_blocks_cache_capacity,
             connection_timeout: Duration::from_millis(x.connection_timeout_in_millis),
+            setup_timeout: Duration::from_millis(x.setup_timeout_in_millis),
             connection_min_idle: x.connection_min_idle,
             connection_idle_timeout: Duration::from_secs(x.connection_idle_timeout_in_secs),
             write_queue_size: x.write_queue_size,
@@ -232,6 +241,7 @@ impl TryFrom<InnerStore> for EnvVarsStore {
             create_gin_indexes: x.create_gin_indexes,
             use_brin_for_all_query_types: x.use_brin_for_all_query_types,
             disable_block_cache_for_lookup: x.disable_block_cache_for_lookup,
+            ignore_block_cache: x.ignore_block_cache,
             insert_extra_cols: x.insert_extra_cols,
             fdw_fetch_size: x.fdw_fetch_size,
             account_like_scan_interval_hours: x.account_like_scan_interval_hours,
@@ -244,12 +254,12 @@ impl TryFrom<InnerStore> for EnvVarsStore {
                 x.connection_unavailable_retry_in_secs,
             ),
         };
-        if let Some(timeout) = vars.batch_timeout {
-            if timeout < 2 * vars.batch_target_duration {
-                bail!(
-                    "GRAPH_STORE_BATCH_TIMEOUT must be greater than 2*GRAPH_STORE_BATCH_TARGET_DURATION"
-                );
-            }
+        if let Some(timeout) = vars.batch_timeout
+            && timeout < 2 * vars.batch_target_duration
+        {
+            bail!(
+                "GRAPH_STORE_BATCH_TIMEOUT must be greater than 2*GRAPH_STORE_BATCH_TARGET_DURATION"
+            );
         }
         if vars.batch_workers < 1 {
             bail!("GRAPH_STORE_BATCH_WORKERS must be at least 1");
@@ -299,6 +309,8 @@ pub struct InnerStore {
     // configured differently for each pool.
     #[envconfig(from = "GRAPH_STORE_CONNECTION_TIMEOUT", default = "5000")]
     connection_timeout_in_millis: u64,
+    #[envconfig(from = "GRAPH_STORE_SETUP_TIMEOUT", default = "30000")]
+    setup_timeout_in_millis: u64,
     #[envconfig(from = "GRAPH_STORE_CONNECTION_MIN_IDLE")]
     connection_min_idle: Option<u32>,
     #[envconfig(from = "GRAPH_STORE_CONNECTION_IDLE_TIMEOUT", default = "600")]
@@ -338,6 +350,8 @@ pub struct InnerStore {
     use_brin_for_all_query_types: bool,
     #[envconfig(from = "GRAPH_STORE_DISABLE_BLOCK_CACHE_FOR_LOOKUP", default = "false")]
     disable_block_cache_for_lookup: bool,
+    #[envconfig(from = "GRAPH_STORE_IGNORE_BLOCK_CACHE", default = "false")]
+    ignore_block_cache: bool,
     #[envconfig(from = "GRAPH_STORE_INSERT_EXTRA_COLS", default = "0")]
     insert_extra_cols: usize,
     #[envconfig(from = "GRAPH_STORE_FDW_FETCH_SIZE", default = "1000")]
diff --git a/graph/src/ext/futures.rs b/graph/src/ext/futures.rs
index 7c5eb0fc96e..b9453ff31da 100644
--- a/graph/src/ext/futures.rs
+++ b/graph/src/ext/futures.rs
@@ -2,7 +2,7 @@ use crate::blockchain::block_stream::BlockStreamError;
 use crate::prelude::tokio::macros::support::Poll;
 use crate::prelude::{Pin, StoreError};
 use futures03::channel::oneshot;
-use futures03::{future::Fuse, Future, FutureExt, Stream};
+use futures03::{Future, FutureExt, Stream, future::Fuse};
 use std::fmt::{Debug, Display};
 use std::sync::{Arc, Mutex, Weak};
 use std::task::Context;
diff --git a/graph/src/firehose/endpoint_info/info_response.rs b/graph/src/firehose/endpoint_info/info_response.rs
index 56f431452c4..a51ae7610c5 100644
--- a/graph/src/firehose/endpoint_info/info_response.rs
+++ b/graph/src/firehose/endpoint_info/info_response.rs
@@ -1,6 +1,6 @@
-use anyhow::anyhow;
 use anyhow::Context;
 use anyhow::Result;
+use anyhow::anyhow;
 
 use crate::blockchain::BlockHash;
 use crate::blockchain::BlockPtr;
@@ -78,9 +78,9 @@ fn parse_block_hash(
     s: String,
     encoding: codec::info_response::BlockIdEncoding,
 ) -> Result<BlockHash> {
+    use base64::Engine;
     use base64::engine::general_purpose::STANDARD;
     use base64::engine::general_purpose::URL_SAFE;
-    use base64::Engine;
     use codec::info_response::BlockIdEncoding::*;
 
     let block_hash = match encoding {
diff --git a/graph/src/firehose/endpoints.rs b/graph/src/firehose/endpoints.rs
index 537b5bf9bcd..8176dc3fbd1 100644
--- a/graph/src/firehose/endpoints.rs
+++ b/graph/src/firehose/endpoints.rs
@@ -2,29 +2,29 @@ use crate::firehose::fetch_client::FetchClient;
 use crate::firehose::interceptors::AuthInterceptor;
 use crate::{
     blockchain::{
-        block_stream::FirehoseCursor, Block as BlockchainBlock, BlockPtr, ChainIdentifier,
+        Block as BlockchainBlock, BlockPtr, ChainIdentifier, block_stream::FirehoseCursor,
     },
     cheap_clone::CheapClone,
     components::store::BlockNumber,
     endpoint::{ConnectionType, EndpointMetrics, RequestLabels},
     env::ENV_VARS,
     firehose::decode_firehose_block,
-    prelude::{anyhow, debug, DeploymentHash},
+    prelude::{DeploymentHash, anyhow, debug},
 };
 use anyhow::Context;
 use async_trait::async_trait;
 use futures03::{StreamExt, TryStreamExt};
 use http::uri::{Scheme, Uri};
 use itertools::Itertools;
-use slog::{error, info, trace, Logger};
+use slog::{Logger, error, info, trace};
 use std::{collections::HashMap, fmt::Display, ops::ControlFlow, sync::Arc, time::Duration};
 use tokio::sync::OnceCell;
 use tonic::codegen::InterceptedService;
 use tonic::{
+    Request,
     codegen::CompressionEncoding,
     metadata::{Ascii, MetadataKey, MetadataValue},
     transport::{Channel, ClientTlsConfig},
-    Request,
 };
 
 use super::{codec as firehose, interceptors::MetricsInterceptor, stream_client::StreamClient};
@@ -89,13 +89,12 @@ impl NetworkDetails for Arc<FirehoseEndpoint> {
 
     async fn provides_extended_blocks(&self) -> anyhow::Result<bool> {
         let info = self.clone().info().await?;
-        let pred = if info.chain_name.contains("arbitrum-one")
-            || info.chain_name.contains("optimism-mainnet")
-        {
-            |x: &String| x.starts_with("extended") || x == "hybrid"
-        } else {
-            |x: &String| x == "extended"
-        };
+        let pred =
+            if info.chain_name.contains("arbitrum-one") || info.chain_name.contains("optimism") {
+                |x: &String| x.starts_with("extended") || x == "hybrid"
+            } else {
+                |x: &String| x == "extended"
+            };
 
         Ok(info.block_features.iter().any(pred))
     }
@@ -736,7 +735,7 @@ impl FirehoseEndpoints {
 mod test {
     use std::{mem, sync::Arc};
 
-    use slog::{o, Discard, Logger};
+    use slog::{Discard, Logger, o};
 
     use super::*;
     use crate::components::metrics::MetricsRegistry;
diff --git a/graph/src/ipfs/cache.rs b/graph/src/ipfs/cache.rs
index 7ca6e766640..ab9daf6f784 100644
--- a/graph/src/ipfs/cache.rs
+++ b/graph/src/ipfs/cache.rs
@@ -9,12 +9,12 @@ use async_trait::async_trait;
 use bytes::Bytes;
 use graph_derive::CheapClone;
 use lru_time_cache::LruCache;
-use object_store::{local::LocalFileSystem, path::Path, ObjectStore};
+use object_store::{ObjectStore, ObjectStoreExt as _, local::LocalFileSystem, path::Path};
 use redis::{
-    aio::{ConnectionManager, ConnectionManagerConfig},
     AsyncCommands as _, RedisResult, Value,
+    aio::{ConnectionManager, ConnectionManagerConfig},
 };
-use slog::{debug, info, warn, Logger};
+use slog::{Logger, debug, info, warn};
 use tokio::sync::Mutex as AsyncMutex;
 
 use crate::{env::ENV_VARS, prelude::CheapClone};
diff --git a/graph/src/ipfs/client.rs b/graph/src/ipfs/client.rs
index 06bf7aee99c..fd8ac996985 100644
--- a/graph/src/ipfs/client.rs
+++ b/graph/src/ipfs/client.rs
@@ -5,9 +5,9 @@ use std::time::{Duration, Instant};
 use async_trait::async_trait;
 use bytes::Bytes;
 use bytes::BytesMut;
-use futures03::stream::BoxStream;
 use futures03::StreamExt;
 use futures03::TryStreamExt;
+use futures03::stream::BoxStream;
 use slog::Logger;
 
 use crate::cheap_clone::CheapClone as _;
@@ -196,6 +196,16 @@ pub struct IpfsResponse {
 }
 
 impl IpfsResponse {
+    /// Construct an `IpfsResponse` from pre-buffered bytes.
+    ///
+    /// Intended for mock `IpfsClient` implementations in tests.
+    pub fn for_test(path: ContentPath, bytes: Bytes) -> Self {
+        Self {
+            path,
+            response: reqwest::Response::from(http::Response::new(bytes)),
+        }
+    }
+
     /// Reads and returns the response body.
     ///
     /// If the max size is specified and the response body is larger than the max size,
diff --git a/graph/src/ipfs/content_path.rs b/graph/src/ipfs/content_path.rs
index 39c8b95d29e..54fd569e5e4 100644
--- a/graph/src/ipfs/content_path.rs
+++ b/graph/src/ipfs/content_path.rs
@@ -172,9 +172,10 @@ mod tests {
     fn fails_on_an_invalid_cid() {
         let err = ContentPath::new("not_a_cid").unwrap_err();
 
-        assert!(err
-            .to_string()
-            .starts_with("'not_a_cid' is not a valid IPFS content path: invalid CID: "));
+        assert!(
+            err.to_string()
+                .starts_with("'not_a_cid' is not a valid IPFS content path: invalid CID: ")
+        );
     }
 
     #[test]
@@ -217,9 +218,11 @@ mod tests {
     fn fails_on_an_invalid_cid_followed_by_a_path() {
         let err = ContentPath::new("not_a_cid/readme.md").unwrap_err();
 
-        assert!(err
-            .to_string()
-            .starts_with("'not_a_cid/readme.md' is not a valid IPFS content path: invalid CID: "));
+        assert!(
+            err.to_string().starts_with(
+                "'not_a_cid/readme.md' is not a valid IPFS content path: invalid CID: "
+            )
+        );
     }
 
     #[test]
diff --git a/graph/src/ipfs/gateway_client.rs b/graph/src/ipfs/gateway_client.rs
index 0a7d3ac34ad..ff2a8a431cc 100644
--- a/graph/src/ipfs/gateway_client.rs
+++ b/graph/src/ipfs/gateway_client.rs
@@ -2,10 +2,10 @@ use std::sync::Arc;
 
 use anyhow::anyhow;
 use async_trait::async_trait;
-use derivative::Derivative;
+use derive_more::Debug;
 use http::header::ACCEPT;
 use http::header::CACHE_CONTROL;
-use reqwest::{redirect::Policy as RedirectPolicy, StatusCode};
+use reqwest::{StatusCode, redirect::Policy as RedirectPolicy};
 use slog::Logger;
 
 use crate::env::ENV_VARS;
@@ -17,12 +17,11 @@ use crate::ipfs::{
 /// A client that connects to an IPFS gateway.
 ///
 /// Reference: <https://specs.ipfs.tech/http-gateways/path-gateway>
-#[derive(Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Debug)]
 pub struct IpfsGatewayClient {
     server_address: ServerAddress,
 
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     http_client: reqwest::Client,
 
     metrics: IpfsMetrics,
@@ -163,11 +162,11 @@ mod tests {
 
     use bytes::BytesMut;
     use futures03::TryStreamExt;
-    use wiremock::matchers as m;
     use wiremock::Mock;
     use wiremock::MockBuilder;
     use wiremock::MockServer;
     use wiremock::ResponseTemplate;
+    use wiremock::matchers as m;
 
     use super::*;
     use crate::data::subgraph::DeploymentHash;
@@ -552,7 +551,7 @@ mod tests {
 
     #[crate::test]
     async fn operation_names_include_cid_for_debugging() {
-        use slog::{o, Drain, Logger, Record};
+        use slog::{Drain, Logger, Record, o};
         use std::sync::{Arc, Mutex};
 
         // Custom drain to capture log messages
diff --git a/graph/src/ipfs/mod.rs b/graph/src/ipfs/mod.rs
index d8231d2074c..1bbcc459be3 100644
--- a/graph/src/ipfs/mod.rs
+++ b/graph/src/ipfs/mod.rs
@@ -5,8 +5,8 @@ use cache::CachingClient;
 use futures03::future::BoxFuture;
 use futures03::stream::FuturesUnordered;
 use futures03::stream::StreamExt;
-use slog::info;
 use slog::Logger;
+use slog::info;
 
 use crate::components::metrics::MetricsRegistry;
 use crate::util::security::SafeDisplay;
diff --git a/graph/src/ipfs/pool.rs b/graph/src/ipfs/pool.rs
index bf8943036c1..d78ac0c9483 100644
--- a/graph/src/ipfs/pool.rs
+++ b/graph/src/ipfs/pool.rs
@@ -68,11 +68,11 @@ mod tests {
     use bytes::BytesMut;
     use futures03::TryStreamExt;
     use http::StatusCode;
-    use wiremock::matchers as m;
     use wiremock::Mock;
     use wiremock::MockBuilder;
     use wiremock::MockServer;
     use wiremock::ResponseTemplate;
+    use wiremock::matchers as m;
 
     use super::*;
     use crate::ipfs::{ContentPath, IpfsContext, IpfsGatewayClient, IpfsMetrics, RetryPolicy};
diff --git a/graph/src/ipfs/retry_policy.rs b/graph/src/ipfs/retry_policy.rs
index 783f506d568..2b7d63f1657 100644
--- a/graph/src/ipfs/retry_policy.rs
+++ b/graph/src/ipfs/retry_policy.rs
@@ -2,8 +2,8 @@ use slog::Logger;
 
 use crate::ipfs::error::IpfsError;
 use crate::prelude::*;
-use crate::util::futures::retry;
 use crate::util::futures::RetryConfig;
+use crate::util::futures::retry;
 
 /// Describes retry behavior when IPFS requests fail.
 #[derive(Clone, Copy, Debug)]
@@ -42,9 +42,9 @@ impl RetryPolicy {
 
 #[cfg(test)]
 mod tests {
+    use std::sync::Arc;
     use std::sync::atomic::AtomicU64;
     use std::sync::atomic::Ordering;
-    use std::sync::Arc;
     use std::time::Duration;
 
     use super::*;
diff --git a/graph/src/ipfs/rpc_client.rs b/graph/src/ipfs/rpc_client.rs
index 92e9e787ec8..8dc1a7b9445 100644
--- a/graph/src/ipfs/rpc_client.rs
+++ b/graph/src/ipfs/rpc_client.rs
@@ -1,9 +1,8 @@
 use std::sync::Arc;
-use std::time::Duration;
 
 use anyhow::anyhow;
 use async_trait::async_trait;
-use derivative::Derivative;
+use derive_more::Debug;
 use http::header::CONTENT_LENGTH;
 use reqwest::Response;
 use reqwest::StatusCode;
@@ -18,17 +17,15 @@ use crate::ipfs::{
 /// A client that connects to an IPFS RPC API.
 ///
 /// Reference: <https://docs.ipfs.tech/reference/kubo/rpc>
-#[derive(Clone, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Debug)]
 pub struct IpfsRpcClient {
     server_address: ServerAddress,
 
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     http_client: reqwest::Client,
 
     metrics: IpfsMetrics,
     logger: Logger,
-    test_request_timeout: Duration,
 }
 
 impl IpfsRpcClient {
@@ -64,7 +61,6 @@ impl IpfsRpcClient {
             http_client: reqwest::Client::new(),
             metrics,
             logger: logger.to_owned(),
-            test_request_timeout: ENV_VARS.ipfs_request_timeout,
         })
     }
 
@@ -140,13 +136,15 @@ impl IpfsClient for IpfsRpcClient {
 
 #[cfg(test)]
 mod tests {
+    use std::time::Duration;
+
     use bytes::BytesMut;
     use futures03::TryStreamExt;
-    use wiremock::matchers as m;
     use wiremock::Mock;
     use wiremock::MockBuilder;
     use wiremock::MockServer;
     use wiremock::ResponseTemplate;
+    use wiremock::matchers as m;
 
     use super::*;
     use crate::ipfs::{ContentPath, IpfsContext, IpfsMetrics};
diff --git a/graph/src/ipfs/server_address.rs b/graph/src/ipfs/server_address.rs
index 556997406ef..a6a7cfe759a 100644
--- a/graph/src/ipfs/server_address.rs
+++ b/graph/src/ipfs/server_address.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use http::uri::Scheme;
 use http::Uri;
+use http::uri::Scheme;
 
 use crate::derive::CheapClone;
 use crate::ipfs::IpfsError;
@@ -70,12 +70,13 @@ impl ServerAddress {
         })
     }
 
-    pub fn local_gateway() -> Self {
-        Self::new("http://127.0.0.1:8080").unwrap()
-    }
-
-    pub fn local_rpc_api() -> Self {
-        Self::new("http://127.0.0.1:5001").unwrap()
+    pub fn test_rpc_api() -> Self {
+        match std::env::var("GRAPH_NODE_TEST_IPFS_URL") {
+            Ok(value) if !value.is_empty() => Self::new(&value).unwrap_or_else(|e| {
+                panic!("GRAPH_NODE_TEST_IPFS_URL contains an invalid URL: {value}: {e}")
+            }),
+            _ => Self::new("http://127.0.0.1:5001").unwrap(),
+        }
     }
 }
 
@@ -182,18 +183,4 @@ mod tests {
 
         assert_eq!(addr.to_string(), "https://example.com/ipfs/");
     }
-
-    #[test]
-    fn local_gateway_server_address_is_valid() {
-        let addr = ServerAddress::local_gateway();
-
-        assert_eq!(addr.to_string(), "http://127.0.0.1:8080/");
-    }
-
-    #[test]
-    fn local_rpc_api_server_address_is_valid() {
-        let addr = ServerAddress::local_rpc_api();
-
-        assert_eq!(addr.to_string(), "http://127.0.0.1:5001/");
-    }
 }
diff --git a/graph/src/ipfs/test_utils.rs b/graph/src/ipfs/test_utils.rs
index 405d46539ea..af4bf72ff34 100644
--- a/graph/src/ipfs/test_utils.rs
+++ b/graph/src/ipfs/test_utils.rs
@@ -1,6 +1,8 @@
 use reqwest::multipart;
 use serde::Deserialize;
 
+use crate::ipfs;
+
 #[derive(Clone, Debug)]
 pub struct IpfsAddFile {
     path: String,
@@ -53,7 +55,7 @@ where
     }
 
     let resp = reqwest::Client::new()
-        .post("http://127.0.0.1:5001/api/v0/add")
+        .post(format!("{}api/v0/add", ipfs::ServerAddress::test_rpc_api()))
         .multipart(form)
         .send()
         .await?
diff --git a/graph/src/lib.rs b/graph/src/lib.rs
index 99dcc35984a..00f01f53551 100644
--- a/graph/src/lib.rs
+++ b/graph/src/lib.rs
@@ -33,6 +33,8 @@ pub mod env;
 
 pub mod ipfs;
 
+pub mod tls;
+
 pub mod abi;
 
 pub mod amp;
@@ -52,8 +54,8 @@ pub use futures03;
 pub use graph_derive as derive;
 pub use graph_derive::test;
 pub use http;
-pub use http0;
 pub use http_body_util;
+pub use http0;
 pub use hyper;
 pub use hyper_util;
 pub use itertools;
@@ -77,8 +79,7 @@ pub use url;
 pub mod prelude {
     pub use ::anyhow;
     pub use alloy;
-    pub use anyhow::{anyhow, Context as _, Error};
-    pub use atty;
+    pub use anyhow::{Context as _, Error, anyhow};
     pub use chrono;
     pub use diesel;
     pub use envconfig;
@@ -93,7 +94,7 @@ pub mod prelude {
     pub use serde_json;
     pub use serde_regex;
     pub use serde_yaml;
-    pub use slog::{self, crit, debug, error, info, o, trace, warn, Logger};
+    pub use slog::{self, Logger, crit, debug, error, info, o, trace, warn};
     pub use std::convert::TryFrom;
     pub use std::fmt::Debug;
     pub use std::iter::FromIterator;
@@ -101,7 +102,6 @@ pub mod prelude {
     pub use std::sync::Arc;
     pub use std::time::Duration;
     pub use thiserror;
-    pub use tiny_keccak;
     pub use tokio;
     pub use toml;
     pub use tonic;
@@ -120,30 +120,31 @@ pub mod prelude {
         IpfsResolver, JsonStreamValue, JsonValueStream, LinkResolver,
     };
     pub use crate::components::metrics::{
-        stopwatch::StopwatchMetrics, subgraph::*, Collector, Counter, CounterVec, Gauge, GaugeVec,
-        Histogram, HistogramOpts, HistogramVec, MetricsRegistry, Opts, PrometheusError, Registry,
+        Collector, Counter, CounterVec, Gauge, GaugeVec, Histogram, HistogramOpts, HistogramVec,
+        MetricsRegistry, Opts, PrometheusError, Registry, stopwatch::StopwatchMetrics, subgraph::*,
     };
     pub use crate::components::store::{
-        write::EntityModification, AssignmentChange, AssignmentOperation, AttributeNames,
-        BlockNumber, CachedEthereumCall, ChainStore, Child, ChildMultiplicity, EntityCache,
-        EntityCollection, EntityFilter, EntityLink, EntityOperation, EntityOrder,
-        EntityOrderByChild, EntityOrderByChildInfo, EntityQuery, EntityRange, EntityWindow,
-        EthereumCallCache, ParentLink, PartialBlockPtr, PoolWaitStats, QueryStore,
-        QueryStoreManager, StoreError, StoreEvent, StoreEventStreamBox, SubgraphStore,
-        UnfailOutcome, WindowAttribute, BLOCK_NUMBER_MAX,
+        AssignmentChange, AssignmentOperation, AttributeNames, BLOCK_NUMBER_MAX, BlockNumber,
+        CachedEthereumCall, ChainStore, Child, ChildMultiplicity, EntityCache, EntityCollection,
+        EntityFilter, EntityLink, EntityOperation, EntityOrder, EntityOrderByChild,
+        EntityOrderByChildInfo, EntityQuery, EntityRange, EntityWindow, EthereumCallCache,
+        ParentLink, PartialBlockPtr, PoolWaitStats, QueryStore, QueryStoreManager, SeqGenerator,
+        StaleCallCacheResult, StoreError, StoreEvent, StoreEventStreamBox, SubgraphStore,
+        UnfailOutcome, WindowAttribute, write::EntityModification,
     };
     pub use crate::components::subgraph::{
-        BlockState, HostMetrics, InstanceDSTemplateInfo, RuntimeHost, RuntimeHostBuilder,
-        SubgraphInstanceManager, SubgraphRegistrar, SubgraphVersionSwitchingMode,
+        BlockState, BlockStateCheckpoint, HostMetrics, InstanceDSTemplateInfo, RuntimeHost,
+        RuntimeHostBuilder, SubgraphInstanceManager, SubgraphRegistrar,
+        SubgraphVersionSwitchingMode,
     };
     pub use crate::components::trigger_processor::TriggerProcessor;
     pub use crate::components::versions::{ApiVersion, FeatureFlag};
-    pub use crate::components::{transaction_receipt, EventConsumer, EventProducer};
+    pub use crate::components::{EventConsumer, EventProducer, transaction_receipt};
     pub use crate::env::ENV_VARS;
 
     pub use crate::cheap_clone::CheapClone;
     pub use crate::data::graphql::{
-        shape_hash::shape_hash, SerializableValue, TryFromValue, ValueMap,
+        SerializableValue, TryFromValue, ValueMap, shape_hash::shape_hash,
     };
     pub use crate::data::query::{
         Query, QueryError, QueryExecutionError, QueryResult, QueryTarget, QueryVariables,
@@ -164,13 +165,13 @@ pub mod prelude {
     };
     pub use crate::impl_slog_value;
     pub use crate::log::codes::LogCode;
-    pub use crate::log::elastic::{elastic_logger, ElasticDrainConfig, ElasticLoggingConfig};
+    pub use crate::log::elastic::{ElasticDrainConfig, ElasticLoggingConfig, elastic_logger};
     pub use crate::log::factory::{
         ComponentLoggerConfig, ElasticComponentLoggerConfig, LoggerFactory,
     };
     pub use crate::log::split::split_logger;
     pub use crate::util::cache_weight::CacheWeight;
-    pub use crate::util::futures::{retry, TimeoutError};
+    pub use crate::util::futures::{TimeoutError, retry};
     pub use crate::util::stats::{AtomicMovingStats, MovingStats};
     pub use crate::util::test_utils::*;
 
diff --git a/graph/src/log/common.rs b/graph/src/log/common.rs
new file mode 100644
index 00000000000..b75bf4c25bb
--- /dev/null
+++ b/graph/src/log/common.rs
@@ -0,0 +1,234 @@
+use std::collections::HashMap;
+use std::fmt;
+
+use serde::Serialize;
+use serde::ser::Serializer as SerdeSerializer;
+use slog::*;
+
+/// Serializer for concatenating key-value arguments into a string
+pub struct SimpleKVSerializer {
+    kvs: Vec<(String, String)>,
+}
+
+impl Default for SimpleKVSerializer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl SimpleKVSerializer {
+    pub fn new() -> Self {
+        Self { kvs: Vec::new() }
+    }
+
+    /// Returns the number of key-value pairs and the concatenated string
+    pub fn finish(self) -> (usize, String) {
+        (
+            self.kvs.len(),
+            self.kvs
+                .iter()
+                .map(|(k, v)| format!("{}: {}", k, v))
+                .collect::<Vec<_>>()
+                .join(", "),
+        )
+    }
+}
+
+impl Serializer for SimpleKVSerializer {
+    fn emit_arguments(&mut self, key: Key, val: &fmt::Arguments) -> slog::Result {
+        self.kvs.push((key.into(), val.to_string()));
+        Ok(())
+    }
+}
+
+/// Serializer for extracting key-value pairs into a Vec
+pub struct VecKVSerializer {
+    kvs: Vec<(String, String)>,
+}
+
+impl Default for VecKVSerializer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl VecKVSerializer {
+    pub fn new() -> Self {
+        Self { kvs: Vec::new() }
+    }
+
+    pub fn finish(self) -> Vec<(String, String)> {
+        self.kvs
+    }
+}
+
+impl Serializer for VecKVSerializer {
+    fn emit_arguments(&mut self, key: Key, val: &fmt::Arguments) -> slog::Result {
+        self.kvs.push((key.into(), val.to_string()));
+        Ok(())
+    }
+}
+
+/// Serializer for extracting key-value pairs into a HashMap
+pub struct HashMapKVSerializer {
+    kvs: Vec<(String, String)>,
+}
+
+impl Default for HashMapKVSerializer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl HashMapKVSerializer {
+    pub fn new() -> Self {
+        HashMapKVSerializer { kvs: Vec::new() }
+    }
+
+    pub fn finish(self) -> HashMap<String, String> {
+        self.kvs.into_iter().collect()
+    }
+}
+
+impl Serializer for HashMapKVSerializer {
+    fn emit_arguments(&mut self, key: Key, val: &fmt::Arguments) -> slog::Result {
+        self.kvs.push((key.into(), val.to_string()));
+        Ok(())
+    }
+}
+
+/// Log metadata structure
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct LogMeta {
+    pub module: String,
+    pub line: i64,
+    pub column: i64,
+}
+
+/// Serializes an slog Level as a lowercase string
+pub fn serialize_log_level<S>(level: &Level, serializer: S) -> std::result::Result<S::Ok, S::Error>
+where
+    S: SerdeSerializer,
+{
+    serializer.serialize_str(&level.as_str().to_ascii_lowercase())
+}
+
+/// Builder for common log entry fields across different drain implementations
+pub struct LogEntryBuilder<'a> {
+    record: &'a Record<'a>,
+    values: &'a OwnedKVList,
+    subgraph_id: String,
+    timestamp: String,
+}
+
+impl<'a> LogEntryBuilder<'a> {
+    pub fn new(
+        record: &'a Record<'a>,
+        values: &'a OwnedKVList,
+        subgraph_id: String,
+        timestamp: String,
+    ) -> Self {
+        Self {
+            record,
+            values,
+            subgraph_id,
+            timestamp,
+        }
+    }
+
+    /// Builds the log ID in the format: subgraph_id-timestamp
+    pub fn build_id(&self) -> String {
+        format!("{}-{}", self.subgraph_id, self.timestamp)
+    }
+
+    /// Builds the text field by concatenating the message with all key-value pairs
+    pub fn build_text(&self) -> String {
+        // Serialize logger arguments
+        let mut serializer = SimpleKVSerializer::new();
+        self.record
+            .kv()
+            .serialize(self.record, &mut serializer)
+            .expect("failed to serialize logger arguments");
+        let (n_logger_kvs, logger_kvs) = serializer.finish();
+
+        // Serialize log message arguments
+        let mut serializer = SimpleKVSerializer::new();
+        self.values
+            .serialize(self.record, &mut serializer)
+            .expect("failed to serialize log message arguments");
+        let (n_value_kvs, value_kvs) = serializer.finish();
+
+        // Build text with all key-value pairs
+        let mut text = format!("{}", self.record.msg());
+        if n_logger_kvs > 0 {
+            use std::fmt::Write;
+            write!(text, ", {}", logger_kvs).unwrap();
+        }
+        if n_value_kvs > 0 {
+            use std::fmt::Write;
+            write!(text, ", {}", value_kvs).unwrap();
+        }
+
+        text
+    }
+
+    /// Builds arguments as a Vec of tuples (for file drain)
+    pub fn build_arguments_vec(&self) -> Vec<(String, String)> {
+        let mut serializer = VecKVSerializer::new();
+        self.record
+            .kv()
+            .serialize(self.record, &mut serializer)
+            .expect("failed to serialize log message arguments into vec");
+        serializer.finish()
+    }
+
+    /// Builds arguments as a HashMap (for elastic and loki drains)
+    pub fn build_arguments_map(&self) -> HashMap<String, String> {
+        let mut serializer = HashMapKVSerializer::new();
+        self.record
+            .kv()
+            .serialize(self.record, &mut serializer)
+            .expect("failed to serialize log message arguments into hash map");
+        serializer.finish()
+    }
+
+    /// Builds metadata from the log record
+    pub fn build_meta(&self) -> LogMeta {
+        LogMeta {
+            module: self.record.module().into(),
+            line: self.record.line() as i64,
+            column: self.record.column() as i64,
+        }
+    }
+
+    /// Gets the log level
+    pub fn level(&self) -> Level {
+        self.record.level()
+    }
+
+    /// Gets the timestamp
+    pub fn timestamp(&self) -> &str {
+        &self.timestamp
+    }
+
+    /// Gets the subgraph ID
+    pub fn subgraph_id(&self) -> &str {
+        &self.subgraph_id
+    }
+}
+
+/// Creates a new asynchronous logger with consistent configuration
+pub fn create_async_logger<D>(drain: D, chan_size: usize, use_block_overflow: bool) -> Logger
+where
+    D: Drain + Send + 'static,
+    D::Err: std::fmt::Debug,
+{
+    let mut builder = slog_async::Async::new(drain.fuse()).chan_size(chan_size);
+
+    if use_block_overflow {
+        builder = builder.overflow_strategy(slog_async::OverflowStrategy::Block);
+    }
+
+    Logger::root(builder.build().fuse(), o!())
+}
diff --git a/graph/src/log/elastic.rs b/graph/src/log/elastic.rs
index eb285d3d6e6..df8d65af037 100644
--- a/graph/src/log/elastic.rs
+++ b/graph/src/log/elastic.rs
@@ -1,6 +1,4 @@
 use std::collections::HashMap;
-use std::fmt;
-use std::fmt::Write;
 use std::result::Result;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
@@ -11,14 +9,14 @@ use http::header::CONTENT_TYPE;
 use prometheus::Counter;
 use reqwest;
 use reqwest::Client;
-use serde::ser::Serializer as SerdeSerializer;
 use serde::Serialize;
 use serde_json::json;
 use slog::*;
-use slog_async;
 
 use crate::util::futures::retry;
 
+use super::common::{LogEntryBuilder, LogMeta, create_async_logger};
+
 /// General configuration parameters for Elasticsearch logging.
 #[derive(Clone, Debug)]
 pub struct ElasticLoggingConfig {
@@ -32,29 +30,7 @@ pub struct ElasticLoggingConfig {
     pub client: Client,
 }
 
-/// Serializes an slog log level using a serde Serializer.
-fn serialize_log_level<S>(level: &Level, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: SerdeSerializer,
-{
-    serializer.serialize_str(match level {
-        Level::Critical => "critical",
-        Level::Error => "error",
-        Level::Warning => "warning",
-        Level::Info => "info",
-        Level::Debug => "debug",
-        Level::Trace => "trace",
-    })
-}
-
-// Log message meta data.
-#[derive(Clone, Debug, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct ElasticLogMeta {
-    module: String,
-    line: i64,
-    column: i64,
-}
+type ElasticLogMeta = LogMeta;
 
 // Log message to be written to Elasticsearch.
 #[derive(Clone, Debug, Serialize)]
@@ -66,72 +42,11 @@ struct ElasticLog {
     arguments: HashMap<String, String>,
     timestamp: String,
     text: String,
-    #[serde(serialize_with = "serialize_log_level")]
+    #[serde(serialize_with = "super::common::serialize_log_level")]
     level: Level,
     meta: ElasticLogMeta,
 }
 
-struct HashMapKVSerializer {
-    kvs: Vec<(String, String)>,
-}
-
-impl HashMapKVSerializer {
-    fn new() -> Self {
-        HashMapKVSerializer {
-            kvs: Default::default(),
-        }
-    }
-
-    fn finish(self) -> HashMap<String, String> {
-        let mut map = HashMap::new();
-        self.kvs.into_iter().for_each(|(k, v)| {
-            map.insert(k, v);
-        });
-        map
-    }
-}
-
-impl Serializer for HashMapKVSerializer {
-    fn emit_arguments(&mut self, key: Key, val: &fmt::Arguments) -> slog::Result {
-        self.kvs.push((key.into(), format!("{}", val)));
-        Ok(())
-    }
-}
-
-/// A super-simple slog Serializer for concatenating key/value arguments.
-struct SimpleKVSerializer {
-    kvs: Vec<(String, String)>,
-}
-
-impl SimpleKVSerializer {
-    /// Creates a new `SimpleKVSerializer`.
-    fn new() -> Self {
-        SimpleKVSerializer {
-            kvs: Default::default(),
-        }
-    }
-
-    /// Collects all key/value arguments into a single, comma-separated string.
-    /// Returns the number of key/value pairs and the string itself.
-    fn finish(self) -> (usize, String) {
-        (
-            self.kvs.len(),
-            self.kvs
-                .iter()
-                .map(|(k, v)| format!("{}: {}", k, v))
-                .collect::<Vec<_>>()
-                .join(", "),
-        )
-    }
-}
-
-impl Serializer for SimpleKVSerializer {
-    fn emit_arguments(&mut self, key: Key, val: &fmt::Arguments) -> slog::Result {
-        self.kvs.push((key.into(), format!("{}", val)));
-        Ok(())
-    }
-}
-
 /// Configuration for `ElasticDrain`.
 #[derive(Clone, Debug)]
 pub struct ElasticDrainConfig {
@@ -309,43 +224,18 @@ impl Drain for ElasticDrain {
     type Err = ();
 
     fn log(&self, record: &Record, values: &OwnedKVList) -> Result<Self::Ok, Self::Err> {
-        // Don't sent `trace` logs to ElasticSearch.
+        // Don't send `trace` logs to ElasticSearch.
         if record.level() == Level::Trace {
             return Ok(());
         }
-        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true);
-        let id = format!("{}-{}", self.config.custom_id_value, timestamp);
-
-        // Serialize logger arguments
-        let mut serializer = SimpleKVSerializer::new();
-        record
-            .kv()
-            .serialize(record, &mut serializer)
-            .expect("failed to serializer logger arguments");
-        let (n_logger_kvs, logger_kvs) = serializer.finish();
-
-        // Serialize log message arguments
-        let mut serializer = SimpleKVSerializer::new();
-        values
-            .serialize(record, &mut serializer)
-            .expect("failed to serialize log message arguments");
-        let (n_value_kvs, value_kvs) = serializer.finish();
-
-        // Serialize log message arguments into hash map
-        let mut serializer = HashMapKVSerializer::new();
-        record
-            .kv()
-            .serialize(record, &mut serializer)
-            .expect("failed to serialize log message arguments into hash map");
-        let arguments = serializer.finish();
 
-        let mut text = format!("{}", record.msg());
-        if n_logger_kvs > 0 {
-            write!(text, ", {}", logger_kvs).unwrap();
-        }
-        if n_value_kvs > 0 {
-            write!(text, ", {}", value_kvs).unwrap();
-        }
+        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true);
+        let builder = LogEntryBuilder::new(
+            record,
+            values,
+            self.config.custom_id_value.clone(),
+            timestamp.clone(),
+        );
 
         // Prepare custom id for log document
         let mut custom_id = HashMap::new();
@@ -356,17 +246,13 @@ impl Drain for ElasticDrain {
 
         // Prepare log document
         let log = ElasticLog {
-            id,
+            id: builder.build_id(),
             custom_id,
-            arguments,
+            arguments: builder.build_arguments_map(),
             timestamp,
-            text,
-            level: record.level(),
-            meta: ElasticLogMeta {
-                module: record.module().into(),
-                line: record.line() as i64,
-                column: record.column() as i64,
-            },
+            text: builder.build_text(),
+            level: builder.level(),
+            meta: builder.build_meta(),
         };
 
         // Push the log into the queue
@@ -386,10 +272,6 @@ pub fn elastic_logger(
     error_logger: Logger,
     logs_sent_counter: Counter,
 ) -> Logger {
-    let elastic_drain = ElasticDrain::new(config, error_logger, logs_sent_counter).fuse();
-    let async_drain = slog_async::Async::new(elastic_drain)
-        .chan_size(20000)
-        .build()
-        .fuse();
-    Logger::root(async_drain, o!())
+    let elastic_drain = ElasticDrain::new(config, error_logger, logs_sent_counter);
+    create_async_logger(elastic_drain, 20000, false)
 }
diff --git a/graph/src/log/factory.rs b/graph/src/log/factory.rs
index 1e8aef33b2e..6b1132364f0 100644
--- a/graph/src/log/factory.rs
+++ b/graph/src/log/factory.rs
@@ -1,11 +1,15 @@
 use std::sync::Arc;
+use std::time::Duration;
 
 use prometheus::Counter;
 use slog::*;
 
+use crate::components::log_store::LogStoreConfig;
 use crate::components::metrics::MetricsRegistry;
 use crate::components::store::DeploymentLocator;
 use crate::log::elastic::*;
+use crate::log::file::{FileDrainConfig, file_logger};
+use crate::log::loki::{LokiDrainConfig, loki_logger};
 use crate::log::split::*;
 use crate::prelude::ENV_VARS;
 
@@ -23,20 +27,20 @@ pub struct ComponentLoggerConfig {
 #[derive(Clone)]
 pub struct LoggerFactory {
     parent: Logger,
-    elastic_config: Option<ElasticLoggingConfig>,
+    log_store_config: Option<LogStoreConfig>,
     metrics_registry: Arc<MetricsRegistry>,
 }
 
 impl LoggerFactory {
-    /// Creates a new factory using a parent logger and optional Elasticsearch configuration.
+    /// Creates a new factory using a parent logger and optional log store configuration.
     pub fn new(
         logger: Logger,
-        elastic_config: Option<ElasticLoggingConfig>,
+        log_store_config: Option<LogStoreConfig>,
         metrics_registry: Arc<MetricsRegistry>,
     ) -> Self {
         Self {
             parent: logger,
-            elastic_config,
+            log_store_config,
             metrics_registry,
         }
     }
@@ -45,7 +49,7 @@ impl LoggerFactory {
     pub fn with_parent(&self, parent: Logger) -> Self {
         Self {
             parent,
-            elastic_config: self.elastic_config.clone(),
+            log_store_config: self.log_store_config.clone(),
             metrics_registry: self.metrics_registry.clone(),
         }
     }
@@ -62,56 +66,129 @@ impl LoggerFactory {
             None => term_logger,
             Some(config) => match config.elastic {
                 None => term_logger,
-                Some(config) => self
-                    .elastic_config
-                    .clone()
-                    .map(|elastic_config| {
-                        split_logger(
-                            term_logger.clone(),
-                            elastic_logger(
-                                ElasticDrainConfig {
-                                    general: elastic_config,
-                                    index: config.index,
-                                    custom_id_key: String::from("componentId"),
-                                    custom_id_value: component.to_string(),
-                                    flush_interval: ENV_VARS.elastic_search_flush_interval,
-                                    max_retries: ENV_VARS.elastic_search_max_retries,
-                                },
+                Some(elastic_component_config) => {
+                    // Check if we have Elasticsearch configured in log_store_config
+                    match &self.log_store_config {
+                        Some(LogStoreConfig::Elasticsearch {
+                            endpoint,
+                            username,
+                            password,
+                            ..
+                        }) => {
+                            // Build ElasticLoggingConfig on-demand
+                            let elastic_config = ElasticLoggingConfig {
+                                endpoint: endpoint.clone(),
+                                username: username.clone(),
+                                password: password.clone(),
+                                client: reqwest::Client::new(),
+                            };
+
+                            split_logger(
                                 term_logger.clone(),
-                                self.logs_sent_counter(None),
-                            ),
-                        )
-                    })
-                    .unwrap_or(term_logger),
+                                elastic_logger(
+                                    ElasticDrainConfig {
+                                        general: elastic_config,
+                                        index: elastic_component_config.index,
+                                        custom_id_key: String::from("componentId"),
+                                        custom_id_value: component.to_string(),
+                                        flush_interval: ENV_VARS.elastic_search_flush_interval,
+                                        max_retries: ENV_VARS.elastic_search_max_retries,
+                                    },
+                                    term_logger.clone(),
+                                    self.logs_sent_counter(None),
+                                ),
+                            )
+                        }
+                        _ => {
+                            // No Elasticsearch configured, just use terminal logger
+                            term_logger
+                        }
+                    }
+                }
             },
         }
     }
 
-    /// Creates a subgraph logger with Elasticsearch support.
+    /// Creates a subgraph logger with multi-backend support.
     pub fn subgraph_logger(&self, loc: &DeploymentLocator) -> Logger {
         let term_logger = self
             .parent
             .new(o!("subgraph_id" => loc.hash.to_string(), "sgd" => loc.id.to_string()));
 
-        self.elastic_config
-            .clone()
-            .map(|elastic_config| {
-                split_logger(
+        // Determine which drain to use based on log_store_config
+        let drain = match &self.log_store_config {
+            Some(LogStoreConfig::Elasticsearch {
+                endpoint,
+                username,
+                password,
+                index,
+                ..
+            }) => {
+                // Build ElasticLoggingConfig on-demand
+                let elastic_config = ElasticLoggingConfig {
+                    endpoint: endpoint.clone(),
+                    username: username.clone(),
+                    password: password.clone(),
+                    client: reqwest::Client::new(),
+                };
+
+                Some(elastic_logger(
+                    ElasticDrainConfig {
+                        general: elastic_config,
+                        index: index.clone(),
+                        custom_id_key: String::from("subgraphId"),
+                        custom_id_value: loc.hash.to_string(),
+                        flush_interval: ENV_VARS.elastic_search_flush_interval,
+                        max_retries: ENV_VARS.elastic_search_max_retries,
+                    },
+                    term_logger.clone(),
+                    self.logs_sent_counter(Some(loc.hash.as_str())),
+                ))
+            }
+
+            None => None,
+
+            Some(LogStoreConfig::Loki {
+                endpoint,
+                tenant_id,
+                username,
+                password,
+            }) => {
+                // Use Loki
+                Some(loki_logger(
+                    LokiDrainConfig {
+                        endpoint: endpoint.clone(),
+                        tenant_id: tenant_id.clone(),
+                        username: username.clone(),
+                        password: password.clone(),
+                        flush_interval: Duration::from_secs(5),
+                        subgraph_id: loc.hash.to_string(),
+                    },
                     term_logger.clone(),
-                    elastic_logger(
-                        ElasticDrainConfig {
-                            general: elastic_config,
-                            index: ENV_VARS.elastic_search_index.clone(),
-                            custom_id_key: String::from("subgraphId"),
-                            custom_id_value: loc.hash.to_string(),
-                            flush_interval: ENV_VARS.elastic_search_flush_interval,
-                            max_retries: ENV_VARS.elastic_search_max_retries,
-                        },
-                        term_logger.clone(),
-                        self.logs_sent_counter(Some(loc.hash.as_str())),
-                    ),
-                )
-            })
+                ))
+            }
+
+            Some(LogStoreConfig::File {
+                directory,
+                retention_hours: _,
+            }) => {
+                // Use File
+                // Note: Cleanup is handled by FileLogStore on startup based on retention_hours
+                Some(file_logger(
+                    FileDrainConfig {
+                        directory: directory.clone(),
+                        subgraph_id: loc.hash.to_string(),
+                    },
+                    term_logger.clone(),
+                ))
+            }
+
+            Some(LogStoreConfig::Disabled) => None,
+        };
+
+        // Combine terminal and storage drain
+        drain
+            .map(|storage_drain| split_logger(term_logger.clone(), storage_drain))
             .unwrap_or(term_logger)
     }
 
diff --git a/graph/src/log/file.rs b/graph/src/log/file.rs
new file mode 100644
index 00000000000..0fed5ce732a
--- /dev/null
+++ b/graph/src/log/file.rs
@@ -0,0 +1,224 @@
+use std::fs::{File, OpenOptions};
+use std::io::{BufWriter, Write};
+use std::path::PathBuf;
+use std::sync::{Arc, Mutex};
+
+use chrono::prelude::{SecondsFormat, Utc};
+use serde::Serialize;
+use slog::*;
+
+use super::common::{LogEntryBuilder, LogMeta, create_async_logger};
+
+/// Configuration for `FileDrain`.
+#[derive(Clone, Debug)]
+pub struct FileDrainConfig {
+    /// Directory where log files will be stored
+    pub directory: PathBuf,
+    /// The subgraph ID used for the log filename
+    pub subgraph_id: String,
+}
+
+/// Log document structure for JSON Lines format
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct FileLogDocument {
+    id: String,
+    subgraph_id: String,
+    timestamp: String,
+    #[serde(serialize_with = "super::common::serialize_log_level")]
+    level: Level,
+    text: String,
+    arguments: Vec<(String, String)>,
+    meta: FileLogMeta,
+}
+
+type FileLogMeta = LogMeta;
+
+/// An slog `Drain` for logging to local files in JSON Lines format.
+///
+/// Each subgraph gets its own .jsonl file with log entries.
+/// Format: One JSON object per line
+/// ```jsonl
+/// {"id":"QmXxx-2024-01-15T10:30:00Z","subgraphId":"QmXxx","timestamp":"2024-01-15T10:30:00Z","level":"error","text":"Error message","arguments":[],"meta":{"module":"test.rs","line":42,"column":10}}
+/// ```
+pub struct FileDrain {
+    config: FileDrainConfig,
+    error_logger: Logger,
+    writer: Arc<Mutex<BufWriter<File>>>,
+}
+
+impl FileDrain {
+    /// Creates a new `FileDrain`.
+    pub fn new(config: FileDrainConfig, error_logger: Logger) -> std::io::Result<Self> {
+        std::fs::create_dir_all(&config.directory)?;
+
+        let path = config
+            .directory
+            .join(format!("{}.jsonl", config.subgraph_id));
+        let file = OpenOptions::new().create(true).append(true).open(path)?;
+
+        Ok(FileDrain {
+            config,
+            error_logger,
+            writer: Arc::new(Mutex::new(BufWriter::new(file))),
+        })
+    }
+}
+
+impl Drain for FileDrain {
+    type Ok = ();
+    type Err = Never;
+
+    fn log(&self, record: &Record, values: &OwnedKVList) -> std::result::Result<(), Never> {
+        // Don't write `trace` logs to file
+        if record.level() == Level::Trace {
+            return Ok(());
+        }
+
+        let timestamp = Utc::now().to_rfc3339_opts(SecondsFormat::Nanos, true);
+        let builder =
+            LogEntryBuilder::new(record, values, self.config.subgraph_id.clone(), timestamp);
+
+        // Build log document
+        let log_doc = FileLogDocument {
+            id: builder.build_id(),
+            subgraph_id: builder.subgraph_id().to_string(),
+            timestamp: builder.timestamp().to_string(),
+            level: builder.level(),
+            text: builder.build_text(),
+            arguments: builder.build_arguments_vec(),
+            meta: builder.build_meta(),
+        };
+
+        // Write JSON line (synchronous, buffered)
+        let mut writer = self.writer.lock().unwrap();
+        if let Err(e) = serde_json::to_writer(&mut *writer, &log_doc) {
+            error!(self.error_logger, "Failed to serialize log to JSON: {}", e);
+            return Ok(());
+        }
+
+        if let Err(e) = writeln!(&mut *writer) {
+            error!(self.error_logger, "Failed to write newline: {}", e);
+            return Ok(());
+        }
+
+        // Flush to ensure durability
+        if let Err(e) = writer.flush() {
+            error!(self.error_logger, "Failed to flush log file: {}", e);
+        }
+
+        Ok(())
+    }
+}
+
+/// Creates a new asynchronous file logger.
+///
+/// Uses `error_logger` to print any file logging errors,
+/// so they don't go unnoticed.
+pub fn file_logger(config: FileDrainConfig, error_logger: Logger) -> Logger {
+    let file_drain = match FileDrain::new(config, error_logger.clone()) {
+        Ok(drain) => drain,
+        Err(e) => {
+            error!(error_logger, "Failed to create FileDrain: {}", e);
+            // Return a logger that discards all logs
+            return Logger::root(slog::Discard, o!());
+        }
+    };
+
+    create_async_logger(file_drain, 20000, true)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tempfile::TempDir;
+
+    #[test]
+    fn test_file_drain_creation() {
+        let temp_dir = TempDir::new().unwrap();
+        let error_logger = Logger::root(slog::Discard, o!());
+
+        let config = FileDrainConfig {
+            directory: temp_dir.path().to_path_buf(),
+            subgraph_id: "QmTest".to_string(),
+        };
+
+        let drain = FileDrain::new(config, error_logger);
+        assert!(drain.is_ok());
+
+        // Verify file was created
+        let file_path = temp_dir.path().join("QmTest.jsonl");
+        assert!(file_path.exists());
+    }
+
+    #[test]
+    fn test_log_entry_format() {
+        let arguments = vec![
+            ("key1".to_string(), "value1".to_string()),
+            ("key2".to_string(), "value2".to_string()),
+        ];
+
+        let doc = FileLogDocument {
+            id: "test-id".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: "2024-01-15T10:30:00Z".to_string(),
+            level: Level::Error,
+            text: "Test error message".to_string(),
+            arguments,
+            meta: FileLogMeta {
+                module: "test.rs".to_string(),
+                line: 42,
+                column: 10,
+            },
+        };
+
+        let json = serde_json::to_string(&doc).unwrap();
+        assert!(json.contains("\"id\":\"test-id\""));
+        assert!(json.contains("\"subgraphId\":\"QmTest\""));
+        assert!(json.contains("\"level\":\"error\""));
+        assert!(json.contains("\"text\":\"Test error message\""));
+        assert!(json.contains("\"arguments\""));
+    }
+
+    #[test]
+    fn test_file_drain_writes_jsonl() {
+        use std::io::{BufRead, BufReader};
+
+        let temp_dir = TempDir::new().unwrap();
+        let error_logger = Logger::root(slog::Discard, o!());
+
+        let config = FileDrainConfig {
+            directory: temp_dir.path().to_path_buf(),
+            subgraph_id: "QmTest".to_string(),
+        };
+
+        let drain = FileDrain::new(config.clone(), error_logger).unwrap();
+
+        // Create a test record
+        let logger = Logger::root(drain, o!());
+        info!(logger, "Test message"; "key" => "value");
+
+        // Give async drain time to write (in real test we'd use proper sync)
+        std::thread::sleep(std::time::Duration::from_millis(100));
+
+        // Read the file
+        let file_path = temp_dir.path().join("QmTest.jsonl");
+        let file = File::open(file_path).unwrap();
+        let reader = BufReader::new(file);
+
+        let lines: Vec<String> = reader.lines().map_while(|r| r.ok()).collect();
+
+        // Should have written at least one line
+        assert!(!lines.is_empty());
+
+        // Each line should be valid JSON
+        for line in lines {
+            let parsed: serde_json::Value = serde_json::from_str(&line).unwrap();
+            assert!(parsed.get("id").is_some());
+            assert!(parsed.get("subgraphId").is_some());
+            assert!(parsed.get("timestamp").is_some());
+            assert!(parsed.get("level").is_some());
+            assert!(parsed.get("text").is_some());
+        }
+    }
+}
diff --git a/graph/src/log/loki.rs b/graph/src/log/loki.rs
new file mode 100644
index 00000000000..c779e568dfb
--- /dev/null
+++ b/graph/src/log/loki.rs
@@ -0,0 +1,335 @@
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+
+use chrono::prelude::{SecondsFormat, Utc};
+use reqwest::Client;
+use serde::Serialize;
+use serde_json::json;
+use slog::*;
+
+use super::common::{LogEntryBuilder, LogMeta, create_async_logger};
+
+/// Configuration for `LokiDrain`.
+#[derive(Clone, Debug)]
+pub struct LokiDrainConfig {
+    pub endpoint: String,
+    pub tenant_id: Option<String>,
+    pub username: Option<String>,
+    pub password: Option<String>,
+    pub flush_interval: Duration,
+    pub subgraph_id: String,
+}
+
+/// A log entry to be sent to Loki
+#[derive(Clone, Debug)]
+struct LokiLogEntry {
+    timestamp_ns: String,            // Nanoseconds since epoch as string
+    line: String,                    // JSON-serialized log entry
+    labels: HashMap<String, String>, // Stream labels (subgraphId, level, etc.)
+}
+
+/// Log document structure for JSON serialization
+#[derive(Clone, Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct LokiLogDocument {
+    id: String,
+    subgraph_id: String,
+    timestamp: String,
+    #[serde(serialize_with = "super::common::serialize_log_level")]
+    level: Level,
+    text: String,
+    arguments: HashMap<String, String>,
+    meta: LokiLogMeta,
+}
+
+type LokiLogMeta = LogMeta;
+
+/// A slog `Drain` for logging to Loki.
+///
+/// Loki expects logs in the following format:
+/// ```json
+/// {
+///   "streams": [
+///     {
+///       "stream": {"subgraphId": "QmXxx", "level": "error"},
+///       "values": [
+///         ["<unix_epoch_nanoseconds>", "<log_line_json>"],
+///         ["<unix_epoch_nanoseconds>", "<log_line_json>"]
+///       ]
+///     }
+///   ]
+/// }
+/// ```
+pub struct LokiDrain {
+    config: LokiDrainConfig,
+    client: Client,
+    error_logger: Logger,
+    logs: Arc<Mutex<Vec<LokiLogEntry>>>,
+}
+
+impl LokiDrain {
+    /// Creates a new `LokiDrain`.
+    pub fn new(config: LokiDrainConfig, error_logger: Logger) -> Self {
+        let client = Client::builder()
+            .timeout(Duration::from_secs(30))
+            .build()
+            .expect("failed to create HTTP client for LokiDrain");
+
+        let drain = LokiDrain {
+            config,
+            client,
+            error_logger,
+            logs: Arc::new(Mutex::new(vec![])),
+        };
+        drain.periodically_flush_logs();
+        drain
+    }
+
+    fn periodically_flush_logs(&self) {
+        let flush_logger = self.error_logger.clone();
+        let logs = self.logs.clone();
+        let config = self.config.clone();
+        let client = self.client.clone();
+        let mut interval = tokio::time::interval(self.config.flush_interval);
+
+        crate::tokio::spawn(async move {
+            loop {
+                interval.tick().await;
+
+                let logs_to_send = {
+                    let mut logs = logs.lock().unwrap();
+                    let logs_to_send = (*logs).clone();
+                    logs.clear();
+                    logs_to_send
+                };
+
+                // Do nothing if there are no logs to flush
+                if logs_to_send.is_empty() {
+                    continue;
+                }
+
+                // Group logs by labels (Loki streams)
+                let streams = group_by_labels(logs_to_send);
+
+                // Build Loki push request body
+                let streams_json: Vec<_> = streams
+                    .into_iter()
+                    .map(|(labels, entries)| {
+                        json!({
+                            "stream": labels,
+                            "values": entries.into_iter()
+                                .map(|e| vec![e.timestamp_ns, e.line])
+                                .collect::<Vec<_>>()
+                        })
+                    })
+                    .collect();
+
+                let body = json!({
+                    "streams": streams_json
+                });
+
+                let url = format!("{}/loki/api/v1/push", config.endpoint);
+
+                let mut request = client
+                    .post(&url)
+                    .json(&body)
+                    .timeout(Duration::from_secs(30));
+
+                if let Some(ref tenant_id) = config.tenant_id {
+                    request = request.header("X-Scope-OrgID", tenant_id);
+                }
+
+                if let Some(ref username) = config.username {
+                    request = request.basic_auth(username, config.password.as_ref());
+                }
+
+                match request.send().await {
+                    Ok(resp) if resp.status().is_success() => {
+                        // Success
+                    }
+                    Ok(resp) => {
+                        error!(
+                            flush_logger,
+                            "Loki push failed with status: {}",
+                            resp.status()
+                        );
+                    }
+                    Err(e) => {
+                        error!(flush_logger, "Failed to send logs to Loki: {}", e);
+                    }
+                }
+            }
+        });
+    }
+}
+
+impl Drain for LokiDrain {
+    type Ok = ();
+    type Err = ();
+
+    fn log(&self, record: &Record, values: &OwnedKVList) -> std::result::Result<(), ()> {
+        // Don't send `trace` logs to Loki
+        if record.level() == Level::Trace {
+            return Ok(());
+        }
+
+        let now = Utc::now();
+        let timestamp = now.to_rfc3339_opts(SecondsFormat::Nanos, true);
+        let timestamp_ns = now.timestamp_nanos_opt().unwrap().to_string();
+
+        let builder = LogEntryBuilder::new(
+            record,
+            values,
+            self.config.subgraph_id.clone(),
+            timestamp.clone(),
+        );
+
+        // Build log document
+        let log_doc = LokiLogDocument {
+            id: builder.build_id(),
+            subgraph_id: builder.subgraph_id().to_string(),
+            timestamp,
+            level: builder.level(),
+            text: builder.build_text(),
+            arguments: builder.build_arguments_map(),
+            meta: builder.build_meta(),
+        };
+
+        // Serialize to JSON line
+        let line = match serde_json::to_string(&log_doc) {
+            Ok(l) => l,
+            Err(e) => {
+                error!(self.error_logger, "Failed to serialize log to JSON: {}", e);
+                return Ok(());
+            }
+        };
+
+        // Build labels for Loki stream
+        let mut labels = HashMap::new();
+        labels.insert("subgraphId".to_string(), builder.subgraph_id().to_string());
+        labels.insert(
+            "level".to_string(),
+            builder.level().as_str().to_ascii_lowercase(),
+        );
+
+        // Create log entry
+        let entry = LokiLogEntry {
+            timestamp_ns,
+            line,
+            labels,
+        };
+
+        // Push to buffer
+        let mut logs = self.logs.lock().unwrap();
+        logs.push(entry);
+
+        Ok(())
+    }
+}
+
+/// Groups log entries by their labels to create Loki streams
+/// Returns a HashMap where the key is the labels and the value is a vec of entries
+fn group_by_labels(
+    entries: Vec<LokiLogEntry>,
+) -> Vec<(HashMap<String, String>, Vec<LokiLogEntry>)> {
+    let mut streams: HashMap<String, (HashMap<String, String>, Vec<LokiLogEntry>)> = HashMap::new();
+    for entry in entries {
+        // Create a deterministic string key from the labels
+        let label_key = serde_json::to_string(&entry.labels).unwrap_or_default();
+
+        streams
+            .entry(label_key)
+            .or_insert_with(|| (entry.labels.clone(), Vec::new()))
+            .1
+            .push(entry);
+    }
+
+    // Convert to a vec of (labels, entries) tuples
+    streams.into_values().collect()
+}
+
+/// Creates a new asynchronous Loki logger.
+///
+/// Uses `error_logger` to print any Loki logging errors,
+/// so they don't go unnoticed.
+pub fn loki_logger(config: LokiDrainConfig, error_logger: Logger) -> Logger {
+    let loki_drain = LokiDrain::new(config, error_logger);
+    create_async_logger(loki_drain, 20000, true)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_group_by_labels() {
+        let mut labels1 = HashMap::new();
+        labels1.insert("subgraphId".to_string(), "QmTest".to_string());
+        labels1.insert("level".to_string(), "error".to_string());
+
+        let mut labels2 = HashMap::new();
+        labels2.insert("subgraphId".to_string(), "QmTest".to_string());
+        labels2.insert("level".to_string(), "info".to_string());
+
+        let entries = vec![
+            LokiLogEntry {
+                timestamp_ns: "1000000000".to_string(),
+                line: "log1".to_string(),
+                labels: labels1.clone(),
+            },
+            LokiLogEntry {
+                timestamp_ns: "2000000000".to_string(),
+                line: "log2".to_string(),
+                labels: labels1.clone(),
+            },
+            LokiLogEntry {
+                timestamp_ns: "3000000000".to_string(),
+                line: "log3".to_string(),
+                labels: labels2.clone(),
+            },
+        ];
+
+        let streams = group_by_labels(entries);
+
+        // Should have 2 streams (one for each unique label set)
+        assert_eq!(streams.len(), 2);
+
+        // Find streams by label and verify counts
+        for (labels, entries) in streams {
+            if labels.get("level") == Some(&"error".to_string()) {
+                assert_eq!(entries.len(), 2, "Error stream should have 2 entries");
+            } else if labels.get("level") == Some(&"info".to_string()) {
+                assert_eq!(entries.len(), 1, "Info stream should have 1 entry");
+            } else {
+                panic!("Unexpected label combination");
+            }
+        }
+    }
+
+    #[test]
+    fn test_loki_log_document_serialization() {
+        let mut arguments = HashMap::new();
+        arguments.insert("key1".to_string(), "value1".to_string());
+
+        let doc = LokiLogDocument {
+            id: "test-id".to_string(),
+            subgraph_id: "QmTest".to_string(),
+            timestamp: "2024-01-15T10:30:00Z".to_string(),
+            level: Level::Error,
+            text: "Test error".to_string(),
+            arguments,
+            meta: LokiLogMeta {
+                module: "test.rs".to_string(),
+                line: 42,
+                column: 10,
+            },
+        };
+
+        let json = serde_json::to_string(&doc).unwrap();
+        assert!(json.contains("\"id\":\"test-id\""));
+        assert!(json.contains("\"subgraphId\":\"QmTest\""));
+        assert!(json.contains("\"level\":\"error\""));
+        assert!(json.contains("\"text\":\"Test error\""));
+    }
+}
diff --git a/graph/src/log/mod.rs b/graph/src/log/mod.rs
index dfe8ab35379..833f984e208 100644
--- a/graph/src/log/mod.rs
+++ b/graph/src/log/mod.rs
@@ -17,18 +17,24 @@ macro_rules! impl_slog_value {
     };
 }
 
-use atty;
 use slog::*;
 use slog_async;
 use slog_envlogger;
 use slog_term::*;
-use std::{fmt, io, result};
+use std::{
+    fmt,
+    io::{self, IsTerminal},
+    result,
+};
 
 use crate::prelude::ENV_VARS;
 
 pub mod codes;
+pub mod common;
 pub mod elastic;
 pub mod factory;
+pub mod file;
+pub mod loki;
 pub mod split;
 
 pub fn logger(show_debug: bool) -> Logger {
@@ -36,7 +42,7 @@ pub fn logger(show_debug: bool) -> Logger {
 }
 
 pub fn logger_with_levels(show_debug: bool, levels: Option<&str>) -> Logger {
-    let use_color = atty::is(atty::Stream::Stdout);
+    let use_color = io::stdout().is_terminal();
     let decorator = slog_term::TermDecorator::new().build();
     let drain = CustomFormat::new(decorator, use_color).fuse();
     let drain = slog_envlogger::LogBuilder::new(drain)
@@ -94,6 +100,9 @@ where
 
     fn format_custom(&self, record: &Record, values: &OwnedKVList) -> io::Result<()> {
         self.decorator.with_record(record, values, |mut decorator| {
+            #[cfg(debug_assertions)]
+            write!(decorator, "[DEBUG-BUILD] ")?;
+
             decorator.start_timestamp()?;
             formatted_timestamp_local(&mut decorator)?;
             decorator.start_whitespace()?;
diff --git a/graph/src/runtime/asc_heap.rs b/graph/src/runtime/asc_heap.rs
index 1301ea017f5..ecccf546ba3 100644
--- a/graph/src/runtime/asc_heap.rs
+++ b/graph/src/runtime/asc_heap.rs
@@ -4,8 +4,8 @@ use async_trait::async_trait;
 use semver::Version;
 
 use super::{
-    gas::GasCounter, AscIndexId, AscPtr, AscType, DeterministicHostError, HostExportError,
-    IndexForAscTypeId,
+    AscIndexId, AscPtr, AscType, DeterministicHostError, HostExportError, IndexForAscTypeId,
+    gas::GasCounter,
 };
 
 // A 128 limit is plenty for any subgraph, while the `fn recursion_limit` test ensures it is not
diff --git a/graph/src/runtime/asc_ptr.rs b/graph/src/runtime/asc_ptr.rs
index 3325d4b7f02..8e25971590b 100644
--- a/graph/src/runtime/asc_ptr.rs
+++ b/graph/src/runtime/asc_ptr.rs
@@ -1,7 +1,7 @@
 use crate::data::subgraph::API_VERSION_0_0_4;
 
 use super::gas::GasCounter;
-use super::{padding_to_16, DeterministicHostError, HostExportError};
+use super::{DeterministicHostError, HostExportError, padding_to_16};
 
 use super::{AscHeap, AscIndexId, AscType, IndexForAscTypeId};
 use semver::Version;
diff --git a/graph/src/runtime/gas/combinators.rs b/graph/src/runtime/gas/combinators.rs
index a6bc37954db..152f317bab0 100644
--- a/graph/src/runtime/gas/combinators.rs
+++ b/graph/src/runtime/gas/combinators.rs
@@ -83,10 +83,10 @@ where
 
     #[inline]
     fn const_gas_size_of() -> Option<Gas> {
-        if let Some(t0) = T0::const_gas_size_of() {
-            if let Some(t1) = T1::const_gas_size_of() {
-                return Some(C::combine(t0, t1));
-            }
+        if let Some(t0) = T0::const_gas_size_of()
+            && let Some(t1) = T1::const_gas_size_of()
+        {
+            return Some(C::combine(t0, t1));
         }
         None
     }
@@ -109,12 +109,11 @@ where
 
     #[inline] // Const propagation to the rescue. I hope.
     fn const_gas_size_of() -> Option<Gas> {
-        if let Some(t0) = T0::const_gas_size_of() {
-            if let Some(t1) = T1::const_gas_size_of() {
-                if let Some(t2) = T2::const_gas_size_of() {
-                    return Some(C::combine(C::combine(t0, t1), t2));
-                }
-            }
+        if let Some(t0) = T0::const_gas_size_of()
+            && let Some(t1) = T1::const_gas_size_of()
+            && let Some(t2) = T2::const_gas_size_of()
+        {
+            return Some(C::combine(C::combine(t0, t1), t2));
         }
         None
     }
diff --git a/graph/src/runtime/gas/mod.rs b/graph/src/runtime/gas/mod.rs
index 4758833e8ea..ab666c9095b 100644
--- a/graph/src/runtime/gas/mod.rs
+++ b/graph/src/runtime/gas/mod.rs
@@ -12,8 +12,8 @@ pub use costs::DEFAULT_BASE_COST;
 pub use costs::*;
 pub use saturating::*;
 
-use std::sync::atomic::{AtomicU64, Ordering::SeqCst};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering::SeqCst};
 use std::{fmt, fmt::Display};
 
 pub struct GasOp {
@@ -100,11 +100,11 @@ impl GasCounter {
         amount += costs::HOST_EXPORT_GAS;
 
         // If gas metrics are enabled, track the gas used
-        if ENV_VARS.enable_dips_metrics {
-            if let Some(method) = method {
-                self.metrics.track_gas(method, amount.0);
-                self.metrics.track_operations(method, 1);
-            }
+        if ENV_VARS.enable_dips_metrics
+            && let Some(method) = method
+        {
+            self.metrics.track_gas(method, amount.0);
+            self.metrics.track_operations(method, 1);
         }
 
         let old = self
diff --git a/graph/src/runtime/gas/size_of.rs b/graph/src/runtime/gas/size_of.rs
index 651df429099..05369d94847 100644
--- a/graph/src/runtime/gas/size_of.rs
+++ b/graph/src/runtime/gas/size_of.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     components::store::LoadRelatedRequest,
-    data::store::{scalar::Bytes, Value},
+    data::store::{Value, scalar::Bytes},
     schema::{EntityKey, EntityType},
 };
 
diff --git a/graph/src/runtime/mod.rs b/graph/src/runtime/mod.rs
index ac94d33c32f..34a8a316020 100644
--- a/graph/src/runtime/mod.rs
+++ b/graph/src/runtime/mod.rs
@@ -9,7 +9,7 @@ mod asc_heap;
 mod asc_ptr;
 
 pub use asc_heap::{
-    asc_get, asc_new, asc_new_or_missing, asc_new_or_null, AscHeap, FromAscObj, ToAscObj,
+    AscHeap, FromAscObj, ToAscObj, asc_get, asc_new, asc_new_or_missing, asc_new_or_null,
 };
 pub use asc_ptr::AscPtr;
 
@@ -157,7 +157,7 @@ impl_asc_type!(u8, u16, u32, u64, i8, i32, i64, f32, f64);
 /// 3. Once defined, items and their discriminants cannot be changed, as this would break running
 ///    subgraphs compiled in previous versions of this representation.
 #[repr(u32)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum IndexForAscTypeId {
     // Ethereum type IDs
     String = 0,
diff --git a/graph/src/schema/api.rs b/graph/src/schema/api.rs
index 6195e3295a2..38ee4582a47 100644
--- a/graph/src/schema/api.rs
+++ b/graph/src/schema/api.rs
@@ -10,13 +10,13 @@ use crate::cheap_clone::CheapClone;
 use crate::data::graphql::{ObjectOrInterface, ObjectTypeExt, TypeExt};
 use crate::data::store::IdType;
 use crate::env::ENV_VARS;
-use crate::schema::{ast, META_FIELD_NAME, META_FIELD_TYPE, SCHEMA_TYPE_NAME};
+use crate::schema::{LOGS_FIELD_NAME, META_FIELD_NAME, META_FIELD_TYPE, SCHEMA_TYPE_NAME, ast};
 
 use crate::data::graphql::ext::{
-    camel_cased_names, DefinitionExt, DirectiveExt, DocumentExt, ValueExt,
+    DefinitionExt, DirectiveExt, DocumentExt, ValueExt, camel_cased_names,
 };
 use crate::derive::CheapClone;
-use crate::prelude::{q, r, s, DeploymentHash};
+use crate::prelude::{DeploymentHash, q, r, s};
 
 use super::{Aggregation, Field, InputSchema, Schema, TypeKind};
 
@@ -349,7 +349,7 @@ pub(in crate::schema) fn api_schema(
 ) -> Result<s::Document, APISchemaError> {
     // Refactor: Don't clone the schema.
     let mut api = init_api_schema(input_schema)?;
-    add_meta_field_type(&mut api.document);
+    add_builtin_field_types(&mut api.document);
     add_types_for_object_types(&mut api, input_schema)?;
     add_types_for_interface_types(&mut api, input_schema)?;
     add_types_for_aggregation_types(&mut api, input_schema)?;
@@ -444,18 +444,24 @@ fn init_api_schema(input_schema: &InputSchema) -> Result<Schema, APISchemaError>
         .map_err(|e| APISchemaError::SchemaCreationFailed(e.to_string()))
 }
 
-/// Adds a global `_Meta_` type to the schema. The `_meta` field
-/// accepts values of this type
-fn add_meta_field_type(api: &mut s::Document) {
+/// Adds built-in field types to the schema. Currently adds `_Meta_` and `_Log_` types
+/// which are used by the `_meta` and `_logs` fields respectively.
+fn add_builtin_field_types(api: &mut s::Document) {
     lazy_static! {
         static ref META_FIELD_SCHEMA: s::Document = {
             let schema = include_str!("meta.graphql");
             s::parse_schema(schema).expect("the schema `meta.graphql` is invalid")
         };
+        static ref LOGS_FIELD_SCHEMA: s::Document = {
+            let schema = include_str!("logs.graphql");
+            s::parse_schema(schema).expect("the schema `logs.graphql` is invalid")
+        };
     }
 
     api.definitions
         .extend(META_FIELD_SCHEMA.definitions.iter().cloned());
+    api.definitions
+        .extend(LOGS_FIELD_SCHEMA.definitions.iter().cloned());
 }
 
 fn add_types_for_object_types(
@@ -703,6 +709,11 @@ impl FilterOps {
                     "",
                     s::Type::NamedType("OrderDirection".to_string()),
                 ),
+                input_value(
+                    "current",
+                    "",
+                    s::Type::NamedType("Aggregation_current".to_string()),
+                ),
             ],
         };
 
@@ -812,10 +823,10 @@ fn field_filter_input_values(
                 extend_with_child_filter_input_value(field, type_name, &mut input_values);
                 input_values
             }
-            s::TypeDefinition::Scalar(ref t) => {
+            s::TypeDefinition::Scalar(t) => {
                 field_scalar_filter_input_values(&schema.document, field, ops.for_type(t))
             }
-            s::TypeDefinition::Enum(ref t) => {
+            s::TypeDefinition::Enum(t) => {
                 field_enum_filter_input_values(&schema.document, field, t)
             }
             _ => vec![],
@@ -965,6 +976,26 @@ fn field_enum_filter_input_values(
         .collect()
 }
 
+/// Returns true if the given type supports case-insensitive filter
+/// operations (`_nocase` variants) when used as a list element type.
+/// Only `String` scalar types and object/interface types with `String`
+/// IDs support case-insensitive matching; types like `Bytes`, `BigInt`,
+/// etc. don't have a concept of case.
+fn field_list_supports_nocase(schema: &Schema, typedef: &s::TypeDefinition) -> bool {
+    match typedef {
+        s::TypeDefinition::Scalar(t) => t.name == "String",
+        s::TypeDefinition::Object(obj_type) => {
+            matches!(IdType::try_from(obj_type), Ok(IdType::String))
+        }
+        s::TypeDefinition::Interface(intf_type) => schema
+            .types_for_interface
+            .get(&intf_type.name)
+            .and_then(|types| types.first())
+            .is_none_or(|obj_type| matches!(IdType::try_from(obj_type), Ok(IdType::String))),
+        _ => false,
+    }
+}
+
 /// Generates `*_filter` input values for the given list field.
 fn field_list_filter_input_values(
     schema: &Schema,
@@ -991,8 +1022,8 @@ fn field_list_filter_input_values(
                 (Some(named_type), Some(name.clone()))
             }
         }
-        s::TypeDefinition::Scalar(ref t) => (Some(s::Type::NamedType(t.name.clone())), None),
-        s::TypeDefinition::Enum(ref t) => (Some(s::Type::NamedType(t.name.clone())), None),
+        s::TypeDefinition::Scalar(t) => (Some(s::Type::NamedType(t.name.clone())), None),
+        s::TypeDefinition::Enum(t) => (Some(s::Type::NamedType(t.name.clone())), None),
         s::TypeDefinition::InputObject(_) | s::TypeDefinition::Union(_) => (None, None),
     };
 
@@ -1000,25 +1031,26 @@ fn field_list_filter_input_values(
         None => {
             vec![]
         }
-        Some(input_field_type) => vec![
-            "",
-            "not",
-            "contains",
-            "contains_nocase",
-            "not_contains",
-            "not_contains_nocase",
-        ]
-        .into_iter()
-        .map(|filter_type| {
-            input_value(
-                &field.name,
-                filter_type,
-                s::Type::ListType(Box::new(s::Type::NonNullType(Box::new(
-                    input_field_type.clone(),
-                )))),
-            )
-        })
-        .collect(),
+        Some(input_field_type) => {
+            let ops: &[&str] = if field_list_supports_nocase(schema, typedef) {
+                &[
+                    "",
+                    "not",
+                    "contains",
+                    "contains_nocase",
+                    "not_contains",
+                    "not_contains_nocase",
+                ]
+            } else {
+                &["", "not", "contains", "not_contains"]
+            };
+            let value_type = s::Type::ListType(Box::new(s::Type::NonNullType(Box::new(
+                input_field_type.clone(),
+            ))));
+            ops.iter()
+                .map(|filter_type| input_value(&field.name, filter_type, value_type.clone()))
+                .collect()
+        }
     };
 
     if let Some(parent) = parent_type_name {
@@ -1072,6 +1104,7 @@ fn add_query_type(api: &mut s::Document, input_schema: &InputSchema) -> Result<(
     fields.append(&mut agg_fields);
     fields.append(&mut fulltext_fields);
     fields.push(meta_field());
+    fields.push(logs_field());
 
     let typedef = s::TypeDefinition::Object(s::ObjectType {
         position: q::Pos::default(),
@@ -1277,14 +1310,122 @@ fn meta_field() -> s::Field {
     META_FIELD.clone()
 }
 
+fn logs_field() -> s::Field {
+    lazy_static! {
+        static ref LOGS_FIELD: s::Field = s::Field {
+            position: q::Pos::default(),
+            description: Some(
+                "Query execution logs emitted by the subgraph during indexing. \
+                Results are sorted by timestamp in descending order (newest first)."
+                .to_string()
+            ),
+            name: LOGS_FIELD_NAME.to_string(),
+            arguments: vec![
+                // level: LogLevel
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Filter logs by severity level. Only logs at this level will be returned."
+                        .to_string()
+                    ),
+                    name: String::from("level"),
+                    value_type: s::Type::NamedType(String::from("LogLevel")),
+                    default_value: None,
+                    directives: vec![],
+                },
+                // from: String (RFC3339 timestamp)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Filter logs from this timestamp onwards (inclusive). \
+                        Must be in RFC3339 format (e.g., '2024-01-15T10:30:00Z')."
+                        .to_string()
+                    ),
+                    name: String::from("from"),
+                    value_type: s::Type::NamedType(String::from("String")),
+                    default_value: None,
+                    directives: vec![],
+                },
+                // to: String (RFC3339 timestamp)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Filter logs until this timestamp (inclusive). \
+                        Must be in RFC3339 format (e.g., '2024-01-15T23:59:59Z')."
+                        .to_string()
+                    ),
+                    name: String::from("to"),
+                    value_type: s::Type::NamedType(String::from("String")),
+                    default_value: None,
+                    directives: vec![],
+                },
+                // search: String (full-text search)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Search for logs containing this text in the message. \
+                        Case-insensitive substring match. Maximum length: 1000 characters."
+                        .to_string()
+                    ),
+                    name: String::from("search"),
+                    value_type: s::Type::NamedType(String::from("String")),
+                    default_value: None,
+                    directives: vec![],
+                },
+                // first: Int (default 100, max 1000)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Maximum number of logs to return. Default: 100, Maximum: 1000."
+                        .to_string()
+                    ),
+                    name: String::from("first"),
+                    value_type: s::Type::NamedType(String::from("Int")),
+                    default_value: Some(s::Value::Int(100.into())),
+                    directives: vec![],
+                },
+                // skip: Int (default 0, max 10000)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Number of logs to skip (for pagination). Default: 0, Maximum: 10000."
+                        .to_string()
+                    ),
+                    name: String::from("skip"),
+                    value_type: s::Type::NamedType(String::from("Int")),
+                    default_value: Some(s::Value::Int(0.into())),
+                    directives: vec![],
+                },
+                // orderDirection: OrderDirection (default desc)
+                s::InputValue {
+                    position: q::Pos::default(),
+                    description: Some(
+                        "Sort direction for results. Default: desc (newest first)."
+                        .to_string()
+                    ),
+                    name: String::from("orderDirection"),
+                    value_type: s::Type::NamedType(String::from("OrderDirection")),
+                    default_value: Some(s::Value::Enum(String::from("desc"))),
+                    directives: vec![],
+                },
+            ],
+            field_type: s::Type::NonNullType(Box::new(s::Type::ListType(Box::new(
+                s::Type::NonNullType(Box::new(s::Type::NamedType(String::from("_Log_")))),
+            )))),
+            directives: vec![],
+        };
+    }
+    LOGS_FIELD.clone()
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{
         data::{
-            graphql::{ext::FieldExt, ObjectTypeExt, TypeExt as _},
+            graphql::{ObjectTypeExt, TypeExt as _, ext::FieldExt},
             subgraph::LATEST_VERSION,
         },
-        prelude::{s, DeploymentHash},
+        prelude::{DeploymentHash, s},
         schema::{InputSchema, SCHEMA_TYPE_NAME},
     };
     use lazy_static::lazy_static;
@@ -2018,7 +2159,7 @@ mod tests {
             .expect("Query type is missing in derived API schema");
 
         let singular_field = match query_type {
-            s::TypeDefinition::Object(ref t) => ast::get_field(t, "node"),
+            s::TypeDefinition::Object(t) => ast::get_field(t, "node"),
             _ => None,
         }
         .expect("\"node\" field is missing on Query type");
@@ -2042,7 +2183,7 @@ mod tests {
         );
 
         let plural_field = match query_type {
-            s::TypeDefinition::Object(ref t) => ast::get_field(t, "nodes"),
+            s::TypeDefinition::Object(t) => ast::get_field(t, "nodes"),
             _ => None,
         }
         .expect("\"nodes\" field is missing on Query type");
@@ -2210,6 +2351,8 @@ type Gravatar @entity {
             assert_eq!("Aggregation_interval", interval.value_type.get_base_type());
             let filter = field.argument("where").unwrap();
             assert_eq!(&filter_type, filter.value_type.get_base_type());
+            let current = field.argument("current").unwrap();
+            assert_eq!("Aggregation_current", current.value_type.get_base_type());
 
             let s::TypeDefinition::InputObject(filter) = schema
                 .get_type_definition_from_type(&filter.value_type)
@@ -2346,10 +2489,8 @@ type Gravatar @entity {
                     "pools",
                     "pools_",
                     "pools_contains",
-                    "pools_contains_nocase",
                     "pools_not",
                     "pools_not_contains",
-                    "pools_not_contains_nocase",
                 ],
                 pools_fields.as_slice(),
                 "Field {protos} has the wrong pools filters"
diff --git a/graph/src/schema/ast.rs b/graph/src/schema/ast.rs
index 60395cb88e0..fc9b97430c0 100644
--- a/graph/src/schema/ast.rs
+++ b/graph/src/schema/ast.rs
@@ -7,7 +7,7 @@ use crate::data::graphql::ext::DirectiveFinder;
 use crate::data::graphql::{DirectiveExt, DocumentExt, ObjectOrInterface};
 use crate::derive::CheapClone;
 use crate::prelude::anyhow::anyhow;
-use crate::prelude::{s, Error, ValueType};
+use crate::prelude::{Error, ValueType, s};
 
 use super::AsEntityTypeName;
 
@@ -211,7 +211,7 @@ pub fn get_field<'a>(
 /// Returns the value type for a GraphQL field type.
 pub fn get_field_value_type(field_type: &s::Type) -> Result<ValueType, Error> {
     match field_type {
-        s::Type::NamedType(ref name) => ValueType::from_str(name),
+        s::Type::NamedType(name) => ValueType::from_str(name),
         s::Type::NonNullType(inner) => get_field_value_type(inner),
         s::Type::ListType(_) => Err(anyhow!("Only scalar values are supported in this context")),
     }
diff --git a/graph/src/schema/entity_key.rs b/graph/src/schema/entity_key.rs
index 520d3d6320a..3a5a8581a3c 100644
--- a/graph/src/schema/entity_key.rs
+++ b/graph/src/schema/entity_key.rs
@@ -59,3 +59,17 @@ impl std::fmt::Debug for EntityKey {
         )
     }
 }
+
+impl std::fmt::Display for EntityKey {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.causality_region == CausalityRegion::ONCHAIN {
+            write!(f, "{}[{}]", self.entity_type, self.entity_id)
+        } else {
+            write!(
+                f,
+                "{}/{}[{}]",
+                self.entity_type, self.causality_region, self.entity_id
+            )
+        }
+    }
+}
diff --git a/graph/src/schema/entity_type.rs b/graph/src/schema/entity_type.rs
index deb3cb3d8ef..c46f68681c9 100644
--- a/graph/src/schema/entity_type.rs
+++ b/graph/src/schema/entity_type.rs
@@ -68,6 +68,10 @@ impl EntityType {
         self.schema.is_immutable(self.atom)
     }
 
+    pub fn skip_duplicates(&self) -> bool {
+        self.schema.skip_duplicates(self.atom)
+    }
+
     pub fn id_type(&self) -> Result<IdType, Error> {
         self.schema.id_type(self.atom)
     }
diff --git a/graph/src/schema/input/mod.rs b/graph/src/schema/input/mod.rs
index 4f7eb70e0bf..905a46dbea5 100644
--- a/graph/src/schema/input/mod.rs
+++ b/graph/src/schema/input/mod.rs
@@ -4,7 +4,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
 use semver::Version;
 use store::Entity;
 
@@ -15,18 +15,18 @@ use crate::components::store::LoadRelatedRequest;
 use crate::data::graphql::ext::DirectiveFinder;
 use crate::data::graphql::{DirectiveExt, DocumentExt, ObjectTypeExt, TypeExt, ValueExt};
 use crate::data::store::{
-    self, EntityValidationError, IdType, IntoEntityIterator, TryIntoEntityIterator, ValueType, ID,
+    self, EntityValidationError, ID, IdType, IntoEntityIterator, TryIntoEntityIterator, ValueType,
 };
 use crate::data::subgraph::SPEC_VERSION_1_3_0;
 use crate::data::value::Word;
 use crate::derive::CheapClone;
 use crate::prelude::q::Value;
-use crate::prelude::{s, DeploymentHash};
+use crate::prelude::{DeploymentHash, s};
 use crate::schema::api::api_schema;
 use crate::util::intern::{Atom, AtomPool};
 
 use crate::schema::fulltext::FulltextDefinition;
-use crate::schema::{ApiSchema, AsEntityTypeName, EntityType, Schema};
+use crate::schema::{ApiSchema, AsEntityTypeName, EntityType, Schema, SchemaValidationError};
 
 pub mod sqlexpr;
 
@@ -42,6 +42,7 @@ pub mod kw {
     pub const ENTITY: &str = "entity";
     pub const IMMUTABLE: &str = "immutable";
     pub const TIMESERIES: &str = "timeseries";
+    pub const SKIP_DUPLICATES: &str = "skipDuplicates";
     pub const TIMESTAMP: &str = "timestamp";
     pub const AGGREGATE: &str = "aggregate";
     pub const AGGREGATION: &str = "aggregation";
@@ -51,6 +52,7 @@ pub mod kw {
     pub const INTERVALS: &str = "intervals";
     pub const INTERVAL: &str = "interval";
     pub const CUMULATIVE: &str = "cumulative";
+    pub const CURRENT: &str = "current";
 }
 
 /// The internal representation of a subgraph schema, i.e., the
@@ -124,12 +126,27 @@ impl TypeInfo {
 
     fn is_immutable(&self) -> bool {
         match self {
-            TypeInfo::Object(obj_type) => obj_type.immutable,
+            TypeInfo::Object(obj_type) => {
+                matches!(obj_type.mutability, ObjectMutability::Immutable { .. })
+            }
             TypeInfo::Interface(_) => false,
             TypeInfo::Aggregation(_) => true,
         }
     }
 
+    fn skip_duplicates(&self) -> bool {
+        match self {
+            TypeInfo::Object(obj_type) => matches!(
+                obj_type.mutability,
+                ObjectMutability::Immutable {
+                    skip_duplicates: true
+                }
+            ),
+            TypeInfo::Interface(_) => false,
+            TypeInfo::Aggregation(_) => false,
+        }
+    }
+
     fn kind(&self) -> TypeKind {
         match self {
             TypeInfo::Object(_) => TypeKind::Object,
@@ -408,7 +425,7 @@ pub struct ObjectType {
     pub name: Atom,
     pub id_type: IdType,
     pub fields: Box<[Field]>,
-    pub immutable: bool,
+    pub mutability: ObjectMutability,
     /// The name of the aggregation to which this object type belongs if it
     /// is part of an aggregation
     aggregation: Option<Atom>,
@@ -447,16 +464,28 @@ impl ObjectType {
             None => false,
             _ => unreachable!("validations ensure we don't get here"),
         };
-        let immutable = match dir.argument("immutable") {
+        let immutable = match dir.argument(kw::IMMUTABLE) {
             Some(Value::Boolean(im)) => *im,
             None => timeseries,
             _ => unreachable!("validations ensure we don't get here"),
         };
+
+        let mutability = if immutable {
+            let skip_duplicates = match dir.argument(kw::SKIP_DUPLICATES) {
+                Some(Value::Boolean(sd)) => *sd,
+                _ => false,
+            };
+
+            ObjectMutability::Immutable { skip_duplicates }
+        } else {
+            ObjectMutability::Mutable
+        };
+
         Self {
             name,
             fields,
             id_type,
-            immutable,
+            mutability,
             aggregation: None,
             timeseries,
             interfaces,
@@ -487,7 +516,7 @@ impl ObjectType {
             name,
             interfaces: Box::new([]),
             id_type: IdType::String,
-            immutable: false,
+            mutability: ObjectMutability::Mutable,
             aggregation: None,
             timeseries: false,
             fields,
@@ -505,6 +534,12 @@ impl ObjectType {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum ObjectMutability {
+    Mutable,
+    Immutable { skip_duplicates: bool },
+}
+
 #[derive(PartialEq, Debug)]
 pub struct InterfaceType {
     pub name: Atom,
@@ -885,7 +920,9 @@ impl Aggregation {
                         .cloned()
                         .chain(aggregates.iter().map(Aggregate::as_agg_field))
                         .collect(),
-                    immutable: true,
+                    mutability: ObjectMutability::Immutable {
+                        skip_duplicates: false,
+                    },
                     aggregation: Some(name),
                     timeseries: false,
                     interfaces: Box::new([]),
@@ -1053,6 +1090,21 @@ impl InputSchema {
         Self::parse(LATEST_VERSION, raw, id)
     }
 
+    pub fn validate(
+        spec_version: &Version,
+        raw: &str,
+        id: DeploymentHash,
+    ) -> Vec<SchemaValidationError> {
+        let schema = match Schema::parse(raw, id.clone()) {
+            Ok(schema) => schema,
+            Err(err) => return vec![SchemaValidationError::InvalidSchema(err.to_string())],
+        };
+        match validations::validate(spec_version, &schema) {
+            Ok(_) => vec![],
+            Err(errors) => errors,
+        }
+    }
+
     /// Convenience for tests to construct an `InputSchema`
     ///
     /// # Panics
@@ -1187,6 +1239,13 @@ impl InputSchema {
             .unwrap_or(false)
     }
 
+    pub(in crate::schema) fn skip_duplicates(&self, entity_type: Atom) -> bool {
+        self.type_info(entity_type)
+            .ok()
+            .map(|ti| ti.skip_duplicates())
+            .unwrap_or(false)
+    }
+
     /// Return true if `type_name` is the name of an object or interface type
     pub fn is_reference(&self, type_name: &str) -> bool {
         self.inner
@@ -1206,7 +1265,7 @@ impl InputSchema {
         obj_type.interfaces().map(|intf| {
             let atom = self.inner.pool.lookup(intf).unwrap();
             match self.type_info(atom).unwrap() {
-                TypeInfo::Interface(ref intf_type) => intf_type,
+                TypeInfo::Interface(intf_type) => intf_type,
                 _ => unreachable!("expected `{intf}` to refer to an interface"),
             }
         })
@@ -1328,7 +1387,7 @@ impl InputSchema {
                 TypeInfo::Object(obj_type) => Some(obj_type),
                 TypeInfo::Interface(_) | TypeInfo::Aggregation(_) => None,
             })
-            .filter(|obj_type| obj_type.immutable)
+            .filter(|obj_type| matches!(obj_type.mutability, ObjectMutability::Immutable { .. }))
             .map(|obj_type| EntityType::new(self.cheap_clone(), obj_type.name))
     }
 
@@ -1686,17 +1745,17 @@ mod validations {
     use crate::{
         data::{
             graphql::{
-                ext::{DirectiveFinder, FieldExt},
                 DirectiveExt, DocumentExt, ObjectTypeExt, TypeExt, ValueExt,
+                ext::{DirectiveFinder, FieldExt},
             },
-            store::{IdType, ValueType, ID},
+            store::{ID, IdType, ValueType},
             subgraph::SPEC_VERSION_1_1_0,
         },
         prelude::s,
         schema::{
-            input::{kw, sqlexpr, AggregateFn, AggregationInterval},
-            FulltextAlgorithm, FulltextLanguage, Schema as BaseSchema, SchemaValidationError,
-            SchemaValidationError as Err, Strings, SCHEMA_TYPE_NAME,
+            FulltextAlgorithm, FulltextLanguage, SCHEMA_TYPE_NAME, Schema as BaseSchema,
+            SchemaValidationError, SchemaValidationError as Err, Strings,
+            input::{AggregateFn, AggregationInterval, kw, sqlexpr},
         },
     };
 
@@ -1916,7 +1975,7 @@ mod validations {
                             .find(|typ| typ.name[..].eq(entity))
                         {
                             None => {
-                                return vec![SchemaValidationError::FulltextIncludedEntityNotFound]
+                                return vec![SchemaValidationError::FulltextIncludedEntityNotFound];
                             }
                             Some(t) => t,
                         };
@@ -2034,6 +2093,15 @@ mod validations {
                         Ok(b) => b.unwrap_or(timeseries),
                         Err(e) => return Some(e),
                     };
+                    let skip_duplicates = match bool_arg(dir, kw::SKIP_DUPLICATES) {
+                        Ok(b) => b.unwrap_or(false),
+                        Err(e) => return Some(e),
+                    };
+                    if skip_duplicates && !immutable {
+                        return Some(SchemaValidationError::SkipDuplicatesRequiresImmutable(
+                            object_type.name.clone(),
+                        ));
+                    }
                     if timeseries {
                         if !immutable {
                             Some(SchemaValidationError::MutableTimeseries(
@@ -2236,7 +2304,7 @@ mod validations {
                             object_type,
                             &field.name,
                             "the @derivedFrom `field` argument must be a string",
-                        ))
+                        ));
                     }
                 };
 
@@ -2294,11 +2362,11 @@ mod validations {
                     let valid_types = valid_types.join(", ");
 
                     let msg = format!(
-                    "field `{tf}` on type `{tt}` must have one of the following types: {valid_types}",
-                    tf = target_field.name,
-                    tt = target_type_name,
-                    valid_types = valid_types,
-                );
+                        "field `{tf}` on type `{tt}` must have one of the following types: {valid_types}",
+                        tf = target_field.name,
+                        tt = target_type_name,
+                        valid_types = valid_types,
+                    );
                     return Err(invalid(object_type, &field.name, &msg));
                 }
             }
@@ -3147,8 +3215,8 @@ mod tests {
         data::store::ID,
         prelude::DeploymentHash,
         schema::{
-            input::{POI_DIGEST, POI_OBJECT},
             EntityType,
+            input::{POI_DIGEST, POI_OBJECT},
         },
     };
 
diff --git a/graph/src/schema/input/sqlexpr.rs b/graph/src/schema/input/sqlexpr.rs
index 24d373a930a..a215c95b585 100644
--- a/graph/src/schema/input/sqlexpr.rs
+++ b/graph/src/schema/input/sqlexpr.rs
@@ -137,6 +137,7 @@ impl<'a> VisitExpr<'a> {
                 data_type: _,
                 kind,
                 format: _,
+                array: _,
             } => match kind {
                 // Cast: `CAST(<expr> as <datatype>)`
                 // DoubleColon: `<expr>::<datatype>`
@@ -235,7 +236,7 @@ impl<'a> VisitExpr<'a> {
         match pargs {
             p::FunctionArguments::None => { /* nothing to do */ }
             p::FunctionArguments::Subquery(_) => {
-                return self.illegal_function(format!("call to {name} uses a subquery argument"))
+                return self.illegal_function(format!("call to {name} uses a subquery argument"));
             }
             p::FunctionArguments::List(pargs) => {
                 let p::FunctionArgumentList {
@@ -262,7 +263,8 @@ impl<'a> VisitExpr<'a> {
                                 self.visit_expr(expr)?;
                             }
                             p::FunctionArgExpr::QualifiedWildcard(_)
-                            | p::FunctionArgExpr::Wildcard => {
+                            | p::FunctionArgExpr::Wildcard
+                            | p::FunctionArgExpr::WildcardWithOptions(_) => {
                                 return self.illegal_function(format!(
                                     "call to {name} uses a wildcard argument"
                                 ));
diff --git a/graph/src/schema/logs.graphql b/graph/src/schema/logs.graphql
new file mode 100644
index 00000000000..16a12160cd4
--- /dev/null
+++ b/graph/src/schema/logs.graphql
@@ -0,0 +1,71 @@
+"""
+The severity level of a log entry.
+Log levels are ordered from most to least severe: CRITICAL > ERROR > WARNING > INFO > DEBUG
+"""
+enum LogLevel {
+  "Critical errors that require immediate attention"
+  CRITICAL
+  "Error conditions that indicate a failure"
+  ERROR
+  "Warning conditions that may require attention"
+  WARNING
+  "Informational messages about normal operations"
+  INFO
+  "Detailed diagnostic information for debugging"
+  DEBUG
+}
+
+"""
+Sort direction for query results.
+"""
+enum OrderDirection {
+  "Ascending order (oldest first for timestamps)"
+  asc
+  "Descending order (newest first for timestamps)"
+  desc
+}
+
+"""
+A log entry emitted by a subgraph during indexing.
+Logs can be generated by the subgraph's AssemblyScript code using the `log.*` functions.
+"""
+type _Log_ {
+  "Unique identifier for this log entry"
+  id: String!
+  "The deployment hash of the subgraph that emitted this log"
+  subgraphId: String!
+  "The timestamp when the log was emitted, in RFC3339 format (e.g., '2024-01-15T10:30:00Z')"
+  timestamp: String!
+  "The severity level of the log entry"
+  level: LogLevel!
+  "The log message text"
+  text: String!
+  "Additional structured data passed to the log function as key-value pairs"
+  arguments: [_LogArgument_!]!
+  "Metadata about the source location in the subgraph code where the log was emitted"
+  meta: _LogMeta_!
+}
+
+"""
+A key-value pair of additional data associated with a log entry.
+These correspond to arguments passed to the log function in the subgraph code.
+"""
+type _LogArgument_ {
+  "The parameter name"
+  key: String!
+  "The parameter value, serialized as a string"
+  value: String!
+}
+
+"""
+Source code location metadata for a log entry.
+Indicates where in the subgraph's AssemblyScript code the log statement was executed.
+"""
+type _LogMeta_ {
+  "The module or file path where the log was emitted"
+  module: String!
+  "The line number in the source file"
+  line: Int!
+  "The column number in the source file"
+  column: Int!
+}
diff --git a/graph/src/schema/meta.graphql b/graph/src/schema/meta.graphql
index 1b48bfa6501..729874d8b9d 100644
--- a/graph/src/schema/meta.graphql
+++ b/graph/src/schema/meta.graphql
@@ -106,3 +106,12 @@ enum Aggregation_interval {
   hour
   day
 }
+
+"Indicates whether the current, partially filled bucket should be included in the response. Defaults to `exclude`"
+enum Aggregation_current {
+    "Exclude the current, partially filled bucket from the response"
+    exclude
+
+    "Include the current, partially filled bucket in the response"
+    include
+}
diff --git a/graph/src/schema/mod.rs b/graph/src/schema/mod.rs
index f8725302b52..0da95598e2e 100644
--- a/graph/src/schema/mod.rs
+++ b/graph/src/schema/mod.rs
@@ -22,17 +22,17 @@ mod entity_type;
 mod fulltext;
 pub(crate) mod input;
 
-pub use api::{is_introspection_field, APISchemaError, INTROSPECTION_QUERY_TYPE};
+pub use api::{APISchemaError, INTROSPECTION_QUERY_TYPE, is_introspection_field};
 
 pub use api::{ApiSchema, ErrorPolicy};
 pub use entity_key::EntityKey;
 pub use entity_type::{AsEntityTypeName, EntityType};
 pub use fulltext::{FulltextAlgorithm, FulltextConfig, FulltextDefinition, FulltextLanguage};
-pub use input::sqlexpr::{ExprVisitor, VisitExpr};
 pub(crate) use input::POI_OBJECT;
+pub use input::sqlexpr::{ExprVisitor, VisitExpr};
 pub use input::{
-    kw, Aggregate, AggregateFn, Aggregation, AggregationInterval, AggregationMapping, Field,
-    InputSchema, InterfaceType, ObjectOrInterface, ObjectType, TypeKind,
+    Aggregate, AggregateFn, Aggregation, AggregationInterval, AggregationMapping, Field,
+    InputSchema, InterfaceType, ObjectOrInterface, ObjectType, TypeKind, kw,
 };
 
 pub const SCHEMA_TYPE_NAME: &str = "_Schema_";
@@ -41,6 +41,9 @@ pub const INTROSPECTION_SCHEMA_FIELD_NAME: &str = "__schema";
 pub const META_FIELD_TYPE: &str = "_Meta_";
 pub const META_FIELD_NAME: &str = "_meta";
 
+pub const LOGS_FIELD_TYPE: &str = "_Log_";
+pub const LOGS_FIELD_NAME: &str = "_logs";
+
 pub const INTROSPECTION_TYPE_FIELD_NAME: &str = "__type";
 
 pub const BLOCK_FIELD_TYPE: &str = "_Block_";
@@ -57,6 +60,8 @@ impl fmt::Display for Strings {
 
 #[derive(Debug, Error, PartialEq, Eq)]
 pub enum SchemaValidationError {
+    #[error("Invalid schema: {0}")]
+    InvalidSchema(String),
     #[error("Interface `{0}` not defined")]
     InterfaceUndefined(String),
 
@@ -70,7 +75,9 @@ pub enum SchemaValidationError {
          the following fields: {2}"
     )]
     InterfaceFieldsMissing(String, String, Strings), // (type, interface, missing_fields)
-    #[error("Implementors of interface `{0}` use different id types `{1}`. They must all use the same type")]
+    #[error(
+        "Implementors of interface `{0}` use different id types `{1}`. They must all use the same type"
+    )]
     InterfaceImplementorsMixId(String, String),
     #[error("Field `{1}` in type `{0}` has invalid @derivedFrom: {2}")]
     InvalidDerivedFrom(String, String, String), // (type, field, reason)
@@ -88,7 +95,9 @@ pub enum SchemaValidationError {
     FulltextNameUndefined,
     #[error("Fulltext directive name overlaps with type: {0}")]
     FulltextNameConflict(String),
-    #[error("Fulltext directive name overlaps with an existing entity field or a top-level query field: {0}")]
+    #[error(
+        "Fulltext directive name overlaps with an existing entity field or a top-level query field: {0}"
+    )]
     FulltextNameCollision(String),
     #[error("Fulltext language is undefined")]
     FulltextLanguageUndefined,
@@ -120,9 +129,13 @@ pub enum SchemaValidationError {
     IllegalIdType(String),
     #[error("Timeseries {0} is missing a `timestamp` field")]
     TimestampFieldMissing(String),
-    #[error("Aggregation {0}, field{1}: aggregates must use a numeric type, one of Int, Int8, BigInt, and BigDecimal")]
+    #[error(
+        "Aggregation {0}, field{1}: aggregates must use a numeric type, one of Int, Int8, BigInt, and BigDecimal"
+    )]
     NonNumericAggregate(String, String),
-    #[error("Aggregation '{0}', field '{1}': first/last aggregates must use a numeric, byte array, string or a reference type")]
+    #[error(
+        "Aggregation '{0}', field '{1}': first/last aggregates must use a numeric, byte array, string or a reference type"
+    )]
     InvalidFirstLastAggregate(String, String),
     #[error("Aggregation {0} is missing the `source` argument")]
     AggregationMissingSource(String),
@@ -146,6 +159,10 @@ pub enum SchemaValidationError {
     AggregationDerivedField(String, String),
     #[error("Timeseries {0} is marked as mutable, it must be immutable")]
     MutableTimeseries(String),
+    #[error(
+        "Entity type `{0}` has skipDuplicates: true but is not immutable; skipDuplicates requires immutable: true"
+    )]
+    SkipDuplicatesRequiresImmutable(String),
     #[error("Timeseries {0} is missing a `timestamp` field")]
     TimeseriesMissingTimestamp(String),
     #[error("Type {0} has a `timestamp` field of type {1}, but it must be of type Timestamp")]
@@ -164,7 +181,9 @@ pub enum SchemaValidationError {
     AggregationInvalidFn(String, String, String),
     #[error("Field {1} in aggregation {0} is missing the `fn` argument")]
     AggregationMissingFn(String, String),
-    #[error("Field {1} in aggregation {0} is missing the `arg` argument since the function {2} requires it")]
+    #[error(
+        "Field {1} in aggregation {0} is missing the `arg` argument since the function {2} requires it"
+    )]
     AggregationMissingArg(String, String, String),
     #[error(
         "Field {1} in aggregation {0} has `arg` {2} but the source type does not have such a field"
@@ -176,11 +195,17 @@ pub enum SchemaValidationError {
     AggregationNonMatchingArg(String, String, String, String, String),
     #[error("Field {1} in aggregation {0} has arg `{3}` but that is not a numeric field in {2}")]
     AggregationNonNumericArg(String, String, String, String),
-    #[error("Field {1} in aggregation {0} has an invalid value for `cumulative`. It needs to be a boolean")]
+    #[error(
+        "Field {1} in aggregation {0} has an invalid value for `cumulative`. It needs to be a boolean"
+    )]
     AggregationInvalidCumulative(String, String),
-    #[error("Aggregations are not supported with spec version {0}; please migrate the subgraph to the latest version")]
+    #[error(
+        "Aggregations are not supported with spec version {0}; please migrate the subgraph to the latest version"
+    )]
     AggregationsNotSupported(Version),
-    #[error("Using Int8 as the type for the `id` field is not supported with spec version {0}; please migrate the subgraph to the latest version")]
+    #[error(
+        "Using Int8 as the type for the `id` field is not supported with spec version {0}; please migrate the subgraph to the latest version"
+    )]
     IdTypeInt8NotSupported(Version),
     #[error("{0}")]
     ExprNotSupported(String),
@@ -305,7 +330,7 @@ impl Schema {
                 arguments: vec![subgraph_id_argument],
             };
 
-            if let s::Definition::TypeDefinition(ref mut type_definition) = definition {
+            if let s::Definition::TypeDefinition(type_definition) = definition {
                 let (name, directives) = match type_definition {
                     s::TypeDefinition::Object(object_type) => {
                         (&object_type.name, &mut object_type.directives)
diff --git a/graph/src/schema/test_schemas/skip_duplicates_not_a_boolean.graphql b/graph/src/schema/test_schemas/skip_duplicates_not_a_boolean.graphql
new file mode 100644
index 00000000000..ed22d3e8eb8
--- /dev/null
+++ b/graph/src/schema/test_schemas/skip_duplicates_not_a_boolean.graphql
@@ -0,0 +1,5 @@
+# fail: EntityDirectiveNonBooleanArgValue("skipDuplicates")
+
+type Data @entity(immutable: true, skipDuplicates: "yes") {
+  id: Bytes!
+}
diff --git a/graph/src/schema/test_schemas/skip_duplicates_requires_immutable.graphql b/graph/src/schema/test_schemas/skip_duplicates_requires_immutable.graphql
new file mode 100644
index 00000000000..2eeaf6cff09
--- /dev/null
+++ b/graph/src/schema/test_schemas/skip_duplicates_requires_immutable.graphql
@@ -0,0 +1,5 @@
+# fail: SkipDuplicatesRequiresImmutable("Data")
+
+type Data @entity(skipDuplicates: true) {
+  id: Bytes!
+}
diff --git a/graph/src/schema/test_schemas/skip_duplicates_valid.graphql b/graph/src/schema/test_schemas/skip_duplicates_valid.graphql
new file mode 100644
index 00000000000..cdf6ee29b23
--- /dev/null
+++ b/graph/src/schema/test_schemas/skip_duplicates_valid.graphql
@@ -0,0 +1,5 @@
+# valid: Minimal example
+
+type Data @entity(immutable: true, skipDuplicates: true) {
+  id: Bytes!
+}
diff --git a/graph/src/tls.rs b/graph/src/tls.rs
new file mode 100644
index 00000000000..6c54cfc955d
--- /dev/null
+++ b/graph/src/tls.rs
@@ -0,0 +1,12 @@
+//! Process-wide TLS crypto provider setup.
+//!
+//! Our deps pull in `rustls` with both `aws_lc_rs` (via alloy) and `ring`
+//! (via object_store/reqwest). With multiple providers linked, `rustls`
+//! 0.23 panics on first TLS use unless a default is installed explicitly.
+//! Must be called once per process before any TLS connection is built.
+
+/// Install `aws_lc_rs` as the process-wide default `rustls` crypto provider.
+/// Idempotent: later calls are no-ops.
+pub fn install_default_crypto_provider() {
+    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+}
diff --git a/graph/src/util/cache_weight.rs b/graph/src/util/cache_weight.rs
index 077db9a51ce..12bcc2446a8 100644
--- a/graph/src/util/cache_weight.rs
+++ b/graph/src/util/cache_weight.rs
@@ -2,7 +2,7 @@ use chrono::{DateTime, TimeZone};
 
 use crate::{
     data::value::Word,
-    prelude::{q, BigDecimal, BigInt, Value},
+    prelude::{BigDecimal, BigInt, Value, q},
     schema::EntityType,
 };
 use std::{
@@ -140,7 +140,7 @@ impl CacheWeight for BigDecimal {
 
 impl CacheWeight for BigInt {
     fn indirect_weight(&self) -> usize {
-        self.bits() / 8
+        self.bits().div_ceil(8)
     }
 }
 
@@ -188,6 +188,12 @@ impl CacheWeight for EntityType {
     }
 }
 
+impl CacheWeight for slog::Logger {
+    fn indirect_weight(&self) -> usize {
+        0
+    }
+}
+
 impl CacheWeight for [u8; 32] {
     fn indirect_weight(&self) -> usize {
         0
diff --git a/graph/src/util/futures.rs b/graph/src/util/futures.rs
index 7dff592b342..f263480b063 100644
--- a/graph/src/util/futures.rs
+++ b/graph/src/util/futures.rs
@@ -2,14 +2,14 @@ use crate::ext::futures::FutureExtension;
 use futures03::{Future, FutureExt, TryFutureExt};
 use lazy_static::lazy_static;
 use regex::Regex;
-use slog::{debug, trace, warn, Logger};
+use slog::{Logger, debug, trace, warn};
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::sync::Arc;
 use std::time::Duration;
 use thiserror::Error;
-use tokio_retry::strategy::{jitter, ExponentialBackoff};
 use tokio_retry::Retry;
+use tokio_retry::strategy::{ExponentialBackoff, jitter};
 
 // Use different limits for test and production code to speed up tests
 #[cfg(debug_assertions)]
@@ -305,7 +305,7 @@ where
 
     let mut attempt_count = 0;
 
-    Retry::spawn(retry_strategy(limit_opt, max_delay), move || {
+    Retry::start(retry_strategy(limit_opt, max_delay), move || {
         let operation_name = operation_name.clone();
         let logger = logger.clone();
         let condition = condition.clone();
@@ -412,7 +412,8 @@ pub fn retry_strategy(
         Some(limit) => {
             // Items are delays *between* attempts,
             // so subtract 1 from limit.
-            Box::new(backoff.take(limit - 1))
+            // Use saturating_sub to avoid underflow if limit is set to 0
+            Box::new(backoff.take(limit.saturating_sub(1)))
         }
         None => Box::new(backoff),
     }
diff --git a/graph/src/util/herd_cache.rs b/graph/src/util/herd_cache.rs
index a469b2d9ac2..88f32ffb861 100644
--- a/graph/src/util/herd_cache.rs
+++ b/graph/src/util/herd_cache.rs
@@ -1,5 +1,5 @@
-use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
diff --git a/graph/src/util/intern.rs b/graph/src/util/intern.rs
index 884e4cb7e3d..655d71da9e7 100644
--- a/graph/src/util/intern.rs
+++ b/graph/src/util/intern.rs
@@ -114,10 +114,10 @@ impl AtomPool {
     /// Get the atom for `word`. Return `None` if the word is not in this
     /// pool or any of its ancestors.
     pub fn lookup(&self, word: &str) -> Option<Atom> {
-        if let Some(base) = &self.base {
-            if let Some(atom) = base.lookup(word) {
-                return Some(atom);
-            }
+        if let Some(base) = &self.base
+            && let Some(atom) = base.lookup(word)
+        {
+            return Some(atom);
         }
 
         self.words.get(word).cloned()
@@ -510,9 +510,7 @@ impl<V: PartialEq> PartialEq for Object<V> {
     }
 }
 
-impl<V: Eq> Eq for Object<V> {
-    fn assert_receiver_is_total_eq(&self) {}
-}
+impl<V: Eq> Eq for Object<V> {}
 
 impl<V: Serialize> Serialize for Object<V> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
diff --git a/graph/src/util/jobs.rs b/graph/src/util/jobs.rs
index 438ff72004c..bd5d10b854d 100644
--- a/graph/src/util/jobs.rs
+++ b/graph/src/util/jobs.rs
@@ -3,9 +3,9 @@
 //! to be done on a tight deadline, solely for work that needs to be done
 //! at reasonably long intervals (like a few hours)
 
-use slog::{debug, info, o, trace, warn, Logger};
-use std::sync::atomic::{AtomicBool, Ordering};
+use slog::{Logger, debug, info, o, trace, warn};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Duration, Instant};
 
 use async_trait::async_trait;
diff --git a/graph/src/util/mem.rs b/graph/src/util/mem.rs
index b98b7d5ed87..02982c962d2 100644
--- a/graph/src/util/mem.rs
+++ b/graph/src/util/mem.rs
@@ -1,4 +1,4 @@
-use std::mem::{transmute, MaybeUninit};
+use std::mem::{MaybeUninit, transmute};
 
 /// Temporarily needed until MaybeUninit::write_slice is stabilized.
 pub fn init_slice<'a, T>(src: &[T], dst: &'a mut [MaybeUninit<T>]) -> &'a mut [T]
diff --git a/graph/src/util/test_utils.rs b/graph/src/util/test_utils.rs
index d5240e21faa..0bd954aabf4 100644
--- a/graph/src/util/test_utils.rs
+++ b/graph/src/util/test_utils.rs
@@ -1,41 +1,41 @@
-use alloy::consensus::{TxEnvelope, TxLegacy};
+use alloy::consensus::TxLegacy;
 use alloy::primitives::Address;
 use alloy::rpc::types::Transaction;
 
+use crate::components::ethereum::{AnyBlock, AnyHeader, AnyTransaction, AnyTxEnvelope};
 use crate::prelude::alloy::consensus::Header as ConsensusHeader;
 use crate::prelude::alloy::primitives::B256;
 use crate::prelude::alloy::rpc::types::{Block, Header};
 
 /// Creates a minimal Alloy Block for testing purposes.
-pub fn create_minimal_block_for_test(block_number: u64, block_hash: B256) -> Block {
+pub fn create_minimal_block_for_test(block_number: u64, block_hash: B256) -> AnyBlock {
     // Create consensus header with defaults, but set the specific number
     let consensus_header = ConsensusHeader {
         number: block_number,
         ..Default::default()
     };
 
-    // Create RPC header with the specific hash
+    // Create RPC header with the specific hash and wrap in AnyHeader
     let rpc_header = Header {
         hash: block_hash,
-        inner: consensus_header,
+        inner: AnyHeader::from(consensus_header),
         total_difficulty: None,
         size: None,
     };
 
-    // Create an empty block with this header
     Block::empty(rpc_header)
 }
 
-/// Generic function that creates a mock legacy Transaction from ANY log
+/// Generic function that creates a mock legacy Transaction for testing
 pub fn create_dummy_transaction(
     block_number: u64,
     block_hash: B256,
     transaction_index: Option<u64>,
     transaction_hash: B256,
-) -> Transaction<TxEnvelope> {
+) -> AnyTransaction {
     use alloy::{
         consensus::transaction::Recovered,
-        consensus::Signed,
+        consensus::{Signed, TxEnvelope},
         primitives::{Signature, U256},
     };
 
@@ -46,13 +46,15 @@ pub fn create_dummy_transaction(
 
     let signed_tx = Signed::new_unchecked(tx, signature, transaction_hash);
     let envelope = TxEnvelope::Legacy(signed_tx);
+    let any_envelope = AnyTxEnvelope::Ethereum(envelope);
 
-    let recovered = Recovered::new_unchecked(envelope, Address::ZERO);
+    let recovered = Recovered::new_unchecked(any_envelope, Address::ZERO);
 
     Transaction {
         inner: recovered,
         block_hash: Some(block_hash),
         block_number: Some(block_number),
+        block_timestamp: None,
         transaction_index,
         effective_gas_price: None,
     }
diff --git a/graph/src/util/timed_rw_lock.rs b/graph/src/util/timed_rw_lock.rs
index e8ff394be44..17befde8636 100644
--- a/graph/src/util/timed_rw_lock.rs
+++ b/graph/src/util/timed_rw_lock.rs
@@ -1,5 +1,5 @@
 use parking_lot::{Mutex, RwLock};
-use slog::{warn, Logger};
+use slog::{Logger, warn};
 use std::time::{Duration, Instant};
 
 use crate::prelude::ENV_VARS;
diff --git a/graph/tests/subgraph_datasource_tests.rs b/graph/tests/subgraph_datasource_tests.rs
index 366c7bc8d26..9dba0767065 100644
--- a/graph/tests/subgraph_datasource_tests.rs
+++ b/graph/tests/subgraph_datasource_tests.rs
@@ -2,12 +2,12 @@ use std::{collections::BTreeMap, ops::Range, sync::Arc};
 
 use graph::{
     blockchain::{
+        Block, SubgraphFilter, Trigger,
         block_stream::{
             EntityOperationKind, EntitySourceOperation, SubgraphTriggerScanRange,
             TriggersAdapterWrapper,
         },
         mock::MockTriggersAdapter,
-        Block, SubgraphFilter, Trigger,
     },
     components::store::SourceableStore,
     data_source::CausalityRegion,
diff --git a/graphql/Cargo.toml b/graphql/Cargo.toml
index 2dcac956d67..cec9330f072 100644
--- a/graphql/Cargo.toml
+++ b/graphql/Cargo.toml
@@ -8,9 +8,9 @@ async-trait = { workspace = true }
 crossbeam = "0.8"
 graph = { path = "../graph" }
 graphql-tools = { workspace = true }
-lazy_static = "1.5.0"
-stable-hash = { git = "https://github.com/graphprotocol/stable-hash", branch = "main"}
-stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }
+lazy_static = { workspace = true }
+stable-hash = { git = "https://github.com/graphprotocol/stable-hash", rev = "70300f974e61529675aef3f20803f26a23f0e0ea"}
+stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", rev = "42b85d936c6b9f1b7a4b8385d2f081d5564daa69", package = "stable-hash" }
 parking_lot = "0.12"
 anyhow = "1.0"
 async-recursion = "1.1.1"
diff --git a/graphql/src/execution/ast.rs b/graphql/src/execution/ast.rs
index 65bdb6298d1..cc9eeae5083 100644
--- a/graphql/src/execution/ast.rs
+++ b/graphql/src/execution/ast.rs
@@ -1,11 +1,11 @@
 use std::collections::{BTreeSet, HashSet};
 
 use graph::{
-    components::store::{AttributeNames, ChildMultiplicity, EntityOrder},
+    components::store::{AggregationCurrent, AttributeNames, ChildMultiplicity, EntityOrder},
     data::{graphql::ObjectOrInterface, store::ID},
     env::ENV_VARS,
-    prelude::{anyhow, q, r, s, QueryExecutionError, ValueMap},
-    schema::{ast::ObjectType, kw, AggregationInterval, ApiSchema, EntityType},
+    prelude::{QueryExecutionError, ValueMap, anyhow, q, r, s},
+    schema::{AggregationInterval, ApiSchema, EntityType, ast::ObjectType, kw},
 };
 
 /// A selection set is a table that maps object types to the fields that
@@ -364,6 +364,26 @@ impl Field {
             })
             .transpose()
     }
+
+    pub fn aggregation_current(&self) -> Result<Option<AggregationCurrent>, QueryExecutionError> {
+        let Some(value) = self.argument_value(kw::CURRENT) else {
+            return Ok(None);
+        };
+
+        if let r::Value::Enum(current) = value {
+            match current.as_str() {
+                "exclude" => return Ok(Some(AggregationCurrent::Exclude)),
+                "include" => return Ok(Some(AggregationCurrent::Include)),
+                _ => {}
+            }
+        }
+
+        Err(QueryExecutionError::InvalidArgumentError(
+            self.position,
+            kw::CURRENT.to_string(),
+            q::Value::from(value.clone()),
+        ))
+    }
 }
 
 impl ValueMap for Field {
diff --git a/graphql/src/execution/cache.rs b/graphql/src/execution/cache.rs
index 099fba25f23..de4387ace46 100644
--- a/graphql/src/execution/cache.rs
+++ b/graphql/src/execution/cache.rs
@@ -1,6 +1,6 @@
-use graph::prelude::{debug, BlockPtr, CheapClone, Logger, QueryResult};
-use std::sync::atomic::{AtomicU64, Ordering};
+use graph::prelude::{BlockPtr, CheapClone, Logger, QueryResult, debug};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
 use std::{collections::HashMap, time::Duration};
 use std::{collections::VecDeque, time::Instant};
 
@@ -107,10 +107,10 @@ impl QueryBlockCache {
         // - There are none yet, this is the first query being cached, or
         // - `block_ptr` is of higher or equal number than the most recent block in the cache.
         // Otherwise this is a historical query that does not belong in the block cache.
-        if let Some(highest) = cache.iter().next() {
-            if highest.block.number > block_ptr.number {
-                return false;
-            }
+        if let Some(highest) = cache.iter().next()
+            && highest.block.number > block_ptr.number
+        {
+            return false;
         };
 
         if cache.len() == self.max_blocks {
@@ -164,10 +164,10 @@ impl QueryBlockCache {
             .map(|(_, c)| c)
         {
             // Iterate from the most recent block looking for a block that matches.
-            if let Some(cache_by_block) = cache.iter().find(|c| &c.block == block_ptr) {
-                if let Some(response) = cache_by_block.get(key) {
-                    return Some(response.cheap_clone());
-                }
+            if let Some(cache_by_block) = cache.iter().find(|c| &c.block == block_ptr)
+                && let Some(response) = cache_by_block.get(key)
+            {
+                return Some(response.cheap_clone());
             }
         }
         None
diff --git a/graphql/src/execution/execution.rs b/graphql/src/execution/execution.rs
index 48477d3eb5f..c3d116e6c64 100644
--- a/graphql/src/execution/execution.rs
+++ b/graphql/src/execution/execution.rs
@@ -7,8 +7,8 @@ use graph::{
         value::{Object, Word},
     },
     futures03::future::TryFutureExt,
-    prelude::{s, CheapClone},
-    schema::{is_introspection_field, INTROSPECTION_QUERY_TYPE, META_FIELD_NAME},
+    prelude::{CheapClone, s},
+    schema::{INTROSPECTION_QUERY_TYPE, LOGS_FIELD_NAME, META_FIELD_NAME, is_introspection_field},
     util::{herd_cache::HerdCache, lfu_cache::EvictStats, timed_rw_lock::TimedMutex},
 };
 use lazy_static::lazy_static;
@@ -39,11 +39,7 @@ lazy_static! {
 
     // We will not add entries to the cache that exceed this weight.
     static ref MAX_ENTRY_WEIGHT: usize = {
-        if ENV_VARS.graphql.query_cache_max_entry_ratio == 0 {
-            usize::MAX
-        } else {
-        *MAX_WEIGHT / ENV_VARS.graphql.query_cache_max_entry_ratio
-        }
+        MAX_WEIGHT.checked_div(ENV_VARS.graphql.query_cache_max_entry_ratio).unwrap_or(usize::MAX)
     };
 
     // Sharded query results cache for recent blocks by network.
@@ -168,8 +164,8 @@ fn log_lfu_evict_stats(
 ) {
     let total_shards = ENV_VARS.graphql.query_lfu_cache_shards as usize;
 
-    if total_shards > 0 {
-        if let Some(EvictStats {
+    if total_shards > 0
+        && let Some(EvictStats {
             new_weight,
             evicted_weight,
             new_count,
@@ -179,27 +175,26 @@ fn log_lfu_evict_stats(
             accesses,
             hits,
         }) = evict_stats
+    {
         {
-            {
-                let shard = (cache_key[0] as usize) % total_shards;
-                let network = network.to_string();
-                let logger = logger.clone();
-
-                graph::spawn(async move {
-                    debug!(logger, "Evicted LFU cache";
-                        "shard" => shard,
-                        "network" => network,
-                        "entries" => new_count,
-                        "entries_evicted" => evicted_count,
-                        "weight" => new_weight,
-                        "weight_evicted" => evicted_weight,
-                        "stale_update" => stale_update,
-                        "hit_rate" => format!("{:.0}%", hits as f64 / accesses as f64 * 100.0),
-                        "accesses" => accesses,
-                        "evict_time_ms" => evict_time.as_millis()
-                    )
-                });
-            }
+            let shard = (cache_key[0] as usize) % total_shards;
+            let network = network.to_string();
+            let logger = logger.clone();
+
+            graph::spawn(async move {
+                debug!(logger, "Evicted LFU cache";
+                    "shard" => shard,
+                    "network" => network,
+                    "entries" => new_count,
+                    "entries_evicted" => evicted_count,
+                    "weight" => new_weight,
+                    "weight_evicted" => evicted_weight,
+                    "stale_update" => stale_update,
+                    "hit_rate" => format!("{:.0}%", hits as f64 / accesses as f64 * 100.0),
+                    "accesses" => accesses,
+                    "evict_time_ms" => evict_time.as_millis()
+                )
+            });
         }
     }
 }
@@ -231,6 +226,9 @@ where
 
     /// Whether to include an execution trace in the result
     pub trace: bool,
+
+    /// The log store to use for querying logs.
+    pub log_store: Arc<dyn graph::components::log_store::LogStore>,
 }
 
 pub(crate) fn get_field<'a>(
@@ -264,6 +262,7 @@ where
             // `cache_status` is a dead value for the introspection context.
             cache_status: AtomicCell::new(CacheStatus::Miss),
             trace: ENV_VARS.log_sql_timing(),
+            log_store: self.log_store.cheap_clone(),
         }
     }
 }
@@ -273,11 +272,12 @@ pub(crate) async fn execute_root_selection_set_uncached(
     selection_set: &a::SelectionSet,
     root_type: &sast::ObjectType,
 ) -> Result<(Object, Trace), Vec<QueryExecutionError>> {
-    // Split the top-level fields into introspection fields and
-    // regular data fields
+    // Split the top-level fields into introspection fields,
+    // logs fields, meta fields, and regular data fields
     let mut data_set = a::SelectionSet::empty_from(selection_set);
     let mut intro_set = a::SelectionSet::empty_from(selection_set);
     let mut meta_items = Vec::new();
+    let mut logs_fields = Vec::new();
 
     for field in selection_set.fields_for(root_type)? {
         // See if this is an introspection or data field. We don't worry about
@@ -285,6 +285,8 @@ pub(crate) async fn execute_root_selection_set_uncached(
         // the data_set SelectionSet
         if is_introspection_field(&field.name) {
             intro_set.push(field)?
+        } else if field.name == LOGS_FIELD_NAME {
+            logs_fields.push(field)
         } else if field.name == META_FIELD_NAME || field.name == "__typename" {
             meta_items.push(field)
         } else {
@@ -292,6 +294,26 @@ pub(crate) async fn execute_root_selection_set_uncached(
         }
     }
 
+    // Validate that _logs queries cannot be combined with regular entity queries
+    if !logs_fields.is_empty() && !data_set.is_empty() {
+        return Err(vec![QueryExecutionError::ValidationError(
+            None,
+            "The _logs query cannot be combined with other entity queries in the same request"
+                .to_string(),
+        )]);
+    }
+
+    // If a client requests `_logs` but this indexer has no log store
+    // configured, return an error rather than silently returning empty
+    // results, which would otherwise be indistinguishable from a subgraph that
+    // genuinely produced no logs. Checked before prefetch/introspection so we
+    // don't do that work only to error out.
+    if !logs_fields.is_empty() && !ctx.log_store.is_available() {
+        return Err(vec![QueryExecutionError::NotSupported(
+            "the `_logs` query is not enabled on this indexer".to_string(),
+        )]);
+    }
+
     // If we are getting regular data, prefetch it from the database
     let (mut values, trace) = if data_set.is_empty() && meta_items.is_empty() {
         (Object::default(), Trace::None)
@@ -314,6 +336,96 @@ pub(crate) async fn execute_root_selection_set_uncached(
         );
     }
 
+    // Resolve logs fields, if there are any
+    for field in logs_fields {
+        use graph::data::graphql::object;
+
+        // Build log query from field arguments
+        let log_query = crate::store::logs::build_log_query(field, ctx.query.schema.id())
+            .map_err(|e| vec![e])?;
+
+        // Query the log store
+        let log_entries = ctx.log_store.query_logs(log_query).await.map_err(|e| {
+            vec![QueryExecutionError::StoreError(
+                anyhow::Error::from(e).into(),
+            )]
+        })?;
+
+        // Get _Log_ type from schema for field selection
+        let log_type_def = ctx.query.schema.get_named_type("_Log_").ok_or_else(|| {
+            vec![QueryExecutionError::AbstractTypeError(
+                "_Log_ type not found in schema".to_string(),
+            )]
+        })?;
+        let log_object_type = match log_type_def {
+            s::TypeDefinition::Object(obj) => sast::ObjectType::from(Arc::new(obj.clone())),
+            _ => {
+                return Err(vec![QueryExecutionError::AbstractTypeError(
+                    "_Log_ is not an object type".to_string(),
+                )]);
+            }
+        };
+
+        // Convert log entries to GraphQL values, respecting field selection
+        let log_values: Vec<r::Value> = log_entries
+            .into_iter()
+            .map(|entry| {
+                // Convert log level to string (needed by multiple fields)
+                let level_str = entry.level.as_str().to_uppercase();
+                let mut results = Vec::new();
+
+                // Iterate over requested fields (same pattern as entity queries)
+                for log_field in field
+                    .selection_set
+                    .fields_for(&log_object_type)
+                    .map_err(|e| vec![e])?
+                {
+                    let response_key = log_field.response_key();
+
+                    // Map field name to LogEntry value (replaces prefetched_object lookup)
+                    let value = match log_field.name.as_str() {
+                        "id" => entry.id.clone().into_value(),
+                        "subgraphId" => entry.subgraph_id.to_string().into_value(),
+                        "timestamp" => entry.timestamp.clone().into_value(),
+                        "level" => level_str.clone().into_value(),
+                        "text" => entry.text.clone().into_value(),
+                        "arguments" => {
+                            // Convert arguments Vec<(String, String)> to GraphQL objects
+                            let args: Vec<r::Value> = entry
+                                .arguments
+                                .iter()
+                                .map(|(key, value)| {
+                                    object! {
+                                        key: key.clone(),
+                                        value: value.clone(),
+                                        __typename: "_LogArgument_"
+                                    }
+                                })
+                                .collect();
+                            r::Value::List(args)
+                        }
+                        "meta" => object! {
+                            module: entry.meta.module.clone(),
+                            line: r::Value::Int(entry.meta.line),
+                            column: r::Value::Int(entry.meta.column),
+                            __typename: "_LogMeta_"
+                        },
+                        "__typename" => "_Log_".into_value(),
+                        _ => continue, // Unknown field, skip it
+                    };
+
+                    results.push((Word::from(response_key), value));
+                }
+
+                Ok(r::Value::Object(Object::from_iter(results)))
+            })
+            .collect::<Result<Vec<_>, Vec<QueryExecutionError>>>()?;
+
+        let response_key = Word::from(field.response_key());
+        let logs_object = Object::from_iter(vec![(response_key, r::Value::List(log_values))]);
+        values.append(logs_object);
+    }
+
     Ok((values, trace))
 }
 
@@ -336,34 +448,34 @@ pub(crate) async fn execute_root_selection_set<R: Resolver>(
             }
         };
 
-    if should_check_cache {
-        if let (Some(block_ptr), Some(network)) = (block_ptr.as_ref(), &ctx.query.network) {
-            // JSONB and metadata queries use `BLOCK_NUMBER_MAX`. Ignore this case for two reasons:
-            // - Metadata queries are not cacheable.
-            // - Caching `BLOCK_NUMBER_MAX` would make this cache think all other blocks are old.
-            if block_ptr.number != BLOCK_NUMBER_MAX {
-                // Calculate the hash outside of the lock
-                let cache_key = cache_key(&ctx, &selection_set, block_ptr);
-                let shard = (cache_key[0] as usize) % QUERY_BLOCK_CACHE.len();
-
-                // Check if the response is cached, first in the recent blocks cache,
-                // and then in the LfuCache for historical queries
-                // The blocks are used to delimit how long locks need to be held
-                {
-                    let cache = QUERY_BLOCK_CACHE[shard].lock(&ctx.logger);
-                    if let Some(result) = cache.get(network, block_ptr, &cache_key) {
-                        ctx.cache_status.store(CacheStatus::Hit);
-                        return result;
-                    }
-                }
-                if let Some(mut cache) = lfu_cache(&ctx.logger, &cache_key) {
-                    if let Some(weighted) = cache.get(&cache_key) {
-                        ctx.cache_status.store(CacheStatus::Hit);
-                        return weighted.result.cheap_clone();
-                    }
+    if should_check_cache
+        && let (Some(block_ptr), Some(network)) = (block_ptr.as_ref(), &ctx.query.network)
+    {
+        // JSONB and metadata queries use `BLOCK_NUMBER_MAX`. Ignore this case for two reasons:
+        // - Metadata queries are not cacheable.
+        // - Caching `BLOCK_NUMBER_MAX` would make this cache think all other blocks are old.
+        if block_ptr.number != BLOCK_NUMBER_MAX {
+            // Calculate the hash outside of the lock
+            let cache_key = cache_key(&ctx, &selection_set, block_ptr);
+            let shard = (cache_key[0] as usize) % QUERY_BLOCK_CACHE.len();
+
+            // Check if the response is cached, first in the recent blocks cache,
+            // and then in the LfuCache for historical queries
+            // The blocks are used to delimit how long locks need to be held
+            {
+                let cache = QUERY_BLOCK_CACHE[shard].lock(&ctx.logger);
+                if let Some(result) = cache.get(network, block_ptr, &cache_key) {
+                    ctx.cache_status.store(CacheStatus::Hit);
+                    return result;
                 }
-                key = Some(cache_key);
             }
+            if let Some(mut cache) = lfu_cache(&ctx.logger, &cache_key)
+                && let Some(weighted) = cache.get(&cache_key)
+            {
+                ctx.cache_status.store(CacheStatus::Hit);
+                return weighted.result.cheap_clone();
+            }
+            key = Some(cache_key);
         }
     }
 
@@ -614,7 +726,7 @@ async fn resolve_field_value(
             .await
         }
 
-        s::Type::NamedType(ref name) => {
+        s::Type::NamedType(name) => {
             resolve_field_value_for_named_type(
                 ctx,
                 object_type,
@@ -702,7 +814,7 @@ async fn resolve_field_value_for_list_type(
                 .await
         }
 
-        s::Type::NamedType(ref type_name) => {
+        s::Type::NamedType(type_name) => {
             let named_type = ctx
                 .query
                 .schema
diff --git a/graphql/src/execution/mod.rs b/graphql/src/execution/mod.rs
index 9cd5db531df..d51bf6f5a75 100644
--- a/graphql/src/execution/mod.rs
+++ b/graphql/src/execution/mod.rs
@@ -9,7 +9,7 @@ mod resolver;
 /// Our representation of a query AST
 pub mod ast;
 
-use stable_hash_legacy::{crypto::SetHasher, StableHasher};
+use stable_hash_legacy::{StableHasher, crypto::SetHasher};
 
 pub use self::execution::*;
 pub use self::query::Query;
diff --git a/graphql/src/execution/query.rs b/graphql/src/execution/query.rs
index 1eb377acafb..c12d68d7fa9 100644
--- a/graphql/src/execution/query.rs
+++ b/graphql/src/execution/query.rs
@@ -3,7 +3,7 @@ use graph::data::graphql::DocumentExt as _;
 use graph::data::value::{Object, Word};
 use graph::schema::ApiSchema;
 use graphql_tools::validation::rules::*;
-use graphql_tools::validation::validate::{validate, ValidationPlan};
+use graphql_tools::validation::validate::{ValidationPlan, validate};
 use lazy_static::lazy_static;
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::hash::{Hash, Hasher};
@@ -12,15 +12,15 @@ use std::sync::Arc;
 use std::time::Instant;
 use std::{collections::hash_map::DefaultHasher, convert::TryFrom};
 
-use graph::data::graphql::{ext::TypeExt, ObjectOrInterface};
+use graph::data::graphql::{ObjectOrInterface, ext::TypeExt};
 use graph::data::query::{Query as GraphDataQuery, QueryVariables};
 use graph::data::query::{QueryExecutionError, Trace};
 use graph::prelude::{
-    info, o, q, r, s, warn, BlockNumber, CheapClone, DeploymentHash, EntityRange, GraphQLMetrics,
-    Logger, TryFromValue, ENV_VARS,
+    BlockNumber, CheapClone, DeploymentHash, ENV_VARS, EntityRange, GraphQLMetrics, Logger,
+    TryFromValue, info, o, q, r, s, warn,
 };
-use graph::schema::ast::{self as sast};
 use graph::schema::ErrorPolicy;
+use graph::schema::ast::{self as sast};
 
 use crate::execution::ast as a;
 use crate::execution::get_field;
@@ -224,12 +224,12 @@ impl Query {
             q::OperationDefinition::Subscription(_) => {
                 return Err(vec![QueryExecutionError::NotSupported(
                     "Subscriptions are not supported".to_owned(),
-                )])
+                )]);
             }
             q::OperationDefinition::Mutation(_) => {
                 return Err(vec![QueryExecutionError::NotSupported(
                     "Mutations are not supported".to_owned(),
-                )])
+                )]);
             }
         };
 
@@ -468,13 +468,13 @@ impl<'s> RawQuery<'s> {
         max_depth: u8,
     ) -> Result<u64, Vec<QueryExecutionError>> {
         let complexity = self.complexity(max_depth).map_err(|e| vec![e])?;
-        if let Some(max_complexity) = max_complexity {
-            if complexity > max_complexity {
-                return Err(vec![QueryExecutionError::TooComplex(
-                    complexity,
-                    max_complexity,
-                )]);
-            }
+        if let Some(max_complexity) = max_complexity
+            && complexity > max_complexity
+        {
+            return Err(vec![QueryExecutionError::TooComplex(
+                complexity,
+                max_complexity,
+            )]);
         }
         Ok(complexity)
     }
diff --git a/graphql/src/execution/resolver.rs b/graphql/src/execution/resolver.rs
index 6568b7538f8..7e0609e98d4 100644
--- a/graphql/src/execution/resolver.rs
+++ b/graphql/src/execution/resolver.rs
@@ -4,14 +4,14 @@ use async_trait::async_trait;
 
 use graph::components::store::QueryPermit;
 use graph::data::query::{CacheStatus, Trace};
-use graph::prelude::{s, Error, QueryExecutionError};
+use graph::prelude::{Error, QueryExecutionError, s};
 use graph::schema::ApiSchema;
 use graph::{
     data::graphql::ObjectOrInterface,
-    prelude::{r, QueryResult},
+    prelude::{QueryResult, r},
 };
 
-use crate::execution::{ast as a, ExecutionContext};
+use crate::execution::{ExecutionContext, ast as a};
 
 use super::Query;
 
diff --git a/graphql/src/introspection/resolver.rs b/graphql/src/introspection/resolver.rs
index a44e0294c92..39ead572448 100644
--- a/graphql/src/introspection/resolver.rs
+++ b/graphql/src/introspection/resolver.rs
@@ -4,12 +4,12 @@ use graph::data::graphql::ext::{FieldExt, TypeDefinitionExt};
 use graph::data::query::Trace;
 use std::collections::BTreeMap;
 
-use graph::data::graphql::{object, DocumentExt, ObjectOrInterface};
+use graph::data::graphql::{DocumentExt, ObjectOrInterface, object};
 use graph::prelude::*;
 
 use crate::execution::ast as a;
 use crate::prelude::*;
-use graph::schema::{ast as sast, Schema};
+use graph::schema::{Schema, ast as sast};
 
 type TypeObjectsMap = BTreeMap<String, r::Value>;
 
@@ -34,8 +34,8 @@ fn type_object(schema: &Schema, type_objects: &mut TypeObjectsMap, t: &s::Type)
     match t {
         // We store the name of the named type here to be able to resolve it dynamically later
         s::Type::NamedType(s) => r::Value::String(s.clone()),
-        s::Type::ListType(ref inner) => list_type_object(schema, type_objects, inner),
-        s::Type::NonNullType(ref inner) => non_null_type_object(schema, type_objects, inner),
+        s::Type::ListType(inner) => list_type_object(schema, type_objects, inner),
+        s::Type::NonNullType(inner) => non_null_type_object(schema, type_objects, inner),
     }
 }
 
@@ -300,6 +300,8 @@ fn input_value(
                 .map_or(r::Value::Null, |value| {
                     r::Value::String(format!("{}", value))
                 }),
+        isDeprecated: false,
+        deprecationReason: r::Value::Null,
     }
 }
 
@@ -389,7 +391,7 @@ impl Resolver for IntrospectionResolver {
                         type_names
                             .iter()
                             .filter_map(|type_name| match type_name {
-                                r::Value::String(ref type_name) => Some(type_name),
+                                r::Value::String(type_name) => Some(type_name),
                                 _ => None,
                             })
                             .filter_map(|type_name| self.type_objects.get(type_name).cloned())
diff --git a/graphql/src/lib.rs b/graphql/src/lib.rs
index 03626eb907e..9869d0a5344 100644
--- a/graphql/src/lib.rs
+++ b/graphql/src/lib.rs
@@ -21,9 +21,9 @@ mod metrics;
 
 /// Prelude that exports the most important traits and types.
 pub mod prelude {
-    pub use super::execution::{ast as a, ExecutionContext, Query, Resolver};
+    pub use super::execution::{ExecutionContext, Query, Resolver, ast as a};
     pub use super::introspection::IntrospectionResolver;
-    pub use super::query::{execute_query, ext::BlockConstraint, QueryExecutionOptions};
+    pub use super::query::{QueryExecutionOptions, execute_query, ext::BlockConstraint};
     pub use super::store::StoreResolver;
     pub use super::values::MaybeCoercible;
 
diff --git a/graphql/src/query/ext.rs b/graphql/src/query/ext.rs
index 4abca7a4b6c..c57c35c5392 100644
--- a/graphql/src/query/ext.rs
+++ b/graphql/src/query/ext.rs
@@ -7,7 +7,7 @@ use std::collections::{BTreeMap, HashMap};
 
 use anyhow::anyhow;
 use graph::data::query::QueryExecutionError;
-use graph::prelude::{q, r, BlockNumber, Error};
+use graph::prelude::{BlockNumber, Error, q, r};
 
 pub trait ValueExt: Sized {
     fn as_object(&self) -> &BTreeMap<String, q::Value>;
diff --git a/graphql/src/query/mod.rs b/graphql/src/query/mod.rs
index 641eb4581bb..86244c4cc71 100644
--- a/graphql/src/query/mod.rs
+++ b/graphql/src/query/mod.rs
@@ -29,6 +29,9 @@ pub struct QueryExecutionOptions<R> {
 
     /// Whether to include an execution trace in the result
     pub trace: bool,
+
+    /// The log store to use for querying logs.
+    pub log_store: Arc<dyn graph::components::log_store::LogStore>,
 }
 
 /// Executes a query and returns a result.
@@ -52,6 +55,7 @@ where
         max_skip: options.max_skip,
         cache_status: Default::default(),
         trace: options.trace,
+        log_store: options.log_store,
     });
 
     let selection_set = selection_set
diff --git a/graphql/src/runner.rs b/graphql/src/runner.rs
index 293dcaa111b..dd4b6919500 100644
--- a/graphql/src/runner.rs
+++ b/graphql/src/runner.rs
@@ -9,11 +9,11 @@ use crate::query::execute_query;
 use graph::data::query::{CacheStatus, SqlQueryReq};
 use graph::data::store::SqlQueryObject;
 use graph::futures03::future;
+use graph::prelude::{ApiVersion, MetricsRegistry};
 use graph::prelude::{
-    o, CheapClone, DeploymentState, GraphQLMetrics as GraphQLMetricsTrait,
-    GraphQlRunner as GraphQlRunnerTrait, Logger, Query, QueryExecutionError, ENV_VARS,
+    CheapClone, DeploymentState, ENV_VARS, GraphQLMetrics as GraphQLMetricsTrait,
+    GraphQlRunner as GraphQlRunnerTrait, Logger, Query, QueryExecutionError, o,
 };
-use graph::prelude::{ApiVersion, MetricsRegistry};
 use graph::{data::graphql::load_manager::LoadManager, prelude::QueryStoreManager};
 use graph::{
     data::query::{LatestBlockInfo, QueryResults, QueryTarget},
@@ -26,6 +26,7 @@ pub struct GraphQlRunner<S> {
     store: Arc<S>,
     load_manager: Arc<LoadManager>,
     graphql_metrics: Arc<GraphQLMetrics>,
+    log_store: Arc<dyn graph::components::log_store::LogStore>,
 }
 
 #[cfg(debug_assertions)]
@@ -44,6 +45,7 @@ where
         store: Arc<S>,
         load_manager: Arc<LoadManager>,
         registry: Arc<MetricsRegistry>,
+        log_store: Arc<dyn graph::components::log_store::LogStore>,
     ) -> Self {
         let logger = logger.new(o!("component" => "GraphQlRunner"));
         let graphql_metrics = Arc::new(GraphQLMetrics::new(registry));
@@ -52,6 +54,7 @@ where
             store,
             load_manager,
             graphql_metrics,
+            log_store,
         }
     }
 
@@ -186,6 +189,7 @@ where
                     max_first: max_first.unwrap_or(ENV_VARS.graphql.max_first),
                     max_skip: max_skip.unwrap_or(ENV_VARS.graphql.max_skip),
                     trace: do_trace,
+                    log_store: self.log_store.cheap_clone(),
                 },
             ));
         }
diff --git a/graphql/src/store/logs.rs b/graphql/src/store/logs.rs
new file mode 100644
index 00000000000..57cd4e61ded
--- /dev/null
+++ b/graphql/src/store/logs.rs
@@ -0,0 +1,187 @@
+use graph::components::log_store::LogQuery;
+use graph::prelude::{DeploymentHash, QueryExecutionError, q, r};
+
+use crate::execution::ast as a;
+
+const MAX_FIRST: u32 = 1000;
+const MAX_SKIP: u32 = 10000;
+const MAX_TEXT_LENGTH: usize = 1000;
+
+/// Validate and sanitize text search input to prevent injection attacks
+fn validate_text_input(text: &str) -> Result<(), &'static str> {
+    if text.is_empty() {
+        return Err("search text cannot be empty");
+    }
+
+    if text.len() > MAX_TEXT_LENGTH {
+        return Err("search text exceeds maximum length of 1000 characters");
+    }
+
+    // Reject strings that look like Elasticsearch query DSL to prevent injection
+    if text
+        .chars()
+        .any(|c| matches!(c, '{' | '}' | '[' | ']' | ':' | '"'))
+    {
+        return Err("search text contains invalid characters ({}[]:\")");
+    }
+
+    Ok(())
+}
+
+/// Validate RFC3339 timestamp format
+fn validate_timestamp(timestamp: &str) -> Result<(), &'static str> {
+    if !timestamp.contains('T') {
+        return Err("must be in ISO 8601 format (e.g., 2024-01-15T10:30:00Z)");
+    }
+
+    if !timestamp.ends_with('Z') && !timestamp.contains('+') && !timestamp.contains('-') {
+        return Err("must include timezone (Z or offset like +00:00)");
+    }
+
+    if timestamp.len() > 50 {
+        return Err("timestamp exceeds maximum length");
+    }
+
+    // Check for suspicious characters that could be injection attempts
+    if timestamp
+        .chars()
+        .any(|c| matches!(c, '{' | '}' | ';' | '\'' | '"'))
+    {
+        return Err("timestamp contains invalid characters");
+    }
+
+    Ok(())
+}
+
+pub fn build_log_query(
+    field: &a::Field,
+    subgraph_id: &DeploymentHash,
+) -> Result<LogQuery, QueryExecutionError> {
+    let mut level = None;
+    let mut from = None;
+    let mut to = None;
+    let mut search = None;
+    let mut first = 100;
+    let mut skip = 0;
+    let mut order_direction = graph::components::log_store::OrderDirection::Desc;
+
+    // Parse arguments
+    for (name, value) in &field.arguments {
+        match name.as_str() {
+            "level" => {
+                if let r::Value::Enum(level_str) = value {
+                    level = Some(level_str.parse().map_err(|_| {
+                        QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "level".to_string(),
+                            q::Value::String(format!("Invalid log level: {}", level_str)),
+                        )
+                    })?);
+                }
+            }
+            "from" => {
+                if let r::Value::String(from_str) = value {
+                    validate_timestamp(from_str).map_err(|e| {
+                        QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "from".to_string(),
+                            q::Value::String(format!("Invalid timestamp: {}", e)),
+                        )
+                    })?;
+                    from = Some(from_str.clone());
+                }
+            }
+            "to" => {
+                if let r::Value::String(to_str) = value {
+                    validate_timestamp(to_str).map_err(|e| {
+                        QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "to".to_string(),
+                            q::Value::String(format!("Invalid timestamp: {}", e)),
+                        )
+                    })?;
+                    to = Some(to_str.clone());
+                }
+            }
+            "search" => {
+                if let r::Value::String(search_str) = value {
+                    validate_text_input(search_str).map_err(|e| {
+                        QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "search".to_string(),
+                            q::Value::String(format!("Invalid search text: {}", e)),
+                        )
+                    })?;
+                    search = Some(search_str.clone());
+                }
+            }
+            "first" => {
+                if let r::Value::Int(first_val) = value {
+                    let first_i64 = *first_val;
+                    if first_i64 < 0 {
+                        return Err(QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "first".to_string(),
+                            q::Value::String("first must be non-negative".to_string()),
+                        ));
+                    }
+                    let first_u32 = first_i64 as u32;
+                    if first_u32 > MAX_FIRST {
+                        return Err(QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "first".to_string(),
+                            q::Value::String(format!("first must not exceed {}", MAX_FIRST)),
+                        ));
+                    }
+                    first = first_u32;
+                }
+            }
+            "skip" => {
+                if let r::Value::Int(skip_val) = value {
+                    let skip_i64 = *skip_val;
+                    if skip_i64 < 0 {
+                        return Err(QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "skip".to_string(),
+                            q::Value::String("skip must be non-negative".to_string()),
+                        ));
+                    }
+                    let skip_u32 = skip_i64 as u32;
+                    if skip_u32 > MAX_SKIP {
+                        return Err(QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "skip".to_string(),
+                            q::Value::String(format!("skip must not exceed {}", MAX_SKIP)),
+                        ));
+                    }
+                    skip = skip_u32;
+                }
+            }
+            "orderDirection" => {
+                if let r::Value::Enum(order_str) = value {
+                    order_direction = order_str.parse().map_err(|e: String| {
+                        QueryExecutionError::InvalidArgumentError(
+                            field.position,
+                            "orderDirection".to_string(),
+                            q::Value::String(e),
+                        )
+                    })?;
+                }
+            }
+            _ => {
+                // Unknown argument, ignore
+            }
+        }
+    }
+
+    Ok(LogQuery {
+        subgraph_id: subgraph_id.clone(),
+        level,
+        from,
+        to,
+        search,
+        first,
+        skip,
+        order_direction,
+    })
+}
diff --git a/graphql/src/store/mod.rs b/graphql/src/store/mod.rs
index 6a4850b6a86..8f77a832b90 100644
--- a/graphql/src/store/mod.rs
+++ b/graphql/src/store/mod.rs
@@ -1,3 +1,4 @@
+pub mod logs;
 mod prefetch;
 mod query;
 mod resolver;
diff --git a/graphql/src/store/prefetch.rs b/graphql/src/store/prefetch.rs
index ce5722bfb78..e9a04c8c97b 100644
--- a/graphql/src/store/prefetch.rs
+++ b/graphql/src/store/prefetch.rs
@@ -1,6 +1,7 @@
 //! Run a GraphQL query and fetch all the entitied needed to build the
 //! final result
 
+use graph::components::store::AggregationCurrent;
 use graph::data::graphql::ObjectTypeExt;
 use graph::data::query::Trace;
 use graph::data::store::Id;
@@ -8,8 +9,7 @@ use graph::data::store::IdList;
 use graph::data::store::IdType;
 use graph::data::store::QueryObject;
 use graph::data::value::{Object, Word};
-use graph::prelude::{r, CacheWeight, CheapClone};
-use graph::schema::kw;
+use graph::prelude::{CacheWeight, CheapClone, r};
 use graph::schema::AggregationInterval;
 use graph::schema::Field;
 use graph::slog::warn;
@@ -20,15 +20,16 @@ use std::time::Instant;
 
 use graph::data::graphql::TypeExt;
 use graph::prelude::{
-    AttributeNames, ChildMultiplicity, EntityCollection, EntityFilter, EntityLink, EntityOrder,
-    EntityWindow, ParentLink, QueryExecutionError, Value as StoreValue, WindowAttribute, ENV_VARS,
+    AttributeNames, ChildMultiplicity, ENV_VARS, EntityCollection, EntityFilter, EntityLink,
+    EntityOrder, EntityWindow, ParentLink, QueryExecutionError, Value as StoreValue,
+    WindowAttribute,
 };
 use graph::schema::{EntityType, InputSchema, ObjectOrInterface};
 
 use crate::execution::ast as a;
 use crate::metrics::GraphQLMetrics;
-use crate::store::query::build_query;
 use crate::store::StoreResolver;
+use crate::store::query::build_query;
 
 pub const ARG_ID: &str = "id";
 
@@ -597,11 +598,11 @@ impl<'a> Loader<'a> {
 
         // Process all field groups in order
         for (object_type, fields) in selection_set.interior_fields() {
-            if let Some(deadline) = self.ctx.deadline {
-                if deadline < Instant::now() {
-                    errors.push(QueryExecutionError::Timeout);
-                    break;
-                }
+            if let Some(deadline) = self.ctx.deadline
+                && deadline < Instant::now()
+            {
+                errors.push(QueryExecutionError::Timeout);
+                break;
             }
 
             // Filter out parents that do not match the type condition.
@@ -626,6 +627,7 @@ impl<'a> Loader<'a> {
                 let child_type = input_schema
                     .object_or_interface(field_type.field_type.get_base_type(), child_interval)
                     .expect("we only collect fields that are objects or interfaces");
+                let aggregation_current = field.aggregation_current()?;
 
                 let join = if at_root {
                     MaybeJoin::Root { child_type }
@@ -644,6 +646,7 @@ impl<'a> Loader<'a> {
                     let field_type = object_type
                         .field(&field.name)
                         .expect("field names are valid");
+
                     MaybeJoin::Nested(Join::new(
                         &input_schema,
                         object_type.cheap_clone(),
@@ -652,7 +655,10 @@ impl<'a> Loader<'a> {
                     ))
                 };
 
-                match self.fetch(&parents, &join, field).await {
+                match self
+                    .fetch(&parents, &join, field, aggregation_current)
+                    .await
+                {
                     Ok((children, trace)) => {
                         let exec_fut = Box::pin(self.execute_selection_set(
                             children,
@@ -696,6 +702,7 @@ impl<'a> Loader<'a> {
         parents: &[&mut Node],
         join: &MaybeJoin<'_>,
         field: &a::Field,
+        aggregation_current: Option<AggregationCurrent>,
     ) -> Result<(Vec<Node>, Trace), QueryExecutionError> {
         let input_schema = self.resolver.store.input_schema().await?;
         let child_type = join.child_type();
@@ -715,11 +722,6 @@ impl<'a> Loader<'a> {
             // that causes unnecessary work in the database
             query.order = EntityOrder::Unordered;
         }
-        // Apply default timestamp ordering for aggregations if no custom order is specified
-        if child_type.is_aggregation() && matches!(query.order, EntityOrder::Default) {
-            let ts = child_type.field(kw::TIMESTAMP).unwrap();
-            query.order = EntityOrder::Descending(ts.name.to_string(), ts.value_type);
-        }
         query.logger = Some(self.ctx.logger.cheap_clone());
         if let Some(r::Value::String(id)) = field.argument_value(ARG_ID) {
             query.filter = Some(
@@ -728,6 +730,10 @@ impl<'a> Loader<'a> {
             );
         }
 
+        if child_type.is_aggregation() {
+            query.aggregation_current = Some(aggregation_current.unwrap_or_default());
+        }
+
         if let MaybeJoin::Nested(join) = join {
             // For anything but the root node, restrict the children we select
             // by the parent list
diff --git a/graphql/src/store/query.rs b/graphql/src/store/query.rs
index ce43dee97a9..f893663b258 100644
--- a/graphql/src/store/query.rs
+++ b/graphql/src/store/query.rs
@@ -10,8 +10,9 @@ use graph::data::query::QueryExecutionError;
 use graph::data::store::{Attribute, Value, ValueType};
 use graph::data::value::Object;
 use graph::data::value::Value as DataValue;
-use graph::prelude::{r, TryFromValue, ENV_VARS};
+use graph::prelude::{ENV_VARS, TryFromValue, r};
 use graph::schema::ast::{self as sast, FilterOp};
+use graph::schema::kw;
 use graph::schema::{EntityType, InputSchema, ObjectOrInterface};
 
 use crate::execution::ast as a;
@@ -257,9 +258,7 @@ fn build_filter_from_object(
             let filter_list = column_filters.join(", ");
             let example = format!(
                 "Instead of:\nwhere: {{ {}, or: [...] }}\n\nUse:\nwhere: {{ or: [{{ {}, ... }}, {{ {}, ... }}] }}",
-                filter_list,
-                filter_list,
-                filter_list
+                filter_list, filter_list, filter_list
             );
             return Err(QueryExecutionError::InvalidOrFilterStructure(
                 column_filters,
@@ -552,6 +551,14 @@ fn build_order(
                 }
             }
         }
+        // Apply a default ordering to the aggregations so that the most recent buckets are returned first
+        (None, _) if entity.is_aggregation() => {
+            let ts = entity
+                .field(kw::TIMESTAMP)
+                .expect("aggregation entities have timestamps");
+
+            EntityOrder::Descending(ts.name.to_string(), ts.value_type)
+        }
         (None, _) => EntityOrder::Default,
     };
     Ok(order)
@@ -686,10 +693,9 @@ mod tests {
         data::value::Object,
         prelude::lazy_static,
         prelude::{
-            r,
+            AttributeNames, BLOCK_NUMBER_MAX, DeploymentHash, EntityCollection, EntityFilter,
+            EntityOrder, EntityRange, Value, ValueType, r,
             s::{self, Directive, Field, InputValue, ObjectType, Type, Value as SchemaValue},
-            AttributeNames, DeploymentHash, EntityCollection, EntityFilter, EntityOrder,
-            EntityRange, Value, ValueType, BLOCK_NUMBER_MAX,
         },
         schema::{EntityType, InputSchema},
     };
@@ -1209,7 +1215,9 @@ mod tests {
                 assert!(example.contains("Instead of:"));
                 assert!(example.contains("where: { 'name_gt', or: [...] }"));
                 assert!(example.contains("Use:"));
-                assert!(example.contains("where: { or: [{ 'name_gt', ... }, { 'name_gt', ... }] }"));
+                assert!(
+                    example.contains("where: { or: [{ 'name_gt', ... }, { 'name_gt', ... }] }")
+                );
             }
             _ => panic!("Expected InvalidOrFilterStructure error, got: {}", error),
         }
@@ -1238,7 +1246,9 @@ mod tests {
         assert!(error_msg.contains("Instead of:"));
         assert!(error_msg.contains("Use:"));
         assert!(error_msg.contains("where: { 'age_gt', 'name', or: [...] }"));
-        assert!(error_msg
-            .contains("where: { or: [{ 'age_gt', 'name', ... }, { 'age_gt', 'name', ... }] }"));
+        assert!(
+            error_msg
+                .contains("where: { or: [{ 'age_gt', 'name', ... }, { 'age_gt', 'name', ... }] }")
+        );
     }
 }
diff --git a/graphql/src/store/resolver.rs b/graphql/src/store/resolver.rs
index 779a9766fe7..1cfe64c4cbc 100644
--- a/graphql/src/store/resolver.rs
+++ b/graphql/src/store/resolver.rs
@@ -5,20 +5,20 @@ use async_trait::async_trait;
 use graph::components::graphql::GraphQLMetrics as _;
 use graph::components::store::QueryPermit;
 use graph::data::graphql::load_manager::LoadManager;
-use graph::data::graphql::{object, ObjectOrInterface};
+use graph::data::graphql::{ObjectOrInterface, object};
 use graph::data::query::{CacheStatus, QueryResults, Trace};
 use graph::data::store::ID;
 use graph::data::value::{Object, Word};
 use graph::derive::CheapClone;
 use graph::prelude::alloy::primitives::B256;
 use graph::prelude::*;
+use graph::schema::{BLOCK_FIELD_TYPE, ErrorPolicy};
 use graph::schema::{
-    ast as sast, INTROSPECTION_SCHEMA_FIELD_NAME, INTROSPECTION_TYPE_FIELD_NAME, META_FIELD_NAME,
-    META_FIELD_TYPE,
+    INTROSPECTION_SCHEMA_FIELD_NAME, INTROSPECTION_TYPE_FIELD_NAME, LOGS_FIELD_NAME,
+    META_FIELD_NAME, META_FIELD_TYPE, ast as sast,
 };
-use graph::schema::{ErrorPolicy, BLOCK_FIELD_TYPE};
 
-use crate::execution::{ast as a, Query};
+use crate::execution::{Query, ast as a};
 use crate::metrics::GraphQLMetrics;
 use crate::prelude::{ExecutionContext, Resolver};
 use crate::query::ext::BlockConstraint;
@@ -329,8 +329,11 @@ impl Resolver for StoreResolver {
                         let child1_id = child_id(&children[1]);
                         QueryExecutionError::InternalError(format!(
                             "expected only one child for {}.{} but got {}. One child has id {}, another has id {}",
-                            object_type.name(), field.name,
-                            children.len(), child0_id, child1_id
+                            object_type.name(),
+                            field.name,
+                            children.len(),
+                            child0_id,
+                            child1_id
                         ))
                     }
                 };
@@ -354,6 +357,23 @@ impl Resolver for StoreResolver {
             return Ok(());
         }
 
+        // Check if the query only contains debugging fields (_meta, _logs).
+        // If so, don't add indexing errors - these queries are specifically for debugging
+        // failed subgraphs and should work without errors.
+        // Introspection queries (__schema, __type) still get the indexing_error to inform
+        // users the subgraph has issues, but they return data.
+        let only_debugging_fields = result
+            .data()
+            .map(|data| {
+                data.iter()
+                    .all(|(key, _)| key == META_FIELD_NAME || key == LOGS_FIELD_NAME)
+            })
+            .unwrap_or(false);
+
+        if only_debugging_fields {
+            return Ok(());
+        }
+
         // Add the "indexing_error" to the response.
         assert!(result.errors_mut().is_empty());
         *result.errors_mut() = vec![QueryError::IndexingError];
@@ -365,9 +385,10 @@ impl Resolver for StoreResolver {
             ErrorPolicy::Deny => {
                 let mut data = result.take_data();
 
-                // Only keep the _meta, __schema and __type fields from the data
+                // Only keep the _meta, _logs, __schema and __type fields from the data
                 let meta_fields = data.as_mut().and_then(|d| {
                     let meta_field = d.remove(META_FIELD_NAME);
+                    let logs_field = d.remove(LOGS_FIELD_NAME);
                     let schema_field = d.remove(INTROSPECTION_SCHEMA_FIELD_NAME);
                     let type_field = d.remove(INTROSPECTION_TYPE_FIELD_NAME);
 
@@ -377,6 +398,9 @@ impl Resolver for StoreResolver {
                     if let Some(meta_field) = meta_field {
                         meta_fields.push((Word::from(META_FIELD_NAME), meta_field));
                     }
+                    if let Some(logs_field) = logs_field {
+                        meta_fields.push((Word::from(LOGS_FIELD_NAME), logs_field));
+                    }
                     if let Some(schema_field) = schema_field {
                         meta_fields
                             .push((Word::from(INTROSPECTION_SCHEMA_FIELD_NAME), schema_field));
diff --git a/graphql/src/values/coercion.rs b/graphql/src/values/coercion.rs
index 9d85059b33c..bd0bacbf677 100644
--- a/graphql/src/values/coercion.rs
+++ b/graphql/src/values/coercion.rs
@@ -1,6 +1,6 @@
 use graph::data::store::scalar::Timestamp;
 use graph::prelude::s::{EnumType, InputValue, ScalarType, Type, TypeDefinition};
-use graph::prelude::{q, r, QueryExecutionError};
+use graph::prelude::{QueryExecutionError, q, r};
 use graph::schema;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
diff --git a/justfile b/justfile
index 8fe5b44150d..a05ef141078 100644
--- a/justfile
+++ b/justfile
@@ -22,6 +22,10 @@ check-all:
 build *EXTRA_FLAGS:
     cargo build --bin graph-node {{EXTRA_FLAGS}}
 
+# Build both graph-node and gnd binaries
+build-all *EXTRA_FLAGS:
+    cargo build --bin graph-node --bin gnd {{EXTRA_FLAGS}}
+
 _cargo-test *ARGS:
     #!/usr/bin/env bash
     set -e # Exit on error
@@ -48,7 +52,53 @@ test-runner *EXTRA_FLAGS:
 
 # Run integration tests
 test-integration *EXTRA_FLAGS:
-    @just _cargo-test {{EXTRA_FLAGS}} --package graph-tests --test integration_tests -- --nocapture
+    #!/usr/bin/env bash
+    set -e # Exit on error
+
+    # Build graph-node and gnd binaries
+    cargo build --bin graph-node --bin gnd
+
+    just _cargo-test {{EXTRA_FLAGS}} --package graph-tests --test integration_tests -- --nocapture
+
+# Run gnd CLI integration tests (deployment workflow with gnd as CLI)
+# Prerequisites: nix run .#integration (PostgreSQL:3011, IPFS:3001, Anvil:3021)
+test-gnd-cli *EXTRA_FLAGS:
+    #!/usr/bin/env bash
+    set -e # Exit on error
+
+    # Build graph-node and gnd binaries
+    cargo build --bin graph-node --bin gnd
+
+    # Set GRAPH_CLI to use gnd binary
+    export GRAPH_CLI="../target/debug/gnd"
+
+    echo "Running gnd CLI integration tests with GRAPH_CLI=$GRAPH_CLI"
+
+    cargo test {{EXTRA_FLAGS}} --package graph-tests --test gnd_cli_tests -- --nocapture
+
+# Run gnd standalone command tests (init, add, build - no Graph Node required)
+test-gnd-commands *EXTRA_FLAGS:
+    #!/usr/bin/env bash
+    set -e # Exit on error
+
+    # Build gnd binary
+    cargo build --bin gnd
+
+    echo "Running gnd standalone command tests"
+
+    cargo test {{EXTRA_FLAGS}} --package gnd --test cli_commands -- --nocapture
+
+# Run gnd test runner tests (requires asc in PATH, uses pgtemp for PostgreSQL)
+test-gnd-test *EXTRA_FLAGS:
+    #!/usr/bin/env bash
+    set -e # Exit on error
+
+    # Build gnd binary
+    cargo build --bin gnd
+
+    echo "Running gnd test runner tests"
+
+    cargo test {{EXTRA_FLAGS}} --package gnd --test gnd_test -- --nocapture
 
 # Clean workspace (cargo clean)
 clean:
diff --git a/nix/anvil.nix b/nix/anvil.nix
index 6feae9ab88f..0c4925b6512 100644
--- a/nix/anvil.nix
+++ b/nix/anvil.nix
@@ -36,18 +36,62 @@
     };
 
     blockTime = lib.mkOption {
-      type = lib.types.int;
-      default = 2;
-      description = "Block time for the genesis block";
+      type = lib.types.nullOr lib.types.int;
+      default = null;
+      description = "Block time in seconds. Null means instant mining.";
+    };
+
+    state = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+      description = "Path to state file (loads on start, saves on exit)";
+    };
+
+    stateInterval = lib.mkOption {
+      type = lib.types.nullOr lib.types.int;
+      default = null;
+      description = "Interval in seconds to dump state to disk. Useful when graceful shutdown isn't guaranteed.";
+    };
+
+    preserveHistoricalStates = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Preserve historical state snapshots when dumping. Enables RPC calls for older blocks after state reload.";
     };
   };
 
   config = {
     outputs.settings.processes.${name} = {
-      command = "${lib.getExe' config.package "anvil"} --gas-limit ${toString config.gasLimit} --base-fee ${toString config.baseFee} --block-time ${toString config.blockTime} --timestamp ${toString config.timestamp} --port ${toString config.port}";
+      command = let
+        stateDir =
+          if config.state != null
+          then builtins.dirOf config.state
+          else null;
+        mkdirCmd =
+          if stateDir != null
+          then "mkdir -p ${stateDir} && "
+          else "";
+      in
+        mkdirCmd
+        + builtins.concatStringsSep " " (lib.filter (s: s != "") [
+          "${lib.getExe' config.package "anvil"}"
+          "--gas-limit ${toString config.gasLimit}"
+          "--base-fee ${toString config.baseFee}"
+          "--timestamp ${toString config.timestamp}"
+          "--port ${toString config.port}"
+          (lib.optionalString (config.blockTime != null) "--block-time ${toString config.blockTime}")
+          (lib.optionalString (config.state != null) "--state ${config.state}")
+          (lib.optionalString (config.stateInterval != null) "--state-interval ${toString config.stateInterval}")
+          (lib.optionalString config.preserveHistoricalStates "--preserve-historical-states")
+        ]);
 
       availability = {
-        restart = "always";
+        restart = "on_failure";
+      };
+
+      shutdown = {
+        command = "kill -TERM $${PROCESS_PID}";
+        timeout_seconds = 10;
       };
 
       readiness_probe = {
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 6c87324031d..b08fae8e53e 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -14,12 +14,12 @@ path = "src/bin/manager.rs"
 
 [dependencies]
 anyhow = { workspace = true }
-env_logger = "0.11.8"
+env_logger = { workspace = true }
 clap.workspace = true
-git-testament = "0.2"
+git-testament = { workspace = true }
 itertools = { workspace = true }
-lazy_static = "1.5.0"
-url = "2.5.8"
+lazy_static = { workspace = true }
+url = { workspace = true }
 graph = { path = "../graph" }
 graph-core = { path = "../core" }
 graph-chain-ethereum = { path = "../chain/ethereum" }
@@ -33,13 +33,15 @@ graph-store-postgres = { path = "../store/postgres" }
 graphman-server = { workspace = true }
 graphman = { workspace = true }
 serde = { workspace = true }
-shellexpand = "3.1.1"
+shellexpand = "3.1.2"
 termcolor = "1.4.1"
 tokio = { workspace = true }
 diesel = { workspace = true }
 diesel-async = { workspace = true }
 prometheus = { version = "0.14.0", features = ["push"] }
 json-structural-diff = { version = "0.2", features = ["colorize"] }
+indicatif = { workspace = true }
+console = { workspace = true }
 
 # Dependencies related to Amp subgraphs
 tokio-util.workspace = true
diff --git a/node/resources/tests/full_config.toml b/node/resources/tests/full_config.toml
index 057e774d93e..6292770a087 100644
--- a/node/resources/tests/full_config.toml
+++ b/node/resources/tests/full_config.toml
@@ -45,14 +45,26 @@ ingestor = "index_0"
 
 [chains.mainnet]
 shard = "primary"
+amp = "ethereum-mainnet"
 provider = [
   { label = "mainnet-0", url = "http://rpc.mainnet.io", features = ["archive", "traces"] },
   { label = "mainnet-1", details = { type = "web3call", url = "http://rpc.mainnet.io", features = ["archive", "traces"] }},
+  { label = "mainnet-2", details = { type = "web3", url = "http://rpc.mainnet.io", features = ["archive", "compression/gzip"] }},
   { label = "firehose", details = { type = "firehose", url = "http://localhost:9000", features = [] }},
 ]
 
 [chains.ropsten]
 shard = "primary"
+json_rpc_timeout = 60
+request_retries = 5
+max_block_range_size = 500
+block_batch_size = 5
+block_ptr_batch_size = 10
+max_event_only_range = 200
+target_triggers_per_block_range = 50
+get_logs_max_contracts = 1000
+block_ingestor_max_concurrent_json_rpc_calls = 500
+genesis_block_number = 0
 provider = [
   { label = "ropsten-0", url = "http://rpc.ropsten.io", transport = "rpc", features = ["archive", "traces"] }
 ]
@@ -68,3 +80,8 @@ shard = "primary"
 provider = [
   { label = "kovan-0", url = "http://rpc.kovan.io", transport = "ws", features = [] }
 ]
+
+[log_store]
+backend = "file"
+directory = "/var/log/graph-node/subgraph-logs"
+retention_hours = 72
diff --git a/node/src/bin/manager.rs b/node/src/bin/manager.rs
index 8894f18ff56..1053c90e300 100644
--- a/node/src/bin/manager.rs
+++ b/node/src/bin/manager.rs
@@ -8,12 +8,13 @@ use graph::components::network_provider::ChainName;
 use graph::endpoint::EndpointMetrics;
 use graph::env::ENV_VARS;
 use graph::log::logger_with_levels;
-use graph::prelude::{BlockNumber, MetricsRegistry, BLOCK_NUMBER_MAX};
+use graph::prelude::{BLOCK_NUMBER_MAX, BlockNumber, MetricsRegistry};
 use graph::{data::graphql::load_manager::LoadManager, prelude::chrono, prometheus::Registry};
 use graph::{
     prelude::{
-        anyhow::{self, anyhow, Context as AnyhowContextTrait},
-        info, tokio, Logger, NodeId,
+        Logger, NodeId,
+        anyhow::{self, Context as AnyhowContextTrait, anyhow},
+        info, tokio,
     },
     url::Url,
 };
@@ -24,11 +25,11 @@ use graph_node::manager::color::Terminal;
 use graph_node::manager::commands;
 use graph_node::network_setup::Networks;
 use graph_node::{
-    manager::deployment::DeploymentSearch, store_builder::StoreBuilder, MetricsContext,
+    MetricsContext, manager::deployment::DeploymentSearch, store_builder::StoreBuilder,
 };
 use graph_store_postgres::{
-    BlockStore, ChainStore, ConnectionPool, NotificationSender, PoolCoordinator, Shard, Store,
-    SubgraphStore, SubscriptionManager, PRIMARY_SHARD,
+    BlockStore, ChainStore, ConnectionPool, NotificationSender, PRIMARY_SHARD, PoolCoordinator,
+    Shard, Store, SubgraphStore, SubscriptionManager,
 };
 use itertools::Itertools;
 use lazy_static::lazy_static;
@@ -165,7 +166,7 @@ pub enum Command {
     /// Remove a named subgraph
     Remove {
         /// The name of the subgraph to remove
-        name: DeploymentSearch,
+        name: String,
     },
     /// Create a subgraph name
     Create {
@@ -327,6 +328,51 @@ pub enum Command {
         #[clap(long, short, default_value = "http://localhost:8020")]
         url: String,
     },
+
+    /// Dump a subgraph deployment into a directory
+    ///
+    /// EXPERIMENTAL - NOT FOR PRODUCTION USE
+    ///
+    /// This will create a dump of the subgraph deployment in the specified
+    /// directory. The dump includes the subgraph manifest, the mapping, and
+    /// the data in the database as parquet files. The dump can be used to
+    /// restore the subgraph deployment later with the `restore` command.
+    Dump {
+        /// The deployment (see `help info`)
+        deployment: DeploymentSearch,
+        /// The name of the directory to dump to
+        directory: String,
+    },
+
+    /// Restore a subgraph deployment from a dump directory
+    ///
+    /// EXPERIMENTAL - NOT FOR PRODUCTION USE
+    ///
+    /// Restore a subgraph deployment from a dump created with the `dump`
+    /// command.
+    Restore {
+        /// Path to the dump directory
+        directory: String,
+        /// The database shard to restore into. When not given, use the
+        /// deployment rules to determine the shard, or default to the
+        /// primary shard if no rules match. This option is required when
+        /// using `--add`
+        #[clap(long)]
+        shard: Option<String>,
+        /// Subgraph name for deployment rule matching and node assignment.
+        /// If omitted, uses an existing name from the database; errors if none found.
+        #[clap(long)]
+        name: Option<String>,
+        /// Drop and recreate if the deployment already exists in the target shard
+        #[clap(long, conflicts_with_all = ["add", "force"])]
+        replace: bool,
+        /// Create a copy in a shard that doesn't have this deployment (requires --shard)
+        #[clap(long, conflicts_with_all = ["replace", "force"])]
+        add: bool,
+        /// Restore no matter what: replace if exists in target shard, add if not
+        #[clap(long, conflicts_with_all = ["replace", "add"])]
+        force: bool,
+    },
 }
 
 impl Command {
@@ -574,11 +620,12 @@ pub enum CallCacheCommand {
         #[clap(long, conflicts_with_all = &["from", "to"])]
         remove_entire_cache: bool,
         /// Remove the cache for contracts that have not been accessed in the last <TTL_DAYS> days
-        #[clap(long, conflicts_with_all = &["from", "to", "remove-entire-cache"], value_parser = clap::value_parser!(i32).range(1..))]
-        ttl_days: Option<i32>,
-        /// Limits the number of contracts to consider for cache removal when using --ttl_days
-        #[clap(long, conflicts_with_all = &["remove-entire-cache", "to", "from"], requires = "ttl_days", value_parser = clap::value_parser!(i64).range(1..))]
-        ttl_max_contracts: Option<i64>,
+        #[clap(long, conflicts_with_all = &["from", "to", "remove-entire-cache"], value_parser = clap::value_parser!(u32).range(1..))]
+        ttl_days: Option<u32>,
+        /// Maximum number of contracts to evict. When set, the effective TTL
+        /// is increased so that at most this many contracts are deleted.
+        #[clap(long, requires = "ttl_days")]
+        max_contracts: Option<usize>,
         /// Starting block number
         #[clap(long, short, conflicts_with = "remove-entire-cache", requires = "to")]
         from: Option<i32>,
@@ -1033,7 +1080,13 @@ impl Context {
 
         let load_manager = Arc::new(LoadManager::new(&logger, vec![], vec![], registry.clone()));
 
-        Arc::new(GraphQlRunner::new(&logger, store, load_manager, registry))
+        Arc::new(GraphQlRunner::new(
+            &logger,
+            store,
+            load_manager,
+            registry,
+            Arc::new(graph::components::log_store::NoOpLogStore),
+        ))
     }
 
     async fn networks(&self) -> anyhow::Result<Networks> {
@@ -1086,8 +1139,11 @@ impl Context {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
+    graph::tls::install_default_crypto_provider();
     // Disable load management for graphman commands
-    env::set_var("GRAPH_LOAD_THRESHOLD", "0");
+    unsafe {
+        env::set_var("GRAPH_LOAD_THRESHOLD", "0");
+    }
 
     let opt = Opt::parse();
 
@@ -1105,11 +1161,6 @@ async fn main() -> anyhow::Result<()> {
     );
 
     let mut config = Cfg::load(&logger, &opt.clone().into()).context("Configuration error")?;
-    config.stores.iter_mut().for_each(|(_, shard)| {
-        shard.pool_size = PoolSize::Fixed(5);
-        shard.fdw_pool_size = PoolSize::Fixed(5);
-    });
-
     if opt.pool_size > 0 && !opt.cmd.use_configured_pool_size() {
         // Override pool size from configuration
         for shard in config.stores.values_mut() {
@@ -1458,8 +1509,8 @@ async fn main() -> anyhow::Result<()> {
                 }
 
                 CheckBlocks { method, chain_name } => {
-                    use commands::check_blocks::{by_hash, by_number, by_range};
                     use CheckBlockMethod::*;
+                    use commands::check_blocks::{by_hash, by_number, by_range};
                     let logger = ctx.logger.clone();
                     let (chain_store, ethereum_adapter) =
                         ctx.chain_store_and_adapter(&chain_name).await?;
@@ -1509,20 +1560,22 @@ async fn main() -> anyhow::Result<()> {
                             to,
                             remove_entire_cache,
                             ttl_days,
-                            ttl_max_contracts,
+                            max_contracts,
                         } => {
                             let chain_store = ctx.chain_store(&chain_name).await?;
                             if let Some(ttl_days) = ttl_days {
                                 return commands::chain::clear_stale_call_cache(
                                     chain_store,
-                                    ttl_days,
-                                    ttl_max_contracts,
+                                    ttl_days as usize,
+                                    max_contracts,
                                 )
                                 .await;
                             }
 
                             if !remove_entire_cache && from.is_none() && to.is_none() {
-                                bail!("you must specify either --from and --to or --remove-entire-cache");
+                                bail!(
+                                    "you must specify either --from and --to or --remove-entire-cache"
+                                );
                             }
                             let (from, to) = if remove_entire_cache {
                                 (0, BLOCK_NUMBER_MAX)
@@ -1732,6 +1785,31 @@ async fn main() -> anyhow::Result<()> {
 
             commands::deploy::run(subgraph_store, deployment, name, url).await
         }
+
+        Dump {
+            deployment,
+            directory,
+        } => {
+            let (store, primary_pool) = ctx.store_and_primary().await;
+            let subgraph_store = store.subgraph_store();
+
+            commands::dump::run(subgraph_store, primary_pool, deployment, directory).await
+        }
+
+        Restore {
+            directory,
+            shard,
+            name,
+            replace,
+            add,
+            force,
+        } => {
+            let store = ctx.store().await;
+            let subgraph_store = store.subgraph_store();
+
+            commands::restore::run(subgraph_store, directory, shard, name, replace, add, force)
+                .await
+        }
     }
 }
 
@@ -1745,7 +1823,7 @@ fn make_deployment_selector(
     use graphman::deployment::DeploymentSelector::*;
 
     match deployment {
-        DeploymentSearch::Name { name } => Name(name.to_string()),
+        DeploymentSearch::Name { name } => Name(name),
         DeploymentSearch::Hash { hash, shard } => Subgraph { hash, shard },
         DeploymentSearch::All => All,
         DeploymentSearch::Deployment { namespace } => Schema(namespace),
diff --git a/node/src/chain.rs b/node/src/chain.rs
index b1f2b0709cb..824cbf5faeb 100644
--- a/node/src/chain.rs
+++ b/node/src/chain.rs
@@ -1,13 +1,14 @@
-use crate::config::{Config, ProviderDetails};
+use crate::config::{ChainSettings as ConfigChainSettings, Config, ProviderDetails};
 use crate::network_setup::{
     AdapterConfiguration, EthAdapterConfig, FirehoseAdapterConfig, Networks,
 };
+use ethereum::ProviderEthRpcMetrics;
+use ethereum::chain::ChainSettings;
 use ethereum::chain::{
     EthereumAdapterSelector, EthereumBlockRefetcher, EthereumRuntimeAdapterBuilder,
     EthereumStreamBuilder,
 };
 use ethereum::network::EthereumNetworkAdapter;
-use ethereum::ProviderEthRpcMetrics;
 use graph::anyhow::bail;
 use graph::blockchain::client::ChainClient;
 use graph::blockchain::{BlockchainKind, BlockchainMap, ChainIdentifier};
@@ -15,14 +16,14 @@ use graph::cheap_clone::CheapClone;
 use graph::components::network_provider::ChainName;
 use graph::components::store::BlockStore as _;
 use graph::endpoint::EndpointMetrics;
-use graph::env::{EnvVars, ENV_VARS};
+use graph::env::{ENV_VARS, EnvVars};
 use graph::firehose::FirehoseEndpoint;
 use graph::futures03::future::try_join_all;
 use graph::itertools::Itertools;
 use graph::log::factory::LoggerFactory;
-use graph::prelude::anyhow;
 use graph::prelude::MetricsRegistry;
-use graph::slog::{debug, info, o, warn, Logger};
+use graph::prelude::anyhow;
+use graph::slog::{Logger, debug, info, o, warn};
 use graph::url::Url;
 use graph_chain_ethereum::{self as ethereum, Transport};
 use graph_store_postgres::{BlockStore, ChainHeadUpdateListener};
@@ -146,6 +147,37 @@ pub fn create_firehose_networks(
         .collect()
 }
 
+impl From<ConfigChainSettings> for ChainSettings {
+    fn from(c: ConfigChainSettings) -> Self {
+        let ConfigChainSettings {
+            polling_interval,
+            json_rpc_timeout,
+            request_retries,
+            max_block_range_size,
+            block_batch_size,
+            block_ptr_batch_size,
+            max_event_only_range,
+            target_triggers_per_block_range,
+            get_logs_max_contracts,
+            block_ingestor_max_concurrent_json_rpc_calls,
+            genesis_block_number,
+        } = c;
+        ChainSettings {
+            polling_interval,
+            json_rpc_timeout,
+            request_retries,
+            max_block_range_size,
+            block_batch_size,
+            block_ptr_batch_size,
+            max_event_only_range,
+            target_triggers_per_block_range,
+            get_logs_max_contracts,
+            block_ingestor_max_concurrent_json_rpc_calls,
+            genesis_block_number,
+        }
+    }
+}
+
 /// Parses all Ethereum connection strings and returns their network names and
 /// `EthereumAdapter`.
 pub async fn create_ethereum_networks(
@@ -188,6 +220,7 @@ pub async fn create_ethereum_networks_for_chain(
         .chains
         .get(network_name)
         .ok_or_else(|| anyhow!("unknown network {}", network_name))?;
+    let settings = Arc::new(ChainSettings::from(chain.settings.clone()));
     let mut adapters = vec![];
     let mut call_only_adapters = vec![];
 
@@ -206,21 +239,26 @@ pub async fn create_ethereum_networks_for_chain(
         }
 
         let logger = logger.new(o!("provider" => provider.label.clone()));
+        let compression = web3.compression();
         info!(
             logger,
             "Creating transport";
             "url" => &web3.url,
-            "capabilities" => capabilities
+            "capabilities" => capabilities,
+            "compression" => compression.to_string()
         );
 
         use crate::config::Transport::*;
 
+        let no_eip2718 = web3.features.contains("no_eip2718");
         let transport = match web3.transport {
             Rpc => Transport::new_rpc(
                 Url::parse(&web3.url)?,
                 web3.headers.clone(),
                 endpoint_metrics.cheap_clone(),
                 &provider.label,
+                no_eip2718,
+                compression,
             ),
             Ipc => Transport::new_ipc(&web3.url).await,
             Ws => Transport::new_ws(&web3.url).await,
@@ -238,6 +276,7 @@ pub async fn create_ethereum_networks_for_chain(
                     eth_rpc_metrics.clone(),
                     supports_eip_1898,
                     call_only,
+                    settings.clone(),
                 )
                 .await,
             ),
@@ -264,7 +303,7 @@ pub async fn create_ethereum_networks_for_chain(
         chain_id: network_name.into(),
         adapters,
         call_only: call_only_adapters,
-        polling_interval: Some(chain.polling_interval),
+        settings,
     }))
 }
 
@@ -317,7 +356,12 @@ pub async fn networks_as_chains(
                 {
                     Ok(Ok(ident)) => ident,
                     err => {
-                        warn!(&logger, "unable to fetch genesis for {}. Err: {:?}.falling back to the default value", chain_id, err);
+                        warn!(
+                            &logger,
+                            "unable to fetch genesis for {}. Err: {:?}.falling back to the default value",
+                            chain_id,
+                            err
+                        );
                         ChainIdentifier::default()
                     }
                 };
@@ -330,12 +374,12 @@ pub async fn networks_as_chains(
 
         match kind {
             BlockchainKind::Ethereum => {
-                // polling interval is set per chain so if set all adapter configuration will have
-                // the same value.
-                let polling_interval = adapters
-                    .first()
-                    .and_then(|a| a.as_rpc().and_then(|a| a.polling_interval))
-                    .unwrap_or(config.ingestor_polling_interval);
+                // settings come from the first RPC adapter config; falls back to ENV_VAR
+                // defaults for firehose-only chains.
+                let settings = adapters
+                    .iter()
+                    .find_map(|a| a.as_rpc().map(|r| r.settings.clone()))
+                    .unwrap_or_else(|| Arc::new(ChainSettings::from_env_defaults()));
 
                 let firehose_endpoints = networks.firehose_endpoints(chain_id.clone());
                 let eth_adapters = networks.ethereum_rpcs(chain_id.clone());
@@ -372,8 +416,8 @@ pub async fn networks_as_chains(
                     Arc::new(EthereumRuntimeAdapterBuilder {}),
                     eth_adapters,
                     ENV_VARS.reorg_threshold(),
-                    polling_interval,
                     true,
+                    settings,
                 );
 
                 blockchain_map
diff --git a/node/src/config.rs b/node/src/config.rs
index b118f34da57..4c9b776e43a 100644
--- a/node/src/config.rs
+++ b/node/src/config.rs
@@ -1,29 +1,33 @@
 use graph::{
     anyhow::Error,
     blockchain::BlockchainKind,
-    components::network_provider::ChainName,
+    components::{
+        network_provider::{AmpChainNames, ChainName},
+        store::BLOCK_CACHE_SIZE,
+    },
     env::ENV_VARS,
-    firehose::{SubgraphLimit, SUBGRAPHS_PER_CONN},
+    firehose::{SUBGRAPHS_PER_CONN, SubgraphLimit},
     itertools::Itertools,
     prelude::{
-        anyhow::{anyhow, bail, Context, Result},
+        BLOCK_NUMBER_MAX, Logger, NodeId, StoreError,
+        anyhow::{Context, Result, anyhow, bail},
         info,
         regex::Regex,
         serde::{
-            de::{self, value, SeqAccess, Visitor},
             Deserialize, Deserializer,
+            de::{self, SeqAccess, Visitor, value},
         },
-        serde_json, serde_regex, toml, Logger, NodeId, StoreError,
+        serde_json, serde_regex, toml,
     },
 };
 use graph_chain_ethereum as ethereum;
-use graph_chain_ethereum::NodeCapabilities;
-use graph_store_postgres::{DeploymentPlacer, Shard as ShardName, PRIMARY_SHARD};
+use graph_chain_ethereum::{Compression, NodeCapabilities};
+use graph_store_postgres::{DeploymentPlacer, PRIMARY_SHARD, Shard as ShardName};
 
 use graph::http::{HeaderMap, Uri};
 use serde::Serialize;
 use std::{
-    collections::{BTreeMap, BTreeSet},
+    collections::{BTreeMap, BTreeSet, HashMap},
     fmt,
 };
 use std::{fs::read_to_string, time::Duration};
@@ -72,11 +76,14 @@ impl Default for Opt {
 pub struct Config {
     #[serde(skip, default = "default_node_id")]
     pub node: NodeId,
+    #[serde(skip)]
+    pub disable_block_ingestor: bool,
     pub general: Option<GeneralSection>,
     #[serde(rename = "store")]
     pub stores: BTreeMap<String, Shard>,
     pub chains: ChainSection,
     pub deployment: Deployment,
+    pub log_store: Option<LogStoreSection>,
 }
 
 fn validate_name(s: &str) -> Result<()> {
@@ -104,6 +111,15 @@ fn validate_name(s: &str) -> Result<()> {
 }
 
 impl Config {
+    /// Returns `true` if this node should run block ingestion.
+    ///
+    /// Block ingestion runs when the `--disable-block-ingestor` kill switch
+    /// is **not** set and this node's id matches the `ingestor` value from
+    /// the `[chains]` config section.
+    pub fn is_block_ingestor(&self) -> bool {
+        !self.disable_block_ingestor && self.chains.ingestor == self.node.to_string()
+    }
+
     pub fn chain_ids(&self) -> Vec<ChainName> {
         self.chains
             .chains
@@ -112,6 +128,24 @@ impl Config {
             .collect()
     }
 
+    /// Build an `AmpChainNames` mapping from the config. Chains with an
+    /// explicit `amp` name map that name to the chain name; chains without
+    /// use identity mapping.
+    pub fn amp_chain_names(&self) -> AmpChainNames {
+        let mapping: HashMap<ChainName, ChainName> = self
+            .chains
+            .chains
+            .iter()
+            .map(|(chain_name, chain)| {
+                let amp_name: ChainName =
+                    chain.amp.as_deref().unwrap_or(chain_name.as_str()).into();
+                let internal_name: ChainName = chain_name.as_str().into();
+                (amp_name, internal_name)
+            })
+            .collect();
+        AmpChainNames::new(mapping)
+    }
+
     /// Check that the config is valid.
     fn validate(&mut self) -> Result<()> {
         if !self.stores.contains_key(PRIMARY_SHARD.as_str()) {
@@ -124,7 +158,7 @@ impl Config {
             ));
         }
         for (key, shard) in self.stores.iter_mut() {
-            shard.validate(key)?;
+            shard.validate(key, &self.node)?;
         }
         self.deployment.validate()?;
 
@@ -164,7 +198,7 @@ impl Config {
     /// a config from the command line arguments in `opt`
     pub fn load(logger: &Logger, opt: &Opt) -> Result<Config> {
         if let Some(config) = &opt.config {
-            Self::from_file(logger, config, &opt.node_id)
+            Self::from_file(logger, config, opt)
         } else {
             info!(
                 logger,
@@ -174,14 +208,16 @@ impl Config {
         }
     }
 
-    pub fn from_file(logger: &Logger, path: &str, node: &str) -> Result<Config> {
+    pub fn from_file(logger: &Logger, path: &str, opt: &Opt) -> Result<Config> {
         info!(logger, "Reading configuration file `{}`", path);
-        Self::from_str(&read_to_string(path)?, node)
+        Self::from_str(&read_to_string(path)?, opt)
     }
 
-    pub fn from_str(config: &str, node: &str) -> Result<Config> {
+    pub fn from_str(config: &str, opt: &Opt) -> Result<Config> {
         let mut config: Config = toml::from_str(config)?;
-        config.node = NodeId::new(node).map_err(|node| anyhow!("invalid node id {}", node))?;
+        config.node =
+            NodeId::new(&opt.node_id).map_err(|node| anyhow!("invalid node id {}", node))?;
+        config.disable_block_ingestor = opt.disable_block_ingestor;
         config.validate()?;
         Ok(config)
     }
@@ -195,10 +231,12 @@ impl Config {
         stores.insert(PRIMARY_SHARD.to_string(), Shard::from_opt(true, opt)?);
         Ok(Config {
             node,
+            disable_block_ingestor: opt.disable_block_ingestor,
             general: None,
             stores,
             chains,
             deployment,
+            log_store: None,
         })
     }
 
@@ -235,6 +273,79 @@ pub struct GeneralSection {
     query: Regex,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LogStoreSection {
+    pub backend: String,
+
+    // File backend
+    pub directory: Option<String>,
+    pub retention_hours: Option<u32>,
+
+    // Elasticsearch backend
+    pub url: Option<String>,
+    pub username: Option<String>,
+    pub password: Option<String>,
+    pub index: Option<String>,
+    pub timeout_secs: Option<u64>,
+
+    // Loki backend (url shared with elasticsearch, differentiated by backend)
+    pub tenant_id: Option<String>,
+}
+
+impl LogStoreSection {
+    pub fn to_log_store_config(&self) -> Result<graph::components::log_store::LogStoreConfig> {
+        use graph::components::log_store::LogStoreConfig;
+
+        match self.backend.to_lowercase().as_str() {
+            "disabled" | "none" => Ok(LogStoreConfig::Disabled),
+
+            "elasticsearch" | "elastic" | "es" => {
+                let endpoint = self.url.clone().ok_or_else(|| {
+                    anyhow!("log_store: 'url' is required for elasticsearch backend")
+                })?;
+
+                Ok(LogStoreConfig::Elasticsearch {
+                    endpoint,
+                    username: self.username.clone(),
+                    password: self.password.clone(),
+                    index: self.index.clone().unwrap_or_else(|| "subgraph".to_string()),
+                    timeout_secs: self.timeout_secs.unwrap_or(10),
+                })
+            }
+
+            "loki" => {
+                let endpoint = self
+                    .url
+                    .clone()
+                    .ok_or_else(|| anyhow!("log_store: 'url' is required for loki backend"))?;
+
+                Ok(LogStoreConfig::Loki {
+                    endpoint,
+                    tenant_id: self.tenant_id.clone(),
+                    username: self.username.clone(),
+                    password: self.password.clone(),
+                })
+            }
+
+            "file" | "files" => {
+                let directory = self.directory.clone().ok_or_else(|| {
+                    anyhow!("log_store: 'directory' is required for file backend")
+                })?;
+
+                Ok(LogStoreConfig::File {
+                    directory: std::path::PathBuf::from(directory),
+                    retention_hours: self.retention_hours.unwrap_or(0),
+                })
+            }
+
+            other => Err(anyhow!(
+                "log_store: unknown backend '{}'. Valid options: disabled, elasticsearch, loki, file",
+                other
+            )),
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Shard {
     pub connection: String,
@@ -249,10 +360,10 @@ pub struct Shard {
 }
 
 impl Shard {
-    fn validate(&mut self, name: &str) -> Result<()> {
+    fn validate(&mut self, name: &str, node: &NodeId) -> Result<()> {
         ShardName::new(name.to_string()).map_err(|e| anyhow!(e))?;
 
-        self.expand_connection()?;
+        self.expand_connection(node)?;
 
         if matches!(self.pool_size, PoolSize::None) {
             return Err(anyhow!("missing pool size definition for shard `{}`", name));
@@ -302,22 +413,25 @@ impl Shard {
         })
     }
 
-    fn expand_connection(&mut self) -> Result<()> {
+    // Put the PGAPPNAME into the URL since tokio-postgres ignores this
+    // environment variable. If PGAPPNAME is not set, use `node`.
+    fn expand_connection(&mut self, node: &NodeId) -> Result<()> {
+        let app_name = std::env::var("PGAPPNAME").unwrap_or(node.to_string());
+
         let mut url = Url::parse(shellexpand::env(&self.connection)?.as_ref())?;
-        // Put the PGAPPNAME into the URL since tokio-postgres ignores this
-        // environment variable
-        if let Ok(app_name) = std::env::var("PGAPPNAME") {
-            let query = match url.query() {
-                Some(query) => {
-                    format!("{query}&application_name={app_name}")
-                }
-                None => {
-                    format!("application_name={app_name}")
-                }
-            };
-            url.set_query(Some(&query));
-        }
+
+        let query = match url.query() {
+            Some(query) => {
+                format!("{query}&application_name={app_name}")
+            }
+            None => {
+                format!("application_name={app_name}")
+            }
+        };
+        url.set_query(Some(&query));
+
         self.connection = url.to_string();
+
         Ok(())
     }
 }
@@ -421,31 +535,97 @@ pub struct ChainSection {
     pub ingestor: String,
     #[serde(flatten)]
     pub chains: BTreeMap<String, Chain>,
+    /// The default for chains that don't set this explicitly. When running
+    /// without a config file, we use `BLOCK_NUMBER_MAX` to turn off pruning
+    /// the block cache
+    #[serde(default = "default_cache_size")]
+    pub cache_size: i32,
 }
 
 impl ChainSection {
     fn validate(&mut self) -> Result<()> {
         NodeId::new(&self.ingestor)
             .map_err(|node| anyhow!("invalid node id for ingestor {}", node))?;
-        for (_, chain) in self.chains.iter_mut() {
-            chain.validate()?
+        let reorg_threshold = ENV_VARS.reorg_threshold();
+
+        if self.cache_size <= reorg_threshold {
+            return Err(anyhow!(
+                "default chains.cache_size ({}) must be greater than reorg_threshold ({})",
+                self.cache_size,
+                reorg_threshold
+            ));
         }
+
+        // Apply section-level cache_size as default for chains that
+        // don't set their own.
+        for chain in self.chains.values_mut() {
+            if chain.cache_size == 0 {
+                chain.cache_size = self.cache_size;
+            }
+        }
+
+        for (name, chain) in self.chains.iter_mut() {
+            chain
+                .validate()
+                .map_err(|e| anyhow!("chain '{}': {}", name, e))?;
+            if chain.cache_size <= reorg_threshold {
+                return Err(anyhow!(
+                    "chain '{}': cache_size ({}) must be greater than reorg_threshold ({})",
+                    name,
+                    chain.cache_size,
+                    reorg_threshold
+                ));
+            }
+        }
+
+        // Validate that effective AMP names are unique and don't collide
+        // with other chain names.
+        let mut amp_names: BTreeMap<String, String> = BTreeMap::new();
+        for (chain_name, chain) in &self.chains {
+            let effective = chain.amp.as_deref().unwrap_or(chain_name.as_str());
+            if let Some(prev_chain) = amp_names.get(effective) {
+                return Err(anyhow!(
+                    "duplicate AMP name `{}`: used by chains `{}` and `{}`",
+                    effective,
+                    prev_chain,
+                    chain_name
+                ));
+            }
+            // Check that an explicit amp alias doesn't collide with
+            // another chain's own name (which would be ambiguous).
+            if chain.amp.is_some()
+                && let Some(other) = self.chains.get(effective)
+            {
+                // Only a collision if the other chain doesn't also
+                // set the same amp alias (which is covered by the
+                // duplicate check above).
+                if other.amp.as_deref() != Some(effective) {
+                    return Err(anyhow!(
+                        "AMP alias `{}` on chain `{}` collides with chain `{}`",
+                        effective,
+                        chain_name,
+                        effective,
+                    ));
+                }
+            }
+            amp_names.insert(effective.to_string(), chain_name.clone());
+        }
+
         Ok(())
     }
 
     fn from_opt(opt: &Opt) -> Result<Self> {
-        // If we are not the block ingestor, set the node name
-        // to something that is definitely not our node_id
-        let ingestor = if opt.disable_block_ingestor {
-            format!("{} is not ingesting", opt.node_id)
-        } else {
-            opt.node_id.clone()
-        };
+        let ingestor = opt.node_id.clone();
         let mut chains = BTreeMap::new();
         Self::parse_networks(&mut chains, Transport::Rpc, &opt.ethereum_rpc)?;
         Self::parse_networks(&mut chains, Transport::Ws, &opt.ethereum_ws)?;
         Self::parse_networks(&mut chains, Transport::Ipc, &opt.ethereum_ipc)?;
-        Ok(Self { ingestor, chains })
+        Ok(Self {
+            ingestor,
+            chains,
+            // When running without a config file, we do not prune the block cache
+            cache_size: BLOCK_NUMBER_MAX,
+        })
     }
 
     pub fn providers(&self) -> Vec<String> {
@@ -521,8 +701,10 @@ impl ChainSection {
                 let entry = chains.entry(name.to_string()).or_insert_with(|| Chain {
                     shard: PRIMARY_SHARD.to_string(),
                     protocol: BlockchainKind::Ethereum,
-                    polling_interval: default_polling_interval(),
                     providers: vec![],
+                    amp: None,
+                    cache_size: 0,
+                    settings: ChainSettings::default(),
                 });
                 entry.providers.push(provider);
             }
@@ -531,18 +713,135 @@ impl ChainSection {
     }
 }
 
+/// Per-chain settings. Flattened into `Chain` so all fields appear as top-level keys in
+/// `[chains.X]` TOML sections. Absent fields fall back to the corresponding `GRAPH_ETHEREUM_*` /
+/// `ETHEREUM_*` environment variable defaults via serde default functions — the same pattern as
+/// `polling_interval`.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
-pub struct Chain {
-    pub shard: String,
-    #[serde(default = "default_blockchain_kind")]
-    pub protocol: BlockchainKind,
+pub struct ChainSettings {
+    /// Set by `polling_interval` (milliseconds). Defaults to `ETHEREUM_POLLING_INTERVAL`.
     #[serde(
         default = "default_polling_interval",
         deserialize_with = "deserialize_duration_millis"
     )]
     pub polling_interval: Duration,
+    /// Set by `json_rpc_timeout` (seconds). Defaults to `GRAPH_ETHEREUM_JSON_RPC_TIMEOUT`.
+    #[serde(
+        default = "default_json_rpc_timeout",
+        deserialize_with = "deserialize_duration_secs"
+    )]
+    pub json_rpc_timeout: Duration,
+    /// Defaults to `GRAPH_ETHEREUM_REQUEST_RETRIES`.
+    #[serde(default = "default_request_retries")]
+    pub request_retries: usize,
+    /// Defaults to `GRAPH_ETHEREUM_MAX_BLOCK_RANGE_SIZE`.
+    #[serde(default = "default_max_block_range_size")]
+    pub max_block_range_size: i32,
+    /// Defaults to `ETHEREUM_BLOCK_BATCH_SIZE`.
+    #[serde(default = "default_block_batch_size")]
+    pub block_batch_size: usize,
+    /// Defaults to `ETHEREUM_BLOCK_PTR_BATCH_SIZE`.
+    #[serde(default = "default_block_ptr_batch_size")]
+    pub block_ptr_batch_size: usize,
+    /// Defaults to `GRAPH_ETHEREUM_MAX_EVENT_ONLY_RANGE`.
+    #[serde(default = "default_max_event_only_range")]
+    pub max_event_only_range: i32,
+    /// Defaults to `GRAPH_ETHEREUM_TARGET_TRIGGERS_PER_BLOCK_RANGE`.
+    #[serde(default = "default_target_triggers_per_block_range")]
+    pub target_triggers_per_block_range: u64,
+    /// Defaults to `GRAPH_ETH_GET_LOGS_MAX_CONTRACTS`.
+    #[serde(default = "default_get_logs_max_contracts")]
+    pub get_logs_max_contracts: usize,
+    /// Defaults to `GRAPH_ETHEREUM_BLOCK_INGESTOR_MAX_CONCURRENT_JSON_RPC_CALLS_FOR_TXN_RECEIPTS`.
+    #[serde(default = "default_block_ingestor_max_concurrent_json_rpc_calls")]
+    pub block_ingestor_max_concurrent_json_rpc_calls: usize,
+    /// Defaults to `GRAPH_ETHEREUM_GENESIS_BLOCK_NUMBER`.
+    #[serde(default = "default_genesis_block_number")]
+    pub genesis_block_number: u64,
+}
+
+impl Default for ChainSettings {
+    fn default() -> Self {
+        ChainSettings {
+            polling_interval: default_polling_interval(),
+            json_rpc_timeout: default_json_rpc_timeout(),
+            request_retries: default_request_retries(),
+            max_block_range_size: default_max_block_range_size(),
+            block_batch_size: default_block_batch_size(),
+            block_ptr_batch_size: default_block_ptr_batch_size(),
+            max_event_only_range: default_max_event_only_range(),
+            target_triggers_per_block_range: default_target_triggers_per_block_range(),
+            get_logs_max_contracts: default_get_logs_max_contracts(),
+            block_ingestor_max_concurrent_json_rpc_calls:
+                default_block_ingestor_max_concurrent_json_rpc_calls(),
+            genesis_block_number: default_genesis_block_number(),
+        }
+    }
+}
+
+impl ChainSettings {
+    fn validate(&self) -> Result<()> {
+        anyhow::ensure!(
+            !self.polling_interval.is_zero(),
+            "polling_interval must be > 0"
+        );
+        anyhow::ensure!(
+            !self.json_rpc_timeout.is_zero(),
+            "json_rpc_timeout must be > 0"
+        );
+        anyhow::ensure!(self.request_retries > 0, "request_retries must be > 0");
+        anyhow::ensure!(
+            self.max_block_range_size > 0,
+            "max_block_range_size must be > 0"
+        );
+        anyhow::ensure!(
+            self.max_event_only_range > 0,
+            "max_event_only_range must be > 0"
+        );
+        anyhow::ensure!(self.block_batch_size > 0, "block_batch_size must be > 0");
+        anyhow::ensure!(
+            self.block_ptr_batch_size > 0,
+            "block_ptr_batch_size must be > 0"
+        );
+        anyhow::ensure!(
+            self.block_ingestor_max_concurrent_json_rpc_calls > 0,
+            "block_ingestor_max_concurrent_json_rpc_calls must be > 0"
+        );
+        anyhow::ensure!(
+            self.get_logs_max_contracts > 0,
+            "get_logs_max_contracts must be > 0"
+        );
+        anyhow::ensure!(
+            self.target_triggers_per_block_range > 0,
+            "target_triggers_per_block_range must be > 0"
+        );
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+pub struct Chain {
+    pub shard: String,
+    #[serde(default = "default_blockchain_kind")]
+    pub protocol: BlockchainKind,
     #[serde(rename = "provider")]
     pub providers: Vec<Provider>,
+    /// AMP network name alias. When set, AMP manifests using this name will
+    /// resolve to this chain. Defaults to the chain name.
+    #[serde(default)]
+    pub amp: Option<String>,
+    /// Number of blocks from chain head for which to keep block data
+    /// cached. When `GRAPH_STORE_IGNORE_BLOCK_CACHE` is set, blocks
+    /// older than this are treated as if they have no data.
+    #[serde(default)]
+    pub cache_size: i32,
+    /// Per-chain settings (flat fields). Absent fields fall back to ENV_VAR defaults.
+    #[serde(flatten)]
+    pub settings: ChainSettings,
+}
+
+fn default_cache_size() -> i32 {
+    BLOCK_CACHE_SIZE
 }
 
 fn default_blockchain_kind() -> BlockchainKind {
@@ -555,7 +854,7 @@ impl Chain {
         labels.sort();
         labels.dedup();
         if labels.len() != self.providers.len() {
-            return Err(anyhow!("Provider labels must be unique"));
+            return Err(anyhow!("provider labels must be unique"));
         }
 
         // `Config` validates that `self.shard` references a configured shard
@@ -563,6 +862,10 @@ impl Chain {
             provider.validate()?
         }
 
+        if self.protocol == BlockchainKind::Ethereum {
+            self.settings.validate()?;
+        }
+
         Ok(())
     }
 }
@@ -704,12 +1007,38 @@ impl Web3Provider {
         }
     }
 
+    pub fn compression(&self) -> Compression {
+        if self.features.contains("compression/gzip") {
+            Compression::Gzip
+        } else if self.features.contains("compression/brotli") {
+            Compression::Brotli
+        } else if self.features.contains("compression/deflate") {
+            Compression::Deflate
+        } else {
+            Compression::None
+        }
+    }
+
     pub fn limit_for(&self, node: &NodeId) -> SubgraphLimit {
         self.rules.limit_for(node)
     }
 }
 
-const PROVIDER_FEATURES: [&str; 3] = ["traces", "archive", "no_eip1898"];
+/// Supported provider features:
+/// - `traces`: Provider supports debug_traceBlockByNumber for call tracing
+/// - `archive`: Provider is an archive node with full historical state
+/// - `no_eip1898`: Provider doesn't support EIP-1898 (block parameter by hash/number object)
+/// - `no_eip2718`: Provider doesn't return the `type` field in transaction receipts.
+///   When set, receipts are patched to add `"type": "0x0"` for legacy transaction compatibility.
+const PROVIDER_FEATURES: [&str; 7] = [
+    "traces",
+    "archive",
+    "no_eip1898",
+    "no_eip2718",
+    "compression/gzip",
+    "compression/brotli",
+    "compression/deflate",
+];
 const DEFAULT_PROVIDER_FEATURES: [&str; 2] = ["traces", "archive"];
 
 impl Provider {
@@ -770,6 +1099,18 @@ impl Provider {
                     }
                 }
 
+                let compression_count = web3
+                    .features
+                    .iter()
+                    .filter(|f| f.starts_with("compression/"))
+                    .count();
+                if compression_count > 1 {
+                    return Err(anyhow!(
+                        "at most one compression method allowed for provider {}",
+                        self.label
+                    ));
+                }
+
                 web3.url = shellexpand::env(&web3.url)?.into_owned();
 
                 let label = &self.label;
@@ -869,7 +1210,9 @@ impl<'de> Deserialize<'de> for Provider {
                             || features.is_some()
                             || headers.is_some()
                         {
-                            return Err(serde::de::Error::custom("when `details` field is provided, deprecated `url`, `transport`, `features` and `headers` cannot be specified"));
+                            return Err(serde::de::Error::custom(
+                                "when `details` field is provided, deprecated `url`, `transport`, `features` and `headers` cannot be specified",
+                            ));
                         }
 
                         if let ProviderDetails::Firehose(ref mut firehose) = v {
@@ -1059,10 +1402,10 @@ impl Predicate {
     }
 
     pub fn matches(&self, name: &str, network: &str) -> bool {
-        if let Some(n) = &self.network {
-            if !n.matches(network) {
-                return false;
-            }
+        if let Some(n) = &self.network
+            && !n.matches(network)
+        {
+            return false;
         }
 
         match self.name.find(name) {
@@ -1148,6 +1491,46 @@ fn default_polling_interval() -> Duration {
     ENV_VARS.ingestor_polling_interval
 }
 
+fn default_json_rpc_timeout() -> Duration {
+    ethereum::ENV_VARS.json_rpc_timeout
+}
+
+fn default_request_retries() -> usize {
+    ethereum::ENV_VARS.request_retries
+}
+
+fn default_max_block_range_size() -> i32 {
+    ethereum::ENV_VARS.max_block_range_size
+}
+
+fn default_block_batch_size() -> usize {
+    ethereum::ENV_VARS.block_batch_size
+}
+
+fn default_block_ptr_batch_size() -> usize {
+    ethereum::ENV_VARS.block_ptr_batch_size
+}
+
+fn default_max_event_only_range() -> i32 {
+    ethereum::ENV_VARS.max_event_only_range
+}
+
+fn default_target_triggers_per_block_range() -> u64 {
+    ethereum::ENV_VARS.target_triggers_per_block_range
+}
+
+fn default_get_logs_max_contracts() -> usize {
+    ethereum::ENV_VARS.get_logs_max_contracts
+}
+
+fn default_block_ingestor_max_concurrent_json_rpc_calls() -> usize {
+    ethereum::ENV_VARS.block_ingestor_max_concurrent_json_rpc_calls
+}
+
+fn default_genesis_block_number() -> u64 {
+    ethereum::ENV_VARS.genesis_block_number
+}
+
 fn deserialize_duration_millis<'de, D>(data: D) -> Result<Duration, D::Error>
 where
     D: Deserializer<'de>,
@@ -1156,6 +1539,14 @@ where
     Ok(Duration::from_millis(millis))
 }
 
+fn deserialize_duration_secs<'de, D>(data: D) -> Result<Duration, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let secs = u64::deserialize(data)?;
+    Ok(Duration::from_secs(secs))
+}
+
 // From https://github.com/serde-rs/serde/issues/889#issuecomment-295988865
 fn string_or_vec<'de, D>(deserializer: D) -> Result<Vec<String>, D::Error>
 where
@@ -1191,16 +1582,26 @@ where
 #[cfg(test)]
 mod tests {
 
-    use crate::config::{default_polling_interval, ChainSection, Web3Rule};
+    use std::time::Duration;
+
+    use crate::config::{
+        ChainSection, Web3Rule, default_block_batch_size,
+        default_block_ingestor_max_concurrent_json_rpc_calls, default_block_ptr_batch_size,
+        default_genesis_block_number, default_get_logs_max_contracts, default_json_rpc_timeout,
+        default_max_block_range_size, default_max_event_only_range, default_polling_interval,
+        default_request_retries, default_target_triggers_per_block_range,
+    };
 
     use super::{
-        Chain, Config, FirehoseProvider, Provider, ProviderDetails, Shard, Transport, Web3Provider,
+        Chain, ChainSettings, Config, FirehoseProvider, Provider, ProviderDetails, Shard,
+        Transport, Web3Provider,
     };
     use graph::blockchain::BlockchainKind;
     use graph::firehose::SubgraphLimit;
     use graph::http::{HeaderMap, HeaderValue};
     use graph::prelude::regex::Regex;
-    use graph::prelude::{toml, NodeId};
+    use graph::prelude::{NodeId, toml};
+    use graph_chain_ethereum::Compression;
     use std::collections::BTreeSet;
     use std::fs::read_to_string;
     use std::path::{Path, PathBuf};
@@ -1235,8 +1636,10 @@ mod tests {
             Chain {
                 shard: "primary".to_string(),
                 protocol: BlockchainKind::Ethereum,
-                polling_interval: default_polling_interval(),
                 providers: vec![],
+                amp: None,
+                cache_size: 0,
+                settings: ChainSettings::default(),
             },
             actual
         );
@@ -1257,13 +1660,40 @@ mod tests {
             Chain {
                 shard: "primary".to_string(),
                 protocol: BlockchainKind::Near,
-                polling_interval: default_polling_interval(),
                 providers: vec![],
+                amp: None,
+                cache_size: 0,
+                settings: ChainSettings::default(),
             },
             actual
         );
     }
 
+    #[test]
+    fn chain_inherits_cache_size_from_section() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            cache_size = 1000
+            [mainnet]
+            shard = "primary"
+            provider = []
+            [sepolia]
+            shard = "primary"
+            provider = []
+            cache_size = 2000
+            "#,
+        )
+        .unwrap();
+
+        section.validate().unwrap();
+
+        // mainnet inherits from section
+        assert_eq!(section.chains["mainnet"].cache_size, 1000);
+        // sepolia keeps its explicit value
+        assert_eq!(section.chains["sepolia"].cache_size, 2000);
+    }
+
     #[test]
     fn it_works_on_deprecated_provider_from_toml() {
         let actual = toml::from_str(
@@ -1534,9 +1964,11 @@ mod tests {
         assert!(actual.is_err(), "{:?}", actual);
 
         if let Err(error) = actual {
-            assert!(error
-                .to_string()
-                .starts_with("supported firehose endpoint filters are:"))
+            assert!(
+                error
+                    .to_string()
+                    .starts_with("supported firehose endpoint filters are:")
+            )
         }
     }
 
@@ -1619,6 +2051,117 @@ mod tests {
         assert!(SubgraphLimit::Limit(10) > SubgraphLimit::Disabled);
     }
 
+    #[test]
+    fn it_parses_web3_provider_with_gzip_compression_feature() {
+        let actual: Provider = toml::from_str(
+            r#"
+            label = "compressed"
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive", "compression/gzip"] }
+        "#,
+        )
+        .unwrap();
+
+        let mut features = BTreeSet::new();
+        features.insert("archive".to_string());
+        features.insert("compression/gzip".to_string());
+
+        assert_eq!(
+            Provider {
+                label: "compressed".to_owned(),
+                details: ProviderDetails::Web3(Web3Provider {
+                    transport: Transport::Rpc,
+                    url: "http://localhost:8545".to_owned(),
+                    features,
+                    headers: HeaderMap::new(),
+                    rules: Vec::new(),
+                }),
+            },
+            actual
+        );
+
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert_eq!(web3.compression(), Compression::Gzip);
+            }
+            _ => panic!("expected Web3 provider"),
+        }
+    }
+
+    #[test]
+    fn it_parses_web3_provider_with_brotli_compression_feature() {
+        let actual: Provider = toml::from_str(
+            r#"
+            label = "compressed"
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive", "compression/brotli"] }
+        "#,
+        )
+        .unwrap();
+
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert_eq!(web3.compression(), Compression::Brotli);
+            }
+            _ => panic!("expected Web3 provider"),
+        }
+    }
+
+    #[test]
+    fn it_parses_web3_provider_with_deflate_compression_feature() {
+        let actual: Provider = toml::from_str(
+            r#"
+            label = "compressed"
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive", "compression/deflate"] }
+        "#,
+        )
+        .unwrap();
+
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert_eq!(web3.compression(), Compression::Deflate);
+            }
+            _ => panic!("expected Web3 provider"),
+        }
+    }
+
+    #[test]
+    fn it_parses_web3_provider_without_compression_feature() {
+        let actual: Provider = toml::from_str(
+            r#"
+            label = "uncompressed"
+            details = { type = "web3", url = "http://localhost:8545", features = ["archive"] }
+        "#,
+        )
+        .unwrap();
+
+        match actual.details {
+            ProviderDetails::Web3(ref web3) => {
+                assert_eq!(web3.compression(), Compression::None);
+            }
+            _ => panic!("expected Web3 provider"),
+        }
+    }
+
+    #[test]
+    fn it_rejects_multiple_compression_features() {
+        let mut actual: Provider = toml::from_str(
+            r#"
+            label = "multi-comp"
+            details = { type = "web3", url = "http://localhost:8545", features = ["compression/gzip", "compression/brotli"] }
+        "#,
+        )
+        .unwrap();
+
+        let err = actual.validate();
+        assert!(err.is_err());
+        let err = err.unwrap_err();
+        assert!(
+            err.to_string()
+                .contains("at most one compression method allowed"),
+            "result: {:?}",
+            err
+        );
+    }
+
     #[test]
     fn duplicated_labels_are_not_allowed_within_chain() {
         let mut actual = toml::from_str::<ChainSection>(
@@ -1682,7 +2225,12 @@ mod tests {
 
         assert_eq!(
             default,
-            actual.chains.get("mainnet").unwrap().polling_interval
+            actual
+                .chains
+                .get("mainnet")
+                .unwrap()
+                .settings
+                .polling_interval
         );
 
         // Polling interval set explicitly, use that
@@ -1702,7 +2250,12 @@ mod tests {
 
         assert_eq!(
             different,
-            actual.chains.get("mainnet").unwrap().polling_interval
+            actual
+                .chains
+                .get("mainnet")
+                .unwrap()
+                .settings
+                .polling_interval
         );
     }
 
@@ -1730,7 +2283,9 @@ fdw_pool_size = [
             )
             .unwrap();
 
-            shard.validate("index_node_1").unwrap();
+            shard
+                .validate("shard_1", &NodeId::new("index_node_1").unwrap())
+                .unwrap();
             shard
         };
         if let Some(appname) = appname {
@@ -1752,4 +2307,487 @@ fdw_pool_size = [
         assert_eq!(shard.fdw_pool_size.size_for(&query, "ashard").unwrap(), 5);
         assert_eq!(shard.fdw_pool_size.size_for(&other, "ashard").unwrap(), 5);
     }
+
+    #[test]
+    fn amp_chain_names_parsed_from_toml() {
+        let actual: Chain = toml::from_str(
+            r#"
+            shard = "primary"
+            provider = []
+            amp = "ethereum-mainnet"
+        "#,
+        )
+        .unwrap();
+
+        assert_eq!(actual.amp, Some("ethereum-mainnet".to_string()));
+    }
+
+    #[test]
+    fn amp_chain_names_default_when_absent() {
+        let actual: Chain = toml::from_str(
+            r#"
+            shard = "primary"
+            provider = []
+        "#,
+        )
+        .unwrap();
+
+        assert_eq!(actual.amp, None);
+    }
+
+    #[test]
+    fn amp_chain_names_validation_rejects_duplicate_effective_names() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            provider = []
+            amp = "eth"
+            [sepolia]
+            shard = "primary"
+            provider = []
+            amp = "eth"
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate();
+        assert!(err.is_err());
+        assert!(
+            err.unwrap_err().to_string().contains("duplicate AMP name"),
+            "expected duplicate AMP name error"
+        );
+    }
+
+    #[test]
+    fn amp_chain_names_validation_rejects_alias_colliding_with_chain_name() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            provider = []
+            [sepolia]
+            shard = "primary"
+            provider = []
+            amp = "mainnet"
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate();
+        assert!(err.is_err());
+        let msg = err.unwrap_err().to_string();
+        // The alias "mainnet" on sepolia collides with the chain named
+        // "mainnet" whose effective AMP name is also "mainnet".
+        assert!(
+            msg.contains("duplicate AMP name") || msg.contains("collides with chain"),
+            "expected collision/duplicate error, got: {msg}"
+        );
+    }
+
+    #[test]
+    fn amp_chain_names_builds_correct_mapping() {
+        let section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            provider = []
+            amp = "ethereum-mainnet"
+            [sepolia]
+            shard = "primary"
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let config = Config {
+            node: NodeId::new("test").unwrap(),
+            disable_block_ingestor: false,
+            general: None,
+            stores: {
+                let mut s = std::collections::BTreeMap::new();
+                s.insert(
+                    "primary".to_string(),
+                    toml::from_str::<Shard>(r#"connection = "postgresql://u:p@h/db""#).unwrap(),
+                );
+                s
+            },
+            chains: section,
+            deployment: toml::from_str("[[rule]]\nshards = [\"primary\"]\nindexers = [\"test\"]")
+                .unwrap(),
+            log_store: None,
+        };
+
+        let amp = config.amp_chain_names();
+        // Explicit alias resolves
+        assert_eq!(
+            amp.resolve(&"ethereum-mainnet".into()),
+            graph::components::network_provider::ChainName::from("mainnet")
+        );
+        // Identity for chain without alias
+        assert_eq!(
+            amp.resolve(&"sepolia".into()),
+            graph::components::network_provider::ChainName::from("sepolia")
+        );
+        // Unknown name passes through
+        assert_eq!(
+            amp.resolve(&"unknown".into()),
+            graph::components::network_provider::ChainName::from("unknown")
+        );
+    }
+
+    #[test]
+    fn is_block_ingestor() {
+        let make_config = |node: &str, ingestor: &str, disable: bool| -> Config {
+            let section: ChainSection =
+                toml::from_str(&format!(r#"ingestor = "{}""#, ingestor)).unwrap();
+            Config {
+                node: NodeId::new(node).unwrap(),
+                disable_block_ingestor: disable,
+                general: None,
+                stores: {
+                    let mut s = std::collections::BTreeMap::new();
+                    s.insert(
+                        "primary".to_string(),
+                        toml::from_str::<Shard>(r#"connection = "postgresql://u:p@h/db""#).unwrap(),
+                    );
+                    s
+                },
+                chains: section,
+                deployment: toml::from_str(
+                    "[[rule]]\nshards = [\"primary\"]\nindexers = [\"test\"]",
+                )
+                .unwrap(),
+                log_store: None,
+            }
+        };
+
+        // Node matches ingestor, not disabled
+        assert!(make_config("index-0", "index-0", false).is_block_ingestor());
+
+        // Node does not match ingestor
+        assert!(!make_config("query-0", "index-0", false).is_block_ingestor());
+
+        // Node matches but kill switch is on
+        assert!(!make_config("index-0", "index-0", true).is_block_ingestor());
+
+        // Node does not match and kill switch is on
+        assert!(!make_config("query-0", "index-0", true).is_block_ingestor());
+    }
+
+    #[test]
+    fn chain_settings_valid_overrides() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            json_rpc_timeout = 300
+            request_retries = 15
+            max_block_range_size = 2000
+            block_batch_size = 20
+            block_ptr_batch_size = 50
+            max_event_only_range = 1000
+            target_triggers_per_block_range = 200
+            get_logs_max_contracts = 5000
+            block_ingestor_max_concurrent_json_rpc_calls = 500
+            genesis_block_number = 1
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        assert!(section.validate().is_ok());
+        let settings = &section.chains.get("mainnet").unwrap().settings;
+        assert_eq!(settings.json_rpc_timeout, Duration::from_secs(300));
+        assert_eq!(settings.request_retries, 15);
+        assert_eq!(settings.max_block_range_size, 2000);
+        assert_eq!(settings.block_batch_size, 20);
+        assert_eq!(settings.block_ptr_batch_size, 50);
+        assert_eq!(settings.max_event_only_range, 1000);
+        assert_eq!(settings.target_triggers_per_block_range, 200);
+        assert_eq!(settings.get_logs_max_contracts, 5000);
+        assert_eq!(settings.block_ingestor_max_concurrent_json_rpc_calls, 500);
+        assert_eq!(settings.genesis_block_number, 1);
+    }
+
+    #[test]
+    fn chain_settings_defaults_match_env_vars() {
+        let settings = ChainSettings::default();
+        assert_eq!(settings.polling_interval, default_polling_interval());
+        assert_eq!(settings.json_rpc_timeout, default_json_rpc_timeout());
+        assert_eq!(settings.request_retries, default_request_retries());
+        assert_eq!(
+            settings.max_block_range_size,
+            default_max_block_range_size()
+        );
+        assert_eq!(settings.block_batch_size, default_block_batch_size());
+        assert_eq!(
+            settings.block_ptr_batch_size,
+            default_block_ptr_batch_size()
+        );
+        assert_eq!(
+            settings.max_event_only_range,
+            default_max_event_only_range()
+        );
+        assert_eq!(
+            settings.target_triggers_per_block_range,
+            default_target_triggers_per_block_range()
+        );
+        assert_eq!(
+            settings.get_logs_max_contracts,
+            default_get_logs_max_contracts()
+        );
+        assert_eq!(
+            settings.block_ingestor_max_concurrent_json_rpc_calls,
+            default_block_ingestor_max_concurrent_json_rpc_calls()
+        );
+        assert_eq!(
+            settings.genesis_block_number,
+            default_genesis_block_number()
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_max_block_range_size() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            max_block_range_size = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("max_block_range_size must be > 0"),
+            "expected max_block_range_size error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_negative_max_block_range_size() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            max_block_range_size = -1
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("max_block_range_size must be > 0"),
+            "expected max_block_range_size error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_max_event_only_range() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            max_event_only_range = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("max_event_only_range must be > 0"),
+            "expected max_event_only_range error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_block_batch_size() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            block_batch_size = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("block_batch_size must be > 0"),
+            "expected block_batch_size error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_block_ptr_batch_size() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            block_ptr_batch_size = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("block_ptr_batch_size must be > 0"),
+            "expected block_ptr_batch_size error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_concurrent_json_rpc_calls() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            block_ingestor_max_concurrent_json_rpc_calls = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("block_ingestor_max_concurrent_json_rpc_calls must be > 0"),
+            "expected block_ingestor_max_concurrent_json_rpc_calls error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_get_logs_max_contracts() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            get_logs_max_contracts = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("get_logs_max_contracts must be > 0"),
+            "expected get_logs_max_contracts error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_polling_interval() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            polling_interval = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("polling_interval must be > 0"),
+            "expected polling_interval error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_json_rpc_timeout() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            json_rpc_timeout = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("json_rpc_timeout must be > 0"),
+            "expected json_rpc_timeout error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_request_retries() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            request_retries = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("request_retries must be > 0"),
+            "expected request_retries error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_rejects_zero_target_triggers_per_block_range() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [mainnet]
+            shard = "primary"
+            target_triggers_per_block_range = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("target_triggers_per_block_range must be > 0"),
+            "expected target_triggers_per_block_range error, got: {err}"
+        );
+    }
+
+    #[test]
+    fn chain_settings_validation_error_includes_chain_name() {
+        let mut section = toml::from_str::<ChainSection>(
+            r#"
+            ingestor = "block_ingestor_node"
+            [my_chain]
+            shard = "primary"
+            block_batch_size = 0
+            provider = []
+            "#,
+        )
+        .unwrap();
+
+        let err = section.validate().unwrap_err().to_string();
+        assert!(
+            err.contains("my_chain"),
+            "expected chain name in error, got: {err}"
+        );
+    }
 }
diff --git a/node/src/helpers.rs b/node/src/helpers.rs
index 7b2e81335f8..2cef6c70eb7 100644
--- a/node/src/helpers.rs
+++ b/node/src/helpers.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use graph::prelude::{
     BlockPtr, DeploymentHash, NodeId, SubgraphRegistrarError, SubgraphStore as SubgraphStoreTrait,
 };
-use graph::slog::{error, info, Logger};
+use graph::slog::{Logger, error, info};
 use graph::{
     components::store::DeploymentLocator,
     prelude::{SubgraphName, SubgraphRegistrar},
diff --git a/node/src/launcher.rs b/node/src/launcher.rs
index 9c0bef19e44..18ee4c727db 100644
--- a/node/src/launcher.rs
+++ b/node/src/launcher.rs
@@ -18,16 +18,17 @@ use graph::url::Url;
 use graph::{
     amp,
     blockchain::{Blockchain, BlockchainKind, BlockchainMap},
+    components::network_provider::AmpChainNames,
 };
-use graph_core::polling_monitor::{arweave_service, ArweaveService, IpfsService};
+use graph_core::polling_monitor::{ArweaveService, IpfsService, arweave_service};
 use graph_graphql::prelude::GraphQlRunner;
 use graph_server_http::GraphQLServer as GraphQLQueryServer;
 use graph_server_index_node::IndexNodeServer;
 use graph_server_json_rpc::JsonRpcServer;
 use graph_server_metrics::PrometheusMetricsServer;
 use graph_store_postgres::{
-    register_jobs as register_store_jobs, ChainHeadUpdateListener, ConnectionPool,
-    NotificationSender, Store, SubgraphStore, SubscriptionManager,
+    ChainHeadUpdateListener, ConnectionPool, NotificationSender, Store, SubgraphStore,
+    SubscriptionManager, register_jobs as register_store_jobs,
 };
 use graphman_server::GraphmanServer;
 use graphman_server::GraphmanServerConfig;
@@ -276,6 +277,7 @@ fn build_subgraph_registrar<AC>(
     ipfs_service: IpfsService,
     amp_client: Option<Arc<AC>>,
     cancel_token: CancellationToken,
+    amp_chain_names: Arc<AmpChainNames>,
 ) -> Arc<
     graph_core::subgraph::SubgraphRegistrar<
         graph_core::subgraph_provider::SubgraphProvider,
@@ -354,6 +356,7 @@ where
         node_id.clone(),
         version_switching_mode,
         Arc::new(subgraph_settings),
+        amp_chain_names,
     ))
 }
 
@@ -364,6 +367,7 @@ fn build_graphql_server(
     metrics_registry: Arc<MetricsRegistry>,
     network_store: &Arc<Store>,
     logger_factory: &LoggerFactory,
+    log_store: Arc<dyn graph::components::log_store::LogStore>,
 ) -> GraphQLQueryServer<GraphQlRunner<Store>> {
     let shards: Vec<_> = config.stores.keys().cloned().collect();
     let load_manager = Arc::new(LoadManager::new(
@@ -377,6 +381,7 @@ fn build_graphql_server(
         network_store.clone(),
         load_manager,
         metrics_registry,
+        log_store,
     ));
 
     GraphQLQueryServer::new(logger_factory, graphql_runner.clone())
@@ -410,6 +415,13 @@ pub async fn run(
         render_testament!(TESTAMENT)
     );
 
+    #[cfg(debug_assertions)]
+    warn!(
+        logger,
+        "This is a DEBUG build — performance is severely degraded. \
+        Use `cargo build --release` for production deployments."
+    );
+
     if !graph_server_index_node::PoiProtection::from_env(&ENV_VARS).is_active() {
         warn!(
             logger,
@@ -440,20 +452,45 @@ pub async fn run(
 
     info!(logger, "Starting up"; "node_id" => &node_id);
 
-    // Optionally, identify the Elasticsearch logging configuration
-    let elastic_config = opt
-        .elasticsearch_url
-        .clone()
-        .map(|endpoint| ElasticLoggingConfig {
-            endpoint,
-            username: opt.elasticsearch_user.clone(),
-            password: opt.elasticsearch_password.clone(),
-            client: reqwest::Client::new(),
-        });
+    // Resolve log store configuration from [log_store] TOML section
+    let (log_store, log_store_config) = match &config.log_store {
+        Some(section) => match section.to_log_store_config() {
+            Ok(store_config) => {
+                let store = graph::components::log_store::LogStoreFactory::from_config(
+                    store_config.clone(),
+                )
+                .unwrap_or_else(|e| {
+                    warn!(logger, "Failed to initialize log store: {}", e);
+                    Arc::new(graph::components::log_store::NoOpLogStore)
+                });
+                info!(logger, "Log store initialized"; "backend" => format!("{:?}", store_config));
+                (store, Some(store_config))
+            }
+            Err(e) => {
+                warn!(logger, "Invalid [log_store] configuration: {}", e);
+                (
+                    Arc::new(graph::components::log_store::NoOpLogStore)
+                        as Arc<dyn graph::components::log_store::LogStore>,
+                    None,
+                )
+            }
+        },
+        None => {
+            info!(
+                logger,
+                "No [log_store] section in config, log queries will return empty results"
+            );
+            (
+                Arc::new(graph::components::log_store::NoOpLogStore)
+                    as Arc<dyn graph::components::log_store::LogStore>,
+                None,
+            )
+        }
+    };
 
     // Create a component and subgraph logger factory
     let logger_factory =
-        LoggerFactory::new(logger.clone(), elastic_config, metrics_registry.clone());
+        LoggerFactory::new(logger.clone(), log_store_config, metrics_registry.clone());
 
     let arweave_resolver = Arc::new(ArweaveClient::new(
         logger.cheap_clone(),
@@ -548,9 +585,19 @@ pub async fn run(
         )
         .await;
 
-        // see comment on cleanup_ethereum_shallow_blocks
-        if !opt.disable_block_ingestor {
+        if config.is_block_ingestor() {
+            // see comment on cleanup_ethereum_shallow_blocks
             cleanup_ethereum_shallow_blocks(&blockchain_map, &network_store).await;
+        } else if opt.disable_block_ingestor {
+            info!(
+                logger,
+                "Block ingestor disabled by --disable-block-ingestor"
+            );
+        } else {
+            info!(
+                logger,
+                "Not running block ingestion, ingestor is `{}`", config.chains.ingestor
+            );
         }
 
         let graphql_server = build_graphql_server(
@@ -560,6 +607,7 @@ pub async fn run(
             metrics_registry.clone(),
             &network_store,
             &logger_factory,
+            log_store.clone(),
         );
 
         let index_node_server = IndexNodeServer::new(
@@ -570,7 +618,7 @@ pub async fn run(
             amp_client.cheap_clone(),
         );
 
-        if !opt.disable_block_ingestor {
+        if config.is_block_ingestor() {
             spawn_block_ingestor(
                 &logger,
                 &blockchain_map,
@@ -581,6 +629,7 @@ pub async fn run(
             .await;
         }
 
+        let amp_chain_names = Arc::new(config.amp_chain_names());
         let subgraph_registrar = build_subgraph_registrar(
             metrics_registry.clone(),
             &network_store,
@@ -595,6 +644,7 @@ pub async fn run(
             ipfs_service,
             amp_client,
             cancel_token,
+            amp_chain_names,
         );
 
         graph::spawn(
@@ -670,25 +720,28 @@ fn spawn_contention_checker(logger: Logger) {
         }
         panic!("ping sender dropped");
     });
-    std::thread::spawn(move || loop {
-        std::thread::sleep(Duration::from_secs(1));
-        let (pong_send, pong_receive) = std::sync::mpsc::sync_channel(1);
-        if graph::futures03::executor::block_on(ping_send.clone().send(pong_send)).is_err() {
-            debug!(logger, "Shutting down contention checker thread");
-            break;
-        }
-        let mut timeout = Duration::from_millis(10);
-        while pong_receive.recv_timeout(timeout) == Err(std::sync::mpsc::RecvTimeoutError::Timeout)
-        {
-            debug!(logger, "Possible contention in tokio threadpool";
+    std::thread::spawn(move || {
+        loop {
+            std::thread::sleep(Duration::from_secs(1));
+            let (pong_send, pong_receive) = std::sync::mpsc::sync_channel(1);
+            if graph::futures03::executor::block_on(ping_send.clone().send(pong_send)).is_err() {
+                debug!(logger, "Shutting down contention checker thread");
+                break;
+            }
+            let mut timeout = Duration::from_millis(10);
+            while pong_receive.recv_timeout(timeout)
+                == Err(std::sync::mpsc::RecvTimeoutError::Timeout)
+            {
+                debug!(logger, "Possible contention in tokio threadpool";
                                      "timeout_ms" => timeout.as_millis(),
                                      "code" => LogCode::TokioContention);
-            if timeout < ENV_VARS.kill_if_unresponsive_timeout {
-                timeout *= 10;
-            } else if ENV_VARS.kill_if_unresponsive {
-                // The node is unresponsive, kill it in hopes it will be restarted.
-                crit!(logger, "Node is unresponsive, killing process");
-                std::process::abort()
+                if timeout < ENV_VARS.kill_if_unresponsive_timeout {
+                    timeout *= 10;
+                } else if ENV_VARS.kill_if_unresponsive {
+                    // The node is unresponsive, kill it in hopes it will be restarted.
+                    crit!(logger, "Node is unresponsive, killing process");
+                    std::process::abort()
+                }
             }
         }
     });
diff --git a/node/src/main.rs b/node/src/main.rs
index da6838635a2..652258c734d 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -15,6 +15,7 @@ lazy_static! {
 }
 
 fn main() {
+    graph::tls::install_default_crypto_provider();
     tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .max_blocking_threads(*MAX_BLOCKING_THREADS)
diff --git a/node/src/manager/color.rs b/node/src/manager/color.rs
index 5c89789f90c..9e4541c55ca 100644
--- a/node/src/manager/color.rs
+++ b/node/src/manager/color.rs
@@ -1,7 +1,10 @@
-use std::{io, sync::Mutex};
+use std::{
+    io::{self, IsTerminal as _},
+    sync::Mutex,
+};
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
-use graph::prelude::{atty, lazy_static};
+use graph::prelude::lazy_static;
 
 use super::CmdResult;
 
@@ -27,7 +30,7 @@ impl Terminal {
             "always" => ColorChoice::Always,
             "ansi" => ColorChoice::AlwaysAnsi,
             "auto" => {
-                if atty::is(atty::Stream::Stdout) {
+                if io::stdout().is_terminal() {
                     ColorChoice::Auto
                 } else {
                     ColorChoice::Never
diff --git a/node/src/manager/commands/assign.rs b/node/src/manager/commands/assign.rs
index c5f451281be..3787145fb29 100644
--- a/node/src/manager/commands/assign.rs
+++ b/node/src/manager/commands/assign.rs
@@ -1,6 +1,6 @@
 use graph::components::store::DeploymentLocator;
-use graph::prelude::{anyhow::anyhow, Error, NodeId, StoreEvent};
-use graph_store_postgres::{command_support::catalog, ConnectionPool, NotificationSender};
+use graph::prelude::{Error, NodeId, StoreEvent, anyhow::anyhow};
+use graph_store_postgres::{ConnectionPool, NotificationSender, command_support::catalog};
 use std::time::Duration;
 use tokio;
 
diff --git a/node/src/manager/commands/chain.rs b/node/src/manager/commands/chain.rs
index ad6d7bdd543..ffce3c738a6 100644
--- a/node/src/manager/commands/chain.rs
+++ b/node/src/manager/commands/chain.rs
@@ -19,20 +19,19 @@ use graph::{
     components::store::BlockStore as _, components::store::ChainHeadStore as _,
     prelude::anyhow::Error,
 };
-use graph_chain_ethereum::chain::BlockFinality;
 use graph_chain_ethereum::EthereumAdapter;
 use graph_chain_ethereum::EthereumAdapterTrait as _;
-use graph_store_postgres::add_chain;
-use graph_store_postgres::find_chain;
-use graph_store_postgres::update_chain_name;
+use graph_chain_ethereum::chain::BlockFinality;
 use graph_store_postgres::BlockStore;
-use graph_store_postgres::ChainStatus;
 use graph_store_postgres::ChainStore;
 use graph_store_postgres::PoolCoordinator;
-use graph_store_postgres::ScopedFutureExt;
 use graph_store_postgres::Shard;
-use graph_store_postgres::{command_support::catalog::block_store, ConnectionPool};
+use graph_store_postgres::add_chain;
+use graph_store_postgres::find_chain;
+use graph_store_postgres::update_chain_name;
+use graph_store_postgres::{ConnectionPool, command_support::catalog::block_store};
 
+use crate::manager::prompt::prompt_for_confirmation;
 use crate::network_setup::Networks;
 
 pub async fn list(primary: ConnectionPool, store: BlockStore) -> Result<(), Error> {
@@ -84,16 +83,28 @@ pub async fn clear_call_cache(
 
 pub async fn clear_stale_call_cache(
     chain_store: Arc<ChainStore>,
-    ttl_days: i32,
-    ttl_max_contracts: Option<i64>,
+    ttl_days: usize,
+    max_contracts: Option<usize>,
 ) -> Result<(), Error> {
     println!(
         "Removing stale entries from the call cache for `{}`",
         chain_store.chain
     );
-    chain_store
-        .clear_stale_call_cache(ttl_days, ttl_max_contracts)
+    let result = chain_store
+        .clear_stale_call_cache(ttl_days, max_contracts)
         .await?;
+    if result.effective_ttl_days != ttl_days {
+        println!(
+            "Effective TTL: {} days (adjusted from {} to stay within {} contracts)",
+            result.effective_ttl_days,
+            ttl_days,
+            max_contracts.unwrap()
+        );
+    }
+    println!(
+        "Deleted {} cache entries for {} contracts",
+        result.cache_entries_deleted, result.contracts_deleted
+    );
     Ok(())
 }
 
@@ -135,10 +146,11 @@ pub async fn info(
     let head_block = chain_store.cheap_clone().chain_head_ptr().await?;
     let ancestor = match &head_block {
         None => None,
-        Some(head_block) => chain_store
-            .ancestor_block(head_block.clone(), offset, None)
-            .await?
-            .map(|x| x.1),
+        Some(head_block) => {
+            chain_store
+                .ancestor_block_ptr(head_block.clone(), offset, None)
+                .await?
+        }
     };
 
     row("name", chain.name);
@@ -238,6 +250,9 @@ pub async fn change_block_cache_shard(
         .await?
         .ok_or_else(|| anyhow!("unknown chain: {}", chain_name))?;
     let old_shard = chain.shard;
+    let canonical_backup_name = format!("{chain_name}-old");
+
+    let existing_backup = find_chain(&mut conn, &canonical_backup_name).await?;
 
     println!("Current shard: {}", old_shard);
 
@@ -245,43 +260,110 @@ pub async fn change_block_cache_shard(
         .chain_store(&chain_name)
         .await
         .ok_or_else(|| anyhow!("unknown chain: {}", &chain_name))?;
-    let new_name = format!("{}-old", &chain_name);
     let ident = chain_store.chain_identifier().await?;
+    let target_shard = Shard::new(shard)?;
+
+    let reuse_existing_backup = match existing_backup.as_ref() {
+        None => false,
+        Some(backup) if backup.shard != target_shard => {
+            bail!(
+                "`{}` already exists on shard `{}`. Remove it with `graphman chain remove {}` before changing `{}` to shard `{}`",
+                canonical_backup_name,
+                backup.shard,
+                canonical_backup_name,
+                chain_name,
+                target_shard,
+            );
+        }
+        Some(backup) => {
+            let backup_ident = backup.network_identifier()?;
+            if backup_ident != ident {
+                bail!(
+                    "`{}` has a different chain identifier ({}) than `{}` ({}). Remove it with `graphman chain remove {}` before changing `{}` to shard `{}`",
+                    canonical_backup_name,
+                    backup_ident,
+                    chain_name,
+                    ident,
+                    canonical_backup_name,
+                    chain_name,
+                    target_shard,
+                );
+            }
+            let prompt = format!(
+                "`{}` already exists on shard `{}` and will be reused as the active `{}` chain.\nProceed?",
+                canonical_backup_name, target_shard, chain_name
+            );
+            if !prompt_for_confirmation(&prompt)? {
+                println!(
+                    "Aborting. Remove `{}` with `graphman chain remove {}` if you want to create a fresh cache on shard `{}`.",
+                    canonical_backup_name, canonical_backup_name, target_shard
+                );
+                return Ok(());
+            }
+            true
+        }
+    };
 
-    conn.transaction::<(), StoreError, _>(|conn|  {
-        async {
-            let shard = Shard::new(shard.to_string())?;
+    let existing_backup_store = if reuse_existing_backup {
+        store.chain_store(&canonical_backup_name).await
+    } else {
+        None
+    };
 
-            let chain = BlockStore::allocate_chain(conn, &chain_name, &shard, &ident).await?;
+    if !reuse_existing_backup {
+        let chain =
+            BlockStore::allocate_chain(&mut conn, &chain_name, &target_shard, &ident).await?;
+        store.add_chain_store(&chain, true).await?;
+    }
 
-            graph::block_on(store.add_chain_store(&chain,ChainStatus::Ingestible, true))?;
+    let temp_backup_name = format!("{chain_name}-old-temp");
+    if reuse_existing_backup && find_chain(&mut conn, &temp_backup_name).await?.is_some() {
+        bail!(
+            "`{}` already exists. Remove it with `graphman chain remove {}` before changing `{}` to shard `{}`",
+            temp_backup_name,
+            temp_backup_name,
+            chain_name,
+            target_shard,
+        );
+    }
 
-            // Drop the foreign key constraint on deployment_schemas
-            sql_query(
-                "alter table deployment_schemas drop constraint deployment_schemas_network_fkey;",
-            )
-            .execute(conn).await?;
+    conn.transaction::<(), StoreError, _>(async |conn| {
+        sql_query(
+            "alter table deployment_schemas drop constraint deployment_schemas_network_fkey;",
+        )
+        .execute(conn)
+        .await?;
 
-            // Update the current chain name to chain-old
-            update_chain_name(conn, &chain_name, &new_name).await?;
+        if let Some(backup) = existing_backup.as_ref() {
+            update_chain_name(conn, &backup.name, &temp_backup_name).await?;
+        }
+
+        update_chain_name(conn, &chain_name, &canonical_backup_name).await?;
+
+        if reuse_existing_backup {
+            update_chain_name(conn, &temp_backup_name, &chain_name).await?;
+        } else {
+            add_chain(conn, &chain_name, &target_shard, ident.clone()).await?;
+        }
 
-            // Create a new chain with the name in the destination shard
-            let _ = add_chain(conn, &chain_name, &shard, ident).await?;
+        sql_query(
+            "alter table deployment_schemas add constraint deployment_schemas_network_fkey foreign key (network) references chains(name);",
+        )
+        .execute(conn)
+        .await?;
+        Ok(())
+    })
+    .await?;
 
-            // Re-add the foreign key constraint
-            sql_query(
-                "alter table deployment_schemas add constraint deployment_schemas_network_fkey foreign key (network) references chains(name);",
-            )
-            .execute(conn).await?;
-            Ok(())
-        }.scope_boxed()
-    }).await?;
+    chain_store.update_name(&canonical_backup_name).await?;
 
-    chain_store.update_name(&new_name).await?;
+    if reuse_existing_backup && let Some(backup_store) = existing_backup_store.as_ref() {
+        backup_store.update_name(&chain_name).await?;
+    }
 
     println!(
         "Changed block cache shard for {} from {} to {}",
-        chain_name, old_shard, shard
+        chain_name, old_shard, target_shard
     );
 
     Ok(())
diff --git a/node/src/manager/commands/check_blocks.rs b/node/src/manager/commands/check_blocks.rs
index f6a4506a2f8..d7014bd4b1c 100644
--- a/node/src/manager/commands/check_blocks.rs
+++ b/node/src/manager/commands/check_blocks.rs
@@ -2,10 +2,13 @@ use crate::manager::prompt::prompt_for_confirmation;
 use graph::{
     anyhow::{bail, ensure},
     cheap_clone::CheapClone,
-    components::store::ChainStore as ChainStoreTrait,
+    components::{
+        ethereum::{CachedBlock, LightEthereumBlock},
+        store::ChainStore as ChainStoreTrait,
+    },
     prelude::{
         alloy::primitives::B256,
-        anyhow::{self, anyhow, Context},
+        anyhow::{self, Context, anyhow},
     },
     slog::Logger,
 };
@@ -114,7 +117,7 @@ async fn run(
         steps::fetch_single_cached_block(*block_hash, chain_store.cheap_clone()).await?;
     let provider_block =
         steps::fetch_single_provider_block(block_hash, ethereum_adapter, logger).await?;
-    let diff = steps::diff_block_pair(&cached_block, &provider_block);
+    let diff = steps::diff_block_pair(&cached_block, &provider_block)?;
     steps::report_difference(diff.as_deref(), block_hash);
     if diff.is_some() {
         steps::delete_block(block_hash, &chain_store).await?;
@@ -162,7 +165,7 @@ mod steps {
             serde_json::{self, Value},
         },
     };
-    use json_structural_diff::{colorize as diff_to_string, JsonDiff};
+    use json_structural_diff::{JsonDiff, colorize as diff_to_string};
 
     /// Queries the [`ChainStore`] about the block hash for the given block number.
     ///
@@ -186,18 +189,16 @@ mod steps {
     pub(super) async fn fetch_single_cached_block(
         block_hash: B256,
         chain_store: Arc<ChainStore>,
-    ) -> anyhow::Result<Value> {
-        let blocks = chain_store.blocks(vec![block_hash.into()]).await?;
+    ) -> anyhow::Result<CachedBlock> {
+        let mut blocks = chain_store.blocks(vec![block_hash.into()]).await?;
         match blocks.len() {
             0 => bail!("Failed to locate block with hash {} in store", block_hash),
-            1 => {}
+            1 => Ok(blocks.pop().unwrap()),
             _ => bail!("Found multiple blocks with hash {} in store", block_hash),
-        };
-        // Unwrap: We just checked that the vector has a single element
-        Ok(blocks.into_iter().next().unwrap())
+        }
     }
 
-    /// Fetches a block from a JRPC endpoint.
+    /// Fetches a block from an RPC endpoint.
     ///
     /// Errors on provider failure or if the returned block has a different hash than the one
     /// requested.
@@ -205,24 +206,38 @@ mod steps {
         block_hash: &B256,
         ethereum_adapter: &EthereumAdapter,
         logger: &Logger,
-    ) -> anyhow::Result<Value> {
+    ) -> anyhow::Result<LightEthereumBlock> {
         let provider_block = ethereum_adapter
             .block_by_hash(logger, *block_hash)
             .await
             .with_context(|| format!("failed to fetch block {block_hash}"))?
-            .ok_or_else(|| anyhow!("JRPC provider found no block with hash {block_hash:?}"))?;
+            .ok_or_else(|| anyhow!("RPC provider found no block with hash {block_hash:?}"))?;
         ensure!(
             provider_block.header.hash == *block_hash,
             "Provider responded with a different block hash"
         );
-        serde_json::to_value(provider_block)
-            .context("failed to parse provider block as a JSON value")
+        Ok(LightEthereumBlock::new(provider_block))
     }
 
-    /// Compares two [`serde_json::Value`] values.
+    /// Compares a cached block against a provider block.
     ///
+    /// Only compares the block data (without receipts) since the provider's
+    /// `eth_getBlockByHash` does not return receipts. Both sides are serialized
+    /// through the same alloy types for a fair comparison.
     /// If they are different, returns a user-friendly string ready to be displayed.
-    pub(super) fn diff_block_pair(a: &Value, b: &Value) -> Option<String> {
+    pub(super) fn diff_block_pair(
+        cached: &CachedBlock,
+        provider: &LightEthereumBlock,
+    ) -> anyhow::Result<Option<String>> {
+        let cached_json = serde_json::to_value(cached.light_block())
+            .context("failed to serialize cached block")?;
+        let provider_json =
+            serde_json::to_value(provider).context("failed to serialize provider block")?;
+
+        Ok(diff_json(&cached_json, &provider_json))
+    }
+
+    fn diff_json(a: &Value, b: &Value) -> Option<String> {
         if a == b {
             None
         } else {
diff --git a/node/src/manager/commands/config.rs b/node/src/manager/commands/config.rs
index 08633ae586d..35ee9ed573a 100644
--- a/node/src/manager/commands/config.rs
+++ b/node/src/manager/commands/config.rs
@@ -2,14 +2,14 @@ use std::{collections::BTreeMap, sync::Arc};
 
 use graph::components::network_provider::ChainName;
 use graph::{
-    anyhow::{bail, Context},
+    anyhow::{Context, bail},
     components::subgraph::{Setting, Settings},
     endpoint::EndpointMetrics,
     env::EnvVars,
     itertools::Itertools,
     prelude::{
-        anyhow::{anyhow, Error},
         MetricsRegistry, NodeId, SubgraphName,
+        anyhow::{Error, anyhow},
     },
     slog::Logger,
 };
diff --git a/node/src/manager/commands/copy.rs b/node/src/manager/commands/copy.rs
index cafe82dacbb..9d158dcd231 100644
--- a/node/src/manager/commands/copy.rs
+++ b/node/src/manager/commands/copy.rs
@@ -6,19 +6,20 @@ use graph::{
     components::store::{BlockStore as _, DeploymentId, DeploymentLocator},
     data::query::QueryTarget,
     prelude::{
-        anyhow::{anyhow, bail, Error},
-        chrono::{DateTime, Duration, SecondsFormat, Utc},
         BlockPtr, ChainStore, DeploymentHash, NodeId, QueryStoreManager,
+        anyhow::{Error, anyhow, bail},
+        chrono::{DateTime, Duration, SecondsFormat, Utc},
     },
 };
+use graph_store_postgres::{ConnectionPool, Shard, Store, SubgraphStore};
 use graph_store_postgres::{
+    PRIMARY_SHARD,
     command_support::{
+        OnSync,
         catalog::{self, copy_state, copy_table_state},
-        on_sync, OnSync,
+        on_sync,
     },
-    PRIMARY_SHARD,
 };
-use graph_store_postgres::{ConnectionPool, Shard, Store, SubgraphStore};
 
 use crate::manager::display::List;
 use crate::manager::{deployment::DeploymentSearch, fmt};
@@ -114,12 +115,32 @@ async fn create_inner(
         .await?;
     let network = query_store.network_name();
 
-    let src_ptr = query_store.block_ptr().await?.ok_or_else(|| anyhow!("subgraph {} has not indexed any blocks yet and can not be used as the source of a copy", src))?;
-    let src_number = if src_ptr.number <= block_offset {
-        bail!("subgraph {} has only indexed up to block {}, but we need at least block {} before we can copy from it", src, src_ptr.number, block_offset);
-    } else {
-        src_ptr.number - block_offset
-    };
+    let src_ptr = query_store
+        .block_ptr()
+        .await?
+        .ok_or_else(|| anyhow!("subgraph {} has not indexed any blocks yet and can not be used as the source of a copy", src))?;
+
+    if src_ptr.number <= block_offset {
+        bail!(
+            "subgraph {} has only indexed up to block {}, but we need at least block {} before we can copy from it",
+            src,
+            src_ptr.number,
+            block_offset
+        );
+    }
+
+    // Validate that the offset block does not fall behind the subgraph's earliest block.
+    let src_state = query_store.deployment_state().await?;
+    let src_number = src_ptr.number - block_offset;
+    if src_number < src_state.earliest_block_number {
+        bail!(
+            "cannot copy subgraph {} with --offset {}: the offset block number {} is behind the subgraph's earliest_block_number {}",
+            src,
+            block_offset,
+            src_number,
+            src_state.earliest_block_number,
+        );
+    }
 
     let chain_store = store
         .block_store()
diff --git a/node/src/manager/commands/create.rs b/node/src/manager/commands/create.rs
index db75e28d5c1..8ab34a0d487 100644
--- a/node/src/manager/commands/create.rs
+++ b/node/src/manager/commands/create.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use graph::prelude::{anyhow, Error, SubgraphName, SubgraphStore as _};
+use graph::prelude::{Error, SubgraphName, SubgraphStore as _, anyhow};
 use graph_store_postgres::SubgraphStore;
 
 pub async fn run(store: Arc<SubgraphStore>, name: String) -> Result<(), Error> {
diff --git a/node/src/manager/commands/database.rs b/node/src/manager/commands/database.rs
index 56df0a73f27..69c7ad932af 100644
--- a/node/src/manager/commands/database.rs
+++ b/node/src/manager/commands/database.rs
@@ -16,15 +16,15 @@ pub async fn remap(
     };
     let servers = coord.servers();
 
-    if let Some(src) = &src {
-        if !servers.iter().any(|srv| srv.shard.as_str() == src) {
-            return Err(anyhow!("unknown source shard {src}"));
-        }
+    if let Some(src) = &src
+        && !servers.iter().any(|srv| srv.shard.as_str() == src)
+    {
+        return Err(anyhow!("unknown source shard {src}"));
     }
-    if let Some(dst) = &dst {
-        if !pools.iter().any(|pool| pool.shard.as_str() == dst) {
-            return Err(anyhow!("unknown destination shard {dst}"));
-        }
+    if let Some(dst) = &dst
+        && !pools.iter().any(|pool| pool.shard.as_str() == dst)
+    {
+        return Err(anyhow!("unknown destination shard {dst}"));
     }
 
     let servers = servers.iter().filter(|srv| match &src {
diff --git a/node/src/manager/commands/deploy.rs b/node/src/manager/commands/deploy.rs
index 15ddc6b1049..603d09b63ca 100644
--- a/node/src/manager/commands/deploy.rs
+++ b/node/src/manager/commands/deploy.rs
@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use graph::prelude::{
-    anyhow::{anyhow, bail, Result},
-    reqwest,
-    serde_json::{json, Value},
     SubgraphName, SubgraphStore,
+    anyhow::{Result, anyhow, bail},
+    reqwest,
+    serde_json::{Value, json},
 };
 
 use crate::manager::deployment::DeploymentSearch;
diff --git a/node/src/manager/commands/deployment/info.rs b/node/src/manager/commands/deployment/info.rs
index 08e8f1c517d..14151664bda 100644
--- a/node/src/manager/commands/deployment/info.rs
+++ b/node/src/manager/commands/deployment/info.rs
@@ -3,13 +3,13 @@ use std::collections::HashMap;
 use std::io;
 use std::sync::Arc;
 
-use anyhow::bail;
 use anyhow::Result;
+use anyhow::bail;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::Store;
+use graphman::commands::deployment::info::DeploymentStatus;
 use graphman::commands::deployment::info::load_deployment_statuses;
 use graphman::commands::deployment::info::load_deployments;
-use graphman::commands::deployment::info::DeploymentStatus;
 use graphman::deployment::Deployment;
 use graphman::deployment::DeploymentSelector;
 use graphman::deployment::DeploymentVersionSelector;
diff --git a/node/src/manager/commands/deployment/pause.rs b/node/src/manager/commands/deployment/pause.rs
index 2b91680a0f3..2dd913df300 100644
--- a/node/src/manager/commands/deployment/pause.rs
+++ b/node/src/manager/commands/deployment/pause.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
 use graphman::commands::deployment::pause::{
-    load_active_deployment, pause_active_deployment, PauseDeploymentError,
+    PauseDeploymentError, load_active_deployment, pause_active_deployment,
 };
 use graphman::deployment::DeploymentSelector;
 
diff --git a/node/src/manager/commands/deployment/reassign.rs b/node/src/manager/commands/deployment/reassign.rs
index da8341422c4..abd35f42700 100644
--- a/node/src/manager/commands/deployment/reassign.rs
+++ b/node/src/manager/commands/deployment/reassign.rs
@@ -5,7 +5,7 @@ use graph::prelude::NodeId;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
 use graphman::commands::deployment::reassign::{
-    load_deployment, reassign_deployment, ReassignResult,
+    ReassignResult, load_deployment, reassign_deployment,
 };
 use graphman::deployment::DeploymentSelector;
 
diff --git a/node/src/manager/commands/dump.rs b/node/src/manager/commands/dump.rs
new file mode 100644
index 00000000000..5dca517f2f7
--- /dev/null
+++ b/node/src/manager/commands/dump.rs
@@ -0,0 +1,149 @@
+use std::fs;
+use std::sync::Arc;
+use std::time::Instant;
+
+use console::style;
+use graph::components::store::DumpReporter;
+use graph::prelude::anyhow::Result;
+use indicatif::ProgressBar;
+
+use graph_store_postgres::{ConnectionPool, SubgraphStore};
+
+use crate::manager::deployment::DeploymentSearch;
+
+struct DumpProgress {
+    spinner: ProgressBar,
+    start: Instant,
+    table_start: Instant,
+    table_rows: usize,
+}
+
+impl DumpProgress {
+    fn new() -> Self {
+        let spinner = ProgressBar::new_spinner();
+        spinner.enable_steady_tick(std::time::Duration::from_millis(80));
+        Self {
+            spinner,
+            start: Instant::now(),
+            table_start: Instant::now(),
+            table_rows: 0,
+        }
+    }
+}
+
+impl DumpReporter for DumpProgress {
+    fn start(&mut self, deployment: &str, table_count: usize) {
+        self.start = Instant::now();
+        self.spinner.set_message(format!(
+            "Dumping deployment {} ({} tables)",
+            style(deployment).cyan(),
+            table_count,
+        ));
+    }
+
+    fn start_table(&mut self, table: &str, rows_approx: usize) {
+        self.table_start = Instant::now();
+        self.table_rows = 0;
+        self.spinner
+            .set_message(format!("{:<32} ~{} rows", table, format_count(rows_approx),));
+    }
+
+    fn batch_dumped(&mut self, table: &str, rows: usize) {
+        self.table_rows += rows;
+        self.spinner.set_message(format!(
+            "{:<32} {} rows",
+            table,
+            format_count(self.table_rows),
+        ));
+    }
+
+    fn finish_table(&mut self, table: &str, rows: usize) {
+        let elapsed = self.table_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>10} rows {:>4}s",
+            style("\u{2714}").green(),
+            table,
+            format_count(rows),
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn start_data_sources(&mut self) {
+        self.table_start = Instant::now();
+        self.table_rows = 0;
+        self.spinner.set_message("data_sources$".to_string());
+    }
+
+    fn finish_data_sources(&mut self, rows: usize) {
+        let elapsed = self.table_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>10} rows {:>4}s",
+            style("\u{2714}").green(),
+            "data_sources$",
+            format_count(rows),
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn start_clamps(&mut self, table: &str, rows_approx: usize) {
+        self.spinner.set_message(format!(
+            "{:<32} clamps ~{} rows",
+            table,
+            format_count(rows_approx),
+        ));
+    }
+
+    fn finish_clamps(&mut self, table: &str, rows: usize) {
+        if rows > 0 {
+            let line = format!(
+                "  {} {:<32} {:>10} clamps",
+                style("\u{2714}").green(),
+                table,
+                format_count(rows),
+            );
+            self.spinner.suspend(|| println!("{line}"));
+        }
+    }
+
+    fn finish(&mut self) {
+        let elapsed = self.start.elapsed().as_secs();
+        self.spinner.finish_with_message(format!(
+            "{} Dump complete ({}s)",
+            style("\u{2714}").green(),
+            elapsed
+        ));
+    }
+}
+
+fn format_count(n: usize) -> String {
+    if n == 0 {
+        return "0".to_string();
+    }
+    let s = n.to_string();
+    let mut result = String::new();
+    for (i, c) in s.chars().rev().enumerate() {
+        if i > 0 && i % 3 == 0 {
+            result.push(',');
+        }
+        result.push(c);
+    }
+    result.chars().rev().collect()
+}
+
+pub async fn run(
+    subgraph_store: Arc<SubgraphStore>,
+    primary_pool: ConnectionPool,
+    deployment: DeploymentSearch,
+    directory: String,
+) -> Result<()> {
+    fs::create_dir_all(&directory)?;
+    let directory = fs::canonicalize(&directory)?;
+
+    let loc = deployment.locate_unique(&primary_pool).await?;
+
+    let reporter = Box::new(DumpProgress::new());
+    subgraph_store.dump(&loc, directory, reporter).await?;
+    Ok(())
+}
diff --git a/node/src/manager/commands/index.rs b/node/src/manager/commands/index.rs
index 6a5370895e5..bf14e0ee62a 100644
--- a/node/src/manager/commands/index.rs
+++ b/node/src/manager/commands/index.rs
@@ -1,12 +1,12 @@
-use crate::manager::{color::Terminal, deployment::DeploymentSearch, CmdResult};
+use crate::manager::{CmdResult, color::Terminal, deployment::DeploymentSearch};
 use graph::{
     components::store::DeploymentLocator,
     itertools::Itertools,
-    prelude::{anyhow, StoreError},
+    prelude::{StoreError, anyhow},
 };
 use graph_store_postgres::{
-    command_support::index::{CreateIndex, Method},
     ConnectionPool, SubgraphStore,
+    command_support::index::{CreateIndex, IndexCreator, Method},
 };
 use std::io::Write as _;
 use std::{collections::HashSet, sync::Arc};
@@ -183,8 +183,9 @@ pub async fn list(
     let mut term = Terminal::new();
 
     if to_sql {
+        let creat = IndexCreator::new(concurrent, if_not_exists, true);
         for index in indexes {
-            writeln!(term, "{};", index.to_sql(concurrent, if_not_exists)?)?;
+            writeln!(term, "{};", creat.to_sql(&index)?)?;
         }
     } else {
         let mut first = true;
diff --git a/node/src/manager/commands/listen.rs b/node/src/manager/commands/listen.rs
index 0f61f8a5b2e..2b65fde8006 100644
--- a/node/src/manager/commands/listen.rs
+++ b/node/src/manager/commands/listen.rs
@@ -1,11 +1,11 @@
 use std::io::Write;
 use std::sync::Arc;
 
-use graph::futures03::{future, StreamExt};
+use graph::futures03::{StreamExt, future};
 
 use graph::{
     components::store::SubscriptionManager as _,
-    prelude::{serde_json, Error},
+    prelude::{Error, serde_json},
 };
 use graph_store_postgres::SubscriptionManager;
 
diff --git a/node/src/manager/commands/mod.rs b/node/src/manager/commands/mod.rs
index 42e45605ebd..9e5ba8e0b95 100644
--- a/node/src/manager/commands/mod.rs
+++ b/node/src/manager/commands/mod.rs
@@ -7,12 +7,14 @@ pub mod create;
 pub mod database;
 pub mod deploy;
 pub mod deployment;
+pub mod dump;
 pub mod index;
 pub mod listen;
 pub mod provider_checks;
 pub mod prune;
 pub mod query;
 pub mod remove;
+pub mod restore;
 pub mod rewind;
 pub mod run;
 pub mod stats;
diff --git a/node/src/manager/commands/provider_checks.rs b/node/src/manager/commands/provider_checks.rs
index 12f2e98e00b..5154756c8f3 100644
--- a/node/src/manager/commands/provider_checks.rs
+++ b/node/src/manager/commands/provider_checks.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use graph::components::network_provider::chain_id_validator;
 use graph::components::network_provider::ChainIdentifierValidator;
 use graph::components::network_provider::ChainName;
 use graph::components::network_provider::ExtendedBlocksCheck;
@@ -9,9 +8,10 @@ use graph::components::network_provider::GenesisHashCheck;
 use graph::components::network_provider::NetworkDetails;
 use graph::components::network_provider::ProviderCheck;
 use graph::components::network_provider::ProviderCheckStatus;
-use graph::prelude::tokio;
+use graph::components::network_provider::chain_id_validator;
 use graph::prelude::CheapClone;
 use graph::prelude::Logger;
+use graph::prelude::tokio;
 use graph_store_postgres::BlockStore;
 use itertools::Itertools;
 
diff --git a/node/src/manager/commands/prune.rs b/node/src/manager/commands/prune.rs
index 5078ab37d02..82f4387dd4d 100644
--- a/node/src/manager/commands/prune.rs
+++ b/node/src/manager/commands/prune.rs
@@ -12,11 +12,11 @@ use graph::{
 use graph::{
     components::store::{PruneReporter, StatusStore},
     data::subgraph::status,
-    prelude::{anyhow, BlockNumber},
+    prelude::{BlockNumber, anyhow},
 };
 use graph_store_postgres::{
-    command_support::{Phase, PruneTableState},
     ConnectionPool, Store,
+    command_support::{Phase, PruneTableState},
 };
 use termcolor::Color;
 
@@ -194,7 +194,9 @@ async fn check_args(
         .ok_or_else(|| anyhow!("deployment {} does not index any chain", deployment))?;
     let latest_block = status.latest_block.map(|ptr| ptr.number()).unwrap_or(0);
     if latest_block <= history {
-        return Err(anyhow!("deployment {deployment} has only indexed up to block {latest_block} and we can't preserve {history} blocks of history"));
+        return Err(anyhow!(
+            "deployment {deployment} has only indexed up to block {latest_block} and we can't preserve {history} blocks of history"
+        ));
     }
     Ok(Args {
         history,
@@ -426,7 +428,8 @@ pub async fn status(
         let batch_size = batch_size.map_or_null(|b| b.to_string());
         let duration = started_at.map_or_null(|s| fmt::duration(s, &finished_at));
         let phase = phase.as_str();
-        writeln!(term,
+        writeln!(
+            term,
             "{table_name:<30} | {:<15} {complete:>6} | {rows:>8} | {batch_size:>11} | {duration:>8}",
             format!("{strategy}/{phase}")
         )?;
diff --git a/node/src/manager/commands/query.rs b/node/src/manager/commands/query.rs
index 04400bfb923..57937200839 100644
--- a/node/src/manager/commands/query.rs
+++ b/node/src/manager/commands/query.rs
@@ -9,8 +9,9 @@ use graph::prelude::{q, r};
 use graph::{
     data::query::QueryTarget,
     prelude::{
+        DeploymentHash, GraphQlRunner as _, Query, QueryVariables, SubgraphName,
         anyhow::{self, anyhow},
-        serde_json, DeploymentHash, GraphQlRunner as _, Query, QueryVariables, SubgraphName,
+        serde_json,
     },
 };
 use graph_graphql::prelude::GraphQlRunner;
diff --git a/node/src/manager/commands/remove.rs b/node/src/manager/commands/remove.rs
index 4311e824cbb..44a5e888f46 100644
--- a/node/src/manager/commands/remove.rs
+++ b/node/src/manager/commands/remove.rs
@@ -1,26 +1,13 @@
 use std::sync::Arc;
 
-use graph::prelude::{anyhow, Error, SubgraphName, SubgraphStore as _};
+use graph::prelude::{Error, SubgraphName, SubgraphStore as _, anyhow};
 use graph_store_postgres::SubgraphStore;
 
-use crate::manager::deployment::DeploymentSearch;
+pub async fn run(store: Arc<SubgraphStore>, name: &str) -> Result<(), Error> {
+    let name = SubgraphName::new(name).map_err(|name| anyhow!("illegal subgraph name `{name}`"))?;
 
-pub async fn run(store: Arc<SubgraphStore>, name: &DeploymentSearch) -> Result<(), Error> {
-    match name {
-        DeploymentSearch::Name { name } => {
-            let subgraph_name = SubgraphName::new(name)
-                .map_err(|name| anyhow!("illegal subgraph name `{name}`"))?;
-            println!("Removing subgraph {}", name);
-            store.remove_subgraph(subgraph_name).await?;
-            println!("Subgraph {} removed", name);
-        }
-        _ => {
-            return Err(anyhow!(
-                "Remove command expects a subgraph name, but got either hash or namespace: {}",
-                name
-            ))
-        }
-    }
+    println!("Removing subgraph {}", name);
+    store.remove_subgraph(name).await?;
 
     Ok(())
 }
diff --git a/node/src/manager/commands/restore.rs b/node/src/manager/commands/restore.rs
new file mode 100644
index 00000000000..432b65a85a1
--- /dev/null
+++ b/node/src/manager/commands/restore.rs
@@ -0,0 +1,235 @@
+use std::sync::Arc;
+use std::time::Instant;
+
+use console::style;
+use graph::components::store::RestoreReporter;
+use graph::env::ENV_VARS;
+use graph::{bail, prelude::anyhow::Result};
+use indicatif::ProgressBar;
+
+use graph::prelude::SubgraphName;
+use graph_store_postgres::{RestoreMode, Shard, SubgraphStore};
+
+struct RestoreProgress {
+    spinner: ProgressBar,
+    start: Instant,
+    phase_start: Instant,
+    table_rows: usize,
+    table_total: usize,
+    deployment: String,
+    namespace: String,
+    shard: String,
+}
+
+impl RestoreProgress {
+    fn new() -> Self {
+        let spinner = ProgressBar::new_spinner();
+        spinner.enable_steady_tick(std::time::Duration::from_millis(80));
+        Self {
+            spinner,
+            start: Instant::now(),
+            phase_start: Instant::now(),
+            table_rows: 0,
+            table_total: 0,
+            deployment: String::new(),
+            namespace: String::new(),
+            shard: String::new(),
+        }
+    }
+}
+
+impl RestoreReporter for RestoreProgress {
+    fn start(&mut self, deployment: &str, table_count: usize) {
+        self.deployment = deployment.to_string();
+        self.start = Instant::now();
+        self.spinner.set_message(format!(
+            "Restoring deployment {} ({} tables)",
+            style(deployment).cyan(),
+            table_count,
+        ));
+    }
+
+    fn start_create_schema(&mut self, namespace: &str, shard: &str) {
+        self.namespace = namespace.to_string();
+        self.shard = shard.to_string();
+        self.phase_start = Instant::now();
+        self.spinner.set_message(format!(
+            "Creating schema for {} in shard {}",
+            namespace, shard
+        ));
+    }
+
+    fn finish_create_schema(&mut self) {
+        let elapsed = self.phase_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>15} {:>4}s",
+            style("\u{2714}").green(),
+            format!("Schema for {} created", self.namespace),
+            "",
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn start_table(&mut self, table: &str, total_rows: usize) {
+        self.phase_start = Instant::now();
+        self.table_rows = 0;
+        self.table_total = total_rows;
+        self.spinner
+            .set_message(format!("{:<32} 0/{} rows", table, format_count(total_rows),));
+    }
+
+    fn batch_imported(&mut self, table: &str, rows: usize) {
+        self.table_rows += rows;
+        self.spinner.set_message(format!(
+            "{:<32} {}/{} rows",
+            table,
+            format_count(self.table_rows),
+            format_count(self.table_total),
+        ));
+    }
+
+    fn skip_table(&mut self, table: &str) {
+        let line = format!(
+            "  {} {:<32} {:>15}",
+            style("\u{2714}").green(),
+            table,
+            "skipped",
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn finish_table(&mut self, table: &str, rows: usize) {
+        let elapsed = self.phase_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>10} rows {:>4}s",
+            style("\u{2714}").green(),
+            table,
+            format_count(rows),
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn start_data_sources(&mut self, total_rows: usize) {
+        self.phase_start = Instant::now();
+        self.table_rows = 0;
+        self.table_total = total_rows;
+        self.spinner.set_message(format!(
+            "data_sources$  0/{} rows",
+            format_count(total_rows)
+        ));
+    }
+
+    fn finish_data_sources(&mut self, rows: usize) {
+        let elapsed = self.phase_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>10} rows {:>4}s",
+            style("\u{2714}").green(),
+            "data_sources$",
+            format_count(rows),
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn start_finalize(&mut self) {
+        self.phase_start = Instant::now();
+        self.spinner.set_message("Finalizing".to_string());
+    }
+
+    fn finish_finalize(&mut self) {
+        let elapsed = self.phase_start.elapsed().as_secs();
+        let line = format!(
+            "  {} {:<32} {:>15} {:>4}s",
+            style("\u{2714}").green(),
+            "Finalized",
+            "",
+            elapsed,
+        );
+        self.spinner.suspend(|| println!("{line}"));
+    }
+
+    fn finish(&mut self) {
+        let elapsed = self.start.elapsed().as_secs();
+        self.spinner.finish_with_message(format!(
+            "{} Restore complete ({}s)",
+            style("\u{2714}").green(),
+            elapsed,
+        ));
+    }
+}
+
+fn format_count(n: usize) -> String {
+    if n == 0 {
+        return "0".to_string();
+    }
+    let s = n.to_string();
+    let mut result = String::new();
+    for (i, c) in s.chars().rev().enumerate() {
+        if i > 0 && i % 3 == 0 {
+            result.push(',');
+        }
+        result.push(c);
+    }
+    result.chars().rev().collect()
+}
+
+pub async fn run(
+    subgraph_store: Arc<SubgraphStore>,
+    directory: String,
+    shard: Option<String>,
+    name: Option<String>,
+    replace: bool,
+    add: bool,
+    force: bool,
+) -> Result<()> {
+    if add && shard.is_none() {
+        bail!("--add requires --shard");
+    }
+
+    let directory = std::path::Path::new(&directory).canonicalize()?;
+    let stat = std::fs::metadata(&directory)?;
+
+    if !stat.is_dir() {
+        bail!(
+            "The path `{}` is not a directory",
+            directory.to_string_lossy()
+        );
+    }
+
+    let name = name
+        .map(|n| SubgraphName::new(n.clone()).map_err(|_| anyhow::anyhow!("invalid name `{n}`")))
+        .transpose()?;
+
+    let mode = if replace {
+        RestoreMode::Replace
+    } else if add {
+        RestoreMode::Add
+    } else if force {
+        RestoreMode::Force
+    } else {
+        RestoreMode::Default
+    };
+
+    let shard = shard.map(Shard::new).transpose()?;
+
+    let version_switching_mode = ENV_VARS.subgraph_version_switching_mode;
+
+    let mut reporter = Box::new(RestoreProgress::new());
+    subgraph_store
+        .restore(
+            &directory,
+            shard,
+            name,
+            mode,
+            version_switching_mode,
+            &mut *reporter,
+        )
+        .await?;
+    println!(
+        "Restored {} into {} in shard {}",
+        reporter.deployment, reporter.namespace, reporter.shard
+    );
+    Ok(())
+}
diff --git a/node/src/manager/commands/rewind.rs b/node/src/manager/commands/rewind.rs
index 0ca0c9d2bd2..55628c2de3c 100644
--- a/node/src/manager/commands/rewind.rs
+++ b/node/src/manager/commands/rewind.rs
@@ -8,7 +8,7 @@ use crate::manager::deployment::DeploymentSearch;
 use graph::anyhow::bail;
 use graph::components::store::{BlockStore as _, ChainStore as _, DeploymentLocator};
 use graph::env::ENV_VARS;
-use graph::prelude::{anyhow, BlockNumber, BlockPtr};
+use graph::prelude::{BlockNumber, BlockPtr, anyhow};
 use graph_store_postgres::command_support::catalog::{self as store_catalog};
 use graph_store_postgres::{BlockStore, NotificationSender};
 use graph_store_postgres::{ConnectionPool, Store};
@@ -176,12 +176,12 @@ pub async fn run(
 
         match (block_ptr_to, start_block) {
             (Some(block_ptr), _) => {
-                subgraph_store.rewind(loc.hash.clone(), block_ptr).await?;
+                subgraph_store.rewind(loc.id.into(), block_ptr).await?;
                 println!("  ... rewound {}", loc);
             }
             (None, Some(start_block_ptr)) => {
                 subgraph_store
-                    .truncate(loc.hash.clone(), start_block_ptr)
+                    .truncate(loc.id.into(), start_block_ptr)
                     .await?;
                 println!("  ... truncated {}", loc);
             }
diff --git a/node/src/manager/commands/run.rs b/node/src/manager/commands/run.rs
index 4a3a94e92ec..bbe9e1faf18 100644
--- a/node/src/manager/commands/run.rs
+++ b/node/src/manager/commands/run.rs
@@ -2,11 +2,11 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
 
+use crate::MetricsContext;
 use crate::config::Config;
 use crate::manager::PanicSubscriptionManager;
 use crate::network_setup::Networks;
 use crate::store_builder::StoreBuilder;
-use crate::MetricsContext;
 use graph::amp;
 use graph::anyhow::bail;
 use graph::cheap_clone::CheapClone;
@@ -17,11 +17,11 @@ use graph::components::subgraph::{Settings, SubgraphInstanceManager as _};
 use graph::endpoint::EndpointMetrics;
 use graph::env::EnvVars;
 use graph::prelude::{
-    anyhow, tokio, BlockNumber, DeploymentHash, IpfsResolver, LoggerFactory, NodeId,
+    BlockNumber, DeploymentHash, ENV_VARS, IpfsResolver, LoggerFactory, NodeId,
     SubgraphCountMetric, SubgraphName, SubgraphRegistrar, SubgraphStore,
-    SubgraphVersionSwitchingMode, ENV_VARS,
+    SubgraphVersionSwitchingMode, anyhow, tokio,
 };
-use graph::slog::{debug, info, Logger};
+use graph::slog::{Logger, debug, info};
 use graph_core::polling_monitor::{arweave_service, ipfs_service};
 use tokio_util::sync::CancellationToken;
 
@@ -209,6 +209,7 @@ pub async fn run(
 
     let panicking_subscription_manager = Arc::new(PanicSubscriptionManager {});
 
+    let amp_chain_names = Arc::new(config.amp_chain_names());
     let subgraph_registrar = Arc::new(graph_core::subgraph::SubgraphRegistrar::new(
         &logger_factory,
         link_resolver.cheap_clone(),
@@ -220,6 +221,7 @@ pub async fn run(
         node_id.clone(),
         SubgraphVersionSwitchingMode::Instant,
         Arc::new(Settings::default()),
+        amp_chain_names,
     ));
 
     let (name, hash) = if subgraph.contains(':') {
diff --git a/node/src/manager/commands/stats.rs b/node/src/manager/commands/stats.rs
index 34405b05e9b..bbb219bf11c 100644
--- a/node/src/manager/commands/stats.rs
+++ b/node/src/manager/commands/stats.rs
@@ -6,15 +6,15 @@ use crate::manager::deployment::DeploymentSearch;
 use crate::manager::fmt;
 use graph::components::store::DeploymentLocator;
 use graph::components::store::VersionStats;
-use graph::prelude::anyhow;
 use graph::prelude::CheapClone as _;
-use graph_store_postgres::command_support::catalog as store_catalog;
-use graph_store_postgres::command_support::catalog::Site;
+use graph::prelude::anyhow;
 use graph_store_postgres::AsyncPgConnection;
 use graph_store_postgres::ConnectionPool;
+use graph_store_postgres::PRIMARY_SHARD;
 use graph_store_postgres::Shard;
 use graph_store_postgres::SubgraphStore;
-use graph_store_postgres::PRIMARY_SHARD;
+use graph_store_postgres::command_support::catalog as store_catalog;
+use graph_store_postgres::command_support::catalog::Site;
 
 async fn site_and_conn(
     pools: HashMap<Shard, ConnectionPool>,
diff --git a/node/src/manager/commands/unused_deployments.rs b/node/src/manager/commands/unused_deployments.rs
index 5690a7485af..c14f7662d7a 100644
--- a/node/src/manager/commands/unused_deployments.rs
+++ b/node/src/manager/commands/unused_deployments.rs
@@ -1,7 +1,7 @@
 use std::{sync::Arc, time::Instant};
 
 use graph::prelude::{anyhow::Error, chrono};
-use graph_store_postgres::{unused, SubgraphStore, UnusedDeployment};
+use graph_store_postgres::{SubgraphStore, UnusedDeployment, unused};
 
 use crate::manager::{deployment::DeploymentSearch, display::List};
 
diff --git a/node/src/manager/deployment.rs b/node/src/manager/deployment.rs
index eb5b575eb4e..4dd31fbbec0 100644
--- a/node/src/manager/deployment.rs
+++ b/node/src/manager/deployment.rs
@@ -12,7 +12,7 @@ use diesel_async::RunQueryDsl;
 use graph::components::store::DeploymentId;
 use graph::{
     components::store::DeploymentLocator,
-    prelude::{anyhow, lazy_static, regex::Regex, DeploymentHash},
+    prelude::{DeploymentHash, anyhow, lazy_static, regex::Regex},
 };
 use graph_store_postgres::command_support::catalog as store_catalog;
 use graph_store_postgres::unused;
diff --git a/node/src/manager/fmt.rs b/node/src/manager/fmt.rs
index 45807fecbf7..e476bb876dd 100644
--- a/node/src/manager/fmt.rs
+++ b/node/src/manager/fmt.rs
@@ -76,8 +76,8 @@ pub fn abbreviate(name: &str, size: usize) -> String {
         let last = name.len() - fragment;
         let mut name = name.to_string();
         name.replace_range(fragment..last, "..");
-        let table = name.trim().to_string();
-        table
+
+        name.trim().to_string()
     } else {
         name.to_string()
     }
diff --git a/node/src/manager/mod.rs b/node/src/manager/mod.rs
index d95e5fbadc1..7c3ae84793d 100644
--- a/node/src/manager/mod.rs
+++ b/node/src/manager/mod.rs
@@ -1,6 +1,6 @@
 use graph::{
     components::store::SubscriptionManager,
-    prelude::{anyhow, StoreEventStreamBox},
+    prelude::{StoreEventStreamBox, anyhow},
 };
 
 pub mod catalog;
diff --git a/node/src/network_setup.rs b/node/src/network_setup.rs
index 8de5532e8ff..e1630786345 100644
--- a/node/src/network_setup.rs
+++ b/node/src/network_setup.rs
@@ -1,6 +1,7 @@
 use ethereum::{
-    network::{EthereumNetworkAdapter, EthereumNetworkAdapters},
     BlockIngestor,
+    chain::ChainSettings,
+    network::{EthereumNetworkAdapter, EthereumNetworkAdapters},
 };
 use graph::components::network_provider::ChainName;
 use graph::components::network_provider::NetworkDetails;
@@ -19,19 +20,20 @@ use graph::{
     itertools::Itertools,
     log::factory::LoggerFactory,
     prelude::{
-        anyhow::{anyhow, Result},
-        info, Logger,
+        Logger,
+        anyhow::{Result, anyhow},
+        info,
     },
-    slog::{o, warn, Discard},
+    slog::{Discard, o, warn},
 };
 use graph_chain_ethereum as ethereum;
 use graph_store_postgres::{BlockStore, ChainHeadUpdateListener};
 
-use std::{any::Any, cmp::Ordering, sync::Arc, time::Duration};
+use std::{any::Any, cmp::Ordering, sync::Arc};
 
 use crate::chain::{
-    create_ethereum_networks, create_firehose_networks, networks_as_chains, AnyChainFilter,
-    ChainFilter, OneChainFilter,
+    AnyChainFilter, ChainFilter, OneChainFilter, create_ethereum_networks,
+    create_firehose_networks, networks_as_chains,
 };
 
 #[derive(Debug, Clone)]
@@ -39,9 +41,7 @@ pub struct EthAdapterConfig {
     pub chain_id: ChainName,
     pub adapters: Vec<EthereumNetworkAdapter>,
     pub call_only: Vec<EthereumNetworkAdapter>,
-    // polling interval is set per chain so if set all adapter configuration will have
-    // the same value.
-    pub polling_interval: Option<Duration>,
+    pub settings: Arc<ChainSettings>,
 }
 
 #[derive(Debug, Clone)]
@@ -130,13 +130,13 @@ impl Networks {
                     Ok(ident) => return Ok(ident),
                     Err(err) => {
                         warn!(
-                        logger,
-                        "unable to get chain identification from {} provider {} for chain {}, err: {}",
-                        provider_type,
-                        adapter.provider_name(),
-                        chain_id,
-                        err.to_string(),
-                    );
+                            logger,
+                            "unable to get chain identification from {} provider {} for chain {}, err: {}",
+                            provider_type,
+                            adapter.provider_name(),
+                            chain_id,
+                            err.to_string(),
+                        );
                     }
                 }
             }
@@ -182,7 +182,7 @@ impl Networks {
             endpoint_metrics.cheap_clone(),
             chain_filter,
         );
-        let adapters: Vec<_> = eth.into_iter().chain(firehose.into_iter()).collect();
+        let adapters: Vec<_> = eth.into_iter().chain(firehose).collect();
 
         Ok(Networks::new(&logger, adapters, provider_checks))
     }
@@ -236,7 +236,7 @@ impl Networks {
                  chain_id,
                  mut adapters,
                  call_only: _,
-                 polling_interval: _,
+                 settings: _,
              }| {
                 adapters.sort_by(|a, b| {
                     a.capabilities
@@ -261,7 +261,7 @@ impl Networks {
             )
             .collect_vec();
 
-        let s = Self {
+        Self {
             adapters: adapters2,
             rpc_provider_manager: ProviderManager::new(
                 logger.clone(),
@@ -273,9 +273,7 @@ impl Networks {
                 firehose_adapters,
                 ProviderCheckStrategy::RequireAll(provider_checks),
             ),
-        };
-
-        s
+        }
     }
 
     pub async fn block_ingestors(
diff --git a/node/src/opt.rs b/node/src/opt.rs
index 3708a7da493..dbcd3b68cf9 100644
--- a/node/src/opt.rs
+++ b/node/src/opt.rs
@@ -82,7 +82,7 @@ pub struct Opt {
         conflicts_with_all = &["ethereum_ws", "ethereum_ipc", "config"],
         value_name="NETWORK_NAME:[CAPABILITIES]:URL",
         env="ETHEREUM_RPC",
-        help= "Ethereum network name (e.g. 'mainnet'), optional comma-seperated capabilities (eg 'full,archive'), and an Ethereum RPC URL, separated by a ':'",
+        help= "Ethereum network name (e.g. 'mainnet'), optional comma-separated capabilities (eg 'full,archive'), and an Ethereum RPC URL, separated by a ':'",
     )]
     pub ethereum_rpc: Vec<String>,
     #[clap(long, allow_negative_numbers = false,
@@ -90,7 +90,7 @@ pub struct Opt {
         conflicts_with_all = &["ethereum_rpc", "ethereum_ipc", "config"],
         value_name="NETWORK_NAME:[CAPABILITIES]:URL",
         env="ETHEREUM_WS",
-        help= "Ethereum network name (e.g. 'mainnet'), optional comma-seperated capabilities (eg 'full,archive`, and an Ethereum WebSocket URL, separated by a ':'",
+        help= "Ethereum network name (e.g. 'mainnet'), optional comma-separated capabilities (eg 'full,archive`, and an Ethereum WebSocket URL, separated by a ':'",
     )]
     pub ethereum_ws: Vec<String>,
     #[clap(long,
@@ -99,7 +99,7 @@ pub struct Opt {
         conflicts_with_all = &["ethereum_rpc", "ethereum_ws", "config"],
         value_name="NETWORK_NAME:[CAPABILITIES]:FILE",
         env="ETHEREUM_IPC",
-        help= "Ethereum network name (e.g. 'mainnet'), optional comma-seperated capabilities (eg 'full,archive'), and an Ethereum IPC pipe, separated by a ':'",
+        help= "Ethereum network name (e.g. 'mainnet'), optional comma-separated capabilities (eg 'full,archive'), and an Ethereum IPC pipe, separated by a ':'",
     )]
     pub ethereum_ipc: Vec<String>,
     #[clap(
@@ -165,28 +165,6 @@ pub struct Opt {
     #[clap(long, help = "Enable debug logging")]
     pub debug: bool,
 
-    #[clap(
-        long,
-        value_name = "URL",
-        env = "ELASTICSEARCH_URL",
-        help = "Elasticsearch service to write subgraph logs to"
-    )]
-    pub elasticsearch_url: Option<String>,
-    #[clap(
-        long,
-        value_name = "USER",
-        env = "ELASTICSEARCH_USER",
-        help = "User to use for Elasticsearch logging"
-    )]
-    pub elasticsearch_user: Option<String>,
-    #[clap(
-        long,
-        value_name = "PASSWORD",
-        env = "ELASTICSEARCH_PASSWORD",
-        hide_env_values = true,
-        help = "Password to use for Elasticsearch logging"
-    )]
-    pub elasticsearch_password: Option<String>,
     #[clap(
         long,
         value_name = "DISABLE_BLOCK_INGESTOR",
diff --git a/node/src/store_builder.rs b/node/src/store_builder.rs
index d54a64f5b06..fb3737e5b89 100644
--- a/node/src/store_builder.rs
+++ b/node/src/store_builder.rs
@@ -1,18 +1,19 @@
 use std::iter::FromIterator;
 use std::{collections::HashMap, sync::Arc};
 
-use graph::prelude::{o, MetricsRegistry, NodeId};
+use graph::components::store::BLOCK_CACHE_SIZE;
+use graph::prelude::{MetricsRegistry, NodeId, o};
 use graph::slog::warn;
 use graph::url::Url;
 use graph::{
-    prelude::{info, CheapClone, Logger},
+    prelude::{CheapClone, Logger, info},
     util::security::SafeDisplay,
 };
 use graph_store_postgres::{
     BlockStore as DieselBlockStore, ChainHeadUpdateListener as PostgresChainHeadUpdateListener,
-    ChainStoreMetrics, ConnectionPool, ForeignServer, NotificationSender, PoolCoordinator,
-    PoolRole, Shard as ShardName, Store as DieselStore, SubgraphStore, SubscriptionManager,
-    PRIMARY_SHARD,
+    ChainStoreMetrics, ConnectionPool, ForeignServer, NotificationSender, PRIMARY_SHARD,
+    PoolCoordinator, PoolRole, Shard as ShardName, Store as DieselStore, SubgraphStore,
+    SubscriptionManager,
 };
 
 use crate::config::{Config, Shard};
@@ -24,7 +25,8 @@ pub struct StoreBuilder {
     subscription_manager: Arc<SubscriptionManager>,
     chain_head_update_listener: Arc<PostgresChainHeadUpdateListener>,
     /// Map network names to the shards where they are/should be stored
-    chains: HashMap<String, ShardName>,
+    /// and their cache_size setting
+    chains: HashMap<String, (ShardName, i32)>,
     pub coord: Arc<PoolCoordinator>,
     registry: Arc<MetricsRegistry>,
 }
@@ -65,7 +67,7 @@ impl StoreBuilder {
         let chains = HashMap::from_iter(config.chains.chains.iter().map(|(name, chain)| {
             let shard = ShardName::new(chain.shard.to_string())
                 .expect("config validation catches invalid names");
-            (name.to_string(), shard)
+            (name.to_string(), (shard, chain.cache_size))
         }));
 
         let chain_head_update_listener = Arc::new(PostgresChainHeadUpdateListener::new(
@@ -177,15 +179,18 @@ impl StoreBuilder {
         logger: &Logger,
         pools: HashMap<ShardName, ConnectionPool>,
         subgraph_store: Arc<SubgraphStore>,
-        chains: HashMap<String, ShardName>,
+        chains: HashMap<String, (ShardName, i32)>,
         networks: Vec<String>,
         registry: Arc<MetricsRegistry>,
     ) -> Arc<DieselStore> {
         let networks = networks
             .into_iter()
             .map(|name| {
-                let shard = chains.get(&name).unwrap_or(&*PRIMARY_SHARD).clone();
-                (name, shard)
+                let (shard, cache_size) = chains
+                    .get(&name)
+                    .cloned()
+                    .unwrap_or_else(|| (PRIMARY_SHARD.clone(), BLOCK_CACHE_SIZE));
+                (name, shard, cache_size)
             })
             .collect();
 
diff --git a/package.json b/package.json
index 2fd2303149e..9b54a0cd667 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,7 @@
 {
   "private": true,
-  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748"
+  "packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
+  "devDependencies": {
+    "assemblyscript": "0.19.23"
+  }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9276137fd13..deb287d228f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,72 +6,61 @@ settings:
 
 importers:
 
-  .: {}
+  .:
+    devDependencies:
+      assemblyscript:
+        specifier: 0.19.23
+        version: 0.19.23
 
   tests/integration-tests/base:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/block-handlers:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/declared-calls-basic:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.97.1
-        version: 0.97.1(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@graphprotocol/graph-ts':
         specifier: 0.33.0
         version: 0.33.0
 
   tests/integration-tests/declared-calls-struct-fields:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.97.1
-        version: 0.97.1(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@graphprotocol/graph-ts':
         specifier: 0.33.0
         version: 0.33.0
 
   tests/integration-tests/ethereum-api-tests:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.36.0-alpha-20240422133139-8761ea3
         version: 0.36.0-alpha-20240422133139-8761ea3
 
   tests/integration-tests/grafted:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/host-exports:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/int8:
+    devDependencies:
+      '@graphprotocol/graph-ts':
+        specifier: 0.34.0
+        version: 0.34.0
+
+  tests/integration-tests/logs-query:
     devDependencies:
       '@graphprotocol/graph-cli':
         specifier: 0.69.0
@@ -82,121 +71,91 @@ importers:
 
   tests/integration-tests/multiple-subgraph-datasources:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc
-        version: 0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@graphprotocol/graph-ts':
         specifier: 0.36.0-alpha-20241129215038-b75cda9
         version: 0.36.0-alpha-20241129215038-b75cda9
 
   tests/integration-tests/non-fatal-errors:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/overloaded-functions:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/poi-for-failed-subgraph:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/remove-then-update:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/reverted-calls:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/source-subgraph:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.91.0-alpha-20241129215038-b75cda9
-        version: 0.91.0-alpha-20241129215038-b75cda9(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.36.0-alpha-20241129215038-b75cda9
         version: 0.36.0-alpha-20241129215038-b75cda9
 
   tests/integration-tests/source-subgraph-a:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/source-subgraph-b:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/subgraph-data-sources:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc
-        version: 0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@graphprotocol/graph-ts':
         specifier: 0.36.0-alpha-20241129215038-b75cda9
         version: 0.36.0-alpha-20241129215038-b75cda9
 
   tests/integration-tests/timestamp:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
   tests/integration-tests/topic-filter:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.71.0-alpha-20240419180731-51ea29d
-        version: 0.71.0-alpha-20240419180731-51ea29d(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.35.0
         version: 0.35.0
 
   tests/integration-tests/value-roundtrip:
     devDependencies:
-      '@graphprotocol/graph-cli':
-        specifier: 0.69.0
-        version: 0.69.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
       '@graphprotocol/graph-ts':
         specifier: 0.34.0
         version: 0.34.0
 
+  tests/runner-tests/aggregation-current-bucket:
+    devDependencies:
+      '@graphprotocol/graph-cli':
+        specifier: 0.98.1
+        version: 0.98.1(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)
+      '@graphprotocol/graph-ts':
+        specifier: 0.35.0
+        version: 0.35.0
+
   tests/runner-tests/api-version:
     devDependencies:
       '@graphprotocol/graph-cli':
@@ -308,11 +267,14 @@ importers:
         specifier: 0.31.0
         version: 0.31.0
 
-  tests/runner-tests/substreams:
+  tests/runner-tests/skip-duplicates:
     devDependencies:
       '@graphprotocol/graph-cli':
-        specifier: 0.61.0
-        version: 0.61.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
+        specifier: 0.60.0
+        version: 0.60.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)
+      '@graphprotocol/graph-ts':
+        specifier: 0.31.0
+        version: 0.31.0
 
   tests/runner-tests/typename:
     devDependencies:
@@ -419,33 +381,13 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  '@graphprotocol/graph-cli@0.61.0':
-    resolution: {integrity: sha512-gc3+DioZ/K40sQCt6DsNvbqfPTc9ZysuSz3I9MJ++bD6SftaSSweWwfpPysDMzDuxvUAhLAsJ6QjBACPngT2Kw==}
-    engines: {node: '>=14'}
-    hasBin: true
-
   '@graphprotocol/graph-cli@0.69.0':
     resolution: {integrity: sha512-DoneR0TRkZYumsygdi/RST+OB55TgwmhziredI21lYzfj0QNXGEHZOagTOKeFKDFEpP3KR6BAq6rQIrkprJ1IQ==}
     engines: {node: '>=18'}
     hasBin: true
 
-  '@graphprotocol/graph-cli@0.71.0-alpha-20240419180731-51ea29d':
-    resolution: {integrity: sha512-S8TRg4aHzsRQ0I7aJl91d4R2qoPzK0svrRpFcqzZ4AoYr52yBdmPo4yTsSDlB8sQl2zz2e5avJ5r1avU1J7m+g==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  '@graphprotocol/graph-cli@0.91.0-alpha-20241129215038-b75cda9':
-    resolution: {integrity: sha512-LpfQPjOkCOquTeWqeeC9MJr4eTyKspl2g8u/K8S8qe3SKzMmuHcwQfq/dgBxCbs3m+4vrDYJgDUcQNJ6W5afyw==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  '@graphprotocol/graph-cli@0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc':
-    resolution: {integrity: sha512-+pleAuy1422Q26KCNjMd+DJvjazEb3rSRTM+Y0cRwdMJtl2qcDAXUcg9E/9z+tpCFxx61ujf7T3z04x8Tlq+Lg==}
-    engines: {node: '>=20.18.1'}
-    hasBin: true
-
-  '@graphprotocol/graph-cli@0.97.1':
-    resolution: {integrity: sha512-j5dc2Tl694jMZmVQu8SSl5Yt3VURiBPgglQEpx30aW6UJ89eLR/x46Nn7S6eflV69fmB5IHAuAACnuTzo8MD0Q==}
+  '@graphprotocol/graph-cli@0.98.1':
+    resolution: {integrity: sha512-GrWFcRCBlLcRT+gIGundQl7yyrX3YWUPj66bxThKf5CJvvWXdZoNxrj27dMMqulsSwYmpCkb3YmpCiVJFGdpHw==}
     engines: {node: '>=20.18.1'}
     hasBin: true
 
@@ -706,16 +648,8 @@ packages:
     resolution: {integrity: sha512-1QlPaHMhOORySCXkQyzjsIsy2GYTilOw3LkjeHkCgsPJQjAT4IclVytJusWktPbYNys9O+O4V23J44yomQvnBQ==}
     engines: {node: '>=14.0.0'}
 
-  '@oclif/core@4.0.34':
-    resolution: {integrity: sha512-jHww7lIqyifamynDSjDNNjNOwFTQdKYeOSYaxUaoWhqXnRwacZ+pfUN4Y0L9lqSN4MQtlWM9mwnBD7FvlT9kPw==}
-    engines: {node: '>=18.0.0'}
-
-  '@oclif/core@4.3.0':
-    resolution: {integrity: sha512-lIzHY+JMP6evrS5E/sGijNnwrCoNtGy8703jWXcMuPOYKiFhWoAqnIm1BGgoRgmxczkbSfRsHUL/lwsSgh74Lw==}
-    engines: {node: '>=18.0.0'}
-
-  '@oclif/core@4.5.2':
-    resolution: {integrity: sha512-eQcKyrEcDYeZJKu4vUWiu0ii/1Gfev6GF4FsLSgNez5/+aQyAUCjg3ZWlurf491WiYZTXCWyKAxyPWk8DKv2MA==}
+  '@oclif/core@4.5.5':
+    resolution: {integrity: sha512-iQzlaJQgPeUXrtrX71OzDwxPikQ7c2FhNd8U8rBB7BCtj2XYfmzBT/Hmbc+g9OKDIG/JkbJT0fXaWMMBrhi+1A==}
     engines: {node: '>=18.0.0'}
 
   '@oclif/plugin-autocomplete@2.3.10':
@@ -749,8 +683,8 @@ packages:
     resolution: {integrity: sha512-BRs5XUAwiyCDQMsVA9IDvDa7UBR9gAvPHgugOeGng3YN6vJ9JYonyDc0lNczErgtCWtucjR5N7VtaonboD/ezg==}
     engines: {node: '>=10.12.0'}
 
-  '@pinax/graph-networks-registry@0.6.7':
-    resolution: {integrity: sha512-xogeCEZ50XRMxpBwE3TZjJ8RCO8Guv39gDRrrKtlpDEDEMLm0MzD3A0SQObgj7aF7qTZNRTWzsuvQdxgzw25wQ==}
+  '@pinax/graph-networks-registry@0.7.1':
+    resolution: {integrity: sha512-Gn2kXRiEd5COAaMY/aDCRO0V+zfb1uQKCu5HFPoWka+EsZW27AlTINA7JctYYYEMuCbjMia5FBOzskjgEvj6LA==}
 
   '@pnpm/config.env-replace@1.1.0':
     resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==}
@@ -1051,9 +985,6 @@ packages:
   axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
 
-  axios@0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -1074,11 +1005,6 @@ packages:
     resolution: {integrity: sha512-v7ms6N/H7iciuk6QInon3/n2mu7oRX+6knJ9xFPsJ3rQePgAqcR3CRTwUheFd8SLbiq4LL7Z4G/44L9zscdt9A==}
     engines: {node: '>=10'}
 
-  binary-install@1.1.2:
-    resolution: {integrity: sha512-ZS2cqFHPZOy4wLxvzqfQvDjCOifn+7uCPqNmYRIBM/03+yllON+4fNnsD0VJdW0p97y+E+dTRNPStWNqMBq+9g==}
-    engines: {node: '>=10'}
-    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
-
   binaryen@101.0.0-nightly.20210723:
     resolution: {integrity: sha512-eioJNqhHlkguVSbblHOtLqlhtC882SOEPKmNFZaDuz1hzQjolxZ+eu3/kaS10n3sGPONsIZsO7R9fR00UyhEUA==}
     hasBin: true
@@ -1142,6 +1068,9 @@ packages:
   buffer-alloc@1.2.0:
     resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
 
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
   buffer-fill@1.0.0:
     resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
 
@@ -1151,6 +1080,9 @@ packages:
   buffer-xor@1.0.3:
     resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
 
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
   buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
 
@@ -1216,10 +1148,6 @@ packages:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
 
-  chokidar@4.0.1:
-    resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==}
-    engines: {node: '>= 14.16.0'}
-
   chokidar@4.0.3:
     resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
     engines: {node: '>= 14.16.0'}
@@ -1355,8 +1283,8 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.3.7:
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -1364,8 +1292,8 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.4.1:
-    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -1373,6 +1301,26 @@ packages:
       supports-color:
         optional: true
 
+  decompress-tar@4.1.1:
+    resolution: {integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==}
+    engines: {node: '>=4'}
+
+  decompress-tarbz2@4.1.1:
+    resolution: {integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==}
+    engines: {node: '>=4'}
+
+  decompress-targz@4.1.1:
+    resolution: {integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==}
+    engines: {node: '>=4'}
+
+  decompress-unzip@4.0.1:
+    resolution: {integrity: sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw==}
+    engines: {node: '>=4'}
+
+  decompress@4.2.1:
+    resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==}
+    engines: {node: '>=4'}
+
   default-browser-id@5.0.0:
     resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}
     engines: {node: '>=18'}
@@ -1388,10 +1336,6 @@ packages:
     resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
     engines: {node: '>= 0.4'}
 
-  define-lazy-prop@2.0.0:
-    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
-    engines: {node: '>=8'}
-
   define-lazy-prop@3.0.0:
     resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
     engines: {node: '>=12'}
@@ -1423,12 +1367,8 @@ packages:
     resolution: {integrity: sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==}
     engines: {node: '>= 6.0.0'}
 
-  docker-compose@1.1.0:
-    resolution: {integrity: sha512-VrkQJNafPQ5d6bGULW0P6KqcxSkv3ZU5Wn2wQA19oB71o7+55vQ9ogFe2MMeNbK+jc9rrKVy280DnHO5JLMWOQ==}
-    engines: {node: '>= 6.0.0'}
-
-  docker-compose@1.2.0:
-    resolution: {integrity: sha512-wIU1eHk3Op7dFgELRdmOYlPYS4gP8HhH1ZmZa13QZF59y0fblzFDFmKPhyc05phCy2hze9OEvNZAsoljrs+72w==}
+  docker-compose@1.3.0:
+    resolution: {integrity: sha512-7Gevk/5eGD50+eMD+XDnFnOrruFkL0kSd7jEG4cjmqweDSUhB7i0g8is/nBdVpl+Bx338SqIB2GLKm32M+Vs6g==}
     engines: {node: '>= 6.0.0'}
 
   docker-modem@1.0.9:
@@ -1602,6 +1542,9 @@ packages:
   fastq@1.19.1:
     resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
 
+  fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
     engines: {node: '>=12.0.0'}
@@ -1611,6 +1554,18 @@ packages:
       picomatch:
         optional: true
 
+  file-type@3.9.0:
+    resolution: {integrity: sha512-RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA==}
+    engines: {node: '>=0.10.0'}
+
+  file-type@5.2.0:
+    resolution: {integrity: sha512-Iq1nJ6D2+yIO4c8HHg4fyVb8mAJieo1Oloy1mLLaB2PvezNedhBVm+QU7g0qM42aiMbRXTxKKwGD17rjKNJYVQ==}
+    engines: {node: '>=4'}
+
+  file-type@6.2.0:
+    resolution: {integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==}
+    engines: {node: '>=4'}
+
   filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
 
@@ -1649,12 +1604,8 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
-  fs-extra@11.2.0:
-    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
-    engines: {node: '>=14.14'}
-
-  fs-extra@11.3.0:
-    resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==}
+  fs-extra@11.3.2:
+    resolution: {integrity: sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==}
     engines: {node: '>=14.14'}
 
   fs-extra@9.1.0:
@@ -1698,6 +1649,10 @@ packages:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
 
+  get-stream@2.3.1:
+    resolution: {integrity: sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA==}
+    engines: {node: '>=0.10.0'}
+
   get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
@@ -1709,13 +1664,8 @@ packages:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
 
-  glob@11.0.0:
-    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
-    engines: {node: 20 || >=22}
-    hasBin: true
-
-  glob@11.0.2:
-    resolution: {integrity: sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==}
+  glob@11.0.3:
+    resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
     engines: {node: 20 || >=22}
     hasBin: true
 
@@ -1766,10 +1716,6 @@ packages:
     resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==}
     engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
 
-  graphql@16.9.0:
-    resolution: {integrity: sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==}
-    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
-
   har-schema@2.0.0:
     resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
     engines: {node: '>=4'}
@@ -1855,11 +1801,8 @@ packages:
   immutable@4.2.1:
     resolution: {integrity: sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ==}
 
-  immutable@5.0.3:
-    resolution: {integrity: sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==}
-
-  immutable@5.1.2:
-    resolution: {integrity: sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==}
+  immutable@5.1.4:
+    resolution: {integrity: sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==}
 
   import-fresh@3.3.1:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
@@ -1980,6 +1923,9 @@ packages:
     resolution: {integrity: sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==}
     engines: {node: '>=8'}
 
+  is-natural-number@4.0.1:
+    resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==}
+
   is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
@@ -1996,6 +1942,10 @@ packages:
     resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==}
     engines: {node: '>=0.10.0'}
 
+  is-stream@1.1.0:
+    resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
+    engines: {node: '>=0.10.0'}
+
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -2098,11 +2048,6 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  jayson@4.1.3:
-    resolution: {integrity: sha512-LtXh5aYZodBZ9Fc3j6f2w+MTNcnxteMOrb+QgIouguGOulWi0lieEkOUg+HkjjFs0DGoWDds6bi4E9hpNFLulQ==}
-    engines: {node: '>=8'}
-    hasBin: true
-
   jayson@4.2.0:
     resolution: {integrity: sha512-VfJ9t1YLwacIubLhONk0KFeosUBwstRWQ0IRT1KDjEjnVnSOVHC3uwugyV7L0c7R9lpVyrUGT2XWiBA1UTtpyg==}
     engines: {node: '>=8'}
@@ -2237,6 +2182,10 @@ packages:
   main-event@1.0.1:
     resolution: {integrity: sha512-NWtdGrAca/69fm6DIVd8T9rtfDII4Q8NQbIbsKQq2VzS9eqOGYs8uaNQjcuaCq/d9H/o625aOTJX2Qoxzqw0Pw==}
 
+  make-dir@1.3.0:
+    resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
+    engines: {node: '>=4'}
+
   make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
@@ -2447,18 +2396,10 @@ packages:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
     engines: {node: '>=6'}
 
-  open@10.1.0:
-    resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==}
-    engines: {node: '>=18'}
-
-  open@10.1.2:
-    resolution: {integrity: sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==}
+  open@10.2.0:
+    resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==}
     engines: {node: '>=18'}
 
-  open@8.4.2:
-    resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
-    engines: {node: '>=12'}
-
   ora@4.0.2:
     resolution: {integrity: sha512-YUOZbamht5mfLxPmk4M35CD/5DuOkAacxlEUbStVXpBAt4fyhBf+vZHI/HRkI++QUp3sNoeA2Gw4C+hi4eGSig==}
     engines: {node: '>=8'}
@@ -2533,6 +2474,9 @@ packages:
     resolution: {integrity: sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==}
     engines: {node: '>=0.12'}
 
+  pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
+
   performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
 
@@ -2547,6 +2491,22 @@ packages:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
 
+  pify@2.3.0:
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
+
+  pify@3.0.0:
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
+    engines: {node: '>=4'}
+
+  pinkie-promise@2.0.1:
+    resolution: {integrity: sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==}
+    engines: {node: '>=0.10.0'}
+
+  pinkie@2.0.4:
+    resolution: {integrity: sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==}
+    engines: {node: '>=0.10.0'}
+
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -2565,13 +2525,8 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  prettier@3.4.2:
-    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
-    engines: {node: '>=14'}
-    hasBin: true
-
-  prettier@3.5.3:
-    resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==}
+  prettier@3.6.2:
+    resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -2581,6 +2536,10 @@ packages:
   progress-events@1.0.1:
     resolution: {integrity: sha512-MOzLIwhpt64KIVN64h1MwdKWiyKFNc/S6BoYKPIVUHFg0/eIEyBulhWCgn678v/4c0ri3FdGuzXymNCv02MUIw==}
 
+  progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+
   promise@8.3.0:
     resolution: {integrity: sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==}
 
@@ -2726,6 +2685,10 @@ packages:
     resolution: {integrity: sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==}
     engines: {node: '>=18.0.0'}
 
+  seek-bzip@1.0.6:
+    resolution: {integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==}
+    hasBin: true
+
   semver@7.3.5:
     resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==}
     engines: {node: '>=10'}
@@ -2736,13 +2699,13 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.6.3:
-    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+  semver@7.7.2:
+    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -2860,6 +2823,9 @@ packages:
     resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
     engines: {node: '>=12'}
 
+  strip-dirs@2.1.0:
+    resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
+
   strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
@@ -2993,15 +2959,14 @@ packages:
   uint8arrays@5.1.0:
     resolution: {integrity: sha512-vA6nFepEmlSKkMBnLBaUMVvAC4G3CTmO58C12y4sq6WPDOR7mOFYOi7GlrQ4djeSbP6JG9Pv9tJDM97PedRSww==}
 
+  unbzip2-stream@1.4.3:
+    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+
   undici-types@7.10.0:
     resolution: {integrity: sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==}
 
-  undici@7.1.1:
-    resolution: {integrity: sha512-WZkQ6eH9f5ZT93gaIffsbUaDpBwjbpvmMbfaEhOnbdUneurTESeRxwPGwjI28mRFESH3W3e8Togijh37ptOQqA==}
-    engines: {node: '>=20.18.1'}
-
-  undici@7.9.0:
-    resolution: {integrity: sha512-e696y354tf5cFZPXsF26Yg+5M63+5H3oE6Vtkh2oqbvsE2Oe7s2nIbcQh5lmG7Lp/eS29vJtTpw9+p6PX0qNSg==}
+  undici@7.16.0:
+    resolution: {integrity: sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==}
     engines: {node: '>=20.18.1'}
 
   universalify@2.0.1:
@@ -3143,6 +3108,10 @@ packages:
       utf-8-validate:
         optional: true
 
+  wsl-utils@0.1.0:
+    resolution: {integrity: sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==}
+    engines: {node: '>=18'}
+
   xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
@@ -3154,13 +3123,8 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
-  yaml@2.6.1:
-    resolution: {integrity: sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==}
-    engines: {node: '>= 14'}
-    hasBin: true
-
-  yaml@2.8.0:
-    resolution: {integrity: sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==}
+  yaml@2.8.1:
+    resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==}
     engines: {node: '>= 14.6'}
     hasBin: true
 
@@ -3168,6 +3132,9 @@ packages:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
 
+  yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+
   yn@3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
@@ -3340,7 +3307,7 @@ snapshots:
       binary-install-raw: 0.0.13(debug@4.3.4)
       chalk: 3.0.0
       chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4
       docker-compose: 0.23.19
       dockerode: 2.5.8
       fs-extra: 9.1.0
@@ -3379,7 +3346,7 @@ snapshots:
       binary-install-raw: 0.0.13(debug@4.3.4)
       chalk: 3.0.0
       chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4
       docker-compose: 0.23.19
       dockerode: 2.5.8
       fs-extra: 9.1.0
@@ -3420,48 +3387,7 @@ snapshots:
       binary-install-raw: 0.0.13(debug@4.3.4)
       chalk: 3.0.0
       chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
-      docker-compose: 0.23.19
-      dockerode: 2.5.8
-      fs-extra: 9.1.0
-      glob: 9.3.5
-      gluegun: 5.1.2(debug@4.3.4)
-      graphql: 15.5.0
-      immutable: 4.2.1
-      ipfs-http-client: 55.0.0(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))
-      jayson: 4.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      js-yaml: 3.14.1
-      prettier: 1.19.1
-      request: 2.88.2
-      semver: 7.4.0
-      sync-request: 6.1.0
-      tmp-promise: 3.0.3
-      web3-eth-abi: 1.7.0
-      which: 2.0.2
-      yaml: 1.10.2
-    transitivePeerDependencies:
-      - '@swc/core'
-      - '@swc/wasm'
-      - '@types/node'
-      - bufferutil
-      - encoding
-      - node-fetch
-      - supports-color
-      - typescript
-      - utf-8-validate
-
-  '@graphprotocol/graph-cli@0.61.0(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)':
-    dependencies:
-      '@float-capital/float-subgraph-uncrashable': 0.0.0-internal-testing.5
-      '@oclif/core': 2.8.6(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-autocomplete': 2.3.10(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-not-found': 2.4.3(@types/node@24.3.0)(typescript@5.9.2)
-      '@whatwg-node/fetch': 0.8.8
-      assemblyscript: 0.19.23
-      binary-install-raw: 0.0.13(debug@4.3.4)
-      chalk: 3.0.0
-      chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4
       docker-compose: 0.23.19
       dockerode: 2.5.8
       fs-extra: 9.1.0
@@ -3502,7 +3428,7 @@ snapshots:
       binary-install-raw: 0.0.13(debug@4.3.4)
       chalk: 3.0.0
       chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4
       docker-compose: 0.23.19
       dockerode: 2.5.8
       fs-extra: 9.1.0
@@ -3531,162 +3457,45 @@ snapshots:
       - typescript
       - utf-8-validate
 
-  '@graphprotocol/graph-cli@0.71.0-alpha-20240419180731-51ea29d(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)':
+  '@graphprotocol/graph-cli@0.98.1(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)':
     dependencies:
       '@float-capital/float-subgraph-uncrashable': 0.0.0-internal-testing.5
-      '@oclif/core': 2.8.6(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-autocomplete': 2.3.10(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-not-found': 2.4.3(@types/node@24.3.0)(typescript@5.9.2)
-      '@whatwg-node/fetch': 0.8.8
+      '@oclif/core': 4.5.5
+      '@oclif/plugin-autocomplete': 3.2.34
+      '@oclif/plugin-not-found': 3.2.65(@types/node@24.3.0)
+      '@oclif/plugin-warn-if-update-available': 3.1.46
+      '@pinax/graph-networks-registry': 0.7.1
+      '@whatwg-node/fetch': 0.10.10
       assemblyscript: 0.19.23
-      binary-install-raw: 0.0.13(debug@4.3.4)
-      chalk: 3.0.0
-      chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
-      docker-compose: 0.23.19
-      dockerode: 2.5.8
-      fs-extra: 9.1.0
-      glob: 9.3.5
-      gluegun: 5.1.6(debug@4.3.4)
-      graphql: 15.5.0
-      immutable: 4.2.1
-      ipfs-http-client: 55.0.0(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))
-      jayson: 4.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      js-yaml: 3.14.1
-      prettier: 3.0.3
-      semver: 7.4.0
-      sync-request: 6.1.0
+      chokidar: 4.0.3
+      debug: 4.4.3(supports-color@8.1.1)
+      decompress: 4.2.1
+      docker-compose: 1.3.0
+      fs-extra: 11.3.2
+      glob: 11.0.3
+      gluegun: 5.2.0(debug@4.4.3)
+      graphql: 16.11.0
+      immutable: 5.1.4
+      jayson: 4.2.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+      js-yaml: 4.1.0
+      kubo-rpc-client: 5.2.0(undici@7.16.0)
+      open: 10.2.0
+      prettier: 3.6.2
+      progress: 2.0.3
+      semver: 7.7.3
       tmp-promise: 3.0.3
-      web3-eth-abi: 1.7.0
-      which: 2.0.2
-      yaml: 1.10.2
+      undici: 7.16.0
+      web3-eth-abi: 4.4.1(typescript@5.9.2)(zod@3.25.76)
+      yaml: 2.8.1
     transitivePeerDependencies:
-      - '@swc/core'
-      - '@swc/wasm'
       - '@types/node'
       - bufferutil
-      - encoding
-      - node-fetch
       - supports-color
       - typescript
       - utf-8-validate
+      - zod
 
-  '@graphprotocol/graph-cli@0.91.0-alpha-20241129215038-b75cda9(@types/node@24.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))(typescript@5.9.2)(utf-8-validate@5.0.10)':
-    dependencies:
-      '@float-capital/float-subgraph-uncrashable': 0.0.0-internal-testing.5
-      '@oclif/core': 2.8.6(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-autocomplete': 2.3.10(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-not-found': 2.4.3(@types/node@24.3.0)(typescript@5.9.2)
-      '@oclif/plugin-warn-if-update-available': 3.1.46
-      '@whatwg-node/fetch': 0.8.8
-      assemblyscript: 0.19.23
-      binary-install-raw: 0.0.13(debug@4.3.4)
-      chalk: 3.0.0
-      chokidar: 3.5.3
-      debug: 4.3.4(supports-color@8.1.1)
-      docker-compose: 0.23.19
-      dockerode: 2.5.8
-      fs-extra: 9.1.0
-      glob: 9.3.5
-      gluegun: 5.1.6(debug@4.3.4)
-      graphql: 15.5.0
-      immutable: 4.2.1
-      ipfs-http-client: 55.0.0(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))
-      jayson: 4.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      js-yaml: 3.14.1
-      open: 8.4.2
-      prettier: 3.0.3
-      semver: 7.4.0
-      sync-request: 6.1.0
-      tmp-promise: 3.0.3
-      web3-eth-abi: 1.7.0
-      which: 2.0.2
-      yaml: 1.10.2
-    transitivePeerDependencies:
-      - '@swc/core'
-      - '@swc/wasm'
-      - '@types/node'
-      - bufferutil
-      - encoding
-      - node-fetch
-      - supports-color
-      - typescript
-      - utf-8-validate
-
-  '@graphprotocol/graph-cli@0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)':
-    dependencies:
-      '@float-capital/float-subgraph-uncrashable': 0.0.0-internal-testing.5
-      '@oclif/core': 4.0.34
-      '@oclif/plugin-autocomplete': 3.2.34
-      '@oclif/plugin-not-found': 3.2.65(@types/node@24.3.0)
-      '@oclif/plugin-warn-if-update-available': 3.1.46
-      '@pinax/graph-networks-registry': 0.6.7
-      '@whatwg-node/fetch': 0.10.10
-      assemblyscript: 0.19.23
-      binary-install: 1.1.2(debug@4.3.7)
-      chokidar: 4.0.1
-      debug: 4.3.7(supports-color@8.1.1)
-      docker-compose: 1.1.0
-      fs-extra: 11.2.0
-      glob: 11.0.0
-      gluegun: 5.2.0(debug@4.3.7)
-      graphql: 16.9.0
-      immutable: 5.0.3
-      jayson: 4.1.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      js-yaml: 4.1.0
-      kubo-rpc-client: 5.2.0(undici@7.1.1)
-      open: 10.1.0
-      prettier: 3.4.2
-      semver: 7.6.3
-      tmp-promise: 3.0.3
-      undici: 7.1.1
-      web3-eth-abi: 4.4.1(typescript@5.9.2)(zod@3.25.76)
-      yaml: 2.6.1
-    transitivePeerDependencies:
-      - '@types/node'
-      - bufferutil
-      - supports-color
-      - typescript
-      - utf-8-validate
-      - zod
-
-  '@graphprotocol/graph-cli@0.97.1(@types/node@24.3.0)(bufferutil@4.0.9)(typescript@5.9.2)(utf-8-validate@5.0.10)(zod@3.25.76)':
-    dependencies:
-      '@float-capital/float-subgraph-uncrashable': 0.0.0-internal-testing.5
-      '@oclif/core': 4.3.0
-      '@oclif/plugin-autocomplete': 3.2.34
-      '@oclif/plugin-not-found': 3.2.65(@types/node@24.3.0)
-      '@oclif/plugin-warn-if-update-available': 3.1.46
-      '@pinax/graph-networks-registry': 0.6.7
-      '@whatwg-node/fetch': 0.10.10
-      assemblyscript: 0.19.23
-      chokidar: 4.0.3
-      debug: 4.4.1(supports-color@8.1.1)
-      docker-compose: 1.2.0
-      fs-extra: 11.3.0
-      glob: 11.0.2
-      gluegun: 5.2.0(debug@4.4.1)
-      graphql: 16.11.0
-      immutable: 5.1.2
-      jayson: 4.2.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      js-yaml: 4.1.0
-      kubo-rpc-client: 5.2.0(undici@7.9.0)
-      open: 10.1.2
-      prettier: 3.5.3
-      semver: 7.7.2
-      tmp-promise: 3.0.3
-      undici: 7.9.0
-      web3-eth-abi: 4.4.1(typescript@5.9.2)(zod@3.25.76)
-      yaml: 2.8.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - bufferutil
-      - supports-color
-      - typescript
-      - utf-8-validate
-      - zod
-
-  '@graphprotocol/graph-ts@0.30.0':
+  '@graphprotocol/graph-ts@0.30.0':
     dependencies:
       assemblyscript: 0.19.10
 
@@ -3984,7 +3793,7 @@ snapshots:
       chalk: 4.1.2
       clean-stack: 3.0.1
       cli-progress: 3.12.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       ejs: 3.1.10
       get-package-type: 0.1.0
       globby: 11.1.0
@@ -4020,7 +3829,7 @@ snapshots:
       chalk: 4.1.2
       clean-stack: 3.0.1
       cli-progress: 3.12.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
       ejs: 3.1.10
       fs-extra: 9.1.0
       get-package-type: 0.1.0
@@ -4032,7 +3841,7 @@ snapshots:
       natural-orderby: 2.0.3
       object-treeify: 1.1.33
       password-prompt: 1.1.3
-      semver: 7.4.0
+      semver: 7.7.2
       string-width: 4.2.3
       strip-ansi: 6.0.1
       supports-color: 8.1.1
@@ -4069,7 +3878,7 @@ snapshots:
       natural-orderby: 2.0.3
       object-treeify: 1.1.33
       password-prompt: 1.1.3
-      semver: 7.6.3
+      semver: 7.7.2
       string-width: 4.2.3
       strip-ansi: 6.0.1
       supports-color: 8.1.1
@@ -4085,62 +3894,20 @@ snapshots:
       - '@types/node'
       - typescript
 
-  '@oclif/core@4.0.34':
-    dependencies:
-      ansi-escapes: 4.3.2
-      ansis: 3.17.0
-      clean-stack: 3.0.1
-      cli-spinners: 2.9.2
-      debug: 4.3.7(supports-color@8.1.1)
-      ejs: 3.1.10
-      get-package-type: 0.1.0
-      globby: 11.1.0
-      indent-string: 4.0.0
-      is-wsl: 2.2.0
-      lilconfig: 3.1.3
-      minimatch: 9.0.5
-      semver: 7.6.3
-      string-width: 4.2.3
-      supports-color: 8.1.1
-      widest-line: 3.1.0
-      wordwrap: 1.0.0
-      wrap-ansi: 7.0.0
-
-  '@oclif/core@4.3.0':
-    dependencies:
-      ansi-escapes: 4.3.2
-      ansis: 3.17.0
-      clean-stack: 3.0.1
-      cli-spinners: 2.9.2
-      debug: 4.4.1(supports-color@8.1.1)
-      ejs: 3.1.10
-      get-package-type: 0.1.0
-      globby: 11.1.0
-      indent-string: 4.0.0
-      is-wsl: 2.2.0
-      lilconfig: 3.1.3
-      minimatch: 9.0.5
-      semver: 7.7.2
-      string-width: 4.2.3
-      supports-color: 8.1.1
-      widest-line: 3.1.0
-      wordwrap: 1.0.0
-      wrap-ansi: 7.0.0
-
-  '@oclif/core@4.5.2':
+  '@oclif/core@4.5.5':
     dependencies:
       ansi-escapes: 4.3.2
       ansis: 3.17.0
       clean-stack: 3.0.1
       cli-spinners: 2.9.2
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       ejs: 3.1.10
       get-package-type: 0.1.0
       indent-string: 4.0.0
       is-wsl: 2.2.0
       lilconfig: 3.1.3
       minimatch: 9.0.5
-      semver: 7.6.3
+      semver: 7.7.3
       string-width: 4.2.3
       supports-color: 8.1.1
       tinyglobby: 0.2.14
@@ -4152,7 +3919,7 @@ snapshots:
     dependencies:
       '@oclif/core': 2.16.0(@types/node@24.3.0)(typescript@5.9.2)
       chalk: 4.1.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
@@ -4162,9 +3929,9 @@ snapshots:
 
   '@oclif/plugin-autocomplete@3.2.34':
     dependencies:
-      '@oclif/core': 4.0.34
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       ejs: 3.1.10
     transitivePeerDependencies:
       - supports-color
@@ -4183,7 +3950,7 @@ snapshots:
   '@oclif/plugin-not-found@3.2.65(@types/node@24.3.0)':
     dependencies:
       '@inquirer/prompts': 7.8.3(@types/node@24.3.0)
-      '@oclif/core': 4.5.2
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
       fast-levenshtein: 3.0.0
     transitivePeerDependencies:
@@ -4191,9 +3958,9 @@ snapshots:
 
   '@oclif/plugin-warn-if-update-available@3.1.46':
     dependencies:
-      '@oclif/core': 4.0.34
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       http-call: 5.3.0
       lodash: 4.17.21
       registry-auth-token: 5.1.0
@@ -4218,7 +3985,7 @@ snapshots:
       tslib: 2.8.1
       webcrypto-core: 1.8.1
 
-  '@pinax/graph-networks-registry@0.6.7': {}
+  '@pinax/graph-networks-registry@0.7.1': {}
 
   '@pnpm/config.env-replace@1.1.0': {}
 
@@ -4452,15 +4219,9 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  apisauce@2.1.6(debug@4.3.7):
-    dependencies:
-      axios: 0.21.4(debug@4.3.7)
-    transitivePeerDependencies:
-      - debug
-
-  apisauce@2.1.6(debug@4.4.1):
+  apisauce@2.1.6(debug@4.4.3):
     dependencies:
-      axios: 0.21.4(debug@4.4.1)
+      axios: 0.21.4(debug@4.4.3)
     transitivePeerDependencies:
       - debug
 
@@ -4523,21 +4284,9 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@0.21.4(debug@4.3.7):
-    dependencies:
-      follow-redirects: 1.15.11(debug@4.3.7)
-    transitivePeerDependencies:
-      - debug
-
-  axios@0.21.4(debug@4.4.1):
-    dependencies:
-      follow-redirects: 1.15.11(debug@4.4.1)
-    transitivePeerDependencies:
-      - debug
-
-  axios@0.26.1(debug@4.3.7):
+  axios@0.21.4(debug@4.4.3):
     dependencies:
-      follow-redirects: 1.15.11(debug@4.3.7)
+      follow-redirects: 1.15.11(debug@4.4.3)
     transitivePeerDependencies:
       - debug
 
@@ -4563,14 +4312,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  binary-install@1.1.2(debug@4.3.7):
-    dependencies:
-      axios: 0.26.1(debug@4.3.7)
-      rimraf: 3.0.2
-      tar: 6.2.1
-    transitivePeerDependencies:
-      - debug
-
   binaryen@101.0.0-nightly.20210723: {}
 
   binaryen@102.0.0-nightly.20211028: {}
@@ -4641,12 +4382,19 @@ snapshots:
       buffer-alloc-unsafe: 1.1.0
       buffer-fill: 1.0.0
 
+  buffer-crc32@0.2.13: {}
+
   buffer-fill@1.0.0: {}
 
   buffer-from@1.1.2: {}
 
   buffer-xor@1.0.3: {}
 
+  buffer@5.7.1:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
   buffer@6.0.3:
     dependencies:
       base64-js: 1.5.1
@@ -4725,10 +4473,6 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
-  chokidar@4.0.1:
-    dependencies:
-      readdirp: 4.1.2
-
   chokidar@4.0.3:
     dependencies:
       readdirp: 4.1.2
@@ -4866,24 +4610,60 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  debug@4.3.4(supports-color@8.1.1):
+  debug@4.3.4:
     dependencies:
       ms: 2.1.2
-    optionalDependencies:
-      supports-color: 8.1.1
 
-  debug@4.3.7(supports-color@8.1.1):
+  debug@4.4.1(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
     optionalDependencies:
       supports-color: 8.1.1
 
-  debug@4.4.1(supports-color@8.1.1):
+  debug@4.4.3(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
     optionalDependencies:
       supports-color: 8.1.1
 
+  decompress-tar@4.1.1:
+    dependencies:
+      file-type: 5.2.0
+      is-stream: 1.1.0
+      tar-stream: 1.6.2
+
+  decompress-tarbz2@4.1.1:
+    dependencies:
+      decompress-tar: 4.1.1
+      file-type: 6.2.0
+      is-stream: 1.1.0
+      seek-bzip: 1.0.6
+      unbzip2-stream: 1.4.3
+
+  decompress-targz@4.1.1:
+    dependencies:
+      decompress-tar: 4.1.1
+      file-type: 5.2.0
+      is-stream: 1.1.0
+
+  decompress-unzip@4.0.1:
+    dependencies:
+      file-type: 3.9.0
+      get-stream: 2.3.1
+      pify: 2.3.0
+      yauzl: 2.10.0
+
+  decompress@4.2.1:
+    dependencies:
+      decompress-tar: 4.1.1
+      decompress-tarbz2: 4.1.1
+      decompress-targz: 4.1.1
+      decompress-unzip: 4.0.1
+      graceful-fs: 4.2.11
+      make-dir: 1.3.0
+      pify: 2.3.0
+      strip-dirs: 2.1.0
+
   default-browser-id@5.0.0: {}
 
   default-browser@5.2.1:
@@ -4901,8 +4681,6 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  define-lazy-prop@2.0.0: {}
-
   define-lazy-prop@3.0.0: {}
 
   delay@5.0.0: {}
@@ -4917,7 +4695,7 @@ snapshots:
 
   dns-over-http-resolver@1.2.3(node-fetch@2.7.0(encoding@0.1.13)):
     dependencies:
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       native-fetch: 3.0.0(node-fetch@2.7.0(encoding@0.1.13))
       receptacle: 1.3.2
     transitivePeerDependencies:
@@ -4932,13 +4710,9 @@ snapshots:
     dependencies:
       yaml: 1.10.2
 
-  docker-compose@1.1.0:
-    dependencies:
-      yaml: 2.6.1
-
-  docker-compose@1.2.0:
+  docker-compose@1.3.0:
     dependencies:
-      yaml: 2.8.0
+      yaml: 2.8.1
 
   docker-modem@1.0.9:
     dependencies:
@@ -5098,7 +4872,7 @@ snapshots:
 
   execa@5.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1
@@ -5148,10 +4922,20 @@ snapshots:
     dependencies:
       reusify: 1.1.0
 
+  fd-slicer@1.1.0:
+    dependencies:
+      pend: 1.2.0
+
   fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
 
+  file-type@3.9.0: {}
+
+  file-type@5.2.0: {}
+
+  file-type@6.2.0: {}
+
   filelist@1.0.4:
     dependencies:
       minimatch: 5.1.6
@@ -5162,15 +4946,11 @@ snapshots:
 
   follow-redirects@1.15.11(debug@4.3.4):
     optionalDependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4
 
-  follow-redirects@1.15.11(debug@4.3.7):
+  follow-redirects@1.15.11(debug@4.4.3):
     optionalDependencies:
-      debug: 4.3.7(supports-color@8.1.1)
-
-  follow-redirects@1.15.11(debug@4.4.1):
-    optionalDependencies:
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
 
   for-each@0.3.5:
     dependencies:
@@ -5200,13 +4980,7 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
-  fs-extra@11.2.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.2.0
-      universalify: 2.0.1
-
-  fs-extra@11.3.0:
+  fs-extra@11.3.2:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.2.0
@@ -5259,6 +5033,11 @@ snapshots:
       dunder-proto: 1.0.1
       es-object-atoms: 1.1.1
 
+  get-stream@2.3.1:
+    dependencies:
+      object-assign: 4.1.1
+      pinkie-promise: 2.0.1
+
   get-stream@6.0.1: {}
 
   getpass@0.1.7:
@@ -5269,16 +5048,7 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@11.0.0:
-    dependencies:
-      foreground-child: 3.3.1
-      jackspeak: 4.1.1
-      minimatch: 10.0.3
-      minipass: 7.1.2
-      package-json-from-dist: 1.0.1
-      path-scurry: 2.0.0
-
-  glob@11.0.2:
+  glob@11.0.3:
     dependencies:
       foreground-child: 3.3.1
       jackspeak: 4.1.1
@@ -5382,44 +5152,9 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  gluegun@5.2.0(debug@4.3.7):
-    dependencies:
-      apisauce: 2.1.6(debug@4.3.7)
-      app-module-path: 2.2.0
-      cli-table3: 0.6.0
-      colors: 1.4.0
-      cosmiconfig: 7.0.1
-      cross-spawn: 7.0.3
-      ejs: 3.1.8
-      enquirer: 2.3.6
-      execa: 5.1.1
-      fs-jetpack: 4.3.1
-      lodash.camelcase: 4.3.0
-      lodash.kebabcase: 4.1.1
-      lodash.lowercase: 4.3.0
-      lodash.lowerfirst: 4.3.1
-      lodash.pad: 4.5.1
-      lodash.padend: 4.6.1
-      lodash.padstart: 4.6.1
-      lodash.repeat: 4.1.0
-      lodash.snakecase: 4.1.1
-      lodash.startcase: 4.4.0
-      lodash.trim: 4.5.1
-      lodash.trimend: 4.5.1
-      lodash.trimstart: 4.5.1
-      lodash.uppercase: 4.3.0
-      lodash.upperfirst: 4.3.1
-      ora: 4.0.2
-      pluralize: 8.0.0
-      semver: 7.3.5
-      which: 2.0.2
-      yargs-parser: 21.1.1
-    transitivePeerDependencies:
-      - debug
-
-  gluegun@5.2.0(debug@4.4.1):
+  gluegun@5.2.0(debug@4.4.3):
     dependencies:
-      apisauce: 2.1.6(debug@4.4.1)
+      apisauce: 2.1.6(debug@4.4.3)
       app-module-path: 2.2.0
       cli-table3: 0.6.0
       colors: 1.4.0
@@ -5466,8 +5201,6 @@ snapshots:
 
   graphql@16.11.0: {}
 
-  graphql@16.9.0: {}
-
   har-schema@2.0.0: {}
 
   har-validator@5.1.5:
@@ -5526,7 +5259,7 @@ snapshots:
   http-call@5.3.0:
     dependencies:
       content-type: 1.0.5
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       is-retry-allowed: 1.2.0
       is-stream: 2.0.1
       parse-json: 4.0.0
@@ -5558,9 +5291,7 @@ snapshots:
 
   immutable@4.2.1: {}
 
-  immutable@5.0.3: {}
-
-  immutable@5.1.2: {}
+  immutable@5.1.4: {}
 
   import-fresh@3.3.1:
     dependencies:
@@ -5609,7 +5340,7 @@ snapshots:
       any-signal: 2.1.2
       blob-to-it: 1.0.4
       browser-readablestream-to-it: 1.0.3
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       err-code: 3.0.1
       ipfs-core-types: 0.9.0(node-fetch@2.7.0(encoding@0.1.13))
       ipfs-unixfs: 6.0.9
@@ -5638,7 +5369,7 @@ snapshots:
       '@ipld/dag-pb': 2.1.18
       abort-controller: 3.0.0
       any-signal: 2.1.2
-      debug: 4.4.1(supports-color@8.1.1)
+      debug: 4.4.3(supports-color@8.1.1)
       err-code: 3.0.1
       ipfs-core-types: 0.9.0(node-fetch@2.7.0(encoding@0.1.13))
       ipfs-core-utils: 0.13.0(encoding@0.1.13)(node-fetch@2.7.0(encoding@0.1.13))
@@ -5734,6 +5465,8 @@ snapshots:
     dependencies:
       ip-regex: 4.3.0
 
+  is-natural-number@4.0.1: {}
+
   is-number@7.0.0: {}
 
   is-plain-obj@2.1.0: {}
@@ -5747,6 +5480,8 @@ snapshots:
 
   is-retry-allowed@1.2.0: {}
 
+  is-stream@1.1.0: {}
+
   is-stream@2.0.1: {}
 
   is-typed-array@1.1.15:
@@ -5853,24 +5588,6 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-  jayson@4.1.3(bufferutil@4.0.9)(utf-8-validate@5.0.10):
-    dependencies:
-      '@types/connect': 3.4.38
-      '@types/node': 12.20.55
-      '@types/ws': 7.4.7
-      JSONStream: 1.3.5
-      commander: 2.20.3
-      delay: 5.0.0
-      es6-promisify: 5.0.0
-      eyes: 0.1.8
-      isomorphic-ws: 4.0.1(ws@7.5.10(bufferutil@4.0.9)(utf-8-validate@5.0.10))
-      json-stringify-safe: 5.0.1
-      uuid: 8.3.2
-      ws: 7.5.10(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-
   jayson@4.2.0(bufferutil@4.0.9)(utf-8-validate@5.0.10):
     dependencies:
       '@types/connect': 3.4.38
@@ -5935,45 +5652,7 @@ snapshots:
       node-gyp-build: 4.8.4
       readable-stream: 3.6.2
 
-  kubo-rpc-client@5.2.0(undici@7.1.1):
-    dependencies:
-      '@ipld/dag-cbor': 9.2.4
-      '@ipld/dag-json': 10.2.5
-      '@ipld/dag-pb': 4.1.5
-      '@libp2p/crypto': 5.1.7
-      '@libp2p/interface': 2.10.5
-      '@libp2p/logger': 5.1.21
-      '@libp2p/peer-id': 5.1.8
-      '@multiformats/multiaddr': 12.5.1
-      '@multiformats/multiaddr-to-uri': 11.0.2
-      any-signal: 4.1.1
-      blob-to-it: 2.0.10
-      browser-readablestream-to-it: 2.0.10
-      dag-jose: 5.1.1
-      electron-fetch: 1.9.1
-      err-code: 3.0.1
-      ipfs-unixfs: 11.2.5
-      iso-url: 1.2.1
-      it-all: 3.0.9
-      it-first: 3.0.9
-      it-glob: 3.0.4
-      it-last: 3.0.9
-      it-map: 3.1.4
-      it-peekable: 3.0.8
-      it-to-stream: 1.0.0
-      merge-options: 3.0.4
-      multiformats: 13.4.0
-      nanoid: 5.1.5
-      native-fetch: 4.0.2(undici@7.1.1)
-      parse-duration: 2.1.4
-      react-native-fetch-api: 3.0.0
-      stream-to-it: 1.0.1
-      uint8arrays: 5.1.0
-      wherearewe: 2.0.1
-    transitivePeerDependencies:
-      - undici
-
-  kubo-rpc-client@5.2.0(undici@7.9.0):
+  kubo-rpc-client@5.2.0(undici@7.16.0):
     dependencies:
       '@ipld/dag-cbor': 9.2.4
       '@ipld/dag-json': 10.2.5
@@ -6002,7 +5681,7 @@ snapshots:
       merge-options: 3.0.4
       multiformats: 13.4.0
       nanoid: 5.1.5
-      native-fetch: 4.0.2(undici@7.9.0)
+      native-fetch: 4.0.2(undici@7.16.0)
       parse-duration: 2.1.4
       react-native-fetch-api: 3.0.0
       stream-to-it: 1.0.1
@@ -6065,6 +5744,10 @@ snapshots:
 
   main-event@1.0.1: {}
 
+  make-dir@1.3.0:
+    dependencies:
+      pify: 3.0.0
+
   make-error@1.3.6: {}
 
   math-intrinsics@1.1.0: {}
@@ -6190,13 +5873,9 @@ snapshots:
     dependencies:
       node-fetch: 2.7.0(encoding@0.1.13)
 
-  native-fetch@4.0.2(undici@7.1.1):
-    dependencies:
-      undici: 7.1.1
-
-  native-fetch@4.0.2(undici@7.9.0):
+  native-fetch@4.0.2(undici@7.16.0):
     dependencies:
-      undici: 7.9.0
+      undici: 7.16.0
 
   natural-orderby@2.0.3: {}
 
@@ -6239,25 +5918,12 @@ snapshots:
     dependencies:
       mimic-fn: 2.1.0
 
-  open@10.1.0:
-    dependencies:
-      default-browser: 5.2.1
-      define-lazy-prop: 3.0.0
-      is-inside-container: 1.0.0
-      is-wsl: 3.1.0
-
-  open@10.1.2:
+  open@10.2.0:
     dependencies:
       default-browser: 5.2.1
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
-      is-wsl: 3.1.0
-
-  open@8.4.2:
-    dependencies:
-      define-lazy-prop: 2.0.0
-      is-docker: 2.2.1
-      is-wsl: 2.2.0
+      wsl-utils: 0.1.0
 
   ora@4.0.2:
     dependencies:
@@ -6339,6 +6005,8 @@ snapshots:
       sha.js: 2.4.12
       to-buffer: 1.2.1
 
+  pend@1.2.0: {}
+
   performance-now@2.1.0: {}
 
   picocolors@1.1.1: {}
@@ -6347,6 +6015,16 @@ snapshots:
 
   picomatch@4.0.3: {}
 
+  pify@2.3.0: {}
+
+  pify@3.0.0: {}
+
+  pinkie-promise@2.0.1:
+    dependencies:
+      pinkie: 2.0.4
+
+  pinkie@2.0.4: {}
+
   pluralize@8.0.0: {}
 
   possible-typed-array-names@1.1.0: {}
@@ -6355,14 +6033,14 @@ snapshots:
 
   prettier@3.0.3: {}
 
-  prettier@3.4.2: {}
-
-  prettier@3.5.3: {}
+  prettier@3.6.2: {}
 
   process-nextick-args@2.0.1: {}
 
   progress-events@1.0.1: {}
 
+  progress@2.0.3: {}
+
   promise@8.3.0:
     dependencies:
       asap: 2.0.6
@@ -6549,6 +6227,10 @@ snapshots:
       node-addon-api: 5.1.0
       node-gyp-build: 4.8.4
 
+  seek-bzip@1.0.6:
+    dependencies:
+      commander: 2.20.3
+
   semver@7.3.5:
     dependencies:
       lru-cache: 6.0.0
@@ -6557,10 +6239,10 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
-  semver@7.6.3: {}
-
   semver@7.7.2: {}
 
+  semver@7.7.3: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
@@ -6697,6 +6379,10 @@ snapshots:
     dependencies:
       ansi-regex: 6.2.0
 
+  strip-dirs@2.1.0:
+    dependencies:
+      is-natural-number: 4.0.1
+
   strip-final-newline@2.0.0: {}
 
   strip-hex-prefix@1.0.0:
@@ -6863,11 +6549,14 @@ snapshots:
     dependencies:
       multiformats: 13.4.0
 
-  undici-types@7.10.0: {}
+  unbzip2-stream@1.4.3:
+    dependencies:
+      buffer: 5.7.1
+      through: 2.3.8
 
-  undici@7.1.1: {}
+  undici-types@7.10.0: {}
 
-  undici@7.9.0: {}
+  undici@7.16.0: {}
 
   universalify@2.0.1: {}
 
@@ -7033,18 +6722,25 @@ snapshots:
       bufferutil: 4.0.9
       utf-8-validate: 5.0.10
 
+  wsl-utils@0.1.0:
+    dependencies:
+      is-wsl: 3.1.0
+
   xtend@4.0.2: {}
 
   yallist@4.0.0: {}
 
   yaml@1.10.2: {}
 
-  yaml@2.6.1: {}
-
-  yaml@2.8.0: {}
+  yaml@2.8.1: {}
 
   yargs-parser@21.1.1: {}
 
+  yauzl@2.10.0:
+    dependencies:
+      buffer-crc32: 0.2.13
+      fd-slicer: 1.1.0
+
   yn@3.1.1: {}
 
   yoctocolors-cjs@2.1.2: {}
diff --git a/runtime/test/Cargo.toml b/runtime/test/Cargo.toml
index d0cce213fc9..783596feb40 100644
--- a/runtime/test/Cargo.toml
+++ b/runtime/test/Cargo.toml
@@ -5,12 +5,12 @@ edition.workspace = true
 
 [dependencies]
 async-trait = { workspace = true }
-semver = "1.0"
-wasmtime.workspace = true
+semver = { workspace = true }
+wasmtime = { workspace = true }
 graph = { path = "../../graph" }
 graph-chain-ethereum = { path = "../../chain/ethereum" }
 graph-runtime-wasm = { path = "../wasm" }
-rand.workspace = true
+rand = { workspace = true }
 
 
 [dev-dependencies]
diff --git a/runtime/test/src/common.rs b/runtime/test/src/common.rs
index 183a79a0bbe..b08251c8604 100644
--- a/runtime/test/src/common.rs
+++ b/runtime/test/src/common.rs
@@ -1,5 +1,5 @@
 use graph::blockchain::BlockTime;
-use graph::components::store::DeploymentLocator;
+use graph::components::store::{DeploymentLocator, SeqGenerator};
 use graph::components::subgraph::SharedProofOfIndexing;
 use graph::data::subgraph::*;
 use graph::data_source;
@@ -64,7 +64,7 @@ fn mock_host_exports(
     );
 
     let client =
-        IpfsRpcClient::new_unchecked(ServerAddress::local_rpc_api(), IpfsMetrics::test(), &LOGGER)
+        IpfsRpcClient::new_unchecked(ServerAddress::test_rpc_api(), IpfsMetrics::test(), &LOGGER)
             .unwrap();
 
     HostExports::new(
@@ -126,6 +126,7 @@ pub fn mock_context(
             ))
             .unwrap(),
             Default::default(),
+            SeqGenerator::new(12),
         ),
         proof_of_indexing: SharedProofOfIndexing::ignored(),
         host_fns: Arc::new(Vec::new()),
diff --git a/runtime/test/src/test.rs b/runtime/test/src/test.rs
index 2a367a25e69..14af4d0f8e3 100644
--- a/runtime/test/src/test.rs
+++ b/runtime/test/src/test.rs
@@ -2,9 +2,10 @@ use async_trait::async_trait;
 use graph::blockchain::BlockTime;
 use graph::components::metrics::gas::GasMetrics;
 use graph::components::store::*;
-use graph::data::store::{scalar, Id, IdType};
+use graph::data::store::{Id, IdType, scalar};
 use graph::data::subgraph::*;
 use graph::data::value::Word;
+use graph::futures03::future::BoxFuture;
 use graph::ipfs::test_utils::add_files_to_local_ipfs_node_for_testing;
 use graph::prelude::alloy::primitives::U256;
 use graph::runtime::gas::GasCounter;
@@ -15,12 +16,12 @@ use graph::{entity, prelude::*};
 use graph_chain_ethereum::DataSource;
 use graph_runtime_wasm::asc_abi::class::{Array, AscBigInt, AscEntity, AscString, Uint8Array};
 use graph_runtime_wasm::{
-    host_exports, ExperimentalFeatures, MappingContext, ValidModule, WasmInstance,
+    ExperimentalFeatures, MappingContext, ValidModule, WasmInstance, host_exports,
 };
 use semver::Version;
 use std::collections::{BTreeMap, HashMap};
 use std::str::FromStr;
-use test_store::{LOGGER, STORE};
+use test_store::{LOGGER, STOPWATCH, STORE, SUBGRAPH_STORE};
 use wasmtime::{AsContext, AsContextMut};
 
 use crate::common::{mock_context, mock_data_source};
@@ -44,78 +45,82 @@ fn subgraph_id_with_api_version(subgraph_id: &str, api_version: Version) -> Stri
     )
 }
 
-async fn test_valid_module_and_store(
+async fn test_module_and_deployment(
     subgraph_id: &str,
     data_source: DataSource,
     api_version: Version,
-) -> (WasmInstance, Arc<impl SubgraphStore>, DeploymentLocator) {
-    test_valid_module_and_store_with_timeout(subgraph_id, data_source, api_version, None).await
+) -> (WasmInstance, DeploymentLocator) {
+    test_module_and_deployment_with_timeout(subgraph_id, data_source, api_version, None).await
 }
 
-async fn test_valid_module_and_store_with_timeout(
-    subgraph_id: &str,
+fn test_module_and_deployment_with_timeout<'a>(
+    subgraph_id: &'a str,
     data_source: DataSource,
     api_version: Version,
     timeout: Option<Duration>,
-) -> (WasmInstance, Arc<impl SubgraphStore>, DeploymentLocator) {
-    let logger = Logger::root(slog::Discard, o!());
-    let subgraph_id_with_api_version =
-        subgraph_id_with_api_version(subgraph_id, api_version.clone());
-
-    let store = STORE.clone();
-    let metrics_registry = Arc::new(MetricsRegistry::mock());
-    let deployment_id = DeploymentHash::new(&subgraph_id_with_api_version).unwrap();
-    let deployment = test_store::create_test_subgraph(
-        &deployment_id,
-        "type User @entity {
-            id: ID!,
-            name: String,
-            count: BigInt,
-        }
+) -> BoxFuture<'a, (WasmInstance, DeploymentLocator)> {
+    Box::pin(async move {
+        let logger = Logger::root(slog::Discard, o!());
+        let subgraph_id_with_api_version =
+            subgraph_id_with_api_version(subgraph_id, api_version.clone());
 
-        type Thing @entity {
-            id: ID!,
-            value: String,
-            extra: String
-        }",
-    )
-    .await;
-    let stopwatch_metrics = StopwatchMetrics::new(
-        logger.clone(),
-        deployment_id.clone(),
-        "test",
-        metrics_registry.clone(),
-        "test_shard".to_string(),
-    );
+        let store = STORE.clone();
+        let metrics_registry = Arc::new(MetricsRegistry::mock());
+        let deployment_id = DeploymentHash::new(&subgraph_id_with_api_version).unwrap();
+        let deployment = test_store::create_test_subgraph(
+            &deployment_id,
+            "type User @entity {
+                id: ID!,
+                name: String,
+                count: BigInt,
+            }
 
-    let gas_metrics = GasMetrics::new(deployment_id.clone(), metrics_registry.clone());
+            type Thing @entity {
+                id: ID!,
+                value: String,
+                extra: String
+            }",
+        )
+        .await;
+        let stopwatch = StopwatchMetrics::new(
+            logger.clone(),
+            deployment_id.clone(),
+            "test",
+            metrics_registry.clone(),
+            "test_shard".to_string(),
+        );
 
-    let host_metrics = Arc::new(HostMetrics::new(
-        metrics_registry,
-        deployment_id.as_str(),
-        stopwatch_metrics,
-        gas_metrics,
-    ));
+        let gas_metrics = GasMetrics::new(deployment_id.clone(), metrics_registry.clone());
 
-    let experimental_features = ExperimentalFeatures {
-        allow_non_deterministic_ipfs: true,
-    };
+        let host_metrics = Arc::new(HostMetrics::new(
+            metrics_registry,
+            deployment_id.as_str(),
+            stopwatch.cheap_clone(),
+            gas_metrics,
+        ));
 
-    let module = WasmInstance::from_valid_module_with_ctx(
-        Arc::new(ValidModule::new(&logger, data_source.mapping.runtime.as_ref(), timeout).unwrap()),
-        mock_context(
-            deployment.clone(),
-            data_source,
-            store.subgraph_store(),
-            api_version,
-        ),
-        host_metrics,
-        experimental_features,
-    )
-    .await
-    .unwrap();
+        let experimental_features = ExperimentalFeatures {
+            allow_non_deterministic_ipfs: true,
+        };
+
+        let module = WasmInstance::from_valid_module_with_ctx(
+            Arc::new(
+                ValidModule::new(&logger, data_source.mapping.runtime.as_ref(), timeout).unwrap(),
+            ),
+            mock_context(
+                deployment.clone(),
+                data_source,
+                store.subgraph_store(),
+                api_version,
+            ),
+            host_metrics,
+            experimental_features,
+        )
+        .await
+        .unwrap();
 
-    (module, store.subgraph_store(), deployment)
+        (module, deployment)
+    })
 }
 
 pub async fn test_module(
@@ -123,7 +128,7 @@ pub async fn test_module(
     data_source: DataSource,
     api_version: Version,
 ) -> WasmInstance {
-    test_valid_module_and_store(subgraph_id, data_source, api_version)
+    test_module_and_deployment(subgraph_id, data_source, api_version)
         .await
         .0
 }
@@ -135,9 +140,7 @@ pub async fn test_module_latest(subgraph_id: &str, wasm_file: &str) -> WasmInsta
         &wasm_file_path(wasm_file, API_VERSION_0_0_5),
         version.clone(),
     );
-    test_valid_module_and_store(subgraph_id, ds, version)
-        .await
-        .0
+    test_module_and_deployment(subgraph_id, ds, version).await.0
 }
 
 pub trait SyncWasmTy: wasmtime::WasmTy + Sync {}
@@ -192,7 +195,9 @@ impl WasmInstanceExt for WasmInstance {
             .typed(self.store.as_context())
             .unwrap()
             .clone();
-        func.call_async(&mut self.store.as_context_mut(), ()).await
+        func.call_async(&mut self.store.as_context_mut(), ())
+            .await
+            .map_err(anyhow::Error::from)
     }
 
     async fn invoke_export0<R>(&mut self, f: &str) -> AscPtr<R> {
@@ -306,6 +311,7 @@ impl WasmInstanceExt for WasmInstance {
             (arg0.wasm_ptr(), arg1.wasm_ptr()),
         )
         .await
+        .map_err(anyhow::Error::from)
     }
 
     async fn invoke_export0_val<V: wasmtime::WasmTy + Sync>(&mut self, func: &str) -> V {
@@ -401,7 +407,7 @@ async fn json_conversions_v0_0_4() {
 
 #[graph::test]
 async fn json_conversions_v0_0_5() {
-    test_json_conversions(API_VERSION_0_0_5, 2289897).await;
+    test_json_conversions(API_VERSION_0_0_5, 2214813).await;
 }
 
 async fn test_json_parsing(api_version: Version, gas_used: u64) {
@@ -529,7 +535,7 @@ async fn run_ipfs_map(
             .to_owned()
     };
 
-    let (mut instance, _, _) = test_valid_module_and_store(
+    let mut instance = test_module(
         subgraph_id,
         mock_data_source(
             &wasm_file_path("ipfs_map.wasm", api_version.clone()),
@@ -557,7 +563,7 @@ async fn run_ipfs_map(
         .take_ctx()
         .take_state()
         .entity_cache
-        .as_modifications(0)
+        .as_modifications(0, &STOPWATCH)
         .await?
         .modifications;
 
@@ -766,7 +772,7 @@ async fn big_int_to_hex_v0_0_4() {
 
 #[graph::test]
 async fn big_int_to_hex_v0_0_5() {
-    test_big_int_to_hex(API_VERSION_0_0_5, 2858580).await;
+    test_big_int_to_hex(API_VERSION_0_0_5, 2565990).await;
 }
 
 async fn test_big_int_arithmetic(api_version: Version, gas_used: u64) {
@@ -832,7 +838,7 @@ async fn big_int_arithmetic_v0_0_4() {
 
 #[graph::test]
 async fn big_int_arithmetic_v0_0_5() {
-    test_big_int_arithmetic(API_VERSION_0_0_5, 7318364).await;
+    test_big_int_arithmetic(API_VERSION_0_0_5, 5256825).await;
 }
 
 async fn test_abort(api_version: Version, error_msg: &str) {
@@ -970,7 +976,7 @@ async fn data_source_create_v0_0_4() {
 
 #[graph::test]
 async fn data_source_create_v0_0_5() {
-    test_data_source_create(API_VERSION_0_0_5, 101450079).await;
+    test_data_source_create(API_VERSION_0_0_5, 101425051).await;
 }
 
 async fn test_ens_name_by_hash(api_version: Version) {
@@ -991,10 +997,12 @@ async fn test_ens_name_by_hash(api_version: Version) {
     let data: String = module.asc_get(converted).unwrap();
     assert_eq!(data, name);
 
-    assert!(module
-        .invoke_export1::<_, _, AscString>("nameByHash", "impossible keccak hash")
-        .await
-        .is_null());
+    assert!(
+        module
+            .invoke_export1::<_, _, AscString>("nameByHash", "impossible keccak hash")
+            .await
+            .is_null()
+    );
 }
 
 #[graph::test]
@@ -1008,7 +1016,8 @@ async fn ens_name_by_hash_v0_0_5() {
 }
 
 async fn test_entity_store(api_version: Version) {
-    let (mut instance, store, deployment) = test_valid_module_and_store(
+    let store = SUBGRAPH_STORE.clone();
+    let (mut instance, deployment) = test_module_and_deployment(
         "entityStore",
         mock_data_source(
             &wasm_file_path("store.wasm", api_version.clone()),
@@ -1071,9 +1080,13 @@ async fn test_entity_store(api_version: Version) {
     let ctx = instance.store.data_mut();
     let cache = std::mem::replace(
         &mut ctx.ctx.state.entity_cache,
-        EntityCache::new(Arc::new(writable.clone())),
+        EntityCache::new(Arc::new(writable.clone()), SeqGenerator::new(12)),
     );
-    let mut mods = cache.as_modifications(0).await.unwrap().modifications;
+    let mut mods = cache
+        .as_modifications(0, &STOPWATCH)
+        .await
+        .unwrap()
+        .modifications;
     assert_eq!(1, mods.len());
     match mods.pop().unwrap() {
         EntityModification::Overwrite { data, .. } => {
@@ -1093,7 +1106,7 @@ async fn test_entity_store(api_version: Version) {
         .take_ctx()
         .take_state()
         .entity_cache
-        .as_modifications(0)
+        .as_modifications(0, &STOPWATCH)
         .await
         .unwrap()
         .modifications;
@@ -1122,10 +1135,12 @@ fn test_detect_contract_calls(api_version: Version) {
         &wasm_file_path("abi_store_value.wasm", api_version.clone()),
         api_version.clone(),
     );
-    assert!(!data_source_without_calls
-        .mapping
-        .requires_archive()
-        .unwrap());
+    assert!(
+        !data_source_without_calls
+            .mapping
+            .requires_archive()
+            .unwrap()
+    );
 
     let data_source_with_calls = mock_data_source(
         &wasm_file_path("contract_calls.wasm", api_version.clone()),
@@ -1242,30 +1257,38 @@ async fn test_boolean() {
 
     // non-zero values are true
     for x in (-10i32..10).filter(|&x| x != 0) {
-        assert!(module
-            .invoke_export1_val_void("testReceiveTrue", x)
-            .await
-            .is_ok(),);
+        assert!(
+            module
+                .invoke_export1_val_void("testReceiveTrue", x)
+                .await
+                .is_ok(),
+        );
     }
 
     // zero is not true
-    assert!(module
-        .invoke_export1_val_void("testReceiveTrue", 0i32)
-        .await
-        .is_err());
+    assert!(
+        module
+            .invoke_export1_val_void("testReceiveTrue", 0i32)
+            .await
+            .is_err()
+    );
 
     // zero is false
-    assert!(module
-        .invoke_export1_val_void("testReceiveFalse", 0i32)
-        .await
-        .is_ok());
+    assert!(
+        module
+            .invoke_export1_val_void("testReceiveFalse", 0i32)
+            .await
+            .is_ok()
+    );
 
     // non-zero values are not false
     for x in (-10i32..10).filter(|&x| x != 0) {
-        assert!(module
-            .invoke_export1_val_void("testReceiveFalse", x)
-            .await
-            .is_err());
+        assert!(
+            module
+                .invoke_export1_val_void("testReceiveFalse", x)
+                .await
+                .is_err()
+        );
     }
 }
 
@@ -1358,7 +1381,6 @@ impl Host {
         self.host_exports
             .store_set(
                 &self.ctx.logger,
-                12, // Arbitrary block number
                 &mut self.ctx.state,
                 &self.ctx.proof_of_indexing,
                 entity_type.to_string(),
@@ -1559,7 +1581,10 @@ async fn test_store_set_invalid_fields() {
         .err()
         .unwrap();
 
-    err_says(err, "Attempted to set undefined fields [test3] for the entity type `User`. Make sure those fields are defined in the schema.");
+    err_says(
+        err,
+        "Attempted to set undefined fields [test3] for the entity type `User`. Make sure those fields are defined in the schema.",
+    );
 
     // For apiVersion below 0.0.8, we should not error out
     let mut host2 = Host::new(
@@ -1626,7 +1651,7 @@ async fn generate_id() {
 
     let entity_cache = host.ctx.state.entity_cache;
     let mods = entity_cache
-        .as_modifications(12)
+        .as_modifications(12, &STOPWATCH)
         .await
         .unwrap()
         .modifications;
@@ -1822,10 +1847,10 @@ async fn test_yaml_parsing(api_version: Version, gas_used: u64) {
 
 #[graph::test]
 async fn yaml_parsing_v0_0_4() {
-    test_yaml_parsing(API_VERSION_0_0_4, 1053927678771).await;
+    test_yaml_parsing(API_VERSION_0_0_4, 1066812580659).await;
 }
 
 #[graph::test]
 async fn yaml_parsing_v0_0_5() {
-    test_yaml_parsing(API_VERSION_0_0_5, 1053955992265).await;
+    test_yaml_parsing(API_VERSION_0_0_5, 1066831062419).await;
 }
diff --git a/runtime/test/src/test/abi.rs b/runtime/test/src/test/abi.rs
index 1d50ccc8f0a..bd1b2de04d9 100644
--- a/runtime/test/src/test/abi.rs
+++ b/runtime/test/src/test/abi.rs
@@ -7,7 +7,7 @@ use super::*;
 
 async fn test_unbounded_loop(api_version: Version) {
     // Set handler timeout to 3 seconds.
-    let mut instance = test_valid_module_and_store_with_timeout(
+    let mut instance = test_module_and_deployment_with_timeout(
         "unboundedLoop",
         mock_data_source(
             &wasm_file_path("non_terminating.wasm", api_version.clone()),
@@ -117,7 +117,7 @@ async fn abi_array_v0_0_4() {
 
 #[graph::test]
 async fn abi_array_v0_0_5() {
-    test_abi_array(API_VERSION_0_0_5, 1636130).await;
+    test_abi_array(API_VERSION_0_0_5, 1561046).await;
 }
 
 async fn test_abi_subarray(api_version: Version) {
@@ -525,8 +525,8 @@ async fn test_abi_big_int(api_version: Version) {
     let new_uint_obj: AscPtr<AscBigInt> = module.invoke_export1("test_uint", &old_uint).await;
     let new_uint: BigInt = module.asc_get(new_uint_obj).unwrap();
     assert_eq!(new_uint, BigInt::from(-49_i32));
-    let new_uint_from_u256 = BigInt::from_signed_u256(&new_uint.to_signed_u256());
-    assert_eq!(new_uint, new_uint_from_u256);
+    let new_uint_from_i256 = BigInt::from_i256(&new_uint.to_i256().unwrap());
+    assert_eq!(new_uint, new_uint_from_i256);
 }
 
 #[graph::test]
diff --git a/runtime/test/src/test_padding.rs b/runtime/test/src/test_padding.rs
index 93e1a642724..89cab5b7231 100644
--- a/runtime/test/src/test_padding.rs
+++ b/runtime/test/src/test_padding.rs
@@ -7,7 +7,7 @@ const WASM_FILE_NAME: &str = "test_padding.wasm";
 
 //for tests, to run in parallel, sub graph name has be unique
 fn rnd_sub_graph_name(size: usize) -> String {
-    use rand::{distr::Alphanumeric, Rng};
+    use rand::{Rng, distr::Alphanumeric};
     rand::rng()
         .sample_iter(&Alphanumeric)
         .take(size)
@@ -62,8 +62,8 @@ pub mod data {
     use async_trait::async_trait;
     use graph::runtime::HostExportError;
     pub use graph::runtime::{
-        asc_new, gas::GasCounter, AscHeap, AscIndexId, AscPtr, AscType, AscValue,
-        DeterministicHostError, IndexForAscTypeId, ToAscObj,
+        AscHeap, AscIndexId, AscPtr, AscType, AscValue, DeterministicHostError, IndexForAscTypeId,
+        ToAscObj, asc_new, gas::GasCounter,
     };
     use graph_runtime_wasm::asc_abi::class::AscString;
 
diff --git a/runtime/wasm/Cargo.toml b/runtime/wasm/Cargo.toml
index 47ce3c2b288..abf96ddc0ff 100644
--- a/runtime/wasm/Cargo.toml
+++ b/runtime/wasm/Cargo.toml
@@ -9,12 +9,12 @@ hex = "0.4.3"
 graph = { path = "../../graph" }
 bs58 = "0.4.0"
 graph-runtime-derive = { path = "../derive" }
-semver = "1.0.27"
-anyhow = "1.0"
+semver = { workspace = true }
+anyhow = { workspace = true }
 never = "0.1"
 
 wasmtime.workspace = true
-wasm-instrument = { version = "0.2.0", features = ["std", "sign_ext"] }
+wasm-instrument = { version = "0.4.0", features = ["std", "sign_ext"] }
 
 # AssemblyScript uses sign extensions
 parity-wasm = { version = "0.45", features = ["std", "sign_ext"] }
diff --git a/runtime/wasm/src/asc_abi/class.rs b/runtime/wasm/src/asc_abi/class.rs
index 8d0f54049dc..ac3256661b2 100644
--- a/runtime/wasm/src/asc_abi/class.rs
+++ b/runtime/wasm/src/asc_abi/class.rs
@@ -8,8 +8,8 @@ use graph::{
         subgraph::API_VERSION_0_0_4,
     },
     runtime::{
-        gas::GasCounter, AscHeap, AscIndexId, AscType, AscValue, HostExportError,
-        IndexForAscTypeId, ToAscObj,
+        AscHeap, AscIndexId, AscType, AscValue, HostExportError, IndexForAscTypeId, ToAscObj,
+        gas::GasCounter,
     },
 };
 use graph::{prelude::serde_json, runtime::DeterministicHostError};
diff --git a/runtime/wasm/src/asc_abi/v0_0_5.rs b/runtime/wasm/src/asc_abi/v0_0_5.rs
index 3c769845b2b..c09ce7a167f 100644
--- a/runtime/wasm/src/asc_abi/v0_0_5.rs
+++ b/runtime/wasm/src/asc_abi/v0_0_5.rs
@@ -7,7 +7,7 @@ use semver::Version;
 
 use graph::runtime::gas::GasCounter;
 use graph::runtime::{
-    AscHeap, AscPtr, AscType, AscValue, DeterministicHostError, HostExportError, HEADER_SIZE,
+    AscHeap, AscPtr, AscType, AscValue, DeterministicHostError, HEADER_SIZE, HostExportError,
 };
 
 use crate::asc_abi::class;
diff --git a/runtime/wasm/src/gas_rules.rs b/runtime/wasm/src/gas_rules.rs
index 10717f92542..7a375f9e346 100644
--- a/runtime/wasm/src/gas_rules.rs
+++ b/runtime/wasm/src/gas_rules.rs
@@ -165,4 +165,8 @@ impl Rules for GasRules {
 
         MemoryGrowCost::Linear(gas_per_page)
     }
+
+    fn call_per_local_cost(&self) -> u32 {
+        0
+    }
 }
diff --git a/runtime/wasm/src/host_exports.rs b/runtime/wasm/src/host_exports.rs
index 0d9c0d2b3bc..b6ab94a066f 100644
--- a/runtime/wasm/src/host_exports.rs
+++ b/runtime/wasm/src/host_exports.rs
@@ -24,7 +24,7 @@ use graph::data_source::{CausalityRegion, DataSource, EntityTypeAccess};
 use graph::ensure;
 use graph::prelude::serde_json;
 use graph::prelude::{slog::b, slog::record_static, *};
-use graph::runtime::gas::{self, complexity, Gas, GasCounter};
+use graph::runtime::gas::{self, Gas, GasCounter, complexity};
 pub use graph::runtime::{DeterministicHostError, HostExportError};
 
 use crate::module::WasmInstance;
@@ -179,8 +179,8 @@ impl HostExports {
 
             if has_invalid_fields {
                 let mut invalid_fields: Vec<Word> = data
-                    .iter()
-                    .filter_map(|(field_name, _)| {
+                    .keys()
+                    .filter_map(|field_name| {
                         if !state
                             .entity_cache
                             .schema
@@ -224,7 +224,6 @@ impl HostExports {
     pub(crate) async fn store_set(
         &self,
         logger: &Logger,
-        block: BlockNumber,
         state: &mut BlockState,
         proof_of_indexing: &SharedProofOfIndexing,
         block_time: BlockTime,
@@ -251,7 +250,7 @@ impl HostExports {
                 .into());
             }
             let id_type = entity_type.id_type()?;
-            let id = state.entity_cache.generate_id(id_type, block)?;
+            let id = state.entity_cache.seq_gen.id(id_type)?;
             data.insert(store::ID.clone(), id.clone().into());
             id.to_string()
         } else {
@@ -338,12 +337,7 @@ impl HostExports {
 
         state
             .entity_cache
-            .set(
-                key,
-                entity,
-                block,
-                Some(&mut state.write_capacity_remaining),
-            )
+            .set(key, entity, Some(&mut state.write_capacity_remaining))
             .await?;
 
         Ok(())
@@ -676,7 +670,7 @@ impl HostExports {
             gas::DEFAULT_GAS_OP.with_args(complexity::Size, data),
             "crypto_keccak_256",
         )?;
-        Ok(tiny_keccak::keccak256(data))
+        Ok(alloy::primitives::keccak256(data).0)
     }
 
     pub(crate) fn big_int_plus(
@@ -1242,6 +1236,30 @@ impl HostExports {
         ty.abi_decode(&data).context("Failed to decode")
     }
 
+    /// Like [`Self::ethereum_decode`], but decodes `data` as ABI function
+    /// parameters (the layout used by transaction calldata and event data)
+    /// rather than as a single ABI value. The two differ only for a top-level
+    /// tuple with at least one dynamic field: calldata has no leading offset
+    /// word, which `abi_decode` would otherwise expect.
+    pub(crate) fn ethereum_decode_params(
+        &self,
+        types: String,
+        data: Vec<u8>,
+        gas: &GasCounter,
+        state: &mut BlockState,
+    ) -> Result<abi::DynSolValue, anyhow::Error> {
+        Self::track_gas_and_ops(
+            gas,
+            state,
+            gas::DEFAULT_GAS_OP.with_args(complexity::Size, &data),
+            "ethereum_decode_params",
+        )?;
+
+        let ty: abi::DynSolType = types.parse().context("Failed to read types")?;
+
+        ty.abi_decode_params(&data).context("Failed to decode")
+    }
+
     pub(crate) fn yaml_from_bytes(
         &self,
         bytes: &[u8],
@@ -1302,13 +1320,10 @@ pub mod test_support {
 
     use graph::{
         blockchain::BlockTime,
-        components::{
-            store::{BlockNumber, GetScope},
-            subgraph::SharedProofOfIndexing,
-        },
+        components::{store::GetScope, subgraph::SharedProofOfIndexing},
         data::value::Word,
         prelude::{BlockState, Entity, StopwatchMetrics, Value},
-        runtime::{gas::GasCounter, HostExportError},
+        runtime::{HostExportError, gas::GasCounter},
         slog::Logger,
     };
 
@@ -1330,7 +1345,6 @@ pub mod test_support {
         pub async fn store_set(
             &self,
             logger: &Logger,
-            block: BlockNumber,
             state: &mut BlockState,
             proof_of_indexing: &SharedProofOfIndexing,
             entity_type: String,
@@ -1342,7 +1356,6 @@ pub mod test_support {
             self.host_exports
                 .store_set(
                     logger,
-                    block,
                     state,
                     proof_of_indexing,
                     self.block_time,
@@ -1382,7 +1395,9 @@ fn bytes_to_string_is_lossy() {
         "Downcoin WETH-USDT",
         bytes_to_string(
             &graph::log::logger(true),
-            vec![68, 111, 119, 110, 99, 111, 105, 110, 32, 87, 69, 84, 72, 45, 85, 83, 68, 84],
+            vec![
+                68, 111, 119, 110, 99, 111, 105, 110, 32, 87, 69, 84, 72, 45, 85, 83, 68, 84
+            ],
         )
     );
 
diff --git a/runtime/wasm/src/mapping.rs b/runtime/wasm/src/mapping.rs
index 0a73832e9dd..c185148bff0 100644
--- a/runtime/wasm/src/mapping.rs
+++ b/runtime/wasm/src/mapping.rs
@@ -1,5 +1,5 @@
 use crate::gas_rules::GasRules;
-use crate::module::{ExperimentalFeatures, ToAscPtr, WasmInstance};
+use crate::module::{ExperimentalFeatures, ToAscPtr, WasmInstance, WasmInstanceData};
 use graph::blockchain::{BlockTime, Blockchain, HostFn};
 use graph::components::store::SubgraphFork;
 use graph::components::subgraph::{MappingError, SharedProofOfIndexing};
@@ -7,13 +7,15 @@ use graph::data_source::{MappingTrigger, TriggerWithHandler};
 use graph::futures01::sync::mpsc;
 use graph::futures01::{Future as _, Stream as _};
 use graph::futures03::channel::oneshot::Sender;
+use graph::parking_lot::RwLock;
 use graph::prelude::*;
+use graph::runtime::IndexForAscTypeId;
 use graph::runtime::gas::Gas;
 use parity_wasm::elements::ExportEntry;
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::panic::AssertUnwindSafe;
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 use std::{panic, thread};
 
 /// Spawn a wasm module in its own thread.
@@ -205,7 +207,11 @@ impl MappingContext {
             host_exports: self.host_exports.cheap_clone(),
             block_ptr: self.block_ptr.cheap_clone(),
             timestamp: self.timestamp,
-            state: BlockState::new(self.state.entity_cache.store.clone(), Default::default()),
+            state: BlockState::new(
+                self.state.entity_cache.store.clone(),
+                Default::default(),
+                self.state.seq_gen(),
+            ),
             proof_of_indexing: self.proof_of_indexing.cheap_clone(),
             host_fns: self.host_fns.cheap_clone(),
             debug_fork: self.debug_fork.cheap_clone(),
@@ -222,6 +228,11 @@ const GN_START_FUNCTION_NAME: &str = "gn::start";
 pub struct ValidModule {
     pub module: wasmtime::Module,
 
+    /// Pre-linked instance template. Created once at module validation time and reused for every
+    /// trigger instantiation, avoiding the cost of rebuilding the linker (~60 host function
+    /// registrations) and resolving imports on each trigger.
+    pub instance_pre: wasmtime::InstancePre<WasmInstanceData>,
+
     // Due to our internal architecture we don't want to run the start function at instantiation time,
     // so we track it separately so that we can run it at an appropriate time.
     // Since the start function is not an export, we will also create an export for it.
@@ -243,6 +254,10 @@ pub struct ValidModule {
 
     // Used as a guard to terminate this task dependency.
     epoch_counter_abort_handle: Option<tokio::task::AbortHandle>,
+
+    /// Cache for asc_type_id results. Maps IndexForAscTypeId to their WASM runtime
+    /// type IDs. Populated lazily on first use; deterministic per compiled module.
+    asc_type_id_cache: RwLock<HashMap<IndexForAscTypeId, u32>>,
 }
 
 impl ValidModule {
@@ -287,20 +302,26 @@ impl ValidModule {
 
             name
         });
-        let parity_module = wasm_instrument::gas_metering::inject(parity_module, &GasRules, "gas")
-            .map_err(|_| anyhow!("Failed to inject gas counter"))?;
+        let backend = wasm_instrument::gas_metering::host_function::Injector::new("gas", "gas");
+        let parity_module =
+            wasm_instrument::gas_metering::inject(parity_module, backend, &GasRules)
+                .map_err(|_| anyhow!("Failed to inject gas counter"))?;
         let raw_module = parity_module.into_bytes()?;
 
-        // We currently use Cranelift as a compilation engine. Cranelift is an optimizing compiler,
-        // but that should not cause determinism issues since it adheres to the Wasm spec. Still we
-        // turn off optional optimizations to be conservative.
+        // We use Cranelift as a compilation engine. Cranelift is an optimizing compiler, but that
+        // should not cause determinism issues since it adheres to the Wasm spec and NaN
+        // canonicalization is enabled below. The optimization level is configurable via
+        // GRAPH_WASM_OPT_LEVEL (default: speed).
         let mut config = wasmtime::Config::new();
         config.strategy(wasmtime::Strategy::Cranelift);
         config.epoch_interruption(true);
         config.cranelift_nan_canonicalization(true); // For NaN determinism.
-        config.cranelift_opt_level(wasmtime::OptLevel::None);
+        config.cranelift_opt_level(match ENV_VARS.mappings.wasm_opt_level {
+            graph::env::WasmOptLevel::None => wasmtime::OptLevel::None,
+            graph::env::WasmOptLevel::Speed => wasmtime::OptLevel::Speed,
+            graph::env::WasmOptLevel::SpeedAndSize => wasmtime::OptLevel::SpeedAndSize,
+        });
         config.max_wasm_stack(ENV_VARS.mappings.max_stack_size);
-        config.async_support(true);
 
         let engine = &wasmtime::Engine::new(&config)?;
         let module = wasmtime::Module::from_binary(engine, &raw_module)?;
@@ -335,14 +356,27 @@ impl ValidModule {
             epoch_counter_abort_handle = Some(graph::spawn(epoch_counter).abort_handle());
         }
 
+        let linker = crate::module::build_linker(engine, &import_name_to_modules)?;
+        let instance_pre = linker.instantiate_pre(&module)?;
+
         Ok(ValidModule {
             module,
+            instance_pre,
             import_name_to_modules,
             start_function,
             timeout,
             epoch_counter_abort_handle,
+            asc_type_id_cache: RwLock::new(HashMap::new()),
         })
     }
+
+    pub fn get_cached_type_id(&self, idx: IndexForAscTypeId) -> Option<u32> {
+        self.asc_type_id_cache.read().get(&idx).copied()
+    }
+
+    pub fn cache_type_id(&self, idx: IndexForAscTypeId, type_id: u32) {
+        self.asc_type_id_cache.write().insert(idx, type_id);
+    }
 }
 
 impl Drop for ValidModule {
diff --git a/runtime/wasm/src/module/context.rs b/runtime/wasm/src/module/context.rs
index 6230a9a1596..70d65489304 100644
--- a/runtime/wasm/src/module/context.rs
+++ b/runtime/wasm/src/module/context.rs
@@ -10,24 +10,24 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use anyhow::Error;
-use graph::components::store::GetScope;
+use graph::components::store::{GetScope, SeqGenerator};
 use never::Never;
 
-use crate::asc_abi::class::*;
 use crate::HostExports;
+use crate::asc_abi::class::*;
 use graph::data::store;
 
+use crate::ExperimentalFeatures;
 use crate::asc_abi::class::AscEntity;
 use crate::asc_abi::class::AscString;
 use crate::mapping::MappingContext;
 use crate::mapping::ValidModule;
-use crate::ExperimentalFeatures;
 use graph::prelude::*;
 use graph::runtime::AscPtr;
-use graph::runtime::{asc_new, gas::GasCounter, DeterministicHostError, HostExportError};
+use graph::runtime::{DeterministicHostError, HostExportError, asc_new, gas::GasCounter};
 
-use super::asc_get;
 use super::AscHeapCtx;
+use super::asc_get;
 
 pub(crate) struct WasmInstanceContext<'a> {
     inner: StoreContextMut<'a, WasmInstanceData>,
@@ -82,6 +82,9 @@ pub struct WasmInstanceData {
     pub valid_module: Arc<ValidModule>,
     pub host_metrics: Arc<HostMetrics>,
 
+    // Per-trigger gas counter, shared via Arc so clones refer to the same counter.
+    pub gas: GasCounter,
+
     // A trap ocurred due to a possible reorg detection.
     pub possible_reorg: bool,
 
@@ -100,6 +103,7 @@ impl WasmInstanceData {
         ctx: MappingContext,
         valid_module: Arc<ValidModule>,
         host_metrics: Arc<HostMetrics>,
+        gas: GasCounter,
         experimental_features: ExperimentalFeatures,
     ) -> Self {
         WasmInstanceData {
@@ -107,6 +111,7 @@ impl WasmInstanceData {
             ctx,
             valid_module,
             host_metrics,
+            gas,
             possible_reorg: false,
             deterministic_host_trap: false,
             experimental_features,
@@ -126,7 +131,11 @@ impl WasmInstanceData {
 
         std::mem::replace(
             state,
-            BlockState::new(state.entity_cache.store.cheap_clone(), LfuCache::default()),
+            BlockState::new(
+                state.entity_cache.store.cheap_clone(),
+                LfuCache::default(),
+                SeqGenerator::new(self.ctx.block_ptr.number),
+            ),
         )
     }
 }
@@ -251,7 +260,6 @@ impl WasmInstanceContext<'_> {
     ) -> Result<(), HostExportError> {
         let stopwatch = self.as_ref().host_metrics.stopwatch.cheap_clone();
         let logger = self.as_ref().ctx.logger.cheap_clone();
-        let block_number = self.as_ref().ctx.block_ptr.block_number();
         stopwatch.start_section("host_export_store_set__wasm_instance_context_store_set");
 
         let entity: String = asc_get(self, entity_ptr, gas)?;
@@ -270,7 +278,6 @@ impl WasmInstanceContext<'_> {
         host_exports
             .store_set(
                 &logger,
-                block_number,
                 &mut ctx.state,
                 &ctx.proof_of_indexing,
                 ctx.timestamp,
@@ -1173,6 +1180,26 @@ impl WasmInstanceContext<'_> {
         }
     }
 
+    /// function decodeParams(types: String, data: Bytes): ethereum.Value | null
+    pub async fn ethereum_decode_params(
+        &mut self,
+        gas: &GasCounter,
+        types_ptr: AscPtr<AscString>,
+        data_ptr: AscPtr<Uint8Array>,
+    ) -> Result<AscPtr<AscEnum<EthereumValueKind>>, HostExportError> {
+        let types = asc_get(self, types_ptr, gas)?;
+        let data = asc_get(self, data_ptr, gas)?;
+        let host_exports = self.as_ref().ctx.host_exports.cheap_clone();
+        let ctx = &mut self.as_mut().ctx;
+        let result = host_exports.ethereum_decode_params(types, data, gas, &mut ctx.state);
+
+        // return `null` if it fails
+        match result {
+            Ok(token) => asc_new(self, &token, gas).await,
+            Err(_) => Ok(AscPtr::null()),
+        }
+    }
+
     /// function arweave.transactionData(txId: string): Bytes | null
     pub async fn arweave_transaction_data(
         &self,
diff --git a/runtime/wasm/src/module/instance.rs b/runtime/wasm/src/module/instance.rs
index d35730f9bfe..79017beadc1 100644
--- a/runtime/wasm/src/module/instance.rs
+++ b/runtime/wasm/src/module/instance.rs
@@ -1,9 +1,9 @@
-use std::sync::atomic::{AtomicBool, Ordering};
+use std::collections::BTreeMap;
 use std::time::Instant;
 
 use anyhow::Error;
-use graph::futures03::future::BoxFuture;
 use graph::futures03::FutureExt as _;
+use graph::futures03::future::BoxFuture;
 use graph::slog::SendSyncRefUnwindSafeKV;
 
 use semver::Version;
@@ -15,21 +15,20 @@ use graph::data::subgraph::schema::SubgraphError;
 use graph::data_source::{MappingTrigger, TriggerWithHandler};
 use graph::prelude::*;
 use graph::runtime::{
-    asc_new,
-    gas::{Gas, GasCounter, SaturatingInto},
-    HostExportError,
+    HostExportError, asc_new,
+    gas::{Gas, GasCounter},
 };
 use graph::{components::subgraph::MappingError, runtime::AscPtr};
 
 use super::IntoWasmRet;
 use super::{IntoTrap, WasmInstanceContext};
+use crate::ExperimentalFeatures;
 use crate::error::DeterminismLevel;
 use crate::mapping::MappingContext;
 use crate::mapping::ValidModule;
 use crate::module::WasmInstanceData;
-use crate::ExperimentalFeatures;
 
-use super::{is_trap_deterministic, AscHeapCtx, ToAscPtr};
+use super::{AscHeapCtx, ToAscPtr, is_trap_deterministic};
 
 /// Handle to a WASM instance, which is terminated if and only if this is dropped.
 pub struct WasmInstance {
@@ -43,11 +42,11 @@ pub struct WasmInstance {
 #[cfg(debug_assertions)]
 mod impl_for_tests {
     use graph::runtime::{
-        asc_new, AscIndexId, AscPtr, AscType, DeterministicHostError, FromAscObj, HostExportError,
-        ToAscObj,
+        AscIndexId, AscPtr, AscType, DeterministicHostError, FromAscObj, HostExportError, ToAscObj,
+        asc_new,
     };
 
-    use crate::module::{asc_get, WasmInstanceContext};
+    use crate::module::{WasmInstanceContext, asc_get};
 
     impl super::WasmInstance {
         pub fn asc_get<T, P>(&mut self, asc_ptr: AscPtr<P>) -> Result<T, DeterministicHostError>
@@ -94,12 +93,14 @@ impl WasmInstance {
         self.instance
             .get_func(self.store.as_context_mut(), handler_name)
             .with_context(|| format!("function {} not found", handler_name))?
-            .typed::<(u32, u32), ()>(self.store.as_context_mut())?
+            .typed::<(u32, u32), ()>(self.store.as_context_mut())
+            .map_err(anyhow::Error::from)?
             .call_async(
                 self.store.as_context_mut(),
                 (value?.wasm_ptr(), user_data?.wasm_ptr()),
             )
             .await
+            .map_err(anyhow::Error::from)
             .with_context(|| format!("Failed to handle callback '{}'", handler_name))?;
 
         let mut wasm_ctx = self.store.into_data();
@@ -160,6 +161,7 @@ impl WasmInstance {
 
         let func = func
             .typed(self.store.as_context_mut())
+            .map_err(anyhow::Error::from)
             .context("wasm function has incorrect signature")?;
 
         // Caution: Make sure all exit paths from this function call `exit_handler`.
@@ -169,6 +171,7 @@ impl WasmInstance {
         let deterministic_error: Option<Error> = match func
             .call_async(self.store.as_context_mut(), arg.wasm_ptr())
             .await
+            .map_err(anyhow::Error::from)
         {
             Ok(()) => {
                 assert!(!self.instance_ctx().as_ref().possible_reorg);
@@ -249,352 +252,401 @@ impl WasmInstance {
     }
 }
 
-impl WasmInstance {
-    /// Instantiates the module and sets it to be interrupted after `timeout`.
-    pub async fn from_valid_module_with_ctx(
-        valid_module: Arc<ValidModule>,
-        ctx: MappingContext,
-        host_metrics: Arc<HostMetrics>,
-        experimental_features: ExperimentalFeatures,
-    ) -> Result<WasmInstance, anyhow::Error> {
-        let engine = valid_module.module.engine();
-        let mut linker: Linker<WasmInstanceData> = wasmtime::Linker::new(engine);
-        let host_fns = ctx.host_fns.cheap_clone();
-        let api_version = ctx.host_exports.data_source.api_version.clone();
+/// Register a chain-specific host function dispatcher for the given import name.
+/// The registered closure looks up the `HostFn` by name from `caller.data().ctx.host_fns`
+/// at call time. If the module doesn't import this function, this is a no-op.
+fn link_chain_host_fn(
+    linker: &mut Linker<WasmInstanceData>,
+    import_name_to_modules: &BTreeMap<String, Vec<String>>,
+    name: &'static str,
+) -> Result<(), anyhow::Error> {
+    let modules = match import_name_to_modules.get(name) {
+        Some(m) => m,
+        None => return Ok(()),
+    };
 
-        let wasm_ctx = WasmInstanceData::from_instance(
-            ctx,
-            valid_module.cheap_clone(),
-            host_metrics.cheap_clone(),
-            experimental_features,
-        );
-        let mut store = Store::new(engine, wasm_ctx);
+    let name_for_metrics = name.replace('.', "_");
+    let section_name = format!("host_export_{}", name_for_metrics);
 
-        // The epoch on the engine will only ever be incremeted if increment_epoch() is explicitly
-        // called, we only do so if a timeout has been set, it will run forever. When a timeout is
-        // set, the timeout duration is used as the duration of one epoch.
-        //
-        // Therefore, the setting of 2 here means that if a `timeout` is provided, then this
-        // interrupt will be triggered between a duration of `timeout` and `timeout * 2`.
-        //
-        // See also: runtime-timeouts
-        store.set_epoch_deadline(2);
+    for module in modules {
+        let name_for_metrics = name_for_metrics.clone();
+        let section_name = section_name.clone();
+        linker.func_wrap_async(
+            module,
+            name,
+            move |mut caller: wasmtime::Caller<'_, WasmInstanceData>, (call_ptr,): (u32,)| {
+                let name_for_metrics = name_for_metrics.clone();
+                let section_name = section_name.clone();
+                Box::new(async move {
+                    let host_fn = caller
+                        .data()
+                        .ctx
+                        .host_fns
+                        .iter()
+                        .find(|hf| hf.name == name)
+                        .ok_or_else(|| {
+                            wasmtime::Error::msg(format!(
+                                "chain host function '{}' is not available for this chain",
+                                name
+                            ))
+                        })?
+                        .cheap_clone();
+
+                    let start = Instant::now();
+
+                    let gas = caller.data().gas.cheap_clone();
+                    let host_metrics = caller.data().host_metrics.cheap_clone();
+                    let stopwatch = host_metrics.stopwatch.cheap_clone();
+                    let _section = stopwatch.start_section(&section_name);
+
+                    let ctx = HostFnCtx {
+                        logger: caller.data().ctx.logger.cheap_clone(),
+                        block_ptr: caller.data().ctx.block_ptr.cheap_clone(),
+                        gas: gas.cheap_clone(),
+                        metrics: host_metrics.cheap_clone(),
+                        heap: &mut WasmInstanceContext::new(&mut caller),
+                    };
+                    let ret = (host_fn.func)(ctx, call_ptr)
+                        .await
+                        .map_err(|e| match e {
+                            HostExportError::Deterministic(e) => {
+                                caller.data_mut().deterministic_host_trap = true;
+                                e
+                            }
+                            HostExportError::PossibleReorg(e) => {
+                                caller.data_mut().possible_reorg = true;
+                                e
+                            }
+                            HostExportError::Unknown(e) => e,
+                        })
+                        .map_err(wasmtime::Error::from_anyhow)?;
+                    host_metrics.observe_host_fn_execution_time(
+                        start.elapsed().as_secs_f64(),
+                        &name_for_metrics,
+                    );
+                    Ok(ret)
+                })
+            },
+        )?;
+    }
+    Ok(())
+}
 
-        // Because `gas` and `deterministic_host_trap` need to be accessed from the gas
-        // host fn, they need to be separate from the rest of the context.
-        let gas = GasCounter::new(host_metrics.gas_metrics.clone());
-        let deterministic_host_trap = Arc::new(AtomicBool::new(false));
+/// Build a pre-linked `Linker` for a WASM module. This linker can be reused across triggers by
+/// calling `linker.instantiate_pre()` once and then `instance_pre.instantiate_async()` per trigger.
+///
+/// All host functions (builtins + chain-specific) are registered here. Chain-specific host functions
+/// are dispatched generically by looking up the `HostFn` by name from `caller.data().ctx.host_fns`
+/// at call time rather than capturing concrete closures at link time.
+pub(crate) fn build_linker(
+    engine: &wasmtime::Engine,
+    import_name_to_modules: &BTreeMap<String, Vec<String>>,
+) -> Result<Linker<WasmInstanceData>, anyhow::Error> {
+    let mut linker: Linker<WasmInstanceData> = wasmtime::Linker::new(engine);
+
+    // Helper to turn a parameter name into 'u32' for a tuple type
+    // (param1, parma2, ..) : (u32, u32, ..)
+    macro_rules! param_u32 {
+        ($param:ident) => {
+            u32
+        };
+    }
 
-        // Helper to turn a parameter name into 'u32' for a tuple type
-        // (param1, parma2, ..) : (u32, u32, ..)
-        macro_rules! param_u32 {
-            ($param:ident) => {
-                u32
-            };
-        }
+    // The difficulty with this macro is that it needs to turn a list of
+    // parameter names into a tuple declaration (param1, parma2, ..) :
+    // (u32, u32, ..), but also for an empty parameter list, it needs to
+    // produce '(): ()'. In the first case we need a trailing comma, in
+    // the second case we don't. That's why there are two separate
+    // expansions, one with and one without params
+    macro_rules! link {
+        ($wasm_name:expr, $rust_name:ident, $($param:ident),*) => {
+            link!($wasm_name, $rust_name, "host_export_other",$($param),*)
+        };
 
-        // The difficulty with this macro is that it needs to turn a list of
-        // parameter names into a tuple declaration (param1, parma2, ..) :
-        // (u32, u32, ..), but also for an empty parameter list, it needs to
-        // produce '(): ()'. In the first case we need a trailing comma, in
-        // the second case we don't. That's why there are two separate
-        // expansions, one with and one without params
-        macro_rules! link {
-            ($wasm_name:expr, $rust_name:ident, $($param:ident),*) => {
-                link!($wasm_name, $rust_name, "host_export_other",$($param),*)
-            };
+        ($wasm_name:expr, $rust_name:ident, $section:expr, $($param:ident),+) => {
+            let modules = import_name_to_modules
+                .get($wasm_name)
+                .into_iter()
+                .flatten();
 
-            ($wasm_name:expr, $rust_name:ident, $section:expr, $($param:ident),+) => {
-                let modules = valid_module
-                    .import_name_to_modules
-                    .get($wasm_name)
-                    .into_iter()
-                    .flatten();
-
-                // link an import with all the modules that require it.
-                for module in modules {
-                    let gas = gas.cheap_clone();
-                    linker.func_wrap_async(
-                        module,
-                        $wasm_name,
-                        move |mut caller: wasmtime::Caller<'_, WasmInstanceData>,
-                              ($($param),*,) : ($(param_u32!($param)),*,)|  {
-                            let gas = gas.cheap_clone();
-                            Box::new(async move {
-                                let host_metrics = caller.data().host_metrics.cheap_clone();
-                                let _section = host_metrics.stopwatch.start_section($section);
-
-                                #[allow(unused_mut)]
-                                let mut ctx = std::pin::pin!(WasmInstanceContext::new(&mut caller));
-                                let result = ctx.$rust_name(
-                                    &gas,
-                                    $($param.into()),*
-                                ).await;
-                                let ctx = ctx.get_mut();
-                                match result {
-                                    Ok(result) => Ok(result.into_wasm_ret()),
-                                    Err(e) => {
-                                        match IntoTrap::determinism_level(&e) {
-                                            DeterminismLevel::Deterministic => {
-                                                ctx.as_mut().deterministic_host_trap = true;
-                                            }
-                                            DeterminismLevel::PossibleReorg => {
-                                                ctx.as_mut().possible_reorg = true;
-                                            }
-                                            DeterminismLevel::Unimplemented
-                                            | DeterminismLevel::NonDeterministic => {}
+            // link an import with all the modules that require it.
+            for module in modules {
+                linker.func_wrap_async(
+                    module,
+                    $wasm_name,
+                    move |mut caller: wasmtime::Caller<'_, WasmInstanceData>,
+                          ($($param),*,) : ($(param_u32!($param)),*,)|  {
+                        Box::new(async move {
+                            let gas = caller.data().gas.cheap_clone();
+                            let host_metrics = caller.data().host_metrics.cheap_clone();
+                            let _section = host_metrics.stopwatch.start_section($section);
+
+                            #[allow(unused_mut)]
+                            let mut ctx = std::pin::pin!(WasmInstanceContext::new(&mut caller));
+                            let result = ctx.$rust_name(
+                                &gas,
+                                $($param.into()),*
+                            ).await;
+                            let ctx = ctx.get_mut();
+                            match result {
+                                Ok(result) => Ok(result.into_wasm_ret()),
+                                Err(e) => {
+                                    match IntoTrap::determinism_level(&e) {
+                                        DeterminismLevel::Deterministic => {
+                                            ctx.as_mut().deterministic_host_trap = true;
                                         }
-
-                                        Err(e.into())
-                                    }
-                                }
-                        }) },
-                    )?;
-                }
-            };
-
-            ($wasm_name:expr, $rust_name:ident, $section:expr,) => {
-                let modules = valid_module
-                    .import_name_to_modules
-                    .get($wasm_name)
-                    .into_iter()
-                    .flatten();
-
-                // link an import with all the modules that require it.
-                for module in modules {
-                    let gas = gas.cheap_clone();
-                    linker.func_wrap_async(
-                        module,
-                        $wasm_name,
-                        move |mut caller: wasmtime::Caller<'_, WasmInstanceData>,
-                              _ : ()|  {
-                            let gas = gas.cheap_clone();
-                            Box::new(async move {
-                                let host_metrics = caller.data().host_metrics.cheap_clone();
-                                let _section = host_metrics.stopwatch.start_section($section);
-
-                                #[allow(unused_mut)]
-                                let mut ctx = WasmInstanceContext::new(&mut caller);
-                                let result = ctx.$rust_name(&gas).await;
-                                match result {
-                                    Ok(result) => Ok(result.into_wasm_ret()),
-                                    Err(e) => {
-                                        match IntoTrap::determinism_level(&e) {
-                                            DeterminismLevel::Deterministic => {
-                                                ctx.as_mut().deterministic_host_trap = true;
-                                            }
-                                            DeterminismLevel::PossibleReorg => {
-                                                ctx.as_mut().possible_reorg = true;
-                                            }
-                                            DeterminismLevel::Unimplemented
-                                            | DeterminismLevel::NonDeterministic => {}
+                                        DeterminismLevel::PossibleReorg => {
+                                            ctx.as_mut().possible_reorg = true;
                                         }
-
-                                        Err(e.into())
+                                        DeterminismLevel::Unimplemented
+                                        | DeterminismLevel::NonDeterministic => {}
                                     }
+
+                                    Err(e.into())
                                 }
-                        }) },
-                    )?;
-                }
-            };
-        }
+                            }
+                    }) },
+                )?;
+            }
+        };
 
-        // Link chain-specifc host fns.
-        for host_fn in host_fns.iter() {
-            let modules = valid_module
-                .import_name_to_modules
-                .get(host_fn.name)
+        ($wasm_name:expr, $rust_name:ident, $section:expr,) => {
+            let modules = import_name_to_modules
+                .get($wasm_name)
                 .into_iter()
                 .flatten();
 
+            // link an import with all the modules that require it.
             for module in modules {
-                let host_fn = host_fn.cheap_clone();
-                let gas = gas.cheap_clone();
                 linker.func_wrap_async(
                     module,
-                    host_fn.name,
+                    $wasm_name,
                     move |mut caller: wasmtime::Caller<'_, WasmInstanceData>,
-                          (call_ptr,): (u32,)| {
-                        let host_fn = host_fn.cheap_clone();
-                        let gas = gas.cheap_clone();
+                          _ : ()|  {
                         Box::new(async move {
-                            let start = Instant::now();
-
-                            let name_for_metrics = host_fn.name.replace('.', "_");
+                            let gas = caller.data().gas.cheap_clone();
                             let host_metrics = caller.data().host_metrics.cheap_clone();
-                            let stopwatch = host_metrics.stopwatch.cheap_clone();
-                            let _section = stopwatch
-                                .start_section(&format!("host_export_{}", name_for_metrics));
-
-                            let ctx = HostFnCtx {
-                                logger: caller.data().ctx.logger.cheap_clone(),
-                                block_ptr: caller.data().ctx.block_ptr.cheap_clone(),
-                                gas: gas.cheap_clone(),
-                                metrics: host_metrics.cheap_clone(),
-                                heap: &mut WasmInstanceContext::new(&mut caller),
-                            };
-                            let ret = (host_fn.func)(ctx, call_ptr).await.map_err(|e| match e {
-                                HostExportError::Deterministic(e) => {
-                                    caller.data_mut().deterministic_host_trap = true;
-                                    e
-                                }
-                                HostExportError::PossibleReorg(e) => {
-                                    caller.data_mut().possible_reorg = true;
-                                    e
+                            let _section = host_metrics.stopwatch.start_section($section);
+
+                            #[allow(unused_mut)]
+                            let mut ctx = WasmInstanceContext::new(&mut caller);
+                            let result = ctx.$rust_name(&gas).await;
+                            match result {
+                                Ok(result) => Ok(result.into_wasm_ret()),
+                                Err(e) => {
+                                    match IntoTrap::determinism_level(&e) {
+                                        DeterminismLevel::Deterministic => {
+                                            ctx.as_mut().deterministic_host_trap = true;
+                                        }
+                                        DeterminismLevel::PossibleReorg => {
+                                            ctx.as_mut().possible_reorg = true;
+                                        }
+                                        DeterminismLevel::Unimplemented
+                                        | DeterminismLevel::NonDeterministic => {}
+                                    }
+
+                                    Err(e.into())
                                 }
-                                HostExportError::Unknown(e) => e,
-                            })?;
-                            host_metrics.observe_host_fn_execution_time(
-                                start.elapsed().as_secs_f64(),
-                                &name_for_metrics,
-                            );
-                            Ok(ret)
-                        })
-                    },
+                            }
+                    }) },
                 )?;
             }
-        }
-
-        link!("ethereum.encode", ethereum_encode, params_ptr);
-        link!("ethereum.decode", ethereum_decode, params_ptr, data_ptr);
-
-        link!("abort", abort, message_ptr, file_name_ptr, line, column);
-
-        link!("store.get", store_get, "host_export_store_get", entity, id);
-        link!(
-            "store.loadRelated",
-            store_load_related,
-            "host_export_store_load_related",
-            entity,
-            id,
-            field
-        );
-        link!(
-            "store.get_in_block",
-            store_get_in_block,
-            "host_export_store_get_in_block",
-            entity,
-            id
-        );
-        link!(
-            "store.set",
-            store_set,
-            "host_export_store_set",
-            entity,
-            id,
-            data
-        );
+        };
+    }
 
-        // All IPFS-related functions exported by the host WASM runtime should be listed in the
-        // graph::data::subgraph::features::IPFS_ON_ETHEREUM_CONTRACTS_FUNCTION_NAMES array for
-        // automatic feature detection to work.
-        //
-        // For reference, search this codebase for: ff652476-e6ad-40e4-85b8-e815d6c6e5e2
-        link!("ipfs.cat", ipfs_cat, "host_export_ipfs_cat", hash_ptr);
-        link!(
-            "ipfs.map",
-            ipfs_map,
-            "host_export_ipfs_map",
-            link_ptr,
-            callback,
-            user_data,
-            flags
-        );
-        // The previous ipfs-related functions are unconditionally linked for backward compatibility
-        if experimental_features.allow_non_deterministic_ipfs {
-            link!(
-                "ipfs.getBlock",
-                ipfs_get_block,
-                "host_export_ipfs_get_block",
-                hash_ptr
-            );
-        }
+    // Chain-specific host functions. Each is registered explicitly rather than
+    // discovered dynamically from imports.
+    link_chain_host_fn(&mut linker, import_name_to_modules, "ethereum.call")?;
+    link_chain_host_fn(&mut linker, import_name_to_modules, "ethereum.getBalance")?;
+    link_chain_host_fn(&mut linker, import_name_to_modules, "ethereum.hasCode")?;
+
+    link!("ethereum.encode", ethereum_encode, params_ptr);
+    link!("ethereum.decode", ethereum_decode, params_ptr, data_ptr);
+    link!(
+        "ethereum.decodeParams",
+        ethereum_decode_params,
+        params_ptr,
+        data_ptr
+    );
+
+    link!("abort", abort, message_ptr, file_name_ptr, line, column);
+
+    link!("store.get", store_get, "host_export_store_get", entity, id);
+    link!(
+        "store.loadRelated",
+        store_load_related,
+        "host_export_store_load_related",
+        entity,
+        id,
+        field
+    );
+    link!(
+        "store.get_in_block",
+        store_get_in_block,
+        "host_export_store_get_in_block",
+        entity,
+        id
+    );
+    link!(
+        "store.set",
+        store_set,
+        "host_export_store_set",
+        entity,
+        id,
+        data
+    );
+
+    // All IPFS-related functions exported by the host WASM runtime should be listed in the
+    // graph::data::subgraph::features::IPFS_ON_ETHEREUM_CONTRACTS_FUNCTION_NAMES array for
+    // automatic feature detection to work.
+    //
+    // For reference, search this codebase for: ff652476-e6ad-40e4-85b8-e815d6c6e5e2
+    link!("ipfs.cat", ipfs_cat, "host_export_ipfs_cat", hash_ptr);
+    link!(
+        "ipfs.map",
+        ipfs_map,
+        "host_export_ipfs_map",
+        link_ptr,
+        callback,
+        user_data,
+        flags
+    );
+    // ipfs.getBlock checks the experimental_features flag internally via
+    // caller.data().experimental_features, so it can be linked unconditionally.
+    link!(
+        "ipfs.getBlock",
+        ipfs_get_block,
+        "host_export_ipfs_get_block",
+        hash_ptr
+    );
+
+    link!("store.remove", store_remove, entity_ptr, id_ptr);
+
+    link!("typeConversion.bytesToString", bytes_to_string, ptr);
+    link!("typeConversion.bytesToHex", bytes_to_hex, ptr);
+    link!("typeConversion.bigIntToString", big_int_to_string, ptr);
+    link!("typeConversion.bigIntToHex", big_int_to_hex, ptr);
+    link!("typeConversion.stringToH160", string_to_h160, ptr);
+    link!("typeConversion.bytesToBase58", bytes_to_base58, ptr);
+
+    link!("json.fromBytes", json_from_bytes, ptr);
+    link!("json.try_fromBytes", json_try_from_bytes, ptr);
+    link!("json.toI64", json_to_i64, ptr);
+    link!("json.toU64", json_to_u64, ptr);
+    link!("json.toF64", json_to_f64, ptr);
+    link!("json.toBigInt", json_to_big_int, ptr);
+
+    link!("yaml.fromBytes", yaml_from_bytes, ptr);
+    link!("yaml.try_fromBytes", yaml_try_from_bytes, ptr);
+
+    link!("crypto.keccak256", crypto_keccak_256, ptr);
+
+    link!("bigInt.plus", big_int_plus, x_ptr, y_ptr);
+    link!("bigInt.minus", big_int_minus, x_ptr, y_ptr);
+    link!("bigInt.times", big_int_times, x_ptr, y_ptr);
+    link!("bigInt.dividedBy", big_int_divided_by, x_ptr, y_ptr);
+    link!("bigInt.dividedByDecimal", big_int_divided_by_decimal, x, y);
+    link!("bigInt.mod", big_int_mod, x_ptr, y_ptr);
+    link!("bigInt.pow", big_int_pow, x_ptr, exp);
+    link!("bigInt.fromString", big_int_from_string, ptr);
+    link!("bigInt.bitOr", big_int_bit_or, x_ptr, y_ptr);
+    link!("bigInt.bitAnd", big_int_bit_and, x_ptr, y_ptr);
+    link!("bigInt.leftShift", big_int_left_shift, x_ptr, bits);
+    link!("bigInt.rightShift", big_int_right_shift, x_ptr, bits);
+
+    link!("bigDecimal.toString", big_decimal_to_string, ptr);
+    link!("bigDecimal.fromString", big_decimal_from_string, ptr);
+    link!("bigDecimal.plus", big_decimal_plus, x_ptr, y_ptr);
+    link!("bigDecimal.minus", big_decimal_minus, x_ptr, y_ptr);
+    link!("bigDecimal.times", big_decimal_times, x_ptr, y_ptr);
+    link!("bigDecimal.dividedBy", big_decimal_divided_by, x, y);
+    link!("bigDecimal.equals", big_decimal_equals, x_ptr, y_ptr);
+
+    link!("dataSource.create", data_source_create, name, params);
+    link!(
+        "dataSource.createWithContext",
+        data_source_create_with_context,
+        name,
+        params,
+        context
+    );
+    link!("dataSource.address", data_source_address,);
+    link!("dataSource.network", data_source_network,);
+    link!("dataSource.context", data_source_context,);
+
+    link!("ens.nameByHash", ens_name_by_hash, ptr);
+
+    link!("log.log", log_log, level, msg_ptr);
+
+    // `arweave` and `box` functionality was removed. The implementations return deterministic
+    // errors. Linked unconditionally since import_name_to_modules ensures they're only
+    // registered if the module actually imports them.
+    link!("arweave.transactionData", arweave_transaction_data, ptr);
+    link!("box.profile", box_profile, ptr);
+
+    // link the `gas` function
+    // See also e3f03e62-40e4-4f8c-b4a1-d0375cca0b76
+    linker.func_wrap(
+        "gas",
+        "gas",
+        |mut caller: wasmtime::Caller<'_, WasmInstanceData>,
+         gas_used: u64|
+         -> wasmtime::Result<()> {
+            // Gas metering has a relevant execution cost cost, being called tens of thousands
+            // of times per handler, but it's not worth having a stopwatch section here because
+            // the cost of measuring would be greater than the cost of `consume_host_fn`. Last
+            // time this was benchmarked it took < 100ns to run.
+            if let Err(e) = caller
+                .data()
+                .gas
+                .consume_host_fn_with_metrics(Gas::new(gas_used), "gas")
+            {
+                caller.data_mut().deterministic_host_trap = true;
+                return Err(wasmtime::Error::from_anyhow(e.into()));
+            }
 
-        link!("store.remove", store_remove, entity_ptr, id_ptr);
-
-        link!("typeConversion.bytesToString", bytes_to_string, ptr);
-        link!("typeConversion.bytesToHex", bytes_to_hex, ptr);
-        link!("typeConversion.bigIntToString", big_int_to_string, ptr);
-        link!("typeConversion.bigIntToHex", big_int_to_hex, ptr);
-        link!("typeConversion.stringToH160", string_to_h160, ptr);
-        link!("typeConversion.bytesToBase58", bytes_to_base58, ptr);
-
-        link!("json.fromBytes", json_from_bytes, ptr);
-        link!("json.try_fromBytes", json_try_from_bytes, ptr);
-        link!("json.toI64", json_to_i64, ptr);
-        link!("json.toU64", json_to_u64, ptr);
-        link!("json.toF64", json_to_f64, ptr);
-        link!("json.toBigInt", json_to_big_int, ptr);
-
-        link!("yaml.fromBytes", yaml_from_bytes, ptr);
-        link!("yaml.try_fromBytes", yaml_try_from_bytes, ptr);
-
-        link!("crypto.keccak256", crypto_keccak_256, ptr);
-
-        link!("bigInt.plus", big_int_plus, x_ptr, y_ptr);
-        link!("bigInt.minus", big_int_minus, x_ptr, y_ptr);
-        link!("bigInt.times", big_int_times, x_ptr, y_ptr);
-        link!("bigInt.dividedBy", big_int_divided_by, x_ptr, y_ptr);
-        link!("bigInt.dividedByDecimal", big_int_divided_by_decimal, x, y);
-        link!("bigInt.mod", big_int_mod, x_ptr, y_ptr);
-        link!("bigInt.pow", big_int_pow, x_ptr, exp);
-        link!("bigInt.fromString", big_int_from_string, ptr);
-        link!("bigInt.bitOr", big_int_bit_or, x_ptr, y_ptr);
-        link!("bigInt.bitAnd", big_int_bit_and, x_ptr, y_ptr);
-        link!("bigInt.leftShift", big_int_left_shift, x_ptr, bits);
-        link!("bigInt.rightShift", big_int_right_shift, x_ptr, bits);
-
-        link!("bigDecimal.toString", big_decimal_to_string, ptr);
-        link!("bigDecimal.fromString", big_decimal_from_string, ptr);
-        link!("bigDecimal.plus", big_decimal_plus, x_ptr, y_ptr);
-        link!("bigDecimal.minus", big_decimal_minus, x_ptr, y_ptr);
-        link!("bigDecimal.times", big_decimal_times, x_ptr, y_ptr);
-        link!("bigDecimal.dividedBy", big_decimal_divided_by, x, y);
-        link!("bigDecimal.equals", big_decimal_equals, x_ptr, y_ptr);
-
-        link!("dataSource.create", data_source_create, name, params);
-        link!(
-            "dataSource.createWithContext",
-            data_source_create_with_context,
-            name,
-            params,
-            context
-        );
-        link!("dataSource.address", data_source_address,);
-        link!("dataSource.network", data_source_network,);
-        link!("dataSource.context", data_source_context,);
+            Ok(())
+        },
+    )?;
 
-        link!("ens.nameByHash", ens_name_by_hash, ptr);
+    Ok(linker)
+}
 
-        link!("log.log", log_log, level, msg_ptr);
+impl WasmInstance {
+    /// Instantiates the module and sets it to be interrupted after `timeout`.
+    pub async fn from_valid_module_with_ctx(
+        valid_module: Arc<ValidModule>,
+        ctx: MappingContext,
+        host_metrics: Arc<HostMetrics>,
+        experimental_features: ExperimentalFeatures,
+    ) -> Result<WasmInstance, anyhow::Error> {
+        let engine = valid_module.module.engine();
+        let api_version = ctx.host_exports.data_source.api_version.clone();
 
-        // `arweave and `box` functionality was removed, but apiVersion <= 0.0.4 must link it.
-        if api_version <= Version::new(0, 0, 4) {
-            link!("arweave.transactionData", arweave_transaction_data, ptr);
-            link!("box.profile", box_profile, ptr);
-        }
+        let gas = GasCounter::new(host_metrics.gas_metrics.clone());
 
-        // link the `gas` function
-        // See also e3f03e62-40e4-4f8c-b4a1-d0375cca0b76
-        {
-            let gas = gas.cheap_clone();
-            linker.func_wrap("gas", "gas", move |gas_used: u32| -> anyhow::Result<()> {
-                // Gas metering has a relevant execution cost cost, being called tens of thousands
-                // of times per handler, but it's not worth having a stopwatch section here because
-                // the cost of measuring would be greater than the cost of `consume_host_fn`. Last
-                // time this was benchmarked it took < 100ns to run.
-                if let Err(e) = gas.consume_host_fn_with_metrics(gas_used.saturating_into(), "gas")
-                {
-                    deterministic_host_trap.store(true, Ordering::SeqCst);
-                    return Err(e.into());
-                }
+        let wasm_ctx = WasmInstanceData::from_instance(
+            ctx,
+            valid_module.cheap_clone(),
+            host_metrics.cheap_clone(),
+            gas.cheap_clone(),
+            experimental_features,
+        );
+        let mut store = Store::new(engine, wasm_ctx);
 
-                Ok(())
-            })?;
-        }
+        // The epoch on the engine will only ever be incremeted if increment_epoch() is explicitly
+        // called, we only do so if a timeout has been set, it will run forever. When a timeout is
+        // set, the timeout duration is used as the duration of one epoch.
+        //
+        // Therefore, the setting of 2 here means that if a `timeout` is provided, then this
+        // interrupt will be triggered between a duration of `timeout` and `timeout * 2`.
+        //
+        // See also: runtime-timeouts
+        store.set_epoch_deadline(2);
 
-        let instance = linker
-            .instantiate_async(store.as_context_mut(), &valid_module.module)
+        let instance = valid_module
+            .instance_pre
+            .instantiate_async(store.as_context_mut())
             .await?;
 
         let asc_heap = AscHeapCtx::new(
diff --git a/runtime/wasm/src/module/into_wasm_ret.rs b/runtime/wasm/src/module/into_wasm_ret.rs
index 8bb9e544981..07d5abf4312 100644
--- a/runtime/wasm/src/module/into_wasm_ret.rs
+++ b/runtime/wasm/src/module/into_wasm_ret.rs
@@ -71,8 +71,9 @@ where
     T: IntoWasmRet,
     T::Ret: wasmtime::WasmTy,
 {
-    type Ret = Result<T::Ret, Error>;
+    type Ret = Result<T::Ret, wasmtime::Error>;
     fn into_wasm_ret(self) -> Self::Ret {
         self.map(|x| x.into_wasm_ret())
+            .map_err(wasmtime::Error::from_anyhow)
     }
 }
diff --git a/runtime/wasm/src/module/mod.rs b/runtime/wasm/src/module/mod.rs
index 02914abc519..fc9b5e0ca09 100644
--- a/runtime/wasm/src/module/mod.rs
+++ b/runtime/wasm/src/module/mod.rs
@@ -1,8 +1,8 @@
 use std::convert::TryFrom;
 use std::mem::MaybeUninit;
 
-use anyhow::anyhow;
 use anyhow::Error;
+use anyhow::anyhow;
 use async_trait::async_trait;
 use graph::blockchain::Blockchain;
 use graph::data_source::subgraph;
@@ -13,14 +13,13 @@ use wasmtime::AsContext;
 use wasmtime::AsContextMut;
 use wasmtime::Memory;
 
-use graph::data_source::{offchain, MappingTrigger, TriggerWithHandler};
+use graph::data_source::{MappingTrigger, TriggerWithHandler, offchain};
 use graph::prelude::*;
 use graph::runtime::AscPtr;
 use graph::runtime::{
-    asc_new,
-    gas::{Gas, GasCounter},
     AscHeap, AscIndexId, AscType, DeterministicHostError, FromAscObj, HostExportError,
-    IndexForAscTypeId,
+    IndexForAscTypeId, asc_new,
+    gas::{Gas, GasCounter},
 };
 pub use into_wasm_ret::IntoWasmRet;
 
@@ -368,17 +367,29 @@ impl AscHeap for WasmInstanceContext<'_> {
         &mut self,
         type_id_index: IndexForAscTypeId,
     ) -> Result<u32, HostExportError> {
+        // Check the module-level cache. Lives on ValidModule (Arc-shared, persists
+        // across all triggers for this subgraph module).
+        if let Some(type_id) = self.as_ref().valid_module.get_cached_type_id(type_id_index) {
+            return Ok(type_id);
+        }
+
+        // Cache miss: call into WASM.
         let asc_heap = self.asc_heap().cheap_clone();
         let func = asc_heap.id_of_type.as_ref().unwrap();
-
-        // Unwrap ok because it's only called on correct apiVersion, look for AscPtr::generate_header
-        func.call_async(self.as_context_mut(), type_id_index as u32)
+        let type_id = func
+            .call_async(self.as_context_mut(), type_id_index as u32)
             .await
             .map_err(|trap| {
                 host_export_error_from_trap(
-                    trap,
+                    trap.into(),
                     format!("Failed to call 'asc_type_id' with '{:?}'", type_id_index),
                 )
-            })
+            })?;
+
+        // Store for all future triggers.
+        self.as_ref()
+            .valid_module
+            .cache_type_id(type_id_index, type_id);
+        Ok(type_id)
     }
 }
diff --git a/runtime/wasm/src/to_from/external.rs b/runtime/wasm/src/to_from/external.rs
index 1ae4e6426fe..e917ffa2fa9 100644
--- a/runtime/wasm/src/to_from/external.rs
+++ b/runtime/wasm/src/to_from/external.rs
@@ -5,16 +5,13 @@ use graph::data::store::scalar::Timestamp;
 use graph::data::value::Word;
 use graph::prelude::alloy::primitives::{Address, B256};
 use graph::prelude::{BigDecimal, BigInt};
-use graph::runtime::gas::GasCounter;
 use graph::runtime::AscHeap;
+use graph::runtime::gas::GasCounter;
 use graph::runtime::{
-    asc_get, asc_new, AscIndexId, AscPtr, AscType, AscValue, HostExportError, ToAscObj,
+    AscIndexId, AscPtr, AscType, AscValue, HostExportError, ToAscObj, asc_get, asc_new,
 };
 use graph::{data::store, runtime::DeterministicHostError};
-use graph::{
-    prelude::{alloy::primitives::U256, serde_json},
-    runtime::FromAscObj,
-};
+use graph::{prelude::serde_json, runtime::FromAscObj};
 
 use crate::asc_abi::class::*;
 
@@ -235,8 +232,7 @@ impl FromAscObj<AscEnum<EthereumValueKind>> for abi::DynSolValue {
             EthereumValueKind::Int => {
                 let ptr: AscPtr<AscBigInt> = AscPtr::from(payload);
                 let n: BigInt = asc_get(heap, ptr, gas, depth)?;
-                let x =
-                    abi::I256::from_le_bytes(n.to_signed_u256().to_le_bytes::<{ U256::BYTES }>());
+                let x = n.to_i256().map_err(DeterministicHostError::Other)?;
 
                 Self::Int(x, x.bits() as usize)
             }
diff --git a/runtime/wasm/src/to_from/mod.rs b/runtime/wasm/src/to_from/mod.rs
index d3dc07c9afe..5318aac2fd2 100644
--- a/runtime/wasm/src/to_from/mod.rs
+++ b/runtime/wasm/src/to_from/mod.rs
@@ -9,8 +9,8 @@ use std::iter::FromIterator;
 use graph::{
     data::value::Word,
     runtime::{
-        asc_get, asc_new, gas::GasCounter, AscHeap, AscIndexId, AscPtr, AscType, AscValue,
-        DeterministicHostError, FromAscObj, HostExportError, ToAscObj,
+        AscHeap, AscIndexId, AscPtr, AscType, AscValue, DeterministicHostError, FromAscObj,
+        HostExportError, ToAscObj, asc_get, asc_new, gas::GasCounter,
     },
 };
 
@@ -207,11 +207,11 @@ where
 }
 
 impl<
-        K: AscType + AscIndexId,
-        V: AscType + AscIndexId,
-        T: FromAscObj<K> + Hash + Eq,
-        U: FromAscObj<V>,
-    > FromAscObj<AscTypedMap<K, V>> for HashMap<T, U>
+    K: AscType + AscIndexId,
+    V: AscType + AscIndexId,
+    T: FromAscObj<K> + Hash + Eq,
+    U: FromAscObj<V>,
+> FromAscObj<AscTypedMap<K, V>> for HashMap<T, U>
 where
     Array<AscPtr<AscTypedMapEntry<K, V>>>: AscIndexId,
     AscTypedMapEntry<K, V>: AscIndexId,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4caf2a671f8..529ab8268aa 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,9 @@
 [toolchain]
-channel = "stable"
+# Pinned to 1.94.0 because Rust 1.95.0 has a compiler regression where
+# the `core` crate hits a recursion limit resolving NonZero niche types
+# ("queries overflow the depth limit!" in niche_types.rs). See
+# https://github.com/rust-lang/rust/issues/152942 for details. Switch
+# back to "stable" once a fixed release (1.95.1+ or 1.96.0) is available.
+channel = "1.94.0"
 profile = "default"
 components = [ "rustfmt" ]
diff --git a/server/graphman/src/entities/deployment_selector.rs b/server/graphman/src/entities/deployment_selector.rs
index 97d8ec72b23..f77ab9ee766 100644
--- a/server/graphman/src/entities/deployment_selector.rs
+++ b/server/graphman/src/entities/deployment_selector.rs
@@ -1,5 +1,5 @@
-use anyhow::anyhow;
 use anyhow::Result;
+use anyhow::anyhow;
 use async_graphql::InputObject;
 
 /// Available criteria for selecting one or more deployments.
diff --git a/server/graphman/src/handlers/graphql.rs b/server/graphman/src/handlers/graphql.rs
index 4eeb88303cf..8390942f018 100644
--- a/server/graphman/src/handlers/graphql.rs
+++ b/server/graphman/src/handlers/graphql.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use async_graphql::http::playground_source;
 use async_graphql::http::GraphQLPlaygroundConfig;
+use async_graphql::http::playground_source;
 use async_graphql_axum::GraphQLRequest;
 use async_graphql_axum::GraphQLResponse;
 use axum::extract::Extension;
diff --git a/server/graphman/src/resolvers/deployment_mutation/create.rs b/server/graphman/src/resolvers/deployment_mutation/create.rs
index 52e30bc6504..9c9bd09542e 100644
--- a/server/graphman/src/resolvers/deployment_mutation/create.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/create.rs
@@ -20,7 +20,7 @@ pub async fn run(ctx: &GraphmanContext, name: &String) -> Result<()> {
             return Err(GraphmanError::Store(anyhow!(
                 "Subgraph name must contain only a-z, A-Z, 0-9, '-' and '_'"
             ))
-            .into())
+            .into());
         }
     };
 
diff --git a/server/graphman/src/resolvers/deployment_mutation/pause.rs b/server/graphman/src/resolvers/deployment_mutation/pause.rs
index 71327e62f7e..386747f1af5 100644
--- a/server/graphman/src/resolvers/deployment_mutation/pause.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/pause.rs
@@ -1,6 +1,6 @@
 use async_graphql::Result;
 use graphman::commands::deployment::pause::{
-    load_active_deployment, pause_active_deployment, PauseDeploymentError,
+    PauseDeploymentError, load_active_deployment, pause_active_deployment,
 };
 use graphman::deployment::DeploymentSelector;
 
diff --git a/server/graphman/src/resolvers/deployment_mutation/reassign.rs b/server/graphman/src/resolvers/deployment_mutation/reassign.rs
index 00d32bc0a7b..ee24719c328 100644
--- a/server/graphman/src/resolvers/deployment_mutation/reassign.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/reassign.rs
@@ -1,9 +1,9 @@
 use anyhow::Ok;
 use async_graphql::Result;
 use graph::prelude::NodeId;
+use graphman::commands::deployment::reassign::ReassignResult;
 use graphman::commands::deployment::reassign::load_deployment;
 use graphman::commands::deployment::reassign::reassign_deployment;
-use graphman::commands::deployment::reassign::ReassignResult;
 use graphman::deployment::DeploymentSelector;
 
 use crate::resolvers::context::GraphmanContext;
diff --git a/server/graphman/src/resolvers/deployment_mutation/remove.rs b/server/graphman/src/resolvers/deployment_mutation/remove.rs
index ba1b50a2adb..b310281d52c 100644
--- a/server/graphman/src/resolvers/deployment_mutation/remove.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/remove.rs
@@ -20,14 +20,11 @@ pub async fn run(ctx: &GraphmanContext, name: &String) -> Result<()> {
             return Err(GraphmanError::Store(anyhow!(
                 "Subgraph name must contain only a-z, A-Z, 0-9, '-' and '_'"
             ))
-            .into())
+            .into());
         }
     };
 
-    let changes = catalog_conn
-        .remove_subgraph(name)
-        .await
-        .map_err(GraphmanError::from)?;
+    let changes = catalog_conn.remove_subgraph(name).await?;
     catalog_conn
         .send_store_event(&ctx.notification_sender, &StoreEvent::new(changes))
         .await?;
diff --git a/server/graphman/src/resolvers/deployment_mutation/restart.rs b/server/graphman/src/resolvers/deployment_mutation/restart.rs
index 3f92b9403e7..477ee7fb261 100644
--- a/server/graphman/src/resolvers/deployment_mutation/restart.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/restart.rs
@@ -3,8 +3,8 @@ use std::time::Duration;
 
 use async_graphql::Result;
 use graph_store_postgres::graphman::GraphmanStore;
-use graphman::deployment::DeploymentSelector;
 use graphman::GraphmanExecutionTracker;
+use graphman::deployment::DeploymentSelector;
 use graphman_store::CommandKind;
 use graphman_store::GraphmanStore as _;
 
diff --git a/server/graphman/src/server.rs b/server/graphman/src/server.rs
index a969433cdea..a3a4456606b 100644
--- a/server/graphman/src/server.rs
+++ b/server/graphman/src/server.rs
@@ -3,28 +3,28 @@ use std::sync::Arc;
 
 use async_graphql::EmptySubscription;
 use async_graphql::Schema;
+use axum::Router;
 use axum::extract::Extension;
 use axum::http::Method;
 use axum::routing::get;
-use axum::Router;
 use graph::log::factory::LoggerFactory;
 use graph::prelude::ComponentLoggerConfig;
 use graph::prelude::ElasticComponentLoggerConfig;
-use graph_store_postgres::graphman::GraphmanStore;
 use graph_store_postgres::ConnectionPool;
 use graph_store_postgres::NotificationSender;
 use graph_store_postgres::Store;
-use slog::{info, Logger};
+use graph_store_postgres::graphman::GraphmanStore;
+use slog::{Logger, info};
 use tokio::sync::Notify;
 use tower_http::cors::{Any, CorsLayer};
 
+use crate::GraphmanServerError;
 use crate::auth::AuthToken;
+use crate::handlers::AppState;
 use crate::handlers::graphql_playground_handler;
 use crate::handlers::graphql_request_handler;
-use crate::handlers::AppState;
 use crate::resolvers::MutationRoot;
 use crate::resolvers::QueryRoot;
-use crate::GraphmanServerError;
 
 #[derive(Clone)]
 pub struct GraphmanServer {
diff --git a/server/graphman/tests/auth.rs b/server/graphman/tests/auth.rs
index f60670c33dc..a5729ef9e66 100644
--- a/server/graphman/tests/auth.rs
+++ b/server/graphman/tests/auth.rs
@@ -2,10 +2,10 @@ pub mod util;
 
 use serde_json::json;
 
-use self::util::client::send_graphql_request;
-use self::util::client::send_request;
 use self::util::client::BASE_URL;
 use self::util::client::CLIENT;
+use self::util::client::send_graphql_request;
+use self::util::client::send_request;
 use self::util::run_test;
 use self::util::server::INVALID_TOKEN;
 use self::util::server::VALID_TOKEN;
diff --git a/server/graphman/tests/deployment_mutation.rs b/server/graphman/tests/deployment_mutation.rs
index e4d89633976..6742b064f20 100644
--- a/server/graphman/tests/deployment_mutation.rs
+++ b/server/graphman/tests/deployment_mutation.rs
@@ -7,7 +7,7 @@ use graph::prelude::DeploymentHash;
 use serde::Deserialize;
 use serde_json::json;
 use test_store::SUBGRAPH_STORE;
-use test_store::{create_subgraph_name, create_test_subgraph};
+use test_store::create_test_subgraph;
 use tokio::time::sleep;
 
 use self::util::client::send_graphql_request;
@@ -358,8 +358,6 @@ fn graphql_cannot_create_new_subgraph_with_invalid_name() {
 #[test]
 fn graphql_can_remove_subgraph() {
     run_test(|| async {
-        create_subgraph_name("subgraph_1").await.unwrap();
-
         let resp = send_graphql_request(
             json!({
                 "query": r#"mutation RemoveSubgraph {
@@ -405,44 +403,17 @@ fn graphql_cannot_remove_subgraph_with_invalid_name() {
         )
         .await;
 
-        let data = &resp["data"]["deployment"];
-        let errors = resp["errors"].as_array().unwrap();
-
-        assert!(data.is_null());
-        assert_eq!(errors.len(), 1);
-        assert_eq!(
-            errors[0]["message"].as_str().unwrap(),
-            "store error: Subgraph name must contain only a-z, A-Z, 0-9, '-' and '_'"
-        );
-    });
-}
-
-#[test]
-fn graphql_remove_returns_error_for_non_existing_subgraph() {
-    run_test(|| async {
-        let resp = send_graphql_request(
-            json!({
-                "query": r#"mutation RemoveNonExistingSubgraph {
-                    deployment {
-                        remove(name: "non_existing_subgraph") {
-                            success
-                        }
+        let success_resp = json!({
+            "data": {
+                "deployment": {
+                    "remove": {
+                        "success": true,
                     }
-                }"#
-            }),
-            VALID_TOKEN,
-        )
-        .await;
-
-        let data = &resp["data"]["deployment"];
-        let errors = resp["errors"].as_array().unwrap();
+                }
+            }
+        });
 
-        assert!(data.is_null());
-        assert_eq!(errors.len(), 1);
-        assert_eq!(
-            errors[0]["message"].as_str().unwrap(),
-            "store error: subgraph not found: non_existing_subgraph"
-        );
+        assert_ne!(resp, success_resp);
     });
 }
 
diff --git a/server/graphman/tests/deployment_query.rs b/server/graphman/tests/deployment_query.rs
index 9d11cfc018f..52006b91b38 100644
--- a/server/graphman/tests/deployment_query.rs
+++ b/server/graphman/tests/deployment_query.rs
@@ -5,10 +5,10 @@ use graph::data::subgraph::DeploymentHash;
 use graph::prelude::QueryTarget;
 
 use serde_json::json;
-use test_store::store::create_test_subgraph;
-use test_store::store::NETWORK_NAME;
 use test_store::STORE;
 use test_store::SUBGRAPH_STORE;
+use test_store::store::NETWORK_NAME;
+use test_store::store::create_test_subgraph;
 
 use self::util::client::send_graphql_request;
 use self::util::run_test;
diff --git a/server/graphman/tests/util/mod.rs b/server/graphman/tests/util/mod.rs
index 7fe6893fcd6..b4409d2d500 100644
--- a/server/graphman/tests/util/mod.rs
+++ b/server/graphman/tests/util/mod.rs
@@ -6,8 +6,8 @@ use std::sync::Mutex;
 
 use graph::TEST_RUNTIME;
 use lazy_static::lazy_static;
-use test_store::store::remove_subgraphs;
 use test_store::store::PRIMARY_POOL;
+use test_store::store::remove_subgraphs;
 
 lazy_static! {
     // Used to make sure tests will run sequentially.
diff --git a/server/http/src/server.rs b/server/http/src/server.rs
index f5868cff5b8..8aad5eb0d18 100644
--- a/server/http/src/server.rs
+++ b/server/http/src/server.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use graph::anyhow;
 use graph::cheap_clone::CheapClone;
-use graph::components::server::server::{start, ServerHandle};
+use graph::components::server::server::{ServerHandle, start};
 use graph::log::factory::{ComponentLoggerConfig, ElasticComponentLoggerConfig};
 use graph::slog::info;
 
diff --git a/server/http/src/service.rs b/server/http/src/service.rs
index 6eee41ce59a..66a799caed3 100644
--- a/server/http/src/service.rs
+++ b/server/http/src/service.rs
@@ -19,15 +19,15 @@ use graph::hyper::header::{
     ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
     CONTENT_LENGTH, CONTENT_TYPE, LOCATION,
 };
-use graph::hyper::{body::Body, header::HeaderValue};
 use graph::hyper::{Method, Request, Response, StatusCode};
-use graph::prelude::serde_json;
-use graph::prelude::serde_json::json;
+use graph::hyper::{body::Body, header::HeaderValue};
 use graph::prelude::CacheWeight as _;
 use graph::prelude::QueryError;
+use graph::prelude::serde_json;
+use graph::prelude::serde_json::json;
 use graph::semver::VersionReq;
-use graph::slog::error;
 use graph::slog::Logger;
+use graph::slog::error;
 use graph::url::form_urlencoded;
 use graph::{components::server::query::ServerError, data::query::QueryTarget};
 
@@ -104,10 +104,10 @@ where
 
         if let Some(query) = request.uri().query() {
             let potential_version_requirement = query.split('&').find_map(|pair| {
-                if pair.starts_with("api-version=") {
-                    if let Some(version_requirement) = pair.split('=').nth(1) {
-                        return Some(version_requirement);
-                    }
+                if pair.starts_with("api-version=")
+                    && let Some(version_requirement) = pair.split('=').nth(1)
+                {
+                    return Some(version_requirement);
                 }
                 None
             });
@@ -298,12 +298,11 @@ where
     }
 
     fn has_request_body<T>(&self, req: &Request<T>) -> bool {
-        if let Some(length) = req.headers().get(CONTENT_LENGTH) {
-            if let Ok(length) = length.to_str() {
-                if let Ok(length) = length.parse::<usize>() {
-                    return length > 0;
-                }
-            }
+        if let Some(length) = req.headers().get(CONTENT_LENGTH)
+            && let Ok(length) = length.to_str()
+            && let Ok(length) = length.parse::<usize>()
+        {
+            return length > 0;
         }
         false
     }
@@ -493,9 +492,10 @@ mod tests {
         }
 
         async fn run_query(self: Arc<Self>, _query: Query, _target: QueryTarget) -> QueryResults {
-            QueryResults::from(Object::from_iter(
-                vec![(Word::from("name"), r::Value::String(String::from("Jordi")))].into_iter(),
-            ))
+            QueryResults::from(Object::from_iter(vec![(
+                Word::from("name"),
+                r::Value::String(String::from("Jordi")),
+            )]))
         }
 
         fn metrics(&self) -> Arc<dyn GraphQLMetrics> {
diff --git a/server/http/src/test_utils.rs b/server/http/src/test_utils.rs
index 3ad4586c8fc..114b729e385 100644
--- a/server/http/src/test_utils.rs
+++ b/server/http/src/test_utils.rs
@@ -1,5 +1,5 @@
 use graph::http_body_util::{BodyExt, Full};
-use graph::hyper::{body::Bytes, header::ACCESS_CONTROL_ALLOW_ORIGIN, Response, StatusCode};
+use graph::hyper::{Response, StatusCode, body::Bytes, header::ACCESS_CONTROL_ALLOW_ORIGIN};
 use graph::prelude::serde_json;
 
 /// Asserts that the response is a successful GraphQL response; returns its `"data"` field.
diff --git a/server/http/tests/server.rs b/server/http/tests/server.rs
index 812dd25ef63..a7d43360cf5 100644
--- a/server/http/tests/server.rs
+++ b/server/http/tests/server.rs
@@ -56,13 +56,15 @@ impl GraphQlRunner for TestGraphQlRunner {
                 .unwrap()
                 == &r::Value::String(String::from("John"))
         {
-            Object::from_iter(
-                vec![(Word::from("name"), r::Value::String(String::from("John")))].into_iter(),
-            )
+            Object::from_iter(vec![(
+                Word::from("name"),
+                r::Value::String(String::from("John")),
+            )])
         } else {
-            Object::from_iter(
-                vec![(Word::from("name"), r::Value::String(String::from("Jordi")))].into_iter(),
-            )
+            Object::from_iter(vec![(
+                Word::from("name"),
+                r::Value::String(String::from("Jordi")),
+            )])
         }
         .into()
     }
@@ -197,7 +199,10 @@ mod test {
         let errors = assert_error_response(response, StatusCode::BAD_REQUEST, false).await;
 
         let message = errors[0].as_str().expect("Error message is not a string");
-        assert_eq!(message, "{\"error\":\"GraphQL server error (client error): The \\\"query\\\" field is missing in request data\"}");
+        assert_eq!(
+            message,
+            "{\"error\":\"GraphQL server error (client error): The \\\"query\\\" field is missing in request data\"}"
+        );
     }
 
     #[graph::test]
diff --git a/server/index-node/Cargo.toml b/server/index-node/Cargo.toml
index 9672f657e4a..549b56c4365 100644
--- a/server/index-node/Cargo.toml
+++ b/server/index-node/Cargo.toml
@@ -10,4 +10,4 @@ graph = { path = "../../graph" }
 graph-graphql = { path = "../../graphql" }
 graph-chain-ethereum = { path = "../../chain/ethereum" }
 graph-chain-near = { path = "../../chain/near" }
-git-testament = "0.2.6"
+git-testament = { workspace = true }
diff --git a/server/index-node/src/explorer.rs b/server/index-node/src/explorer.rs
index 8bcd39d7f8b..728fc228129 100644
--- a/server/index-node/src/explorer.rs
+++ b/server/index-node/src/explorer.rs
@@ -18,7 +18,7 @@ use graph::{
     },
     data::subgraph::status,
     object,
-    prelude::{serde_json, warn, Logger, ENV_VARS},
+    prelude::{ENV_VARS, Logger, serde_json, warn},
     util::timed_cache::TimedCache,
 };
 
diff --git a/server/index-node/src/resolver.rs b/server/index-node/src/resolver.rs
index b8385866d33..5d23483265e 100644
--- a/server/index-node/src/resolver.rs
+++ b/server/index-node/src/resolver.rs
@@ -6,18 +6,18 @@ use graph::data::store::Id;
 use graph::prelude::alloy::primitives::Address;
 use graph::schema::EntityType;
 
-use git_testament::{git_testament, CommitKind};
+use git_testament::{CommitKind, git_testament};
 use graph::amp;
 use graph::blockchain::{Blockchain, BlockchainKind, BlockchainMap};
 use graph::components::link_resolver::LinkResolverContext;
 use graph::components::store::{BlockPtrForNumber, BlockStore, QueryPermit, Store};
 use graph::components::versions::VERSIONS;
-use graph::data::graphql::{object, IntoValue, ObjectOrInterface, ValueMap};
-use graph::data::subgraph::{status, DeploymentFeatures};
+use graph::data::graphql::{IntoValue, ObjectOrInterface, ValueMap, object};
+use graph::data::subgraph::{DeploymentFeatures, status};
 use graph::data::value::Object;
 use graph::futures03::TryFutureExt;
 use graph::prelude::*;
-use graph_graphql::prelude::{a, ExecutionContext, Resolver};
+use graph_graphql::prelude::{ExecutionContext, Resolver, a};
 
 use crate::auth::PoiProtection;
 
@@ -235,7 +235,21 @@ where
             }
             Ok(mut blocks) => {
                 assert!(blocks.len() == 1, "Multiple blocks with the same hash");
-                blocks.pop().unwrap().into()
+                let block = blocks.pop().unwrap();
+                let json = block.to_json();
+                match json {
+                    Ok(json) => json.into(),
+                    Err(e) => {
+                        error!(
+                            self.logger,
+                            "Failed to serialize cached block";
+                            "network" => network.as_str(),
+                            "block_hash" => format!("{}", block_hash),
+                            "error" => e.to_string(),
+                        );
+                        r::Value::Null
+                    }
+                }
             }
             Err(e) => {
                 error!(
diff --git a/server/index-node/src/server.rs b/server/index-node/src/server.rs
index 00b62c09ca2..e59e3407c4d 100644
--- a/server/index-node/src/server.rs
+++ b/server/index-node/src/server.rs
@@ -3,7 +3,7 @@ use graph::{
     blockchain::BlockchainMap,
     cheap_clone::CheapClone,
     components::{
-        server::server::{start, ServerHandle},
+        server::server::{ServerHandle, start},
         store::Store,
     },
     prelude::*,
diff --git a/server/index-node/src/service.rs b/server/index-node/src/service.rs
index 09ddfd29038..23e63ebb502 100644
--- a/server/index-node/src/service.rs
+++ b/server/index-node/src/service.rs
@@ -13,14 +13,14 @@ use graph::hyper::header::{
     self, ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
     CONTENT_TYPE, LOCATION,
 };
-use graph::hyper::{body::Body, Method, Request, Response, StatusCode};
+use graph::hyper::{Method, Request, Response, StatusCode, body::Body};
 
 use graph::amp;
 use graph::components::{server::query::ServerError, store::Store};
 use graph::data::query::{Query, QueryError, QueryResult, QueryResults};
 use graph::prelude::{q, serde_json};
-use graph::slog::{debug, error, Logger};
-use graph_graphql::prelude::{execute_query, Query as PreparedQuery, QueryExecutionOptions};
+use graph::slog::{Logger, debug, error};
+use graph_graphql::prelude::{Query as PreparedQuery, QueryExecutionOptions, execute_query};
 
 use crate::auth::bearer_token;
 
@@ -153,6 +153,7 @@ where
                 max_first: u32::MAX,
                 max_skip: u32::MAX,
                 trace: false,
+                log_store: Arc::new(graph::components::log_store::NoOpLogStore),
             };
             let (result, _) = execute_query(query_clone.cheap_clone(), None, None, options).await;
             query_clone.log_execution(0);
diff --git a/server/json-rpc/Cargo.toml b/server/json-rpc/Cargo.toml
index 3b727976811..65af5d0a280 100644
--- a/server/json-rpc/Cargo.toml
+++ b/server/json-rpc/Cargo.toml
@@ -4,6 +4,10 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
+axum = { workspace = true }
 graph = { path = "../../graph" }
-jsonrpsee = { version = "0.15.1", features = ["http-server"] }
 serde = { workspace = true }
+serde_json = { workspace = true }
+slog = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true }
diff --git a/server/json-rpc/src/handlers.rs b/server/json-rpc/src/handlers.rs
new file mode 100644
index 00000000000..442347cfdb5
--- /dev/null
+++ b/server/json-rpc/src/handlers.rs
@@ -0,0 +1,422 @@
+//! JSON-RPC request handlers for subgraph operations.
+//!
+//! This module implements the request dispatch and individual handlers
+//! for each JSON-RPC method.
+
+use std::collections::BTreeMap;
+use std::fmt::Debug;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+use axum::Json;
+use axum::extract::{ConnectInfo, State};
+use axum::http::{HeaderMap, StatusCode};
+use axum::response::IntoResponse;
+use graph::prelude::{
+    DeploymentHash, ENV_VARS, NodeId, SubgraphName, SubgraphRegistrar, SubgraphRegistrarError,
+};
+use serde::Deserialize;
+use serde_json::{self, Value as JsonValue};
+use slog::{Logger, error, info};
+
+use crate::jsonrpc::{JsonRpcError, JsonRpcId, JsonRpcRequest, JsonRpcResponse};
+
+/// Application-specific error codes for subgraph operations.
+mod error_codes {
+    pub const DEPLOY_ERROR: i64 = 0;
+    pub const REMOVE_ERROR: i64 = 1;
+    pub const CREATE_ERROR: i64 = 2;
+    pub const REASSIGN_ERROR: i64 = 3;
+    pub const PAUSE_ERROR: i64 = 4;
+    pub const RESUME_ERROR: i64 = 5;
+}
+
+/// Shared application state for the JSON-RPC server.
+pub struct AppState<R> {
+    pub registrar: Arc<R>,
+    pub http_port: u16,
+    pub node_id: NodeId,
+    pub logger: Logger,
+}
+
+/// Dispatch a single JSON-RPC request to the appropriate method handler.
+///
+/// Returns `None` for notifications (requests without an id), since the
+/// JSON-RPC 2.0 spec says notifications must not produce a response.
+async fn dispatch_request<R: SubgraphRegistrar>(
+    state: &Arc<AppState<R>>,
+    request: JsonRpcRequest,
+) -> Option<JsonRpcResponse> {
+    if !request.is_valid_version() {
+        return Some(JsonRpcResponse::invalid_request());
+    }
+
+    let id = request.id.clone().unwrap_or(JsonRpcId::Null);
+
+    // Notifications (no id) should not produce a response per JSON-RPC 2.0 spec.
+    // But since all our methods have side effects, we still execute them;
+    // we just don't return the response.
+    let is_notification = request.id.is_none();
+
+    let response = match request.method.as_str() {
+        "subgraph_create" => handle_create(state, &request, id).await,
+        "subgraph_deploy" => handle_deploy(state, &request, id).await,
+        "subgraph_remove" => handle_remove(state, &request, id).await,
+        "subgraph_reassign" => handle_reassign(state, &request, id).await,
+        "subgraph_pause" => handle_pause(state, &request, id).await,
+        "subgraph_resume" => handle_resume(state, &request, id).await,
+        _ => JsonRpcResponse::error(id, JsonRpcError::method_not_found()),
+    };
+
+    if is_notification {
+        None
+    } else {
+        Some(response)
+    }
+}
+
+/// Main JSON-RPC request handler.
+///
+/// Supports both single requests and batch requests (JSON arrays).
+/// Per JSON-RPC 2.0 spec, an empty batch array returns an invalid request error.
+pub async fn jsonrpc_handler<R: SubgraphRegistrar>(
+    State(state): State<Arc<AppState<R>>>,
+    ConnectInfo(remote_addr): ConnectInfo<SocketAddr>,
+    headers: HeaderMap,
+    body: String,
+) -> impl IntoResponse {
+    fn header<'a>(headers: &'a HeaderMap, key: &str) -> &'a str {
+        headers
+            .get(key)
+            .and_then(|v| v.to_str().ok())
+            .unwrap_or("unset")
+    }
+
+    let log_request = |method: &str, params: &Option<JsonValue>| {
+        info!(
+            &state.logger,
+            "JSON-RPC call";
+            "method" => method,
+            "params" => ?params,
+            "remote_addr" => %remote_addr,
+            "x_forwarded_for" => header(&headers, "x-forwarded-for"),
+            "x_real_ip" => header(&headers, "x-real-ip"),
+            "x_forwarded_proto" => header(&headers, "x-forwarded-proto")
+        );
+    };
+
+    // Try batch (JSON array) first, then single request.
+    if let Ok(requests) = serde_json::from_str::<Vec<JsonRpcRequest>>(&body) {
+        if requests.is_empty() {
+            let resp = serde_json::to_value(JsonRpcResponse::invalid_request())
+                .expect("failed to serialize response");
+            return (StatusCode::OK, Json(resp));
+        }
+
+        info!(
+            &state.logger,
+            "JSON-RPC batch request";
+            "batch_size" => requests.len(),
+            "remote_addr" => %remote_addr,
+        );
+
+        let mut responses = Vec::new();
+        for request in requests {
+            log_request(&request.method, &request.params);
+            if let Some(resp) = dispatch_request(&state, request).await {
+                responses.push(resp);
+            }
+        }
+
+        let value = serde_json::to_value(responses).expect("failed to serialize responses");
+        return (StatusCode::OK, Json(value));
+    }
+
+    // Single request
+    let request: JsonRpcRequest = match serde_json::from_str(&body) {
+        Ok(req) => req,
+        Err(_) => {
+            let resp = serde_json::to_value(JsonRpcResponse::parse_error())
+                .expect("failed to serialize response");
+            return (StatusCode::OK, Json(resp));
+        }
+    };
+
+    log_request(&request.method, &request.params);
+
+    let response = dispatch_request(&state, request)
+        .await
+        .unwrap_or_else(|| JsonRpcResponse::success(JsonRpcId::Null, JsonValue::Null));
+
+    let value = serde_json::to_value(response).expect("failed to serialize response");
+    (StatusCode::OK, Json(value))
+}
+
+/// Parse parameters from a JSON-RPC request.
+#[allow(clippy::result_large_err)]
+fn parse_params<T: for<'de> Deserialize<'de>>(
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> Result<T, JsonRpcResponse> {
+    let params = request.params.clone().unwrap_or(JsonValue::Null);
+    serde_json::from_value(params).map_err(|e| {
+        JsonRpcResponse::error(
+            id,
+            JsonRpcError::invalid_params(format!("Invalid params: {}", e)),
+        )
+    })
+}
+
+/// Convert a registrar result to a JSON-RPC response.
+fn to_response<P: Debug>(
+    logger: &Logger,
+    method: &str,
+    error_code: i64,
+    params: &P,
+    result: Result<JsonValue, SubgraphRegistrarError>,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    match result {
+        Ok(value) => JsonRpcResponse::success(id, value),
+        Err(e) => {
+            error!(logger, "{} failed", method;
+                "error" => format!("{:?}", e),
+                "params" => format!("{:?}", params));
+
+            let message = if let SubgraphRegistrarError::Unknown(_) = e {
+                "internal error".to_owned()
+            } else {
+                e.to_string()
+            };
+
+            JsonRpcResponse::error(id, JsonRpcError::new(error_code, message))
+        }
+    }
+}
+
+/// Handler for `subgraph_create`.
+async fn handle_create<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    #[derive(Debug, Deserialize)]
+    pub struct SubgraphCreateParams {
+        pub name: SubgraphName,
+    }
+
+    let params: SubgraphCreateParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let result = state
+        .registrar
+        .create_subgraph(params.name.clone())
+        .await
+        .map(|r| serde_json::to_value(r).expect("invalid result"));
+
+    to_response(
+        &state.logger,
+        "subgraph_create",
+        error_codes::CREATE_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+/// Handler for `subgraph_deploy`.
+async fn handle_deploy<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    #[derive(Debug, Deserialize)]
+    pub struct SubgraphDeployParams {
+        pub name: SubgraphName,
+        pub ipfs_hash: DeploymentHash,
+        pub node_id: Option<NodeId>,
+        pub debug_fork: Option<DeploymentHash>,
+        pub history_blocks: Option<i32>,
+    }
+
+    let params: SubgraphDeployParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let node_id = params.node_id.clone().unwrap_or(state.node_id.clone());
+
+    let result = state
+        .registrar
+        .create_subgraph_version(
+            params.name.clone(),
+            params.ipfs_hash.clone(),
+            node_id,
+            params.debug_fork.clone(),
+            // Here it doesn't make sense to receive another
+            // startBlock, we'll use the one from the manifest.
+            None,
+            None,
+            params.history_blocks,
+            false,
+        )
+        .await
+        .map(|_| subgraph_routes(&params.name, state.http_port));
+
+    to_response(
+        &state.logger,
+        "subgraph_deploy",
+        error_codes::DEPLOY_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+/// Handler for `subgraph_remove`.
+async fn handle_remove<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    #[derive(Debug, Deserialize)]
+    pub struct SubgraphRemoveParams {
+        pub name: SubgraphName,
+    }
+
+    let params: SubgraphRemoveParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let result = state
+        .registrar
+        .remove_subgraph(params.name.clone())
+        .await
+        .map(|_| JsonValue::Null);
+
+    to_response(
+        &state.logger,
+        "subgraph_remove",
+        error_codes::REMOVE_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+/// Handler for `subgraph_reassign`.
+async fn handle_reassign<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    #[derive(Debug, Deserialize)]
+    pub struct SubgraphReassignParams {
+        pub ipfs_hash: DeploymentHash,
+        pub node_id: NodeId,
+    }
+
+    let params: SubgraphReassignParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let result = state
+        .registrar
+        .reassign_subgraph(&params.ipfs_hash, &params.node_id)
+        .await
+        .map(|_| JsonValue::Null);
+
+    to_response(
+        &state.logger,
+        "subgraph_reassign",
+        error_codes::REASSIGN_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+// Parameter structs for pause and resume
+
+#[derive(Debug, Deserialize)]
+pub struct SubgraphPauseParams {
+    pub deployment: DeploymentHash,
+}
+
+/// Handler for `subgraph_pause`.
+async fn handle_pause<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    let params: SubgraphPauseParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let result = state
+        .registrar
+        .pause_subgraph(&params.deployment)
+        .await
+        .map(|_| JsonValue::Null);
+
+    to_response(
+        &state.logger,
+        "subgraph_pause",
+        error_codes::PAUSE_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+/// Handler for `subgraph_resume`.
+async fn handle_resume<R: SubgraphRegistrar>(
+    state: &AppState<R>,
+    request: &JsonRpcRequest,
+    id: JsonRpcId,
+) -> JsonRpcResponse {
+    let params: SubgraphPauseParams = match parse_params(request, id.clone()) {
+        Ok(p) => p,
+        Err(resp) => return resp,
+    };
+
+    let result = state
+        .registrar
+        .resume_subgraph(&params.deployment)
+        .await
+        .map(|_| JsonValue::Null);
+
+    to_response(
+        &state.logger,
+        "subgraph_resume",
+        error_codes::RESUME_ERROR,
+        &params,
+        result,
+        id,
+    )
+}
+
+/// Build the subgraph routes response for deploy.
+fn subgraph_routes(name: &SubgraphName, http_port: u16) -> JsonValue {
+    let http_base_url = ENV_VARS
+        .external_http_base_url
+        .clone()
+        .unwrap_or_else(|| format!(":{}", http_port));
+
+    let mut map = BTreeMap::new();
+    map.insert(
+        "playground",
+        format!("{}/subgraphs/name/{}/graphql", http_base_url, name),
+    );
+    map.insert(
+        "queries",
+        format!("{}/subgraphs/name/{}", http_base_url, name),
+    );
+
+    serde_json::to_value(map).expect("invalid subgraph routes")
+}
diff --git a/server/json-rpc/src/jsonrpc.rs b/server/json-rpc/src/jsonrpc.rs
new file mode 100644
index 00000000000..e8a3da155a2
--- /dev/null
+++ b/server/json-rpc/src/jsonrpc.rs
@@ -0,0 +1,253 @@
+//! JSON-RPC 2.0 types for the admin server.
+//!
+//! This module implements the JSON-RPC 2.0 protocol types according to the specification:
+//! https://www.jsonrpc.org/specification
+
+use serde::{Deserialize, Serialize};
+use serde_json::Value as JsonValue;
+
+/// JSON-RPC 2.0 request ID.
+///
+/// The ID can be a string, number, or null (for notifications).
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum JsonRpcId {
+    String(String),
+    Number(i64),
+    #[default]
+    Null,
+}
+
+/// JSON-RPC 2.0 request object.
+#[derive(Debug, Clone, Deserialize)]
+pub struct JsonRpcRequest {
+    /// JSON-RPC version. Must be "2.0".
+    pub jsonrpc: String,
+
+    /// Method name to invoke.
+    pub method: String,
+
+    /// Method parameters (optional).
+    #[serde(default)]
+    pub params: Option<JsonValue>,
+
+    /// Request ID (optional for notifications).
+    #[serde(default)]
+    pub id: Option<JsonRpcId>,
+}
+
+impl JsonRpcRequest {
+    /// Returns true if this request has a valid JSON-RPC version.
+    pub fn is_valid_version(&self) -> bool {
+        self.jsonrpc == "2.0"
+    }
+}
+
+/// JSON-RPC 2.0 error object.
+#[derive(Debug, Clone, Serialize)]
+pub struct JsonRpcError {
+    /// Error code.
+    pub code: i64,
+
+    /// Human-readable error message.
+    pub message: String,
+
+    /// Additional error data (optional).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<JsonValue>,
+}
+
+impl JsonRpcError {
+    /// Create a new error with the given code and message.
+    pub fn new(code: i64, message: impl Into<String>) -> Self {
+        Self {
+            code,
+            message: message.into(),
+            data: None,
+        }
+    }
+
+    /// Parse error (-32700): Invalid JSON was received.
+    pub fn parse_error() -> Self {
+        Self::new(-32700, "Parse error")
+    }
+
+    /// Invalid request (-32600): The JSON sent is not a valid Request object.
+    pub fn invalid_request() -> Self {
+        Self::new(-32600, "Invalid Request")
+    }
+
+    /// Method not found (-32601): The method does not exist / is not available.
+    pub fn method_not_found() -> Self {
+        Self::new(-32601, "Method not found")
+    }
+
+    /// Invalid params (-32602): Invalid method parameter(s).
+    pub fn invalid_params(message: impl Into<String>) -> Self {
+        Self::new(-32602, message)
+    }
+}
+
+/// JSON-RPC 2.0 response object.
+#[derive(Debug, Clone, Serialize)]
+pub struct JsonRpcResponse {
+    /// JSON-RPC version. Always "2.0".
+    pub jsonrpc: &'static str,
+
+    /// Result on success (mutually exclusive with error).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub result: Option<JsonValue>,
+
+    /// Error on failure (mutually exclusive with result).
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub error: Option<JsonRpcError>,
+
+    /// Request ID (same as the request, or null for notifications).
+    pub id: JsonRpcId,
+}
+
+impl JsonRpcResponse {
+    /// Create a successful response.
+    pub fn success(id: JsonRpcId, result: JsonValue) -> Self {
+        Self {
+            jsonrpc: "2.0",
+            result: Some(result),
+            error: None,
+            id,
+        }
+    }
+
+    /// Create an error response.
+    pub fn error(id: JsonRpcId, error: JsonRpcError) -> Self {
+        Self {
+            jsonrpc: "2.0",
+            result: None,
+            error: Some(error),
+            id,
+        }
+    }
+
+    /// Create an error response for a parse error (when we don't have an ID).
+    pub fn parse_error() -> Self {
+        Self::error(JsonRpcId::Null, JsonRpcError::parse_error())
+    }
+
+    /// Create an error response for an invalid request (when we don't have an ID).
+    pub fn invalid_request() -> Self {
+        Self::error(JsonRpcId::Null, JsonRpcError::invalid_request())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize_request_with_string_id() {
+        let json = r#"{"jsonrpc":"2.0","method":"test","id":"abc"}"#;
+        let req: JsonRpcRequest = serde_json::from_str(json).unwrap();
+        assert_eq!(req.id, Some(JsonRpcId::String("abc".to_string())));
+    }
+
+    #[test]
+    fn deserialize_request_with_number_id() {
+        let json = r#"{"jsonrpc":"2.0","method":"test","id":123}"#;
+        let req: JsonRpcRequest = serde_json::from_str(json).unwrap();
+        assert_eq!(req.id, Some(JsonRpcId::Number(123)));
+    }
+
+    #[test]
+    fn deserialize_request_with_null_id() {
+        // When id is explicitly null, serde treats it as None due to Option<JsonRpcId>
+        // This is acceptable per JSON-RPC 2.0 spec as null id means notification
+        let json = r#"{"jsonrpc":"2.0","method":"test","id":null}"#;
+        let req: JsonRpcRequest = serde_json::from_str(json).unwrap();
+        assert_eq!(req.id, None);
+    }
+
+    #[test]
+    fn deserialize_request_without_id() {
+        let json = r#"{"jsonrpc":"2.0","method":"test"}"#;
+        let req: JsonRpcRequest = serde_json::from_str(json).unwrap();
+        assert_eq!(req.id, None);
+    }
+
+    #[test]
+    fn serialize_success_response() {
+        let resp = JsonRpcResponse::success(JsonRpcId::Number(1), serde_json::json!({"ok": true}));
+        let json = serde_json::to_string(&resp).unwrap();
+        assert!(json.contains(r#""jsonrpc":"2.0""#));
+        assert!(json.contains(r#""result":{"ok":true}"#));
+        assert!(json.contains(r#""id":1"#));
+        assert!(!json.contains("error"));
+    }
+
+    #[test]
+    fn serialize_error_response() {
+        let resp = JsonRpcResponse::error(
+            JsonRpcId::String("req-1".to_string()),
+            JsonRpcError::new(-32601, "Method not found"),
+        );
+        let json = serde_json::to_string(&resp).unwrap();
+        assert!(json.contains(r#""jsonrpc":"2.0""#));
+        assert!(json.contains(r#""error""#));
+        assert!(json.contains(r#""code":-32601"#));
+        assert!(json.contains(r#""id":"req-1""#));
+        assert!(!json.contains("result"));
+    }
+
+    #[test]
+    fn deserialize_batch_request() {
+        let json = r#"[
+            {"jsonrpc":"2.0","method":"subgraph_create","id":1},
+            {"jsonrpc":"2.0","method":"subgraph_remove","id":2}
+        ]"#;
+        let requests: Vec<JsonRpcRequest> = serde_json::from_str(json).unwrap();
+        assert_eq!(requests.len(), 2);
+        assert_eq!(requests[0].method, "subgraph_create");
+        assert_eq!(requests[0].id, Some(JsonRpcId::Number(1)));
+        assert_eq!(requests[1].method, "subgraph_remove");
+        assert_eq!(requests[1].id, Some(JsonRpcId::Number(2)));
+    }
+
+    #[test]
+    fn serialize_batch_response() {
+        let responses = vec![
+            JsonRpcResponse::success(JsonRpcId::Number(1), serde_json::json!({"ok": true})),
+            JsonRpcResponse::error(
+                JsonRpcId::Number(2),
+                JsonRpcError::new(-32601, "Method not found"),
+            ),
+        ];
+        let json = serde_json::to_string(&responses).unwrap();
+        // Must be a JSON array
+        assert!(json.starts_with('['));
+        assert!(json.ends_with(']'));
+        // Both responses present
+        let parsed: Vec<serde_json::Value> = serde_json::from_str(&json).unwrap();
+        assert_eq!(parsed.len(), 2);
+        assert_eq!(parsed[0]["id"], 1);
+        assert_eq!(parsed[1]["id"], 2);
+    }
+
+    #[test]
+    fn batch_with_notification_omits_response() {
+        // A notification has no id — when filtered, the batch response should
+        // contain fewer entries than the batch request.
+        let json = r#"[
+            {"jsonrpc":"2.0","method":"subgraph_create","id":1},
+            {"jsonrpc":"2.0","method":"subgraph_remove"}
+        ]"#;
+        let requests: Vec<JsonRpcRequest> = serde_json::from_str(json).unwrap();
+        assert_eq!(requests.len(), 2);
+        assert!(requests[0].id.is_some());
+        assert!(requests[1].id.is_none());
+    }
+
+    #[test]
+    fn empty_batch_is_valid_json_array() {
+        let json = "[]";
+        let requests: Vec<JsonRpcRequest> = serde_json::from_str(json).unwrap();
+        assert!(requests.is_empty());
+    }
+}
diff --git a/server/json-rpc/src/lib.rs b/server/json-rpc/src/lib.rs
index 1bd6769f3b8..401a457c57e 100644
--- a/server/json-rpc/src/lib.rs
+++ b/server/json-rpc/src/lib.rs
@@ -1,334 +1,10 @@
-use graph::prelude::{Value as GraphValue, *};
-use jsonrpsee::core::middleware::{Headers, HttpMiddleware, MethodKind, Params};
-use jsonrpsee::core::Error as JsonRpcError;
-use jsonrpsee::http_server::{HttpServerBuilder, HttpServerHandle};
-use jsonrpsee::types::error::CallError;
-use jsonrpsee::types::ErrorObject;
-use jsonrpsee::RpcModule;
-use serde_json::{self, Value as JsonValue};
+//! JSON-RPC admin server for subgraph management.
+//!
+//! This crate provides a JSON-RPC 2.0 server for managing subgraphs,
+//! supporting operations like create, deploy, remove, reassign, pause, and resume.
 
-use std::collections::BTreeMap;
-use std::net::{Ipv4Addr, SocketAddr};
+mod handlers;
+mod jsonrpc;
+mod server;
 
-/// Middleware for logging JSON-RPC requests.
-///
-/// Logs incoming HTTP requests with remote address and proxy headers,
-/// and logs each JSON-RPC method call with its parameters.
-#[derive(Clone)]
-struct RpcLogger {
-    logger: Logger,
-}
-
-impl HttpMiddleware for RpcLogger {
-    type Instant = ();
-
-    fn on_request(&self, remote_addr: SocketAddr, headers: &Headers) -> Self::Instant {
-        info!(
-            &self.logger,
-            "JSON-RPC request";
-            "remote_addr" => %remote_addr,
-            "x_forwarded_for" => headers.get("x-forwarded-for").and_then(|v| v.to_str().ok()),
-            "x_real_ip" => headers.get("x-real-ip").and_then(|v| v.to_str().ok()),
-            "x_forwarded_proto" => headers.get("x-forwarded-proto").and_then(|v| v.to_str().ok())
-        );
-    }
-
-    fn on_call(&self, method_name: &str, params: Params, _kind: MethodKind) {
-        info!(
-            &self.logger,
-            "JSON-RPC call";
-            "method" => method_name,
-            "params" => ?params
-        );
-    }
-
-    fn on_result(&self, _method_name: &str, _success: bool, _started_at: Self::Instant) {}
-
-    fn on_response(&self, _result: &str, _started_at: Self::Instant) {}
-}
-
-type JsonRpcResult<T> = Result<T, jsonrpsee::core::Error>;
-
-pub struct JsonRpcServer {
-    // TODO: in the future we might want to have some sort of async drop to stop
-    // the server. For now, we're just letting it run it forever.
-    _handle: HttpServerHandle,
-}
-
-impl JsonRpcServer {
-    pub async fn serve<R>(
-        port: u16,
-        http_port: u16,
-        registrar: Arc<R>,
-        node_id: NodeId,
-        logger: Logger,
-    ) -> JsonRpcResult<Self>
-    where
-        R: SubgraphRegistrar,
-    {
-        let logger = logger.new(o!("component" => "JsonRpcServer"));
-
-        info!(
-            logger,
-            "Starting JSON-RPC admin server at: http://localhost:{}", port
-        );
-
-        let state = ServerState {
-            registrar,
-            http_port,
-            node_id,
-            logger,
-        };
-
-        let socket_addr: SocketAddr = (Ipv4Addr::new(0, 0, 0, 0), port).into();
-        let http_server = HttpServerBuilder::default()
-            .set_middleware(RpcLogger {
-                logger: state.logger.clone(),
-            })
-            .build(socket_addr)
-            .await?;
-
-        let mut rpc_module = RpcModule::new(state);
-        rpc_module
-            .register_async_method("subgraph_create", |params, state| async move {
-                state.create_handler(params.parse()?).await
-            })
-            .unwrap();
-        rpc_module
-            .register_async_method("subgraph_deploy", |params, state| async move {
-                state.deploy_handler(params.parse()?).await
-            })
-            .unwrap();
-        rpc_module
-            .register_async_method("subgraph_remove", |params, state| async move {
-                state.remove_handler(params.parse()?).await
-            })
-            .unwrap();
-        rpc_module
-            .register_async_method("subgraph_reassign", |params, state| async move {
-                state.reassign_handler(params.parse()?).await
-            })
-            .unwrap();
-        rpc_module
-            .register_async_method("subgraph_pause", |params, state| async move {
-                state.pause_handler(params.parse()?).await
-            })
-            .unwrap();
-        rpc_module
-            .register_async_method("subgraph_resume", |params, state| async move {
-                state.resume_handler(params.parse()?).await
-            })
-            .unwrap();
-
-        let _handle = http_server.start(rpc_module)?;
-        Ok(Self { _handle })
-    }
-}
-
-struct ServerState<R> {
-    registrar: Arc<R>,
-    http_port: u16,
-    node_id: NodeId,
-    logger: Logger,
-}
-
-impl<R: SubgraphRegistrar> ServerState<R> {
-    const DEPLOY_ERROR: i64 = 0;
-    const REMOVE_ERROR: i64 = 1;
-    const CREATE_ERROR: i64 = 2;
-    const REASSIGN_ERROR: i64 = 3;
-    const PAUSE_ERROR: i64 = 4;
-    const RESUME_ERROR: i64 = 5;
-
-    /// Handler for the `subgraph_create` endpoint.
-    async fn create_handler(&self, params: SubgraphCreateParams) -> JsonRpcResult<JsonValue> {
-        info!(&self.logger, "Received subgraph_create request"; "params" => format!("{:?}", params));
-
-        match self.registrar.create_subgraph(params.name.clone()).await {
-            Ok(result) => {
-                Ok(serde_json::to_value(result).expect("invalid subgraph creation result"))
-            }
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_create",
-                e,
-                Self::CREATE_ERROR,
-                params,
-            )),
-        }
-    }
-
-    /// Handler for the `subgraph_deploy` endpoint.
-    async fn deploy_handler(&self, params: SubgraphDeployParams) -> JsonRpcResult<JsonValue> {
-        info!(&self.logger, "Received subgraph_deploy request"; "params" => format!("{:?}", params));
-
-        let node_id = params.node_id.clone().unwrap_or(self.node_id.clone());
-        let routes = subgraph_routes(&params.name, self.http_port);
-        match self
-            .registrar
-            .create_subgraph_version(
-                params.name.clone(),
-                params.ipfs_hash.clone(),
-                node_id,
-                params.debug_fork.clone(),
-                // Here it doesn't make sense to receive another
-                // startBlock, we'll use the one from the manifest.
-                None,
-                None,
-                params.history_blocks,
-                false,
-            )
-            .await
-        {
-            Ok(_) => Ok(routes),
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_deploy",
-                e,
-                Self::DEPLOY_ERROR,
-                params,
-            )),
-        }
-    }
-
-    /// Handler for the `subgraph_remove` endpoint.
-    async fn remove_handler(&self, params: SubgraphRemoveParams) -> JsonRpcResult<GraphValue> {
-        info!(&self.logger, "Received subgraph_remove request"; "params" => format!("{:?}", params));
-
-        match self.registrar.remove_subgraph(params.name.clone()).await {
-            Ok(_) => Ok(Value::Null),
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_remove",
-                e,
-                Self::REMOVE_ERROR,
-                params,
-            )),
-        }
-    }
-
-    /// Handler for the `subgraph_assign` endpoint.
-    async fn reassign_handler(&self, params: SubgraphReassignParams) -> JsonRpcResult<GraphValue> {
-        info!(&self.logger, "Received subgraph_reassignment request"; "params" => format!("{:?}", params));
-
-        match self
-            .registrar
-            .reassign_subgraph(&params.ipfs_hash, &params.node_id)
-            .await
-        {
-            Ok(_) => Ok(Value::Null),
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_reassign",
-                e,
-                Self::REASSIGN_ERROR,
-                params,
-            )),
-        }
-    }
-
-    /// Handler for the `subgraph_pause` endpoint.
-    async fn pause_handler(&self, params: SubgraphPauseParams) -> JsonRpcResult<GraphValue> {
-        info!(&self.logger, "Received subgraph_pause request"; "params" => format!("{:?}", params));
-
-        match self.registrar.pause_subgraph(&params.deployment).await {
-            Ok(_) => Ok(Value::Null),
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_pause",
-                e,
-                Self::PAUSE_ERROR,
-                params,
-            )),
-        }
-    }
-
-    /// Handler for the `subgraph_resume` endpoint.
-    async fn resume_handler(&self, params: SubgraphPauseParams) -> JsonRpcResult<GraphValue> {
-        info!(&self.logger, "Received subgraph_resume request"; "params" => format!("{:?}", params));
-
-        match self.registrar.resume_subgraph(&params.deployment).await {
-            Ok(_) => Ok(Value::Null),
-            Err(e) => Err(json_rpc_error(
-                &self.logger,
-                "subgraph_resume",
-                e,
-                Self::RESUME_ERROR,
-                params,
-            )),
-        }
-    }
-}
-
-fn json_rpc_error(
-    logger: &Logger,
-    operation: &str,
-    e: SubgraphRegistrarError,
-    code: i64,
-    params: impl std::fmt::Debug,
-) -> JsonRpcError {
-    error!(logger, "{} failed", operation;
-        "error" => format!("{:?}", e),
-        "params" => format!("{:?}", params));
-
-    let message = if let SubgraphRegistrarError::Unknown(_) = e {
-        "internal error".to_owned()
-    } else {
-        e.to_string()
-    };
-
-    JsonRpcError::Call(CallError::Custom(ErrorObject::owned(
-        code as _,
-        message,
-        None::<String>,
-    )))
-}
-
-fn subgraph_routes(name: &SubgraphName, http_port: u16) -> JsonValue {
-    let http_base_url = ENV_VARS
-        .external_http_base_url
-        .clone()
-        .unwrap_or_else(|| format!(":{}", http_port));
-
-    let mut map = BTreeMap::new();
-    map.insert(
-        "playground",
-        format!("{}/subgraphs/name/{}/graphql", http_base_url, name),
-    );
-    map.insert(
-        "queries",
-        format!("{}/subgraphs/name/{}", http_base_url, name),
-    );
-
-    serde_json::to_value(map).expect("invalid subgraph routes")
-}
-
-#[derive(Debug, Deserialize)]
-struct SubgraphCreateParams {
-    name: SubgraphName,
-}
-
-#[derive(Debug, Deserialize)]
-struct SubgraphDeployParams {
-    name: SubgraphName,
-    ipfs_hash: DeploymentHash,
-    node_id: Option<NodeId>,
-    debug_fork: Option<DeploymentHash>,
-    history_blocks: Option<i32>,
-}
-
-#[derive(Debug, Deserialize)]
-struct SubgraphRemoveParams {
-    name: SubgraphName,
-}
-
-#[derive(Debug, Deserialize)]
-struct SubgraphReassignParams {
-    ipfs_hash: DeploymentHash,
-    node_id: NodeId,
-}
-
-#[derive(Debug, Deserialize)]
-struct SubgraphPauseParams {
-    deployment: DeploymentHash,
-}
+pub use server::{JsonRpcServer, JsonRpcServerError};
diff --git a/server/json-rpc/src/server.rs b/server/json-rpc/src/server.rs
new file mode 100644
index 00000000000..5fe5905ba70
--- /dev/null
+++ b/server/json-rpc/src/server.rs
@@ -0,0 +1,95 @@
+//! Axum-based JSON-RPC server implementation.
+//!
+//! This module provides the `JsonRpcServer` that serves JSON-RPC requests
+//! over HTTP using axum.
+
+use std::net::{Ipv4Addr, SocketAddr};
+use std::sync::Arc;
+
+use axum::Router;
+use axum::routing::post;
+use graph::prelude::{NodeId, SubgraphRegistrar};
+use slog::{Logger, info};
+use thiserror::Error;
+use tokio::sync::Notify;
+
+use crate::handlers::{AppState, jsonrpc_handler};
+
+/// Errors that can occur when starting the JSON-RPC server.
+#[derive(Debug, Error)]
+pub enum JsonRpcServerError {
+    #[error("Failed to bind to address: {0}")]
+    Bind(#[from] std::io::Error),
+}
+
+/// Handle to a running JSON-RPC server.
+///
+/// Dropping this handle does not stop the server. Use `stop()` for graceful shutdown.
+pub struct JsonRpcServer {
+    notify: Arc<Notify>,
+}
+
+impl JsonRpcServer {
+    /// Start the JSON-RPC server.
+    ///
+    /// # Arguments
+    ///
+    /// * `port` - The port to listen on for JSON-RPC requests
+    /// * `http_port` - The HTTP port used for subgraph route URLs in deploy responses
+    /// * `registrar` - The subgraph registrar for handling operations
+    /// * `node_id` - Default node ID for deployments
+    /// * `logger` - Logger for request/response logging
+    pub async fn serve<R>(
+        port: u16,
+        http_port: u16,
+        registrar: Arc<R>,
+        node_id: NodeId,
+        logger: Logger,
+    ) -> Result<Self, JsonRpcServerError>
+    where
+        R: SubgraphRegistrar,
+    {
+        let logger = logger.new(graph::prelude::o!("component" => "JsonRpcServer"));
+
+        info!(
+            logger,
+            "Starting JSON-RPC admin server at: http://localhost:{}", port
+        );
+
+        let state = Arc::new(AppState {
+            registrar,
+            http_port,
+            node_id,
+            logger,
+        });
+
+        let app = Router::new()
+            .route("/", post(jsonrpc_handler::<R>))
+            .with_state(state);
+
+        let addr: SocketAddr = (Ipv4Addr::new(0, 0, 0, 0), port).into();
+        let listener = tokio::net::TcpListener::bind(addr).await?;
+
+        let notify = Arc::new(Notify::new());
+        let notify_clone = notify.clone();
+
+        graph::spawn(async move {
+            axum::serve(
+                listener,
+                app.into_make_service_with_connect_info::<SocketAddr>(),
+            )
+            .with_graceful_shutdown(async move {
+                notify_clone.notified().await;
+            })
+            .await
+            .unwrap_or_else(|err| panic!("JSON-RPC server failed: {err}"));
+        });
+
+        Ok(Self { notify })
+    }
+
+    /// Stop the server gracefully.
+    pub fn stop(self) {
+        self.notify.notify_one();
+    }
+}
diff --git a/server/metrics/src/lib.rs b/server/metrics/src/lib.rs
index 7526bf7dc6c..d2fb2e747fe 100644
--- a/server/metrics/src/lib.rs
+++ b/server/metrics/src/lib.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
-use graph::components::server::server::{start, ServerHandle};
+use graph::components::server::server::{ServerHandle, start};
 use graph::http_body_util::Full;
-use graph::hyper::header::{ACCESS_CONTROL_ALLOW_ORIGIN, CONTENT_TYPE};
 use graph::hyper::Response;
+use graph::hyper::header::{ACCESS_CONTROL_ALLOW_ORIGIN, CONTENT_TYPE};
 
 use graph::prelude::*;
 use graph::prometheus::{Encoder, Registry, TextEncoder};
diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml
index 36be96bb7d7..96732c44c28 100644
--- a/store/postgres/Cargo.toml
+++ b/store/postgres/Cargo.toml
@@ -8,7 +8,7 @@ async-trait = { workspace = true }
 blake3 = "1.8"
 chrono = { workspace = true }
 deadpool = { workspace = true }
-derive_more = { version = "2.1.1", features = ["full"] }
+derive_more = { workspace = true, features = ["full"] }
 diesel = { workspace = true }
 diesel-async = { workspace = true }
 diesel-dynamic-schema = { workspace = true }
@@ -18,26 +18,28 @@ diesel_migrations = { workspace = true }
 fallible-iterator = "0.3.0"
 graph = { path = "../../graph" }
 graphman-store = { workspace = true }
-Inflector = "0.11.3"
-lazy_static = "1.5"
+Inflector = { workspace = true }
+lazy_static = { workspace = true }
 lru_time_cache = "0.11"
 postgres = "0.19.1"
-openssl = { version = "0.10.75", features = ["vendored"] }
-postgres-openssl = "0.5.2"
+openssl = { version = "0.10.80", features = ["vendored"] }
+postgres-openssl = "0.5.3"
 rand.workspace = true
 serde = { workspace = true }
 serde_json = { workspace = true }
-stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }
+stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", rev = "42b85d936c6b9f1b7a4b8385d2f081d5564daa69", package = "stable-hash" }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
-anyhow = "1.0.100"
-git-testament = "0.2.6"
-itertools = "0.14.0"
+anyhow = "1.0.102"
+git-testament = { workspace = true }
+itertools = "0.15.0"
 hex = "0.4.3"
 pretty_assertions = "1.4.1"
 sqlparser = { workspace = true }
 thiserror = { workspace = true }
 serde_yaml.workspace = true
+arrow = { workspace = true }
+parquet = { workspace = true }
 
 [dev-dependencies]
 clap.workspace = true
diff --git a/store/postgres/examples/create_index.rs b/store/postgres/examples/create_index.rs
new file mode 100644
index 00000000000..764c50d7ddb
--- /dev/null
+++ b/store/postgres/examples/create_index.rs
@@ -0,0 +1,74 @@
+use std::{collections::HashSet, env, fs, time::Instant};
+
+use graph::anyhow;
+use graph_store_postgres::command_support::index::{CreateIndex, Expr};
+
+/// Parse index definitions from a file and print information about any that
+/// we could not parse.
+///
+/// The easiest way to create a file with index definitions is to run this
+/// query in psql:
+/// ```sql
+/// select indexdef from pg_indexes where schemaname like 'sgd%' \g /tmp/idxs.txt
+/// ```
+pub fn main() -> anyhow::Result<()> {
+    let args: Vec<String> = env::args().collect();
+    if args.len() != 2 {
+        return Err(anyhow::anyhow!("usage: create_index <index_file>"));
+    }
+    let idxs = fs::read_to_string(&args[1])?;
+
+    let mut parsed: usize = 0;
+    let mut failed: usize = 0;
+    let mut skipped: usize = 0;
+    let mut unknown_cols = HashSet::new();
+    let start = Instant::now();
+    for idxdef in idxs.lines() {
+        let idxdef = idxdef.trim();
+        if idxdef.is_empty() || !idxdef.starts_with("CREATE") && !idxdef.starts_with("create") {
+            skipped += 1;
+            continue;
+        }
+
+        let idx = CreateIndex::parse(idxdef.to_string());
+
+        match &idx {
+            CreateIndex::Parsed { columns, .. } => {
+                let mut failed_col = false;
+                for column in columns {
+                    match column {
+                        Expr::Unknown(expr) => {
+                            unknown_cols.insert(expr.clone());
+                            failed_col = true;
+                            break;
+                        }
+                        _ => { /* ok  */ }
+                    }
+                }
+                if failed_col {
+                    failed += 1;
+                } else {
+                    parsed += 1
+                }
+            }
+            CreateIndex::Unknown { defn } => {
+                println!("Can not parse index definition: {}", defn);
+                failed += 1;
+            }
+        }
+    }
+
+    if !unknown_cols.is_empty() {
+        println!("Unknown columns:");
+        for col in unknown_cols {
+            println!("  {}", col);
+        }
+    }
+
+    println!(
+        "total: {}, parsed: {parsed}, failed: {failed}, skipped: {skipped}, elapsed: {}s",
+        parsed + failed + skipped,
+        start.elapsed().as_secs()
+    );
+    Ok(())
+}
diff --git a/store/postgres/examples/layout.rs b/store/postgres/examples/layout.rs
index cab97889cba..e7fde150fe9 100644
--- a/store/postgres/examples/layout.rs
+++ b/store/postgres/examples/layout.rs
@@ -1,7 +1,7 @@
 extern crate clap;
 extern crate graph_store_postgres;
 
-use clap::{arg, Command};
+use clap::{Parser, ValueEnum};
 use graph::schema::InputSchema;
 use std::collections::BTreeSet;
 use std::process::exit;
@@ -13,10 +13,32 @@ use graph_store_postgres::{
     layout_for_tests::make_dummy_site,
 };
 
-pub fn usage(msg: &str) -> ! {
-    println!("layout: {}", msg);
-    println!("Try 'layout --help' for more information.");
-    std::process::exit(1);
+/// The kind of SQL to generate from a GraphQL schema.
+#[derive(Clone, Copy, Debug, Default, ValueEnum)]
+enum Kind {
+    /// Generate the DDL to create the tables (the default).
+    #[default]
+    Ddl,
+    /// Generate `delete` statements for all tables.
+    Delete,
+    /// Generate `drop table` statements for all tables.
+    Drop,
+    /// Generate Diesel `table!` definitions and Rust structs.
+    Diesel,
+}
+
+/// Information about the database schema for a GraphQL schema
+#[derive(Parser, Debug)]
+#[command(name = "layout")]
+struct Opts {
+    /// What kind of SQL to generate.
+    #[arg(short, long, value_enum, default_value_t = Kind::Ddl)]
+    generate: Kind,
+    /// Path to the GraphQL schema file.
+    schema: String,
+    /// The database schema (namespace) to use.
+    #[arg(default_value = "subgraphs")]
+    db_schema: String,
 }
 
 pub fn ensure<T, E: std::fmt::Display>(res: Result<T, E>, msg: &str) -> T {
@@ -42,7 +64,7 @@ fn print_delete_all(layout: &Layout) {
 }
 
 fn print_ddl(layout: &Layout) {
-    let ddl = ensure(layout.as_ddl(None), "Failed to generate DDL");
+    let ddl = ensure(layout.as_ddl(), "Failed to generate DDL");
     println!("{}", ddl);
 }
 
@@ -127,28 +149,15 @@ fn print_diesel_tables(layout: &Layout) {
 }
 
 pub fn main() {
-    let args = Command::new("layout")
-    .version("1.0")
-    .about("Information about the database schema for a GraphQL schema")
-    .arg(arg!(-g --generate <KIND> "what kind of SQL to generate. Can be ddl (the default), migrate, delete, or drop"))
-    .arg(arg!(<schema>))
-    .arg(arg!(<db_schema>))
-    .get_matches();
-
-    let schema = args.get_one::<&str>("schema").unwrap();
-    let namespace = args.get_one::<&str>("db_schema").unwrap_or(&"subgraphs");
-    let kind = args.get_one::<&str>("generate").unwrap_or(&"ddl");
+    let opts = Opts::parse();
 
     let subgraph = DeploymentHash::new("Qmasubgraph").unwrap();
-    let schema = ensure(fs::read_to_string(schema), "Can not read schema file");
+    let schema = ensure(fs::read_to_string(&opts.schema), "Can not read schema file");
     let schema = ensure(
         InputSchema::parse_latest(&schema, subgraph.clone()),
         "Failed to parse schema",
     );
-    let namespace = ensure(
-        Namespace::new(namespace.to_string()),
-        "Invalid database schema",
-    );
+    let namespace = ensure(Namespace::new(opts.db_schema), "Invalid database schema");
     let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
     let catalog = ensure(
         Catalog::for_tests(site.clone(), BTreeSet::new()),
@@ -158,13 +167,10 @@ pub fn main() {
         Layout::new(site, &schema, catalog),
         "Failed to construct Mapping",
     );
-    match *kind {
-        "drop" => print_drop(&layout),
-        "delete" => print_delete_all(&layout),
-        "ddl" => print_ddl(&layout),
-        "diesel" => print_diesel_tables(&layout),
-        _ => {
-            usage(&format!("illegal value {} for --generate", kind));
-        }
+    match opts.generate {
+        Kind::Drop => print_drop(&layout),
+        Kind::Delete => print_delete_all(&layout),
+        Kind::Ddl => print_ddl(&layout),
+        Kind::Diesel => print_diesel_tables(&layout),
     }
 }
diff --git a/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/down.sql b/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/down.sql
new file mode 100644
index 00000000000..a7b4a25623e
--- /dev/null
+++ b/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/down.sql
@@ -0,0 +1 @@
+ALTER TABLE subgraphs.deployment DROP COLUMN postponed_indexes_created;
diff --git a/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/up.sql b/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/up.sql
new file mode 100644
index 00000000000..34b4f512fda
--- /dev/null
+++ b/store/postgres/migrations/2026-05-27-171745_postponed_indexes_created/up.sql
@@ -0,0 +1,8 @@
+ALTER TABLE subgraphs.deployment
+    ADD COLUMN postponed_indexes_created BOOLEAN NOT NULL DEFAULT FALSE;
+
+-- Existing synced deployments already had their postponed indexes created
+-- eagerly under the old code path; mark them done so we don't try again.
+UPDATE subgraphs.deployment
+    SET postponed_indexes_created = TRUE
+    WHERE synced_at IS NOT NULL;
diff --git a/store/postgres/src/advisory_lock.rs b/store/postgres/src/advisory_lock.rs
index 6b0fc671ffa..6e9b9fbf0ac 100644
--- a/store/postgres/src/advisory_lock.rs
+++ b/store/postgres/src/advisory_lock.rs
@@ -17,9 +17,9 @@ use diesel::sql_types::Bool;
 use diesel_async::RunQueryDsl;
 use graph::prelude::StoreError;
 
+use crate::AsyncPgConnection;
 use crate::command_support::catalog::Site;
 use crate::primary::DeploymentId;
-use crate::AsyncPgConnection;
 
 /// A locking scope for a particular deployment. We use different scopes for
 /// different purposes, and in each scope we use an advisory lock for each
diff --git a/store/postgres/src/block_range.rs b/store/postgres/src/block_range.rs
index 4383ab80d7e..d6877957dea 100644
--- a/store/postgres/src/block_range.rs
+++ b/store/postgres/src/block_range.rs
@@ -8,7 +8,7 @@ use diesel::sql_types::{Integer, Range};
 use graph::env::ENV_VARS;
 use std::ops::{Bound, RangeBounds, RangeFrom};
 
-use graph::prelude::{lazy_static, BlockNumber, BlockPtr, BLOCK_NUMBER_MAX};
+use graph::prelude::{BLOCK_NUMBER_MAX, BlockNumber, BlockPtr, lazy_static};
 
 use crate::relational::{SqlName, Table};
 
diff --git a/store/postgres/src/block_store.rs b/store/postgres/src/block_store.rs
index 48ea768c033..4bc9b105c57 100644
--- a/store/postgres/src/block_store.rs
+++ b/store/postgres/src/block_store.rs
@@ -1,16 +1,16 @@
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
-use graph::parking_lot::RwLock;
+use graph::{components::store::BLOCK_CACHE_SIZE, parking_lot::RwLock};
 
 use anyhow::anyhow;
 use async_trait::async_trait;
-use diesel::{sql_query, ExpressionMethods as _, QueryDsl};
-use diesel_async::{scoped_futures::ScopedFutureExt, RunQueryDsl};
+use diesel::{ExpressionMethods as _, QueryDsl, sql_query};
+use diesel_async::RunQueryDsl;
 use graph::{
     blockchain::ChainIdentifier,
     components::store::{BlockStore as BlockStoreTrait, QueryPermit},
     derive::CheapClone,
-    prelude::{error, info, BlockNumber, BlockPtr, Logger, ENV_VARS},
+    prelude::{BlockNumber, BlockPtr, ENV_VARS, Logger, error, info, warn},
     slog::o,
 };
 use graph::{
@@ -21,11 +21,11 @@ use graph::{internal_error, prelude::CheapClone};
 use graph::{prelude::StoreError, util::timed_cache::TimedCache};
 
 use crate::{
+    AsyncPgConnection, ChainStore, NotificationSender, PRIMARY_SHARD, Shard,
     chain_head_listener::ChainHeadUpdateSender,
     chain_store::{ChainStoreMetrics, Storage},
     pool::ConnectionPool,
     primary::Mirror as PrimaryMirror,
-    AsyncPgConnection, ChainStore, NotificationSender, Shard, PRIMARY_SHARD,
 };
 
 use self::primary::Chain;
@@ -37,18 +37,10 @@ pub const FAKE_NETWORK_SHARED: &str = "fake_network_shared";
 // To be incremented on each breaking change to the database.
 const SUPPORTED_DB_VERSION: i64 = 3;
 
-/// The status of a chain: whether we can only read from the chain, or
-/// whether it is ok to ingest from it, too
-#[derive(Copy, Clone)]
-pub enum ChainStatus {
-    ReadOnly,
-    Ingestible,
-}
-
 pub mod primary {
     use std::convert::TryFrom;
 
-    use diesel::{delete, insert_into, update, ExpressionMethods, OptionalExtension, QueryDsl};
+    use diesel::{ExpressionMethods, OptionalExtension, QueryDsl, delete, insert_into, update};
     use diesel_async::RunQueryDsl;
     use graph::{
         blockchain::{BlockHash, ChainIdentifier},
@@ -56,7 +48,7 @@ pub mod primary {
         prelude::StoreError,
     };
 
-    use crate::{chain_store::Storage, AsyncPgConnection};
+    use crate::{AsyncPgConnection, chain_store::Storage};
     use crate::{ConnectionPool, Shard};
 
     table! {
@@ -225,8 +217,9 @@ pub struct Inner {
     /// known to the system at startup, either from configuration or from
     /// previous state in the database.
     stores: RwLock<HashMap<String, Arc<ChainStore>>>,
-    // We keep this information so we can create chain stores during startup
-    shards: Vec<(String, Shard)>,
+    /// We keep this information so we can create chain stores during
+    /// startup. The triple is (network, shard, cache_size)
+    shards: Vec<(String, Shard, BlockNumber)>,
     pools: HashMap<Shard, ConnectionPool>,
     sender: Arc<NotificationSender>,
     mirror: PrimaryMirror,
@@ -248,8 +241,8 @@ impl BlockStore {
     /// a chain uses the pool from `pools` for the given shard.
     pub async fn new(
         logger: Logger,
-        // (network, shard)
-        shards: Vec<(String, Shard)>,
+        // (network, shard, cache_size)
+        shards: Vec<(String, Shard, BlockNumber)>,
         // shard -> pool
         pools: HashMap<Shard, ConnectionPool>,
         sender: Arc<NotificationSender>,
@@ -260,9 +253,27 @@ impl BlockStore {
         const CHAIN_HEAD_CACHE_TTL: Duration = Duration::from_secs(2);
 
         let mirror = PrimaryMirror::new(&pools);
-        let existing_chains = mirror
-            .read_async(|conn| primary::load_chains(conn).scope_boxed())
-            .await?;
+        // Treat a chain whose shard has no connection pool (i.e. a shard
+        // configured with `pool_size = 0`, which `store_builder` drops) as if it
+        // doesn't exist: skip it here so we neither create a chain store for it
+        // nor fail startup. See issue #6195.
+        let existing_chains: Vec<_> = mirror
+            .read_async(primary::load_chains)
+            .await?
+            .into_iter()
+            .filter(|chain| {
+                let has_pool = pools.contains_key(&chain.shard);
+                if !has_pool {
+                    warn!(
+                        &logger,
+                        "Ignoring chain `{}`: its shard `{}` has no connection pool (pool_size = 0)",
+                        chain.name,
+                        chain.shard,
+                    );
+                }
+                has_pool
+            })
+            .collect();
         let chain_head_cache = TimedCache::new(CHAIN_HEAD_CACHE_TTL);
         let chains = shards.clone();
 
@@ -278,39 +289,22 @@ impl BlockStore {
         });
         let block_store = Self { inner };
 
-        /// Check that the configuration for `chain` hasn't changed so that
-        /// it is ok to ingest from it
-        fn chain_ingestible(
-            logger: &Logger,
-            chain: &primary::Chain,
-            shard: &Shard,
-            // ident: &ChainIdentifier,
-        ) -> bool {
-            if &chain.shard != shard {
-                error!(
-                    logger,
-                    "the chain {} is stored in shard {} but is configured for shard {}",
-                    chain.name,
-                    chain.shard,
-                    shard
-                );
-                return false;
-            }
-            true
-        }
-
         // For each configured chain, add a chain store
-        for (chain_name, shard) in chains {
+        for (chain_name, shard, _cache_size) in chains {
             if let Some(chain) = existing_chains
                 .iter()
                 .find(|chain| chain.name == chain_name)
             {
-                let status = if chain_ingestible(&block_store.logger, chain, &shard) {
-                    ChainStatus::Ingestible
-                } else {
-                    ChainStatus::ReadOnly
-                };
-                block_store.add_chain_store(chain, status, false).await?;
+                if chain.shard != shard {
+                    warn!(
+                        &block_store.logger,
+                        "The chain `{0}` is stored in shard `{1}` but is configured for shard `{2}`; ignoring config and using shard `{1}`",
+                        chain.name,
+                        chain.shard,
+                        shard,
+                    );
+                }
+                block_store.add_chain_store(chain, false).await?;
             };
         }
 
@@ -326,9 +320,7 @@ impl BlockStore {
             .iter()
             .filter(|chain| !configured_chains.contains(&chain.name))
         {
-            block_store
-                .add_chain_store(chain, ChainStatus::ReadOnly, false)
-                .await?;
+            block_store.add_chain_store(chain, false).await?;
         }
         Ok(block_store)
     }
@@ -376,7 +368,6 @@ impl BlockStore {
     pub async fn add_chain_store(
         &self,
         chain: &primary::Chain,
-        status: ChainStatus,
         create: bool,
     ) -> Result<Arc<ChainStore>, StoreError> {
         let pool = self
@@ -391,15 +382,26 @@ impl BlockStore {
         );
         let ident = chain.network_identifier()?;
         let logger = self.logger.new(o!("network" => chain.name.clone()));
+        let cache_size = self
+            .shards
+            .iter()
+            .find_map(|(network, _, chain_size)| {
+                if network == &chain.name {
+                    Some(*chain_size)
+                } else {
+                    None
+                }
+            })
+            .unwrap_or(BLOCK_CACHE_SIZE);
         let store = ChainStore::new(
             logger,
             chain.name.clone(),
             chain.storage.clone(),
-            status,
             sender,
             pool,
             ENV_VARS.store.recent_blocks_cache_capacity,
             self.chain_store_metrics.clone(),
+            cache_size,
         );
         if create {
             store.create(&ident).await?;
@@ -453,20 +455,15 @@ impl BlockStore {
         let chain = chain.to_string();
         let this = self.cheap_clone();
         self.mirror
-            .read_async(|conn| {
-                async {
-                    match primary::find_chain(conn, &chain).await? {
-                        Some(chain) => {
-                            let chain_store = this
-                                .add_chain_store(&chain, ChainStatus::ReadOnly, false)
-                                .await?;
-                            Ok(Some(chain_store))
-                        }
-                        None => Ok(None),
+            .read_async(
+                async |conn| match primary::find_chain(conn, &chain).await? {
+                    Some(chain) => {
+                        let chain_store = this.add_chain_store(&chain, false).await?;
+                        Ok(Some(chain_store))
                     }
-                }
-                .scope_boxed()
-            })
+                    None => Ok(None),
+                },
+            )
             .await
     }
 
@@ -596,7 +593,7 @@ impl BlockStore {
         let shard = self
             .shards
             .iter()
-            .find_map(|(chain_id, shard)| {
+            .find_map(|(chain_id, shard, _cache_size)| {
                 if chain_id.as_str().eq(network) {
                     Some(shard)
                 } else {
@@ -605,7 +602,7 @@ impl BlockStore {
             })
             .ok_or_else(|| anyhow!("unable to find shard for network {}", network))?;
         let chain = primary::add_chain(&mut conn, network, shard, ident).await?;
-        self.add_chain_store(&chain, ChainStatus::Ingestible, true)
+        self.add_chain_store(&chain, true)
             .await
             .map_err(anyhow::Error::from)
     }
diff --git a/store/postgres/src/catalog.rs b/store/postgres/src/catalog.rs
index 5f094548565..0fbee8ff416 100644
--- a/store/postgres/src/catalog.rs
+++ b/store/postgres/src/catalog.rs
@@ -1,11 +1,11 @@
 use diesel::select;
 use diesel::sql_query;
 use diesel::sql_types::{Bool, Integer};
-use diesel::{insert_into, OptionalExtension};
 use diesel::{
-    sql_types::{Array, BigInt, Double, Nullable, Text},
     ExpressionMethods, QueryDsl,
+    sql_types::{Array, BigInt, Double, Nullable, Text},
 };
+use diesel::{OptionalExtension, insert_into};
 use diesel_async::{RunQueryDsl, SimpleAsyncConnection};
 use graph::components::store::VersionStats;
 use graph::prelude::BlockNumber;
@@ -20,14 +20,14 @@ use std::time::Duration;
 use graph::prelude::anyhow::anyhow;
 use graph::{
     data::subgraph::schema::POI_TABLE,
-    prelude::{lazy_static, StoreError, BLOCK_NUMBER_MAX},
+    prelude::{BLOCK_NUMBER_MAX, StoreError, lazy_static},
 };
 
 use crate::AsyncPgConnection;
 use crate::{
     block_range::BLOCK_RANGE_COLUMN,
     pool::ForeignServer,
-    primary::{Namespace, Site, NAMESPACE_PUBLIC},
+    primary::{NAMESPACE_PUBLIC, Namespace, Site},
     relational::SqlName,
 };
 
@@ -189,7 +189,7 @@ pub struct Catalog {
 
     /// Whether the database supports `int4_minmax_multi_ops` etc.
     /// See the [Postgres docs](https://www.postgresql.org/docs/15/brin-builtin-opclasses.html)
-    has_minmax_multi_ops: bool,
+    pub has_minmax_multi_ops: bool,
 
     /// Whether the column `pg_stats.range_bounds_histogram` introduced in
     /// Postgres 17 exists. See the [Postgres
@@ -882,6 +882,36 @@ pub(crate) async fn check_index_is_valid(
     Ok(matches!(result, Some(true)))
 }
 
+/// Check whether there is an index creation currently running for any index
+/// in the given schema. If there is, return the PID of the backend that is
+/// creating the index and the name of the index being created.
+pub(crate) async fn index_creation_is_running(
+    conn: &mut AsyncPgConnection,
+    schema_name: &str,
+) -> Result<Option<(i32, String)>, StoreError> {
+    #[derive(Queryable, QueryableByName)]
+    struct IndexCreationCheck {
+        #[diesel(sql_type = Integer)]
+        pid: i32,
+        #[diesel(sql_type = Text)]
+        index_name: String,
+    }
+
+    let query = "
+        select ci.pid, ci.index_relid::regclass as index_name \
+        from pg_stat_progress_create_index ci \
+        join pg_class c on ci.relid = c.oid \
+        join pg_namespace n on c.relnamespace = n.oid \
+        where n.nspname = $1";
+    sql_query(query)
+        .bind::<Text, _>(schema_name)
+        .get_result::<IndexCreationCheck>(conn)
+        .await
+        .optional()
+        .map(|check| check.map(|check| (check.pid, check.index_name)))
+        .map_err::<StoreError, _>(Into::into)
+}
+
 pub(crate) async fn indexes_for_table(
     conn: &mut AsyncPgConnection,
     schema_name: &str,
@@ -913,6 +943,32 @@ pub(crate) async fn indexes_for_table(
     Ok(results.into_iter().map(|i| i.def).collect())
 }
 
+pub(crate) async fn table_has_index(
+    conn: &mut AsyncPgConnection,
+    schema_name: &str,
+    index_name: &str,
+) -> Result<bool, StoreError> {
+    #[derive(QueryableByName)]
+    #[allow(dead_code)]
+    struct Exists {
+        #[diesel(sql_type = diesel::sql_types::Integer)]
+        exists: i32,
+    }
+
+    let exists = sql_query(
+        "SELECT 1 AS exists FROM pg_indexes \
+         WHERE schemaname = $1 AND indexname = $2",
+    )
+    .bind::<Text, _>(schema_name)
+    .bind::<Text, _>(index_name)
+    .get_result::<Exists>(conn)
+    .await
+    .optional()
+    .map_err::<StoreError, _>(Into::into)?;
+
+    Ok(exists.is_some())
+}
+
 pub(crate) async fn drop_index(
     conn: &mut AsyncPgConnection,
     schema_name: &str,
diff --git a/store/postgres/src/chain_head_listener.rs b/store/postgres/src/chain_head_listener.rs
index 035e10f377a..2502fd7a631 100644
--- a/store/postgres/src/chain_head_listener.rs
+++ b/store/postgres/src/chain_head_listener.rs
@@ -1,7 +1,7 @@
 use graph::futures03::{self, FutureExt};
 use graph::{
     blockchain::ChainHeadUpdateStream,
-    prelude::{tokio, MetricsRegistry, StoreError},
+    prelude::{MetricsRegistry, StoreError, tokio},
     prometheus::{CounterVec, GaugeVec},
     util::timed_rw_lock::TimedRwLock,
 };
@@ -11,15 +11,15 @@ use std::sync::Arc;
 use lazy_static::lazy_static;
 
 use crate::{
+    NotificationSender,
     notification_listener::{JsonNotification, NotificationListener, SafeChannelName},
     pool::ConnectionPool,
-    NotificationSender,
 };
 use graph::blockchain::ChainHeadUpdateListener as ChainHeadUpdateListenerTrait;
 use graph::prelude::serde::{Deserialize, Serialize};
 use graph::prelude::serde_json::{self, json};
 use graph::prelude::tokio::sync::{mpsc::Receiver, watch};
-use graph::prelude::{crit, debug, o, CheapClone, Logger, ENV_VARS};
+use graph::prelude::{CheapClone, ENV_VARS, Logger, crit, debug, o};
 
 lazy_static! {
     pub static ref CHANNEL_NAME: SafeChannelName =
diff --git a/store/postgres/src/chain_store.rs b/store/postgres/src/chain_store.rs
index bdf63f52c31..3160afebfab 100644
--- a/store/postgres/src/chain_store.rs
+++ b/store/postgres/src/chain_store.rs
@@ -1,18 +1,17 @@
 use anyhow::anyhow;
 use async_trait::async_trait;
 use diesel::sql_types::Text;
-use diesel::{insert_into, update, ExpressionMethods, OptionalExtension, QueryDsl};
-use diesel_async::AsyncConnection;
-use diesel_async::{scoped_futures::ScopedFutureExt, RunQueryDsl};
+use diesel::{ExpressionMethods, OptionalExtension, QueryDsl, insert_into, update};
+use diesel_async::RunQueryDsl;
 
 use graph::components::store::ChainHeadStore;
 use graph::data::store::ethereum::call;
 use graph::env::ENV_VARS;
 use graph::parking_lot::RwLock;
-use graph::prelude::alloy::primitives::B256;
 use graph::prelude::MetricsRegistry;
+use graph::prelude::alloy::primitives::B256;
 use graph::prometheus::{CounterVec, GaugeVec};
-use graph::slog::Logger;
+use graph::slog::{Logger, info, o};
 use graph::stable_hash::crypto_stable_hash;
 use graph::util::herd_cache::HerdCache;
 
@@ -29,17 +28,18 @@ use std::{
 
 use graph::blockchain::{Block, BlockHash, ChainIdentifier, ExtendedBlockPtr};
 use graph::cheap_clone::CheapClone;
+use graph::components::ethereum::CachedBlock;
 use graph::prelude::{
-    serde_json as json, transaction_receipt::LightTransactionReceipt, BlockNumber, BlockPtr,
-    CachedEthereumCall, ChainStore as ChainStoreTrait, Error, EthereumCallCache, StoreError,
+    BlockNumber, BlockPtr, CachedEthereumCall, ChainStore as ChainStoreTrait, Error,
+    EthereumCallCache, StaleCallCacheResult, StoreError, serde_json as json,
+    transaction_receipt::LightTransactionReceipt,
 };
 use graph::{ensure, internal_error};
 
 use self::recent_blocks_cache::RecentBlocksCache;
 use crate::AsyncPgConnection;
-use crate::{
-    block_store::ChainStatus, chain_head_listener::ChainHeadUpdateSender, pool::ConnectionPool,
-};
+use crate::vid_batcher::AdaptiveBatchSize;
+use crate::{chain_head_listener::ChainHeadUpdateSender, pool::ConnectionPool};
 
 /// Our own internal notion of a block
 #[derive(Clone, Debug)]
@@ -65,6 +65,45 @@ impl JsonBlock {
             .and_then(|ts| ts.as_str())
             .and_then(|ts| ts.parse::<u64>().ok())
     }
+
+    fn into_cache_block(self) -> CacheBlock {
+        let data = self.data.and_then(CachedBlock::from_json);
+        CacheBlock {
+            ptr: self.ptr,
+            parent_hash: self.parent_hash,
+            data,
+        }
+    }
+}
+
+/// Typed version of JsonBlock for the in-memory cache.
+#[derive(Clone, Debug)]
+struct CacheBlock {
+    ptr: BlockPtr,
+    parent_hash: BlockHash,
+    data: Option<CachedBlock>,
+}
+
+impl CacheBlock {
+    fn timestamp(&self) -> Option<u64> {
+        self.data.as_ref().and_then(|d| d.timestamp())
+    }
+
+    fn to_extended_block_ptr(&self) -> Result<ExtendedBlockPtr, Error> {
+        let hash = self.ptr.hash.clone();
+        let number = self.ptr.number;
+        let parent_hash = self.parent_hash.clone();
+
+        let timestamp = self
+            .timestamp()
+            .ok_or_else(|| anyhow!("Timestamp is missing"))?;
+
+        let ptr =
+            ExtendedBlockPtr::try_from((hash.as_b256(), number, parent_hash.as_b256(), timestamp))
+                .map_err(|e| anyhow!("Failed to convert to ExtendedBlockPtr: {}", e))?;
+
+        Ok(ptr)
+    }
 }
 
 /// Tables in the 'public' database schema that store chain-specific data
@@ -87,11 +126,14 @@ pub use data::Storage;
 /// Encapuslate access to the blocks table for a chain.
 mod data {
     use crate::diesel::dsl::IntervalDsl;
-    use crate::AsyncPgConnection;
+    use crate::{AsyncPgConnection, catalog};
     use diesel::dsl::sql;
     use diesel::insert_into;
     use diesel::sql_types::{Array, Binary, Bool, Nullable, Text};
-    use diesel::{delete, sql_query, ExpressionMethods, JoinOnDsl, OptionalExtension, QueryDsl};
+    use diesel::{
+        BoolExpressionMethods, ExpressionMethods, JoinOnDsl, NullableExpressionMethods,
+        OptionalExtension, QueryDsl, delete, sql_query,
+    };
     use diesel::{
         deserialize::FromSql,
         pg::Pg,
@@ -108,8 +150,8 @@ mod data {
     use graph::prelude::alloy::primitives::{Address, B256};
     use graph::prelude::transaction_receipt::LightTransactionReceipt;
     use graph::prelude::{
-        info, serde_json as json, BlockNumber, BlockPtr, CachedEthereumCall, Error, Logger,
-        StoreError,
+        BlockNumber, BlockPtr, CachedEthereumCall, Error, Logger, StoreError, info,
+        serde_json as json,
     };
 
     use std::collections::HashMap;
@@ -118,6 +160,8 @@ mod data {
     use std::iter::FromIterator;
     use std::str::FromStr;
 
+    use std::time::Instant;
+
     use crate::transaction_receipt::RawTransactionReceipt;
 
     use super::JsonBlock;
@@ -125,6 +169,7 @@ mod data {
     pub(crate) const ETHEREUM_BLOCKS_TABLE_NAME: &str = "public.ethereum_blocks";
 
     pub(crate) const ETHEREUM_CALL_CACHE_TABLE_NAME: &str = "public.eth_call_cache";
+    pub(crate) const ETHEREUM_CALL_META_TABLE_NAME: &str = "public.eth_call_meta";
 
     mod public {
         pub(super) use super::super::public::ethereum_networks;
@@ -707,6 +752,73 @@ mod data {
                 .collect())
         }
 
+        /// Return the parent block pointer for the block with the given hash.
+        /// Only reads header columns, not the data column.
+        pub(super) async fn block_parent_ptr(
+            &self,
+            conn: &mut AsyncPgConnection,
+            chain: &str,
+            hash: &BlockHash,
+        ) -> Result<Option<BlockPtr>, Error> {
+            let result = match self {
+                Storage::Shared => {
+                    use public::ethereum_blocks as b;
+
+                    let (child, parent) = diesel::alias!(
+                        public::ethereum_blocks as child,
+                        public::ethereum_blocks as parent
+                    );
+
+                    child
+                        .inner_join(
+                            parent.on(child
+                                .field(b::parent_hash)
+                                .assume_not_null()
+                                .eq(parent.field(b::hash))
+                                .and(parent.field(b::network_name).eq(chain))),
+                        )
+                        .select((parent.field(b::hash), parent.field(b::number)))
+                        .filter(child.field(b::hash).eq(format!("{:x}", hash)))
+                        .filter(child.field(b::network_name).eq(chain))
+                        .first::<(String, i64)>(conn)
+                        .await
+                        .optional()?
+                        .map(|(h, n)| {
+                            Ok::<_, Error>(BlockPtr::new(h.parse()?, i32::try_from(n).unwrap()))
+                        })
+                        .transpose()?
+                }
+                Storage::Private(Schema { blocks, .. }) => {
+                    // We can't use diesel::alias! here because the table is
+                    // dynamic, so we write the SQL query manually
+
+                    let query = format!(
+                        "SELECT parent.hash, parent.number \
+                         FROM {qname} child, {qname} parent \
+                         WHERE child.hash = $1 \
+                         AND child.parent_hash = parent.hash",
+                        qname = blocks.qname
+                    );
+
+                    #[derive(QueryableByName)]
+                    struct BlockHashAndNumber {
+                        #[diesel(sql_type = Bytea)]
+                        hash: Vec<u8>,
+                        #[diesel(sql_type = BigInt)]
+                        number: i64,
+                    }
+
+                    sql_query(query)
+                        .bind::<Bytea, _>(hash.as_slice())
+                        .get_result::<BlockHashAndNumber>(conn)
+                        .await
+                        .optional()?
+                        .map(|block| BlockPtr::from((block.hash, block.number)))
+                }
+            };
+            Ok(result)
+        }
+
         pub(super) async fn block_hashes_by_block_number(
             &self,
             conn: &mut AsyncPgConnection,
@@ -1184,6 +1296,89 @@ mod data {
             Ok(data_and_ptr)
         }
 
+        /// Like `ancestor_block` but returns only the `BlockPtr` without
+        /// fetching the `data` column.
+        pub(super) async fn ancestor_block_ptr(
+            &self,
+            conn: &mut AsyncPgConnection,
+            block_ptr: BlockPtr,
+            offset: BlockNumber,
+            root: Option<BlockHash>,
+        ) -> Result<Option<BlockPtr>, Error> {
+            let short_circuit_predicate = match root {
+                Some(_) => "and b.parent_hash <> $3",
+                None => "",
+            };
+
+            match self {
+                Storage::Shared => {
+                    let query =
+                        self.ancestor_block_query(short_circuit_predicate, "ethereum_blocks");
+
+                    #[derive(QueryableByName)]
+                    struct BlockHashAndNumber {
+                        #[diesel(sql_type = Text)]
+                        hash: String,
+                        #[diesel(sql_type = BigInt)]
+                        number: i64,
+                    }
+
+                    let block = match root {
+                        Some(root) => sql_query(query)
+                            .bind::<Text, _>(block_ptr.hash_hex())
+                            .bind::<BigInt, _>(offset as i64)
+                            .bind::<Text, _>(root.hash_hex())
+                            .get_result::<BlockHashAndNumber>(conn),
+                        None => sql_query(query)
+                            .bind::<Text, _>(block_ptr.hash_hex())
+                            .bind::<BigInt, _>(offset as i64)
+                            .get_result::<BlockHashAndNumber>(conn),
+                    }
+                    .await
+                    .optional()?;
+
+                    match block {
+                        None => Ok(None),
+                        Some(block) => Ok(Some(BlockPtr::new(
+                            BlockHash::from_str(&block.hash)?,
+                            i32::try_from(block.number).unwrap(),
+                        ))),
+                    }
+                }
+                Storage::Private(Schema { blocks, .. }) => {
+                    let query =
+                        self.ancestor_block_query(short_circuit_predicate, blocks.qname.as_str());
+
+                    #[derive(QueryableByName)]
+                    struct BlockHashAndNumber {
+                        #[diesel(sql_type = Bytea)]
+                        hash: Vec<u8>,
+                        #[diesel(sql_type = BigInt)]
+                        number: i64,
+                    }
+
+                    let block = match &root {
+                        Some(root) => sql_query(query)
+                            .bind::<Bytea, _>(block_ptr.hash_slice())
+                            .bind::<BigInt, _>(offset as i64)
+                            .bind::<Bytea, _>(root.as_slice())
+                            .get_result::<BlockHashAndNumber>(conn),
+                        None => sql_query(query)
+                            .bind::<Bytea, _>(block_ptr.hash_slice())
+                            .bind::<BigInt, _>(offset as i64)
+                            .get_result::<BlockHashAndNumber>(conn),
+                    }
+                    .await
+                    .optional()?;
+
+                    match block {
+                        None => Ok(None),
+                        Some(block) => Ok(Some(BlockPtr::from((block.hash, block.number)))),
+                    }
+                }
+            }
+        }
+
         pub(super) async fn delete_blocks_before(
             &self,
             conn: &mut AsyncPgConnection,
@@ -1449,193 +1644,184 @@ mod data {
             }
         }
 
-        pub async fn clear_stale_call_cache(
+        /// Ensure that an index on `contract_address` exists on the
+        /// call_cache table to speed up deletion queries. If the index does
+        /// not exist, create it concurrently.
+        pub(super) async fn ensure_contract_address_index(
             &self,
             conn: &mut AsyncPgConnection,
             logger: &Logger,
-            ttl_days: i32,
-            ttl_max_contracts: Option<i64>,
-        ) -> Result<(), Error> {
-            let mut total_calls: usize = 0;
-            let mut total_contracts: i64 = 0;
-            // We process contracts in batches to avoid loading too many entries into memory
-            // at once. Each contract can have many calls, so we also delete calls in batches.
-            // Note: The batch sizes were chosen based on experimentation. Potentially, they
-            // could be made configurable via ENV vars.
-            let contracts_batch_size: i64 = 2000;
-            let cache_batch_size: usize = 10000;
-
-            // Limits the number of contracts to process if ttl_max_contracts is set.
-            // Used also to adjust the final batch size, so we don't process more
-            // contracts than the set limit.
-            let remaining_contracts = |processed: i64| -> Option<i64> {
-                ttl_max_contracts.map(|limit| limit.saturating_sub(processed))
-            };
+        ) -> Result<(), StoreError> {
+            const CONTRACT_INDEX: &str = "call_cache_contract_address";
 
-            match self {
-                Storage::Shared => {
-                    use public::eth_call_cache as cache;
-                    use public::eth_call_meta as meta;
+            let (schema_name, table_qname) = match self {
+                Storage::Shared => ("public", "public.eth_call_cache".to_string()),
+                Storage::Private(Schema {
+                    name, call_cache, ..
+                }) => (name.as_str(), call_cache.qname.clone()),
+            };
 
-                    loop {
-                        if let Some(0) = remaining_contracts(total_contracts) {
-                            info!(
-                                logger,
-                                "Finished cleaning call cache: deleted {} entries for {} contracts (limit reached)",
-                                total_calls,
-                                total_contracts
-                            );
-                            break;
-                        }
+            let has_index = catalog::table_has_index(conn, schema_name, CONTRACT_INDEX).await?;
 
-                        let batch_limit = remaining_contracts(total_contracts)
-                            .map(|left| left.min(contracts_batch_size))
-                            .unwrap_or(contracts_batch_size);
-
-                        let stale_contracts = meta::table
-                            .select(meta::contract_address)
-                            .filter(
-                                meta::accessed_at
-                                    .lt(diesel::dsl::date(diesel::dsl::now - ttl_days.days())),
-                            )
-                            .limit(batch_limit)
-                            .get_results::<Vec<u8>>(conn)
-                            .await?;
+            let idx_valid =
+                catalog::check_index_is_valid(conn, schema_name, CONTRACT_INDEX).await?;
 
-                        if stale_contracts.is_empty() {
-                            info!(
-                                logger,
-                                "Finished cleaning call cache: deleted {} entries for {} contracts",
-                                total_calls,
-                                total_contracts
-                            );
-                            break;
-                        }
+            if has_index && idx_valid {
+                return Ok(());
+            }
 
-                        loop {
-                            let next_batch = cache::table
-                                .select(cache::id)
-                                .filter(cache::contract_address.eq_any(&stale_contracts))
-                                .limit(cache_batch_size as i64)
-                                .get_results::<Vec<u8>>(conn)
-                                .await?;
-                            let deleted_count =
-                                diesel::delete(cache::table.filter(cache::id.eq_any(&next_batch)))
-                                    .execute(conn)
-                                    .await?;
-
-                            total_calls += deleted_count;
-
-                            if deleted_count < cache_batch_size {
-                                break;
-                            }
-                        }
+            if !idx_valid {
+                conn.batch_execute(&format!(
+                    "drop index concurrently if exists {schema_name}.{}",
+                    CONTRACT_INDEX
+                ))
+                .await?;
+            }
 
-                        let deleted_contracts = diesel::delete(
-                            meta::table.filter(meta::contract_address.eq_any(&stale_contracts)),
-                        )
-                        .execute(conn)
-                        .await?;
+            let start = Instant::now();
+            info!(
+                logger,
+                "Creating index {} on {}.contract_address; \
+                     this may take a long time",
+                CONTRACT_INDEX,
+                table_qname
+            );
+            conn.batch_execute(&format!(
+                "create index concurrently {} on {}(contract_address)",
+                CONTRACT_INDEX, table_qname
+            ))
+            .await?;
+            let duration = start.elapsed();
+            info!(
+                logger,
+                "Finished creating index {} on {}.contract_address in {:?}",
+                CONTRACT_INDEX,
+                table_qname,
+                duration
+            );
 
-                        total_contracts += deleted_contracts as i64;
-                    }
+            Ok(())
+        }
 
-                    Ok(())
-                }
+        /// Delete up to `batch_size` call_cache rows whose contract_address
+        /// appears in call_meta with accessed_at older than `ttl_days`.
+        /// Returns the number of deleted rows.
+        pub(super) async fn delete_stale_calls_batch(
+            &self,
+            conn: &mut AsyncPgConnection,
+            ttl_days: i64,
+            batch_size: i64,
+        ) -> Result<usize, StoreError> {
+            let (cache, meta) = match self {
+                Storage::Shared => (
+                    ETHEREUM_CALL_CACHE_TABLE_NAME,
+                    ETHEREUM_CALL_META_TABLE_NAME,
+                ),
                 Storage::Private(Schema {
                     call_cache,
                     call_meta,
                     ..
-                }) => {
-                    let select_query = format!(
-                        "WITH stale_contracts AS (
-                            SELECT contract_address
-                            FROM {}
-                            WHERE accessed_at < current_date - interval '{} days'
-                            LIMIT $1
-                        )
-                        SELECT contract_address FROM stale_contracts",
-                        call_meta.qname, ttl_days
-                    );
-
-                    let delete_cache_query = format!(
-                        "WITH targets AS (
-                            SELECT id
-                            FROM {}
-                            WHERE contract_address = ANY($1)
-                            LIMIT {}
-                        )
-                        DELETE FROM {} USING targets
-                        WHERE {}.id = targets.id",
-                        call_cache.qname, cache_batch_size, call_cache.qname, call_cache.qname
-                    );
-
-                    let delete_meta_query = format!(
-                        "DELETE FROM {} WHERE contract_address = ANY($1)",
-                        call_meta.qname
-                    );
-
-                    #[derive(QueryableByName)]
-                    struct ContractAddress {
-                        #[diesel(sql_type = Bytea)]
-                        contract_address: Vec<u8>,
-                    }
-
-                    loop {
-                        if let Some(0) = remaining_contracts(total_contracts) {
-                            info!(
-                                logger,
-                                "Finished cleaning call cache: deleted {} entries for {} contracts (limit reached)",
-                                total_calls,
-                                total_contracts
-                            );
-                            break;
-                        }
-
-                        let batch_limit = remaining_contracts(total_contracts)
-                            .map(|left| left.min(contracts_batch_size))
-                            .unwrap_or(contracts_batch_size);
-
-                        let stale_contracts: Vec<Vec<u8>> = sql_query(&select_query)
-                            .bind::<BigInt, _>(batch_limit)
-                            .load::<ContractAddress>(conn)
-                            .await?
-                            .into_iter()
-                            .map(|r| r.contract_address)
-                            .collect();
-
-                        if stale_contracts.is_empty() {
-                            info!(
-                                logger,
-                                "Finished cleaning call cache: deleted {} entries for {} contracts",
-                                total_calls,
-                                total_contracts
-                            );
-                            break;
-                        }
-
-                        loop {
-                            let deleted_count = sql_query(&delete_cache_query)
-                                .bind::<Array<Bytea>, _>(&stale_contracts)
-                                .execute(conn)
-                                .await?;
+                }) => (call_cache.qname.as_str(), call_meta.qname.as_str()),
+            };
+            let query = format!(
+                "/* controller='call_cache_cleanup',days={ttl_days},batch_size={batch_size} */ \
+                 delete from {cache}
+                    where ctid in (
+                        select cc.ctid
+                        from {cache} cc
+                        join {meta} cm
+                          on cc.contract_address = cm.contract_address
+                        where cm.accessed_at < current_date - $1 * interval '1 day'
+                        limit $2
+                    )"
+            );
+            sql_query(&query)
+                .bind::<BigInt, _>(ttl_days)
+                .bind::<BigInt, _>(batch_size)
+                .execute(conn)
+                .await
+                .map_err(StoreError::from)
+        }
 
-                            total_calls += deleted_count;
+        /// Given `ttl_days` and `max_contracts`, compute an effective
+        /// TTL in days such that at most `max_contracts` contracts would
+        /// be evicted. Returns a value >= `ttl_days`.
+        ///
+        /// We look at the (max_contracts+1)th oldest stale contract. If
+        /// it exists with `accessed_at = D`, the effective TTL is set to
+        /// `current_date - D` days, making the deletion cutoff exactly
+        /// `D`. Since the deletion query uses `accessed_at < cutoff`,
+        /// contracts with `accessed_at = D` are excluded, guaranteeing
+        /// at most `max_contracts` deletions.
+        ///
+        /// When multiple contracts share the boundary date, we may
+        /// delete fewer than `max_contracts` since we can only control
+        /// the cutoff at date granularity.
+        pub(super) async fn effective_ttl(
+            &self,
+            conn: &mut AsyncPgConnection,
+            ttl_days: i64,
+            max_contracts: i64,
+        ) -> Result<i64, StoreError> {
+            #[derive(QueryableByName)]
+            struct Row {
+                #[diesel(sql_type = diesel::sql_types::BigInt)]
+                effective_ttl: i64,
+            }
 
-                            if deleted_count < cache_batch_size {
-                                break;
-                            }
-                        }
+            let meta_table = match self {
+                Storage::Shared => ETHEREUM_CALL_META_TABLE_NAME,
+                Storage::Private(Schema { call_meta, .. }) => call_meta.qname.as_str(),
+            };
+            let query = format!(
+                "select extract(day from current_date - accessed_at)::int8 + 1\
+                        as effective_ttl \
+                   from {meta_table} \
+                  where accessed_at < current_date - $1 * interval '1 day' \
+                  order by accessed_at asc \
+                 offset $2 \
+                  limit 1"
+            );
+            let effective_ttl: Option<i64> = sql_query(&query)
+                .bind::<BigInt, _>(ttl_days)
+                .bind::<BigInt, _>(max_contracts)
+                .get_result::<Row>(conn)
+                .await
+                .optional()?
+                .map(|r| r.effective_ttl);
 
-                        let deleted_contracts = sql_query(&delete_meta_query)
-                            .bind::<Array<Bytea>, _>(&stale_contracts)
-                            .execute(conn)
-                            .await?;
+            Ok(effective_ttl.unwrap_or(ttl_days))
+        }
 
-                        total_contracts += deleted_contracts as i64;
-                    }
+        /// Delete all call_meta entries with accessed_at older than
+        /// `ttl_days`. Should be called after all corresponding
+        /// call_cache rows have been deleted.
+        pub(super) async fn delete_stale_meta(
+            &self,
+            conn: &mut AsyncPgConnection,
+            ttl_days: i64,
+        ) -> Result<usize, StoreError> {
+            match self {
+                Storage::Shared => {
+                    use public::eth_call_meta as meta;
 
-                    Ok(())
+                    diesel::delete(meta::table.filter(
+                        meta::accessed_at.lt(diesel::dsl::date(diesel::dsl::now - ttl_days.days())),
+                    ))
+                    .execute(conn)
+                    .await
+                    .map_err(StoreError::from)
+                }
+                Storage::Private(Schema { call_meta, .. }) => {
+                    let query = format!(
+                        "delete from {} where accessed_at < current_date - $1 * interval '1 day'",
+                        call_meta.qname
+                    );
+                    sql_query(&query)
+                        .bind::<BigInt, _>(ttl_days)
+                        .execute(conn)
+                        .await
+                        .map_err(StoreError::from)
                 }
             }
         }
@@ -2048,11 +2234,11 @@ impl ChainHeadPtrCache {
             return None;
         }
         let guard = self.entry.read();
-        if let Some((value, expires)) = guard.as_ref() {
-            if Instant::now() < *expires {
-                self.metrics.record_chain_head_ptr_cache_hit(&self.chain);
-                return Some(value.clone());
-            }
+        if let Some((value, expires)) = guard.as_ref()
+            && Instant::now() < *expires
+        {
+            self.metrics.record_chain_head_ptr_cache_hit(&self.chain);
+            return Some(value.clone());
         }
         self.metrics.record_chain_head_ptr_cache_miss(&self.chain);
         None
@@ -2086,39 +2272,39 @@ impl ChainHeadPtrCache {
 
         // Only update estimate if we have a previous value and block number advanced
         // (skip reorgs where new block number <= old)
-        if let Some(old_ptr) = old_value.as_ref() {
-            if new_value.number > old_ptr.number {
-                let mut last_change = self.last_change.write();
-                let delta_ms = now.duration_since(*last_change).as_millis() as u64;
-                *last_change = now;
-
-                let blocks_advanced = (new_value.number - old_ptr.number) as u64;
-
-                // Increment observation count
-                let obs = AtomicU64::fetch_add(&self.observations, 1, Ordering::Relaxed);
-
-                // Ignore unreasonable deltas (> 60s)
-                if delta_ms > 0 && delta_ms < 60_000 {
-                    let per_block_ms = delta_ms / blocks_advanced;
-                    let new_estimate = if obs == 0 {
-                        // First observation - use as initial estimate
-                        per_block_ms
-                    } else {
-                        // EWMA: new = 0.8 * old + 0.2 * observed
-                        let old_estimate =
-                            AtomicU64::load(&self.estimated_block_time_ms, Ordering::Relaxed);
-                        (old_estimate * 4 + per_block_ms) / 5
-                    };
-                    AtomicU64::store(
-                        &self.estimated_block_time_ms,
-                        new_estimate,
-                        Ordering::Relaxed,
-                    );
+        if let Some(old_ptr) = old_value.as_ref()
+            && new_value.number > old_ptr.number
+        {
+            let mut last_change = self.last_change.write();
+            let delta_ms = now.duration_since(*last_change).as_millis() as u64;
+            *last_change = now;
+
+            let blocks_advanced = (new_value.number - old_ptr.number) as u64;
+
+            // Increment observation count
+            let obs = AtomicU64::fetch_add(&self.observations, 1, Ordering::Relaxed);
+
+            // Ignore unreasonable deltas (> 60s)
+            if delta_ms > 0 && delta_ms < 60_000 {
+                let per_block_ms = delta_ms / blocks_advanced;
+                let new_estimate = if obs == 0 {
+                    // First observation - use as initial estimate
+                    per_block_ms
+                } else {
+                    // EWMA: new = 0.8 * old + 0.2 * observed
+                    let old_estimate =
+                        AtomicU64::load(&self.estimated_block_time_ms, Ordering::Relaxed);
+                    (old_estimate * 4 + per_block_ms) / 5
+                };
+                AtomicU64::store(
+                    &self.estimated_block_time_ms,
+                    new_estimate,
+                    Ordering::Relaxed,
+                );
 
-                    // Update metric gauge
-                    self.metrics
-                        .set_chain_head_ptr_block_time(&self.chain, new_estimate);
-                }
+                // Update metric gauge
+                self.metrics
+                    .set_chain_head_ptr_block_time(&self.chain, new_estimate);
             }
         }
 
@@ -2139,7 +2325,6 @@ pub struct ChainStore {
     pool: ConnectionPool,
     pub chain: String,
     pub(crate) storage: data::Storage,
-    status: ChainStatus,
     chain_head_update_sender: ChainHeadUpdateSender,
     // TODO: We currently only use this cache for
     // [`ChainStore::ancestor_block`], but it could very well be expanded to
@@ -2152,11 +2337,14 @@ pub struct ChainStore {
     blocks_by_hash_cache: HerdCache<Arc<Result<Vec<JsonBlock>, StoreError>>>,
     blocks_by_number_cache:
         HerdCache<Arc<Result<BTreeMap<BlockNumber, Vec<JsonBlock>>, StoreError>>>,
-    ancestor_cache: HerdCache<Arc<Result<Option<(json::Value, BlockPtr)>, StoreError>>>,
+    ancestor_cache: HerdCache<Arc<Result<Option<(CachedBlock, BlockPtr)>, StoreError>>>,
     /// Adaptive cache for chain_head_ptr()
     chain_head_ptr_cache: ChainHeadPtrCache,
     /// Herd cache to prevent thundering herd on chain_head_ptr() lookups
     chain_head_ptr_herd: HerdCache<Arc<Result<Option<BlockPtr>, StoreError>>>,
+    /// Number of blocks from chain head for which to keep block data cached.
+    /// Used with `GRAPH_STORE_IGNORE_BLOCK_CACHE` to simulate block data eviction.
+    cache_size: BlockNumber,
 }
 
 impl ChainStore {
@@ -2164,11 +2352,11 @@ impl ChainStore {
         logger: Logger,
         chain: String,
         storage: data::Storage,
-        status: ChainStatus,
         chain_head_update_sender: ChainHeadUpdateSender,
         pool: ConnectionPool,
         recent_blocks_cache_capacity: usize,
         metrics: Arc<ChainStoreMetrics>,
+        cache_size: BlockNumber,
     ) -> Self {
         let recent_blocks_cache =
             RecentBlocksCache::new(recent_blocks_cache_capacity, chain.clone(), metrics.clone());
@@ -2182,7 +2370,6 @@ impl ChainStore {
             pool,
             chain,
             storage,
-            status,
             chain_head_update_sender,
             recent_blocks_cache,
             blocks_by_hash_cache,
@@ -2190,11 +2377,22 @@ impl ChainStore {
             ancestor_cache,
             chain_head_ptr_cache,
             chain_head_ptr_herd,
+            cache_size,
         }
     }
 
-    pub fn is_ingestible(&self) -> bool {
-        matches!(self.status, ChainStatus::Ingestible)
+    /// Return the block number below which blocks should be treated as
+    /// not cached. Returns `0` when the feature is disabled (effectively
+    /// no cutoff). Returns `i32::MAX` when no chain head is known to
+    /// avoid serving stale data.
+    async fn cache_cutoff(self: &Arc<Self>) -> BlockNumber {
+        if !ENV_VARS.store.ignore_block_cache {
+            return 0;
+        }
+        match self.clone().chain_head_ptr().await {
+            Ok(Some(head)) => head.block_number().saturating_sub(self.cache_size),
+            _ => i32::MAX,
+        }
     }
 
     /// Execute a cached query, avoiding thundering herd for identical requests.
@@ -2221,24 +2419,21 @@ impl ChainStore {
         use public::ethereum_networks::dsl::*;
 
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
-            async move {
-                insert_into(ethereum_networks)
-                    .values((
-                        name.eq(&self.chain),
-                        namespace.eq(&self.storage),
-                        head_block_hash.eq::<Option<String>>(None),
-                        head_block_number.eq::<Option<i64>>(None),
-                        net_version.eq(&ident.net_version),
-                        genesis_block_hash.eq(ident.genesis_block_hash.hash_hex()),
-                    ))
-                    .on_conflict(name)
-                    .do_nothing()
-                    .execute(conn)
-                    .await?;
-                self.storage.create(conn).await
-            }
-            .scope_boxed()
+        conn.transaction(async move |conn| {
+            insert_into(ethereum_networks)
+                .values((
+                    name.eq(&self.chain),
+                    namespace.eq(&self.storage),
+                    head_block_hash.eq::<Option<String>>(None),
+                    head_block_number.eq::<Option<i64>>(None),
+                    net_version.eq(&ident.net_version),
+                    genesis_block_hash.eq(ident.genesis_block_hash.hash_hex()),
+                ))
+                .on_conflict(name)
+                .do_nothing()
+                .execute(conn)
+                .await?;
+            self.storage.create(conn).await
         })
         .await?;
 
@@ -2248,15 +2443,12 @@ impl ChainStore {
     pub async fn update_name(&self, name: &str) -> Result<(), Error> {
         use public::ethereum_networks as n;
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
-            async {
-                update(n::table.filter(n::name.eq(&self.chain)))
-                    .set(n::name.eq(name))
-                    .execute(conn)
-                    .await?;
-                Ok(())
-            }
-            .scope_boxed()
+        conn.transaction(async |conn| {
+            update(n::table.filter(n::name.eq(&self.chain)))
+                .set(n::name.eq(name))
+                .execute(conn)
+                .await?;
+            Ok(())
         })
         .await
     }
@@ -2266,16 +2458,12 @@ impl ChainStore {
         use public::ethereum_networks as n;
 
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
-            async {
-                self.storage.drop_storage(conn, &self.chain).await?;
-
-                delete(n::table.filter(n::name.eq(&self.chain)))
-                    .execute(conn)
-                    .await?;
-                Ok(())
-            }
-            .scope_boxed()
+        conn.transaction(async |conn| {
+            self.storage.drop_storage(conn, &self.chain).await?;
+            delete(n::table.filter(n::name.eq(&self.chain)))
+                .execute(conn)
+                .await?;
+            Ok(())
         })
         .await
     }
@@ -2422,15 +2610,20 @@ impl ChainStore {
         self: &Arc<Self>,
         hashes: Vec<BlockHash>,
     ) -> Result<Vec<JsonBlock>, StoreError> {
+        let cutoff = self.cache_cutoff().await;
         let mut conn = self.pool.get_permitted().await?;
         let values = self.storage.blocks(&mut conn, &self.chain, &hashes).await?;
-        Ok(values)
+        Ok(values
+            .into_iter()
+            .filter(|b| b.ptr.block_number() >= cutoff)
+            .collect())
     }
 
     async fn blocks_from_store_by_numbers(
         self: &Arc<Self>,
         numbers: Vec<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<JsonBlock>>, StoreError> {
+        let cutoff = self.cache_cutoff().await;
         let mut conn = self.pool.get_permitted().await?;
         let values = self
             .storage
@@ -2439,7 +2632,10 @@ impl ChainStore {
 
         let mut block_map = BTreeMap::new();
 
-        for block in values {
+        for block in values
+            .into_iter()
+            .filter(|b| b.ptr.block_number() >= cutoff)
+        {
             let block_number = block.ptr.block_number();
             block_map
                 .entry(block_number)
@@ -2487,8 +2683,8 @@ impl ChainStore {
 
         let hash = ptr.hash_hex();
         let number = ptr.number as i64;
-        conn.transaction::<(Option<B256>, Option<(String, i64)>), StoreError, _>(|conn| {
-            async move {
+        conn.transaction::<(Option<B256>, Option<(String, i64)>), StoreError, _>(
+            async move |conn| {
                 update(n::table.filter(n::name.eq(&self.chain)))
                     .set((
                         n::head_block_hash.eq(&hash),
@@ -2497,9 +2693,8 @@ impl ChainStore {
                     .execute(conn)
                     .await?;
                 Ok((None, Some((hash, number))))
-            }
-            .scope_boxed()
-        })
+            },
+        )
         .await
     }
 
@@ -2616,24 +2811,21 @@ impl ChainHeadStore for ChainStore {
         self.chain_head_update_sender.send(&hash, number).await?;
 
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
-            async {
-                self.storage
-                    .upsert_block(conn, &self.chain, block.as_ref(), true)
-                    .await?;
+        conn.transaction(async |conn| {
+            self.storage
+                .upsert_block(conn, &self.chain, block.as_ref(), true)
+                .await?;
 
-                update(n::table.filter(n::name.eq(&self.chain)))
-                    .set((
-                        n::head_block_hash.eq(&hash),
-                        n::head_block_number.eq(number),
-                        n::head_block_cursor.eq(cursor),
-                    ))
-                    .execute(conn)
-                    .await?;
+            update(n::table.filter(n::name.eq(&self.chain)))
+                .set((
+                    n::head_block_hash.eq(&hash),
+                    n::head_block_number.eq(number),
+                    n::head_block_cursor.eq(cursor),
+                ))
+                .execute(conn)
+                .await?;
 
-                Ok::<(), StoreError>(())
-            }
-            .scope_boxed()
+            Ok::<(), StoreError>(())
         })
         .await?;
         Ok(())
@@ -2654,15 +2846,15 @@ impl ChainStoreTrait for ChainStore {
     async fn upsert_block(&self, block: Arc<dyn Block>) -> Result<(), Error> {
         // We should always have the parent block available to us at this point.
         if let Some(parent_hash) = block.parent_hash() {
-            let block = JsonBlock::new(block.ptr(), parent_hash, block.data().ok());
-            self.recent_blocks_cache.insert_block(block);
+            let json_block = JsonBlock::new(block.ptr(), parent_hash, block.data().ok());
+            self.recent_blocks_cache.insert_json_block(json_block);
         }
 
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
+        conn.transaction(async |conn| {
             self.storage
                 .upsert_block(conn, &self.chain, block.as_ref(), true)
-                .scope_boxed()
+                .await
         })
         .await
         .map_err(Error::from)
@@ -2695,126 +2887,130 @@ impl ChainStoreTrait for ChainStore {
         self: Arc<Self>,
         numbers: Vec<BlockNumber>,
     ) -> Result<BTreeMap<BlockNumber, Vec<ExtendedBlockPtr>>, Error> {
-        let result = if ENV_VARS.store.disable_block_cache_for_lookup {
+        if ENV_VARS.store.disable_block_cache_for_lookup {
             let values = self.blocks_from_store_by_numbers(numbers).await?;
 
-            values
-        } else {
-            let cached = self.recent_blocks_cache.get_block_ptrs_by_numbers(&numbers);
-
-            let stored = if cached.len() < numbers.len() {
-                let missing_numbers = numbers
-                    .iter()
-                    .filter(|num| !cached.iter().any(|(ptr, _)| ptr.block_number() == **num))
-                    .cloned()
-                    .collect::<Vec<_>>();
-
-                let this = self.clone();
-                let missing_clone = missing_numbers.clone();
-                let (res, _) = self
-                    .cached_lookup(&self.blocks_by_number_cache, &missing_numbers, async move {
-                        this.blocks_from_store_by_numbers(missing_clone).await
-                    })
-                    .await;
-
-                match res {
-                    Ok(blocks) => {
-                        for blocks_for_num in blocks.values() {
-                            if blocks.len() == 1 {
-                                self.recent_blocks_cache
-                                    .insert_block(blocks_for_num[0].clone());
-                            }
+            let ptrs = values
+                .into_iter()
+                .map(|(num, blocks)| {
+                    let ptrs = blocks
+                        .into_iter()
+                        .filter_map(|block| json_block_to_block_ptr_ext(&block).ok())
+                        .collect();
+                    (num, ptrs)
+                })
+                .collect();
+
+            return Ok(ptrs);
+        }
+
+        let cached = self.recent_blocks_cache.get_block_ptrs_by_numbers(&numbers);
+
+        let stored = if cached.len() < numbers.len() {
+            let missing_numbers = numbers
+                .iter()
+                .filter(|num| !cached.iter().any(|(ptr, _)| ptr.block_number() == **num))
+                .cloned()
+                .collect::<Vec<_>>();
+
+            let this = self.clone();
+            let missing_clone = missing_numbers.clone();
+            let (res, _) = self
+                .cached_lookup(&self.blocks_by_number_cache, &missing_numbers, async move {
+                    this.blocks_from_store_by_numbers(missing_clone).await
+                })
+                .await;
+
+            match res {
+                Ok(blocks) => {
+                    for blocks_for_num in blocks.values() {
+                        if blocks_for_num.len() == 1 {
+                            self.recent_blocks_cache
+                                .insert_json_block(blocks_for_num[0].clone());
                         }
-                        blocks
-                    }
-                    Err(e) => {
-                        return Err(e.into());
                     }
+                    blocks
+                }
+                Err(e) => {
+                    return Err(e.into());
                 }
-            } else {
-                BTreeMap::new()
-            };
-
-            let cached_map = cached
-                .into_iter()
-                .map(|(ptr, data)| (ptr.block_number(), vec![data]))
-                .collect::<BTreeMap<_, _>>();
-
-            let mut result = cached_map;
-            for (num, blocks) in stored {
-                result.entry(num).or_insert(blocks);
             }
-
-            result
+        } else {
+            BTreeMap::new()
         };
 
-        let ptrs = result
+        let cached_map: BTreeMap<BlockNumber, Vec<ExtendedBlockPtr>> = cached
             .into_iter()
-            .map(|(num, blocks)| {
-                let ptrs = blocks
-                    .into_iter()
-                    .filter_map(|block| json_block_to_block_ptr_ext(&block).ok())
-                    .collect();
-                (num, ptrs)
+            .filter_map(|(_, block)| {
+                block
+                    .to_extended_block_ptr()
+                    .ok()
+                    .map(|ptr| (block.ptr.number, vec![ptr]))
             })
             .collect();
 
-        Ok(ptrs)
+        let mut result = cached_map;
+        for (num, json_blocks) in stored {
+            let ptrs: Vec<_> = json_blocks
+                .into_iter()
+                .filter_map(|block| json_block_to_block_ptr_ext(&block).ok())
+                .collect();
+            result.entry(num).or_insert(ptrs);
+        }
+
+        Ok(result)
     }
 
-    async fn blocks(self: Arc<Self>, hashes: Vec<BlockHash>) -> Result<Vec<json::Value>, Error> {
+    async fn blocks(self: Arc<Self>, hashes: Vec<BlockHash>) -> Result<Vec<CachedBlock>, Error> {
         if ENV_VARS.store.disable_block_cache_for_lookup {
             let values = self
                 .blocks_from_store(hashes)
                 .await?
                 .into_iter()
-                .filter_map(|block| block.data)
+                .filter_map(|block| block.data.and_then(CachedBlock::from_json))
                 .collect();
-            Ok(values)
-        } else {
-            let cached = self.recent_blocks_cache.get_blocks_by_hash(&hashes);
-            let stored = if cached.len() < hashes.len() {
-                let hashes = hashes
-                    .iter()
-                    .filter(|hash| !cached.iter().any(|(ptr, _)| &ptr.hash == *hash))
-                    .cloned()
-                    .collect::<Vec<_>>();
-                // We key this off the entire list of hashes, which means
-                // that concurrent attempts that look up `[h1, h2]` and
-                // `[h1, h3]` will still run two queries and duplicate the
-                // lookup of `h1`. Noticing that the two requests should be
-                // serialized would require a lot more work, and going to
-                // the database for one block hash, `h3`, is not much faster
-                // than looking up `[h1, h3]` though it would require less
-                // IO bandwidth
-                let this = self.clone();
-                let hashes_clone = hashes.clone();
-                let (res, _) = self
-                    .cached_lookup(&self.blocks_by_hash_cache, &hashes, async move {
-                        this.blocks_from_store(hashes_clone).await
-                    })
-                    .await;
-
-                match res {
-                    Ok(blocks) => {
-                        for block in &blocks {
-                            self.recent_blocks_cache.insert_block(block.clone());
-                        }
-                        blocks
-                    }
-                    Err(e) => {
-                        return Err(e.into());
-                    }
+            return Ok(values);
+        }
+
+        let cached = self.recent_blocks_cache.get_blocks_by_hash(&hashes);
+        let stored = if cached.len() < hashes.len() {
+            let hashes = hashes
+                .iter()
+                .filter(|hash| !cached.iter().any(|(ptr, _)| &ptr.hash == *hash))
+                .cloned()
+                .collect::<Vec<_>>();
+            // We key this off the entire list of hashes, which means
+            // that concurrent attempts that look up `[h1, h2]` and
+            // `[h1, h3]` will still run two queries and duplicate the
+            // lookup of `h1`. Noticing that the two requests should be
+            // serialized would require a lot more work, and going to
+            // the database for one block hash, `h3`, is not much faster
+            // than looking up `[h1, h3]` though it would require less
+            // IO bandwidth
+            let this = self.clone();
+            let hashes_clone = hashes.clone();
+            let (res, _) = self
+                .cached_lookup(&self.blocks_by_hash_cache, &hashes, async move {
+                    this.blocks_from_store(hashes_clone).await
+                })
+                .await;
+
+            match res {
+                Ok(blocks) => blocks
+                    .into_iter()
+                    .filter_map(|block| self.recent_blocks_cache.insert_json_block(block))
+                    .collect(),
+                Err(e) => {
+                    return Err(e.into());
                 }
-            } else {
-                Vec::new()
-            };
+            }
+        } else {
+            Vec::new()
+        };
 
-            let mut result = cached.into_iter().map(|(_, data)| data).collect::<Vec<_>>();
-            let stored = stored.into_iter().filter_map(|block| block.data);
-            result.extend(stored);
-            Ok(result)
-        }
+        let mut result: Vec<CachedBlock> = cached.into_iter().map(|(_, data)| data).collect();
+        result.extend(stored);
+        Ok(result)
     }
 
     async fn ancestor_block(
@@ -2822,7 +3018,7 @@ impl ChainStoreTrait for ChainStore {
         block_ptr: BlockPtr,
         offset: BlockNumber,
         root: Option<BlockHash>,
-    ) -> Result<Option<(json::Value, BlockPtr)>, Error> {
+    ) -> Result<Option<(CachedBlock, BlockPtr)>, Error> {
         ensure!(
             block_ptr.number >= offset,
             "block offset {} for block `{}` points to before genesis block",
@@ -2830,6 +3026,12 @@ impl ChainStoreTrait for ChainStore {
             block_ptr.hash_hex()
         );
 
+        let target_number = block_ptr.block_number() - offset;
+        let cutoff = self.cache_cutoff().await;
+        if target_number < cutoff {
+            return Ok(None);
+        }
+
         // Use herd cache to avoid thundering herd when multiple callers
         // request the same ancestor block simultaneously. The cache check
         // is inside the future so that only one caller checks and populates
@@ -2851,29 +3053,31 @@ impl ChainStoreTrait for ChainStore {
 
                 // Cache miss, query the database
                 let mut conn = this.pool.get_permitted().await?;
-                let result = this
+                let json_result = this
                     .storage
                     .ancestor_block(&mut conn, block_ptr_clone, offset, root_clone)
                     .await
                     .map_err(StoreError::from)?;
 
-                // Insert into cache if we got a result
-                if let Some((ref data, ref ptr)) = result {
-                    // Extract parent_hash from data["block"]["parentHash"] or
-                    // data["parentHash"]
-                    if let Some(parent_hash) = data
-                        .get("block")
-                        .unwrap_or(data)
-                        .get("parentHash")
-                        .and_then(|h| h.as_str())
-                        .and_then(|h| h.parse().ok())
-                    {
-                        let block = JsonBlock::new(ptr.clone(), parent_hash, Some(data.clone()));
-                        this.recent_blocks_cache.insert_block(block);
+                // Insert into cache and reuse the typed block
+                match json_result {
+                    Some((data, ptr)) => {
+                        let cached = if let Some(parent_hash) = data
+                            .get("block")
+                            .unwrap_or(&data)
+                            .get("parentHash")
+                            .and_then(|h| h.as_str())
+                            .and_then(|h| h.parse().ok())
+                        {
+                            let json_block = JsonBlock::new(ptr.clone(), parent_hash, Some(data));
+                            this.recent_blocks_cache.insert_json_block(json_block)
+                        } else {
+                            CachedBlock::from_json(data)
+                        };
+                        Ok(cached.map(|c| (c, ptr)))
                     }
+                    None => Ok(None),
                 }
-
-                Ok(result)
             })
             .await;
         let result = res?;
@@ -2888,6 +3092,47 @@ impl ChainStoreTrait for ChainStore {
         Ok(result)
     }
 
+    async fn ancestor_block_ptr(
+        self: Arc<Self>,
+        block_ptr: BlockPtr,
+        offset: BlockNumber,
+        root: Option<BlockHash>,
+    ) -> Result<Option<BlockPtr>, Error> {
+        ensure!(
+            block_ptr.number >= offset,
+            "block offset {} for block `{}` points to before genesis block",
+            offset,
+            block_ptr.hash_hex()
+        );
+
+        // Check the in-memory cache first.
+        if let Some((ptr, _)) = self.recent_blocks_cache.get_ancestor(&block_ptr, offset) {
+            return Ok(Some(ptr));
+        }
+
+        // Cache miss, query the database (CTE only, no data fetch).
+        let mut conn = self.pool.get_permitted().await?;
+        self.storage
+            .ancestor_block_ptr(&mut conn, block_ptr, offset, root)
+            .await
+    }
+
+    async fn block_parent_ptr(
+        self: Arc<Self>,
+        hash: &BlockHash,
+    ) -> Result<Option<BlockPtr>, Error> {
+        // Check the in-memory cache first.
+        if let Some(parent_ptr) = self.recent_blocks_cache.get_parent_ptr_by_hash(hash) {
+            return Ok(Some(parent_ptr));
+        }
+
+        // Cache miss, query the database.
+        let mut conn = self.pool.get_permitted().await?;
+        self.storage
+            .block_parent_ptr(&mut conn, &self.chain, hash)
+            .await
+    }
+
     async fn cleanup_cached_blocks(
         &self,
         ancestor_count: BlockNumber,
@@ -3020,13 +3265,89 @@ impl ChainStoreTrait for ChainStore {
 
     async fn clear_stale_call_cache(
         &self,
-        ttl_days: i32,
-        ttl_max_contracts: Option<i64>,
-    ) -> Result<(), Error> {
+        ttl_days: usize,
+        max_contracts: Option<usize>,
+    ) -> Result<StaleCallCacheResult, Error> {
+        const LOG_INTERVAL: Duration = Duration::from_mins(5);
+
         let conn = &mut self.pool.get_permitted().await?;
+
+        let logger = self.logger.new(o!("component" => "CallCacheCleanup"));
+
         self.storage
-            .clear_stale_call_cache(conn, &self.logger, ttl_days, ttl_max_contracts)
-            .await
+            .ensure_contract_address_index(conn, &self.logger)
+            .await?;
+
+        let ttl_days = ttl_days as i64;
+        let effective_ttl = match max_contracts {
+            Some(max) => {
+                self.storage
+                    .effective_ttl(conn, ttl_days, max as i64)
+                    .await?
+            }
+            None => ttl_days,
+        };
+
+        if effective_ttl != ttl_days {
+            info!(
+                logger,
+                "adjusted ttl from {} to {} days to stay within {} contracts",
+                ttl_days,
+                effective_ttl,
+                max_contracts.unwrap()
+            );
+        }
+
+        let mut total_deleted: usize = 0;
+        let mut batch_count: usize = 0;
+        let mut batch_size = AdaptiveBatchSize::with_size(100);
+        let mut last_log = Instant::now();
+
+        loop {
+            let current_size = batch_size.size;
+            let start = Instant::now();
+            let deleted = self
+                .storage
+                .delete_stale_calls_batch(conn, effective_ttl, current_size)
+                .await?;
+
+            batch_size.adapt(start.elapsed());
+            total_deleted += deleted;
+            batch_count += 1;
+
+            if last_log.elapsed() >= LOG_INTERVAL {
+                info!(
+                    logger,
+                    "deleted {} entries in this batch \
+                     ({} total in {} batches, batch_size now {})",
+                    deleted,
+                    total_deleted,
+                    batch_count,
+                    batch_size.size
+                );
+                last_log = Instant::now();
+            }
+
+            if (deleted as i64) < current_size {
+                break;
+            }
+        }
+
+        let contracts_deleted = self.storage.delete_stale_meta(conn, effective_ttl).await?;
+
+        info!(
+            logger,
+            "deleted {} cache entries and {} contract entries in {} batches",
+            total_deleted,
+            contracts_deleted,
+            batch_count
+        );
+
+        Ok(StaleCallCacheResult {
+            effective_ttl_days: effective_ttl as usize,
+            cache_entries_deleted: total_deleted,
+            contracts_deleted,
+        })
     }
 
     async fn transaction_receipts_in_block(
@@ -3071,20 +3392,28 @@ mod recent_blocks_cache {
         // entries. If there are multiple writes for the same block number,
         // the last one wins. Note that because of NEAR, the block numbers
         // might have gaps.
-        blocks: BTreeMap<BlockNumber, JsonBlock>,
+        blocks: BTreeMap<BlockNumber, CacheBlock>,
         // We only store these many blocks.
         capacity: usize,
     }
 
     impl Inner {
-        fn get_block_by_hash(&self, hash: &BlockHash) -> Option<(&BlockPtr, &json::Value)> {
+        fn get_block_by_hash(&self, hash: &BlockHash) -> Option<(&BlockPtr, &CachedBlock)> {
             self.blocks
                 .values()
                 .find(|block| &block.ptr.hash == hash)
                 .and_then(|block| block.data.as_ref().map(|data| (&block.ptr, data)))
         }
 
-        fn get_block_by_number(&self, number: BlockNumber) -> Option<&JsonBlock> {
+        fn get_parent_ptr_by_hash(&self, hash: &BlockHash) -> Option<BlockPtr> {
+            let block = self.blocks.values().find(|b| &b.ptr.hash == hash)?;
+            self.blocks
+                .values()
+                .find(|b| b.ptr.hash == block.parent_hash)
+                .map(|parent| parent.ptr.clone())
+        }
+
+        fn get_block_by_number(&self, number: BlockNumber) -> Option<&CacheBlock> {
             self.blocks.get(&number)
         }
 
@@ -3092,7 +3421,7 @@ mod recent_blocks_cache {
             &self,
             child_ptr: &BlockPtr,
             offset: BlockNumber,
-        ) -> Option<(&BlockPtr, Option<&json::Value>)> {
+        ) -> Option<(&BlockPtr, Option<&CachedBlock>)> {
             let child = self.blocks.get(&child_ptr.number)?;
             if &child.ptr != child_ptr {
                 return None;
@@ -3113,7 +3442,7 @@ mod recent_blocks_cache {
             self.blocks.last_key_value().map(|b| &b.1.ptr)
         }
 
-        fn earliest_block(&self) -> Option<&JsonBlock> {
+        fn earliest_block(&self) -> Option<&CacheBlock> {
             self.blocks.first_key_value().map(|b| b.1)
         }
 
@@ -3143,7 +3472,7 @@ mod recent_blocks_cache {
                 .set(self.chain_head().map(|b| b.number).unwrap_or(0) as f64);
         }
 
-        fn insert_block(&mut self, block: JsonBlock) {
+        fn insert_block(&mut self, block: CacheBlock) {
             self.blocks.insert(block.ptr.number, block);
             self.evict_if_necessary();
         }
@@ -3183,7 +3512,7 @@ mod recent_blocks_cache {
             &self,
             child: &BlockPtr,
             offset: BlockNumber,
-        ) -> Option<(BlockPtr, Option<json::Value>)> {
+        ) -> Option<(BlockPtr, Option<CachedBlock>)> {
             let block_opt = self
                 .inner
                 .read()
@@ -3200,7 +3529,18 @@ mod recent_blocks_cache {
             block_opt
         }
 
-        pub fn get_blocks_by_hash(&self, hashes: &[BlockHash]) -> Vec<(BlockPtr, json::Value)> {
+        pub fn get_parent_ptr_by_hash(&self, hash: &BlockHash) -> Option<BlockPtr> {
+            let inner = self.inner.read();
+            let result = inner.get_parent_ptr_by_hash(hash);
+            if result.is_some() {
+                inner.metrics.record_cache_hit(&inner.network);
+            } else {
+                inner.metrics.record_cache_miss(&inner.network);
+            }
+            result
+        }
+
+        pub fn get_blocks_by_hash(&self, hashes: &[BlockHash]) -> Vec<(BlockPtr, CachedBlock)> {
             let inner = self.inner.read();
             let blocks: Vec<_> = hashes
                 .iter()
@@ -3218,9 +3558,9 @@ mod recent_blocks_cache {
         pub fn get_block_ptrs_by_numbers(
             &self,
             numbers: &[BlockNumber],
-        ) -> Vec<(BlockPtr, JsonBlock)> {
+        ) -> Vec<(BlockPtr, CacheBlock)> {
             let inner = self.inner.read();
-            let mut blocks: Vec<(BlockPtr, JsonBlock)> = Vec::new();
+            let mut blocks: Vec<(BlockPtr, CacheBlock)> = Vec::new();
 
             for &number in numbers {
                 if let Some(block) = inner.get_block_by_number(number) {
@@ -3241,11 +3581,20 @@ mod recent_blocks_cache {
         /// its associated `data`. Note that for this to work, `child` must be
         /// in the cache already. The first block in the cache should be
         /// inserted via [`RecentBlocksCache::set_chain_head`].
-        pub(super) fn insert_block(&self, block: JsonBlock) {
+        pub(super) fn insert_block(&self, block: CacheBlock) {
             self.inner.write().insert_block(block);
             self.inner.read().update_write_metrics();
         }
 
+        /// Deserialize a JsonBlock into a typed CacheBlock and insert it into the cache.
+        /// Returns the deserialized data so callers can reuse it without re-deserializing.
+        pub(super) fn insert_json_block(&self, block: JsonBlock) -> Option<CachedBlock> {
+            let cache_block = block.into_cache_block();
+            let data = cache_block.data.clone();
+            self.insert_block(cache_block);
+            data
+        }
+
         #[cfg(debug_assertions)]
         pub fn blocks(&self) -> Vec<(BlockPtr, BlockHash)> {
             self.inner
@@ -3294,22 +3643,19 @@ impl EthereumCallCache for ChainStore {
         let id = contract_call_id(req, &block);
         let conn = &mut self.pool.get_permitted().await?;
         let return_value = conn
-            .transaction::<_, Error, _>(|conn| {
-                async {
-                    if let Some((return_value, update_accessed_at)) =
-                        self.storage.get_call_and_access(conn, id.as_ref()).await?
-                    {
-                        if update_accessed_at {
-                            self.storage
-                                .update_accessed_at(conn, req.address.as_ref())
-                                .await?;
-                        }
-                        Ok(Some(return_value))
-                    } else {
-                        Ok(None)
+            .transaction::<_, Error, _>(async |conn| {
+                if let Some((return_value, update_accessed_at)) =
+                    self.storage.get_call_and_access(conn, id.as_ref()).await?
+                {
+                    if update_accessed_at {
+                        self.storage
+                            .update_accessed_at(conn, req.address.as_ref())
+                            .await?;
                     }
+                    Ok(Some(return_value))
+                } else {
+                    Ok(None)
                 }
-                .scope_boxed()
             })
             .await?;
         Ok(return_value.map(|return_value| {
@@ -3335,10 +3681,8 @@ impl EthereumCallCache for ChainStore {
 
         let conn = &mut self.pool.get_permitted().await?;
         let rows = conn
-            .transaction::<_, Error, _>(|conn| {
-                self.storage
-                    .get_calls_and_access(conn, &id_refs)
-                    .scope_boxed()
+            .transaction::<_, Error, _>(async |conn| {
+                self.storage.get_calls_and_access(conn, &id_refs).await
             })
             .await?;
 
@@ -3368,8 +3712,8 @@ impl EthereumCallCache for ChainStore {
 
     async fn get_calls_in_block(&self, block: BlockPtr) -> Result<Vec<CachedEthereumCall>, Error> {
         let conn = &mut self.pool.get_permitted().await?;
-        conn.transaction::<_, Error, _>(|conn| {
-            self.storage.get_calls_in_block(conn, block).scope_boxed()
+        conn.transaction::<_, Error, _>(async |conn| {
+            self.storage.get_calls_in_block(conn, block).await
         })
         .await
     }
@@ -3401,7 +3745,7 @@ impl EthereumCallCache for ChainStore {
 
         let id = contract_call_id(&call, &block);
         let conn = &mut self.pool.get_permitted().await?;
-        conn.transaction::<_, anyhow::Error, _>(|conn| {
+        conn.transaction::<_, anyhow::Error, _>(async |conn| {
             self.storage
                 .set_call(
                     conn,
@@ -3410,7 +3754,7 @@ impl EthereumCallCache for ChainStore {
                     block.number,
                     &return_value,
                 )
-                .scope_boxed()
+                .await
         })
         .await?;
         Ok(())
diff --git a/store/postgres/src/copy.rs b/store/postgres/src/copy.rs
index 54c1a03a896..d35e585a653 100644
--- a/store/postgres/src/copy.rs
+++ b/store/postgres/src/copy.rs
@@ -12,49 +12,40 @@
 //! operation can resume after an interruption, for example, because
 //! `graph-node` was restarted while the copy was running.
 use std::{
+    collections::HashSet,
     convert::TryFrom,
     future::Future,
     pin::Pin,
     sync::{
-        atomic::{AtomicBool, AtomicI64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, AtomicI64, Ordering},
     },
     time::{Duration, Instant},
 };
 
 use diesel::{
-    dsl::sql, insert_into, select, sql_query, update, ExpressionMethods, OptionalExtension,
-    QueryDsl,
-};
-use diesel_async::{
-    scoped_futures::{ScopedBoxFuture, ScopedFutureExt},
-    AsyncConnection,
+    ExpressionMethods, OptionalExtension, QueryDsl, dsl::sql, insert_into, select, update,
 };
-use diesel_async::{RunQueryDsl, SimpleAsyncConnection};
+use diesel_async::{AsyncConnection, RunQueryDsl, SimpleAsyncConnection};
 
+use crate::{
+    AsyncPgConnection, ConnectionPool, advisory_lock, catalog, deployment,
+    dynds::DataSourcesTable,
+    pool::TxnCallback,
+    primary::{DeploymentId, Primary, Site},
+    relational::{Layout, Table, index::IndexList},
+    relational_queries as rq,
+    vid_batcher::{VidBatcher, VidRange},
+};
 use graph::{
-    futures03::{
-        future::{select_all, BoxFuture},
-        FutureExt as _,
-    },
+    futures03::{FutureExt as _, future::select_all},
     internal_error,
     prelude::{
-        info, lazy_static, o, warn, BlockNumber, BlockPtr, CheapClone, Logger, StoreError, ENV_VARS,
+        BlockNumber, BlockPtr, CheapClone, ENV_VARS, Logger, StoreError, info, lazy_static, o, warn,
     },
     schema::EntityType,
     slog::error,
 };
-use itertools::Itertools;
-
-use crate::{
-    advisory_lock, catalog, deployment,
-    dynds::DataSourcesTable,
-    primary::{DeploymentId, Primary, Site},
-    relational::{index::IndexList, Layout, Table},
-    relational_queries as rq,
-    vid_batcher::{VidBatcher, VidRange},
-    AsyncPgConnection, ConnectionPool,
-};
 
 const LOG_INTERVAL: Duration = Duration::from_secs(3 * 60);
 
@@ -151,7 +142,8 @@ impl CopyState {
                         src.site.deployment,
                         dst.site.deployment,
                         stored_target_block,
-                        target_block));
+                        target_block
+                    ));
                 }
                 if src_id != src.site.id {
                     return Err(internal_error!(
@@ -178,7 +170,14 @@ impl CopyState {
         dst: Arc<Layout>,
         target_block: BlockPtr,
     ) -> Result<CopyState, StoreError> {
-        let tables = TableState::load(conn, primary, src.as_ref(), dst.as_ref()).await?;
+        let tables = TableState::load(
+            conn,
+            primary,
+            src.as_ref(),
+            dst.as_ref(),
+            target_block.number,
+        )
+        .await?;
         let (finished, mut unfinished): (Vec<_>, Vec<_>) =
             tables.into_iter().partition(|table| table.finished());
         unfinished.sort_by_key(|table| table.dst.object.to_string());
@@ -299,6 +298,51 @@ impl CopyState {
     fn all_tables(&self) -> impl Iterator<Item = &TableState> {
         self.finished.iter().chain(self.unfinished.iter())
     }
+
+    /// Create the indexes that were postponed at the start of the
+    /// copy/graft operation: first the ones that existed in the source
+    /// subgraph, then any indexes for new fields that don't exist in the
+    /// source.
+    async fn create_indexes(
+        &self,
+        conn: &mut AsyncPgConnection,
+        index_list: &IndexList,
+    ) -> Result<(), StoreError> {
+        let creat = self.dst.index_creator(false, true);
+        let dst_nsp = self.dst.site.namespace.to_string();
+
+        // Create the indexes that existed in the source subgraph
+        for table in self.all_tables() {
+            let idxs = index_list
+                .indexes_for_table(&table.dst)
+                .filter(|idx| idx.to_postpone())
+                .map(|idx| idx.with_nsp(dst_nsp.clone()))
+                .collect::<Result<Vec<_>, _>>()?;
+
+            creat.execute_many(conn, &idxs).await?;
+        }
+
+        // Create indexes for new fields that don't exist in the source
+        for table in self.all_tables() {
+            let src_columns: HashSet<&str> =
+                table.src.columns.iter().map(|c| c.name.as_str()).collect();
+            let new_idxs: Vec<_> = table
+                .dst
+                .indexes(&self.dst.input_schema)
+                .map_err(|_| internal_error!("failed to generate indexes for copy"))?
+                .into_iter()
+                .filter(|idx| idx.to_postpone() && idx.references_column_not_in(&src_columns))
+                .collect();
+            creat.execute_many(conn, &new_idxs).await?;
+        }
+
+        conn.transaction(async |conn| {
+            deployment::set_postponed_indexes_created(conn, &self.dst.site).await
+        })
+        .await?;
+
+        Ok(())
+    }
 }
 
 pub(crate) async fn source(
@@ -329,6 +373,7 @@ struct TableState {
     dst_site: Arc<Site>,
     batcher: VidBatcher,
     duration_ms: i64,
+    target_block: BlockNumber,
 }
 
 impl TableState {
@@ -351,6 +396,7 @@ impl TableState {
             dst_site,
             batcher,
             duration_ms: 0,
+            target_block: target_block.number,
         })
     }
 
@@ -363,6 +409,7 @@ impl TableState {
         primary: Primary,
         src_layout: &Layout,
         dst_layout: &Layout,
+        target_block: BlockNumber,
     ) -> Result<Vec<TableState>, StoreError> {
         use copy_table_state as cts;
 
@@ -429,6 +476,7 @@ impl TableState {
                 dst_site: dst_layout.site.clone(),
                 batcher,
                 duration_ms,
+                target_block,
             };
             states.push(state);
         }
@@ -503,15 +551,20 @@ impl TableState {
     }
 
     async fn copy_batch(&mut self, conn: &mut AsyncPgConnection) -> Result<Status, StoreError> {
-        let (duration, count) = self
+        let (duration, count): (_, Option<i32>) = self
             .batcher
-            .step(async |start, end| {
-                let count =
-                    rq::CopyEntityBatchQuery::new(self.dst.as_ref(), &self.src, start, end)?
-                        .count_current()
-                        .get_result::<i64>(conn)
-                        .await
-                        .optional()?;
+            .step(async |start: i64, end: i64| {
+                let count = rq::CopyEntityBatchQuery::new(
+                    self.dst.as_ref(),
+                    &self.src,
+                    start,
+                    end,
+                    self.target_block,
+                )?
+                .count_current()
+                .get_result::<i64>(conn)
+                .await
+                .optional()?;
                 Ok(count.unwrap_or(0) as i32)
             })
             .await?;
@@ -806,14 +859,11 @@ impl CopyTableWorker {
                     }
 
                     match conn
-                        .transaction(|conn| {
-                            async {
-                                if let Some(timeout) = BATCH_STATEMENT_TIMEOUT.as_ref() {
-                                    conn.batch_execute(timeout).await?;
-                                }
-                                self.table.copy_batch(conn).await
+                        .transaction(async |conn| {
+                            if let Some(timeout) = BATCH_STATEMENT_TIMEOUT.as_ref() {
+                                conn.batch_execute(timeout).await?;
                             }
-                            .scope_boxed()
+                            self.table.copy_batch(conn).await
                         })
                         .await
                     {
@@ -852,7 +902,7 @@ impl CopyTableWorker {
                     // that is hard to predict. This mechanism ensures
                     // that if our estimation is wrong, the consequences
                     // aren't too severe.
-                    conn.transaction(|conn| self.table.set_batch_size(conn, 1).scope_boxed())
+                    conn.transaction(async |conn| self.table.set_batch_size(conn, 1).await)
                         .await?;
                 }
             };
@@ -1001,29 +1051,32 @@ impl Connection {
         })
     }
 
+    /// Run `callback` in a transaction using the connection in `self.conn`.
+    /// This will return an error if `self.conn` is `None`, which happens
+    /// while a background task is copying a table.
+    fn get_conn(&mut self) -> Result<&mut AsyncPgConnection, StoreError> {
+        let Some(conn) = self.conn.as_mut() else {
+            return Err(internal_error!(
+                "copy connection has been handed to background task but not returned yet (get_conn)"
+            ));
+        };
+        Ok(&mut conn.inner)
+    }
+
     /// Run `callback` in a transaction using the connection in `self.conn`.
     /// This will return an error if `self.conn` is `None`, which happens
     /// while a background task is copying a table.
     fn transaction<'a, 'conn, R, F>(
         &'conn mut self,
         callback: F,
-    ) -> Result<BoxFuture<'conn, Result<R, StoreError>>, StoreError>
+    ) -> Result<impl Future<Output = Result<R, StoreError>> + Send + 'conn, StoreError>
     where
-        F: for<'r> FnOnce(
-                &'r mut AsyncPgConnection,
-            ) -> ScopedBoxFuture<'a, 'r, Result<R, StoreError>>
-            + Send
-            + 'a,
+        F: TxnCallback<R, StoreError> + 'a,
         R: Send + 'a,
         'a: 'conn,
     {
-        let Some(conn) = self.conn.as_mut() else {
-            return Err(internal_error!(
-                "copy connection has been handed to background task but not returned yet (transaction)"
-            ));
-        };
-        let conn = &mut conn.inner;
-        Ok(conn.transaction(|conn| callback(conn).scope_boxed()))
+        let conn = self.get_conn()?;
+        Ok(conn.transaction(callback))
     }
 
     /// Copy private data sources if the source uses a schema version that
@@ -1033,19 +1086,19 @@ impl Connection {
         let src_manifest_idx_and_name = self.src_manifest_idx_and_name.cheap_clone();
         let dst_manifest_idx_and_name = self.dst_manifest_idx_and_name.cheap_clone();
         if state.src.site.schema_version.private_data_sources() {
-            self.transaction(|conn| {
-                async {
-                    DataSourcesTable::new(state.src.site.namespace.clone())
-                        .copy_to(
-                            conn,
-                            &DataSourcesTable::new(state.dst.site.namespace.clone()),
-                            state.target_block.number,
-                            &src_manifest_idx_and_name,
-                            &dst_manifest_idx_and_name,
-                        )
-                        .await
-                }
-                .scope_boxed()
+            let src_ns = state.src.site.namespace.clone();
+            let dst_ns = state.dst.site.namespace.clone();
+            let target_block = state.target_block.number;
+            self.transaction(async move |conn| {
+                DataSourcesTable::new(src_ns)
+                    .copy_to(
+                        conn,
+                        &DataSourcesTable::new(dst_ns),
+                        target_block,
+                        &src_manifest_idx_and_name,
+                        &dst_manifest_idx_and_name,
+                    )
+                    .await
             })?
             .await?;
         }
@@ -1144,8 +1197,8 @@ impl Connection {
         let target_block = self.target_block.clone();
         let primary = self.primary.cheap_clone();
         let mut state = self
-            .transaction(|conn| {
-                CopyState::new(conn, primary, src, dst, target_block).scope_boxed()
+            .transaction(async move |conn| {
+                CopyState::new(conn, primary, src, dst, target_block).await
             })?
             .await?;
 
@@ -1229,53 +1282,11 @@ impl Connection {
         }
         debug_assert!(self.conn.is_some());
 
-        // Create indexes for all the attributes that were postponed at the start of
-        // the copy/graft operations.
-        // First recreate the indexes that existed in the original subgraph.
-        for table in state.all_tables() {
-            let arr = index_list.indexes_for_table(
-                &self.dst.site.namespace,
-                &table.src.name.to_string(),
-                &table.dst,
-                true,
-                false,
-                true,
-            )?;
-
-            for (_, sql) in arr {
-                let query = sql_query(format!("{};", sql));
-                self.transaction(|conn| {
-                    async { query.execute(conn).await.map_err(StoreError::from) }.scope_boxed()
-                })?
-                .await?;
-            }
-        }
-
-        // Second create the indexes for the new fields.
-        // Here we need to skip those created in the first step for the old fields.
-        for table in state.all_tables() {
-            let orig_colums = table
-                .src
-                .columns
-                .iter()
-                .map(|c| c.name.to_string())
-                .collect_vec();
-            for sql in table
-                .dst
-                .create_postponed_indexes(orig_colums, false)
-                .into_iter()
-            {
-                let query = sql_query(sql);
-                self.transaction(|conn| {
-                    async { query.execute(conn).await.map_err(StoreError::from) }.scope_boxed()
-                })?
-                .await?;
-            }
-        }
+        state.create_indexes(self.get_conn()?, &index_list).await?;
 
         self.copy_private_data_sources(&state).await?;
 
-        self.transaction(|conn| state.finished(conn).scope_boxed())?
+        self.transaction(async |conn| state.finished(conn).await)?
             .await?;
         progress.finished();
 
diff --git a/store/postgres/src/deployment.rs b/store/postgres/src/deployment.rs
index 15e64321a99..76cde305bcb 100644
--- a/store/postgres/src/deployment.rs
+++ b/store/postgres/src/deployment.rs
@@ -1,7 +1,7 @@
 //! Utilities for dealing with deployment metadata. Any connection passed
 //! into these methods must be for the shard that holds the actual
 //! deployment data and metadata
-use crate::{advisory_lock, detail::GraphNodeVersion, primary::DeploymentId, AsyncPgConnection};
+use crate::{AsyncPgConnection, advisory_lock, detail::GraphNodeVersion, primary::DeploymentId};
 use diesel::{
     dsl::{count, delete, insert_into, now, select, sql, update},
     sql_types::{Bool, Integer},
@@ -18,7 +18,7 @@ use graph::{
     data::subgraph::schema::SubgraphError,
     env::ENV_VARS,
     schema::EntityType,
-    slog::{debug, Logger},
+    slog::{Logger, debug},
 };
 use graph::{components::store::StoreResult, semver::Version};
 use graph::{
@@ -26,7 +26,7 @@ use graph::{
     util::backoff::ExponentialBackoff,
 };
 use graph::{
-    prelude::{anyhow, hex, BlockNumber, BlockPtr, DeploymentHash, DeploymentState, StoreError},
+    prelude::{BlockNumber, BlockPtr, DeploymentHash, DeploymentState, StoreError, anyhow, hex},
     schema::InputSchema,
 };
 use stable_hash_legacy::crypto::SetHasher;
@@ -55,8 +55,8 @@ impl SubgraphHealth {
 
 impl From<SubgraphHealth> for graph::data::subgraph::schema::SubgraphHealth {
     fn from(health: SubgraphHealth) -> Self {
-        use graph::data::subgraph::schema::SubgraphHealth as H;
         use SubgraphHealth as Db;
+        use graph::data::subgraph::schema::SubgraphHealth as H;
 
         match health {
             Db::Failed => H::Failed,
@@ -166,6 +166,12 @@ table! {
 
         synced_at -> Nullable<Timestamptz>,
         synced_at_block_number -> Nullable<Int4>,
+
+        /// `true` once the postponed (deferred) attribute indexes have been
+        /// created. Persisted so that we create them exactly once even
+        /// across restarts, and so that we don't recreate indexes that an
+        /// external process removed because they were unused.
+        postponed_indexes_created -> Bool,
     }
 }
 
@@ -478,13 +484,13 @@ pub async fn transact_block(
     // `where` clause of the `update` statement, but that caused Postgres to use bitmap scans instead
     // of a simple primary key lookup. So a separate query it is.
     let block_ptr = block_ptr(conn, site).await?;
-    if let Some(block_ptr_from) = block_ptr {
-        if block_ptr_from.number >= ptr.number {
-            return Err(StoreError::DuplicateBlockProcessing(
-                site.deployment.clone(),
-                ptr.number,
-            ));
-        }
+    if let Some(block_ptr_from) = block_ptr
+        && block_ptr_from.number >= ptr.number
+    {
+        return Err(StoreError::DuplicateBlockProcessing(
+            site.deployment.clone(),
+            ptr.number,
+        ));
     }
 
     reset_reorg_count(conn, site).await?;
@@ -579,13 +585,12 @@ pub async fn get_subgraph_firehose_cursor(
 ) -> Result<Option<String>, StoreError> {
     use head as h;
 
-    let res = h::table
+    h::table
         .filter(h::id.eq(site.id))
         .select(h::firehose_cursor)
         .first::<Option<String>>(conn)
         .await
-        .map_err(StoreError::from);
-    res
+        .map_err(StoreError::from)
 }
 
 pub async fn revert_block_ptr(
@@ -833,6 +838,38 @@ pub async fn set_synced(
     Ok(())
 }
 
+/// Returns whether the postponed (deferred) attribute indexes have already
+/// been created for this deployment.
+pub async fn postponed_indexes_created(
+    conn: &mut AsyncPgConnection,
+    site: &Site,
+) -> Result<bool, StoreError> {
+    use deployment as d;
+
+    let created = d::table
+        .filter(d::id.eq(site.id))
+        .select(d::postponed_indexes_created)
+        .first::<bool>(conn)
+        .await?;
+    Ok(created)
+}
+
+/// Mark the postponed (deferred) attribute indexes as created for this
+/// deployment. Once set, we never recreate these indexes — even if an
+/// external process removes them.
+pub async fn set_postponed_indexes_created(
+    conn: &mut AsyncPgConnection,
+    site: &Site,
+) -> Result<(), StoreError> {
+    use deployment as d;
+
+    update(d::table.filter(d::id.eq(site.id)))
+        .set(d::postponed_indexes_created.eq(true))
+        .execute(conn)
+        .await?;
+    Ok(())
+}
+
 /// Returns `true` if the deployment (as identified by `site.id`)
 pub async fn exists(conn: &mut AsyncPgConnection, site: &Site) -> Result<bool, StoreError> {
     use deployment as d;
diff --git a/store/postgres/src/deployment_store.rs b/store/postgres/src/deployment_store.rs
index a9fcc833e99..d764d451ad6 100644
--- a/store/postgres/src/deployment_store.rs
+++ b/store/postgres/src/deployment_store.rs
@@ -1,22 +1,23 @@
 use detail::DeploymentDetail;
 use diesel::sql_query;
-use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection as _, RunQueryDsl, SimpleAsyncConnection};
+use graph::util::backoff::ExponentialBackoff;
 use tokio::task::JoinHandle;
 
 use graph::anyhow::Context;
-use graph::blockchain::block_stream::{EntitySourceOperation, FirehoseCursor};
 use graph::blockchain::BlockTime;
+use graph::blockchain::block_stream::{EntitySourceOperation, FirehoseCursor};
 use graph::components::store::write::RowGroup;
 use graph::components::store::{
-    Batch, DeploymentLocator, DerivedEntityQuery, PrunePhase, PruneReporter, PruneRequest,
-    PruningStrategy, QueryPermit, StoredDynamicDataSource, VersionStats,
+    Batch, DeploymentLocator, DerivedEntityQuery, DumpReporter, PrunePhase, PruneReporter,
+    PruneRequest, PruningStrategy, QueryPermit, RestoreReporter, StoredDynamicDataSource,
+    VersionStats,
 };
 use graph::components::versions::VERSIONS;
 use graph::data::graphql::IntoValue;
 use graph::data::query::Trace;
 use graph::data::store::{IdList, SqlQueryObject};
-use graph::data::subgraph::{status, SPEC_VERSION_0_0_6};
+use graph::data::subgraph::{SPEC_VERSION_0_0_6, status};
 use graph::data_source::CausalityRegion;
 use graph::derive::CheapClone;
 use graph::futures03::FutureExt;
@@ -30,8 +31,9 @@ use std::collections::{BTreeMap, HashMap};
 use std::convert::Into;
 use std::ops::Bound;
 use std::ops::{Deref, Range};
+use std::path::{Path, PathBuf};
 use std::str::FromStr;
-use std::sync::{atomic::AtomicUsize, Arc, Mutex};
+use std::sync::{Arc, Mutex, atomic::AtomicUsize};
 use std::time::{Duration, Instant};
 
 use graph::components::store::EntityCollection;
@@ -39,9 +41,9 @@ use graph::components::subgraph::{ProofOfIndexingFinisher, ProofOfIndexingVersio
 use graph::data::subgraph::schema::{DeploymentCreate, SubgraphError};
 use graph::internal_error;
 use graph::prelude::{
-    anyhow, debug, info, o, warn, AttributeNames, BlockNumber, BlockPtr, CheapClone,
-    DeploymentHash, DeploymentState, Entity, EntityQuery, Error, Logger, QueryExecutionError,
-    StopwatchMetrics, StoreError, UnfailOutcome, Value, ENV_VARS,
+    AttributeNames, BlockNumber, BlockPtr, CheapClone, DeploymentHash, DeploymentState, ENV_VARS,
+    Entity, EntityQuery, Error, Logger, QueryExecutionError, StopwatchMetrics, StoreError,
+    UnfailOutcome, Value, anyhow, debug, error, info, o, warn,
 };
 use graph::schema::{ApiSchema, EntityKey, EntityType, InputSchema};
 
@@ -50,11 +52,11 @@ use crate::deployment::{self, OnSync};
 use crate::detail::ErrorDetail;
 use crate::dynds::DataSourcesTable;
 use crate::primary::{DeploymentId, Primary};
-use crate::relational::index::{CreateIndex, IndexList, Method};
-use crate::relational::{self, Layout, LayoutCache, SqlName, Table, STATEMENT_TIMEOUT};
+use crate::relational::index::{CreateIndex, IndexCreator, IndexList, Method};
+use crate::relational::{self, Layout, LayoutCache, STATEMENT_TIMEOUT, SqlName, Table};
 use crate::relational_queries::{FromEntityData, JSONData};
-use crate::{advisory_lock, catalog, retry, AsyncPgConnection};
-use crate::{detail, ConnectionPool};
+use crate::{AsyncPgConnection, advisory_lock, catalog, retry};
+use crate::{ConnectionPool, detail};
 use crate::{dynds, primary::Site};
 
 /// When connected to read replicas, this allows choosing which DB server to use for an operation.
@@ -174,11 +176,6 @@ impl DeploymentStore {
         DeploymentStore(Arc::new(store))
     }
 
-    // Parameter index_def is used to copy over the definition of the indexes from the source subgraph
-    // to the destination one. This happens when it is set to Some. In this case also the BTree attribude
-    // indexes are created later on, when the subgraph has synced. In case this parameter is None, all
-    // indexes are created with the default creation strategy for a new subgraph, and also from the very
-    // start.
     pub(crate) async fn create_deployment(
         &self,
         schema: &InputSchema,
@@ -186,57 +183,51 @@ impl DeploymentStore {
         site: Arc<Site>,
         replace: bool,
         on_sync: OnSync,
-        index_def: Option<IndexList>,
     ) -> Result<(), StoreError> {
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction::<_, StoreError, _>(|conn| {
-            async {
-                let exists = deployment::exists(conn, &site).await?;
-
-                // Create (or update) the metadata. Update only happens in tests
-                let entities_with_causality_region =
-                    deployment.manifest.entities_with_causality_region.clone();
-
-                // If `GRAPH_HISTORY_BLOCKS_OVERRIDE` is set, override the history_blocks
-                // setting with the value of the environment variable.
-                let deployment = if let Some(history_blocks_global_override) =
-                    ENV_VARS.history_blocks_override
-                {
+        conn.transaction::<_, StoreError, _>(async |conn| {
+            let exists = deployment::exists(conn, &site).await?;
+
+            // Create (or update) the metadata. Update only happens in tests
+            let entities_with_causality_region =
+                deployment.manifest.entities_with_causality_region.clone();
+
+            // If `GRAPH_HISTORY_BLOCKS_OVERRIDE` is set, override the history_blocks
+            // setting with the value of the environment variable.
+            let deployment =
+                if let Some(history_blocks_global_override) = ENV_VARS.history_blocks_override {
                     deployment.with_history_blocks_override(history_blocks_global_override)
                 } else {
                     deployment
                 };
 
-                if replace || !exists {
-                    deployment::create_deployment(conn, &site, deployment, exists, replace).await?;
-                };
-
-                // Create the schema for the subgraph data
-                if !exists {
-                    let query = format!("create schema {}", &site.namespace);
-                    conn.batch_execute(&query).await?;
+            if replace || !exists {
+                deployment::create_deployment(conn, &site, deployment, exists, replace).await?;
+            };
 
-                    let _ = Layout::create_relational_schema(
-                        conn,
-                        site.clone(),
-                        schema,
-                        entities_with_causality_region.into_iter().collect(),
-                        index_def,
-                    )
-                    .await?;
+            // Create the schema for the subgraph data
+            if !exists {
+                let query = format!("create schema {}", &site.namespace);
+                conn.batch_execute(&query).await?;
+
+                let _ = Layout::create_relational_schema(
+                    conn,
+                    site.clone(),
+                    schema,
+                    entities_with_causality_region.into_iter().collect(),
+                )
+                .await?;
 
-                    // Create data sources table
-                    if site.schema_version.private_data_sources() {
-                        conn.batch_execute(&DataSourcesTable::new(site.namespace.clone()).as_ddl())
-                            .await?;
-                    }
+                // Create data sources table
+                if site.schema_version.private_data_sources() {
+                    conn.batch_execute(&DataSourcesTable::new(site.namespace.clone()).as_ddl())
+                        .await?;
                 }
+            }
 
-                deployment::set_on_sync(conn, &site, on_sync).await?;
+            deployment::set_on_sync(conn, &site, on_sync).await?;
 
-                Ok(())
-            }
-            .scope_boxed()
+            Ok(())
         })
         .await
     }
@@ -258,15 +249,12 @@ impl DeploymentStore {
     // is not reversible
     pub(crate) async fn drop_deployment(&self, site: &Site) -> Result<(), StoreError> {
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| {
-            async {
-                crate::deployment::drop_schema(conn, &site.namespace).await?;
-                if !site.schema_version.private_data_sources() {
-                    crate::dynds::shared::drop(conn, &site.deployment).await?;
-                }
-                crate::deployment::drop_metadata(conn, site).await
+        conn.transaction(async |conn| {
+            crate::deployment::drop_schema(conn, &site.namespace).await?;
+            if !site.schema_version.private_data_sources() {
+                crate::dynds::shared::drop(conn, &site.deployment).await?;
             }
-            .scope_boxed()
+            crate::deployment::drop_metadata(conn, site).await
         })
         .await
     }
@@ -298,16 +286,13 @@ impl DeploymentStore {
         let query = diesel::sql_query(query);
 
         let results = conn
-            .transaction(|conn| {
-                async {
-                    if let Some(ref timeout_sql) = *STATEMENT_TIMEOUT {
-                        conn.batch_execute(timeout_sql).await?;
-                    }
-
-                    // Execute the provided SQL query
-                    query.load::<JSONData>(conn).await
+            .transaction(async |conn| {
+                if let Some(ref timeout_sql) = *STATEMENT_TIMEOUT {
+                    conn.batch_execute(timeout_sql).await?;
                 }
-                .scope_boxed()
+
+                // Execute the provided SQL query
+                query.load::<JSONData>(conn).await
             })
             .await
             .map_err(|e| QueryExecutionError::SqlError(e.to_string()))?;
@@ -543,7 +528,7 @@ impl DeploymentStore {
         block_ptr: BlockPtr,
     ) -> Result<(), StoreError> {
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| deployment::set_synced(conn, id, block_ptr).scope_boxed())
+        conn.transaction(async |conn| deployment::set_synced(conn, id, block_ptr).await)
             .await
     }
 
@@ -651,17 +636,14 @@ impl DeploymentStore {
             .map(|table| vec![table])
             .unwrap_or_else(|| layout.tables.values().map(Arc::as_ref).collect());
 
-        conn.transaction(|conn| {
-            async {
-                for table in tables {
-                    let (columns, _) = resolve_column_names_and_index_exprs(table, &columns)?;
+        conn.transaction(async |conn| {
+            for table in tables {
+                let (columns, _) = resolve_column_names_and_index_exprs(table, &columns)?;
 
-                    catalog::set_stats_target(conn, &site.namespace, &table.name, &columns, target)
-                        .await?;
-                }
-                Ok(())
+                catalog::set_stats_target(conn, &site.namespace, &table.name, &columns, target)
+                    .await?;
             }
-            .scope_boxed()
+            Ok(())
         })
         .await
     }
@@ -734,12 +716,11 @@ impl DeploymentStore {
         Ok(indexes.into_iter().map(CreateIndex::parse).collect())
     }
 
-    /// Do not use this while already holding a connection as that can lead
-    /// to deadlocks
     pub(crate) async fn load_indexes(&self, site: Arc<Site>) -> Result<IndexList, StoreError> {
-        let store = self.clone();
         let mut conn = self.pool.get_permitted().await?;
-        IndexList::load(&mut conn, site, store).await
+        let layout = self.layout(&mut conn, site).await?;
+
+        IndexList::load(&mut conn, &layout).await
     }
 
     /// Drops an index for a given deployment, concurrently.
@@ -861,9 +842,8 @@ impl DeploymentStore {
                 return Ok(reporter);
             }
 
-            conn.transaction(|conn| {
-                deployment::set_earliest_block(conn, site.as_ref(), req.earliest_block)
-                    .scope_boxed()
+            conn.transaction(async |conn| {
+                deployment::set_earliest_block(conn, site.as_ref(), req.earliest_block).await
             })
             .await?;
 
@@ -896,6 +876,59 @@ impl DeploymentStore {
 
         Ok(relational::prune::Viewer::new(self.pool.clone(), layout))
     }
+
+    pub(crate) async fn dump(
+        &self,
+        site: Arc<Site>,
+        dir: PathBuf,
+        mut reporter: Box<dyn DumpReporter>,
+    ) -> Result<(), StoreError> {
+        let mut conn = self.pool.get_permitted().await?;
+        // Layout and index list are schema metadata — safe to load outside
+        // the snapshot transaction
+        let layout = self.layout(&mut conn, site.cheap_clone()).await?;
+        let index_list = IndexList::load(&mut conn, &layout).await?;
+
+        // Use REPEATABLE READ to get a consistent MVCC snapshot for the
+        // entire dump. All queries inside see the same database state,
+        // regardless of concurrent indexing or pruning.
+        conn.build_transaction()
+            .repeatable_read()
+            .read_only()
+            .run(async move |conn| {
+                let entity_count = crate::detail::entity_count(conn, &site).await?;
+                layout
+                    .dump(
+                        conn,
+                        index_list,
+                        dir,
+                        &site.network,
+                        entity_count,
+                        &mut *reporter,
+                    )
+                    .await
+            })
+            .await
+    }
+
+    pub(crate) async fn restore(
+        &self,
+        site: Arc<Site>,
+        dir: &Path,
+        metadata: &crate::relational::dump::Metadata,
+        reporter: &mut dyn RestoreReporter,
+    ) -> Result<(), StoreError> {
+        let mut conn = self.pool.get_permitted().await?;
+        reporter.start_create_schema(site.namespace.as_str(), site.shard.as_str());
+        let layout =
+            crate::relational::restore::create_schema(&mut conn, site, metadata, dir).await?;
+        reporter.finish_create_schema();
+        crate::relational::restore::import_data(&mut conn, &layout, metadata, dir, reporter)
+            .await?;
+        crate::relational::restore::finalize(&mut conn, &layout, metadata, reporter).await?;
+        reporter.finish();
+        Ok(())
+    }
 }
 
 /// Methods that back the trait `WritableStore`, but have small variations in their signatures
@@ -1116,68 +1149,65 @@ impl DeploymentStore {
         };
 
         let (layout, earliest_block) = deployment::with_lock(&mut conn, &site, async |conn| {
-            conn.transaction(|conn| {
-                async {
-                    // Make the changes
-                    let layout = self.layout(conn, site.clone()).await?;
-
-                    let section = stopwatch.start_section("apply_entity_modifications");
-                    let count = self
-                        .apply_entity_modifications(
-                            conn,
-                            logger,
-                            layout.as_ref(),
-                            batch.groups(),
-                            stopwatch,
-                        )
-                        .await?;
-                    section.end();
+            conn.transaction(async |conn| {
+                // Make the changes
+                let layout = self.layout(conn, site.clone()).await?;
 
-                    layout.rollup(conn, last_rollup, &batch.block_times).await?;
+                let section = stopwatch.start_section("apply_entity_modifications");
+                let count = self
+                    .apply_entity_modifications(
+                        conn,
+                        logger,
+                        layout.as_ref(),
+                        batch.groups(),
+                        stopwatch,
+                    )
+                    .await?;
+                section.end();
 
-                    dynds::insert(conn, &site, &batch.data_sources, manifest_idx_and_name).await?;
+                layout.rollup(conn, last_rollup, &batch.block_times).await?;
 
-                    dynds::update_offchain_status(conn, &site, &batch.offchain_to_remove).await?;
+                dynds::insert(conn, &site, &batch.data_sources, manifest_idx_and_name).await?;
 
-                    if !batch.deterministic_errors.is_empty() {
-                        deployment::insert_subgraph_errors(
-                            &self.logger,
+                dynds::update_offchain_status(conn, &site, &batch.offchain_to_remove).await?;
+
+                if !batch.deterministic_errors.is_empty() {
+                    deployment::insert_subgraph_errors(
+                        &self.logger,
+                        conn,
+                        &site.deployment,
+                        &batch.deterministic_errors,
+                        batch.block_ptr.number,
+                    )
+                    .await?;
+
+                    if batch.is_non_fatal_errors_active {
+                        debug!(
+                            logger,
+                            "Updating non-fatal errors for subgraph";
+                            "subgraph" => site.deployment.to_string(),
+                            "block" => batch.block_ptr.number,
+                        );
+                        deployment::update_non_fatal_errors(
                             conn,
                             &site.deployment,
-                            &batch.deterministic_errors,
-                            batch.block_ptr.number,
+                            deployment::SubgraphHealth::Unhealthy,
+                            Some(&batch.deterministic_errors),
                         )
                         .await?;
-
-                        if batch.is_non_fatal_errors_active {
-                            debug!(
-                                logger,
-                                "Updating non-fatal errors for subgraph";
-                                "subgraph" => site.deployment.to_string(),
-                                "block" => batch.block_ptr.number,
-                            );
-                            deployment::update_non_fatal_errors(
-                                conn,
-                                &site.deployment,
-                                deployment::SubgraphHealth::Unhealthy,
-                                Some(&batch.deterministic_errors),
-                            )
-                            .await?;
-                        }
                     }
+                }
 
-                    let earliest_block = deployment::transact_block(
-                        conn,
-                        &site,
-                        &batch.block_ptr,
-                        &batch.firehose_cursor,
-                        count,
-                    )
-                    .await?;
+                let earliest_block = deployment::transact_block(
+                    conn,
+                    &site,
+                    &batch.block_ptr,
+                    &batch.firehose_cursor,
+                    count,
+                )
+                .await?;
 
-                    Ok((layout, earliest_block))
-                }
-                .scope_boxed()
+                Ok((layout, earliest_block))
             })
             .await
         })
@@ -1307,35 +1337,31 @@ impl DeploymentStore {
     ) -> Result<(), StoreError> {
         let logger = self.logger.cheap_clone();
         deployment::with_lock(conn, &site, async |conn| {
-            conn.transaction(|conn| {
-                async {
-                    // The revert functions want the number of the first block that we need to get rid of
-                    let block = block_ptr_to.number + 1;
+            conn.transaction(async |conn| {
+                // The revert functions want the number of the first block that we need to get rid of
+                let block = block_ptr_to.number + 1;
 
-                    deployment::revert_block_ptr(conn, &site, block_ptr_to, firehose_cursor)
-                        .await?;
+                deployment::revert_block_ptr(conn, &site, block_ptr_to, firehose_cursor).await?;
 
-                    // Revert the data
-                    let layout = self.layout(conn, site.clone()).await?;
+                // Revert the data
+                let layout = self.layout(conn, site.clone()).await?;
 
-                    if truncate {
-                        layout.truncate_tables(conn).await?;
-                        deployment::clear_entity_count(conn, site.as_ref()).await?;
-                    } else {
-                        let count = layout.revert_block(conn, block).await?;
-                        deployment::update_entity_count(conn, site.as_ref(), count).await?;
-                    }
+                if truncate {
+                    layout.truncate_tables(conn).await?;
+                    deployment::clear_entity_count(conn, site.as_ref()).await?;
+                } else {
+                    let count = layout.revert_block(conn, block).await?;
+                    deployment::update_entity_count(conn, site.as_ref(), count).await?;
+                }
 
-                    // Revert the meta data changes that correspond to this subgraph.
-                    // Only certain meta data changes need to be reverted, most
-                    // importantly creation of dynamic data sources. We ensure in the
-                    // rest of the code that we only record history for those meta data
-                    // changes that might need to be reverted
-                    Layout::revert_metadata(&logger, conn, &site, block).await?;
+                // Revert the meta data changes that correspond to this subgraph.
+                // Only certain meta data changes need to be reverted, most
+                // importantly creation of dynamic data sources. We ensure in the
+                // rest of the code that we only record history for those meta data
+                // changes that might need to be reverted
+                Layout::revert_metadata(&logger, conn, &site, block).await?;
 
-                    Ok(())
-                }
-                .scope_boxed()
+                Ok(())
             })
             .await
         })
@@ -1418,24 +1444,27 @@ impl DeploymentStore {
 
         // Confidence check on revert to ensure we go backward only
         if block_ptr_to.number >= deployment_head.number {
-            panic!("revert_block_operations must revert only backward, you are trying to revert forward going from subgraph block {} to new block {}", deployment_head, block_ptr_to);
+            panic!(
+                "revert_block_operations must revert only backward, you are trying to revert forward going from subgraph block {} to new block {}",
+                deployment_head, block_ptr_to
+            );
         }
 
         // Don't revert past a graft point
         let info = self
             .subgraph_info_with_conn(&mut conn, site.cheap_clone())
             .await?;
-        if let Some(graft_block) = info.graft_block {
-            if graft_block > block_ptr_to.number {
-                return Err(internal_error!(
-                    "Can not revert subgraph `{}` to block {} as it was \
+        if let Some(graft_block) = info.graft_block
+            && graft_block > block_ptr_to.number
+        {
+            return Err(internal_error!(
+                "Can not revert subgraph `{}` to block {} as it was \
                         grafted at block {} and reverting past a graft point \
                         is not possible",
-                    site.deployment.clone(),
-                    block_ptr_to.number,
-                    graft_block
-                ));
-            }
+                site.deployment.clone(),
+                block_ptr_to.number,
+                graft_block
+            ));
         }
 
         self.rewind_or_truncate_with_conn(&mut conn, site, block_ptr_to, firehose_cursor, false)
@@ -1456,7 +1485,7 @@ impl DeploymentStore {
         error: SubgraphError,
     ) -> Result<(), StoreError> {
         let mut conn = self.pool.get_permitted().await?;
-        conn.transaction(|conn| deployment::fail(conn, &id, &error).scope_boxed())
+        conn.transaction(async |conn| deployment::fail(conn, &id, &error).await)
             .await
     }
 
@@ -1562,99 +1591,250 @@ impl DeploymentStore {
             }
 
             let mut conn = self.pool.get_permitted().await?;
-            conn.transaction::<(), StoreError, _>(|conn| {
-                async {
-                    // Copy shared dynamic data sources and adjust their ID; if
-                    // the subgraph uses private data sources, that is done by
-                    // `copy::Connection::copy_data` since it requires access to
-                    // the source schema which in sharded setups is only
-                    // available while that function runs
-                    let start = Instant::now();
-                    let count =
-                        dynds::shared::copy(conn, &src.site, &dst.site, block.number).await?;
-                    info!(logger, "Copied {} dynamic data sources", count;
-                      "time_ms" => start.elapsed().as_millis());
-
-                    // Copy errors across
-                    let start = Instant::now();
-                    let count = deployment::copy_errors(conn, &src.site, &dst.site, &block).await?;
-                    info!(logger, "Copied {} existing errors", count;
-                      "time_ms" => start.elapsed().as_millis());
-
-                    catalog::copy_account_like(conn, &src.site, &dst.site).await?;
-
-                    // Analyze all tables for this deployment
-                    info!(logger, "Analyzing all {} tables", dst.tables.len());
-                    for entity_name in dst.tables.keys() {
-                        self.analyze_with_conn(site.cheap_clone(), entity_name.as_str(), conn)
-                            .await?;
-                    }
+            conn.transaction::<(), StoreError, _>(async |conn| {
+                // Copy shared dynamic data sources and adjust their ID; if
+                // the subgraph uses private data sources, that is done by
+                // `copy::Connection::copy_data` since it requires access to
+                // the source schema which in sharded setups is only
+                // available while that function runs
+                let start = Instant::now();
+                let count = dynds::shared::copy(conn, &src.site, &dst.site, block.number).await?;
+                info!(logger, "Copied {} dynamic data sources", count;
+                  "time_ms" => start.elapsed().as_millis());
+
+                // Copy errors across
+                let start = Instant::now();
+                let count = deployment::copy_errors(conn, &src.site, &dst.site, &block).await?;
+                info!(logger, "Copied {} existing errors", count;
+                  "time_ms" => start.elapsed().as_millis());
+
+                catalog::copy_account_like(conn, &src.site, &dst.site).await?;
+
+                // Analyze all tables for this deployment
+                info!(logger, "Analyzing all {} tables", dst.tables.len());
+                for entity_name in dst.tables.keys() {
+                    self.analyze_with_conn(site.cheap_clone(), entity_name.as_str(), conn)
+                        .await?;
+                }
 
-                    // Rewind the subgraph so that entity versions that are
-                    // clamped in the future (beyond `block`) become valid for
-                    // all blocks after `block`. `revert_block` gets rid of
-                    // everything including the block passed to it. We want to
-                    // preserve `block` and therefore revert `block+1`
-                    let start = Instant::now();
-                    let block_to_revert: BlockNumber = block
-                        .number
-                        .checked_add(1)
-                        .expect("block numbers fit into an i32");
-                    info!(logger, "Rewinding to block {}", block.number);
-                    let count = dst.revert_block(conn, block_to_revert).await?;
-                    deployment::update_entity_count(conn, &dst.site, count).await?;
-
-                    info!(logger, "Rewound subgraph to block {}", block.number;
-                      "time_ms" => start.elapsed().as_millis());
-
-                    deployment::set_history_blocks(
-                        conn,
-                        &dst.site,
-                        src_deployment.manifest.history_blocks,
-                    )
-                    .await?;
+                // CopyEntityBatchQuery now reverts entity versions
+                // during copying, making this rewind redundant for new
+                // copies. We keep it for backward compatibility: a copy
+                // that was started before this change and is resumed
+                // after upgrading will have already-copied rows that
+                // weren't reverted during copy. For data that was
+                // already reverted during copy, this is a no-op. This
+                // code can be removed once a release with this change
+                // has been out for a while and we are sure that there
+                // are no more copies in progress that started before
+                // the change
+                //
+                // `revert_block` gets rid of everything including the
+                // block passed to it. We want to preserve `block` and
+                // therefore revert `block+1`
+                let start = Instant::now();
+                let block_to_revert: BlockNumber = block
+                    .number
+                    .checked_add(1)
+                    .expect("block numbers fit into an i32");
+                info!(logger, "Rewinding to block {}", block.number);
+                let count = dst.revert_block(conn, block_to_revert).await?;
+                deployment::update_entity_count(conn, &dst.site, count).await?;
+
+                info!(logger, "Rewound subgraph to block {}", block.number;
+                  "time_ms" => start.elapsed().as_millis());
+
+                deployment::set_history_blocks(
+                    conn,
+                    &dst.site,
+                    src_deployment.manifest.history_blocks,
+                )
+                .await?;
 
-                    // The `earliest_block` for `src` might have changed while
-                    // we did the copy if `src` was pruned while we copied;
-                    // adjusting it very late in the copy process ensures that
-                    // we truly do have all the data starting at
-                    // `earliest_block` and do not inadvertently expose data
-                    // that might be incomplete because a prune on the source
-                    // removed data just before we copied it
-                    deployment::copy_earliest_block(conn, &src.site, &dst.site).await?;
-
-                    // Set the block ptr to the graft point to signal that we successfully
-                    // performed the graft
-                    crate::deployment::forward_block_ptr(conn, &dst.site, &block).await?;
-                    info!(logger, "Subgraph successfully initialized";
-                    "time_ms" => start.elapsed().as_millis());
-                    Ok(())
-                }
-                .scope_boxed()
+                // The `earliest_block` for `src` might have changed while
+                // we did the copy if `src` was pruned while we copied;
+                // adjusting it very late in the copy process ensures that
+                // we truly do have all the data starting at
+                // `earliest_block` and do not inadvertently expose data
+                // that might be incomplete because a prune on the source
+                // removed data just before we copied it
+                deployment::copy_earliest_block(conn, &src.site, &dst.site).await?;
+
+                // Set the block ptr to the graft point to signal that we successfully
+                // performed the graft
+                crate::deployment::forward_block_ptr(conn, &dst.site, &block).await?;
+                info!(logger, "Subgraph successfully initialized";
+                "time_ms" => start.elapsed().as_millis());
+                Ok(())
             })
             .await?;
         }
 
-        let mut conn = self.pool.get_permitted().await?;
-        if ENV_VARS.postpone_attribute_index_creation {
-            // Check if all indexes are valid and recreate them if they
-            // aren't.
-            IndexList::load(&mut conn, site, self.cheap_clone())
-                .await?
-                .recreate_invalid_indexes(&mut conn, &dst)
-                .await?;
-        }
-
         // Make sure the block pointer is set. This is important for newly
         // deployed subgraphs so that we respect the 'startBlock' setting
         // the first time the subgraph is started
-        conn.transaction(|conn| {
-            crate::deployment::initialize_block_ptr(conn, &dst.site).scope_boxed()
+        let mut conn = self.pool.get_permitted().await?;
+        conn.transaction(async |conn| {
+            crate::deployment::initialize_block_ptr(conn, &dst.site).await
         })
         .await?;
         Ok(())
     }
 
+    /// Create all indexes whose creation was postponed when the
+    /// deployment was first created. The decision is persisted in the
+    /// `postponed_indexes_created` flag on `subgraphs.deployment` so that
+    /// this is a one-shot operation: indexes are created exactly once,
+    /// and we never recreate them — even if an external process removes
+    /// indexes that it considers unused.
+    ///
+    /// The actual index creation runs in the background so that callers are
+    /// not blocked while the (potentially long-running) `CREATE INDEX
+    /// CONCURRENTLY` statements execute. Because of that, errors are only
+    /// logged and not returned to the caller. The `postponed_indexes_created`
+    /// flag is only set once all indexes have been created successfully, so a
+    /// failed run is retried the next time `graph-node` starts the
+    /// deployment. A run that was interrupted (for example by a restart while
+    /// a `CREATE INDEX CONCURRENTLY` was still in flight) can leave an invalid
+    /// index behind; such remnants are dropped and rebuilt on the next run.
+    pub(crate) fn create_postponed_indexes(&self, logger: &Logger, site: Arc<Site>) {
+        async fn index_creation_is_running(
+            store: &DeploymentStore,
+            site: &Site,
+        ) -> Result<Option<(i32, String)>, StoreError> {
+            let mut conn = store.pool.get_permitted().await?;
+            catalog::index_creation_is_running(&mut conn, site.namespace.as_str()).await
+        }
+
+        async fn postponed_indexes_created(
+            store: &DeploymentStore,
+            site: &Site,
+        ) -> Result<bool, StoreError> {
+            let mut conn = store.pool.get_permitted().await?;
+            deployment::postponed_indexes_created(&mut conn, site).await
+        }
+
+        async fn wait_for_concurrent_index_creation(
+            logger: &Logger,
+            store: &DeploymentStore,
+            site: &Site,
+        ) -> Result<(), StoreError> {
+            let mut backoff =
+                ExponentialBackoff::new(Duration::from_secs(1), Duration::from_mins(5));
+            let mut last_log = Instant::now() - Duration::from_mins(2);
+            while let Some((pid, index_name)) = index_creation_is_running(store, site).await? {
+                if last_log.elapsed() > Duration::from_mins(1) {
+                    info!(logger,
+                        "Waiting for concurrent index creation to finish";
+                        "pid" => pid,
+                        "index_name" => index_name,
+                    );
+                    last_log = Instant::now();
+                }
+                backoff.sleep_async().await;
+            }
+            Ok(())
+        }
+
+        async fn create_index(
+            logger: &Logger,
+            store: &DeploymentStore,
+            layout: &Layout,
+            site: &Site,
+            idx: &CreateIndex,
+        ) -> Result<(), StoreError> {
+            let mut last_log = Instant::now() - Duration::from_mins(2);
+            // We (ab)use the fdw pool here since `create index` can take a
+            // very long time; with many subgraphs creating indexes, we
+            // might starve the main connection pool which would block the
+            // progress of many subgraphs.
+            let mut conn = store.pool.get_fdw(logger, move || {
+                if last_log.elapsed() > Duration::from_mins(1) {
+                    debug!(logger, "Waiting for a connection to become available so we can create index"; "index_name" => idx.name().unwrap_or("<unknown>"));
+                    last_log = Instant::now();
+                }
+                false
+            }).await?;
+            let schema_name = site.namespace.as_str();
+
+            // A previous run that was interrupted (e.g. by a node
+            // restart) can leave an invalid index behind. Since we
+            // create indexes with `if not exists`, such a leftover
+            // would be skipped and never rebuilt, so drop it first.
+            // `check_index_is_valid` returns `false` both when the
+            // index is missing and when it is invalid; the
+            // `drop index ... if exists` is a no-op in the former
+            // case and removes the invalid remnant in the latter.
+            if let Some(name) = idx.name()
+                && !catalog::check_index_is_valid(&mut conn, schema_name, name).await?
+            {
+                let drop_sql = format!("drop index concurrently if exists {schema_name}.{name}");
+                sql_query(drop_sql).execute(&mut conn).await?;
+            }
+
+            let creat = layout.index_creator(true, true);
+            IndexCreator::execute(&creat, &mut conn, idx).await
+        }
+
+        async fn run(
+            logger: Logger,
+            store: DeploymentStore,
+            site: Arc<Site>,
+        ) -> Result<(), StoreError> {
+            let layout = store.find_layout(site.cheap_clone()).await?;
+
+            // Since this entire run can take many hours, we avoid holding a
+            // connection for the whole time. Instead, we get a new
+            // connection for each index that we create.
+
+            if postponed_indexes_created(&store, &site).await? {
+                return Ok(());
+            }
+
+            for table in layout.tables.values() {
+                let indexes = table.indexes(&layout.input_schema).map_err(|e| {
+                    StoreError::ConstraintViolation(format!("failed to generate indexes: {}", e))
+                })?;
+                for idx in indexes {
+                    if !idx.to_postpone() {
+                        continue;
+                    }
+
+                    wait_for_concurrent_index_creation(&logger, &store, &site).await?;
+
+                    create_index(&logger, &store, &layout, &site, &idx).await?;
+
+                    debug!(logger, "Created index";
+                        "index_name" => idx.name().unwrap_or("<unknown>"),
+                        "table_name" => table.name.as_str(),
+                    );
+                }
+            }
+
+            let mut conn = store.pool.get_permitted().await?;
+            deployment::set_postponed_indexes_created(&mut conn, &site).await?;
+            Ok(())
+        }
+
+        let store = self.cheap_clone();
+        let logger = Logger::new(logger, o!("component" => "IndexCreation"));
+        graph::spawn(async move {
+            let logger2 = logger.cheap_clone();
+            let res = retry::forever(&logger2, "create_postponed_indexes", || {
+                let store = store.cheap_clone();
+                let site = site.cheap_clone();
+                let logger = logger2.cheap_clone();
+                async move { run(logger, store, site).await }
+            })
+            .await;
+            match res {
+                Ok(()) => debug!(logger, "Created postponed indexes"),
+                Err(e) => error!(logger, "Failed to create postponed indexes";
+                    "error" => e.to_string()),
+            }
+        });
+    }
+
     // If the current block of the deployment is the same as the fatal error,
     // we revert all block operations to it's parent/previous block.
     //
@@ -1674,8 +1854,7 @@ impl DeploymentStore {
         let mut conn = self.pool.get_permitted().await?;
         let deployment_id = &site.deployment;
 
-        conn.transaction(|conn| {
-            async {
+        conn.transaction(async |conn| {
             // We'll only unfail subgraphs that had fatal errors
             let subgraph_error = match ErrorDetail::fatal(conn, deployment_id).await? {
                 Some(fatal_error) => fatal_error,
@@ -1749,7 +1928,7 @@ impl DeploymentStore {
 
                     Ok(UnfailOutcome::Noop)
                 }
-            } }.scope_boxed()
+            }
         }).await
     }
 
@@ -1771,7 +1950,7 @@ impl DeploymentStore {
         let mut conn = self.pool.get_permitted().await?;
         let deployment_id = &site.deployment;
 
-        conn.transaction(|conn| async {
+        conn.transaction(async |conn| {
             // We'll only unfail subgraphs that had fatal errors
             let subgraph_error = match ErrorDetail::fatal(conn, deployment_id).await? {
                 Some(fatal_error) => fatal_error,
@@ -1811,7 +1990,8 @@ impl DeploymentStore {
 
                         Ok(UnfailOutcome::Unfailed)
                     }
-                // NOOP, the deployment head is still before where non-deterministic error happened.
+                // The deployment head is still before where non-deterministic error happened.
+                // Return BehindErrorBlock so the caller knows to retry on subsequent blocks.
                 block_range => {
                     info!(
                         self.logger,
@@ -1823,10 +2003,10 @@ impl DeploymentStore {
                         "error_block_hash" => subgraph_error.block_hash.as_ref().map(|hash| format!("0x{}", hex::encode(hash))),
                     );
 
-                    Ok(UnfailOutcome::Noop)
+                    Ok(UnfailOutcome::BehindErrorBlock)
                 }
             }
-        }.scope_boxed()).await
+        }).await
     }
 
     #[cfg(debug_assertions)]
diff --git a/store/postgres/src/detail.rs b/store/postgres/src/detail.rs
index 3be35320d8d..b59a53cdca4 100644
--- a/store/postgres/src/detail.rs
+++ b/store/postgres/src/detail.rs
@@ -14,11 +14,11 @@ use git_testament::{git_testament, git_testament_macros};
 use graph::blockchain::BlockHash;
 use graph::data::store::scalar::ToPrimitive;
 use graph::data::subgraph::schema::{SubgraphError, SubgraphManifestEntity};
-use graph::prelude::alloy::primitives::B256;
 use graph::prelude::BlockNumber;
+use graph::prelude::alloy::primitives::B256;
 use graph::prelude::{
-    chrono::{DateTime, Utc},
     BlockPtr, DeploymentHash, StoreError, SubgraphDeploymentEntity,
+    chrono::{DateTime, Utc},
 };
 use graph::schema::InputSchema;
 use graph::{data::subgraph::status, internal_error};
@@ -27,12 +27,12 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::{ops::Bound, sync::Arc};
 
+use crate::AsyncPgConnection;
 use crate::deployment::{
-    deployment as subgraph_deployment, graph_node_versions, head as subgraph_head, subgraph_error,
-    subgraph_manifest, SubgraphHealth as HealthType,
+    SubgraphHealth as HealthType, deployment as subgraph_deployment, graph_node_versions,
+    head as subgraph_head, subgraph_error, subgraph_manifest,
 };
 use crate::primary::{DeploymentId, Site};
-use crate::AsyncPgConnection;
 
 git_testament_macros!(version);
 git_testament!(TESTAMENT);
@@ -657,6 +657,18 @@ pub async fn deployment_entity(
     StoredDeploymentEntity(detail, manifest).into_subgraph_deployment_entity(schema)
 }
 
+/// Load the entity count for a deployment from `subgraphs.head`.
+pub async fn entity_count(conn: &mut AsyncPgConnection, site: &Site) -> Result<usize, StoreError> {
+    use subgraph_head as h;
+
+    let count: i64 = h::table
+        .find(site.id)
+        .select(h::entity_count)
+        .first(conn)
+        .await?;
+    Ok(count as usize)
+}
+
 #[derive(Queryable, Identifiable, Insertable)]
 #[diesel(table_name = graph_node_versions)]
 pub struct GraphNodeVersion {
diff --git a/store/postgres/src/dynds/mod.rs b/store/postgres/src/dynds/mod.rs
index a1155c96678..e53474ae280 100644
--- a/store/postgres/src/dynds/mod.rs
+++ b/store/postgres/src/dynds/mod.rs
@@ -3,9 +3,9 @@ pub(crate) mod shared;
 
 pub(crate) use private::DataSourcesTable;
 
-use crate::{primary::Site, AsyncPgConnection};
+use crate::{AsyncPgConnection, primary::Site};
 use graph::{
-    components::store::{write, StoredDynamicDataSource},
+    components::store::{StoredDynamicDataSource, write},
     data_source::CausalityRegion,
     internal_error,
     prelude::{BlockNumber, StoreError},
diff --git a/store/postgres/src/dynds/private.rs b/store/postgres/src/dynds/private.rs
index 793a3ffe9fc..714e1741245 100644
--- a/store/postgres/src/dynds/private.rs
+++ b/store/postgres/src/dynds/private.rs
@@ -1,23 +1,25 @@
 use std::{collections::HashMap, ops::Bound};
 
 use diesel::{
-    pg::{sql_types, Pg},
+    ExpressionMethods, OptionalExtension, QueryDsl, QueryResult,
+    pg::{Pg, sql_types},
     query_builder::{AstPass, QueryFragment, QueryId},
     sql_query,
-    sql_types::{Binary, Bool, Integer, Jsonb, Nullable},
-    ExpressionMethods, OptionalExtension, QueryDsl, QueryResult,
+    sql_types::{BigInt, Binary, Bool, Integer, Jsonb, Nullable, Text},
 };
 use diesel_async::RunQueryDsl;
 
 use graph::{
-    anyhow::{anyhow, Context},
-    components::store::{write, StoredDynamicDataSource},
+    anyhow::{Context, anyhow},
+    components::store::{StoredDynamicDataSource, write},
     data_source::CausalityRegion,
     internal_error,
-    prelude::{serde_json, BlockNumber, StoreError},
+    prelude::{BlockNumber, StoreError, serde_json},
 };
 
-use crate::{primary::Namespace, relational_queries::POSTGRES_MAX_PARAMETERS, AsyncPgConnection};
+use crate::parquet::convert::DataSourceRestoreRow;
+
+use crate::{AsyncPgConnection, primary::Namespace, relational_queries::POSTGRES_MAX_PARAMETERS};
 
 type DynTable = diesel_dynamic_schema::Table<String, Namespace>;
 type DynColumn<ST> = diesel_dynamic_schema::Column<DynTable, &'static str, ST>;
@@ -57,6 +59,10 @@ impl DataSourcesTable {
         }
     }
 
+    pub(crate) fn qualified_name(&self) -> &str {
+        &self.qname
+    }
+
     pub(crate) fn as_ddl(&self) -> String {
         format!(
             "
@@ -175,10 +181,10 @@ impl DataSourcesTable {
                 // Offchain data sources have a unique causality region assigned from a sequence in the
                 // database, while onchain data sources always have causality region 0.
                 let query = format!(
-                "insert into {}(block_range, manifest_idx, param, context, causality_region, done_at) \
+                    "insert into {}(block_range, manifest_idx, param, context, causality_region, done_at) \
                             values (int4range($1, null), $2, $3, $4, $5, $6)",
-                self.qname
-            );
+                    self.qname
+                );
 
                 let query = sql_query(query)
                     .bind::<Nullable<Integer>, _>(creation_block)
@@ -305,10 +311,10 @@ impl DataSourcesTable {
 
                 if count > 1 {
                     return Err(internal_error!(
-                    "expected to remove at most one offchain data source but would remove {}, causality region: {}",
-                    count,
-                    ds.causality_region
-                ));
+                        "expected to remove at most one offchain data source but would remove {}, causality region: {}",
+                        count,
+                        ds.causality_region
+                    ));
                 }
             }
         }
@@ -332,6 +338,25 @@ impl DataSourcesTable {
             .await
             .optional()?)
     }
+
+    /// Insert rows from a dump/restore into the `data_sources$` table.
+    /// Rows are batched to stay within PostgreSQL's bind parameter limit.
+    pub(crate) async fn insert_rows(
+        &self,
+        conn: &mut AsyncPgConnection,
+        rows: &[DataSourceRestoreRow],
+    ) -> Result<usize, StoreError> {
+        let chunk_size = POSTGRES_MAX_PARAMETERS / RestoreDsQuery::BIND_PARAMS;
+        let mut count = 0;
+        for chunk in rows.chunks(chunk_size) {
+            let query = RestoreDsQuery {
+                qname: &self.qname,
+                rows: chunk,
+            };
+            count += query.execute(conn).await?;
+        }
+        Ok(count)
+    }
 }
 
 /// Map src manifest indexes to dst manifest indexes. If the
@@ -469,3 +494,58 @@ impl<'a> QueryId for CopyDsQuery<'a> {
 
     const HAS_STATIC_QUERY_ID: bool = false;
 }
+
+struct RestoreDsQuery<'a> {
+    qname: &'a str,
+    rows: &'a [DataSourceRestoreRow],
+}
+
+impl<'a> RestoreDsQuery<'a> {
+    const BIND_PARAMS: usize = 10;
+}
+
+impl<'a> QueryFragment<Pg> for RestoreDsQuery<'a> {
+    fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
+        out.unsafe_to_cache_prepared();
+        out.push_sql("insert into ");
+        out.push_sql(self.qname);
+        out.push_sql(
+            "(vid, block_range, causality_region, manifest_idx, \
+             parent, id, param, context, done_at) values ",
+        );
+        for (i, row) in self.rows.iter().enumerate() {
+            if i > 0 {
+                out.push_sql(", ");
+            }
+            out.push_sql("(");
+            out.push_bind_param::<BigInt, _>(&row.vid)?;
+            out.push_sql(", int4range(");
+            out.push_bind_param::<Integer, _>(&row.block_range_start)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Nullable<Integer>, _>(&row.block_range_end)?;
+            out.push_sql("), ");
+            out.push_bind_param::<Integer, _>(&row.causality_region)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Integer, _>(&row.manifest_idx)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Nullable<Integer>, _>(&row.parent)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Nullable<Binary>, _>(&row.id)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Nullable<Binary>, _>(&row.param)?;
+            out.push_sql(", ");
+            out.push_bind_param::<Nullable<Text>, _>(&row.context)?;
+            out.push_sql("::jsonb, ");
+            out.push_bind_param::<Nullable<Integer>, _>(&row.done_at)?;
+            out.push_sql(")");
+        }
+
+        Ok(())
+    }
+}
+
+impl<'a> QueryId for RestoreDsQuery<'a> {
+    type QueryId = ();
+
+    const HAS_STATIC_QUERY_ID: bool = false;
+}
diff --git a/store/postgres/src/dynds/shared.rs b/store/postgres/src/dynds/shared.rs
index 3562e4584f2..d5e86332115 100644
--- a/store/postgres/src/dynds/shared.rs
+++ b/store/postgres/src/dynds/shared.rs
@@ -11,16 +11,16 @@ use diesel::{
 use diesel_async::RunQueryDsl;
 
 use graph::{
-    components::store::{write, StoredDynamicDataSource},
+    components::store::{StoredDynamicDataSource, write},
     data::store::scalar::ToPrimitive,
     data_source::CausalityRegion,
     internal_error,
-    prelude::{serde_json, BigDecimal, BlockNumber, DeploymentHash, StoreError},
+    prelude::{BigDecimal, BlockNumber, DeploymentHash, StoreError, serde_json},
 };
 
-use crate::primary::Site;
 use crate::AsyncPgConnection;
 use crate::ForeignServer;
+use crate::primary::Site;
 
 table! {
     subgraphs.dynamic_ethereum_contract_data_source (vid) {
@@ -67,9 +67,10 @@ pub(super) async fn load(
         if address.len() != 20 {
             return Err(internal_error!(
                 "Data source address `0x{:?}` for dynamic data source {} should be 20 bytes long but is {} bytes long",
-                address, vid,
-            address.len()
-        ));
+                address,
+                vid,
+                address.len()
+            ));
         }
 
         let manifest_idx = manifest_idx_and_name
diff --git a/store/postgres/src/fork.rs b/store/postgres/src/fork.rs
index c8602e0a519..07241577a53 100644
--- a/store/postgres/src/fork.rs
+++ b/store/postgres/src/fork.rs
@@ -9,8 +9,8 @@ use graph::{
     components::store::SubgraphFork as SubgraphForkTrait,
     internal_error,
     prelude::{
-        anyhow, info, r::Value as RValue, reqwest, serde_json, DeploymentHash, Entity, Logger,
-        Serialize, StoreError, Value, ValueType,
+        DeploymentHash, Entity, Logger, Serialize, StoreError, Value, ValueType, anyhow, info,
+        r::Value as RValue, reqwest, serde_json,
     },
     schema::Field,
     url::Url,
@@ -228,7 +228,7 @@ mod tests {
 
     use graph::{
         data::store::scalar,
-        prelude::{s::Type, DeploymentHash},
+        prelude::{DeploymentHash, s::Type},
         slog::{self, o},
     };
 
diff --git a/store/postgres/src/jobs.rs b/store/postgres/src/jobs.rs
index 2d95ef9b2f0..7a90fcdd811 100644
--- a/store/postgres/src/jobs.rs
+++ b/store/postgres/src/jobs.rs
@@ -7,12 +7,12 @@ use async_trait::async_trait;
 use diesel::{sql_query, sql_types::Double};
 use diesel_async::RunQueryDsl;
 
-use graph::prelude::{error, Logger, MetricsRegistry, StoreError, ENV_VARS};
+use graph::prelude::{ENV_VARS, Logger, MetricsRegistry, StoreError, error};
 use graph::prometheus::Gauge;
 use graph::util::jobs::{Job, Runner};
 
 use crate::ConnectionPool;
-use crate::{unused, Store, SubgraphStore};
+use crate::{Store, SubgraphStore, unused};
 
 pub fn register(
     runner: &mut Runner,
diff --git a/store/postgres/src/lib.rs b/store/postgres/src/lib.rs
index d44301b6f89..10cdf2ff627 100644
--- a/store/postgres/src/lib.rs
+++ b/store/postgres/src/lib.rs
@@ -24,6 +24,7 @@ mod fork;
 mod functions;
 mod jobs;
 mod notification_listener;
+mod parquet;
 mod pool;
 mod primary;
 pub mod query_store;
@@ -46,47 +47,45 @@ pub mod layout_for_tests {
     pub use crate::block_store::FAKE_NETWORK_SHARED;
     pub use crate::catalog::set_account_like;
     pub use crate::primary::{
-        make_dummy_site, Connection, Mirror, Namespace, EVENT_TAP, EVENT_TAP_ENABLED,
+        Connection, EVENT_TAP, EVENT_TAP_ENABLED, Mirror, Namespace, make_dummy_site,
     };
     pub use crate::relational::*;
+    pub use crate::relational_queries::CopyEntityBatchQuery;
     pub mod writable {
         pub use crate::writable::test_support::allow_steps;
     }
 }
 
-pub use self::block_store::primary::{add_chain, find_chain, update_chain_name};
 pub use self::block_store::BlockStore;
-pub use self::block_store::ChainStatus;
+pub use self::block_store::primary::{add_chain, find_chain, update_chain_name};
 pub use self::chain_head_listener::ChainHeadUpdateListener;
 pub use self::chain_store::{ChainStore, ChainStoreMetrics, Storage};
 pub use self::detail::DeploymentDetail;
 pub use self::jobs::register as register_jobs;
 pub use self::notification_listener::NotificationSender;
-pub use self::pool::{
-    AsyncPgConnection, ConnectionPool, ForeignServer, PoolCoordinator, PoolRole, ScopedFutureExt,
-};
-pub use self::primary::{db_version, UnusedDeployment};
+pub use self::pool::{AsyncPgConnection, ConnectionPool, ForeignServer, PoolCoordinator, PoolRole};
+pub use self::primary::{RestoreMode, UnusedDeployment, db_version};
 pub use self::store::Store;
 pub use self::store_events::SubscriptionManager;
-pub use self::subgraph_store::{unused, DeploymentPlacer, Shard, SubgraphStore, PRIMARY_SHARD};
+pub use self::subgraph_store::{DeploymentPlacer, PRIMARY_SHARD, Shard, SubgraphStore, unused};
 
 /// This module is only meant to support command line tooling. It must not
 /// be used in 'normal' graph-node code
 pub mod command_support {
     pub mod catalog {
         pub use crate::block_store::primary as block_store;
-        pub use crate::catalog::{account_like, Catalog};
+        pub use crate::catalog::{Catalog, account_like};
         pub use crate::copy::{copy_state, copy_table_state};
+        pub use crate::primary::{Connection, Mirror};
         pub use crate::primary::{
-            active_copies, deployment_schemas, ens_names, subgraph, subgraph_deployment_assignment,
-            subgraph_version, Site,
+            Site, active_copies, deployment_schemas, ens_names, subgraph,
+            subgraph_deployment_assignment, subgraph_version,
         };
-        pub use crate::primary::{Connection, Mirror};
     }
     pub mod index {
-        pub use crate::relational::index::{CreateIndex, Method};
+        pub use crate::relational::index::{CreateIndex, Expr, IndexCreator, Method};
     }
-    pub use crate::deployment::{on_sync, OnSync};
+    pub use crate::deployment::{OnSync, on_sync};
     pub use crate::primary::Namespace;
     pub use crate::relational::prune::{Phase, PruneState, PruneTableState, Viewer};
     pub use crate::relational::{Catalog, Column, ColumnType, Layout, SqlName};
diff --git a/store/postgres/src/notification_listener.rs b/store/postgres/src/notification_listener.rs
index 7f0e5eb51ba..c72bf4f309d 100644
--- a/store/postgres/src/notification_listener.rs
+++ b/store/postgres/src/notification_listener.rs
@@ -5,14 +5,14 @@ use graph::util::backoff::ExponentialBackoff;
 use lazy_static::lazy_static;
 use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode};
 use postgres::Notification;
-use postgres::{fallible_iterator::FallibleIterator, Client};
+use postgres::{Client, fallible_iterator::FallibleIterator};
 use postgres_openssl::MakeTlsConnector;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Barrier};
 use std::thread;
 use std::time::{Duration, Instant};
-use tokio::sync::mpsc::{channel, Receiver};
 use tokio::sync::Mutex;
+use tokio::sync::mpsc::{Receiver, channel};
 
 use graph::prelude::serde_json;
 use graph::prelude::*;
@@ -453,17 +453,17 @@ impl NotificationSender {
 
             // If we can't get the lock, another thread in this process is
             // already checking, and we can just skip checking
-            if let Ok(mut last_check) = LAST_CLEANUP_CHECK.try_lock() {
-                if last_check.elapsed() > ENV_VARS.store.large_notification_cleanup_interval {
-                    diesel::sql_query(format!(
-                        "delete from large_notifications
+            if let Ok(mut last_check) = LAST_CLEANUP_CHECK.try_lock()
+                && last_check.elapsed() > ENV_VARS.store.large_notification_cleanup_interval
+            {
+                diesel::sql_query(format!(
+                    "delete from large_notifications
                          where created_at < current_timestamp - interval '{}s'",
-                        ENV_VARS.store.large_notification_cleanup_interval.as_secs(),
-                    ))
-                    .execute(conn)
-                    .await?;
-                    *last_check = Instant::now();
-                }
+                    ENV_VARS.store.large_notification_cleanup_interval.as_secs(),
+                ))
+                .execute(conn)
+                .await?;
+                *last_check = Instant::now();
             }
         }
         self.sent_counter
diff --git a/store/postgres/src/parquet/convert.rs b/store/postgres/src/parquet/convert.rs
new file mode 100644
index 00000000000..193a7b3e0bf
--- /dev/null
+++ b/store/postgres/src/parquet/convert.rs
@@ -0,0 +1,1259 @@
+use std::collections::HashMap;
+use std::path::Path;
+use std::str::FromStr;
+use std::sync::Arc;
+
+use arrow::array::{
+    Array, ArrayRef, BinaryArray, BinaryBuilder, BooleanArray, BooleanBuilder, Int32Array,
+    Int32Builder, Int64Array, Int64Builder, ListArray, ListBuilder, RecordBatch, StringArray,
+    StringBuilder, TimestampMicrosecondArray, TimestampMicrosecondBuilder,
+};
+use arrow::datatypes::{DataType, Schema};
+
+use graph::components::store::StoreError;
+use graph::data::store::Value;
+use graph::data::store::scalar;
+use graph::data::value::Word;
+use graph::prelude::BlockNumber;
+
+use crate::relational::value::{OidRow, OidValue};
+use crate::relational::{ColumnType, Table};
+
+/// Convert a batch of `DynamicRow<OidValue>` rows into an Arrow `RecordBatch`.
+///
+/// The `schema` defines the expected column names, types, and nullability.
+/// Each row must have exactly `schema.fields().len()` values, positionally
+/// matching the schema fields.
+///
+/// The dump query selects `lower(block_range)` and `upper(block_range)` as
+/// separate Int32 columns, so the converter never sees `OidValue::Int4Range`.
+pub fn rows_to_record_batch(schema: &Schema, rows: &[OidRow]) -> Result<RecordBatch, StoreError> {
+    let num_fields = schema.fields().len();
+    let num_rows = rows.len();
+
+    // Create builders for each column
+    let mut builders: Vec<ColumnBuilder> = schema
+        .fields()
+        .iter()
+        .map(|field| ColumnBuilder::new(field.data_type(), num_rows))
+        .collect::<Result<_, _>>()?;
+
+    // Append each row's values to the builders
+    for (row_idx, row) in rows.iter().enumerate() {
+        if row.len() != num_fields {
+            return Err(StoreError::InternalError(format!(
+                "row {row_idx} has {} values but schema has {num_fields} fields",
+                row.len()
+            )));
+        }
+        for (col_idx, value) in row.into_iter().enumerate() {
+            builders[col_idx].append(value, row_idx)?;
+        }
+    }
+
+    // Finish builders into arrays
+    let arrays: Vec<ArrayRef> = builders.into_iter().map(|b| b.finish()).collect();
+
+    RecordBatch::try_new(Arc::new(schema.clone()), arrays)
+        .map_err(|e| StoreError::InternalError(format!("failed to build RecordBatch: {e}")))
+}
+
+/// Conservative estimate of the number of payload bytes a row contributes to an
+/// Arrow `RecordBatch`. The dumper uses this to bound batch size so that no
+/// single 32-bit-offset string/binary column can exceed Arrow's 2 GiB offset
+/// limit while a large table is dumped (issue #6609). Variable-length payloads
+/// (`String`/`Bytes`) dominate that limit and are counted exactly; fixed-width
+/// values use their in-memory width.
+pub(crate) fn estimate_row_bytes(row: &OidRow) -> usize {
+    row.into_iter().map(estimate_value_bytes).sum()
+}
+
+fn estimate_value_bytes(value: &OidValue) -> usize {
+    match value {
+        OidValue::Null => 0,
+        OidValue::Bool(_) => 1,
+        OidValue::Int(_) => 4,
+        OidValue::Int8(_) => 8,
+        OidValue::Timestamp(_) => 8,
+        OidValue::Int4Range(_, _) => 8,
+        OidValue::Bytes(v) => v.as_ref().len(),
+        OidValue::String(v) => v.len(),
+        // Decimals are dumped as their decimal-string representation; 64 bytes
+        // is a comfortable upper bound for realistic values.
+        OidValue::BigDecimal(_) => 64,
+        OidValue::BoolArray(v) => v.len(),
+        OidValue::Ints(v) => v.len() * 4,
+        OidValue::Int8Array(v) => v.len() * 8,
+        OidValue::TimestampArray(v) => v.len() * 8,
+        OidValue::BytesArray(v) => v.iter().map(|b| b.as_ref().len()).sum(),
+        OidValue::StringArray(v) => v.iter().map(|s| s.len()).sum(),
+        OidValue::BigDecimalArray(v) => v.len() * 64,
+    }
+}
+
+/// A type-erased column builder that wraps the appropriate Arrow array builder.
+enum ColumnBuilder {
+    Boolean(BooleanBuilder),
+    Int32(Int32Builder),
+    Int64(Int64Builder),
+    Binary(BinaryBuilder),
+    Utf8(StringBuilder),
+    TimestampMicro(TimestampMicrosecondBuilder),
+    BooleanList(ListBuilder<BooleanBuilder>),
+    Int32List(ListBuilder<Int32Builder>),
+    Int64List(ListBuilder<Int64Builder>),
+    BinaryList(ListBuilder<BinaryBuilder>),
+    Utf8List(ListBuilder<StringBuilder>),
+    TimestampMicroList(ListBuilder<TimestampMicrosecondBuilder>),
+}
+
+impl ColumnBuilder {
+    fn new(data_type: &DataType, capacity: usize) -> Result<Self, StoreError> {
+        match data_type {
+            DataType::Boolean => Ok(Self::Boolean(BooleanBuilder::with_capacity(capacity))),
+            DataType::Int32 => Ok(Self::Int32(Int32Builder::with_capacity(capacity))),
+            DataType::Int64 => Ok(Self::Int64(Int64Builder::with_capacity(capacity))),
+            DataType::Binary => Ok(Self::Binary(BinaryBuilder::with_capacity(capacity, 0))),
+            DataType::Utf8 => Ok(Self::Utf8(StringBuilder::with_capacity(capacity, 0))),
+            DataType::Timestamp(arrow::datatypes::TimeUnit::Microsecond, None) => Ok(
+                Self::TimestampMicro(TimestampMicrosecondBuilder::with_capacity(capacity)),
+            ),
+            DataType::List(inner) => match inner.data_type() {
+                DataType::Boolean => Ok(Self::BooleanList(ListBuilder::with_capacity(
+                    BooleanBuilder::new(),
+                    capacity,
+                ))),
+                DataType::Int32 => Ok(Self::Int32List(ListBuilder::with_capacity(
+                    Int32Builder::new(),
+                    capacity,
+                ))),
+                DataType::Int64 => Ok(Self::Int64List(ListBuilder::with_capacity(
+                    Int64Builder::new(),
+                    capacity,
+                ))),
+                DataType::Binary => Ok(Self::BinaryList(ListBuilder::with_capacity(
+                    BinaryBuilder::new(),
+                    capacity,
+                ))),
+                DataType::Utf8 => Ok(Self::Utf8List(ListBuilder::with_capacity(
+                    StringBuilder::new(),
+                    capacity,
+                ))),
+                DataType::Timestamp(arrow::datatypes::TimeUnit::Microsecond, None) => {
+                    Ok(Self::TimestampMicroList(ListBuilder::with_capacity(
+                        TimestampMicrosecondBuilder::new(),
+                        capacity,
+                    )))
+                }
+                other => Err(StoreError::InternalError(format!(
+                    "unsupported list element type: {other:?}"
+                ))),
+            },
+            other => Err(StoreError::InternalError(format!(
+                "unsupported Arrow data type for column builder: {other:?}"
+            ))),
+        }
+    }
+
+    fn append(&mut self, value: &OidValue, row_idx: usize) -> Result<(), StoreError> {
+        match (self, value) {
+            // Null for any builder type
+            (Self::Boolean(b), OidValue::Null) => b.append_null(),
+            (Self::Int32(b), OidValue::Null) => b.append_null(),
+            (Self::Int64(b), OidValue::Null) => b.append_null(),
+            (Self::Binary(b), OidValue::Null) => b.append_null(),
+            (Self::Utf8(b), OidValue::Null) => b.append_null(),
+            (Self::TimestampMicro(b), OidValue::Null) => b.append_null(),
+            (Self::BooleanList(b), OidValue::Null) => b.append_null(),
+            (Self::Int32List(b), OidValue::Null) => b.append_null(),
+            (Self::Int64List(b), OidValue::Null) => b.append_null(),
+            (Self::BinaryList(b), OidValue::Null) => b.append_null(),
+            (Self::Utf8List(b), OidValue::Null) => b.append_null(),
+            (Self::TimestampMicroList(b), OidValue::Null) => b.append_null(),
+
+            // Scalar values
+            (Self::Boolean(b), OidValue::Bool(v)) => b.append_value(*v),
+            (Self::Int32(b), OidValue::Int(v)) => b.append_value(*v),
+            (Self::Int64(b), OidValue::Int8(v)) => b.append_value(*v),
+            (Self::Int64(b), OidValue::Int(v)) => b.append_value(*v as i64),
+            (Self::Binary(b), OidValue::Bytes(v)) => b.append_value(v.as_ref()),
+            (Self::Utf8(b), OidValue::String(v)) => b.append_value(v),
+            (Self::Utf8(b), OidValue::BigDecimal(v)) => b.append_value(v.to_string()),
+            (Self::TimestampMicro(b), OidValue::Timestamp(v)) => {
+                b.append_value(v.as_microseconds_since_epoch())
+            }
+
+            // Array values
+            (Self::BooleanList(b), OidValue::BoolArray(vals)) => {
+                for v in vals {
+                    b.values().append_value(*v);
+                }
+                b.append(true);
+            }
+            (Self::Int32List(b), OidValue::Ints(vals)) => {
+                for v in vals {
+                    b.values().append_value(*v);
+                }
+                b.append(true);
+            }
+            (Self::Int64List(b), OidValue::Int8Array(vals)) => {
+                for v in vals {
+                    b.values().append_value(*v);
+                }
+                b.append(true);
+            }
+            (Self::BinaryList(b), OidValue::BytesArray(vals)) => {
+                for v in vals {
+                    b.values().append_value(v.as_ref());
+                }
+                b.append(true);
+            }
+            (Self::Utf8List(b), OidValue::StringArray(vals)) => {
+                for v in vals {
+                    b.values().append_value(v);
+                }
+                b.append(true);
+            }
+            (Self::Utf8List(b), OidValue::BigDecimalArray(vals)) => {
+                for v in vals {
+                    b.values().append_value(v.to_string());
+                }
+                b.append(true);
+            }
+            (Self::TimestampMicroList(b), OidValue::TimestampArray(vals)) => {
+                for v in vals {
+                    b.values().append_value(v.as_microseconds_since_epoch());
+                }
+                b.append(true);
+            }
+
+            (builder, value) => {
+                return Err(StoreError::InternalError(format!(
+                    "row {row_idx}: type mismatch - cannot append {value:?} to {builder_type}",
+                    builder_type = builder.type_name()
+                )));
+            }
+        }
+        Ok(())
+    }
+
+    fn finish(self) -> ArrayRef {
+        match self {
+            Self::Boolean(mut b) => Arc::new(b.finish()),
+            Self::Int32(mut b) => Arc::new(b.finish()),
+            Self::Int64(mut b) => Arc::new(b.finish()),
+            Self::Binary(mut b) => Arc::new(b.finish()),
+            Self::Utf8(mut b) => Arc::new(b.finish()),
+            Self::TimestampMicro(mut b) => Arc::new(b.finish()),
+            Self::BooleanList(mut b) => Arc::new(b.finish()),
+            Self::Int32List(mut b) => Arc::new(b.finish()),
+            Self::Int64List(mut b) => Arc::new(b.finish()),
+            Self::BinaryList(mut b) => Arc::new(b.finish()),
+            Self::Utf8List(mut b) => Arc::new(b.finish()),
+            Self::TimestampMicroList(mut b) => Arc::new(b.finish()),
+        }
+    }
+
+    fn type_name(&self) -> &'static str {
+        match self {
+            Self::Boolean(_) => "Boolean",
+            Self::Int32(_) => "Int32",
+            Self::Int64(_) => "Int64",
+            Self::Binary(_) => "Binary",
+            Self::Utf8(_) => "Utf8",
+            Self::TimestampMicro(_) => "TimestampMicrosecond",
+            Self::BooleanList(_) => "List<Boolean>",
+            Self::Int32List(_) => "List<Int32>",
+            Self::Int64List(_) => "List<Int64>",
+            Self::BinaryList(_) => "List<Binary>",
+            Self::Utf8List(_) => "List<Utf8>",
+            Self::TimestampMicroList(_) => "List<TimestampMicrosecond>",
+        }
+    }
+}
+
+/// A row extracted from a Parquet file, ready for insertion into an entity table.
+pub struct RestoreRow {
+    pub vid: i64,
+    pub block: BlockNumber,
+    /// `None` for immutable entities, `Some` for mutable (block_range_end).
+    pub block_range_end: Option<Option<BlockNumber>>,
+    pub causality_region: Option<i32>,
+    pub values: Vec<(Word, Value)>,
+}
+
+/// Convert an Arrow `RecordBatch` back into `RestoreRow`s using the entity
+/// table's schema to guide type interpretation.
+///
+/// The batch must follow the column layout produced by `schema::arrow_schema`:
+/// `vid`, block tracking columns, optional `causality_region`, then data columns.
+pub fn record_batch_to_restore_rows(
+    batch: &RecordBatch,
+    table: &Table,
+) -> Result<Vec<RestoreRow>, StoreError> {
+    let num_rows = batch.num_rows();
+    let mut rows = Vec::with_capacity(num_rows);
+
+    // System column indices follow the layout in schema::arrow_schema
+    let vid_array = downcast_i64(batch.column(0), "vid")?;
+
+    let mut col_idx = 1;
+
+    // Block tracking
+    let block_array = downcast_i32(batch.column(col_idx), "block")?;
+    col_idx += 1;
+
+    let block_end_array = if !table.immutable {
+        let arr = downcast_i32(batch.column(col_idx), "block_range_end")?;
+        col_idx += 1;
+        Some(arr)
+    } else {
+        None
+    };
+
+    // Causality region
+    let cr_array = if table.has_causality_region {
+        let arr = downcast_i32(batch.column(col_idx), "causality_region")?;
+        col_idx += 1;
+        Some(arr)
+    } else {
+        None
+    };
+
+    // Data columns: iterate table columns, skip fulltext
+    let data_columns: Vec<_> = table.columns.iter().filter(|c| !c.is_fulltext()).collect();
+
+    // Pre-resolve Arrow column references for data columns
+    let arrow_data_cols: Vec<_> = data_columns
+        .iter()
+        .enumerate()
+        .map(|(i, _)| batch.column(col_idx + i))
+        .collect();
+
+    for row in 0..num_rows {
+        let vid = vid_array.value(row);
+        let block = block_array.value(row);
+
+        let block_range_end = block_end_array.as_ref().map(|arr| {
+            if arr.is_null(row) {
+                None
+            } else {
+                Some(arr.value(row))
+            }
+        });
+
+        let causality_region = cr_array.as_ref().map(|arr| arr.value(row));
+
+        let mut values = Vec::with_capacity(data_columns.len());
+        for (i, col) in data_columns.iter().enumerate() {
+            let arrow_col = arrow_data_cols[i].as_ref();
+            let value = if arrow_col.is_null(row) {
+                Value::Null
+            } else if col.is_list() {
+                extract_list_value(arrow_col, row, &col.column_type)?
+            } else {
+                extract_scalar_value(arrow_col, row, &col.column_type)?
+            };
+            values.push((Word::from(col.name.as_str()), value));
+        }
+
+        rows.push(RestoreRow {
+            vid,
+            block,
+            block_range_end,
+            causality_region,
+            values,
+        });
+    }
+
+    Ok(rows)
+}
+
+/// A row extracted from a `data_sources$` Parquet file.
+pub struct DataSourceRestoreRow {
+    pub vid: i64,
+    pub block_range_start: BlockNumber,
+    pub block_range_end: Option<BlockNumber>,
+    pub causality_region: i32,
+    pub manifest_idx: i32,
+    pub parent: Option<i32>,
+    pub id: Option<Vec<u8>>,
+    pub param: Option<Vec<u8>>,
+    pub context: Option<String>,
+    pub done_at: Option<i32>,
+}
+
+/// Convert an Arrow `RecordBatch` from a `data_sources$` Parquet file
+/// into `DataSourceRestoreRow`s.
+///
+/// The batch must follow the fixed column layout from
+/// `schema::data_sources_arrow_schema`.
+pub fn record_batch_to_data_source_rows(
+    batch: &RecordBatch,
+) -> Result<Vec<DataSourceRestoreRow>, StoreError> {
+    let num_rows = batch.num_rows();
+    let mut rows = Vec::with_capacity(num_rows);
+
+    let vid = downcast_i64(batch.column(0), "vid")?;
+    let block_start = downcast_i32(batch.column(1), "block_range_start")?;
+    let block_end = downcast_i32(batch.column(2), "block_range_end")?;
+    let cr = downcast_i32(batch.column(3), "causality_region")?;
+    let manifest_idx = downcast_i32(batch.column(4), "manifest_idx")?;
+    let parent = downcast_i32(batch.column(5), "parent")?;
+    let id_arr = downcast_binary(batch.column(6), "id")?;
+    let param_arr = downcast_binary(batch.column(7), "param")?;
+    let context_arr = downcast_utf8(batch.column(8), "context")?;
+    let done_at = downcast_i32(batch.column(9), "done_at")?;
+
+    for row in 0..num_rows {
+        rows.push(DataSourceRestoreRow {
+            vid: vid.value(row),
+            block_range_start: block_start.value(row),
+            block_range_end: if block_end.is_null(row) {
+                None
+            } else {
+                Some(block_end.value(row))
+            },
+            causality_region: cr.value(row),
+            manifest_idx: manifest_idx.value(row),
+            parent: if parent.is_null(row) {
+                None
+            } else {
+                Some(parent.value(row))
+            },
+            id: if id_arr.is_null(row) {
+                None
+            } else {
+                Some(id_arr.value(row).to_vec())
+            },
+            param: if param_arr.is_null(row) {
+                None
+            } else {
+                Some(param_arr.value(row).to_vec())
+            },
+            context: if context_arr.is_null(row) {
+                None
+            } else {
+                Some(context_arr.value(row).to_string())
+            },
+            done_at: if done_at.is_null(row) {
+                None
+            } else {
+                Some(done_at.value(row))
+            },
+        });
+    }
+
+    Ok(rows)
+}
+
+/// Load clamp files and build a `vid → block_range_end` map.
+///
+/// Each clamp parquet file contains rows with `(vid: i64, block_range_end: i32)`.
+/// Later clamp files overwrite earlier ones for the same vid (only the
+/// latest value matters).
+pub fn load_clamps(
+    dir: &Path,
+    clamps: &[crate::parquet::writer::ChunkInfo],
+) -> Result<HashMap<i64, i32>, StoreError> {
+    let mut map = HashMap::new();
+    for chunk_info in clamps {
+        let path = dir.join(&chunk_info.file);
+        let batches = crate::parquet::reader::read_batches(&path)?;
+        for batch in batches {
+            let batch = batch?;
+            let vid_arr = downcast_i64(batch.column(0), "vid")?;
+            let bre_arr = downcast_i32(batch.column(1), "block_range_end")?;
+            for row in 0..batch.num_rows() {
+                map.insert(vid_arr.value(row), bre_arr.value(row));
+            }
+        }
+    }
+    Ok(map)
+}
+
+// -- Downcasting helpers --
+
+fn downcast_i64<'a>(array: &'a ArrayRef, name: &str) -> Result<&'a Int64Array, StoreError> {
+    array.as_any().downcast_ref::<Int64Array>().ok_or_else(|| {
+        StoreError::InternalError(format!("expected Int64Array for column '{name}'"))
+    })
+}
+
+fn downcast_i32<'a>(array: &'a ArrayRef, name: &str) -> Result<&'a Int32Array, StoreError> {
+    array.as_any().downcast_ref::<Int32Array>().ok_or_else(|| {
+        StoreError::InternalError(format!("expected Int32Array for column '{name}'"))
+    })
+}
+
+fn downcast_binary<'a>(array: &'a ArrayRef, name: &str) -> Result<&'a BinaryArray, StoreError> {
+    array.as_any().downcast_ref::<BinaryArray>().ok_or_else(|| {
+        StoreError::InternalError(format!("expected BinaryArray for column '{name}'"))
+    })
+}
+
+fn downcast_utf8<'a>(array: &'a ArrayRef, name: &str) -> Result<&'a StringArray, StoreError> {
+    array.as_any().downcast_ref::<StringArray>().ok_or_else(|| {
+        StoreError::InternalError(format!("expected StringArray for column '{name}'"))
+    })
+}
+
+/// Extract a scalar `Value` from an Arrow array at the given row.
+///
+/// The `column_type` determines how to interpret the Arrow data (e.g.
+/// a Utf8 array might be String, BigInt, or BigDecimal).
+fn extract_scalar_value(
+    array: &dyn Array,
+    row: usize,
+    column_type: &ColumnType,
+) -> Result<Value, StoreError> {
+    match column_type {
+        ColumnType::Boolean => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<BooleanArray>()
+                .ok_or_else(|| err("BooleanArray", "Boolean"))?;
+            Ok(Value::Bool(arr.value(row)))
+        }
+        ColumnType::Int => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<Int32Array>()
+                .ok_or_else(|| err("Int32Array", "Int"))?;
+            Ok(Value::Int(arr.value(row)))
+        }
+        ColumnType::Int8 => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<Int64Array>()
+                .ok_or_else(|| err("Int64Array", "Int8"))?;
+            Ok(Value::Int8(arr.value(row)))
+        }
+        ColumnType::Bytes => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<BinaryArray>()
+                .ok_or_else(|| err("BinaryArray", "Bytes"))?;
+            Ok(Value::Bytes(scalar::Bytes::from(arr.value(row))))
+        }
+        ColumnType::BigInt => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<StringArray>()
+                .ok_or_else(|| err("StringArray", "BigInt"))?;
+            let s = arr.value(row);
+            let big = scalar::BigInt::from_str(s)
+                .map_err(|e| StoreError::InternalError(format!("invalid BigInt '{s}': {e}")))?;
+            Ok(Value::BigInt(big))
+        }
+        ColumnType::BigDecimal => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<StringArray>()
+                .ok_or_else(|| err("StringArray", "BigDecimal"))?;
+            let s = arr.value(row);
+            let bd = scalar::BigDecimal::from_str(s)
+                .map_err(|e| StoreError::InternalError(format!("invalid BigDecimal '{s}': {e}")))?;
+            Ok(Value::BigDecimal(bd))
+        }
+        ColumnType::Timestamp => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<TimestampMicrosecondArray>()
+                .ok_or_else(|| err("TimestampMicrosecondArray", "Timestamp"))?;
+            let micros = arr.value(row);
+            let ts = scalar::Timestamp::from_microseconds_since_epoch(micros).map_err(|e| {
+                StoreError::InternalError(format!("invalid Timestamp {micros}: {e}"))
+            })?;
+            Ok(Value::Timestamp(ts))
+        }
+        ColumnType::String | ColumnType::Enum(_) => {
+            let arr = array
+                .as_any()
+                .downcast_ref::<StringArray>()
+                .ok_or_else(|| err("StringArray", "String/Enum"))?;
+            Ok(Value::String(arr.value(row).to_string()))
+        }
+        ColumnType::TSVector(_) => Err(StoreError::InternalError(
+            "TSVector columns should not appear in parquet data".into(),
+        )),
+    }
+}
+
+/// Extract a list `Value` from a `ListArray` at the given row.
+fn extract_list_value(
+    array: &dyn Array,
+    row: usize,
+    column_type: &ColumnType,
+) -> Result<Value, StoreError> {
+    let list_arr = array
+        .as_any()
+        .downcast_ref::<ListArray>()
+        .ok_or_else(|| StoreError::InternalError("expected ListArray for list column".into()))?;
+
+    let inner = list_arr.value(row);
+    let len = inner.len();
+    let mut items = Vec::with_capacity(len);
+
+    for i in 0..len {
+        if inner.is_null(i) {
+            items.push(Value::Null);
+        } else {
+            items.push(extract_scalar_value(inner.as_ref(), i, column_type)?);
+        }
+    }
+
+    Ok(Value::List(items))
+}
+
+fn err(expected: &str, column_type: &str) -> StoreError {
+    StoreError::InternalError(format!("expected {expected} for {column_type} column"))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeSet;
+
+    use arrow::array::{
+        Array, BinaryArray, BooleanArray, Int32Array, Int64Array, ListArray, StringArray,
+        TimestampMicrosecondArray,
+    };
+    use arrow::datatypes::{Field, Schema, TimeUnit};
+    use graph::data::store::scalar::{BigDecimal, Bytes, Timestamp};
+    use graph::prelude::DeploymentHash;
+    use graph::schema::InputSchema;
+    use std::str::FromStr;
+    use std::sync::Arc;
+
+    use super::*;
+    use crate::layout_for_tests::{Catalog, Layout, Namespace, make_dummy_site};
+    use crate::parquet::schema::arrow_schema;
+
+    fn make_row(values: Vec<OidValue>) -> OidRow {
+        values.into_iter().collect()
+    }
+
+    #[test]
+    fn scalar_columns() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("block$", DataType::Int32, false),
+            Field::new("id", DataType::Utf8, false),
+            Field::new("flag", DataType::Boolean, false),
+            Field::new("data", DataType::Binary, false),
+            Field::new("amount", DataType::Utf8, false),
+            Field::new(
+                "ts",
+                DataType::Timestamp(TimeUnit::Microsecond, None),
+                false,
+            ),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::String("token-1".to_string()),
+                OidValue::Bool(true),
+                OidValue::Bytes(Bytes::from(vec![0xab, 0xcd])),
+                OidValue::BigDecimal(BigDecimal::from_str("12345678901234567890").unwrap()),
+                OidValue::Timestamp(
+                    Timestamp::from_microseconds_since_epoch(1_000_000_000_000).unwrap(),
+                ),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(101),
+                OidValue::String("token-2".to_string()),
+                OidValue::Bool(false),
+                OidValue::Bytes(Bytes::from(vec![0xff])),
+                OidValue::BigDecimal(BigDecimal::from_str("999").unwrap()),
+                OidValue::Timestamp(
+                    Timestamp::from_microseconds_since_epoch(2_000_000_000_000).unwrap(),
+                ),
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        assert_eq!(batch.num_rows(), 2);
+        assert_eq!(batch.num_columns(), 7);
+
+        // vid
+        let vid = batch
+            .column(0)
+            .as_any()
+            .downcast_ref::<Int64Array>()
+            .unwrap();
+        assert_eq!(vid.value(0), 1);
+        assert_eq!(vid.value(1), 2);
+
+        // block$
+        let block = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<Int32Array>()
+            .unwrap();
+        assert_eq!(block.value(0), 100);
+        assert_eq!(block.value(1), 101);
+
+        // id
+        let id = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<StringArray>()
+            .unwrap();
+        assert_eq!(id.value(0), "token-1");
+        assert_eq!(id.value(1), "token-2");
+
+        // flag
+        let flag = batch
+            .column(3)
+            .as_any()
+            .downcast_ref::<BooleanArray>()
+            .unwrap();
+        assert!(flag.value(0));
+        assert!(!flag.value(1));
+
+        // data
+        let data = batch
+            .column(4)
+            .as_any()
+            .downcast_ref::<BinaryArray>()
+            .unwrap();
+        assert_eq!(data.value(0), &[0xab, 0xcd]);
+        assert_eq!(data.value(1), &[0xff]);
+
+        // amount (BigDecimal → Utf8)
+        let amount = batch
+            .column(5)
+            .as_any()
+            .downcast_ref::<StringArray>()
+            .unwrap();
+        assert_eq!(amount.value(0), "12345678901234567890");
+        assert_eq!(amount.value(1), "999");
+
+        // ts
+        let ts = batch
+            .column(6)
+            .as_any()
+            .downcast_ref::<TimestampMicrosecondArray>()
+            .unwrap();
+        assert_eq!(ts.value(0), 1_000_000_000_000);
+        assert_eq!(ts.value(1), 2_000_000_000_000);
+    }
+
+    #[test]
+    fn nullable_columns() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("name", DataType::Utf8, true),
+            Field::new("count", DataType::Int32, true),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::String("hello".to_string()),
+                OidValue::Int(42),
+            ]),
+            make_row(vec![OidValue::Int8(2), OidValue::Null, OidValue::Null]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        assert_eq!(batch.num_rows(), 2);
+
+        let name = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<StringArray>()
+            .unwrap();
+        assert!(!name.is_null(0));
+        assert_eq!(name.value(0), "hello");
+        assert!(name.is_null(1));
+
+        let count = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<Int32Array>()
+            .unwrap();
+        assert_eq!(count.value(0), 42);
+        assert!(count.is_null(1));
+    }
+
+    #[test]
+    fn list_columns() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new(
+                "tags",
+                DataType::List(Arc::new(Field::new("item", DataType::Utf8, true))),
+                false,
+            ),
+            Field::new(
+                "scores",
+                DataType::List(Arc::new(Field::new("item", DataType::Int32, true))),
+                true,
+            ),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::StringArray(vec!["foo".to_string(), "bar".to_string()]),
+                OidValue::Ints(vec![10, 20, 30]),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::StringArray(vec![]),
+                OidValue::Null,
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        assert_eq!(batch.num_rows(), 2);
+
+        // tags
+        let tags = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<ListArray>()
+            .unwrap();
+        let tags_0 = tags.value(0);
+        let tags_0_str = tags_0.as_any().downcast_ref::<StringArray>().unwrap();
+        assert_eq!(tags_0_str.len(), 2);
+        assert_eq!(tags_0_str.value(0), "foo");
+        assert_eq!(tags_0_str.value(1), "bar");
+
+        let tags_1 = tags.value(1);
+        let tags_1_str = tags_1.as_any().downcast_ref::<StringArray>().unwrap();
+        assert_eq!(tags_1_str.len(), 0);
+
+        // scores
+        let scores = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<ListArray>()
+            .unwrap();
+        let scores_0 = scores.value(0);
+        let scores_0_int = scores_0.as_any().downcast_ref::<Int32Array>().unwrap();
+        assert_eq!(scores_0_int.len(), 3);
+        assert_eq!(scores_0_int.value(0), 10);
+        assert_eq!(scores_0_int.value(2), 30);
+        assert!(scores.is_null(1));
+    }
+
+    #[test]
+    fn empty_batch() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("name", DataType::Utf8, false),
+        ]);
+
+        let batch = rows_to_record_batch(&schema, &[]).unwrap();
+        assert_eq!(batch.num_rows(), 0);
+        assert_eq!(batch.num_columns(), 2);
+    }
+
+    #[test]
+    fn column_count_mismatch_errors() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("name", DataType::Utf8, false),
+        ]);
+
+        let rows = vec![make_row(vec![OidValue::Int8(1)])];
+        let err = rows_to_record_batch(&schema, &rows).unwrap_err();
+        assert!(err.to_string().contains("1 values but schema has 2 fields"));
+    }
+
+    #[test]
+    fn type_mismatch_errors() {
+        let schema = Schema::new(vec![Field::new("vid", DataType::Int64, false)]);
+        let rows = vec![make_row(vec![OidValue::String("wrong".to_string())])];
+        let err = rows_to_record_batch(&schema, &rows).unwrap_err();
+        assert!(err.to_string().contains("type mismatch"));
+    }
+
+    // -- Restore direction tests --
+
+    fn test_layout(gql: &str) -> Layout {
+        let subgraph = DeploymentHash::new("subgraph").unwrap();
+        let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
+        let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
+        let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
+        let catalog =
+            Catalog::for_tests(site.clone(), BTreeSet::new()).expect("Can not create catalog");
+        Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
+    }
+
+    fn test_layout_with_causality(gql: &str, entity_name: &str) -> Layout {
+        let subgraph = DeploymentHash::new("subgraph").unwrap();
+        let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
+        let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
+        let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
+        let entity_type = schema.entity_type(entity_name).unwrap();
+        let ents = BTreeSet::from_iter(vec![entity_type]);
+        let catalog = Catalog::for_tests(site.clone(), ents).expect("Can not create catalog");
+        Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
+    }
+
+    #[test]
+    fn restore_immutable_entity() {
+        let layout = test_layout(
+            "type Token @entity(immutable: true) { id: ID!, name: String!, decimals: Int! }",
+        );
+        let table = layout.table("token").unwrap();
+        let schema = arrow_schema(table);
+
+        // Build a RecordBatch via the dump direction
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::String("token-1".into()),
+                OidValue::String("Token One".into()),
+                OidValue::Int(18),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(101),
+                OidValue::String("token-2".into()),
+                OidValue::String("Token Two".into()),
+                OidValue::Int(6),
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        let restore_rows = record_batch_to_restore_rows(&batch, table).unwrap();
+
+        assert_eq!(restore_rows.len(), 2);
+
+        // Row 0
+        assert_eq!(restore_rows[0].vid, 1);
+        assert_eq!(restore_rows[0].block, 100);
+        assert!(restore_rows[0].block_range_end.is_none()); // immutable
+        assert!(restore_rows[0].causality_region.is_none());
+
+        assert_eq!(restore_rows[0].values.len(), 3); // id, name, decimals
+        assert_eq!(restore_rows[0].values[0].0.as_str(), "id");
+        assert_eq!(restore_rows[0].values[0].1, Value::String("token-1".into()));
+        assert_eq!(restore_rows[0].values[1].0.as_str(), "name");
+        assert_eq!(
+            restore_rows[0].values[1].1,
+            Value::String("Token One".into())
+        );
+        assert_eq!(restore_rows[0].values[2].0.as_str(), "decimals");
+        assert_eq!(restore_rows[0].values[2].1, Value::Int(18));
+
+        // Row 1
+        assert_eq!(restore_rows[1].vid, 2);
+        assert_eq!(restore_rows[1].block, 101);
+        assert_eq!(restore_rows[1].values[2].1, Value::Int(6));
+    }
+
+    #[test]
+    fn restore_mutable_entity_with_causality() {
+        let layout = test_layout_with_causality(
+            "type Transfer @entity { id: ID!, amount: BigInt! }",
+            "Transfer",
+        );
+        let table = layout.table("transfer").unwrap();
+        let schema = arrow_schema(table);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(10),
+                OidValue::Int(500),
+                OidValue::Int(600),
+                OidValue::Int(0),
+                OidValue::String("tx-1".into()),
+                OidValue::String("12345678901234567890".into()),
+            ]),
+            make_row(vec![
+                OidValue::Int8(11),
+                OidValue::Int(550),
+                OidValue::Null, // unbounded (current)
+                OidValue::Int(1),
+                OidValue::String("tx-2".into()),
+                OidValue::String("99999".into()),
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        let restore_rows = record_batch_to_restore_rows(&batch, table).unwrap();
+
+        assert_eq!(restore_rows.len(), 2);
+
+        // Row 0: closed block range
+        assert_eq!(restore_rows[0].vid, 10);
+        assert_eq!(restore_rows[0].block, 500);
+        assert_eq!(restore_rows[0].block_range_end, Some(Some(600)));
+        assert_eq!(restore_rows[0].causality_region, Some(0));
+        assert_eq!(restore_rows[0].values[0].0.as_str(), "id");
+        assert_eq!(restore_rows[0].values[0].1, Value::String("tx-1".into()));
+        assert_eq!(restore_rows[0].values[1].0.as_str(), "amount");
+        assert_eq!(
+            restore_rows[0].values[1].1,
+            Value::BigInt(scalar::BigInt::from_str("12345678901234567890").unwrap())
+        );
+
+        // Row 1: open block range (current)
+        assert_eq!(restore_rows[1].vid, 11);
+        assert_eq!(restore_rows[1].block, 550);
+        assert_eq!(restore_rows[1].block_range_end, Some(None)); // unbounded
+        assert_eq!(restore_rows[1].causality_region, Some(1));
+    }
+
+    #[test]
+    fn restore_nullable_and_list_columns() {
+        let layout = test_layout(
+            "type Pool @entity(immutable: true) { id: ID!, tags: [String!]!, description: String }",
+        );
+        let table = layout.table("pool").unwrap();
+        let schema = arrow_schema(table);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::String("pool-1".into()),
+                OidValue::StringArray(vec!["defi".into(), "amm".into()]),
+                OidValue::String("A pool".into()),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(101),
+                OidValue::String("pool-2".into()),
+                OidValue::StringArray(vec![]),
+                OidValue::Null,
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        let restore_rows = record_batch_to_restore_rows(&batch, table).unwrap();
+
+        assert_eq!(restore_rows.len(), 2);
+
+        // Row 0: tags is a list of strings
+        let tags_val = &restore_rows[0].values[1].1;
+        match tags_val {
+            Value::List(items) => {
+                assert_eq!(items.len(), 2);
+                assert_eq!(items[0], Value::String("defi".into()));
+                assert_eq!(items[1], Value::String("amm".into()));
+            }
+            other => panic!("expected List, got {:?}", other),
+        }
+        assert_eq!(restore_rows[0].values[2].1, Value::String("A pool".into()));
+
+        // Row 1: empty list and null description
+        let tags_val = &restore_rows[1].values[1].1;
+        match tags_val {
+            Value::List(items) => assert_eq!(items.len(), 0),
+            other => panic!("expected List, got {:?}", other),
+        }
+        assert_eq!(restore_rows[1].values[2].1, Value::Null);
+    }
+
+    #[test]
+    fn restore_all_scalar_types() {
+        let layout = test_layout(
+            "type Everything @entity(immutable: true) { \
+                id: ID!, \
+                flag: Boolean!, \
+                small: Int!, \
+                big: Int8!, \
+                amount: BigInt!, \
+                price: BigDecimal!, \
+                data: Bytes!, \
+                ts: Timestamp!, \
+                label: String! \
+            }",
+        );
+        let table = layout.table("everything").unwrap();
+        let schema = arrow_schema(table);
+
+        let rows = vec![make_row(vec![
+            OidValue::Int8(1),
+            OidValue::Int(100),
+            OidValue::String("thing-1".into()),
+            OidValue::Bool(true),
+            OidValue::Int(42),
+            OidValue::Int8(9_999_999),
+            OidValue::String("12345678901234567890".into()),
+            OidValue::BigDecimal(BigDecimal::from_str("3.14159").unwrap()),
+            OidValue::Bytes(Bytes::from(vec![0xab, 0xcd])),
+            OidValue::Timestamp(Timestamp::from_microseconds_since_epoch(1_000_000).unwrap()),
+            OidValue::String("hello".into()),
+        ])];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        let restore_rows = record_batch_to_restore_rows(&batch, table).unwrap();
+
+        assert_eq!(restore_rows.len(), 1);
+        let vals = &restore_rows[0].values;
+
+        // id
+        assert_eq!(vals[0].1, Value::String("thing-1".into()));
+        // flag
+        assert_eq!(vals[1].1, Value::Bool(true));
+        // small
+        assert_eq!(vals[2].1, Value::Int(42));
+        // big
+        assert_eq!(vals[3].1, Value::Int8(9_999_999));
+        // amount (BigInt)
+        assert_eq!(
+            vals[4].1,
+            Value::BigInt(scalar::BigInt::from_str("12345678901234567890").unwrap())
+        );
+        // price (BigDecimal)
+        assert_eq!(
+            vals[5].1,
+            Value::BigDecimal(BigDecimal::from_str("3.14159").unwrap())
+        );
+        // data (Bytes)
+        assert_eq!(vals[6].1, Value::Bytes(Bytes::from(vec![0xab, 0xcd])));
+        // ts (Timestamp)
+        assert_eq!(
+            vals[7].1,
+            Value::Timestamp(Timestamp::from_microseconds_since_epoch(1_000_000).unwrap())
+        );
+        // label
+        assert_eq!(vals[8].1, Value::String("hello".into()));
+    }
+
+    #[test]
+    fn restore_data_source_rows() {
+        use crate::parquet::schema::data_sources_arrow_schema;
+
+        let schema = data_sources_arrow_schema();
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::Int(200),
+                OidValue::Int(1),
+                OidValue::Int(0),
+                OidValue::Null,
+                OidValue::Null,
+                OidValue::Bytes(Bytes::from(vec![0x01, 0x02])),
+                OidValue::String(r#"{"key":"value"}"#.into()),
+                OidValue::Null,
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(150),
+                OidValue::Null, // unbounded
+                OidValue::Int(2),
+                OidValue::Int(1),
+                OidValue::Int(5),
+                OidValue::Bytes(Bytes::from(vec![0xaa])),
+                OidValue::Null,
+                OidValue::Null,
+                OidValue::Int(300),
+            ]),
+        ];
+
+        let batch = rows_to_record_batch(&schema, &rows).unwrap();
+        let ds_rows = record_batch_to_data_source_rows(&batch).unwrap();
+
+        assert_eq!(ds_rows.len(), 2);
+
+        // Row 0
+        assert_eq!(ds_rows[0].vid, 1);
+        assert_eq!(ds_rows[0].block_range_start, 100);
+        assert_eq!(ds_rows[0].block_range_end, Some(200));
+        assert_eq!(ds_rows[0].causality_region, 1);
+        assert_eq!(ds_rows[0].manifest_idx, 0);
+        assert!(ds_rows[0].parent.is_none());
+        assert!(ds_rows[0].id.is_none());
+        assert_eq!(ds_rows[0].param.as_deref(), Some(&[0x01, 0x02][..]));
+        assert_eq!(ds_rows[0].context.as_deref(), Some(r#"{"key":"value"}"#));
+        assert!(ds_rows[0].done_at.is_none());
+
+        // Row 1
+        assert_eq!(ds_rows[1].vid, 2);
+        assert_eq!(ds_rows[1].block_range_start, 150);
+        assert!(ds_rows[1].block_range_end.is_none());
+        assert_eq!(ds_rows[1].causality_region, 2);
+        assert_eq!(ds_rows[1].manifest_idx, 1);
+        assert_eq!(ds_rows[1].parent, Some(5));
+        assert_eq!(ds_rows[1].id.as_deref(), Some(&[0xaa][..]));
+        assert!(ds_rows[1].param.is_none());
+        assert!(ds_rows[1].context.is_none());
+        assert_eq!(ds_rows[1].done_at, Some(300));
+    }
+
+    #[test]
+    fn restore_empty_batch() {
+        let layout = test_layout("type Token @entity(immutable: true) { id: ID!, name: String! }");
+        let table = layout.table("token").unwrap();
+        let schema = arrow_schema(table);
+
+        let batch = rows_to_record_batch(&schema, &[]).unwrap();
+        let restore_rows = record_batch_to_restore_rows(&batch, table).unwrap();
+        assert!(restore_rows.is_empty());
+    }
+
+    #[test]
+    fn load_clamps_roundtrip() {
+        use crate::parquet::schema::clamp_arrow_schema;
+        use crate::parquet::writer::{ChunkInfo, ParquetChunkWriter};
+
+        let tmp_dir =
+            std::env::temp_dir().join(format!("graph_node_clamp_test_{}", std::process::id()));
+        std::fs::create_dir_all(&tmp_dir).unwrap();
+
+        let schema = clamp_arrow_schema();
+
+        // Write clamp file 1
+        let path1 = tmp_dir.join("clamp_000000.parquet");
+        let mut writer1 =
+            ParquetChunkWriter::new(path1, "clamp_000000.parquet".into(), &schema).unwrap();
+        let batch1 = arrow::array::RecordBatch::try_new(
+            Arc::new(schema.clone()),
+            vec![
+                Arc::new(Int64Array::from(vec![10, 20])),
+                Arc::new(Int32Array::from(vec![500, 600])),
+            ],
+        )
+        .unwrap();
+        writer1.write_batch(&batch1, 10, 20).unwrap();
+        let chunk1 = writer1.finish().unwrap();
+
+        // Write clamp file 2 (overwrites vid 20 with a different end)
+        let path2 = tmp_dir.join("clamp_000001.parquet");
+        let mut writer2 =
+            ParquetChunkWriter::new(path2, "clamp_000001.parquet".into(), &schema).unwrap();
+        let batch2 = arrow::array::RecordBatch::try_new(
+            Arc::new(schema.clone()),
+            vec![
+                Arc::new(Int64Array::from(vec![20, 30])),
+                Arc::new(Int32Array::from(vec![700, 800])),
+            ],
+        )
+        .unwrap();
+        writer2.write_batch(&batch2, 20, 30).unwrap();
+        let chunk2 = writer2.finish().unwrap();
+
+        let clamps = vec![
+            ChunkInfo {
+                file: chunk1.file,
+                ..chunk1
+            },
+            ChunkInfo {
+                file: chunk2.file,
+                ..chunk2
+            },
+        ];
+
+        let map = load_clamps(&tmp_dir, &clamps).unwrap();
+        assert_eq!(map.len(), 3);
+        assert_eq!(map[&10], 500);
+        assert_eq!(map[&20], 700); // overwritten by second clamp file
+        assert_eq!(map[&30], 800);
+
+        // Cleanup
+        let _ = std::fs::remove_dir_all(&tmp_dir);
+    }
+}
diff --git a/store/postgres/src/parquet/mod.rs b/store/postgres/src/parquet/mod.rs
new file mode 100644
index 00000000000..d436709199f
--- /dev/null
+++ b/store/postgres/src/parquet/mod.rs
@@ -0,0 +1,4 @@
+pub(crate) mod convert;
+pub(crate) mod reader;
+pub(crate) mod schema;
+pub(crate) mod writer;
diff --git a/store/postgres/src/parquet/reader.rs b/store/postgres/src/parquet/reader.rs
new file mode 100644
index 00000000000..38aaecf0523
--- /dev/null
+++ b/store/postgres/src/parquet/reader.rs
@@ -0,0 +1,310 @@
+use std::fs;
+use std::path::Path;
+
+use arrow::array::RecordBatch;
+use graph::components::store::StoreError;
+use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
+
+/// Open a Parquet file and return a lazy iterator over its record batches.
+///
+/// Each call to `next()` on the returned iterator reads one row group
+/// from disk, so only one batch is in memory at a time. The caller is
+/// responsible for iterating and processing batches incrementally.
+pub fn read_batches(
+    path: &Path,
+) -> Result<impl Iterator<Item = Result<RecordBatch, StoreError>>, StoreError> {
+    let display = path.display().to_string();
+    let file = fs::File::open(path).map_err(|e| {
+        StoreError::InternalError(format!("failed to open parquet file {display}: {e}"))
+    })?;
+
+    let reader = ParquetRecordBatchReaderBuilder::try_new(file)
+        .map_err(|e| {
+            StoreError::InternalError(format!(
+                "failed to create parquet reader for {display}: {e}"
+            ))
+        })?
+        .build()
+        .map_err(|e| {
+            StoreError::InternalError(format!("failed to build parquet reader for {display}: {e}"))
+        })?;
+
+    Ok(reader.into_iter().map(move |batch| {
+        batch.map_err(|e| {
+            StoreError::InternalError(format!("failed to read record batch from {display}: {e}"))
+        })
+    }))
+}
+
+/// Read all record batches from a Parquet file into memory.
+///
+/// This is a convenience wrapper around `read_batches` that collects
+/// all batches. Prefer `read_batches` for production code to avoid
+/// loading the entire file at once.
+#[cfg(test)]
+pub fn read_all_batches(path: &Path) -> Result<Vec<RecordBatch>, StoreError> {
+    read_batches(path)?.collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use arrow::array::{
+        Array, BinaryArray, BooleanArray, Int32Array, Int64Array, ListArray, StringArray,
+        TimestampMicrosecondArray,
+    };
+    use arrow::datatypes::{DataType, Field, Schema, TimeUnit};
+    use graph::data::store::scalar::{BigDecimal, Bytes, Timestamp};
+    use std::str::FromStr;
+
+    use super::*;
+    use crate::parquet::convert::rows_to_record_batch;
+    use crate::parquet::writer::ParquetChunkWriter;
+    use crate::relational::value::{OidRow, OidValue};
+
+    fn make_row(values: Vec<OidValue>) -> OidRow {
+        values.into_iter().collect()
+    }
+
+    struct TempFile(std::path::PathBuf);
+
+    impl TempFile {
+        fn new(name: &str) -> Self {
+            let path = std::env::temp_dir().join(format!(
+                "graph_node_reader_test_{}_{name}.parquet",
+                std::process::id()
+            ));
+            Self(path)
+        }
+
+        fn path(&self) -> &Path {
+            &self.0
+        }
+    }
+
+    impl Drop for TempFile {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_file(&self.0);
+        }
+    }
+
+    fn write_and_read(name: &str, schema: &Schema, rows: &[OidRow]) -> Vec<RecordBatch> {
+        let tmp = TempFile::new(name);
+        let batch = rows_to_record_batch(schema, rows).unwrap();
+
+        let min_vid = if rows.is_empty() { 0 } else { 1 };
+        let max_vid = rows.len() as i64;
+
+        let mut writer = ParquetChunkWriter::new(
+            tmp.path().to_path_buf(),
+            "test/chunk_000000.parquet".into(),
+            schema,
+        )
+        .unwrap();
+        writer.write_batch(&batch, min_vid, max_vid).unwrap();
+        writer.finish().unwrap();
+
+        read_all_batches(tmp.path()).unwrap()
+    }
+
+    #[test]
+    fn roundtrip_scalar_columns() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("block$", DataType::Int32, false),
+            Field::new("id", DataType::Utf8, false),
+            Field::new("flag", DataType::Boolean, true),
+            Field::new("data", DataType::Binary, true),
+            Field::new("amount", DataType::Utf8, false),
+            Field::new("ts", DataType::Timestamp(TimeUnit::Microsecond, None), true),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::String("token-1".into()),
+                OidValue::Bool(true),
+                OidValue::Bytes(Bytes::from(vec![0xab, 0xcd])),
+                OidValue::BigDecimal(BigDecimal::from_str("12345678901234567890").unwrap()),
+                OidValue::Timestamp(Timestamp::from_microseconds_since_epoch(1_000_000).unwrap()),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(101),
+                OidValue::String("token-2".into()),
+                OidValue::Null,
+                OidValue::Null,
+                OidValue::BigDecimal(BigDecimal::from_str("999").unwrap()),
+                OidValue::Null,
+            ]),
+        ];
+
+        let batches = write_and_read("scalar", &schema, &rows);
+        assert_eq!(batches.len(), 1);
+        let batch = &batches[0];
+        assert_eq!(batch.num_rows(), 2);
+        assert_eq!(batch.num_columns(), 7);
+        assert_eq!(batch.schema().fields().len(), schema.fields().len());
+
+        // Verify schema matches
+        for (got, expected) in batch.schema().fields().iter().zip(schema.fields().iter()) {
+            assert_eq!(got.name(), expected.name());
+            assert_eq!(got.data_type(), expected.data_type());
+        }
+
+        // Spot-check values
+        let vid = batch
+            .column(0)
+            .as_any()
+            .downcast_ref::<Int64Array>()
+            .unwrap();
+        assert_eq!(vid.value(0), 1);
+        assert_eq!(vid.value(1), 2);
+
+        let id = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<StringArray>()
+            .unwrap();
+        assert_eq!(id.value(0), "token-1");
+        assert_eq!(id.value(1), "token-2");
+
+        let flag = batch
+            .column(3)
+            .as_any()
+            .downcast_ref::<BooleanArray>()
+            .unwrap();
+        assert!(flag.value(0));
+        assert!(flag.is_null(1));
+
+        let data = batch
+            .column(4)
+            .as_any()
+            .downcast_ref::<BinaryArray>()
+            .unwrap();
+        assert_eq!(data.value(0), &[0xab, 0xcd]);
+        assert!(data.is_null(1));
+
+        let ts = batch
+            .column(6)
+            .as_any()
+            .downcast_ref::<TimestampMicrosecondArray>()
+            .unwrap();
+        assert_eq!(ts.value(0), 1_000_000);
+        assert!(ts.is_null(1));
+    }
+
+    #[test]
+    fn roundtrip_list_columns() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new(
+                "tags",
+                DataType::List(Arc::new(Field::new("item", DataType::Utf8, true))),
+                false,
+            ),
+            Field::new(
+                "scores",
+                DataType::List(Arc::new(Field::new("item", DataType::Int32, true))),
+                true,
+            ),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::StringArray(vec!["foo".into(), "bar".into()]),
+                OidValue::Ints(vec![10, 20]),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::StringArray(vec![]),
+                OidValue::Null,
+            ]),
+        ];
+
+        let batches = write_and_read("list", &schema, &rows);
+        assert_eq!(batches.len(), 1);
+        let batch = &batches[0];
+        assert_eq!(batch.num_rows(), 2);
+
+        let tags = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<ListArray>()
+            .unwrap();
+        let tags_0 = tags.value(0);
+        let tags_0_str = tags_0.as_any().downcast_ref::<StringArray>().unwrap();
+        assert_eq!(tags_0_str.len(), 2);
+        assert_eq!(tags_0_str.value(0), "foo");
+        assert_eq!(tags_0_str.value(1), "bar");
+
+        let tags_1 = tags.value(1);
+        let tags_1_str = tags_1.as_any().downcast_ref::<StringArray>().unwrap();
+        assert_eq!(tags_1_str.len(), 0);
+
+        let scores = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<ListArray>()
+            .unwrap();
+        assert!(!scores.is_null(0));
+        assert!(scores.is_null(1));
+    }
+
+    #[test]
+    fn roundtrip_mutable_block_range() {
+        let schema = Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("block_range_start", DataType::Int32, false),
+            Field::new("block_range_end", DataType::Int32, true),
+            Field::new("id", DataType::Utf8, false),
+        ]);
+
+        let rows = vec![
+            make_row(vec![
+                OidValue::Int8(1),
+                OidValue::Int(100),
+                OidValue::Int(200),
+                OidValue::String("a".into()),
+            ]),
+            make_row(vec![
+                OidValue::Int8(2),
+                OidValue::Int(150),
+                OidValue::Null, // unbounded (current)
+                OidValue::String("b".into()),
+            ]),
+        ];
+
+        let batches = write_and_read("mutable", &schema, &rows);
+        let batch = &batches[0];
+        assert_eq!(batch.num_rows(), 2);
+
+        let start = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<Int32Array>()
+            .unwrap();
+        assert_eq!(start.value(0), 100);
+        assert_eq!(start.value(1), 150);
+
+        let end = batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<Int32Array>()
+            .unwrap();
+        assert_eq!(end.value(0), 200);
+        assert!(end.is_null(1));
+    }
+
+    #[test]
+    fn nonexistent_file_returns_error() {
+        let err = read_batches(Path::new("/tmp/nonexistent_graph_node_test.parquet"))
+            .err()
+            .expect("should fail for nonexistent file")
+            .to_string();
+        assert!(err.contains("failed to open parquet file"));
+    }
+}
diff --git a/store/postgres/src/parquet/schema.rs b/store/postgres/src/parquet/schema.rs
new file mode 100644
index 00000000000..f5c06643be0
--- /dev/null
+++ b/store/postgres/src/parquet/schema.rs
@@ -0,0 +1,426 @@
+use std::sync::Arc;
+
+use arrow::datatypes::{DataType, Field, Schema, TimeUnit};
+
+use crate::relational::{ColumnType, Table};
+
+/// Map a relational `Table` to an Arrow `Schema`.
+///
+/// System columns are emitted first (`vid`, then block tracking, then
+/// `causality_region`), followed by data columns in declaration order.
+/// Fulltext (TSVector) columns are skipped — they are generated and
+/// rebuilt on restore.
+pub fn arrow_schema(table: &Table) -> Schema {
+    let mut fields = Vec::new();
+
+    // vid — always present, non-nullable
+    fields.push(Field::new("vid", DataType::Int64, false));
+
+    // Block tracking
+    if table.immutable {
+        fields.push(Field::new("block$", DataType::Int32, false));
+    } else {
+        fields.push(Field::new("block_range_start", DataType::Int32, false));
+        fields.push(Field::new("block_range_end", DataType::Int32, true));
+    }
+
+    // Causality region
+    if table.has_causality_region {
+        fields.push(Field::new("causality_region", DataType::Int32, false));
+    }
+
+    // Data columns
+    for col in &table.columns {
+        if col.is_fulltext() {
+            continue;
+        }
+        let base_type = column_type_to_arrow(&col.column_type);
+        let dt = if col.is_list() {
+            DataType::List(Arc::new(Field::new("item", base_type, true)))
+        } else {
+            base_type
+        };
+        fields.push(Field::new(col.name.as_str(), dt, col.is_nullable()));
+    }
+
+    Schema::new(fields)
+}
+
+/// Fixed Arrow schema for the `data_sources$` table.
+pub fn data_sources_arrow_schema() -> Schema {
+    Schema::new(vec![
+        Field::new("vid", DataType::Int64, false),
+        Field::new("block_range_start", DataType::Int32, false),
+        Field::new("block_range_end", DataType::Int32, true),
+        Field::new("causality_region", DataType::Int32, false),
+        Field::new("manifest_idx", DataType::Int32, false),
+        Field::new("parent", DataType::Int32, true),
+        Field::new("id", DataType::Binary, true),
+        Field::new("param", DataType::Binary, true),
+        Field::new("context", DataType::Utf8, true),
+        Field::new("done_at", DataType::Int32, true),
+    ])
+}
+
+/// Arrow schema for clamp files: records which rows had their
+/// `block_range` upper bound set (clamped) since a previous dump.
+pub fn clamp_arrow_schema() -> Schema {
+    Schema::new(vec![
+        Field::new("vid", DataType::Int64, false),
+        Field::new("block_range_end", DataType::Int32, false),
+    ])
+}
+
+fn column_type_to_arrow(ct: &ColumnType) -> DataType {
+    match ct {
+        ColumnType::Boolean => DataType::Boolean,
+        ColumnType::Int => DataType::Int32,
+        ColumnType::Int8 => DataType::Int64,
+        ColumnType::Bytes => DataType::Binary,
+        ColumnType::BigInt | ColumnType::BigDecimal => DataType::Utf8,
+        ColumnType::Timestamp => DataType::Timestamp(TimeUnit::Microsecond, None),
+        ColumnType::String | ColumnType::Enum(_) => DataType::Utf8,
+        ColumnType::TSVector(_) => {
+            unreachable!("TSVector columns should be skipped before calling column_type_to_arrow")
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeSet;
+    use std::sync::Arc;
+
+    use arrow::datatypes::{DataType, TimeUnit};
+    use graph::prelude::DeploymentHash;
+    use graph::schema::InputSchema;
+
+    use crate::layout_for_tests::{Catalog, Layout, Namespace, make_dummy_site};
+
+    use super::*;
+
+    fn test_layout(gql: &str) -> Layout {
+        let subgraph = DeploymentHash::new("subgraph").unwrap();
+        let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
+        let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
+        let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
+        let catalog =
+            Catalog::for_tests(site.clone(), BTreeSet::new()).expect("Can not create catalog");
+        Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
+    }
+
+    fn test_layout_with_causality(gql: &str, entity_name: &str) -> Layout {
+        let subgraph = DeploymentHash::new("subgraph").unwrap();
+        let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
+        let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
+        let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
+        let entity_type = schema.entity_type(entity_name).unwrap();
+        let ents = BTreeSet::from_iter(vec![entity_type]);
+        let catalog = Catalog::for_tests(site.clone(), ents).expect("Can not create catalog");
+        Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
+    }
+
+    #[test]
+    fn immutable_table_schema() {
+        let layout = test_layout(
+            "type Token @entity(immutable: true) { id: ID!, name: String!, decimals: Int! }",
+        );
+        let table = layout.table("token").unwrap();
+        let schema = arrow_schema(table);
+
+        let names: Vec<&str> = schema.fields().iter().map(|f| f.name().as_str()).collect();
+        assert_eq!(names, &["vid", "block$", "id", "name", "decimals"]);
+
+        assert_eq!(
+            schema.field_with_name("vid").unwrap().data_type(),
+            &DataType::Int64
+        );
+        assert!(!schema.field_with_name("vid").unwrap().is_nullable());
+
+        assert_eq!(
+            schema.field_with_name("block$").unwrap().data_type(),
+            &DataType::Int32
+        );
+        assert!(!schema.field_with_name("block$").unwrap().is_nullable());
+
+        assert_eq!(
+            schema.field_with_name("id").unwrap().data_type(),
+            &DataType::Utf8
+        );
+        assert!(!schema.field_with_name("id").unwrap().is_nullable());
+
+        assert_eq!(
+            schema.field_with_name("name").unwrap().data_type(),
+            &DataType::Utf8
+        );
+        assert_eq!(
+            schema.field_with_name("decimals").unwrap().data_type(),
+            &DataType::Int32
+        );
+    }
+
+    #[test]
+    fn mutable_table_with_causality_region() {
+        let layout = test_layout_with_causality(
+            "type Transfer @entity { id: ID!, amount: BigInt! }",
+            "Transfer",
+        );
+        let table = layout.table("transfer").unwrap();
+        let schema = arrow_schema(table);
+
+        let names: Vec<&str> = schema.fields().iter().map(|f| f.name().as_str()).collect();
+        assert_eq!(
+            names,
+            &[
+                "vid",
+                "block_range_start",
+                "block_range_end",
+                "causality_region",
+                "id",
+                "amount"
+            ]
+        );
+
+        assert_eq!(
+            schema
+                .field_with_name("block_range_start")
+                .unwrap()
+                .data_type(),
+            &DataType::Int32
+        );
+        assert!(
+            !schema
+                .field_with_name("block_range_start")
+                .unwrap()
+                .is_nullable()
+        );
+
+        assert_eq!(
+            schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .data_type(),
+            &DataType::Int32
+        );
+        assert!(
+            schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .is_nullable()
+        );
+
+        assert_eq!(
+            schema
+                .field_with_name("causality_region")
+                .unwrap()
+                .data_type(),
+            &DataType::Int32
+        );
+
+        assert_eq!(
+            schema.field_with_name("amount").unwrap().data_type(),
+            &DataType::Utf8
+        );
+    }
+
+    #[test]
+    fn mutable_table_without_causality_region() {
+        let layout = test_layout("type Pair @entity { id: ID!, price: BigDecimal! }");
+        let table = layout.table("pair").unwrap();
+        let schema = arrow_schema(table);
+
+        let names: Vec<&str> = schema.fields().iter().map(|f| f.name().as_str()).collect();
+        assert_eq!(
+            names,
+            &["vid", "block_range_start", "block_range_end", "id", "price"]
+        );
+
+        // No causality_region field
+        assert!(schema.field_with_name("causality_region").is_err());
+    }
+
+    #[test]
+    fn nullable_and_list_columns() {
+        let layout = test_layout(
+            "type Pool @entity(immutable: true) { id: ID!, tags: [String!]!, description: String }",
+        );
+        let table = layout.table("pool").unwrap();
+        let schema = arrow_schema(table);
+
+        // tags is a non-nullable list of strings
+        let tags = schema.field_with_name("tags").unwrap();
+        assert!(!tags.is_nullable());
+        match tags.data_type() {
+            DataType::List(inner) => {
+                assert_eq!(inner.data_type(), &DataType::Utf8);
+            }
+            other => panic!("expected List, got {:?}", other),
+        }
+
+        // description is nullable
+        let desc = schema.field_with_name("description").unwrap();
+        assert!(desc.is_nullable());
+        assert_eq!(desc.data_type(), &DataType::Utf8);
+    }
+
+    #[test]
+    fn all_scalar_column_types() {
+        let layout = test_layout(
+            "type Everything @entity(immutable: true) { \
+                id: ID!, \
+                flag: Boolean!, \
+                small: Int!, \
+                big: Int8!, \
+                amount: BigInt!, \
+                price: BigDecimal!, \
+                data: Bytes!, \
+                ts: Timestamp!, \
+                label: String! \
+            }",
+        );
+        let table = layout.table("everything").unwrap();
+        let schema = arrow_schema(table);
+
+        assert_eq!(
+            schema.field_with_name("flag").unwrap().data_type(),
+            &DataType::Boolean
+        );
+        assert_eq!(
+            schema.field_with_name("small").unwrap().data_type(),
+            &DataType::Int32
+        );
+        assert_eq!(
+            schema.field_with_name("big").unwrap().data_type(),
+            &DataType::Int64
+        );
+        assert_eq!(
+            schema.field_with_name("amount").unwrap().data_type(),
+            &DataType::Utf8
+        );
+        assert_eq!(
+            schema.field_with_name("price").unwrap().data_type(),
+            &DataType::Utf8
+        );
+        assert_eq!(
+            schema.field_with_name("data").unwrap().data_type(),
+            &DataType::Binary
+        );
+        assert_eq!(
+            schema.field_with_name("ts").unwrap().data_type(),
+            &DataType::Timestamp(TimeUnit::Microsecond, None)
+        );
+        assert_eq!(
+            schema.field_with_name("label").unwrap().data_type(),
+            &DataType::Utf8
+        );
+    }
+
+    #[test]
+    fn data_sources_schema() {
+        let schema = data_sources_arrow_schema();
+        let names: Vec<&str> = schema.fields().iter().map(|f| f.name().as_str()).collect();
+        assert_eq!(
+            names,
+            &[
+                "vid",
+                "block_range_start",
+                "block_range_end",
+                "causality_region",
+                "manifest_idx",
+                "parent",
+                "id",
+                "param",
+                "context",
+                "done_at"
+            ]
+        );
+
+        // Check nullability
+        assert!(!schema.field_with_name("vid").unwrap().is_nullable());
+        assert!(
+            !schema
+                .field_with_name("block_range_start")
+                .unwrap()
+                .is_nullable()
+        );
+        assert!(
+            schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .is_nullable()
+        );
+        assert!(
+            !schema
+                .field_with_name("causality_region")
+                .unwrap()
+                .is_nullable()
+        );
+        assert!(
+            !schema
+                .field_with_name("manifest_idx")
+                .unwrap()
+                .is_nullable()
+        );
+        assert!(schema.field_with_name("parent").unwrap().is_nullable());
+        assert!(schema.field_with_name("id").unwrap().is_nullable());
+        assert!(schema.field_with_name("param").unwrap().is_nullable());
+        assert!(schema.field_with_name("context").unwrap().is_nullable());
+        assert!(schema.field_with_name("done_at").unwrap().is_nullable());
+
+        // Check types
+        assert_eq!(
+            schema.field_with_name("vid").unwrap().data_type(),
+            &DataType::Int64
+        );
+        assert_eq!(
+            schema.field_with_name("context").unwrap().data_type(),
+            &DataType::Utf8
+        );
+        assert_eq!(
+            schema.field_with_name("param").unwrap().data_type(),
+            &DataType::Binary
+        );
+    }
+
+    #[test]
+    fn clamp_schema() {
+        let schema = clamp_arrow_schema();
+        let names: Vec<&str> = schema.fields().iter().map(|f| f.name().as_str()).collect();
+        assert_eq!(names, &["vid", "block_range_end"]);
+
+        assert_eq!(
+            schema.field_with_name("vid").unwrap().data_type(),
+            &DataType::Int64
+        );
+        assert!(!schema.field_with_name("vid").unwrap().is_nullable());
+
+        assert_eq!(
+            schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .data_type(),
+            &DataType::Int32
+        );
+        assert!(
+            !schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .is_nullable()
+        );
+    }
+
+    #[test]
+    fn enum_columns_map_to_utf8() {
+        let layout = test_layout(
+            "enum Status { Active, Inactive } \
+             type Item @entity(immutable: true) { id: ID!, status: Status! }",
+        );
+        let table = layout.table("item").unwrap();
+        let schema = arrow_schema(table);
+
+        assert_eq!(
+            schema.field_with_name("status").unwrap().data_type(),
+            &DataType::Utf8
+        );
+    }
+}
diff --git a/store/postgres/src/parquet/writer.rs b/store/postgres/src/parquet/writer.rs
new file mode 100644
index 00000000000..9ab6df53c20
--- /dev/null
+++ b/store/postgres/src/parquet/writer.rs
@@ -0,0 +1,354 @@
+use std::fs;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use arrow::array::RecordBatch;
+use arrow::datatypes::Schema;
+use graph::components::store::StoreError;
+use parquet::arrow::ArrowWriter;
+use parquet::basic::{Compression, ZstdLevel};
+use parquet::file::properties::WriterProperties;
+
+use serde::{Deserialize, Serialize};
+
+/// Per-chunk metadata recorded in `metadata.json`.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ChunkInfo {
+    pub file: String,
+    pub min_vid: i64,
+    pub max_vid: i64,
+    pub row_count: usize,
+}
+
+/// Writes `RecordBatch`es into a single Parquet file using ZSTD compression.
+///
+/// Tracks row count and vid range across all written batches. Call
+/// `finish()` to flush and close the file, returning a `ChunkInfo`
+/// summary.
+pub struct ParquetChunkWriter {
+    writer: ArrowWriter<fs::File>,
+    /// Relative path from the dump directory (e.g. `"Token/chunk_000000.parquet"`).
+    relative_path: String,
+    row_count: usize,
+    min_vid: i64,
+    max_vid: i64,
+}
+
+impl ParquetChunkWriter {
+    /// Create a new writer for a Parquet chunk file.
+    ///
+    /// `path` is the absolute file path. `relative_path` is stored in the
+    /// resulting `ChunkInfo` (e.g. `"Token/chunk_000000.parquet"`).
+    pub fn new(path: PathBuf, relative_path: String, schema: &Schema) -> Result<Self, StoreError> {
+        let props = WriterProperties::builder()
+            .set_compression(Compression::ZSTD(ZstdLevel::default()))
+            .build();
+
+        let file = fs::File::create(&path).map_err(|e| {
+            StoreError::InternalError(format!(
+                "failed to create parquet file {}: {e}",
+                path.display()
+            ))
+        })?;
+
+        let writer =
+            ArrowWriter::try_new(file, Arc::new(schema.clone()), Some(props)).map_err(|e| {
+                StoreError::InternalError(format!(
+                    "failed to create ArrowWriter for {}: {e}",
+                    path.display()
+                ))
+            })?;
+
+        Ok(Self {
+            writer,
+            relative_path,
+            row_count: 0,
+            min_vid: i64::MAX,
+            max_vid: i64::MIN,
+        })
+    }
+
+    /// Write a `RecordBatch` and update tracking stats.
+    ///
+    /// `batch_min_vid` and `batch_max_vid` are the vid bounds of this
+    /// batch (typically the first and last vid values).
+    pub fn write_batch(
+        &mut self,
+        batch: &RecordBatch,
+        batch_min_vid: i64,
+        batch_max_vid: i64,
+    ) -> Result<(), StoreError> {
+        if batch.num_rows() == 0 {
+            return Ok(());
+        }
+        self.writer
+            .write(batch)
+            .map_err(|e| StoreError::InternalError(format!("failed to write RecordBatch: {e}")))?;
+        self.row_count += batch.num_rows();
+        self.min_vid = self.min_vid.min(batch_min_vid);
+        self.max_vid = self.max_vid.max(batch_max_vid);
+        Ok(())
+    }
+
+    /// Flush and close the Parquet file, returning chunk metadata.
+    pub fn finish(self) -> Result<ChunkInfo, StoreError> {
+        self.writer.close().map_err(|e| {
+            StoreError::InternalError(format!("failed to close parquet writer: {e}"))
+        })?;
+        Ok(ChunkInfo {
+            file: self.relative_path,
+            min_vid: self.min_vid,
+            max_vid: self.max_vid,
+            row_count: self.row_count,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use arrow::array::{
+        Array, BinaryArray, BooleanArray, Int32Array, Int64Array, StringArray,
+        TimestampMicrosecondArray,
+    };
+    use arrow::datatypes::{DataType, Field, Schema, TimeUnit};
+    use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
+    use std::sync::Arc;
+
+    use super::*;
+
+    /// Create a unique temp file path for a test. The caller is responsible
+    /// for cleanup via the returned `TempFile` guard.
+    struct TempFile(PathBuf);
+
+    impl TempFile {
+        fn new(name: &str) -> Self {
+            let path = std::env::temp_dir().join(format!(
+                "graph_node_test_{}_{name}.parquet",
+                std::process::id()
+            ));
+            Self(path)
+        }
+
+        fn path(&self) -> &std::path::Path {
+            &self.0
+        }
+    }
+
+    impl Drop for TempFile {
+        fn drop(&mut self) {
+            let _ = std::fs::remove_file(&self.0);
+        }
+    }
+
+    fn test_schema() -> Schema {
+        Schema::new(vec![
+            Field::new("vid", DataType::Int64, false),
+            Field::new("block$", DataType::Int32, false),
+            Field::new("id", DataType::Utf8, false),
+            Field::new("flag", DataType::Boolean, true),
+            Field::new("data", DataType::Binary, true),
+            Field::new("ts", DataType::Timestamp(TimeUnit::Microsecond, None), true),
+        ])
+    }
+
+    fn test_batch(schema: &Schema) -> RecordBatch {
+        RecordBatch::try_new(
+            Arc::new(schema.clone()),
+            vec![
+                Arc::new(Int64Array::from(vec![1, 2, 3])),
+                Arc::new(Int32Array::from(vec![100, 101, 102])),
+                Arc::new(StringArray::from(vec!["a", "b", "c"])),
+                Arc::new(BooleanArray::from(vec![Some(true), None, Some(false)])),
+                Arc::new(BinaryArray::from_opt_vec(vec![
+                    Some(b"\xab\xcd"),
+                    None,
+                    Some(b"\xff"),
+                ])),
+                Arc::new(TimestampMicrosecondArray::from(vec![
+                    Some(1_000_000),
+                    Some(2_000_000),
+                    None,
+                ])),
+            ],
+        )
+        .unwrap()
+    }
+
+    /// Read all record batches from a parquet file.
+    fn read_parquet(path: &std::path::Path) -> Vec<RecordBatch> {
+        let file = std::fs::File::open(path).unwrap();
+        let reader = ParquetRecordBatchReaderBuilder::try_new(file)
+            .unwrap()
+            .build()
+            .unwrap();
+        reader.map(|r| r.unwrap()).collect()
+    }
+
+    #[test]
+    fn write_and_read_back() {
+        let schema = test_schema();
+        let batch = test_batch(&schema);
+        let tmp = TempFile::new("write_read");
+
+        let mut writer = ParquetChunkWriter::new(
+            tmp.path().to_path_buf(),
+            "Test/chunk_000000.parquet".into(),
+            &schema,
+        )
+        .unwrap();
+        writer.write_batch(&batch, 1, 3).unwrap();
+        let chunk_info = writer.finish().unwrap();
+
+        assert_eq!(chunk_info.file, "Test/chunk_000000.parquet");
+        assert_eq!(chunk_info.min_vid, 1);
+        assert_eq!(chunk_info.max_vid, 3);
+        assert_eq!(chunk_info.row_count, 3);
+
+        // Read back and verify
+        let batches = read_parquet(tmp.path());
+        assert_eq!(batches.len(), 1);
+        let read_batch = &batches[0];
+
+        assert_eq!(read_batch.num_rows(), 3);
+        assert_eq!(read_batch.num_columns(), 6);
+
+        let vid = read_batch
+            .column(0)
+            .as_any()
+            .downcast_ref::<Int64Array>()
+            .unwrap();
+        assert_eq!(vid.values(), &[1, 2, 3]);
+
+        let block = read_batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<Int32Array>()
+            .unwrap();
+        assert_eq!(block.values(), &[100, 101, 102]);
+
+        let id = read_batch
+            .column(2)
+            .as_any()
+            .downcast_ref::<StringArray>()
+            .unwrap();
+        assert_eq!(id.value(0), "a");
+        assert_eq!(id.value(2), "c");
+
+        let flag = read_batch
+            .column(3)
+            .as_any()
+            .downcast_ref::<BooleanArray>()
+            .unwrap();
+        assert!(flag.value(0));
+        assert!(flag.is_null(1));
+        assert!(!flag.value(2));
+
+        let data = read_batch
+            .column(4)
+            .as_any()
+            .downcast_ref::<BinaryArray>()
+            .unwrap();
+        assert_eq!(data.value(0), b"\xab\xcd");
+        assert!(data.is_null(1));
+
+        let ts = read_batch
+            .column(5)
+            .as_any()
+            .downcast_ref::<TimestampMicrosecondArray>()
+            .unwrap();
+        assert_eq!(ts.value(0), 1_000_000);
+        assert!(ts.is_null(2));
+    }
+
+    #[test]
+    fn multiple_batches_accumulate_stats() {
+        let schema = test_schema();
+
+        let batch1 = RecordBatch::try_new(
+            Arc::new(schema.clone()),
+            vec![
+                Arc::new(Int64Array::from(vec![10, 20])),
+                Arc::new(Int32Array::from(vec![1, 1])),
+                Arc::new(StringArray::from(vec!["x", "y"])),
+                Arc::new(BooleanArray::from(vec![true, false])),
+                Arc::new(BinaryArray::from_vec(vec![b"a", b"b"])),
+                Arc::new(TimestampMicrosecondArray::from(vec![100, 200])),
+            ],
+        )
+        .unwrap();
+
+        let batch2 = RecordBatch::try_new(
+            Arc::new(schema.clone()),
+            vec![
+                Arc::new(Int64Array::from(vec![30])),
+                Arc::new(Int32Array::from(vec![2])),
+                Arc::new(StringArray::from(vec!["z"])),
+                Arc::new(BooleanArray::from(vec![true])),
+                Arc::new(BinaryArray::from_vec(vec![b"c"])),
+                Arc::new(TimestampMicrosecondArray::from(vec![300])),
+            ],
+        )
+        .unwrap();
+
+        let tmp = TempFile::new("multi_batch");
+
+        let mut writer = ParquetChunkWriter::new(
+            tmp.path().to_path_buf(),
+            "Foo/chunk_000000.parquet".into(),
+            &schema,
+        )
+        .unwrap();
+        writer.write_batch(&batch1, 10, 20).unwrap();
+        writer.write_batch(&batch2, 30, 30).unwrap();
+        let chunk_info = writer.finish().unwrap();
+
+        assert_eq!(chunk_info.min_vid, 10);
+        assert_eq!(chunk_info.max_vid, 30);
+        assert_eq!(chunk_info.row_count, 3);
+
+        // Verify all 3 rows readable
+        let batches = read_parquet(tmp.path());
+        let total_rows: usize = batches.iter().map(|b| b.num_rows()).sum();
+        assert_eq!(total_rows, 3);
+    }
+
+    #[test]
+    fn empty_batch_is_noop() {
+        let schema = test_schema();
+        let empty = RecordBatch::new_empty(Arc::new(schema.clone()));
+        let tmp = TempFile::new("empty_batch");
+
+        let mut writer = ParquetChunkWriter::new(
+            tmp.path().to_path_buf(),
+            "X/chunk_000000.parquet".into(),
+            &schema,
+        )
+        .unwrap();
+        writer.write_batch(&empty, 0, 0).unwrap();
+        let chunk_info = writer.finish().unwrap();
+
+        assert_eq!(chunk_info.row_count, 0);
+        // min_vid/max_vid stay at initial sentinel values when nothing was written
+        assert_eq!(chunk_info.min_vid, i64::MAX);
+        assert_eq!(chunk_info.max_vid, i64::MIN);
+    }
+
+    #[test]
+    fn chunk_info_serialization() {
+        let info = ChunkInfo {
+            file: "Token/chunk_000000.parquet".into(),
+            min_vid: 0,
+            max_vid: 50000,
+            row_count: 50000,
+        };
+        let json = serde_json::to_string_pretty(&info).unwrap();
+        assert!(json.contains("Token/chunk_000000.parquet"));
+        assert!(json.contains("50000"));
+
+        let deserialized: ChunkInfo = serde_json::from_str(&json).unwrap();
+        assert_eq!(deserialized.file, info.file);
+        assert_eq!(deserialized.min_vid, info.min_vid);
+        assert_eq!(deserialized.max_vid, info.max_vid);
+        assert_eq!(deserialized.row_count, info.row_count);
+    }
+}
diff --git a/store/postgres/src/pool/coordinator.rs b/store/postgres/src/pool/coordinator.rs
index fb0b05a1ac0..cf733deb3f3 100644
--- a/store/postgres/src/pool/coordinator.rs
+++ b/store/postgres/src/pool/coordinator.rs
@@ -1,16 +1,16 @@
 use graph::cheap_clone::CheapClone;
-use graph::futures03::future::join_all;
 use graph::futures03::FutureExt as _;
+use graph::futures03::future::join_all;
 use graph::internal_error;
 use graph::prelude::MetricsRegistry;
-use graph::prelude::{crit, debug, error, info, o, StoreError};
+use graph::prelude::{StoreError, crit, debug, error, info, o};
 use graph::slog::Logger;
 
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
 use crate::advisory_lock::with_migration_lock;
-use crate::{Shard, PRIMARY_SHARD};
+use crate::{PRIMARY_SHARD, Shard};
 
 use super::{ConnectionPool, ForeignServer, MigrationCount, PoolInner, PoolRole, PoolState};
 
@@ -265,7 +265,7 @@ impl PoolCoordinator {
 
         let primary = self.primary()?;
 
-        let mut pconn = primary.get().await?;
+        let mut pconn = primary.get_for_setup().await?;
 
         let states: Vec<_> = states
             .into_iter()
diff --git a/store/postgres/src/pool/foreign_server.rs b/store/postgres/src/pool/foreign_server.rs
index 78cd83116db..c2883eb929b 100644
--- a/store/postgres/src/pool/foreign_server.rs
+++ b/store/postgres/src/pool/foreign_server.rs
@@ -1,8 +1,8 @@
 use diesel_async::SimpleAsyncConnection;
 use graph::{
     prelude::{
+        ENV_VARS, StoreError,
         anyhow::{self, anyhow, bail},
-        StoreError, ENV_VARS,
     },
     util::security::SafeDisplay,
 };
@@ -12,8 +12,8 @@ use std::fmt::Write;
 use postgres::config::{Config, Host};
 
 use crate::primary::NAMESPACE_PUBLIC;
-use crate::{catalog, AsyncPgConnection};
-use crate::{Shard, PRIMARY_SHARD};
+use crate::{AsyncPgConnection, catalog};
+use crate::{PRIMARY_SHARD, Shard};
 
 use super::{PRIMARY_PUBLIC, PRIMARY_TABLES, SHARDED_TABLES};
 
diff --git a/store/postgres/src/pool/manager.rs b/store/postgres/src/pool/manager.rs
index dbbcb288b83..5ff0198a36e 100644
--- a/store/postgres/src/pool/manager.rs
+++ b/store/postgres/src/pool/manager.rs
@@ -9,20 +9,20 @@ use diesel::IntoSql;
 use diesel_async::pooled_connection::{PoolError as DieselPoolError, PoolableConnection};
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use graph::env::ENV_VARS;
-use graph::prelude::error;
 use graph::prelude::AtomicMovingStats;
 use graph::prelude::Counter;
 use graph::prelude::Gauge;
 use graph::prelude::MetricsRegistry;
 use graph::prelude::PoolWaitStats;
-use graph::slog::info;
+use graph::prelude::error;
 use graph::slog::Logger;
+use graph::slog::info;
 
 use std::collections::HashMap;
+use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use std::sync::atomic::AtomicU64;
 use std::sync::atomic::Ordering;
-use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 use crate::pool::AsyncPool;
diff --git a/store/postgres/src/pool/mod.rs b/store/postgres/src/pool/mod.rs
index afb0aef4ebf..c479c2263a2 100644
--- a/store/postgres/src/pool/mod.rs
+++ b/store/postgres/src/pool/mod.rs
@@ -1,5 +1,5 @@
-use deadpool::managed::{PoolError, Timeouts};
 use deadpool::Runtime;
+use deadpool::managed::{PoolError, Timeouts};
 use diesel::sql_query;
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use diesel_async::{AsyncConnection as _, RunQueryDsl, SimpleAsyncConnection};
@@ -11,16 +11,17 @@ use graph::derive::CheapClone;
 use graph::internal_error;
 use graph::prelude::tokio::time::Instant;
 use graph::prelude::{
-    anyhow::anyhow, crit, debug, error, info, o, AtomicMovingStats, Gauge, Logger, PoolWaitStats,
-    StoreError, ENV_VARS,
+    AtomicMovingStats, ENV_VARS, Gauge, Logger, PoolWaitStats, StoreError, anyhow::anyhow, crit,
+    debug, error, info, o,
 };
-use graph::prelude::{tokio, MetricsRegistry};
+use graph::prelude::{MetricsRegistry, tokio};
 use graph::slog::warn;
 use graph::util::timed_rw_lock::TimedMutex;
 use tokio::sync::OwnedSemaphorePermit;
 
 use std::collections::HashMap;
 use std::fmt::{self};
+use std::future::Future;
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;
 use std::time::Duration;
@@ -28,14 +29,68 @@ use std::time::Duration;
 use crate::catalog;
 use crate::pool::manager::{ConnectionManager, WaitMeter};
 use crate::primary::{self, Mirror, Namespace};
-use crate::{Shard, PRIMARY_SHARD};
+use crate::{PRIMARY_SHARD, Shard};
+
+/// A helper trait that names the future type returned by an async closure.
+/// This is the local equivalent of `diesel_async::transaction_manager::AsyncFunc`,
+/// which is not a public API. Adding the `Fut: Send` bound on this trait in
+/// function signatures allows the compiler to prove that the futures produced
+/// by async closures are `Send`, preventing "Send not general enough" errors
+/// that arise when using plain `for<'r> F: AsyncFnOnce(...)` bounds.
+pub trait AsyncFunc<T, R>:
+    AsyncFnOnce(T) -> R + FnOnce(T) -> <Self as AsyncFunc<T, R>>::Fut
+{
+    type Fut: Future<Output = R>;
+}
+
+impl<F, T, Fut, R> AsyncFunc<T, R> for F
+where
+    F: AsyncFnOnce(T) -> R + FnOnce(T) -> Fut,
+    Fut: Future<Output = R>,
+{
+    type Fut = Fut;
+}
+
+pub trait AsyncMutFunc<T, R>:
+    AsyncFnMut(T) -> R + FnMut(T) -> <Self as AsyncMutFunc<T, R>>::Fut
+{
+    type Fut: Future<Output = R>;
+}
+
+impl<F, T, Fut, R> AsyncMutFunc<T, R> for F
+where
+    F: AsyncFnMut(T) -> R + FnMut(T) -> Fut,
+    Fut: Future<Output = R>,
+{
+    type Fut = Fut;
+}
+
+/// Shorthand for an async closure that may be used as a transaction
+/// callback in our own `fn transaction` implementations in a few places.
+pub(crate) trait TxnCallback<R, E, C = AsyncPgConnection>:
+    for<'r> AsyncFunc<&'r mut C, Result<R, E>, Fut: Send> + Send
+{
+}
+
+impl<F, C, R, E> TxnCallback<R, E, C> for F where
+    F: for<'r> AsyncFunc<&'r mut C, Result<R, E>, Fut: Send> + Send
+{
+}
+
+pub(crate) trait TxnMutCallback<R, E, C = AsyncPgConnection>:
+    for<'r> AsyncMutFunc<&'r mut C, Result<R, E>, Fut: Send> + Send
+{
+}
+
+impl<F, C, R, E> TxnMutCallback<R, E, C> for F where
+    F: for<'r> AsyncMutFunc<&'r mut C, Result<R, E>, Fut: Send> + Send
+{
+}
 
 mod coordinator;
 mod foreign_server;
 mod manager;
 
-pub use diesel_async::scoped_futures::ScopedFutureExt;
-
 pub use coordinator::PoolCoordinator;
 pub use foreign_server::ForeignServer;
 use manager::StateTracker;
@@ -65,6 +120,103 @@ impl DerefMut for PermittedConnection {
     }
 }
 
+impl PermittedConnection {
+    /// Build a transaction with custom isolation level and read mode.
+    ///
+    /// This is analogous to `diesel_async::pg::TransactionBuilder` but
+    /// works with the pool-wrapped connection type. The closure receives
+    /// `&mut AsyncPgConnection`, the inner connection, so it can be passed
+    /// directly to functions that take `&mut AsyncPgConnection`.
+    pub(crate) fn build_transaction(&mut self) -> TransactionBuilder<'_> {
+        TransactionBuilder::new(self)
+    }
+
+    /// Run `callback` inside a transaction on this connection. Commits on
+    /// `Ok`, rolls back on `Err`. The callback receives `&mut PermittedConnection`;
+    /// pass it to functions needing `&mut AsyncPgConnection` via deref coercion.
+    pub(crate) fn transaction<'a, 'conn, R, E, F>(
+        &'conn mut self,
+        callback: F,
+    ) -> impl Future<Output = Result<R, E>> + Send + 'conn
+    where
+        F: TxnCallback<R, E> + 'a,
+        E: From<diesel::result::Error> + Send + 'a,
+        R: Send + 'a,
+        'a: 'conn,
+    {
+        self.conn.transaction(callback)
+    }
+}
+
+/// Builder for a PostgreSQL transaction with configurable isolation level
+/// and read mode. Created via [`PermittedConnection::build_transaction`].
+///
+/// We can't use diesel-async's `TransactionBuilder` because it requires
+/// `C: AsyncConnection<TransactionManager = AnsiTransactionManager>`. Our
+/// connection types don't satisfy that: the blanket deref impl in
+/// diesel-async wraps the transaction manager at each deref level, so
+/// `Object<ConnectionManager>` gets `PoolTransactionManager<AnsiTransactionManager>`
+/// and `PermittedConnection` gets
+/// `PoolTransactionManager<PoolTransactionManager<AnsiTransactionManager>>`.
+/// Neither matches `AnsiTransactionManager`.
+#[must_use = "Transaction builder does nothing unless you call `run` on it"]
+pub(crate) struct TransactionBuilder<'a> {
+    conn: &'a mut PermittedConnection,
+    isolation_level: Option<&'static str>,
+    read_only: bool,
+}
+
+impl<'a> TransactionBuilder<'a> {
+    fn new(conn: &'a mut PermittedConnection) -> Self {
+        Self {
+            conn,
+            isolation_level: None,
+            read_only: false,
+        }
+    }
+
+    /// Set the transaction isolation level to `REPEATABLE READ`.
+    pub(crate) fn repeatable_read(mut self) -> Self {
+        self.isolation_level = Some("REPEATABLE READ");
+        self
+    }
+
+    /// Make the transaction `READ ONLY`.
+    pub(crate) fn read_only(mut self) -> Self {
+        self.read_only = true;
+        self
+    }
+
+    /// Execute `f` inside the configured transaction. Commits on `Ok`,
+    /// rolls back on `Err`. The callback receives `&mut PermittedConnection`;
+    /// pass it to functions needing `&mut AsyncPgConnection` via deref coercion.
+    pub(crate) async fn run<T, E, F>(self, f: F) -> Result<T, E>
+    where
+        F: TxnCallback<T, E>,
+        E: From<diesel::result::Error>,
+    {
+        let mut sql = String::from("BEGIN TRANSACTION");
+        if let Some(level) = self.isolation_level {
+            sql.push_str(" ISOLATION LEVEL ");
+            sql.push_str(level);
+        }
+        if self.read_only {
+            sql.push_str(" READ ONLY");
+        }
+        self.conn.batch_execute(&sql).await?;
+        match f(self.conn).await {
+            Ok(value) => {
+                self.conn.batch_execute("COMMIT").await?;
+                Ok(value)
+            }
+            Err(e) => {
+                self.conn.batch_execute("ROLLBACK").await.ok();
+                Err(e)
+            }
+        }
+    }
+}
+
 /// The namespace under which the `PRIMARY_TABLES` are mapped into each
 /// shard
 pub(crate) const PRIMARY_PUBLIC: &str = "primary_public";
@@ -620,6 +772,18 @@ impl PoolInner {
         self.get_from_pool(&self.pool, None, Duration::ZERO).await
     }
 
+    /// Get a connection using the setup timeout. Use only during database
+    /// initialization where operations can legitimately take longer.
+    async fn get_for_setup(&self) -> Result<AsyncPgConnection, StoreError> {
+        let setup_timeouts = Timeouts {
+            wait: Some(ENV_VARS.store.setup_timeout),
+            create: Some(ENV_VARS.store.setup_timeout),
+            recycle: Some(ENV_VARS.store.setup_timeout),
+        };
+        self.get_from_pool(&self.pool, Some(setup_timeouts), Duration::ZERO)
+            .await
+    }
+
     /// Get the pool for fdw connections. It is an error if none is configured
     fn fdw_pool(&self, logger: &Logger) -> Result<&AsyncPool, StoreError> {
         let pool = match &self.fdw_pool {
@@ -701,7 +865,7 @@ impl PoolInner {
     }
 
     async fn locale_check(&self, logger: &Logger) -> Result<(), StoreError> {
-        let mut conn = self.get().await?;
+        let mut conn = self.get_for_setup().await?;
         let _: () = if let Err(msg) = catalog::Locale::load(&mut conn).await?.suitable() {
             if self.shard == *PRIMARY_SHARD && primary::is_empty(&mut conn).await? {
                 const MSG: &str = "Database does not use C locale. \
@@ -710,7 +874,11 @@ impl PoolInner {
                 crit!(logger, "{}: {}", MSG, msg);
                 panic!("{}: {}", MSG, msg);
             } else {
-                warn!(logger, "{}.\nPlease check the graph-node documentation for how to set up the database locale", msg);
+                warn!(
+                    logger,
+                    "{}.\nPlease check the graph-node documentation for how to set up the database locale",
+                    msg
+                );
             }
         };
         Ok(())
@@ -751,22 +919,19 @@ impl PoolInner {
 
     async fn configure_fdw(&self, servers: &[ForeignServer]) -> Result<(), StoreError> {
         info!(&self.logger, "Setting up fdw");
-        let mut conn = self.get().await?;
+        let mut conn = self.get_for_setup().await?;
         conn.batch_execute("create extension if not exists postgres_fdw")
             .await?;
-        conn.transaction(|conn| {
-            async {
-                let current_servers: Vec<String> = crate::catalog::current_servers(conn).await?;
-                for server in servers.iter().filter(|server| server.shard != self.shard) {
-                    if current_servers.contains(&server.name) {
-                        server.update(conn).await?;
-                    } else {
-                        server.create(conn).await?;
-                    }
+        conn.transaction(async |conn| {
+            let current_servers: Vec<String> = crate::catalog::current_servers(conn).await?;
+            for server in servers.iter().filter(|server| server.shard != self.shard) {
+                if current_servers.contains(&server.name) {
+                    server.update(conn).await?;
+                } else {
+                    server.create(conn).await?;
                 }
-                Ok(())
             }
-            .scope_boxed()
+            Ok(())
         })
         .await
     }
@@ -790,7 +955,10 @@ impl PoolInner {
         // careful that block_on only gets called on a blocking thread to
         // avoid errors from the tokio runtime
         let logger = self.logger.cheap_clone();
-        let mut conn = self.get().await.map(AsyncConnectionWrapper::from)?;
+        let mut conn = self
+            .get_for_setup()
+            .await
+            .map(AsyncConnectionWrapper::from)?;
 
         tokio::task::spawn_blocking(move || {
             diesel::Connection::transaction::<_, StoreError, _>(&mut conn, |conn| {
@@ -808,14 +976,11 @@ impl PoolInner {
         }
 
         info!(&self.logger, "Dropping cross-shard views");
-        let mut conn = self.get().await?;
-        conn.transaction(|conn| {
-            async {
-                let query = format!("drop schema if exists {} cascade", CROSS_SHARD_NSP);
-                conn.batch_execute(&query).await?;
-                Ok(())
-            }
-            .scope_boxed()
+        let mut conn = self.get_for_setup().await?;
+        conn.transaction(async move |conn| {
+            let query = format!("drop schema if exists {} cascade", CROSS_SHARD_NSP);
+            conn.batch_execute(&query).await?;
+            Ok(())
         })
         .await
     }
@@ -845,7 +1010,7 @@ impl PoolInner {
             return Ok(());
         }
 
-        let mut conn = self.get().await?;
+        let mut conn = self.get_for_setup().await?;
         let sharded = Namespace::special(CROSS_SHARD_NSP);
         if catalog::has_namespace(&mut conn, &sharded).await? {
             // We dropped the namespace before, but another node must have
@@ -854,28 +1019,25 @@ impl PoolInner {
         }
 
         info!(&self.logger, "Creating cross-shard views");
-        conn.transaction(|conn| {
-            async {
-                let query = format!("create schema {}", CROSS_SHARD_NSP);
-                conn.batch_execute(&query).await?;
-                for (src_nsp, src_tables) in SHARDED_TABLES {
-                    // Pairs of (shard, nsp) for all servers
-                    let nsps = shard_nsp_pairs(&self.shard, src_nsp, servers);
-                    for src_table in src_tables {
-                        let create_view = catalog::create_cross_shard_view(
-                            conn,
-                            src_nsp,
-                            src_table,
-                            CROSS_SHARD_NSP,
-                            &nsps,
-                        )
-                        .await?;
-                        conn.batch_execute(&create_view).await?;
-                    }
+        conn.transaction(async |conn| {
+            let query = format!("create schema {}", CROSS_SHARD_NSP);
+            conn.batch_execute(&query).await?;
+            for (src_nsp, src_tables) in SHARDED_TABLES {
+                // Pairs of (shard, nsp) for all servers
+                let nsps = shard_nsp_pairs(&self.shard, src_nsp, servers);
+                for src_table in src_tables {
+                    let create_view = catalog::create_cross_shard_view(
+                        conn,
+                        src_nsp,
+                        src_table,
+                        CROSS_SHARD_NSP,
+                        &nsps,
+                    )
+                    .await?;
+                    conn.batch_execute(&create_view).await?;
                 }
-                Ok(())
             }
-            .scope_boxed()
+            Ok(())
         })
         .await
     }
@@ -887,7 +1049,7 @@ impl PoolInner {
             return Ok(());
         }
         let mut conn = self.get().await?;
-        conn.transaction(|conn| primary::Mirror::refresh_tables(conn).scope_boxed())
+        conn.transaction(async |conn| primary::Mirror::refresh_tables(conn).await)
             .await
     }
 
@@ -897,8 +1059,8 @@ impl PoolInner {
     pub async fn remap(&self, server: &ForeignServer) -> Result<(), StoreError> {
         if server.shard == *PRIMARY_SHARD {
             info!(&self.logger, "Mapping primary");
-            let mut conn = self.get().await?;
-            conn.transaction(|conn| ForeignServer::map_primary(conn, &self.shard).scope_boxed())
+            let mut conn = self.get_for_setup().await?;
+            conn.transaction(async |conn| ForeignServer::map_primary(conn, &self.shard).await)
                 .await?;
         }
         if server.shard != self.shard {
@@ -907,8 +1069,8 @@ impl PoolInner {
                 "Mapping metadata from {}",
                 server.shard.as_str()
             );
-            let mut conn = self.get().await?;
-            conn.transaction(|conn| server.map_metadata(conn).scope_boxed())
+            let mut conn = self.get_for_setup().await?;
+            conn.transaction(async |conn| server.map_metadata(conn).await)
                 .await?;
         }
         Ok(())
@@ -919,7 +1081,7 @@ impl PoolInner {
             return Ok(false);
         }
 
-        let mut conn = self.get().await?;
+        let mut conn = self.get_for_setup().await?;
         server.needs_remap(&mut conn).await
     }
 }
diff --git a/store/postgres/src/primary.rs b/store/postgres/src/primary.rs
index 21cbef3b9a1..6e6ffd11086 100644
--- a/store/postgres/src/primary.rs
+++ b/store/postgres/src/primary.rs
@@ -2,11 +2,11 @@
 //! shard. Anything in this module can only be used with a database connection
 //! for the primary shard.
 use crate::{
+    AsyncPgConnection, ConnectionPool, ForeignServer, NotificationSender,
     block_range::UNVERSIONED_RANGE,
     detail::DeploymentDetail,
-    pool::{PermittedConnection, PRIMARY_PUBLIC},
-    subgraph_store::{unused, Shard, PRIMARY_SHARD},
-    AsyncPgConnection, ConnectionPool, ForeignServer, NotificationSender,
+    pool::{PRIMARY_PUBLIC, PermittedConnection, TxnCallback, TxnMutCallback},
+    subgraph_store::{PRIMARY_SHARD, Shard, unused},
 };
 use diesel::dsl::{delete, insert_into, sql, update};
 use diesel::prelude::{
@@ -21,24 +21,20 @@ use diesel::{
     serialize::{Output, ToSql},
     sql_types::{Array, BigInt, Bool, Integer, Text},
 };
-use diesel_async::{
-    scoped_futures::{ScopedBoxFuture, ScopedFutureExt},
-    RunQueryDsl, SimpleAsyncConnection as _, TransactionManager,
-};
+use diesel_async::{RunQueryDsl, SimpleAsyncConnection as _, TransactionManager};
 use graph::{
     components::store::DeploymentLocator,
     data::{
         store::scalar::ToPrimitive,
-        subgraph::{status, DeploymentFeatures},
+        subgraph::{DeploymentFeatures, status},
     },
     derive::CheapClone,
-    futures03::{future::BoxFuture, FutureExt},
     internal_error,
     prelude::{
-        anyhow,
+        AssignmentChange, DeploymentHash, NodeId, StoreError, SubgraphName,
+        SubgraphVersionSwitchingMode, anyhow,
         chrono::{DateTime, Utc},
-        serde_json, AssignmentChange, DeploymentHash, NodeId, StoreError, SubgraphName,
-        SubgraphVersionSwitchingMode,
+        serde_json,
     },
 };
 use graph::{
@@ -776,6 +772,29 @@ mod queries {
     }
 }
 
+/// How to handle conflicts when restoring a deployment.
+/// Constructed from CLI flags --replace, --add, --force.
+pub enum RestoreMode {
+    /// No conflict flags given — error if deployment exists anywhere
+    Default,
+    /// --replace: drop and recreate in the target shard
+    Replace,
+    /// --add: create a copy in a shard that doesn't have the deployment
+    Add,
+    /// --force: restore no matter what (replace if in shard, add if not)
+    Force,
+}
+
+/// The action `plan_restore` decided on based on `RestoreMode` and current
+/// state.
+pub enum RestoreAction {
+    /// Create a new site (active=true if fresh, active=false if copy
+    /// exists elsewhere)
+    Create { active: bool },
+    /// Drop existing site in target shard, then recreate
+    Replace { existing: Site },
+}
+
 /// A wrapper for a database connection that provides access to functionality
 /// that works only on the primary database
 pub struct Connection {
@@ -793,38 +812,29 @@ impl Connection {
     /// returns `Err(E)`, the transaction is rolled back and `Err(E)` is
     /// returned. If committing or rolling back the transaction fails,
     /// return an error
-    pub(crate) fn transaction<'a, 'conn, R, F>(
-        &'conn mut self,
-        callback: F,
-    ) -> BoxFuture<'conn, Result<R, StoreError>>
+    pub(crate) async fn transaction<R, F>(&mut self, callback: F) -> Result<R, StoreError>
     where
-        F: for<'r> FnOnce(&'r mut Self) -> ScopedBoxFuture<'a, 'r, Result<R, StoreError>>
-            + Send
-            + 'a,
-        R: Send + 'a,
-        'a: 'conn,
+        F: TxnCallback<R, StoreError, Self>,
+        R: Send,
     {
         type TM = <AsyncPgConnection as diesel_async::AsyncConnection>::TransactionManager;
 
-        async move {
-            TM::begin_transaction(&mut *self.conn).await?;
-            match callback(self).await {
-                Ok(value) => {
-                    TM::commit_transaction(&mut *self.conn).await?;
-                    Ok(value)
-                }
-                Err(user_error) => match TM::rollback_transaction(&mut *self.conn).await {
-                    Ok(()) => Err(user_error),
-                    Err(diesel::result::Error::BrokenTransactionManager) => {
-                        // In this case we are probably more interested by the
-                        // original error, which likely caused this
-                        Err(user_error)
-                    }
-                    Err(rollback_error) => Err(rollback_error.into()),
-                },
+        TM::begin_transaction(&mut *self.conn).await?;
+        match callback(self).await {
+            Ok(value) => {
+                TM::commit_transaction(&mut *self.conn).await?;
+                Ok(value)
             }
+            Err(user_error) => match TM::rollback_transaction(&mut *self.conn).await {
+                Ok(()) => Err(user_error),
+                Err(diesel::result::Error::BrokenTransactionManager) => {
+                    // In this case we are probably more interested by the
+                    // original error, which likely caused this
+                    Err(user_error)
+                }
+                Err(rollback_error) => Err(rollback_error.into()),
+            },
         }
-        .boxed()
     }
 
     /// Signal any copy process that might be copying into one of these
@@ -983,10 +993,10 @@ impl Connection {
     where
         F: AsyncFn(&DeploymentHash) -> Result<bool, StoreError>,
     {
+        use SubgraphVersionSwitchingMode::*;
         use subgraph as s;
         use subgraph_deployment_assignment as a;
         use subgraph_version as v;
-        use SubgraphVersionSwitchingMode::*;
 
         let created_at = SystemTime::now()
             .duration_since(UNIX_EPOCH)
@@ -1124,7 +1134,7 @@ impl Connection {
                 .await?;
             self.remove_unused_assignments().await
         } else {
-            Err(StoreError::SubgraphNotFound(name.to_string()))
+            Ok(vec![])
         }
     }
 
@@ -1368,7 +1378,7 @@ impl Connection {
     /// function only performs the basic operations for creation, and the
     /// caller must check that other conditions (like whether there already
     /// is an active site for the deployment) are met
-    async fn create_site(
+    pub(crate) async fn create_site(
         &mut self,
         shard: Shard,
         deployment: DeploymentHash,
@@ -1406,7 +1416,7 @@ impl Connection {
             shard,
             namespace,
             network,
-            active: true,
+            active,
             schema_version,
             _creation_disallowed: (),
         })
@@ -1444,6 +1454,13 @@ impl Connection {
             .map(|site| (site, site_was_created))
     }
 
+    pub async fn find_active_site(
+        &mut self,
+        subgraph: &DeploymentHash,
+    ) -> Result<Option<Site>, StoreError> {
+        queries::find_active_site(&mut self.conn, subgraph).await
+    }
+
     pub async fn assigned_node(&mut self, site: &Site) -> Result<Option<NodeId>, StoreError> {
         queries::assigned_node(&mut self.conn, site).await
     }
@@ -1509,43 +1526,89 @@ impl Connection {
         use subgraph_version as v;
         use unused_deployments as u;
 
-        self.transaction(|pconn| {
-            async {
-                let conn = &mut pconn.conn;
+        self.transaction(async |pconn| {
+            let conn = &mut pconn.conn;
 
-                delete(ds::table.filter(ds::id.eq(site.id)))
+            delete(ds::table.filter(ds::id.eq(site.id)))
+                .execute(conn)
+                .await?;
+
+            // If there is no site for this deployment any more, we can get
+            // rid of versions pointing to it
+            let exists = select(exists(
+                ds::table.filter(ds::subgraph.eq(site.deployment.as_str())),
+            ))
+            .get_result::<bool>(conn)
+            .await?;
+            if !exists {
+                delete(v::table.filter(v::deployment.eq(site.deployment.as_str())))
                     .execute(conn)
                     .await?;
 
-                // If there is no site for this deployment any more, we can get
-                // rid of versions pointing to it
-                let exists = select(exists(
-                    ds::table.filter(ds::subgraph.eq(site.deployment.as_str())),
-                ))
-                .get_result::<bool>(conn)
-                .await?;
-                if !exists {
-                    delete(v::table.filter(v::deployment.eq(site.deployment.as_str())))
-                        .execute(conn)
-                        .await?;
-
-                    // Remove the entry in `subgraph_features`
-                    delete(f::table.filter(f::id.eq(site.deployment.as_str())))
-                        .execute(conn)
-                        .await?;
-                }
-
-                update(u::table.filter(u::id.eq(site.id)))
-                    .set(u::removed_at.eq(sql("now()")))
+                // Remove the entry in `subgraph_features`
+                delete(f::table.filter(f::id.eq(site.deployment.as_str())))
                     .execute(conn)
                     .await?;
-                Ok(())
             }
-            .scope_boxed()
+
+            update(u::table.filter(u::id.eq(site.id)))
+                .set(u::removed_at.eq(sql("now()")))
+                .execute(conn)
+                .await?;
+            Ok(())
         })
         .await
     }
 
+    /// Determine what action to take when restoring `subgraph` into `shard`
+    /// based on the `mode` and the current state of the deployment.
+    pub async fn plan_restore(
+        &mut self,
+        shard: &Shard,
+        subgraph: &DeploymentHash,
+        mode: &RestoreMode,
+    ) -> Result<RestoreAction, StoreError> {
+        let conn = &mut self.conn;
+        let in_shard = queries::find_site_in_shard(conn, subgraph, shard).await?;
+        let active = queries::find_active_site(conn, subgraph).await?;
+
+        match (in_shard, active, mode) {
+            // Deployment exists in target shard
+            (Some(existing), _, RestoreMode::Replace | RestoreMode::Force) => {
+                Ok(RestoreAction::Replace { existing })
+            }
+            (Some(_), _, RestoreMode::Default | RestoreMode::Add) => {
+                Err(StoreError::Input(format!(
+                    "deployment {} already exists in shard {}; use --replace or --force",
+                    subgraph,
+                    shard.as_str()
+                )))
+            }
+            // Deployment does not exist in target shard but exists elsewhere
+            (None, Some(ref active_site), RestoreMode::Add | RestoreMode::Force) => {
+                let _ = active_site;
+                Ok(RestoreAction::Create { active: false })
+            }
+            (None, Some(active_site), RestoreMode::Default) => Err(StoreError::Input(format!(
+                "deployment {} already exists in shard {}; use --add --shard {} or --force",
+                subgraph,
+                active_site.shard.as_str(),
+                shard.as_str()
+            ))),
+            (None, Some(_), RestoreMode::Replace) => Err(StoreError::Input(format!(
+                "deployment {} is not in shard {}; nothing to replace",
+                subgraph,
+                shard.as_str()
+            ))),
+            // Deployment does not exist anywhere
+            (None, None, RestoreMode::Replace) => Err(StoreError::Input(format!(
+                "deployment {} does not exist; nothing to replace",
+                subgraph
+            ))),
+            (None, None, _) => Ok(RestoreAction::Create { active: true }),
+        }
+    }
+
     pub async fn locate_site(
         &mut self,
         locator: DeploymentLocator,
@@ -2085,33 +2148,24 @@ impl Mirror {
     /// must only access tables that are mirrored through `refresh_tables`
     ///
     /// The function `callback` must not do any blocking work itself
-    pub(crate) fn read_async<'a, 's, R, F>(
-        &'s self,
-        callback: F,
-    ) -> BoxFuture<'s, Result<R, StoreError>>
+    pub(crate) async fn read_async<R, F>(&self, mut callback: F) -> Result<R, StoreError>
     where
-        F: for<'r> Fn(&'r mut AsyncPgConnection) -> ScopedBoxFuture<'a, 'r, Result<R, StoreError>>
-            + Send
-            + 'a,
-        R: Send + 'a,
-        'a: 's,
+        F: TxnMutCallback<R, StoreError> + Send,
+        R: Send,
     {
-        async move {
-            for pool in self.pools.as_ref() {
-                let mut conn = match pool.get_permitted().await {
-                    Ok(conn) => conn,
-                    Err(StoreError::DatabaseUnavailable) => continue,
-                    Err(e) => return Err(e),
-                };
-                match callback(&mut conn).await {
-                    Ok(v) => return Ok(v),
-                    Err(StoreError::DatabaseUnavailable) => continue,
-                    Err(e) => return Err(e),
-                }
+        for pool in self.pools.as_ref() {
+            let mut conn = match pool.get_permitted().await {
+                Ok(conn) => conn,
+                Err(StoreError::DatabaseUnavailable) => continue,
+                Err(e) => return Err(e),
+            };
+            match callback(&mut conn).await {
+                Ok(v) => return Ok(v),
+                Err(StoreError::DatabaseUnavailable) => continue,
+                Err(e) => return Err(e),
             }
-            Err(StoreError::DatabaseUnavailable)
         }
-        .boxed()
+        Err(StoreError::DatabaseUnavailable)
     }
 
     /// Refresh the contents of mirrored tables from the primary (through
@@ -2139,6 +2193,14 @@ impl Mirror {
             .await
         }
 
+        // Prevent FDW zombie connections from holding ACCESS EXCLUSIVE locks
+        // indefinitely. lock_timeout prevents TRUNCATE stampede when multiple
+        // nodes mirror simultaneously. statement_timeout kills stuck FDW
+        // queries. SET LOCAL scopes these to this transaction only.
+        conn.batch_execute("SET LOCAL statement_timeout = '60s'; SET LOCAL lock_timeout = '10s';")
+            .await
+            .map_err(StoreError::from)?;
+
         // Truncate all tables at once, otherwise truncation can fail
         // because of foreign key constraints
         let tables = Self::PUBLIC_TABLES
@@ -2196,17 +2258,17 @@ impl Mirror {
     }
 
     pub async fn assignments(&self, node: &NodeId) -> Result<Vec<Site>, StoreError> {
-        self.read_async(|conn| queries::assignments(conn, node).scope_boxed())
+        self.read_async(async |conn| queries::assignments(conn, node).await)
             .await
     }
 
     pub async fn active_assignments(&self, node: &NodeId) -> Result<Vec<Site>, StoreError> {
-        self.read_async(|conn| queries::active_assignments(conn, node).scope_boxed())
+        self.read_async(async |conn| queries::active_assignments(conn, node).await)
             .await
     }
 
     pub async fn assigned_node(&self, site: &Site) -> Result<Option<NodeId>, StoreError> {
-        self.read_async(|conn| queries::assigned_node(conn, site).scope_boxed())
+        self.read_async(async |conn| queries::assigned_node(conn, site).await)
             .await
     }
 
@@ -2218,7 +2280,7 @@ impl Mirror {
         &self,
         site: Arc<Site>,
     ) -> Result<Option<(NodeId, bool)>, StoreError> {
-        self.read_async(|conn| queries::assignment_status(conn, &site).scope_boxed())
+        self.read_async(async |conn| queries::assignment_status(conn, &site).await)
             .await
     }
 
@@ -2226,12 +2288,12 @@ impl Mirror {
         &self,
         subgraph: &DeploymentHash,
     ) -> Result<Option<Site>, StoreError> {
-        self.read_async(|conn| queries::find_active_site(conn, subgraph).scope_boxed())
+        self.read_async(async |conn| queries::find_active_site(conn, subgraph).await)
             .await
     }
 
     pub async fn find_site_by_ref(&self, id: DeploymentId) -> Result<Option<Site>, StoreError> {
-        self.read_async(|conn| queries::find_site_by_ref(conn, id).scope_boxed())
+        self.read_async(async |conn| queries::find_site_by_ref(conn, id).await)
             .await
     }
 
@@ -2239,17 +2301,17 @@ impl Mirror {
         &self,
         name: &SubgraphName,
     ) -> Result<DeploymentHash, StoreError> {
-        self.read_async(|conn| queries::current_deployment_for_subgraph(conn, name).scope_boxed())
+        self.read_async(async |conn| queries::current_deployment_for_subgraph(conn, name).await)
             .await
     }
 
     pub async fn deployments_for_subgraph(&self, name: &str) -> Result<Vec<Site>, StoreError> {
-        self.read_async(|conn| queries::deployments_for_subgraph(conn, name).scope_boxed())
+        self.read_async(async |conn| queries::deployments_for_subgraph(conn, name).await)
             .await
     }
 
     pub async fn subgraph_exists(&self, name: &SubgraphName) -> Result<bool, StoreError> {
-        self.read_async(|conn| queries::subgraph_exists(conn, name).scope_boxed())
+        self.read_async(async |conn| queries::subgraph_exists(conn, name).await)
             .await
     }
 
@@ -2258,7 +2320,7 @@ impl Mirror {
         name: &str,
         use_current: bool,
     ) -> Result<Option<Site>, StoreError> {
-        self.read_async(|conn| queries::subgraph_version(conn, name, use_current).scope_boxed())
+        self.read_async(async |conn| queries::subgraph_version(conn, name, use_current).await)
             .await
     }
 
@@ -2269,14 +2331,14 @@ impl Mirror {
         ids: &[String],
         only_active: bool,
     ) -> Result<Vec<Site>, StoreError> {
-        self.read_async(|conn| queries::find_sites(conn, ids, only_active).scope_boxed())
+        self.read_async(async |conn| queries::find_sites(conn, ids, only_active).await)
             .await
     }
 
     /// Find sites by their subgraph deployment ids. If `ids` is empty,
     /// return no sites
     pub async fn find_sites_by_id(&self, ids: &[DeploymentId]) -> Result<Vec<Site>, StoreError> {
-        self.read_async(|conn| queries::find_sites_by_id(conn, ids).scope_boxed())
+        self.read_async(async |conn| queries::find_sites_by_id(conn, ids).await)
             .await
     }
 
@@ -2284,7 +2346,7 @@ impl Mirror {
         &self,
         infos: &[status::Info],
     ) -> Result<HashMap<GraphDeploymentId, (String, bool)>, StoreError> {
-        self.read_async(|conn| queries::fill_assignments(conn, infos).scope_boxed())
+        self.read_async(async |conn| queries::fill_assignments(conn, infos).await)
             .await
     }
 
@@ -2292,7 +2354,7 @@ impl Mirror {
         &self,
         version: &str,
     ) -> Result<Option<(String, String)>, StoreError> {
-        self.read_async(|conn| queries::version_info(conn, version).scope_boxed())
+        self.read_async(async |conn| queries::version_info(conn, version).await)
             .await
     }
 
@@ -2300,7 +2362,7 @@ impl Mirror {
         &self,
         subgraph_id: &str,
     ) -> Result<(Option<String>, Option<String>), StoreError> {
-        self.read_async(|conn| queries::versions_for_subgraph_id(conn, subgraph_id).scope_boxed())
+        self.read_async(async |conn| queries::versions_for_subgraph_id(conn, subgraph_id).await)
             .await
     }
 
@@ -2309,8 +2371,8 @@ impl Mirror {
         &self,
         deployment_hash: &str,
     ) -> Result<Vec<(String, String)>, StoreError> {
-        self.read_async(|conn| {
-            queries::subgraphs_by_deployment_hash(conn, deployment_hash).scope_boxed()
+        self.read_async(async |conn| {
+            queries::subgraphs_by_deployment_hash(conn, deployment_hash).await
         })
         .await
     }
@@ -2320,7 +2382,7 @@ impl Mirror {
         subgraph: &DeploymentHash,
         shard: &Shard,
     ) -> Result<Option<Site>, StoreError> {
-        self.read_async(|conn| queries::find_site_in_shard(conn, subgraph, shard).scope_boxed())
+        self.read_async(async |conn| queries::find_site_in_shard(conn, subgraph, shard).await)
             .await
     }
 }
diff --git a/store/postgres/src/relational.rs b/store/postgres/src/relational.rs
index 404daa42b8d..4059e736635 100644
--- a/store/postgres/src/relational.rs
+++ b/store/postgres/src/relational.rs
@@ -15,21 +15,22 @@ mod ddl_tests;
 mod query_tests;
 
 pub(crate) mod dsl;
+pub(crate) mod dump;
 pub(crate) mod index;
 pub(crate) mod prune;
-mod rollup;
+pub(crate) mod restore;
+pub(crate) mod rollup;
 pub(crate) mod value;
 
 use diesel::deserialize::FromSql;
 use diesel::pg::Pg;
 use diesel::serialize::{Output, ToSql};
 use diesel::sql_types::Text;
-use diesel::{debug_query, sql_query, OptionalExtension, QueryDsl, QueryResult};
-use diesel_async::scoped_futures::ScopedFutureExt;
+use diesel::{OptionalExtension, QueryDsl, QueryResult, debug_query, sql_query};
 use diesel_async::{AsyncConnection, RunQueryDsl, SimpleAsyncConnection};
 
-use graph::blockchain::block_stream::{EntityOperationKind, EntitySourceOperation};
 use graph::blockchain::BlockTime;
+use graph::blockchain::block_stream::{EntityOperationKind, EntitySourceOperation};
 use graph::cheap_clone::CheapClone;
 use graph::components::store::write::{RowGroup, WriteChunk};
 use graph::data::graphql::TypeExt as _;
@@ -37,13 +38,12 @@ use graph::data::query::Trace;
 use graph::data::value::Word;
 use graph::data_source::CausalityRegion;
 use graph::internal_error;
-use graph::prelude::{q, EntityQuery, StopwatchMetrics, ENV_VARS};
+use graph::prelude::{ENV_VARS, EntityQuery, StopwatchMetrics, q};
 use graph::schema::{
     AggregationInterval, EntityKey, EntityType, Field, FulltextConfig, FulltextDefinition,
     InputSchema,
 };
-use graph::slog::warn;
-use index::IndexList;
+use graph::slog::{debug, warn};
 use inflector::Inflector;
 use itertools::Itertools;
 use lazy_static::lazy_static;
@@ -69,17 +69,17 @@ use crate::{
     },
 };
 use graph::components::store::{AttributeNames, DerivedEntityQuery};
-use graph::data::store::{IdList, IdType, BYTES_SCALAR};
+use graph::data::store::{BYTES_SCALAR, IdList, IdType};
 use graph::data::subgraph::schema::POI_TABLE;
 use graph::prelude::{
-    anyhow, info, BlockNumber, DeploymentHash, Entity, EntityOperation, Logger,
-    QueryExecutionError, StoreError, ValueType,
+    BlockNumber, DeploymentHash, Entity, EntityOperation, Logger, QueryExecutionError, StoreError,
+    ValueType, anyhow, info,
 };
 
-use crate::block_range::{BoundSide, BLOCK_COLUMN, BLOCK_RANGE_COLUMN};
-pub use crate::catalog::Catalog;
 use crate::ForeignServer;
-use crate::{catalog, deployment, AsyncPgConnection};
+use crate::block_range::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN, BoundSide, CAUSALITY_REGION_COLUMN};
+pub use crate::catalog::Catalog;
+use crate::{AsyncPgConnection, catalog, deployment};
 
 use self::rollup::Rollup;
 
@@ -237,7 +237,7 @@ pub struct Layout {
     pub input_schema: InputSchema,
 
     /// The rollups for aggregations in this layout
-    rollups: Vec<Rollup>,
+    pub(crate) rollups: Vec<Rollup>,
 }
 
 impl Layout {
@@ -371,6 +371,7 @@ impl Layout {
             position: position as u32,
             is_account_like: false,
             immutable: false,
+            skip_duplicates: false,
             has_causality_region: false,
         }
     }
@@ -380,13 +381,12 @@ impl Layout {
         site: Arc<Site>,
         schema: &InputSchema,
         entities_with_causality_region: BTreeSet<EntityType>,
-        index_def: Option<IndexList>,
     ) -> Result<Layout, StoreError> {
         let catalog =
             Catalog::for_creation(conn, site.cheap_clone(), entities_with_causality_region).await?;
         let layout = Self::new(site, schema, catalog)?;
         let sql = layout
-            .as_ddl(index_def)
+            .as_ddl()
             .map_err(|_| StoreError::Unknown(anyhow!("failed to generate DDL for layout")))?;
         conn.batch_execute(&sql).await?;
         Ok(layout)
@@ -653,7 +653,7 @@ impl Layout {
 
         // sort the elements in each blocks bucket by vid
         for vec in entities.values_mut() {
-            vec.sort_by(|a, b| a.vid.cmp(&b.vid));
+            vec.sort_by_key(|a| a.vid);
         }
 
         Ok(entities)
@@ -767,44 +767,60 @@ impl Layout {
         // We insert the entities in chunks to make sure each operation does
         // not exceed the maximum number of bindings allowed in queries
         let chunk_size = InsertQuery::chunk_size(table);
+        let mut affected_rows: usize = 0;
+        let mut expected_rows: usize = 0;
         for chunk in group.write_chunks(chunk_size) {
             // Empty chunks would lead to invalid SQL
             if !chunk.is_empty() {
-                if let Err(e) = InsertQuery::new(table, &chunk)?.execute(conn).await {
-                    // We occasionally get these errors but it's entirely
-                    // unclear what causes them. We work around that by
-                    // switching to row-by-row inserts until we can figure
-                    // out what the underlying cause is
-                    let err_msg = e.to_string();
-                    if !err_msg.contains("value too large to transmit") {
-                        let (block, msg) = chunk_details(&chunk);
-                        return Err(StoreError::write_failure(
-                            e,
-                            table.object.as_str(),
-                            block,
-                            msg,
-                        ));
+                expected_rows += chunk.len();
+                match InsertQuery::new(table, &chunk)?.execute(conn).await {
+                    Ok(count) => {
+                        affected_rows += count;
                     }
-                    let (block, msg) = chunk_details(&chunk);
-                    warn!(logger, "Insert of entire chunk failed. Trying row by row insert.";
-                        "table" => table.object.as_str(),
-                        "block" => block,
-                        "error" => err_msg,
-                        "details" => msg
-                    );
-                    for single_chunk in chunk.as_single_writes() {
-                        InsertQuery::new(table, &single_chunk)?
-                            .execute(conn)
-                            .await
-                            .map_err(|e| {
-                                let (block, msg) = chunk_details(&single_chunk);
-                                let msg = format!("{}: offending row {:?}", msg, single_chunk);
-                                StoreError::write_failure(e, table.object.as_str(), block, msg)
-                            })?;
+                    Err(e) => {
+                        // We occasionally get these errors but it's entirely
+                        // unclear what causes them. We work around that by
+                        // switching to row-by-row inserts until we can figure
+                        // out what the underlying cause is
+                        let err_msg = e.to_string();
+                        if !err_msg.contains("value too large to transmit") {
+                            let (block, msg) = chunk_details(&chunk);
+                            return Err(StoreError::write_failure(
+                                e,
+                                table.object.as_str(),
+                                block,
+                                msg,
+                            ));
+                        }
+                        let (block, msg) = chunk_details(&chunk);
+                        warn!(logger, "Insert of entire chunk failed. Trying row by row insert.";
+                            "table" => table.object.as_str(),
+                            "block" => block,
+                            "error" => err_msg,
+                            "details" => msg
+                        );
+                        for single_chunk in chunk.as_single_writes() {
+                            let count = InsertQuery::new(table, &single_chunk)?
+                                .execute(conn)
+                                .await
+                                .map_err(|e| {
+                                    let (block, msg) = chunk_details(&single_chunk);
+                                    let msg = format!("{}: offending row {:?}", msg, single_chunk);
+                                    StoreError::write_failure(e, table.object.as_str(), block, msg)
+                                })?;
+                            affected_rows += count;
+                        }
                     }
                 }
             }
         }
+        if affected_rows < expected_rows && table.immutable && table.skip_duplicates {
+            debug!(logger, "Cross-batch duplicate inserts skipped by ON CONFLICT DO NOTHING";
+                "entity_type" => table.object.as_str(),
+                "expected_rows" => expected_rows,
+                "affected_rows" => affected_rows,
+                "skipped" => expected_rows - affected_rows);
+        }
         Ok(())
     }
 
@@ -882,20 +898,18 @@ impl Layout {
             query.block,
             query.query_id,
             &self.site,
+            query.aggregation_current,
         )?;
 
         let query_clone = query.clone();
 
         let start = Instant::now();
         let values = conn
-            .transaction(|conn| {
-                async {
-                    if let Some(ref timeout_sql) = *STATEMENT_TIMEOUT {
-                        conn.batch_execute(timeout_sql).await?;
-                    }
-                    query.load::<EntityData>(conn).await
+            .transaction(async |conn| {
+                if let Some(ref timeout_sql) = *STATEMENT_TIMEOUT {
+                    conn.batch_execute(timeout_sql).await?;
                 }
-                .scope_boxed()
+                query.load::<EntityData>(conn).await
             })
             .await
             .map_err(|e| {
@@ -946,6 +960,9 @@ impl Layout {
     ) -> Result<usize, StoreError> {
         let table = self.table_for_entity(&group.entity_type)?;
         if table.immutable && group.has_clamps() {
+            if table.skip_duplicates {
+                return Ok(0);
+            }
             let ids = group
                 .ids()
                 .map(|id| id.to_string())
@@ -1011,9 +1028,13 @@ impl Layout {
 
         let table = self.table_for_entity(&group.entity_type)?;
         if table.immutable {
+            if table.skip_duplicates {
+                return Ok(0);
+            }
             return Err(internal_error!(
                 "entities of type `{}` can not be deleted since they are immutable. Entity ids are [{}]",
-                table.object, group.ids().join(", ")
+                table.object,
+                group.ids().join(", ")
             ));
         }
 
@@ -1659,6 +1680,8 @@ pub struct Table {
     /// deleted
     pub(crate) immutable: bool,
 
+    pub(crate) skip_duplicates: bool,
+
     /// Whether this table has an explicit `causality_region` column. If `false`, then the column is
     /// not present and the causality region for all rows is implicitly `0` (equivalent to CasualityRegion::ONCHAIN).
     pub(crate) has_causality_region: bool,
@@ -1689,6 +1712,7 @@ impl Table {
             .collect::<Result<Vec<Column>, StoreError>>()?;
         let qualified_name = SqlName::qualified_name(&catalog.site.namespace, &table_name);
         let immutable = defn.is_immutable();
+        let skip_duplicates = defn.skip_duplicates();
         let nsp = catalog.site.namespace.clone();
         let table = Table {
             object: defn.cheap_clone(),
@@ -1702,6 +1726,7 @@ impl Table {
             columns,
             position,
             immutable,
+            skip_duplicates,
             has_causality_region,
         };
         Ok(table)
@@ -1719,6 +1744,7 @@ impl Table {
             is_account_like: self.is_account_like,
             position: self.position,
             immutable: self.immutable,
+            skip_duplicates: self.skip_duplicates,
             has_causality_region: self.has_causality_region,
         };
 
@@ -1726,7 +1752,12 @@ impl Table {
     }
 
     /// Find the column `name` in this table. The name must be in snake case,
-    /// i.e., use SQL conventions
+    /// i.e., use SQL conventions.
+    ///
+    /// Fulltext search columns (`ColumnType::TSVector`) are deliberately
+    /// skipped since they are not queryable entity attributes. Use
+    /// [`Table::column_including_fulltext`] when the fulltext columns are
+    /// needed, e.g. when copying a table.
     pub fn column(&self, name: &SqlName) -> Option<&Column> {
         self.columns
             .iter()
@@ -1734,6 +1765,13 @@ impl Table {
             .find(|column| &column.name == name)
     }
 
+    /// Find the column `name` in this table, including fulltext search
+    /// columns which [`Table::column`] hides. The name must be in snake
+    /// case, i.e., use SQL conventions.
+    pub fn column_including_fulltext(&self, name: &SqlName) -> Option<&Column> {
+        self.columns.iter().find(|column| &column.name == name)
+    }
+
     /// Find the column for `field` in this table. The name must be the
     /// GraphQL name of an entity field
     pub fn column_for_field(&self, field: &str) -> Result<&Column, StoreError> {
diff --git a/store/postgres/src/relational/ddl.rs b/store/postgres/src/relational/ddl.rs
index cdb162978b6..c1179b5b1a1 100644
--- a/store/postgres/src/relational/ddl.rs
+++ b/store/postgres/src/relational/ddl.rs
@@ -3,18 +3,18 @@ use std::{
     iter,
 };
 
-use graph::{
-    prelude::{BLOCK_NUMBER_MAX, ENV_VARS},
-    schema::InputSchema,
-};
+use graph::{prelude::ENV_VARS, schema::InputSchema};
 
-use crate::block_range::CAUSALITY_REGION_COLUMN;
 use crate::relational::{
-    ColumnType, BLOCK_COLUMN, BLOCK_RANGE_COLUMN, BYTE_ARRAY_PREFIX_SIZE, STRING_PREFIX_SIZE,
+    BLOCK_COLUMN, BLOCK_RANGE_COLUMN, BYTE_ARRAY_PREFIX_SIZE, ColumnType, STRING_PREFIX_SIZE,
     VID_COLUMN,
 };
+use crate::{block_range::CAUSALITY_REGION_COLUMN, relational::index::Cond};
 
-use super::{index::IndexList, Catalog, Column, Layout, SqlName, Table};
+use super::{
+    Column, Layout, SqlName, Table,
+    index::{CreateIndex, Expr, IndexCreator, Method, PrefixKind},
+};
 
 // In debug builds (for testing etc.) unconditionally create exclusion constraints, in release
 // builds for production, skip them
@@ -29,7 +29,7 @@ impl Layout {
     ///
     /// See the unit tests at the end of this file for the actual DDL that
     /// gets generated
-    pub fn as_ddl(&self, index_def: Option<IndexList>) -> Result<String, fmt::Error> {
+    pub fn as_ddl(&self) -> Result<String, fmt::Error> {
         let mut out = String::new();
 
         // Output enums first so table definitions can reference them
@@ -40,13 +40,9 @@ impl Layout {
         let mut tables = self.tables.values().collect::<Vec<_>>();
         tables.sort_by_key(|table| table.position);
         // Output 'create table' statements for all tables
+        let creat = self.index_creator(false, false);
         for table in tables {
-            table.as_ddl(
-                &self.input_schema,
-                &self.catalog,
-                index_def.as_ref(),
-                &mut out,
-            )?;
+            table.as_ddl(&self.input_schema, &creat, &mut out)?;
         }
 
         Ok(out)
@@ -159,19 +155,28 @@ impl Table {
         }
     }
 
-    fn create_time_travel_indexes(&self, catalog: &Catalog, out: &mut String) -> fmt::Result {
-        let (int4, int8) = catalog.minmax_ops();
+    /// Create a `CreateIndex` for an index on this table with the given
+    /// name over the given columns. The index will be a non-unique BTree
+    /// index
+    fn create_index(&self, name: &str, columns: Vec<Expr>) -> CreateIndex {
+        CreateIndex::create(
+            name,
+            &format!("\"{}\"", self.nsp),
+            &self.name.quoted(),
+            false,
+            Method::BTree,
+            columns,
+            None,
+            None,
+        )
+    }
 
+    fn time_travel_indexes(&self) -> Vec<CreateIndex> {
+        let mut idxs = Vec::new();
         if self.immutable {
             // For immutable entities, a simple BTree on block$ is sufficient
-            write!(
-                out,
-                "create index {table_name}_block\n    \
-                on {qname}({block});\n",
-                table_name = self.name,
-                qname = self.qualified_name,
-                block = BLOCK_COLUMN
-            )
+            let idx = self.create_index(&format!("{}_block", self.name), vec![Expr::Block]);
+            idxs.push(idx);
         } else {
             // Add a BRIN index on the block_range bounds to exploit the fact
             // that block ranges closely correlate with where in a table an
@@ -194,52 +199,26 @@ impl Table {
             //
             // We also index `vid` as that correlates with the order in which
             // entities are stored.
-            write!(out,"create index brin_{table_name}\n    \
-                on {qname}\n \
-                   using brin(lower(block_range) {int4}, coalesce(upper(block_range), {block_max}) {int4}, vid {int8});\n",
-                table_name = self.name,
-                qname = self.qualified_name,
-                block_max = BLOCK_NUMBER_MAX)?;
+
+            let idx = self
+                .create_index(
+                    &format!("brin_{table_name}", table_name = self.name),
+                    vec![Expr::BlockRangeLower, Expr::BlockRangeUpper, Expr::Vid],
+                )
+                .method(Method::Brin);
+            idxs.push(idx);
 
             // Add a BTree index that helps with the `RevertClampQuery` by making
             // it faster to find entity versions that have been modified
-            write!(
-                out,
-                "create index {table_name}_block_range_closed\n    \
-                 on {qname}(coalesce(upper(block_range), {block_max}))\n \
-                 where coalesce(upper(block_range), {block_max}) < {block_max};\n",
-                table_name = self.name,
-                qname = self.qualified_name,
-                block_max = BLOCK_NUMBER_MAX
-            )
-        }
-    }
-
-    /// Calculates the indexing method and expression for a database column.
-    ///
-    /// ### Parameters
-    /// * `immutable`: A boolean flag indicating whether the table is immutable.
-    /// * `column`: A reference to the `Column` struct, representing the database column for which the index method and expression are being calculated.
-    ///
-    /// ### Returns
-    /// A tuple `(String, String)` where:
-    /// - The first element is the indexing method ("btree", "gist", or "gin"),
-    /// - The second element is the index expression as a string.
-    fn calculate_attr_index_method_and_expression(
-        immutable: bool,
-        column: &Column,
-    ) -> (String, String) {
-        if column.is_reference() && !column.is_list() {
-            if immutable {
-                let index_expr = format!("{}, {}", column.name.quoted(), BLOCK_COLUMN);
-                ("btree".to_string(), index_expr)
-            } else {
-                let index_expr = format!("{}, {}", column.name.quoted(), BLOCK_RANGE_COLUMN);
-                ("gist".to_string(), index_expr)
-            }
-        } else {
-            Self::calculate_index_method_and_expression(column)
+            let idx = self
+                .create_index(
+                    &format!("{table_name}_block_range_closed", table_name = self.name),
+                    vec![Expr::BlockRangeUpper],
+                )
+                .cond(Cond::Closed);
+            idxs.push(idx);
         }
+        idxs
     }
 
     pub fn calculate_index_method_and_expression(column: &Column) -> (String, String) {
@@ -269,62 +248,6 @@ impl Table {
         (method, index_expr)
     }
 
-    pub(crate) fn create_postponed_indexes(
-        &self,
-        skip_colums: Vec<String>,
-        concurrently: bool,
-    ) -> Vec<String> {
-        let mut indexing_queries = vec![];
-        let columns = self.columns_to_index();
-
-        for (column_index, column) in columns.enumerate() {
-            let (method, index_expr) =
-                Self::calculate_attr_index_method_and_expression(self.immutable, column);
-            if !column.is_list()
-                && method == "btree"
-                && column.name.as_str() != "id"
-                && !skip_colums.contains(&column.name.to_string())
-            {
-                let conc = if concurrently { "concurrently " } else { "" };
-                let sql = format!(
-                    "create index {conc}if not exists attr_{table_index}_{column_index}_{table_name}_{column_name}\n    on {qname} using {method}({index_expr});\n",
-                    table_index = self.position,
-                    table_name = self.name,
-                    column_name = column.name,
-                    qname = self.qualified_name,
-                );
-                indexing_queries.push(sql);
-            }
-        }
-        indexing_queries
-    }
-
-    fn create_attribute_indexes(&self, out: &mut String) -> fmt::Result {
-        let columns = self.columns_to_index();
-
-        for (column_index, column) in columns.enumerate() {
-            let (method, index_expr) =
-                Self::calculate_attr_index_method_and_expression(self.immutable, column);
-
-            // If `create_gin_indexes` is set to false, we don't create
-            // indexes on array attributes. Experience has shown that these
-            // indexes are very expensive to update and can have a very bad
-            // impact on the write performance of the database, but are
-            // hardly ever used or needed by queries.
-            if !column.is_list() || ENV_VARS.store.create_gin_indexes {
-                write!(
-                    out,
-                    "create index attr_{table_index}_{column_index}_{table_name}_{column_name}\n    on {qname} using {method}({index_expr});\n",
-                    table_index = self.position,
-                    table_name = self.name,
-                    column_name = column.name,
-                    qname = self.qualified_name,
-                )?;
-            }
-        }
-        writeln!(out)
-    }
-
     fn columns_to_index(&self) -> impl Iterator<Item = &Column> {
         // Skip columns whose type is an array of enum, since there is no
         // good way to index them with Postgres 9.6. Once we move to
@@ -343,20 +266,101 @@ impl Table {
                 && [ColumnType::BigDecimal, ColumnType::BigInt, ColumnType::Int]
                     .contains(&col.column_type))
         };
-        let columns = self
-            .columns
+
+        self.columns
             .iter()
             .filter(not_enum_list)
             .filter(not_immutable_pk)
-            .filter(not_numeric_list);
-        columns
+            .filter(not_numeric_list)
+    }
+
+    /// Return the index method and expressions for an attribute column.
+    fn attr_index_spec(immutable: bool, column: &Column) -> (Method, Vec<Expr>) {
+        if column.is_reference() && !column.is_list() {
+            if immutable {
+                (
+                    Method::BTree,
+                    vec![Expr::Column(column.name.as_str().to_string()), Expr::Block],
+                )
+            } else {
+                (
+                    Method::Gist,
+                    vec![
+                        Expr::Column(column.name.as_str().to_string()),
+                        Expr::BlockRange,
+                    ],
+                )
+            }
+        } else if column.use_prefix_comparison {
+            match column.column_type {
+                ColumnType::String => (
+                    Method::BTree,
+                    vec![Expr::Prefix(
+                        column.name.as_str().to_string(),
+                        PrefixKind::Left,
+                    )],
+                ),
+                ColumnType::Bytes => (
+                    Method::BTree,
+                    vec![Expr::Prefix(
+                        column.name.as_str().to_string(),
+                        PrefixKind::Substring,
+                    )],
+                ),
+                _ => unreachable!("only String and Bytes can have arbitrary size"),
+            }
+        } else if column.is_list() || column.is_fulltext() {
+            (
+                Method::Gin,
+                vec![Expr::Column(column.name.as_str().to_string())],
+            )
+        } else {
+            (
+                Method::BTree,
+                vec![Expr::Column(column.name.as_str().to_string())],
+            )
+        }
+    }
+
+    fn add_attribute_indexes(&self, indexes: &mut Vec<CreateIndex>) {
+        for (column_index, column) in self.columns_to_index().enumerate() {
+            if column.is_list() && !ENV_VARS.store.create_gin_indexes {
+                continue;
+            }
+            let (method, columns) = Self::attr_index_spec(self.immutable, column);
+            let name = format!(
+                "attr_{}_{}_{}_{}",
+                self.position, column_index, self.name, column.name
+            );
+            indexes.push(CreateIndex::create(
+                &name,
+                &format!("\"{}\"", self.nsp),
+                &self.name.quoted(),
+                false,
+                method,
+                columns,
+                None,
+                None,
+            ));
+        }
     }
 
-    /// If `self` is an aggregation and has cumulative aggregates, create an
-    /// index on the dimensions. That supports the lookup of previous
-    /// aggregation values we do in the rollup query since that filters by
-    /// all dimensions with an `=` and by timestamp with a `<`
-    fn create_aggregate_indexes(&self, schema: &InputSchema, out: &mut String) -> fmt::Result {
+    /// Add an index `<table>_dims` for aggregation tables if the
+    /// aggregation has cumulative aggregates; the index is needed to speed
+    /// up the rollup query as that has to, for cumulative aggregates,
+    /// access this table when we calculate the aggregations for the next
+    /// bucket.
+    ///
+    /// The index we create is made up of the dimensions of the aggregation
+    /// plus the `timestamp` column as the last entry in the index to make
+    /// it usable for rollup queries.
+    ///
+    /// see also: #rollup-query-indexing for the exact query
+    fn add_aggregate_indexes(
+        &self,
+        schema: &InputSchema,
+        indexes: &mut Vec<CreateIndex>,
+    ) -> Result<(), fmt::Error> {
         let agg = schema
             .agg_mappings()
             .find(|mapping| mapping.agg_type(schema) == self.object)
@@ -368,29 +372,39 @@ impl Table {
             return Ok(());
         };
 
-        let dim_cols: Vec<_> = agg
+        let mut columns: Vec<Expr> = agg
             .dimensions()
             .map(|dim| {
                 self.column_for_field(&dim.name)
-                    .map(|col| &col.name)
-                    // We don't have a good way to return an error
-                    // indicating that somehow the table is wrong (which
-                    // should not happen). We can only return a generic
-                    // formatting error
+                    .map(|col| Expr::Column(col.name.as_str().to_string()))
                     .map_err(|_| fmt::Error)
             })
             .collect::<Result<_, _>>()?;
-
-        write!(
-            out,
-            "create index {table_name}_dims\n    on {qname}({dims}, timestamp);\n",
-            table_name = self.name,
-            qname = self.qualified_name,
-            dims = dim_cols.join(", ")
-        )?;
+        columns.push(Expr::Column("timestamp".to_string()));
+
+        let name = format!("{}_dims", self.name);
+        indexes.push(CreateIndex::create(
+            &name,
+            &format!("\"{}\"", self.nsp),
+            &self.name.quoted(),
+            false,
+            Method::BTree,
+            columns,
+            None,
+            None,
+        ));
         Ok(())
     }
 
+    /// Return all indexes for this table as `CreateIndex` objects
+    pub(crate) fn indexes(&self, schema: &InputSchema) -> Result<Vec<CreateIndex>, fmt::Error> {
+        let mut indexes = Vec::new();
+        indexes.extend(self.time_travel_indexes());
+        self.add_attribute_indexes(&mut indexes);
+        self.add_aggregate_indexes(schema, &mut indexes)?;
+        Ok(indexes)
+    }
+
     /// Generate the DDL for one table, i.e. one `create table` statement
     /// and all `create index` statements for the table's columns
     ///
@@ -399,24 +413,14 @@ impl Table {
     pub(crate) fn as_ddl(
         &self,
         schema: &InputSchema,
-        catalog: &Catalog,
-        index_def: Option<&IndexList>,
+        creat: &IndexCreator,
         out: &mut String,
     ) -> fmt::Result {
         self.create_table(out)?;
-        self.create_time_travel_indexes(catalog, out)?;
-        if index_def.is_some() && ENV_VARS.postpone_attribute_index_creation {
-            #[allow(clippy::unnecessary_unwrap)]
-            let arr = index_def
-                .unwrap()
-                .indexes_for_table(&self.nsp, &self.name.to_string(), self, false, false, false)
-                .map_err(|_| fmt::Error)?;
-            for (_, sql) in arr {
-                writeln!(out, "{};", sql).expect("properly formated index statements")
+        for idx in self.indexes(schema)? {
+            if !idx.to_postpone() {
+                writeln!(out, "{};", creat.to_sql(&idx)?)?;
             }
-        } else {
-            self.create_attribute_indexes(out)?;
-            self.create_aggregate_indexes(schema, out)?;
         }
         Ok(())
     }
diff --git a/store/postgres/src/relational/ddl_tests.rs b/store/postgres/src/relational/ddl_tests.rs
index 901b4daa1e5..f32aa46d97e 100644
--- a/store/postgres/src/relational/ddl_tests.rs
+++ b/store/postgres/src/relational/ddl_tests.rs
@@ -1,4 +1,3 @@
-use index::CreateIndex;
 use itertools::Itertools;
 use pretty_assertions::assert_eq;
 
@@ -8,7 +7,7 @@ use crate::{deployment_store::generate_index_creation_sql, layout_for_tests::mak
 
 const ID_TYPE: ColumnType = ColumnType::String;
 
-fn test_layout(gql: &str) -> Layout {
+fn test_layout(gql: &str) -> Arc<Layout> {
     let subgraph = DeploymentHash::new("subgraph").unwrap();
     let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
     let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
@@ -20,7 +19,7 @@ fn test_layout(gql: &str) -> Layout {
         }
     };
     let catalog = Catalog::for_tests(site.clone(), ents).expect("Can not create catalog");
-    Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
+    Arc::new(Layout::new(site, &schema, catalog).expect("Failed to construct Layout"))
 }
 
 #[test]
@@ -58,7 +57,7 @@ fn check_eqv(left: &str, right: &str) {
 
 #[test]
 fn test_manual_index_creation_ddl() {
-    let layout = Arc::new(test_layout(BOOKS_GQL));
+    let layout = test_layout(BOOKS_GQL);
 
     #[track_caller]
     fn assert_generated_sql(
@@ -93,7 +92,7 @@ fn test_manual_index_creation_ddl() {
         vec!["id".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_id on {namespace}.book using btree (\"id\")",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -102,7 +101,7 @@ fn test_manual_index_creation_ddl() {
         vec!["content".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_content on {namespace}.book using btree (substring(\"content\", 1, 64))",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -111,7 +110,7 @@ fn test_manual_index_creation_ddl() {
         vec!["title".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_title on {namespace}.book using btree (left(\"title\", 256))",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -120,7 +119,7 @@ fn test_manual_index_creation_ddl() {
         vec!["page_count".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_page_count on {namespace}.book using btree (\"page_count\")",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -129,7 +128,7 @@ fn test_manual_index_creation_ddl() {
         vec!["page_count".to_string(), "title".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_page_count_title on {namespace}.book using btree (\"page_count\", left(\"title\", 256))",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -138,7 +137,7 @@ fn test_manual_index_creation_ddl() {
         vec!["content".to_string(), "block_range".to_string()], // Explicitly including 'block_range'
         GIST,
         "create index concurrently if not exists manual_book_content_block_range on {namespace}.book using gist (substring(\"content\", 1, 64), block_range)",
-        None
+        None,
     );
 
     assert_generated_sql(
@@ -147,7 +146,7 @@ fn test_manual_index_creation_ddl() {
         vec!["page_count".to_string()],
         BTREE,
         "create index concurrently if not exists manual_book_page_count_12345 on sgd0815.book using btree (\"page_count\")  where coalesce(upper(block_range), 2147483647) > 12345",
-        Some(12345)
+        Some(12345),
     );
 }
 
@@ -155,94 +154,67 @@ fn test_manual_index_creation_ddl() {
 fn generate_postponed_indexes() {
     let layout = test_layout(THING_GQL);
     let table = layout.table(&SqlName::from("Scalar")).unwrap();
-    let skip_colums = vec!["id".to_string()];
-    let query_vec = table.create_postponed_indexes(skip_colums, true);
-    assert!(query_vec.len() == 7);
-    let queries = query_vec.join(" ");
-    check_eqv(THING_POSTPONED_INDEXES, &queries)
+    let postponed: Vec<_> = table
+        .indexes(&layout.input_schema)
+        .unwrap()
+        .into_iter()
+        .filter(|idx| idx.to_postpone())
+        .collect();
+    assert_eq!(7, postponed.len());
+
+    let creat = layout.index_creator(true, true);
+    let queries: Vec<_> = postponed
+        .iter()
+        .map(|idx| creat.to_sql(idx).unwrap())
+        .collect();
+    let queries = queries.join(";\n");
+    check_eqv(THING_POSTPONED_INDEXES, &queries);
 }
 const THING_POSTPONED_INDEXES: &str = r#"
 create index concurrently if not exists attr_1_1_scalar_bool
-    on "sgd0815"."scalar" using btree("bool");
- create index concurrently if not exists attr_1_2_scalar_int
-    on "sgd0815"."scalar" using btree("int");
- create index concurrently if not exists attr_1_3_scalar_big_decimal
-    on "sgd0815"."scalar" using btree("big_decimal");
- create index concurrently if not exists attr_1_4_scalar_string
-    on "sgd0815"."scalar" using btree(left("string", 256));
- create index concurrently if not exists attr_1_5_scalar_bytes
-    on "sgd0815"."scalar" using btree(substring("bytes", 1, 64));
- create index concurrently if not exists attr_1_6_scalar_big_int
-    on "sgd0815"."scalar" using btree("big_int");
- create index concurrently if not exists attr_1_7_scalar_color
-    on "sgd0815"."scalar" using btree("color");
+    on "sgd0815"."scalar" using btree ("bool");
+create index concurrently if not exists attr_1_2_scalar_int
+    on "sgd0815"."scalar" using btree ("int");
+create index concurrently if not exists attr_1_3_scalar_big_decimal
+    on "sgd0815"."scalar" using btree ("big_decimal");
+create index concurrently if not exists attr_1_4_scalar_string
+    on "sgd0815"."scalar" using btree (left("string", 256));
+create index concurrently if not exists attr_1_5_scalar_bytes
+    on "sgd0815"."scalar" using btree (substring("bytes", 1, 64));
+create index concurrently if not exists attr_1_6_scalar_big_int
+    on "sgd0815"."scalar" using btree ("big_int");
+create index concurrently if not exists attr_1_7_scalar_color
+    on "sgd0815"."scalar" using btree ("color")
 "#;
 
-impl IndexList {
-    fn mock_thing_index_list() -> Self {
-        let mut indexes: HashMap<String, Vec<CreateIndex>> = HashMap::new();
-        let v1 = vec![
-            CreateIndex::parse(r#"create index thing_id_block_range_excl on sgd0815.thing using gist (id, block_range)"#.to_string()),
-            CreateIndex::parse(r#"create index brin_thing on sgd0815."thing" using brin (lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops)"#.to_string()),
-            // fixme: enable the index bellow once the parsing of statements is fixed, and BlockRangeUpper in particular (issue #5512)
-            // CreateIndex::parse(r#"create index thing_block_range_closed on sgd0815."thing" using btree (coalesce(upper(block_range), 2147483647)) where coalesce((upper(block_range), 2147483647) < 2147483647)"#.to_string()),
-            CreateIndex::parse(r#"create index attr_0_0_thing_id on sgd0815."thing" using btree (id)"#.to_string()),
-            CreateIndex::parse(r#"create index attr_0_1_thing_big_thing on sgd0815."thing" using gist (big_thing, block_range)"#.to_string()),
-        ];
-        indexes.insert("thing".to_string(), v1);
-        let v2 = vec![
-            CreateIndex::parse(r#"create index attr_1_0_scalar_id on sgd0815."scalar" using btree (id)"#.to_string(),),
-            CreateIndex::parse(r#"create index attr_1_1_scalar_bool on sgd0815."scalar" using btree (bool)"#.to_string(),),
-            CreateIndex::parse(r#"create index attr_1_2_scalar_int on sgd0815."scalar" using btree (int)"#.to_string(),),
-            CreateIndex::parse(r#"create index attr_1_3_scalar_big_decimal on sgd0815."scalar" using btree (big_decimal)"#.to_string()),
-            CreateIndex::parse(r#"create index attr_1_4_scalar_string on sgd0815."scalar" using btree (left(string, 256))"#.to_string()),
-            CreateIndex::parse(r#"create index attr_1_5_scalar_bytes on sgd0815."scalar" using btree (substring(bytes, 1, 64))"#.to_string()),
-            CreateIndex::parse(r#"create index attr_1_6_scalar_big_int on sgd0815."scalar" using btree (big_int)"#.to_string()),
-            CreateIndex::parse(r#"create index attr_1_7_scalar_color on sgd0815."scalar" using btree (color)"#.to_string()),
-        ];
-        indexes.insert("scalar".to_string(), v2);
-        let v3 = vec![CreateIndex::parse(
-            r#"create index attr_2_0_file_thing_id on sgd0815."file_thing" using btree (id)"#
-                .to_string(),
-        )];
-        indexes.insert("file_thing".to_string(), v3);
-        IndexList { indexes }
-    }
-}
-
 #[test]
 fn generate_ddl() {
     let layout = test_layout(THING_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     assert_eq!(THING_DDL, &sql); // Use `assert_eq!` to also test the formatting.
 
-    let il = IndexList::mock_thing_index_list();
-    let layout = test_layout(THING_GQL);
-    let sql = layout.as_ddl(Some(il)).expect("Failed to generate DDL");
-    check_eqv(THING_DDL_ON_COPY, &sql);
-
     let layout = test_layout(MUSIC_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(MUSIC_DDL, &sql);
 
     let layout = test_layout(FOREST_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(FOREST_DDL, &sql);
 
     let layout = test_layout(FULLTEXT_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(FULLTEXT_DDL, &sql);
 
     let layout = test_layout(FORWARD_ENUM_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(FORWARD_ENUM_SQL, &sql);
 
     let layout = test_layout(TS_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(TS_SQL, &sql);
 
     let layout = test_layout(LIFETIME_GQL);
-    let sql = layout.as_ddl(None).expect("Failed to generate DDL");
+    let sql = layout.as_ddl().expect("Failed to generate DDL");
     check_eqv(LIFETIME_SQL, &sql);
 }
 
@@ -350,88 +322,44 @@ fn can_copy_from() {
     );
 }
 
-/// Check that we do not create the index on `block$` twice. There was a bug
-/// that if an immutable entity type had a `block` field and index creation
-/// was postponed, we would emit the index on `block$` twice, once from
-/// `Table.create_time_travel_indexes` and once through
-/// `IndexList.indexes_for_table`
+/// Check that we do not create the index on `block$` twice. With the new
+/// `Table::indexes()` approach, the `block$` index (time-travel) and the
+/// `attr_*_block` index (attribute) are both generated by `indexes()` but
+/// only the attribute one can be postponed.
 #[test]
 fn postponed_indexes_with_block_column() {
-    fn index_list() -> IndexList {
-        // To generate this list, print the output of `layout.as_ddl(None)`, run
-        // that in Postgres and do `select indexdef from pg_indexes where
-        // schemaname = 'sgd0815'`
-        const INDEX_DEFS: &[&str] = &[
-            "CREATE UNIQUE INDEX data_pkey ON sgd0815.data USING btree (vid)",
-            "CREATE UNIQUE INDEX data_id_key ON sgd0815.data USING btree (id)",
-            "CREATE INDEX data_block ON sgd0815.data USING btree (block$)",
-            "CREATE INDEX attr_1_0_data_block ON sgd0815.data USING btree (block, \"block$\")",
-        ];
-
-        let mut indexes: HashMap<String, Vec<CreateIndex>> = HashMap::new();
-        indexes.insert(
-            "data".to_string(),
-            INDEX_DEFS
-                .iter()
-                .map(|def| CreateIndex::parse(def.to_string()))
-                .collect(),
-        );
-        IndexList { indexes }
-    }
-
     fn cr(index: &str) -> String {
         format!("create index{}", index)
     }
 
-    fn cre(index: &str) -> String {
-        format!("create index if not exists{}", index)
-    }
-
-    // Names of the two indexes we are interested in. Not the leading space
+    // Names of the two indexes we are interested in. Note the leading space
     // to guard a little against overlapping names
     const BLOCK_IDX: &str = " data_block";
     const ATTR_IDX: &str = " attr_1_0_data_block";
 
     let layout = test_layout(BLOCK_GQL);
 
-    // Create everything
-    let sql = layout.as_ddl(None).unwrap();
-    assert!(sql.contains(&cr(BLOCK_IDX)));
-    assert!(sql.contains(&cr(ATTR_IDX)));
-
-    // Defer attribute indexes
-    let sql = layout.as_ddl(Some(index_list())).unwrap();
+    // Create everything; when postpone is enabled (debug builds), the
+    // attribute btree index is omitted from the DDL
+    let sql = layout.as_ddl().unwrap();
     assert!(sql.contains(&cr(BLOCK_IDX)));
-    assert!(!sql.contains(ATTR_IDX));
-    // This used to be duplicated
+    // The block$ time-travel index appears exactly once
     let count = sql.matches(BLOCK_IDX).count();
     assert_eq!(1, count);
 
     let table = layout.table(&SqlName::from("Data")).unwrap();
-    let sql = table.create_postponed_indexes(vec![], false);
-    assert_eq!(1, sql.len());
-    assert!(!sql[0].contains(BLOCK_IDX));
-    assert!(sql[0].contains(&cre(ATTR_IDX)));
-
-    let dst_nsp = Namespace::new("sgd2".to_string()).unwrap();
-    let arr = index_list()
-        .indexes_for_table(&dst_nsp, &table.name.to_string(), table, true, false, false)
-        .unwrap();
-    assert_eq!(1, arr.len());
-    assert!(!arr[0].1.contains(BLOCK_IDX));
-    assert!(arr[0].1.contains(&cr(ATTR_IDX)));
-
-    let arr = index_list()
-        .indexes_for_table(
-            &dst_nsp,
-            &table.name.to_string(),
-            table,
-            false,
-            false,
-            false,
-        )
-        .unwrap();
-    assert_eq!(0, arr.len());
+    let postponed: Vec<_> = table
+        .indexes(&layout.input_schema)
+        .unwrap()
+        .into_iter()
+        .filter(|idx| idx.to_postpone())
+        .collect();
+    assert_eq!(1, postponed.len());
+
+    let creat = layout.index_creator(false, false);
+    let sql = creat.to_sql(&postponed[0]).unwrap();
+    assert!(!sql.contains(BLOCK_IDX));
+    assert!(sql.contains(&cr(ATTR_IDX)));
 }
 
 const THING_GQL: &str = r#"
@@ -474,102 +402,10 @@ create type sgd0815."size"
 
     alter table "sgd0815"."thing"
         add constraint thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_thing
-    on "sgd0815"."thing"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index thing_block_range_closed
-    on "sgd0815"."thing"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_thing_id
-    on "sgd0815"."thing" using btree("id");
-create index attr_0_1_thing_big_thing
-    on "sgd0815"."thing" using gist("big_thing", block_range);
-
-
-    create table "sgd0815"."scalar" (
-        vid                  bigint primary key,
-        block_range          int4range not null,
-        "id"                 text not null,
-        "bool"               boolean,
-        "int"                int4,
-        "big_decimal"        numeric,
-        "string"             text,
-        "bytes"              bytea,
-        "big_int"            numeric,
-        "color"              "sgd0815"."color"
-    );
-
-    alter table "sgd0815"."scalar"
-        add constraint scalar_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_scalar
-    on "sgd0815"."scalar"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index scalar_block_range_closed
-    on "sgd0815"."scalar"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_1_0_scalar_id
-    on "sgd0815"."scalar" using btree("id");
-create index attr_1_1_scalar_bool
-    on "sgd0815"."scalar" using btree("bool");
-create index attr_1_2_scalar_int
-    on "sgd0815"."scalar" using btree("int");
-create index attr_1_3_scalar_big_decimal
-    on "sgd0815"."scalar" using btree("big_decimal");
-create index attr_1_4_scalar_string
-    on "sgd0815"."scalar" using btree(left("string", 256));
-create index attr_1_5_scalar_bytes
-    on "sgd0815"."scalar" using btree(substring("bytes", 1, 64));
-create index attr_1_6_scalar_big_int
-    on "sgd0815"."scalar" using btree("big_int");
-create index attr_1_7_scalar_color
-    on "sgd0815"."scalar" using btree("color");
-
-
-    create table "sgd0815"."file_thing" (
-        vid                  bigint primary key,
-        block_range          int4range not null,
-        causality_region     int not null,
-        "id"                 text not null
-    );
-
-    alter table "sgd0815"."file_thing"
-        add constraint file_thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_file_thing
-    on "sgd0815"."file_thing"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index file_thing_block_range_closed
-    on "sgd0815"."file_thing"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_2_0_file_thing_id
-    on "sgd0815"."file_thing" using btree("id");
-
-"#;
-
-const THING_DDL_ON_COPY: &str = r#"create type sgd0815."color"
-    as enum ('BLUE', 'red', 'yellow');
-create type sgd0815."size"
-    as enum ('large', 'medium', 'small');
-
-    create table "sgd0815"."thing" (
-        vid                  bigint primary key,
-        block_range          int4range not null,
-        "id"                 text not null,
-        "big_thing"          text not null
-    );
-
-    alter table "sgd0815"."thing"
-        add constraint thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_thing
-    on "sgd0815"."thing"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index thing_block_range_closed
-    on "sgd0815"."thing"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_thing_id
-    on sgd0815."thing" using btree ("id");
-create index attr_0_1_thing_big_thing
-    on sgd0815."thing" using gist ("big_thing", block_range);
-
+create index brin_thing on "sgd0815"."thing" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index thing_block_range_closed on "sgd0815"."thing" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_0_0_thing_id on "sgd0815"."thing" using btree ("id");
+create index attr_0_1_thing_big_thing on "sgd0815"."thing" using gist ("big_thing", block_range);
 
     create table "sgd0815"."scalar" (
         vid                  bigint primary key,
@@ -586,15 +422,9 @@ create index attr_0_1_thing_big_thing
 
     alter table "sgd0815"."scalar"
         add constraint scalar_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_scalar
-    on "sgd0815"."scalar"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index scalar_block_range_closed
-    on "sgd0815"."scalar"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_1_0_scalar_id
-    on sgd0815."scalar" using btree ("id");
-
+create index brin_scalar on "sgd0815"."scalar" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index scalar_block_range_closed on "sgd0815"."scalar" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_1_0_scalar_id on "sgd0815"."scalar" using btree ("id");
 
     create table "sgd0815"."file_thing" (
         vid                  bigint primary key,
@@ -605,14 +435,9 @@ create index attr_1_0_scalar_id
 
     alter table "sgd0815"."file_thing"
         add constraint file_thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_file_thing
-    on "sgd0815"."file_thing"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index file_thing_block_range_closed
-    on "sgd0815"."file_thing"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_2_0_file_thing_id
-    on sgd0815."file_thing" using btree ("id");
+create index brin_file_thing on "sgd0815"."file_thing" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index file_thing_block_range_closed on "sgd0815"."file_thing" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_2_0_file_thing_id on "sgd0815"."file_thing" using btree ("id");
 "#;
 
 const BOOKS_GQL: &str = r#"type Author @entity {
@@ -656,84 +481,59 @@ type SongStat @entity {
     song: Song @derivedFrom(field: "id")
     played: Int!
 }"#;
-const MUSIC_DDL: &str = r#"create table "sgd0815"."musician" (
+const MUSIC_DDL: &str = r#"
+    create table "sgd0815"."musician" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "name"               text not null,
         "main_band"          text,
         "bands"              text[] not null
-);
-alter table "sgd0815"."musician"
-  add constraint musician_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_musician
-    on "sgd0815"."musician"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index musician_block_range_closed
-    on "sgd0815"."musician"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_musician_id
-    on "sgd0815"."musician" using btree("id");
-create index attr_0_1_musician_name
-    on "sgd0815"."musician" using btree(left("name", 256));
-create index attr_0_2_musician_main_band
-    on "sgd0815"."musician" using gist("main_band", block_range);
-
-create table "sgd0815"."band" (
+    );
+
+    alter table "sgd0815"."musician"
+        add constraint musician_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_musician on "sgd0815"."musician" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index musician_block_range_closed on "sgd0815"."musician" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_0_0_musician_id on "sgd0815"."musician" using btree ("id");
+create index attr_0_2_musician_main_band on "sgd0815"."musician" using gist ("main_band", block_range);
+
+    create table "sgd0815"."band" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "name"               text not null,
         "original_songs"     text[] not null
-);
-alter table "sgd0815"."band"
-  add constraint band_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_band
-    on "sgd0815"."band"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index band_block_range_closed
-    on "sgd0815"."band"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_1_0_band_id
-    on "sgd0815"."band" using btree("id");
-create index attr_1_1_band_name
-    on "sgd0815"."band" using btree(left("name", 256));
-
-create table "sgd0815"."song" (
+    );
+
+    alter table "sgd0815"."band"
+        add constraint band_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_band on "sgd0815"."band" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index band_block_range_closed on "sgd0815"."band" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_1_0_band_id on "sgd0815"."band" using btree ("id");
+
+    create table "sgd0815"."song" (
         vid                  bigint primary key,
-        block$               int not null,
-        "id"                 text not null,
+        block$                int not null,
+"id"                 text not null,
         "title"              text not null,
         "written_by"         text not null,
-
         unique(id)
-);
-create index song_block
-    on "sgd0815"."song"(block$);
-create index attr_2_0_song_title
-    on "sgd0815"."song" using btree(left("title", 256));
-create index attr_2_1_song_written_by
-    on "sgd0815"."song" using btree("written_by", block$);
-
-create table "sgd0815"."song_stat" (
+    );
+create index song_block on "sgd0815"."song" using btree (block$);
+
+    create table "sgd0815"."song_stat" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "played"             int4 not null
-);
-alter table "sgd0815"."song_stat"
-  add constraint song_stat_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_song_stat
-    on "sgd0815"."song_stat"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index song_stat_block_range_closed
-    on "sgd0815"."song_stat"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_3_0_song_stat_id
-    on "sgd0815"."song_stat" using btree("id");
-create index attr_3_1_song_stat_played
-    on "sgd0815"."song_stat" using btree("played");
+    );
 
+    alter table "sgd0815"."song_stat"
+        add constraint song_stat_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_song_stat on "sgd0815"."song_stat" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index song_stat_block_range_closed on "sgd0815"."song_stat" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_3_0_song_stat_id on "sgd0815"."song_stat" using btree ("id");
 "#;
 
 const FOREST_GQL: &str = r#"
@@ -757,61 +557,47 @@ type Habitat @entity {
     dwellers: [ForestDweller!]!
 }"#;
 
-const FOREST_DDL: &str = r#"create table "sgd0815"."animal" (
+const FOREST_DDL: &str = r#"
+    create table "sgd0815"."animal" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "forest"             text
-);
-alter table "sgd0815"."animal"
-  add constraint animal_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_animal
-    on "sgd0815"."animal"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index animal_block_range_closed
-    on "sgd0815"."animal"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_animal_id
-    on "sgd0815"."animal" using btree("id");
-create index attr_0_1_animal_forest
-    on "sgd0815"."animal" using gist("forest", block_range);
-
-create table "sgd0815"."forest" (
-        vid                bigint primary key,
-        block_range        int4range not null,
-        "id"               text not null
-);
-alter table "sgd0815"."forest"
-  add constraint forest_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_forest
-    on "sgd0815"."forest"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index forest_block_range_closed
-    on "sgd0815"."forest"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_1_0_forest_id
-    on "sgd0815"."forest" using btree("id");
-
-create table "sgd0815"."habitat" (
+    );
+
+    alter table "sgd0815"."animal"
+        add constraint animal_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_animal on "sgd0815"."animal" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index animal_block_range_closed on "sgd0815"."animal" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_0_0_animal_id on "sgd0815"."animal" using btree ("id");
+create index attr_0_1_animal_forest on "sgd0815"."animal" using gist ("forest", block_range);
+
+    create table "sgd0815"."forest" (
+        vid                  bigint primary key,
+        block_range          int4range not null,
+        "id"                 text not null
+    );
+
+    alter table "sgd0815"."forest"
+        add constraint forest_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_forest on "sgd0815"."forest" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index forest_block_range_closed on "sgd0815"."forest" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_1_0_forest_id on "sgd0815"."forest" using btree ("id");
+
+    create table "sgd0815"."habitat" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "most_common"        text not null,
         "dwellers"           text[] not null
-);
-alter table "sgd0815"."habitat"
-  add constraint habitat_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_habitat
-    on "sgd0815"."habitat"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index habitat_block_range_closed
-    on "sgd0815"."habitat"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_2_0_habitat_id
-    on "sgd0815"."habitat" using btree("id");
-create index attr_2_1_habitat_most_common
-    on "sgd0815"."habitat" using gist("most_common", block_range);
+    );
 
+    alter table "sgd0815"."habitat"
+        add constraint habitat_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_habitat on "sgd0815"."habitat" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index habitat_block_range_closed on "sgd0815"."habitat" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_2_0_habitat_id on "sgd0815"."habitat" using btree ("id");
+create index attr_2_1_habitat_most_common on "sgd0815"."habitat" using gist ("most_common", block_range);
 "#;
 const FULLTEXT_GQL: &str = r#"
 type _Schema_ @fulltext(
@@ -844,7 +630,8 @@ type Habitat @entity {
     dwellers: [Animal!]!
 }"#;
 
-const FULLTEXT_DDL: &str = r#"create table "sgd0815"."animal" (
+const FULLTEXT_DDL: &str = r#"
+    create table "sgd0815"."animal" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
@@ -852,63 +639,42 @@ const FULLTEXT_DDL: &str = r#"create table "sgd0815"."animal" (
         "species"            text not null,
         "forest"             text,
         "search"             tsvector
-);
-alter table "sgd0815"."animal"
-  add constraint animal_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_animal
-    on "sgd0815"."animal"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index animal_block_range_closed
-    on "sgd0815"."animal"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_animal_id
-    on "sgd0815"."animal" using btree("id");
-create index attr_0_1_animal_name
-    on "sgd0815"."animal" using btree(left("name", 256));
-create index attr_0_2_animal_species
-    on "sgd0815"."animal" using btree(left("species", 256));
-create index attr_0_3_animal_forest
-    on "sgd0815"."animal" using gist("forest", block_range);
-create index attr_0_4_animal_search
-    on "sgd0815"."animal" using gin("search");
-
-create table "sgd0815"."forest" (
+    );
+
+    alter table "sgd0815"."animal"
+        add constraint animal_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_animal on "sgd0815"."animal" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index animal_block_range_closed on "sgd0815"."animal" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_0_0_animal_id on "sgd0815"."animal" using btree ("id");
+create index attr_0_3_animal_forest on "sgd0815"."animal" using gist ("forest", block_range);
+create index attr_0_4_animal_search on "sgd0815"."animal" using gin ("search");
+
+    create table "sgd0815"."forest" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null
-);
-alter table "sgd0815"."forest"
-  add constraint forest_id_block_range_excl exclude using gist (id with =, block_range with &&);
-
-create index brin_forest
-    on "sgd0815"."forest"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index forest_block_range_closed
-    on "sgd0815"."forest"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_1_0_forest_id
-    on "sgd0815"."forest" using btree("id");
-
-create table "sgd0815"."habitat" (
+    );
+
+    alter table "sgd0815"."forest"
+        add constraint forest_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_forest on "sgd0815"."forest" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index forest_block_range_closed on "sgd0815"."forest" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_1_0_forest_id on "sgd0815"."forest" using btree ("id");
+
+    create table "sgd0815"."habitat" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "most_common"        text not null,
         "dwellers"           text[] not null
-);
-alter table "sgd0815"."habitat"
-  add constraint habitat_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_habitat
-    on "sgd0815"."habitat"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index habitat_block_range_closed
-    on "sgd0815"."habitat"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_2_0_habitat_id
-    on "sgd0815"."habitat" using btree("id");
-create index attr_2_1_habitat_most_common
-    on "sgd0815"."habitat" using gist("most_common", block_range);
+    );
 
+    alter table "sgd0815"."habitat"
+        add constraint habitat_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_habitat on "sgd0815"."habitat" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index habitat_block_range_closed on "sgd0815"."habitat" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_2_0_habitat_id on "sgd0815"."habitat" using btree ("id");
+create index attr_2_1_habitat_most_common on "sgd0815"."habitat" using gist ("most_common", block_range);
 "#;
 
 const FORWARD_ENUM_GQL: &str = r#"
@@ -924,25 +690,19 @@ enum Orientation {
 
 const FORWARD_ENUM_SQL: &str = r#"create type sgd0815."orientation"
     as enum ('DOWN', 'UP');
-create table "sgd0815"."thing" (
+
+    create table "sgd0815"."thing" (
         vid                  bigint primary key,
         block_range          int4range not null,
         "id"                 text not null,
         "orientation"        "sgd0815"."orientation" not null
-);
-alter table "sgd0815"."thing"
-  add constraint thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
-create index brin_thing
-    on "sgd0815"."thing"
- using brin(lower(block_range) int4_minmax_ops, coalesce(upper(block_range), 2147483647) int4_minmax_ops, vid int8_minmax_ops);
-create index thing_block_range_closed
-    on "sgd0815"."thing"(coalesce(upper(block_range), 2147483647))
- where coalesce(upper(block_range), 2147483647) < 2147483647;
-create index attr_0_0_thing_id
-    on "sgd0815"."thing" using btree("id");
-create index attr_0_1_thing_orientation
-    on "sgd0815"."thing" using btree("orientation");
+    );
 
+    alter table "sgd0815"."thing"
+        add constraint thing_id_block_range_excl exclude using gist (id with =, block_range with &&);
+create index brin_thing on "sgd0815"."thing" using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid);
+create index thing_block_range_closed on "sgd0815"."thing" using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647);
+create index attr_0_0_thing_id on "sgd0815"."thing" using btree ("id");
 "#;
 
 const TS_GQL: &str = r#"
@@ -961,56 +721,38 @@ type Stats @aggregation(intervals: ["hour", "day"], source: "Data") {
 "#;
 
 const TS_SQL: &str = r#"
-create table "sgd0815"."data" (
-    vid                  bigint primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "amount"             numeric not null,
-    unique(id)
-);
-create index data_block
-    on "sgd0815"."data"(block$);
-create index attr_0_0_data_timestamp
-    on "sgd0815"."data" using btree("timestamp");
-create index attr_0_1_data_amount
-    on "sgd0815"."data" using btree("amount");
-
-create table "sgd0815"."stats_hour" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "volume"             numeric not null,
-    "max_price"          numeric not null,
-    unique(id)
-);
-create index stats_hour_block
-    on "sgd0815"."stats_hour"(block$);
-create index attr_1_0_stats_hour_timestamp
-    on "sgd0815"."stats_hour" using btree("timestamp");
-create index attr_1_1_stats_hour_volume
-    on "sgd0815"."stats_hour" using btree("volume");
-create index attr_1_2_stats_hour_max_price
-    on "sgd0815"."stats_hour" using btree("max_price");
-
-create table "sgd0815"."stats_day" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "volume"             numeric not null,
-    "max_price"          numeric not null,
-    unique(id)
-);
-create index stats_day_block
-    on "sgd0815"."stats_day"(block$);
-create index attr_2_0_stats_day_timestamp
-    on "sgd0815"."stats_day" using btree("timestamp");
-create index attr_2_1_stats_day_volume
-    on "sgd0815"."stats_day" using btree("volume");
-create index attr_2_2_stats_day_max_price
-    on "sgd0815"."stats_day" using btree("max_price");"#;
+    create table "sgd0815"."data" (
+        vid                  bigint primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "amount"             numeric not null,
+        unique(id)
+    );
+create index data_block on "sgd0815"."data" using btree (block$);
+
+    create table "sgd0815"."stats_hour" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "volume"             numeric not null,
+        "max_price"          numeric not null,
+        unique(id)
+    );
+create index stats_hour_block on "sgd0815"."stats_hour" using btree (block$);
+
+    create table "sgd0815"."stats_day" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "volume"             numeric not null,
+        "max_price"          numeric not null,
+        unique(id)
+    );
+create index stats_day_block on "sgd0815"."stats_day" using btree (block$);
+"#;
 
 const LIFETIME_GQL: &str = r#"
     type Data @entity(timeseries: true) {
@@ -1052,144 +794,87 @@ const LIFETIME_GQL: &str = r#"
     "#;
 
 const LIFETIME_SQL: &str = r#"
-create table "sgd0815"."data" (
-    vid                  bigint primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "group_1"            int4 not null,
-    "group_2"            int4 not null,
-    "amount"             numeric not null,
-    unique(id)
-);
-create index data_block
-on "sgd0815"."data"(block$);
-create index attr_0_0_data_timestamp
-on "sgd0815"."data" using btree("timestamp");
-create index attr_0_1_data_group_1
-on "sgd0815"."data" using btree("group_1");
-create index attr_0_2_data_group_2
-on "sgd0815"."data" using btree("group_2");
-create index attr_0_3_data_amount
-on "sgd0815"."data" using btree("amount");
-
-create table "sgd0815"."stats_1_hour" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_1_hour_block
-on "sgd0815"."stats_1_hour"(block$);
-create index attr_1_0_stats_1_hour_timestamp
-on "sgd0815"."stats_1_hour" using btree("timestamp");
-create index attr_1_1_stats_1_hour_volume
-on "sgd0815"."stats_1_hour" using btree("volume");
-
-
-create table "sgd0815"."stats_1_day" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_1_day_block
-on "sgd0815"."stats_1_day"(block$);
-create index attr_2_0_stats_1_day_timestamp
-on "sgd0815"."stats_1_day" using btree("timestamp");
-create index attr_2_1_stats_1_day_volume
-on "sgd0815"."stats_1_day" using btree("volume");
-
-
-create table "sgd0815"."stats_2_hour" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "group_1"            int4 not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_2_hour_block
-on "sgd0815"."stats_2_hour"(block$);
-create index attr_5_0_stats_2_hour_timestamp
-on "sgd0815"."stats_2_hour" using btree("timestamp");
-create index attr_5_1_stats_2_hour_group_1
-on "sgd0815"."stats_2_hour" using btree("group_1");
-create index attr_5_2_stats_2_hour_volume
-on "sgd0815"."stats_2_hour" using btree("volume");
-create index stats_2_hour_dims
-on "sgd0815"."stats_2_hour"(group_1, timestamp);
-
-create table "sgd0815"."stats_2_day" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "group_1"            int4 not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_2_day_block
-on "sgd0815"."stats_2_day"(block$);
-create index attr_6_0_stats_2_day_timestamp
-on "sgd0815"."stats_2_day" using btree("timestamp");
-create index attr_6_1_stats_2_day_group_1
-on "sgd0815"."stats_2_day" using btree("group_1");
-create index attr_6_2_stats_2_day_volume
-on "sgd0815"."stats_2_day" using btree("volume");
-create index stats_2_day_dims
-on "sgd0815"."stats_2_day"(group_1, timestamp);
-
-create table "sgd0815"."stats_3_hour" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "group_2"            int4 not null,
-    "group_1"            int4 not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_3_hour_block
-on "sgd0815"."stats_3_hour"(block$);
-create index attr_7_0_stats_3_hour_timestamp
-on "sgd0815"."stats_3_hour" using btree("timestamp");
-create index attr_7_1_stats_3_hour_group_2
-on "sgd0815"."stats_3_hour" using btree("group_2");
-create index attr_7_2_stats_3_hour_group_1
-on "sgd0815"."stats_3_hour" using btree("group_1");
-create index attr_7_3_stats_3_hour_volume
-on "sgd0815"."stats_3_hour" using btree("volume");
-create index stats_3_hour_dims
-on "sgd0815"."stats_3_hour"(group_2, group_1, timestamp);
-
-create table "sgd0815"."stats_3_day" (
-    vid                  bigserial primary key,
-    block$               int not null,
-    "id"                 int8 not null,
-    "timestamp"          timestamptz not null,
-    "group_2"            int4 not null,
-    "group_1"            int4 not null,
-    "volume"             numeric not null,
-    unique(id)
-);
-create index stats_3_day_block
-on "sgd0815"."stats_3_day"(block$);
-create index attr_8_0_stats_3_day_timestamp
-on "sgd0815"."stats_3_day" using btree("timestamp");
-create index attr_8_1_stats_3_day_group_2
-on "sgd0815"."stats_3_day" using btree("group_2");
-create index attr_8_2_stats_3_day_group_1
-on "sgd0815"."stats_3_day" using btree("group_1");
-create index attr_8_3_stats_3_day_volume
-on "sgd0815"."stats_3_day" using btree("volume");
-create index stats_3_day_dims
-on "sgd0815"."stats_3_day"(group_2, group_1, timestamp);
+    create table "sgd0815"."data" (
+        vid                  bigint primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "group_1"            int4 not null,
+        "group_2"            int4 not null,
+        "amount"             numeric not null,
+        unique(id)
+    );
+create index data_block on "sgd0815"."data" using btree (block$);
+
+    create table "sgd0815"."stats_1_hour" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_1_hour_block on "sgd0815"."stats_1_hour" using btree (block$);
+
+    create table "sgd0815"."stats_1_day" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_1_day_block on "sgd0815"."stats_1_day" using btree (block$);
+
+    create table "sgd0815"."stats_2_hour" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "group_1"            int4 not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_2_hour_block on "sgd0815"."stats_2_hour" using btree (block$);
+create index stats_2_hour_dims on "sgd0815"."stats_2_hour" using btree ("group_1", "timestamp");
+
+    create table "sgd0815"."stats_2_day" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "group_1"            int4 not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_2_day_block on "sgd0815"."stats_2_day" using btree (block$);
+create index stats_2_day_dims on "sgd0815"."stats_2_day" using btree ("group_1", "timestamp");
+
+    create table "sgd0815"."stats_3_hour" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "group_2"            int4 not null,
+        "group_1"            int4 not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_3_hour_block on "sgd0815"."stats_3_hour" using btree (block$);
+create index stats_3_hour_dims on "sgd0815"."stats_3_hour" using btree ("group_2", "group_1", "timestamp");
+
+    create table "sgd0815"."stats_3_day" (
+        vid                  bigserial primary key,
+        block$                int not null,
+"id"                 int8 not null,
+        "timestamp"          timestamptz not null,
+        "group_2"            int4 not null,
+        "group_1"            int4 not null,
+        "volume"             numeric not null,
+        unique(id)
+    );
+create index stats_3_day_block on "sgd0815"."stats_3_day" using btree (block$);
+create index stats_3_day_dims on "sgd0815"."stats_3_day" using btree ("group_2", "group_1", "timestamp");
 "#;
 
 const BLOCK_GQL: &str = r#"
diff --git a/store/postgres/src/relational/dsl.rs b/store/postgres/src/relational/dsl.rs
index 8620fe7c1fa..9d53bc1a66c 100644
--- a/store/postgres/src/relational/dsl.rs
+++ b/store/postgres/src/relational/dsl.rs
@@ -6,7 +6,7 @@ use std::marker::PhantomData;
 
 use diesel::backend::Backend;
 use diesel::dsl::sql;
-use diesel::expression::{expression_types, is_aggregate, TypedExpressionType, ValidGrouping};
+use diesel::expression::{TypedExpressionType, ValidGrouping, expression_types, is_aggregate};
 use diesel::pg::Pg;
 use diesel::query_builder::{
     AsQuery, AstPass, BoxedSelectStatement, FromClause, Query, QueryFragment, QueryId,
@@ -16,23 +16,23 @@ use diesel::query_dsl::methods::SelectDsl;
 use diesel::query_source::QuerySource;
 
 use diesel::sql_types::{
-    Array, BigInt, Binary, Bool, Integer, Nullable, Numeric, SingleValue, Text, Timestamptz,
+    Array, BigInt, Binary, Bool, Integer, Nullable, Numeric, Range, SingleValue, Text, Timestamptz,
     Untyped,
 };
 use diesel::{AppearsOnTable, Expression, QueryDsl, QueryResult, SelectableExpression};
 use diesel_dynamic_schema::DynamicSelectClause;
-use graph::components::store::{AttributeNames, BlockNumber, StoreError, BLOCK_NUMBER_MAX};
-use graph::data::store::{Id, IdType, ID, VID};
+use graph::components::store::{AttributeNames, BLOCK_NUMBER_MAX, BlockNumber, StoreError};
+use graph::data::store::{ID, Id, IdType, VID};
 use graph::data_source::CausalityRegion;
-use graph::prelude::{lazy_static, ENV_VARS};
+use graph::prelude::{ENV_VARS, lazy_static};
 
 use crate::relational::ColumnType;
 use crate::relational_queries::PARENT_ID;
 
-use super::value::FromOidRow;
 use super::Column as RelColumn;
 use super::SqlName;
-use super::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN};
+use super::value::FromOidRow;
+use super::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN, CAUSALITY_REGION_COLUMN};
 
 const TYPENAME: &str = "__typename";
 
@@ -43,13 +43,15 @@ lazy_static! {
     pub static ref TYPENAME_COL: RelColumn = RelColumn::pseudo_column(TYPENAME, ColumnType::String);
     pub static ref VID_COL: RelColumn = RelColumn::pseudo_column("vid", ColumnType::Int8);
     pub static ref BLOCK_COL: RelColumn = RelColumn::pseudo_column(BLOCK_COLUMN, ColumnType::Int8);
-    // The column type is a placeholder, we can't deserialize in4range; but
-    // we also never try to use it when we get data from the database
+    // The column type is a placeholder; block_range is deserialized as
+    // int4range via special handling in select_cols
     pub static ref BLOCK_RANGE_COL: RelColumn =
         RelColumn::pseudo_column(BLOCK_RANGE_COLUMN, ColumnType::Bytes);
     pub static ref PARENT_STRING_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::String);
     pub static ref PARENT_BYTES_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::Bytes);
     pub static ref PARENT_INT_COL: RelColumn = RelColumn::pseudo_column(PARENT_ID, ColumnType::Int8);
+    pub static ref CAUSALITY_REGION_COL: RelColumn =
+        RelColumn::pseudo_column(CAUSALITY_REGION_COLUMN, ColumnType::Int);
 
     pub static ref META_COLS: [&'static RelColumn; 2] = [&*TYPENAME_COL, &*VID_COL];
 }
@@ -130,7 +132,7 @@ pub enum Alias {
 }
 
 impl Alias {
-    fn as_str(&self) -> &str {
+    pub(crate) fn as_str(&self) -> &str {
         match self {
             Alias::Main => "c",
             Alias::Child(idx) => idx.as_str(),
@@ -158,7 +160,7 @@ fn alias() {
 pub struct Table<'a> {
     /// The metadata for this table
     pub meta: &'a super::Table,
-    alias: Alias,
+    pub(crate) alias: Alias,
 }
 
 impl<'a> Table<'a> {
@@ -184,10 +186,22 @@ impl<'a> Table<'a> {
     /// is useful if just the name of the column qualified with the table
     /// name/alias is needed
     pub fn column(&self, name: &str) -> Option<Column<'a>> {
+        let block_col: &RelColumn = if self.meta.immutable {
+            &BLOCK_COL
+        } else {
+            &BLOCK_RANGE_COL
+        };
+        let cr_col: Option<&RelColumn> = if self.meta.has_causality_region {
+            Some(&*CAUSALITY_REGION_COL)
+        } else {
+            None
+        };
         self.meta
             .columns
             .iter()
             .chain(*META_COLS)
+            .chain(std::iter::once(block_col))
+            .chain(cr_col)
             .find(|c| &c.name == name)
             .map(|c| Column::new(*self, c))
     }
@@ -291,7 +305,6 @@ impl<'a> Table<'a> {
             if self.meta.immutable {
                 cols.push(&*BLOCK_COL);
             } else {
-                // TODO: We can't deserialize in4range
                 cols.push(&*BLOCK_RANGE_COL);
             }
         }
@@ -348,6 +361,10 @@ impl<'a> Table<'a> {
                 )));
                 continue;
             }
+            if column.name == BLOCK_RANGE_COL.name {
+                selection.add_field(self.bind::<Range<Integer>>(&column.name).unwrap());
+                continue;
+            }
             match column.column_type {
                 ColumnType::Boolean => add_field::<Bool>(&mut selection, self, column),
                 ColumnType::BigDecimal => add_field::<Numeric>(&mut selection, self, column),
diff --git a/store/postgres/src/relational/dump.rs b/store/postgres/src/relational/dump.rs
new file mode 100644
index 00000000000..c50fb6ef64c
--- /dev/null
+++ b/store/postgres/src/relational/dump.rs
@@ -0,0 +1,1309 @@
+use std::collections::BTreeMap;
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::{collections::HashMap, fs};
+
+use diesel::QueryDsl;
+use diesel::dsl::sql;
+use diesel::sql_types::{
+    Array, BigInt, Binary, Bool, Integer, Nullable, Numeric, Text, Timestamptz, Untyped,
+};
+use diesel_async::RunQueryDsl;
+use diesel_dynamic_schema::DynamicSelectClause;
+
+use graph::components::store::DumpReporter;
+use graph::data::subgraph::schema::{SubgraphError, SubgraphHealth, SubgraphManifestEntity};
+use graph::prelude::{DeploymentHash, StoreError, SubgraphDeploymentEntity};
+use serde::{Deserialize, Serialize};
+
+use crate::AsyncPgConnection;
+use crate::catalog;
+use crate::detail::deployment_entity;
+use crate::parquet::convert::{estimate_row_bytes, rows_to_record_batch};
+use crate::parquet::schema::{arrow_schema, clamp_arrow_schema, data_sources_arrow_schema};
+use crate::parquet::writer::{ChunkInfo, ParquetChunkWriter};
+use crate::relational::dsl;
+use crate::relational::index::{IndexCreator, IndexList};
+use crate::relational::value::OidRow;
+use crate::relational::{ColumnType, SqlName, Table as RelTable};
+use crate::vid_batcher::{VidBatcher, VidRange};
+
+use super::Layout;
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct Manifest {
+    pub spec_version: String,
+    pub description: Option<String>,
+    pub repository: Option<String>,
+    pub features: Vec<String>,
+    pub entities_with_causality_region: Vec<String>,
+    pub history_blocks: i32,
+}
+
+impl Manifest {
+    fn new(data: SubgraphManifestEntity) -> (Self, String, Option<String>) {
+        let SubgraphManifestEntity {
+            spec_version,
+            description,
+            repository,
+            features,
+            schema,
+            raw_yaml,
+            entities_with_causality_region,
+            history_blocks,
+        } = data;
+        let this = Self {
+            spec_version,
+            description,
+            repository,
+            features,
+            entities_with_causality_region: entities_with_causality_region
+                .into_iter()
+                .map(|v| v.to_string())
+                .collect(),
+            history_blocks,
+        };
+        (this, schema, raw_yaml)
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct BlockPtr {
+    pub number: i32,
+    pub hash: String,
+}
+
+impl BlockPtr {
+    fn new(block_ptr: graph::prelude::BlockPtr) -> Self {
+        let graph::prelude::BlockPtr { number, hash } = block_ptr;
+        let hash = hash.hash_hex();
+        Self { number, hash }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct Error {
+    pub message: String,
+    pub block_ptr: Option<BlockPtr>,
+    pub handler: Option<String>,
+    pub deterministic: bool,
+}
+
+impl Error {
+    fn new(error: SubgraphError) -> Self {
+        let SubgraphError {
+            subgraph_id: _,
+            message,
+            block_ptr,
+            handler,
+            deterministic,
+        } = error;
+        let block_ptr = block_ptr.map(BlockPtr::new);
+        Self {
+            message,
+            block_ptr,
+            handler,
+            deterministic,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub(crate) struct Health {
+    pub failed: bool,
+    pub health: String,
+    pub fatal_error: Option<Error>,
+    pub non_fatal_errors: Vec<Error>,
+}
+
+impl Health {
+    fn new(
+        failed: bool,
+        health: SubgraphHealth,
+        fatal_error: Option<SubgraphError>,
+        non_fatal_errors: Vec<SubgraphError>,
+    ) -> Self {
+        let health = health.as_str().to_string();
+        let fatal_error = fatal_error.map(Error::new);
+        let non_fatal_errors = non_fatal_errors.into_iter().map(Error::new).collect();
+        Self {
+            failed,
+            health,
+            fatal_error,
+            non_fatal_errors,
+        }
+    }
+}
+
+/// Per-table metadata recorded in `metadata.json`.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub(crate) struct TableInfo {
+    pub immutable: bool,
+    pub has_causality_region: bool,
+    pub chunks: Vec<ChunkInfo>,
+    /// Clamp files for mutable tables: record rows whose `block_range`
+    /// upper bound was set since a previous dump. Empty for immutable
+    /// tables and for full (non-incremental) dumps.
+    #[serde(default)]
+    pub clamps: Vec<ChunkInfo>,
+    pub max_vid: i64,
+}
+
+/// Top-level metadata for a subgraph dump (written as `metadata.json`).
+///
+/// The `tables` field is initially empty and populated during the dump
+/// as entity tables are written to Parquet files.
+#[derive(Serialize, Deserialize)]
+pub(crate) struct Metadata {
+    pub version: u32,
+    pub deployment: DeploymentHash,
+    pub network: String,
+    pub manifest: Manifest,
+    pub earliest_block_number: i32,
+    pub start_block: Option<BlockPtr>,
+    pub head_block: Option<BlockPtr>,
+    pub entity_count: usize,
+    pub graft_base: Option<DeploymentHash>,
+    pub graft_block: Option<BlockPtr>,
+    pub debug_fork: Option<DeploymentHash>,
+    pub health: Health,
+    pub indexes: HashMap<String, Vec<String>>,
+    pub tables: BTreeMap<String, TableInfo>,
+}
+
+impl Metadata {
+    /// Read and validate a dump's `metadata.json`.
+    pub fn from_file(path: &Path) -> Result<Self, StoreError> {
+        let content = fs::read_to_string(path).map_err(|e| {
+            StoreError::InternalError(format!("failed to read {}: {e}", path.display()))
+        })?;
+        let metadata: Self = serde_json::from_str(&content).map_err(|e| {
+            StoreError::InternalError(format!("failed to parse {}: {e}", path.display()))
+        })?;
+        if metadata.version != 1 {
+            return Err(StoreError::InternalError(format!(
+                "unsupported dump version {} (expected 1)",
+                metadata.version
+            )));
+        }
+        Ok(metadata)
+    }
+
+    fn new(
+        deployment: DeploymentHash,
+        network: String,
+        entity_count: usize,
+        data: SubgraphDeploymentEntity,
+        index_list: IndexList,
+    ) -> (Self, String, Option<String>) {
+        let indexes = Self::indexes(index_list);
+        let SubgraphDeploymentEntity {
+            manifest,
+            failed,
+            health,
+            synced_at: _,
+            fatal_error,
+            non_fatal_errors,
+            earliest_block_number,
+            start_block,
+            latest_block,
+            graft_base,
+            graft_block,
+            debug_fork,
+            reorg_count: _,
+            current_reorg_depth: _,
+            max_reorg_depth: _,
+        } = data;
+        let (manifest, schema, yaml) = Manifest::new(manifest);
+        let health = Health::new(failed, health, fatal_error, non_fatal_errors);
+        let start_block = start_block.map(BlockPtr::new);
+        let head_block = latest_block.map(BlockPtr::new);
+        let graft_block = graft_block.map(BlockPtr::new);
+        let this = Self {
+            version: 1,
+            deployment,
+            network,
+            manifest,
+            earliest_block_number,
+            start_block,
+            head_block,
+            entity_count,
+            graft_base,
+            graft_block,
+            debug_fork,
+            health,
+            indexes,
+            tables: BTreeMap::new(),
+        };
+        (this, schema, yaml)
+    }
+
+    fn indexes(index_list: IndexList) -> HashMap<String, Vec<String>> {
+        let mut res = HashMap::new();
+        let creat = IndexCreator::new(false, true, false);
+        for (name, indexes) in index_list.indexes {
+            let mut indexes2 = Vec::new();
+            for index in indexes {
+                let Ok(index) = index.with_nsp("sgd".to_string()) else {
+                    continue;
+                };
+                let Ok(index) = creat.to_sql(&index) else {
+                    continue;
+                };
+                indexes2.push(index);
+            }
+            res.insert(name, indexes2);
+        }
+        res
+    }
+}
+
+fn chunk_filename(index: usize) -> String {
+    format!("chunk_{:06}.parquet", index)
+}
+
+/// Maximum estimated payload size of a single Arrow `RecordBatch`. Kept well
+/// under Arrow's 2 GiB i32 offset limit so that no single string/binary column
+/// can overflow while a large table is dumped. The adaptive `VidBatcher` sizes
+/// fetches by elapsed time with no byte ceiling, so a single fetch can hold far
+/// more than this; we therefore split each fetched batch into byte-bounded
+/// `RecordBatch`es before writing (issue #6609).
+const MAX_RECORD_BATCH_BYTES: usize = 256 * 1024 * 1024;
+
+/// Split `rows` (ordered by vid) into contiguous sub-slices whose estimated
+/// payload size each stays at or below `max_bytes`. Always emits at least one
+/// row per slice, so an oversized single row still makes progress (a lone row
+/// can never overflow a column, since Postgres caps any field at ~1 GiB).
+fn byte_bounded_slices(rows: &[OidRow], max_bytes: usize) -> Vec<&[OidRow]> {
+    let mut slices = Vec::new();
+    let mut start = 0;
+    let mut acc = 0usize;
+    for (i, row) in rows.iter().enumerate() {
+        let sz = estimate_row_bytes(row);
+        if i > start && acc + sz > max_bytes {
+            slices.push(&rows[start..i]);
+            start = i;
+            acc = 0;
+        }
+        acc += sz;
+    }
+    if start < rows.len() {
+        slices.push(&rows[start..]);
+    }
+    slices
+}
+
+fn clamp_filename(index: usize) -> String {
+    format!("clamp_{:06}.parquet", index)
+}
+
+/// Build a `DynamicSelectClause` for dumping an entity table. The
+/// selected columns match the Arrow schema from `parquet::schema::arrow_schema`:
+/// `vid`, block columns (split for mutable), `causality_region`, then data columns.
+fn dump_select<'a>(
+    table: &'a dsl::Table<'a>,
+    meta: &'a RelTable,
+) -> diesel::query_builder::BoxedSelectStatement<
+    'a,
+    Untyped,
+    diesel::query_builder::FromClause<dsl::Table<'a>>,
+    diesel::pg::Pg,
+> {
+    type SelectClause<'b> = DynamicSelectClause<'b, diesel::pg::Pg, dsl::Table<'b>>;
+
+    fn add_data_field<'b>(
+        select: &mut SelectClause<'b>,
+        table: &'b dsl::Table<'b>,
+        column: &'b crate::relational::Column,
+    ) {
+        fn add_typed<'c, ST: diesel::sql_types::SingleValue + Send>(
+            select: &mut SelectClause<'c>,
+            table: &'c dsl::Table<'c>,
+            name: &str,
+            is_list: bool,
+            is_nullable: bool,
+        ) {
+            match (is_list, is_nullable) {
+                (true, true) => {
+                    select.add_field(table.column(name).unwrap().bind::<Nullable<Array<ST>>>())
+                }
+                (true, false) => select.add_field(table.column(name).unwrap().bind::<Array<ST>>()),
+                (false, true) => {
+                    select.add_field(table.column(name).unwrap().bind::<Nullable<ST>>())
+                }
+                (false, false) => select.add_field(table.column(name).unwrap().bind::<ST>()),
+            }
+        }
+
+        let name = column.name.as_str();
+        let is_list = column.is_list();
+        let is_nullable = column.is_nullable();
+
+        match &column.column_type {
+            ColumnType::Boolean => add_typed::<Bool>(select, table, name, is_list, is_nullable),
+            ColumnType::BigDecimal | ColumnType::BigInt => {
+                add_typed::<Numeric>(select, table, name, is_list, is_nullable)
+            }
+            ColumnType::Bytes => add_typed::<Binary>(select, table, name, is_list, is_nullable),
+            ColumnType::Int => add_typed::<Integer>(select, table, name, is_list, is_nullable),
+            ColumnType::Int8 => add_typed::<BigInt>(select, table, name, is_list, is_nullable),
+            ColumnType::Timestamp => {
+                add_typed::<Timestamptz>(select, table, name, is_list, is_nullable)
+            }
+            ColumnType::String => add_typed::<Text>(select, table, name, is_list, is_nullable),
+            ColumnType::Enum(_) => {
+                // Cast enum to text for dump
+                let alias = table.alias.as_str();
+                let cast = if is_list { "text[]" } else { "text" };
+                let expr = format!("{alias}.\"{name}\"::{cast}");
+                match (is_list, is_nullable) {
+                    (true, true) => select.add_field(sql::<Nullable<Array<Text>>>(&expr)),
+                    (true, false) => select.add_field(sql::<Array<Text>>(&expr)),
+                    (false, true) => select.add_field(sql::<Nullable<Text>>(&expr)),
+                    (false, false) => select.add_field(sql::<Text>(&expr)),
+                }
+                let _ = alias;
+            }
+            ColumnType::TSVector(_) => { /* skip fulltext columns */ }
+        }
+    }
+
+    let mut selection = DynamicSelectClause::new();
+
+    // vid
+    selection.add_field(table.column("vid").unwrap().bind::<BigInt>());
+
+    // Block columns
+    if meta.immutable {
+        selection.add_field(table.column("block$").unwrap().bind::<Integer>());
+    } else {
+        selection.add_field(sql::<Integer>("lower(c.block_range)"));
+        selection.add_field(sql::<Nullable<Integer>>("upper(c.block_range)"));
+    }
+
+    // Causality region
+    if meta.has_causality_region {
+        selection.add_field(table.column("causality_region").unwrap().bind::<Integer>());
+    }
+
+    // Data columns
+    for col in &meta.columns {
+        if col.is_fulltext() {
+            continue;
+        }
+        add_data_field(&mut selection, table, col);
+    }
+
+    diesel::QueryDsl::select(*table, selection).into_boxed()
+}
+
+/// Query the vid range for a table. Returns `(min_vid, max_vid)`.
+async fn vid_range(conn: &mut AsyncPgConnection, table: &RelTable) -> Result<VidRange, StoreError> {
+    let query = format!(
+        "select coalesce(min(vid), 0)::int8 as min_vid, coalesce(max(vid), -1)::int8 as max_vid from {}",
+        table.qualified_name
+    );
+    diesel::sql_query(&query)
+        .get_result::<VidRange>(conn)
+        .await
+        .map_err(StoreError::from)
+}
+
+/// Row type for clamp queries.
+#[derive(diesel::QueryableByName)]
+struct ClampRow {
+    #[diesel(sql_type = BigInt)]
+    vid: i64,
+    #[diesel(sql_type = Integer)]
+    block_range_end: i32,
+}
+
+/// Convert `ClampRow`s into an Arrow `RecordBatch`.
+fn clamp_rows_to_record_batch(
+    schema: &arrow::datatypes::Schema,
+    rows: &[ClampRow],
+) -> Result<arrow::array::RecordBatch, StoreError> {
+    use arrow::array::{Int32Builder, Int64Builder, RecordBatch};
+    use std::sync::Arc;
+
+    let n = rows.len();
+    let mut vid_b = Int64Builder::with_capacity(n);
+    let mut bre_b = Int32Builder::with_capacity(n);
+
+    for row in rows {
+        vid_b.append_value(row.vid);
+        bre_b.append_value(row.block_range_end);
+    }
+
+    let arrays: Vec<arrow::array::ArrayRef> =
+        vec![Arc::new(vid_b.finish()), Arc::new(bre_b.finish())];
+
+    RecordBatch::try_new(Arc::new(schema.clone()), arrays)
+        .map_err(|e| StoreError::InternalError(format!("failed to build clamp batch: {e}")))
+}
+
+const CLAMP_BATCH_SIZE: i64 = 50_000;
+
+/// Query rows whose `block_range` was closed since the previous dump
+/// and write them to a clamp Parquet file.
+async fn dump_clamp(
+    conn: &mut AsyncPgConnection,
+    table: &RelTable,
+    dir: &Path,
+    prev_max_vid: i64,
+    prev_head_block_number: i32,
+    clamp_index: usize,
+    reporter: &mut dyn DumpReporter,
+) -> Result<Option<ChunkInfo>, StoreError> {
+    let table_dir_name = table.object.as_str();
+    let qualified = &table.qualified_name;
+    let schema = clamp_arrow_schema();
+
+    // Count rows to dump
+    let count_query = format!(
+        "select count(*)::int8 as cnt from {} \
+         where vid <= $1 \
+           and upper(block_range) is not null \
+           and upper(block_range) > $2",
+        qualified,
+    );
+    let count: i64 = diesel::sql_query(&count_query)
+        .bind::<BigInt, _>(prev_max_vid)
+        .bind::<Integer, _>(prev_head_block_number)
+        .get_result::<CountRow>(conn)
+        .await
+        .map_err(StoreError::from)?
+        .cnt;
+
+    if count == 0 {
+        return Ok(None);
+    }
+
+    reporter.start_clamps(table_dir_name, count as usize);
+
+    let table_dir = dir.join(table_dir_name);
+    fs::create_dir_all(&table_dir)
+        .map_err(|e| StoreError::InternalError(format!("failed to create dir: {e}")))?;
+
+    let clamp_file = clamp_filename(clamp_index);
+    let relative_path = format!("{}/{}", table_dir_name, clamp_file);
+    let abs_path = table_dir.join(&clamp_file);
+    let mut writer = ParquetChunkWriter::new(abs_path, relative_path, &schema)?;
+
+    let mut total_rows = 0usize;
+    let mut start_vid: i64 = 0;
+    loop {
+        let query = format!(
+            "select vid::int8, upper(block_range)::int4 as block_range_end \
+               from {} \
+              where vid <= $1 \
+                and vid > $2 \
+                and upper(block_range) is not null \
+                and upper(block_range) > $3 \
+              order by vid \
+              limit $4",
+            qualified,
+        );
+        let rows: Vec<ClampRow> = diesel::sql_query(&query)
+            .bind::<BigInt, _>(prev_max_vid)
+            .bind::<BigInt, _>(start_vid)
+            .bind::<Integer, _>(prev_head_block_number)
+            .bind::<BigInt, _>(CLAMP_BATCH_SIZE)
+            .load(conn)
+            .await
+            .map_err(StoreError::from)?;
+
+        if rows.is_empty() {
+            break;
+        }
+
+        let batch_max_vid = rows[rows.len() - 1].vid;
+        let batch_min_vid = rows[0].vid;
+        let batch = clamp_rows_to_record_batch(&schema, &rows)?;
+        total_rows += rows.len();
+        writer.write_batch(&batch, batch_min_vid, batch_max_vid)?;
+        start_vid = batch_max_vid;
+
+        if (rows.len() as i64) < CLAMP_BATCH_SIZE {
+            break;
+        }
+    }
+
+    let chunk_info = writer.finish()?;
+    reporter.finish_clamps(table_dir_name, total_rows);
+
+    if chunk_info.row_count > 0 {
+        Ok(Some(chunk_info))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Dump clamps for the `data_sources$` table.
+async fn dump_data_sources_clamp(
+    conn: &mut AsyncPgConnection,
+    namespace: &str,
+    dir: &Path,
+    prev_max_vid: i64,
+    prev_head_block_number: i32,
+    clamp_index: usize,
+    reporter: &mut dyn DumpReporter,
+) -> Result<Option<ChunkInfo>, StoreError> {
+    let qualified = format!("\"{}\".\"{}\"", namespace, DATA_SOURCES_TABLE);
+    let schema = clamp_arrow_schema();
+
+    let count_query = format!(
+        "select count(*)::int8 as cnt from {} \
+         where vid <= $1 \
+           and upper(block_range) is not null \
+           and upper(block_range) > $2",
+        qualified,
+    );
+    let count: i64 = diesel::sql_query(&count_query)
+        .bind::<BigInt, _>(prev_max_vid)
+        .bind::<Integer, _>(prev_head_block_number)
+        .get_result::<CountRow>(conn)
+        .await
+        .map_err(StoreError::from)?
+        .cnt;
+
+    if count == 0 {
+        return Ok(None);
+    }
+
+    reporter.start_clamps(DATA_SOURCES_TABLE, count as usize);
+
+    let ds_dir = dir.join(DATA_SOURCES_TABLE);
+    fs::create_dir_all(&ds_dir)
+        .map_err(|e| StoreError::InternalError(format!("failed to create dir: {e}")))?;
+
+    let clamp_file = clamp_filename(clamp_index);
+    let relative_path = format!("{}/{}", DATA_SOURCES_TABLE, clamp_file);
+    let abs_path = ds_dir.join(&clamp_file);
+    let mut writer = ParquetChunkWriter::new(abs_path, relative_path, &schema)?;
+
+    let mut total_rows = 0usize;
+    let mut start_vid: i64 = 0;
+    loop {
+        let query = format!(
+            "select vid::int8, upper(block_range)::int4 as block_range_end \
+               from {} \
+              where vid <= $1 \
+                and vid > $2 \
+                and upper(block_range) is not null \
+                and upper(block_range) > $3 \
+              order by vid \
+              limit $4",
+            qualified,
+        );
+        let rows: Vec<ClampRow> = diesel::sql_query(&query)
+            .bind::<BigInt, _>(prev_max_vid)
+            .bind::<BigInt, _>(start_vid)
+            .bind::<Integer, _>(prev_head_block_number)
+            .bind::<BigInt, _>(CLAMP_BATCH_SIZE)
+            .load(conn)
+            .await
+            .map_err(StoreError::from)?;
+
+        if rows.is_empty() {
+            break;
+        }
+
+        let batch_max_vid = rows[rows.len() - 1].vid;
+        let batch_min_vid = rows[0].vid;
+        let batch = clamp_rows_to_record_batch(&schema, &rows)?;
+        total_rows += rows.len();
+        writer.write_batch(&batch, batch_min_vid, batch_max_vid)?;
+        start_vid = batch_max_vid;
+
+        if (rows.len() as i64) < CLAMP_BATCH_SIZE {
+            break;
+        }
+    }
+
+    let chunk_info = writer.finish()?;
+    reporter.finish_clamps(DATA_SOURCES_TABLE, total_rows);
+
+    if chunk_info.row_count > 0 {
+        Ok(Some(chunk_info))
+    } else {
+        Ok(None)
+    }
+}
+
+#[derive(diesel::QueryableByName)]
+struct CountRow {
+    #[diesel(sql_type = BigInt)]
+    cnt: i64,
+}
+
+/// Dump a single entity table to a Parquet file.
+///
+/// When `prev` is `Some`, performs an incremental dump: only new rows
+/// (vid > prev.max_vid) are written, and clamps are generated for
+/// mutable tables.
+async fn dump_entity_table(
+    conn: &mut AsyncPgConnection,
+    table: &RelTable,
+    dir: &Path,
+    prev: Option<&TableInfo>,
+    prev_head_block_number: Option<i32>,
+    reporter: &mut dyn DumpReporter,
+) -> Result<TableInfo, StoreError> {
+    let arrow_schema = arrow_schema(table);
+    let table_dir_name = table.object.as_str();
+    let table_dir = dir.join(table_dir_name);
+    fs::create_dir_all(&table_dir)
+        .map_err(|e| StoreError::InternalError(format!("failed to create dir: {e}")))?;
+
+    let range = vid_range(conn, table).await?;
+
+    // For incremental dumps, adjust the start of the vid range
+    let (effective_range, chunk_index, mut chunks, mut clamps) = match prev {
+        Some(prev_info) => {
+            let new_min = prev_info.max_vid + 1;
+            let effective = VidRange {
+                min: new_min,
+                max: range.max,
+            };
+            (
+                effective,
+                prev_info.chunks.len(),
+                prev_info.chunks.clone(),
+                prev_info.clamps.clone(),
+            )
+        }
+        None => (range, 0, vec![], vec![]),
+    };
+
+    let rows_approx = if effective_range.is_empty() {
+        0
+    } else {
+        (effective_range.max - effective_range.min + 1) as usize
+    };
+    reporter.start_table(table_dir_name, rows_approx);
+
+    if effective_range.is_empty() {
+        // No new rows, but for incremental mutable tables we still
+        // need to check for clamps
+        if let (Some(prev_info), Some(prev_head)) = (prev, prev_head_block_number)
+            && !table.immutable
+        {
+            let clamp_index = prev_info.clamps.len();
+            if let Some(clamp_info) = dump_clamp(
+                conn,
+                table,
+                dir,
+                prev_info.max_vid,
+                prev_head,
+                clamp_index,
+                reporter,
+            )
+            .await?
+            {
+                clamps.push(clamp_info);
+            }
+        }
+
+        let max_vid = prev.map_or(-1, |p| p.max_vid);
+        reporter.finish_table(table_dir_name, 0);
+        return Ok(TableInfo {
+            immutable: table.immutable,
+            has_causality_region: table.has_causality_region,
+            chunks,
+            clamps,
+            max_vid,
+        });
+    }
+
+    let chunk_file = chunk_filename(chunk_index);
+    let relative_path = format!("{}/{}", table_dir_name, chunk_file);
+    let abs_path = table_dir.join(&chunk_file);
+    let mut writer = ParquetChunkWriter::new(abs_path, relative_path, &arrow_schema)?;
+
+    let dsl_table = dsl::Table::new(table);
+    let mut batcher = VidBatcher::load(conn, &table.nsp, table, effective_range).await?;
+    let mut total_rows = 0usize;
+
+    while !batcher.finished() {
+        let (_, rows_opt) = batcher
+            .step(async |start, end| {
+                let query = dump_select(&dsl_table, table)
+                    .filter(sql::<Bool>("vid >= ").bind::<BigInt, _>(start))
+                    .filter(sql::<Bool>("vid <= ").bind::<BigInt, _>(end))
+                    .order(sql::<Untyped>("vid"));
+
+                let rows: Vec<OidRow> = query.load(conn).await?;
+                if rows.is_empty() {
+                    return Ok(0usize);
+                }
+
+                let count = rows.len();
+                // A single adaptive fetch can hold far more than Arrow's 2 GiB
+                // per-column offset limit allows; split it into byte-bounded
+                // `RecordBatch`es so no string/binary column can overflow (#6609).
+                for sub in byte_bounded_slices(&rows, MAX_RECORD_BATCH_BYTES) {
+                    let batch = rows_to_record_batch(&arrow_schema, sub)?;
+                    writer.write_batch(&batch, start, end)?;
+                }
+                Ok(count)
+            })
+            .await?;
+        if let Some(rows) = rows_opt {
+            total_rows += rows;
+            reporter.batch_dumped(table_dir_name, rows);
+        }
+    }
+
+    let chunk_info = writer.finish()?;
+
+    let max_vid = if chunk_info.row_count > 0 {
+        chunk_info.max_vid
+    } else {
+        prev.map_or(-1, |p| p.max_vid)
+    };
+
+    if chunk_info.row_count > 0 {
+        chunks.push(chunk_info);
+    }
+
+    // For incremental mutable tables, dump clamps
+    if let (Some(prev_info), Some(prev_head)) = (prev, prev_head_block_number)
+        && !table.immutable
+    {
+        let clamp_index = prev_info.clamps.len();
+        if let Some(clamp_info) = dump_clamp(
+            conn,
+            table,
+            dir,
+            prev_info.max_vid,
+            prev_head,
+            clamp_index,
+            reporter,
+        )
+        .await?
+        {
+            clamps.push(clamp_info);
+        }
+    }
+
+    reporter.finish_table(table_dir_name, total_rows);
+
+    Ok(TableInfo {
+        immutable: table.immutable,
+        has_causality_region: table.has_causality_region,
+        chunks,
+        clamps,
+        max_vid,
+    })
+}
+
+/// Row type for the `data_sources$` table dump query.
+#[derive(diesel::QueryableByName)]
+struct DataSourceRow {
+    #[diesel(sql_type = BigInt)]
+    vid: i64,
+    #[diesel(sql_type = Integer)]
+    block_range_start: i32,
+    #[diesel(sql_type = Nullable<Integer>)]
+    block_range_end: Option<i32>,
+    #[diesel(sql_type = Integer)]
+    causality_region: i32,
+    #[diesel(sql_type = Integer)]
+    manifest_idx: i32,
+    #[diesel(sql_type = Nullable<Integer>)]
+    parent: Option<i32>,
+    #[diesel(sql_type = Nullable<Binary>)]
+    id: Option<Vec<u8>>,
+    #[diesel(sql_type = Nullable<Binary>)]
+    param: Option<Vec<u8>>,
+    #[diesel(sql_type = Nullable<Text>)]
+    context: Option<String>,
+    #[diesel(sql_type = Nullable<Integer>)]
+    done_at: Option<i32>,
+}
+
+/// Convert `DataSourceRow`s to an Arrow `RecordBatch` using the fixed
+/// `data_sources$` schema.
+fn data_source_rows_to_record_batch(
+    schema: &arrow::datatypes::Schema,
+    rows: &[DataSourceRow],
+) -> Result<arrow::array::RecordBatch, StoreError> {
+    use arrow::array::{BinaryBuilder, Int32Builder, Int64Builder, RecordBatch, StringBuilder};
+    use std::sync::Arc;
+
+    let n = rows.len();
+    let mut vid_b = Int64Builder::with_capacity(n);
+    let mut brs_b = Int32Builder::with_capacity(n);
+    let mut bre_b = Int32Builder::with_capacity(n);
+    let mut cr_b = Int32Builder::with_capacity(n);
+    let mut mi_b = Int32Builder::with_capacity(n);
+    let mut parent_b = Int32Builder::with_capacity(n);
+    let mut id_b = BinaryBuilder::with_capacity(n, 0);
+    let mut param_b = BinaryBuilder::with_capacity(n, 0);
+    let mut ctx_b = StringBuilder::with_capacity(n, 0);
+    let mut da_b = Int32Builder::with_capacity(n);
+
+    for row in rows {
+        vid_b.append_value(row.vid);
+        brs_b.append_value(row.block_range_start);
+        match row.block_range_end {
+            Some(v) => bre_b.append_value(v),
+            None => bre_b.append_null(),
+        }
+        cr_b.append_value(row.causality_region);
+        mi_b.append_value(row.manifest_idx);
+        match row.parent {
+            Some(v) => parent_b.append_value(v),
+            None => parent_b.append_null(),
+        }
+        match &row.id {
+            Some(v) => id_b.append_value(v),
+            None => id_b.append_null(),
+        }
+        match &row.param {
+            Some(v) => param_b.append_value(v),
+            None => param_b.append_null(),
+        }
+        match &row.context {
+            Some(v) => ctx_b.append_value(v),
+            None => ctx_b.append_null(),
+        }
+        match row.done_at {
+            Some(v) => da_b.append_value(v),
+            None => da_b.append_null(),
+        }
+    }
+
+    let arrays: Vec<arrow::array::ArrayRef> = vec![
+        Arc::new(vid_b.finish()),
+        Arc::new(brs_b.finish()),
+        Arc::new(bre_b.finish()),
+        Arc::new(cr_b.finish()),
+        Arc::new(mi_b.finish()),
+        Arc::new(parent_b.finish()),
+        Arc::new(id_b.finish()),
+        Arc::new(param_b.finish()),
+        Arc::new(ctx_b.finish()),
+        Arc::new(da_b.finish()),
+    ];
+
+    RecordBatch::try_new(Arc::new(schema.clone()), arrays)
+        .map_err(|e| StoreError::InternalError(format!("failed to build data_sources batch: {e}")))
+}
+
+const DATA_SOURCES_TABLE: &str = "data_sources$";
+const DATA_SOURCES_BATCH_SIZE: i64 = 10_000;
+
+/// Dump the `data_sources$` table to a Parquet file, if it exists.
+async fn dump_data_sources(
+    conn: &mut AsyncPgConnection,
+    namespace: &str,
+    dir: &Path,
+    prev: Option<&TableInfo>,
+    prev_head_block_number: Option<i32>,
+    reporter: &mut dyn DumpReporter,
+) -> Result<Option<TableInfo>, StoreError> {
+    let table_name = SqlName::verbatim(DATA_SOURCES_TABLE.to_string());
+    if !catalog::table_exists(conn, namespace, &table_name).await? {
+        return Ok(None);
+    }
+
+    reporter.start_data_sources();
+
+    let qualified = format!("\"{}\".\"{}\"", namespace, DATA_SOURCES_TABLE);
+
+    // Get vid range
+    let range_query = format!(
+        "select coalesce(min(vid), 0)::int8 as min_vid, coalesce(max(vid), -1)::int8 as max_vid from {}",
+        qualified,
+    );
+    let range: VidRange = diesel::sql_query(&range_query)
+        .get_result(conn)
+        .await
+        .map_err(StoreError::from)?;
+
+    // For incremental dumps, adjust start
+    let (effective_min, chunk_index, mut chunks, mut clamps) = match prev {
+        Some(prev_info) => (
+            prev_info.max_vid + 1,
+            prev_info.chunks.len(),
+            prev_info.chunks.clone(),
+            prev_info.clamps.clone(),
+        ),
+        None => (range.min, 0, vec![], vec![]),
+    };
+
+    let effective_empty = range.is_empty() || effective_min > range.max;
+
+    if effective_empty {
+        // No new rows, but still check for clamps on incremental
+        if let (Some(prev_info), Some(prev_head)) = (prev, prev_head_block_number) {
+            let clamp_index = prev_info.clamps.len();
+            if let Some(clamp_info) = dump_data_sources_clamp(
+                conn,
+                namespace,
+                dir,
+                prev_info.max_vid,
+                prev_head,
+                clamp_index,
+                reporter,
+            )
+            .await?
+            {
+                clamps.push(clamp_info);
+            }
+        }
+
+        let max_vid = prev.map_or(-1, |p| p.max_vid);
+        reporter.finish_data_sources(0);
+        return Ok(Some(TableInfo {
+            immutable: false,
+            has_causality_region: true,
+            chunks,
+            clamps,
+            max_vid,
+        }));
+    }
+
+    let schema = data_sources_arrow_schema();
+    let ds_dir = dir.join(DATA_SOURCES_TABLE);
+    fs::create_dir_all(&ds_dir)
+        .map_err(|e| StoreError::InternalError(format!("failed to create dir: {e}")))?;
+
+    let chunk_file = chunk_filename(chunk_index);
+    let relative_path = format!("{}/{}", DATA_SOURCES_TABLE, chunk_file);
+    let abs_path = ds_dir.join(&chunk_file);
+    let mut writer = ParquetChunkWriter::new(abs_path, relative_path, &schema)?;
+
+    let mut total_rows = 0usize;
+    let mut start = effective_min;
+    while start <= range.max {
+        let end = (start + DATA_SOURCES_BATCH_SIZE - 1).min(range.max);
+        let query = format!(
+            "select vid::int8, \
+                    lower(block_range) as block_range_start, \
+                    upper(block_range) as block_range_end, \
+                    causality_region, \
+                    manifest_idx, \
+                    parent, \
+                    id, \
+                    param, \
+                    context::text, \
+                    done_at \
+               from {} \
+              where vid >= $1 and vid <= $2 \
+              order by vid",
+            qualified,
+        );
+        let rows: Vec<DataSourceRow> = diesel::sql_query(&query)
+            .bind::<BigInt, _>(start)
+            .bind::<BigInt, _>(end)
+            .load(conn)
+            .await
+            .map_err(StoreError::from)?;
+
+        if !rows.is_empty() {
+            total_rows += rows.len();
+            let batch = data_source_rows_to_record_batch(&schema, &rows)?;
+            writer.write_batch(&batch, start, end)?;
+        }
+
+        start = end + 1;
+    }
+
+    let chunk_info = writer.finish()?;
+
+    let max_vid = if chunk_info.row_count > 0 {
+        chunk_info.max_vid
+    } else {
+        prev.map_or(-1, |p| p.max_vid)
+    };
+
+    if chunk_info.row_count > 0 {
+        chunks.push(chunk_info);
+    }
+
+    // Dump clamps for incremental
+    if let (Some(prev_info), Some(prev_head)) = (prev, prev_head_block_number) {
+        let clamp_index = prev_info.clamps.len();
+        if let Some(clamp_info) = dump_data_sources_clamp(
+            conn,
+            namespace,
+            dir,
+            prev_info.max_vid,
+            prev_head,
+            clamp_index,
+            reporter,
+        )
+        .await?
+        {
+            clamps.push(clamp_info);
+        }
+    }
+
+    reporter.finish_data_sources(total_rows);
+
+    Ok(Some(TableInfo {
+        immutable: false,
+        has_causality_region: true,
+        chunks,
+        clamps,
+        max_vid,
+    }))
+}
+
+impl Layout {
+    pub(crate) async fn dump(
+        &self,
+        conn: &mut AsyncPgConnection,
+        index_list: IndexList,
+        dir: PathBuf,
+        network: &str,
+        entity_count: usize,
+        reporter: &mut dyn DumpReporter,
+    ) -> Result<(), StoreError> {
+        fn write_file(name: PathBuf, contents: &str) -> Result<(), StoreError> {
+            let mut file = fs::File::create(name).map_err(|e| StoreError::Unknown(e.into()))?;
+            file.write_all(contents.as_bytes())
+                .map_err(|e| StoreError::Unknown(e.into()))?;
+            Ok(())
+        }
+
+        // Check for a previous dump (incremental mode)
+        let metadata_path = dir.join("metadata.json");
+        let prev = if metadata_path.exists() {
+            let prev = Metadata::from_file(&metadata_path)?;
+            if prev.deployment != self.site.deployment {
+                return Err(StoreError::InternalError(format!(
+                    "incremental dump refused: previous dump is for deployment '{}' \
+                     but current deployment is '{}'",
+                    prev.deployment, self.site.deployment
+                )));
+            }
+            Some(prev)
+        } else {
+            None
+        };
+
+        let prev_head_block_number = prev
+            .as_ref()
+            .and_then(|p| p.head_block.as_ref())
+            .map(|b| b.number);
+
+        let deployment = deployment_entity(conn, &self.site, &self.input_schema).await?;
+        let (mut metadata, schema, yaml) = Metadata::new(
+            self.site.deployment.clone(),
+            network.to_string(),
+            entity_count,
+            deployment,
+            index_list,
+        );
+
+        // Guard: refuse incremental if current head ≤ previous head
+        // (could indicate a reorg)
+        if let (Some(prev_head), Some(curr_head)) = (
+            prev_head_block_number,
+            metadata.head_block.as_ref().map(|b| b.number),
+        ) && curr_head <= prev_head
+        {
+            return Err(StoreError::InternalError(format!(
+                "incremental dump refused: current head block ({}) <= previous head block ({}); \
+                     possible reorg — delete the dump directory and re-dump",
+                curr_head, prev_head
+            )));
+        }
+
+        write_file(dir.join("schema.graphql"), &schema)?;
+
+        if let Some(yaml) = yaml {
+            write_file(dir.join("subgraph.yaml"), &yaml)?;
+        }
+
+        // Dump entity tables sorted by name for determinism
+        let mut tables: Vec<_> = self.tables.values().collect();
+        tables.sort_by_key(|t| t.name.as_str().to_string());
+
+        reporter.start(self.site.deployment.as_str(), tables.len());
+
+        for table in &tables {
+            let table_name = table.object.as_str();
+            let prev_table = prev.as_ref().and_then(|p| p.tables.get(table_name));
+            let table_info = dump_entity_table(
+                conn,
+                table,
+                &dir,
+                prev_table,
+                prev_head_block_number,
+                reporter,
+            )
+            .await?;
+            metadata.tables.insert(table_name.to_string(), table_info);
+        }
+
+        // Carry forward tables from previous dump that are no longer in
+        // the current layout (schema evolution — rare but possible)
+        if let Some(ref prev_meta) = prev {
+            for (name, info) in &prev_meta.tables {
+                if name == DATA_SOURCES_TABLE {
+                    continue;
+                }
+                if !metadata.tables.contains_key(name) {
+                    metadata.tables.insert(name.clone(), info.clone());
+                }
+            }
+        }
+
+        // Dump data_sources$ if it exists
+        let namespace = self.site.namespace.as_str();
+        let prev_ds = prev.as_ref().and_then(|p| p.tables.get(DATA_SOURCES_TABLE));
+        if let Some(ds_info) = dump_data_sources(
+            conn,
+            namespace,
+            &dir,
+            prev_ds,
+            prev_head_block_number,
+            reporter,
+        )
+        .await?
+        {
+            metadata
+                .tables
+                .insert(DATA_SOURCES_TABLE.to_string(), ds_info);
+        } else if let Some(prev_ds_info) = prev_ds {
+            // Carry forward from previous dump
+            metadata
+                .tables
+                .insert(DATA_SOURCES_TABLE.to_string(), prev_ds_info.clone());
+        }
+
+        // Write metadata.json atomically via tmp file + rename
+        let tmp_path = dir.join("metadata.json.tmp");
+        write_file(tmp_path.clone(), &serde_json::to_string_pretty(&metadata)?)?;
+        fs::rename(&tmp_path, dir.join("metadata.json")).map_err(|e| {
+            StoreError::InternalError(format!("failed to rename metadata.json.tmp: {e}"))
+        })?;
+
+        reporter.finish();
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn table_info_without_clamps_field() {
+        // Old dumps don't have a `clamps` field. Verify deserialization
+        // works and produces an empty vec.
+        let json = r#"{
+            "immutable": false,
+            "has_causality_region": true,
+            "chunks": [],
+            "max_vid": 42
+        }"#;
+        let info: TableInfo = serde_json::from_str(json).unwrap();
+        assert!(info.clamps.is_empty());
+        assert_eq!(info.max_vid, 42);
+        assert!(!info.immutable);
+    }
+
+    #[test]
+    fn table_info_with_clamps_field() {
+        let json = r#"{
+            "immutable": false,
+            "has_causality_region": false,
+            "chunks": [],
+            "clamps": [{"file": "Foo/clamp_000000.parquet", "min_vid": 1, "max_vid": 10, "row_count": 5}],
+            "max_vid": 100
+        }"#;
+        let info: TableInfo = serde_json::from_str(json).unwrap();
+        assert_eq!(info.clamps.len(), 1);
+        assert_eq!(info.clamps[0].file, "Foo/clamp_000000.parquet");
+        assert_eq!(info.clamps[0].row_count, 5);
+    }
+
+    #[test]
+    fn chunk_and_clamp_filenames() {
+        assert_eq!(chunk_filename(0), "chunk_000000.parquet");
+        assert_eq!(chunk_filename(1), "chunk_000001.parquet");
+        assert_eq!(chunk_filename(999), "chunk_000999.parquet");
+
+        assert_eq!(clamp_filename(0), "clamp_000000.parquet");
+        assert_eq!(clamp_filename(1), "clamp_000001.parquet");
+    }
+
+    #[test]
+    fn byte_bounded_slices_split_and_preserve_rows() {
+        use crate::relational::value::{OidRow, OidValue};
+
+        // Each row is a single string of `n` bytes, so its estimated size is `n`.
+        fn row_of(n: usize) -> OidRow {
+            vec![OidValue::String("x".repeat(n))].into_iter().collect()
+        }
+
+        // Empty input yields no slices.
+        assert!(byte_bounded_slices(&[], 1024).is_empty());
+
+        // Five 100-byte rows with a 250-byte cap pack as 2 + 2 + 1.
+        let rows: Vec<OidRow> = (0..5).map(|_| row_of(100)).collect();
+        let slices = byte_bounded_slices(&rows, 250);
+        let lens: Vec<usize> = slices.iter().map(|s| s.len()).collect();
+        assert_eq!(lens, vec![2, 2, 1]);
+        // No data lost, and no slice exceeds the cap.
+        assert_eq!(slices.iter().map(|s| s.len()).sum::<usize>(), rows.len());
+        for s in &slices {
+            assert!(s.iter().map(estimate_row_bytes).sum::<usize>() <= 250);
+        }
+
+        // A single row larger than the cap still makes progress as its own slice.
+        let big = vec![row_of(1000)];
+        let slices = byte_bounded_slices(&big, 250);
+        assert_eq!(slices.len(), 1);
+        assert_eq!(slices[0].len(), 1);
+    }
+
+    #[test]
+    fn clamp_record_batch_construction() {
+        use crate::parquet::schema::clamp_arrow_schema;
+
+        let schema = clamp_arrow_schema();
+        let rows = vec![
+            ClampRow {
+                vid: 10,
+                block_range_end: 500,
+            },
+            ClampRow {
+                vid: 20,
+                block_range_end: 600,
+            },
+            ClampRow {
+                vid: 30,
+                block_range_end: 700,
+            },
+        ];
+        let batch = clamp_rows_to_record_batch(&schema, &rows).unwrap();
+        assert_eq!(batch.num_rows(), 3);
+        assert_eq!(batch.num_columns(), 2);
+
+        let vid = batch
+            .column(0)
+            .as_any()
+            .downcast_ref::<arrow::array::Int64Array>()
+            .unwrap();
+        assert_eq!(vid.value(0), 10);
+        assert_eq!(vid.value(1), 20);
+        assert_eq!(vid.value(2), 30);
+
+        let bre = batch
+            .column(1)
+            .as_any()
+            .downcast_ref::<arrow::array::Int32Array>()
+            .unwrap();
+        assert_eq!(bre.value(0), 500);
+        assert_eq!(bre.value(1), 600);
+        assert_eq!(bre.value(2), 700);
+    }
+}
diff --git a/store/postgres/src/relational/index.rs b/store/postgres/src/relational/index.rs
index 1465b52838a..dc66a04f9a7 100644
--- a/store/postgres/src/relational/index.rs
+++ b/store/postgres/src/relational/index.rs
@@ -1,26 +1,21 @@
 //! Parse Postgres index definition into a form that is meaningful for us.
-use anyhow::{anyhow, Error};
+use anyhow::{Error, anyhow};
+use graph::env::ENV_VARS;
 use std::collections::HashMap;
 use std::fmt::{Display, Write};
-use std::sync::Arc;
 
 use diesel::sql_query;
-use diesel::sql_types::{Bool, Text};
 use diesel_async::RunQueryDsl;
 use graph::components::store::StoreError;
 use graph::itertools::Itertools;
 use graph::prelude::{
-    lazy_static,
+    BlockNumber, lazy_static,
     regex::{Captures, Regex},
-    BlockNumber,
 };
 
 use crate::block_range::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN};
-use crate::command_support::catalog::Site;
-use crate::deployment_store::DeploymentStore;
-use crate::primary::Namespace;
 use crate::relational::{BYTE_ARRAY_PREFIX_SIZE, STRING_PREFIX_SIZE};
-use crate::{catalog, AsyncPgConnection};
+use crate::{AsyncPgConnection, catalog};
 
 use super::{Layout, Table, VID_COLUMN};
 
@@ -135,6 +130,13 @@ impl Display for Expr {
 }
 
 impl Expr {
+    const LBR: &str = "lower(block_range)";
+    const LBR_MULTI: &str = "lower(block_range) int4_minmax_multi_ops";
+    const UBR: &str = "coalesce(upper(block_range), 2147483647)";
+    const UBR_MULTI: &str = "coalesce(upper(block_range), 2147483647) int4_minmax_multi_ops";
+    const VID_MULTI: &str = "vid int8_minmax_multi_ops";
+    const BLOCK_MULTI: &str = "block$ int4_minmax_multi_ops";
+
     fn parse(expr: &str) -> Self {
         use Expr::*;
 
@@ -142,15 +144,19 @@ impl Expr {
 
         let prefix_rx = Regex::new("^(?P<kind>substring|left)\\((?P<name>[a-z0-9$_]+)").unwrap();
 
-        if expr == VID_COLUMN {
+        // We strip out the minmax_multi_ops operator class from the
+        // expression for the columns where we usually use them. They will
+        // be put back when we create an index, but whether they should be
+        // used depends on the database in which the index is created
+        if expr == VID_COLUMN || expr == Self::VID_MULTI {
             Vid
-        } else if expr == "lower(block_range)" {
+        } else if expr == Self::LBR || expr == Self::LBR_MULTI {
             BlockRangeLower
-        } else if expr == "coalesce(upper(block_range), 2147483647)" {
+        } else if expr == Self::UBR || expr == Self::UBR_MULTI {
             BlockRangeUpper
         } else if expr == "block_range" {
             BlockRange
-        } else if expr == "block$" {
+        } else if expr == BLOCK_COLUMN || expr == Self::BLOCK_MULTI {
             Block
         } else if expr
             .chars()
@@ -199,8 +205,8 @@ impl Expr {
             return false;
         }
         for i in 0..orig.len() {
-            let o = orig[i].to_sql();
-            let n = current[i].to_sql();
+            let o = orig[i].to_sql(false);
+            let n = current[i].to_sql(false);
 
             // check that string n starts with o
             if n.len() < o.len() || n[0..o.len()] != o {
@@ -210,16 +216,24 @@ impl Expr {
         true
     }
 
-    fn to_sql(&self) -> String {
-        match self {
-            Expr::Column(name) => format!("\"{}\"", name),
-            Expr::Prefix(name, kind) => kind.to_sql(&format!("\"{}\"", name)),
-            Expr::Vid => VID_COLUMN.to_string(),
-            Expr::Block => BLOCK_COLUMN.to_string(),
-            Expr::BlockRange => BLOCK_RANGE_COLUMN.to_string(),
-            Expr::BlockRangeLower => "lower(block_range)".to_string(),
-            Expr::BlockRangeUpper => "coalesce(upper(block_range), 2147483647)".to_string(),
-            Expr::Unknown(expr) => expr.to_string(),
+    /// Generate a SQL expression for this index expression. The `multi_ops`
+    /// indicates whether we should also print the `minmax_multi_ops`
+    /// operator class used for BRIN indexes. This is needed because it is
+    /// not the default operator class, and only supported in Postgres 14+.
+    fn to_sql(&self, multi_ops: bool) -> String {
+        match (self, multi_ops) {
+            (Expr::Column(name), _) => format!("\"{}\"", name),
+            (Expr::Prefix(name, kind), _) => kind.to_sql(&format!("\"{}\"", name)),
+            (Expr::Vid, true) => Self::VID_MULTI.to_string(),
+            (Expr::Vid, false) => VID_COLUMN.to_string(),
+            (Expr::Block, false) => BLOCK_COLUMN.to_string(),
+            (Expr::Block, true) => Self::BLOCK_MULTI.to_string(),
+            (Expr::BlockRange, _) => BLOCK_RANGE_COLUMN.to_string(),
+            (Expr::BlockRangeLower, false) => Self::LBR.to_string(),
+            (Expr::BlockRangeLower, true) => Self::LBR_MULTI.to_string(),
+            (Expr::BlockRangeUpper, false) => Self::UBR.to_string(),
+            (Expr::BlockRangeUpper, true) => Self::UBR_MULTI.to_string(),
+            (Expr::Unknown(expr), _) => expr.to_string(),
         }
     }
 }
@@ -262,17 +276,26 @@ impl Cond {
                 .map(Cond::Partial)
         }
 
-        if &cond == "coalesce(upper(block_range), 2147483647) < 2147483647" {
+        let cond = cond.trim();
+        let cond = if cond.starts_with("(") && cond.ends_with(")") {
+            &cond[1..cond.len() - 1]
+        } else {
+            cond
+        };
+        let cond = cond.trim();
+        if cond == "coalesce(upper(block_range), 2147483647) < 2147483647" {
             Cond::Closed
         } else {
-            parse_partial(&cond).unwrap_or(Cond::Unknown(cond))
+            parse_partial(cond).unwrap_or(Cond::Unknown(cond.to_string()))
         }
     }
 
     fn to_sql(&self) -> String {
         match self {
-            Cond::Partial(number) => format!("coalesce(upper(block_range), 2147483647) > {number}"),
-            Cond::Closed => "coalesce(upper(block_range), 2147483647) < 2147483647".to_string(),
+            Cond::Partial(number) => {
+                format!("(coalesce(upper(block_range), 2147483647) > {number})")
+            }
+            Cond::Closed => "(coalesce(upper(block_range), 2147483647) < 2147483647)".to_string(),
             Cond::Unknown(cond) => cond.to_string(),
         }
     }
@@ -387,8 +410,8 @@ impl CreateIndex {
                 "create (?P<unique>unique )?index (?P<name>\"?[a-z0-9$_]+\"?) \
             on (?P<nsp>sgd[0-9]+)\\.(?P<table>\"?[a-z0-9$_]+\"?) \
             using (?P<method>[a-z]+) \\((?P<columns>.*?)\\)\
-            ( where \\((?P<cond>.*)\\))?\
-            ( with \\((?P<with>.*)\\))?$",
+            ( with \\((?P<with>.*)\\))?\
+            ( where (?P<cond>.*))?$",
             )
             .unwrap();
 
@@ -441,7 +464,7 @@ impl CreateIndex {
         }
     }
 
-    pub fn with_nsp(&self, nsp2: String) -> Result<Self, Error> {
+    pub(crate) fn with_nsp(&self, nsp2: String) -> Result<Self, Error> {
         let s = self.clone();
         match s {
             CreateIndex::Unknown { defn: _ } => Err(anyhow!("Failed to parse the index")),
@@ -616,6 +639,10 @@ impl CreateIndex {
     }
 
     pub fn to_postpone(&self) -> bool {
+        if !ENV_VARS.postpone_attribute_index_creation {
+            return false;
+        }
+
         fn has_prefix(s: &str, prefix: &str) -> bool {
             s.starts_with(prefix)
                 || s.ends_with("\"") && s.starts_with(format!("\"{}", prefix).as_str())
@@ -639,23 +666,34 @@ impl CreateIndex {
         }
     }
 
-    pub fn name(&self) -> Option<String> {
+    pub fn name(&self) -> Option<&str> {
         match self {
             CreateIndex::Unknown { .. } => None,
-            CreateIndex::Parsed { name, .. } => Some(name.clone()),
+            CreateIndex::Parsed { name, .. } => Some(name.as_str()),
         }
     }
 
-    pub fn fields_exist_in_dest(&self, dest_table: &Table) -> bool {
-        fn column_exists<'a>(it: &mut impl Iterator<Item = &'a str>, column_name: &str) -> bool {
-            it.any(|c| *c == *column_name)
+    /// Return `true` if any of the attribute columns (user-defined columns,
+    /// not infrastructure columns like `vid`, `block$`, etc.) referenced by
+    /// this index are NOT in `columns`.
+    pub fn references_column_not_in(&self, columns: &std::collections::HashSet<&str>) -> bool {
+        match self {
+            CreateIndex::Unknown { .. } => false,
+            CreateIndex::Parsed { columns: exprs, .. } => exprs.iter().any(|expr| match expr {
+                Expr::Column(name) | Expr::Prefix(name, _) => !columns.contains(name.as_str()),
+                _ => false,
+            }),
         }
+    }
 
-        fn some_column_contained<'a>(expr: &str, it: &mut impl Iterator<Item = &'a str>) -> bool {
-            it.any(|c| expr.contains(c))
+    pub fn fields_exist_in_dest(&self, dest_table: &Table) -> bool {
+        fn column_exists(dest_table: &Table, column_name: &str) -> bool {
+            dest_table
+                .columns
+                .iter()
+                .any(|c| c.name.as_str() == column_name)
         }
 
-        let cols = &mut dest_table.columns.iter().map(|i| i.name.as_str());
         match self {
             CreateIndex::Unknown { defn: _ } => return true,
             CreateIndex::Parsed {
@@ -665,12 +703,12 @@ impl CreateIndex {
                 for c in parsed_cols {
                     match c {
                         Expr::Column(column_name) => {
-                            if !column_exists(cols, column_name) {
+                            if !column_exists(dest_table, column_name) {
                                 return false;
                             }
                         }
                         Expr::Prefix(column_name, _) => {
-                            if !column_exists(cols, column_name) {
+                            if !column_exists(dest_table, column_name) {
                                 return false;
                             }
                         }
@@ -686,18 +724,15 @@ impl CreateIndex {
                             }
                         }
                         Expr::Unknown(expression) => {
-                            if some_column_contained(
-                                expression,
-                                &mut (vec!["block_range"]).into_iter(),
-                            ) && dest_table.immutable
-                            {
+                            if expression.contains("block_range") && dest_table.immutable {
                                 return false;
                             }
-                            if !some_column_contained(expression, cols)
-                                && !some_column_contained(
-                                    expression,
-                                    &mut (vec!["block_range", "vid"]).into_iter(),
-                                )
+                            if !dest_table
+                                .columns
+                                .iter()
+                                .any(|c| expression.contains(c.name.as_str()))
+                                && !expression.contains("block_range")
+                                && !expression.contains("vid")
                             {
                                 return false;
                             }
@@ -712,7 +747,7 @@ impl CreateIndex {
     /// Generate a SQL statement that creates this index. If `concurrent` is
     /// `true`, make it a concurrent index creation. If `if_not_exists` is
     /// `true` add a `if not exists` clause to the index creation.
-    pub fn to_sql(&self, concurrent: bool, if_not_exists: bool) -> Result<String, std::fmt::Error> {
+    fn to_sql(&self, creat: &IndexCreator) -> Result<String, std::fmt::Error> {
         match self {
             CreateIndex::Unknown { defn } => Ok(defn.to_string()),
             CreateIndex::Parsed {
@@ -725,433 +760,592 @@ impl CreateIndex {
                 cond,
                 with,
             } => {
+                let IndexCreator {
+                    concurrently,
+                    if_not_exists,
+                    multi_ops,
+                } = creat;
+                // Explicit operator classes are only needed for BRIN indexes
+                let multi_ops = *multi_ops && method == &Method::Brin;
                 let unique = if *unique { "unique " } else { "" };
-                let concurrent = if concurrent { "concurrently " } else { "" };
-                let if_not_exists = if if_not_exists { "if not exists " } else { "" };
-                let columns = columns.iter().map(|c| c.to_sql()).join(", ");
+                let concurrent = if *concurrently { "concurrently " } else { "" };
+                let if_not_exists = if *if_not_exists { "if not exists " } else { "" };
+                let columns = columns.iter().map(|c| c.to_sql(multi_ops)).join(", ");
 
-                let mut sql = format!("create {unique}index {concurrent}{if_not_exists}{name} on {nsp}.{table} using {method} ({columns})");
+                let mut sql = format!(
+                    "create {unique}index {concurrent}{if_not_exists}{name} on {nsp}.{table} using {method} ({columns})"
+                );
                 if let Some(with) = with {
                     write!(sql, " with ({with})")?;
                 }
                 if let Some(cond) = cond {
-                    write!(sql, " where ({})", cond.to_sql())?;
+                    write!(sql, " where {}", cond.to_sql())?;
                 }
                 Ok(sql)
             }
         }
     }
-}
 
-#[derive(Debug)]
-pub struct IndexList {
-    pub(crate) indexes: HashMap<String, Vec<CreateIndex>>,
+    pub(crate) fn method(self, method: Method) -> CreateIndex {
+        match self {
+            CreateIndex::Unknown { defn } => CreateIndex::Unknown { defn },
+            CreateIndex::Parsed {
+                unique,
+                name,
+                nsp,
+                table,
+                method: _,
+                columns,
+                cond,
+                with,
+            } => CreateIndex::Parsed {
+                unique,
+                name,
+                nsp,
+                table,
+                method,
+                columns,
+                cond,
+                with,
+            },
+        }
+    }
+
+    pub(crate) fn cond(self, cond: Cond) -> CreateIndex {
+        match self {
+            CreateIndex::Unknown { defn } => CreateIndex::Unknown { defn },
+            CreateIndex::Parsed {
+                unique,
+                name,
+                nsp,
+                table,
+                method,
+                columns,
+                cond: _,
+                with,
+            } => CreateIndex::Parsed {
+                unique,
+                name,
+                nsp,
+                table,
+                method,
+                columns,
+                cond: Some(cond),
+                with,
+            },
+        }
+    }
 }
 
-pub async fn load_indexes_from_table(
-    conn: &mut AsyncPgConnection,
-    table: &Arc<Table>,
-    schema_name: &str,
-) -> Result<Vec<CreateIndex>, StoreError> {
-    let table_name = table.name.as_str();
-    let indexes = catalog::indexes_for_table(conn, schema_name, table_name).await?;
-    Ok(indexes.into_iter().map(CreateIndex::parse).collect())
+/// A helper to run or write index creation statements with options as to
+/// whether to create them concurrently or only of they do not exist
+pub struct IndexCreator {
+    concurrently: bool,
+    if_not_exists: bool,
+    /// Whether the shard supports the multi_ops operator classes
+    multi_ops: bool,
 }
 
-impl IndexList {
-    pub async fn load(
-        conn: &mut AsyncPgConnection,
-        site: Arc<Site>,
-        store: DeploymentStore,
-    ) -> Result<Self, StoreError> {
-        let mut list = IndexList {
-            indexes: HashMap::new(),
-        };
-        let schema_name = site.namespace.clone();
-        let layout = store.layout(conn, site).await?;
-        for table in layout.tables.values() {
-            let indexes = load_indexes_from_table(conn, table, schema_name.as_str()).await?;
-            list.indexes.insert(table.name.to_string(), indexes);
+impl IndexCreator {
+    /// Create an index creator with the given options. The `multi_ops` flag
+    /// indicates whether the database in which we will create indexes
+    /// supports the `minmax_multi_ops` operator classes
+    pub fn new(concurrently: bool, if_not_exists: bool, multi_ops: bool) -> Self {
+        IndexCreator {
+            concurrently,
+            if_not_exists,
+            multi_ops,
         }
-        Ok(list)
     }
 
-    pub fn indexes_for_table(
+    /// Create the index `idx` in the transaction that is currently active
+    /// on `conn`, i.e., do not start a new transaction
+    pub async fn execute(
         &self,
-        namespace: &Namespace,
-        table_name: &String,
-        dest_table: &Table,
-        postponed: bool,
-        concurrent: bool,
-        if_not_exists: bool,
-    ) -> Result<Vec<(Option<String>, String)>, Error> {
-        let mut arr = vec![];
-        if let Some(vec) = self.indexes.get(table_name) {
-            for ci in vec {
-                // First we check if the fields do exist in the destination subgraph.
-                // In case of grafting that is not given.
-                if ci.fields_exist_in_dest(dest_table)
-                    // Then we check if the index is one of the default indexes not based on
-                    // the attributes. Those will be created anyway and we should skip them.
-                    && !ci.is_default_non_attr_index()
-                    // Then ID based indexes in the immutable tables are also created initially
-                    // and should be skipped.
-                    && !(ci.is_id() && dest_table.immutable)
-                    // Finally we filter by the criteria is the index to be postponed. The ones
-                    // that are not to be postponed we want to create during initial creation of
-                    // the copied subgraph
-                    && postponed == ci.to_postpone()
-                {
-                    if let Ok(sql) = ci
-                        .with_nsp(namespace.to_string())?
-                        .to_sql(concurrent, if_not_exists)
-                    {
-                        arr.push((ci.name(), sql))
-                    }
-                }
-            }
-        }
-        Ok(arr)
+        conn: &mut AsyncPgConnection,
+        idx: &CreateIndex,
+    ) -> Result<(), StoreError> {
+        let sql = idx.to_sql(self)?;
+        sql_query(sql).execute(conn).await?;
+        Ok(())
     }
 
-    pub async fn recreate_invalid_indexes(
+    /// Create all indexes in `idxs`. Each index creation happens in its own
+    /// transaction, and `conn` should therefore not be in a transaction
+    /// when this method is called.
+    pub async fn execute_many(
         &self,
         conn: &mut AsyncPgConnection,
-        layout: &Layout,
+        idxs: &[CreateIndex],
     ) -> Result<(), StoreError> {
-        #[derive(QueryableByName, Debug)]
-        struct IndexInfo {
-            #[diesel(sql_type = Bool)]
-            isvalid: bool,
+        for idx in idxs {
+            self.execute(conn, idx).await?;
         }
+        Ok(())
+    }
+
+    pub fn to_sql(&self, index: &CreateIndex) -> Result<String, std::fmt::Error> {
+        index.to_sql(self)
+    }
+}
+
+impl Layout {
+    /// Create an index creator with the given options for creating indexes
+    /// in this layout
+    pub fn index_creator(&self, concurrently: bool, if_not_exists: bool) -> IndexCreator {
+        let multi_ops = self.catalog.has_minmax_multi_ops;
+        IndexCreator::new(concurrently, if_not_exists, multi_ops)
+    }
+}
+
+#[derive(Debug)]
+pub struct IndexList {
+    pub(crate) indexes: HashMap<String, Vec<CreateIndex>>,
+}
 
-        let namespace = &layout.catalog.site.namespace;
+impl IndexList {
+    pub fn new(indexes: HashMap<String, Vec<CreateIndex>>) -> Self {
+        IndexList { indexes }
+    }
+
+    pub async fn load(conn: &mut AsyncPgConnection, layout: &Layout) -> Result<Self, StoreError> {
+        let mut indexes = HashMap::new();
+        let schema_name = layout.site.namespace.clone();
         for table in layout.tables.values() {
-            for (ind_name, create_query) in
-                self.indexes_for_table(namespace, &table.name.to_string(), table, true, true, true)?
-            {
-                if let Some(index_name) = ind_name {
-                    let table_name = table.name.clone();
-                    let query = r#"
-                        SELECT  x.indisvalid           AS isvalid
-                        FROM pg_index x
-                                JOIN pg_class c ON c.oid = x.indrelid
-                                JOIN pg_class i ON i.oid = x.indexrelid
-                                LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-                        WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'm'::"char", 'p'::"char"]))
-                        AND (i.relkind = ANY (ARRAY ['i'::"char", 'I'::"char"]))
-                        AND (n.nspname = $1)
-                        AND (c.relname = $2)
-                        AND (i.relname = $3);"#;
-                    let ii_vec = sql_query(query)
-                        .bind::<Text, _>(namespace.to_string())
-                        .bind::<Text, _>(table_name)
-                        .bind::<Text, _>(index_name.clone())
-                        .get_results::<IndexInfo>(conn)
-                        .await?
-                        .into_iter()
-                        .collect::<Vec<IndexInfo>>();
-                    assert!(ii_vec.len() <= 1);
-                    if ii_vec.is_empty() || !ii_vec[0].isvalid {
-                        // if a bad index exist lets first drop it
-                        if !ii_vec.is_empty() {
-                            let drop_query =
-                                sql_query(format!("DROP INDEX {}.{};", namespace, index_name));
-                            drop_query.execute(conn).await?;
-                        }
-                        sql_query(create_query).execute(conn).await?;
-                    }
-                }
-            }
+            let indexes_from_table =
+                catalog::indexes_for_table(conn, schema_name.as_str(), table.name.as_str())
+                    .await?
+                    .into_iter()
+                    .map(CreateIndex::parse)
+                    .collect();
+            indexes.insert(table.name.to_string(), indexes_from_table);
         }
-        Ok(())
+        Ok(Self::new(indexes))
+    }
+
+    /// Return all indexes for `table` from this list. Only indexes that are
+    /// for columns that actually exist on `table` are returned. In
+    /// addition, indexes that are always created when a deployment is
+    /// created independent of the configuration are also not returned.
+    pub fn indexes_for_table<'a>(
+        &'a self,
+        table: &'a Table,
+    ) -> impl Iterator<Item = &'a CreateIndex> {
+        static EMPTY: Vec<CreateIndex> = vec![];
+        let indexes = self.indexes.get(table.name.as_str()).unwrap_or(&EMPTY);
+
+        indexes.iter().filter(move |ci| {
+            // First we check if the fields do exist in the destination subgraph.
+            // In case of grafting that is not given.
+            ci.fields_exist_in_dest(table)
+                // Then we check if the index is one of the default indexes not based on
+                // the attributes. Those will be created anyway and we should skip them.
+                && !ci.is_default_non_attr_index()
+                // Then ID based indexes in the immutable tables are also created initially
+                // and should be skipped.
+                && !(ci.is_id() && table.immutable)
+        })
     }
 }
 
-#[test]
-fn parse() {
-    use Method::*;
-
-    #[derive(Debug)]
-    enum TestExpr {
-        Name(&'static str),
-        Prefix(&'static str, &'static str),
-        Vid,
-        Block,
-        BlockRange,
-        BlockRangeLower,
-        BlockRangeUpper,
-        #[allow(dead_code)]
-        Unknown(&'static str),
+#[cfg(test)]
+mod tests {
+    use std::collections::BTreeSet;
+    use std::sync::Arc;
+
+    use graph::prelude::{BlockNumber, DeploymentHash};
+    use graph::schema::InputSchema;
+
+    use crate::layout_for_tests::{Namespace, make_dummy_site};
+    use crate::relational::Catalog;
+
+    use super::*;
+
+    fn test_layout(gql: &str) -> Layout {
+        let subgraph = DeploymentHash::new("subgraph").unwrap();
+        let schema = InputSchema::parse_latest(gql, subgraph.clone()).expect("Test schema invalid");
+        let namespace = Namespace::new("sgd0815".to_owned()).unwrap();
+        let site = Arc::new(make_dummy_site(subgraph, namespace, "anet".to_string()));
+        let catalog =
+            Catalog::for_tests(site.clone(), BTreeSet::new()).expect("Can not create catalog");
+        Layout::new(site, &schema, catalog).expect("Failed to construct Layout")
     }
 
-    impl<'a> From<&'a TestExpr> for Expr {
-        fn from(expr: &'a TestExpr) -> Self {
-            match expr {
-                TestExpr::Name(name) => Expr::Column(name.to_string()),
-                TestExpr::Prefix(name, kind) => {
-                    Expr::Prefix(name.to_string(), PrefixKind::parse(kind).unwrap())
+    #[test]
+    fn parse() {
+        use Method::*;
+
+        #[derive(Debug)]
+        enum TestExpr {
+            Name(&'static str),
+            Prefix(&'static str, &'static str),
+            Vid,
+            Block,
+            BlockRange,
+            BlockRangeLower,
+            BlockRangeUpper,
+            #[allow(dead_code)]
+            Unknown(&'static str),
+        }
+
+        impl<'a> From<&'a TestExpr> for Expr {
+            fn from(expr: &'a TestExpr) -> Self {
+                match expr {
+                    TestExpr::Name(name) => Expr::Column(name.to_string()),
+                    TestExpr::Prefix(name, kind) => {
+                        Expr::Prefix(name.to_string(), PrefixKind::parse(kind).unwrap())
+                    }
+                    TestExpr::Vid => Expr::Vid,
+                    TestExpr::Block => Expr::Block,
+                    TestExpr::BlockRange => Expr::BlockRange,
+                    TestExpr::BlockRangeLower => Expr::BlockRangeLower,
+                    TestExpr::BlockRangeUpper => Expr::BlockRangeUpper,
+                    TestExpr::Unknown(s) => Expr::Unknown(s.to_string()),
                 }
-                TestExpr::Vid => Expr::Vid,
-                TestExpr::Block => Expr::Block,
-                TestExpr::BlockRange => Expr::BlockRange,
-                TestExpr::BlockRangeLower => Expr::BlockRangeLower,
-                TestExpr::BlockRangeUpper => Expr::BlockRangeUpper,
-                TestExpr::Unknown(s) => Expr::Unknown(s.to_string()),
             }
         }
-    }
 
-    #[derive(Debug)]
-    enum TestCond {
-        Partial(BlockNumber),
-        Closed,
-        Unknown(&'static str),
-    }
+        #[derive(Debug, Clone)]
+        enum TestCond {
+            Partial(BlockNumber),
+            Closed,
+            Unknown(&'static str),
+        }
 
-    impl From<TestCond> for Cond {
-        fn from(expr: TestCond) -> Self {
-            match expr {
-                TestCond::Partial(number) => Cond::Partial(number),
-                TestCond::Unknown(s) => Cond::Unknown(s.to_string()),
-                TestCond::Closed => Cond::Closed,
+        impl From<TestCond> for Cond {
+            fn from(expr: TestCond) -> Self {
+                match expr {
+                    TestCond::Partial(number) => Cond::Partial(number),
+                    TestCond::Unknown(s) => Cond::Unknown(s.to_string()),
+                    TestCond::Closed => Cond::Closed,
+                }
             }
         }
-    }
 
-    #[derive(Debug)]
-    struct Parsed {
-        unique: bool,
-        name: &'static str,
-        nsp: &'static str,
-        table: &'static str,
-        method: Method,
-        columns: &'static [TestExpr],
-        cond: Option<TestCond>,
-    }
+        #[derive(Debug, Clone)]
+        struct Parsed {
+            unique: bool,
+            name: &'static str,
+            nsp: &'static str,
+            table: &'static str,
+            method: Method,
+            columns: &'static [TestExpr],
+            cond: Option<TestCond>,
+        }
 
-    impl From<Parsed> for CreateIndex {
-        fn from(p: Parsed) -> Self {
-            let Parsed {
-                unique,
-                name,
-                nsp,
-                table,
-                method,
-                columns,
-                cond,
-            } = p;
-            let columns: Vec<_> = columns.iter().map(Expr::from).collect();
-            let cond = cond.map(Cond::from);
-            CreateIndex::Parsed {
-                unique,
-                name: name.to_string(),
-                nsp: nsp.to_string(),
-                table: table.to_string(),
-                method,
-                columns,
-                cond,
-                with: None,
+        impl From<Parsed> for CreateIndex {
+            fn from(p: Parsed) -> Self {
+                let Parsed {
+                    unique,
+                    name,
+                    nsp,
+                    table,
+                    method,
+                    columns,
+                    cond,
+                } = p;
+                let columns: Vec<_> = columns.iter().map(Expr::from).collect();
+                let cond = cond.map(Cond::from);
+                CreateIndex::Parsed {
+                    unique,
+                    name: name.to_string(),
+                    nsp: nsp.to_string(),
+                    table: table.to_string(),
+                    method,
+                    columns,
+                    cond,
+                    with: None,
+                }
             }
         }
-    }
 
-    #[track_caller]
-    fn parse_one(defn: &str, exp: Parsed) {
-        let act = CreateIndex::parse(defn.to_string());
-        let exp = CreateIndex::from(exp);
-        assert_eq!(exp, act);
+        #[track_caller]
+        fn parses_to(defn: &str, exp: &Parsed) -> CreateIndex {
+            let act = CreateIndex::parse(defn.to_string());
+            let exp = CreateIndex::from(exp.clone());
+            assert_eq!(exp, act);
+            act
+        }
+
+        #[track_caller]
+        fn parse_one(defn: &str, exp: Parsed) {
+            let act = parses_to(defn, &exp);
 
-        let defn = defn.to_ascii_lowercase();
-        assert_eq!(defn, act.to_sql(false, false).unwrap());
+            let defn = defn.to_ascii_lowercase();
+            let creat = IndexCreator::new(false, false, false);
+            assert_eq!(defn, creat.to_sql(&act).unwrap());
+        }
+
+        // Test that the equivalent index definitions in `defns` are parsed to
+        // the same `CreateIndex` and that turning those index definitions into
+        // a SQL string produces `defns[0]`
+        #[track_caller]
+        fn parse_many(defns: &[&str], exp: Parsed) {
+            let act = parses_to(defns[0], &exp);
+            for defn in &defns[1..] {
+                parses_to(defn, &exp);
+            }
+
+            let defn = defns[0].to_ascii_lowercase();
+            let creat = IndexCreator::new(false, false, false);
+            assert_eq!(defn, creat.to_sql(&act).unwrap());
+        }
+
+        use TestCond::*;
+        use TestExpr::*;
+
+        let sql = "create index attr_1_0_token_id on sgd44.token using btree (\"id\")";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_0_token_id",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[Name("id")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql =
+            "create index attr_1_1_token_symbol on sgd44.token using btree (left(\"symbol\", 256))";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_1_token_symbol",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[Prefix("symbol", "left")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index attr_1_5_token_trade_volume on sgd44.token using btree (\"trade_volume\")";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_5_token_trade_volume",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[Name("trade_volume")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create unique index token_pkey on sgd44.token using btree (vid)";
+        let exp = Parsed {
+            unique: true,
+            name: "token_pkey",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[Vid],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index brin_token on sgd44.token using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid)";
+        let exp = Parsed {
+            unique: false,
+            name: "brin_token",
+            nsp: "sgd44",
+            table: "token",
+            method: Brin,
+            columns: &[BlockRangeLower, BlockRangeUpper, Vid],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "CREATE INDEX brin_nft_transfer ON sgd4.nft_transfer USING brin (lower(block_range) int4_minmax_multi_ops, COALESCE(upper(block_range), 2147483647) int4_minmax_multi_ops, vid int8_minmax_multi_ops)";
+        let act = CreateIndex::parse(sql.to_string());
+        let CreateIndex::Parsed { columns, .. } = act else {
+            panic!("Failed to parse index");
+        };
+        assert_eq!(
+            vec![Expr::BlockRangeLower, Expr::BlockRangeUpper, Expr::Vid],
+            columns
+        );
+
+        let sql = "create index token_block_range_closed on sgd44.token using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647)";
+        let exp = Parsed {
+            unique: false,
+            name: "token_block_range_closed",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[BlockRangeUpper],
+            cond: Some(Closed),
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index token_id_block_range_excl on sgd44.token using gist (\"id\", block_range)";
+        let exp = Parsed {
+            unique: false,
+            name: "token_id_block_range_excl",
+            nsp: "sgd44",
+            table: "token",
+            method: Gist,
+            columns: &[Name("id"), BlockRange],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index attr_1_11_pool_owner on sgd411585.pool using btree (substring(\"owner\", 1, 64))";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_11_pool_owner",
+            nsp: "sgd411585",
+            table: "pool",
+            method: BTree,
+            columns: &[Prefix("owner", "substring")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index attr_1_20_pool_vault_id on sgd411585.pool using gist (\"vault_id\", block_range)";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_20_pool_vault_id",
+            nsp: "sgd411585",
+            table: "pool",
+            method: Gist,
+            columns: &[Name("vault_id"), BlockRange],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql =
+            "create index attr_1_22_pool_tokens_list on sgd411585.pool using gin (\"tokens_list\")";
+        let exp = Parsed {
+            unique: false,
+            name: "attr_1_22_pool_tokens_list",
+            nsp: "sgd411585",
+            table: "pool",
+            method: Gin,
+            columns: &[Name("tokens_list")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index manual_partial_pool_total_liquidity on sgd411585.pool using btree (\"total_liquidity\") where (coalesce(upper(block_range), 2147483647) > 15635000)";
+        let exp = Parsed {
+            unique: false,
+            name: "manual_partial_pool_total_liquidity",
+            nsp: "sgd411585",
+            table: "pool",
+            method: BTree,
+            columns: &[Name("total_liquidity")],
+            cond: Some(Partial(15635000)),
+        };
+        parse_one(sql, exp);
+
+        let sql = "create index manual_swap_pool_timestamp_id on sgd217942.swap using btree (\"pool\", \"timestamp\", \"id\")";
+        let exp = Parsed {
+            unique: false,
+            name: "manual_swap_pool_timestamp_id",
+            nsp: "sgd217942",
+            table: "swap",
+            method: BTree,
+            columns: &[Name("pool"), Name("timestamp"), Name("id")],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid)";
+        let exp = Parsed {
+            unique: false,
+            name: "brin_scy",
+            nsp: "sgd314614",
+            table: "scy",
+            method: Brin,
+            columns: &[Block, Vid],
+            cond: None,
+        };
+        parse_one(sql, exp);
+
+        let sqls = &[
+            "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid) where amount > 0",
+            "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid) where (amount > 0)",
+        ];
+        let exp = Parsed {
+            unique: false,
+            name: "brin_scy",
+            nsp: "sgd314614",
+            table: "scy",
+            method: Brin,
+            columns: &[Block, Vid],
+            cond: Some(TestCond::Unknown("amount > 0")),
+        };
+        parse_many(sqls, exp);
+
+        let sqls = &[
+            "CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (\"decimals\") WHERE decimals > (5)::numeric",
+            "CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (decimals) WHERE decimals > (5)::numeric",
+            "CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (decimals) WHERE ( decimals > (5)::numeric )",
+            "CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (\"decimals\") WHERE ( decimals > (5)::numeric )",
+        ];
+        let exp = Parsed {
+            unique: false,
+            name: "manual_token_random_cond",
+            nsp: "sgd44",
+            table: "token",
+            method: BTree,
+            columns: &[Name("decimals")],
+            cond: Some(TestCond::Unknown("decimals > (5)::numeric")),
+        };
+        parse_many(sqls, exp);
+
+        let sqls = &[
+            "CREATE INDEX manual_pool_swap_enabled_total_liquidity ON sgd12.pool USING btree (\"total_liquidity\") WHERE swap_enabled",
+            "CREATE INDEX manual_pool_swap_enabled_total_liquidity ON sgd12.pool USING btree (total_liquidity) WHERE swap_enabled",
+        ];
+        let exp = Parsed {
+            unique: false,
+            name: "manual_pool_swap_enabled_total_liquidity",
+            nsp: "sgd12",
+            table: "pool",
+            method: BTree,
+            columns: &[Name("total_liquidity")],
+            cond: Some(TestCond::Unknown("swap_enabled")),
+        };
+        parse_many(sqls, exp);
     }
 
-    use TestCond::*;
-    use TestExpr::*;
-
-    let sql = "create index attr_1_0_token_id on sgd44.token using btree (\"id\")";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_0_token_id",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[Name("id")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "create index attr_1_1_token_symbol on sgd44.token using btree (left(\"symbol\", 256))";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_1_token_symbol",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[Prefix("symbol", "left")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "create index attr_1_5_token_trade_volume on sgd44.token using btree (\"trade_volume\")";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_5_token_trade_volume",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[Name("trade_volume")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "create unique index token_pkey on sgd44.token using btree (vid)";
-    let exp = Parsed {
-        unique: true,
-        name: "token_pkey",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[Vid],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "create index brin_token on sgd44.token using brin (lower(block_range), coalesce(upper(block_range), 2147483647), vid)";
-    let exp = Parsed {
-        unique: false,
-        name: "brin_token",
-        nsp: "sgd44",
-        table: "token",
-        method: Brin,
-        columns: &[BlockRangeLower, BlockRangeUpper, Vid],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "create index token_block_range_closed on sgd44.token using btree (coalesce(upper(block_range), 2147483647)) where (coalesce(upper(block_range), 2147483647) < 2147483647)";
-    let exp = Parsed {
-        unique: false,
-        name: "token_block_range_closed",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[BlockRangeUpper],
-        cond: Some(Closed),
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "create index token_id_block_range_excl on sgd44.token using gist (\"id\", block_range)";
-    let exp = Parsed {
-        unique: false,
-        name: "token_id_block_range_excl",
-        nsp: "sgd44",
-        table: "token",
-        method: Gist,
-        columns: &[Name("id"), BlockRange],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql="create index attr_1_11_pool_owner on sgd411585.pool using btree (substring(\"owner\", 1, 64))";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_11_pool_owner",
-        nsp: "sgd411585",
-        table: "pool",
-        method: BTree,
-        columns: &[Prefix("owner", "substring")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "create index attr_1_20_pool_vault_id on sgd411585.pool using gist (\"vault_id\", block_range)";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_20_pool_vault_id",
-        nsp: "sgd411585",
-        table: "pool",
-        method: Gist,
-        columns: &[Name("vault_id"), BlockRange],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "create index attr_1_22_pool_tokens_list on sgd411585.pool using gin (\"tokens_list\")";
-    let exp = Parsed {
-        unique: false,
-        name: "attr_1_22_pool_tokens_list",
-        nsp: "sgd411585",
-        table: "pool",
-        method: Gin,
-        columns: &[Name("tokens_list")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "create index manual_partial_pool_total_liquidity on sgd411585.pool using btree (\"total_liquidity\") where (coalesce(upper(block_range), 2147483647) > 15635000)";
-    let exp = Parsed {
-        unique: false,
-        name: "manual_partial_pool_total_liquidity",
-        nsp: "sgd411585",
-        table: "pool",
-        method: BTree,
-        columns: &[Name("total_liquidity")],
-        cond: Some(Partial(15635000)),
-    };
-    parse_one(sql, exp);
-
-    let sql = "create index manual_swap_pool_timestamp_id on sgd217942.swap using btree (\"pool\", \"timestamp\", \"id\")";
-    let exp = Parsed {
-        unique: false,
-        name: "manual_swap_pool_timestamp_id",
-        nsp: "sgd217942",
-        table: "swap",
-        method: BTree,
-        columns: &[Name("pool"), Name("timestamp"), Name("id")],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid)";
-    let exp = Parsed {
-        unique: false,
-        name: "brin_scy",
-        nsp: "sgd314614",
-        table: "scy",
-        method: Brin,
-        columns: &[Block, Vid],
-        cond: None,
-    };
-    parse_one(sql, exp);
-
-    let sql = "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid) where (amount > 0)";
-    let exp = Parsed {
-        unique: false,
-        name: "brin_scy",
-        nsp: "sgd314614",
-        table: "scy",
-        method: Brin,
-        columns: &[Block, Vid],
-        cond: Some(TestCond::Unknown("amount > 0")),
-    };
-    parse_one(sql, exp);
-
-    let sql =
-        "CREATE INDEX manual_token_random_cond ON sgd44.token USING btree (\"decimals\") WHERE (decimals > (5)::numeric)";
-    let exp = Parsed {
-        unique: false,
-        name: "manual_token_random_cond",
-        nsp: "sgd44",
-        table: "token",
-        method: BTree,
-        columns: &[Name("decimals")],
-        cond: Some(TestCond::Unknown("decimals > (5)::numeric")),
-    };
-    parse_one(sql, exp);
+    #[test]
+    fn fields_exist_in_dest_out_of_order() {
+        let gql = "type Thing @entity {
+            id: Bytes!
+            early: String!
+            mid: String!
+            late: String!
+        }";
+        let layout = test_layout(gql);
+        let table = layout
+            .table_for_entity(&layout.input_schema.entity_type("Thing").unwrap())
+            .unwrap();
+
+        // Index references columns in reverse order vs the table definition.
+        // Table columns: id, early, mid, late
+        // Index columns: late, mid, early
+        // The consuming iterator finds 'late', advances past 'mid' and 'early',
+        // then can't find 'mid' because the iterator is already past it.
+        let index = CreateIndex::Parsed {
+            unique: false,
+            name: "test_reverse".to_string(),
+            nsp: "sgd0815".to_string(),
+            table: "thing".to_string(),
+            method: Method::BTree,
+            columns: vec![
+                Expr::Column("late".to_string()),
+                Expr::Column("mid".to_string()),
+                Expr::Column("early".to_string()),
+            ],
+            cond: None,
+            with: None,
+        };
+
+        assert!(
+            index.fields_exist_in_dest(table),
+            "index columns exist in table regardless of order"
+        );
+    }
 }
diff --git a/store/postgres/src/relational/prune.rs b/store/postgres/src/relational/prune.rs
index 4154eb5110a..2bfb7e6c9c9 100644
--- a/store/postgres/src/relational/prune.rs
+++ b/store/postgres/src/relational/prune.rs
@@ -1,34 +1,26 @@
-use std::{collections::HashMap, fmt::Write, sync::Arc};
+use std::{fmt::Write, future::Future, pin::Pin, sync::Arc};
 
 use diesel::{
     sql_query,
     sql_types::{BigInt, Integer},
 };
-use diesel_async::{
-    scoped_futures::{ScopedBoxFuture, ScopedFutureExt},
-    AsyncConnection, RunQueryDsl, SimpleAsyncConnection,
-};
+use diesel_async::{AsyncConnection, RunQueryDsl, SimpleAsyncConnection};
 use graph::{
     components::store::{PrunePhase, PruneReporter, PruneRequest, PruningStrategy, VersionStats},
-    prelude::{BlockNumber, CancelableError, CheapClone, StoreError, BLOCK_NUMBER_MAX},
-    schema::InputSchema,
-    slog::{warn, Logger},
+    prelude::{BLOCK_NUMBER_MAX, BlockNumber, CancelableError, CheapClone, StoreError},
+    slog::{Logger, warn},
 };
 use itertools::Itertools;
 
 use crate::{
-    catalog,
+    AsyncPgConnection, catalog,
     copy::BATCH_STATEMENT_TIMEOUT,
     deployment,
     relational::{Table, VID_COLUMN},
     vid_batcher::{VidBatcher, VidRange},
-    AsyncPgConnection,
 };
 
-use super::{
-    index::{load_indexes_from_table, CreateIndex, IndexList},
-    Catalog, Layout, Namespace,
-};
+use super::{Layout, Namespace};
 
 pub use status::{Phase, PruneState, PruneTableState, Viewer};
 
@@ -51,31 +43,21 @@ impl TablePair {
     /// different namespace so that the names of indexes etc. don't clash
     async fn create(
         conn: &mut AsyncPgConnection,
+        src_layout: &Layout,
         src: Arc<Table>,
-        src_nsp: Namespace,
         dst_nsp: Namespace,
-        schema: &InputSchema,
-        catalog: &Catalog,
     ) -> Result<Self, StoreError> {
+        let src_nsp = src_layout.site.namespace.clone();
         let dst = src.new_like(&dst_nsp, &src.name);
 
         let mut query = String::new();
         if catalog::table_exists(conn, dst_nsp.as_str(), &dst.name).await? {
             writeln!(query, "truncate table {};", dst.qualified_name)?;
         } else {
-            let mut list = IndexList {
-                indexes: HashMap::new(),
-            };
-            let indexes = load_indexes_from_table(conn, &src, src_nsp.as_str())
-                .await?
-                .into_iter()
-                .map(|index| index.with_nsp(dst_nsp.to_string()))
-                .collect::<Result<Vec<CreateIndex>, _>>()?;
-            list.indexes.insert(src.name.to_string(), indexes);
-
             // In case of pruning we don't do delayed creation of indexes,
             // as the asumption is that there is not that much data inserted.
-            dst.as_ddl(schema, catalog, Some(&list), &mut query)?;
+            let creat = src_layout.index_creator(false, false);
+            dst.as_ddl(&src_layout.input_schema, &creat, &mut query)?;
         }
         conn.batch_execute(&query).await?;
 
@@ -106,10 +88,14 @@ impl TablePair {
         let mut batcher = VidBatcher::load(conn, &self.src_nsp, &self.src, range).await?;
         tracker.start_copy_final(conn, &self.src, range).await?;
 
+        let src_name = self.src.qualified_name.clone();
+        let dst_name = self.dst.qualified_name.clone();
         while !batcher.finished() {
             let rows = batch_with_timeout(conn, &mut batcher, |conn, start, end| {
                 let column_list = column_list.cheap_clone();
-                async move {
+                let src_name = src_name.clone();
+                let dst_name = dst_name.clone();
+                Box::pin(async move {
                     // Page through all rows in `src` in batches of `batch_size`
                     // and copy the ones that are visible to queries at block
                     // heights between `earliest_block` and `final_block`, but
@@ -118,7 +104,7 @@ impl TablePair {
                     // The conditions on `block_range` are expressed redundantly
                     // to make more indexes useable
                     sql_query(format!(
-                    "/* controller=prune,phase=final,start_vid={start},batch_size={batch_size} */ \
+                        "/* controller=prune,phase=final,start_vid={start},batch_size={batch_size} */ \
                      insert into {dst}({column_list}) \
                      select {column_list} from {src} \
                       where lower(block_range) <= $2 \
@@ -127,10 +113,10 @@ impl TablePair {
                         and block_range && int4range($1, $2, '[]') \
                         and vid >= $3 and vid <= $4 \
                       order by vid",
-                    src = self.src.qualified_name,
-                    dst = self.dst.qualified_name,
-                    batch_size = end - start + 1,
-                ))
+                        src = src_name,
+                        dst = dst_name,
+                        batch_size = end - start + 1,
+                    ))
                     .bind::<Integer, _>(earliest_block)
                     .bind::<Integer, _>(final_block)
                     .bind::<BigInt, _>(start)
@@ -138,8 +124,7 @@ impl TablePair {
                     .execute(conn)
                     .await
                     .map_err(StoreError::from)
-                }
-                .scope_boxed()
+                })
             })
             .await?;
             let rows = rows.unwrap_or(0);
@@ -170,20 +155,24 @@ impl TablePair {
         let column_list = Arc::new(self.column_list());
 
         // Determine the last vid that we need to copy
-        let range = VidRange::for_prune(conn, &self.src, final_block + 1, BLOCK_NUMBER_MAX).await?;
+        let range = VidRange::for_prune(conn, &self.src, final_block, BLOCK_NUMBER_MAX).await?;
         let mut batcher = VidBatcher::load(conn, &self.src.nsp, &self.src, range).await?;
         tracker.start_copy_nonfinal(conn, &self.src, range).await?;
 
+        let src_name = self.src.qualified_name.clone();
+        let dst_name = self.dst.qualified_name.clone();
         while !batcher.finished() {
             let rows = batch_with_timeout(conn, &mut batcher, |conn, start, end| {
                 let column_list = column_list.cheap_clone();
-                async move {
-                // Page through all the rows in `src` in batches of
-                // `batch_size` that are visible to queries at block heights
-                // starting right after `final_block`. The conditions on
-                // `block_range` are expressed redundantly to make more
-                // indexes useable
-                sql_query(format!(
+                let src_name = src_name.clone();
+                let dst_name = dst_name.clone();
+                Box::pin(async move {
+                    // Page through all the rows in `src` in batches of
+                    // `batch_size` that are visible to queries at block heights
+                    // starting right after `final_block`. The conditions on
+                    // `block_range` are expressed redundantly to make more
+                    // indexes useable
+                    sql_query(format!(
                         "/* controller=prune,phase=nonfinal,start_vid={start},batch_size={batch_size} */ \
                      insert into {dst}({column_list}) \
                      select {column_list} from {src} \
@@ -191,8 +180,8 @@ impl TablePair {
                         and block_range && int4range($1, null) \
                         and vid >= $2 and vid <= $3 \
                       order by vid",
-                        dst = self.dst.qualified_name,
-                        src = self.src.qualified_name,
+                        dst = dst_name,
+                        src = src_name,
                         batch_size = end - start + 1,
                     ))
                     .bind::<Integer, _>(final_block)
@@ -201,7 +190,8 @@ impl TablePair {
                     .execute(conn)
                     .await
                     .map_err(StoreError::from)
-            }.scope_boxed()}).await?;
+                })
+            }).await?;
             let rows = rows.unwrap_or(0);
 
             tracker
@@ -248,8 +238,10 @@ impl TablePair {
 
         writeln!(query, "drop table {src_qname};")?;
         writeln!(query, "alter table {dst_qname} set schema {src_nsp}")?;
-        conn.transaction(|conn| conn.batch_execute(&query).scope_boxed())
-            .await?;
+        conn.transaction(async move |conn| {
+            conn.batch_execute(&query).await.map_err(StoreError::from)
+        })
+        .await?;
 
         Ok(())
     }
@@ -418,6 +410,17 @@ impl Layout {
         tracker.start(conn, req, &prunable_tables).await?;
         let dst_nsp = Namespace::prune(self.site.id);
         let mut recreate_dst_nsp = true;
+
+        // Go table by table; note that the subgraph writer can write in
+        // between the execution of the `with_lock` block below, and might
+        // therefore work with tables where some are pruned and some are not
+        // pruned yet. That does not affect correctness since we make no
+        // assumption about where the subgraph head is. If the subgraph
+        // advances during this loop, we might have an unnecessarily
+        // pessimistic but still safe value for `final_block`. We do assume
+        // that `final_block` is far enough from the subgraph head that it
+        // stays final even if a revert happens during this loop, but that
+        // is the definition of 'final'
         for (table, strat) in &prunable_tables {
             reporter.start_table(table.name.as_str());
             tracker.start_table(conn, table).await?;
@@ -427,15 +430,8 @@ impl Layout {
                         catalog::recreate_schema(conn, dst_nsp.as_str()).await?;
                         recreate_dst_nsp = false;
                     }
-                    let pair = TablePair::create(
-                        conn,
-                        table.cheap_clone(),
-                        self.site.namespace.clone(),
-                        dst_nsp.clone(),
-                        &self.input_schema,
-                        &self.catalog,
-                    )
-                    .await?;
+                    let pair = TablePair::create(conn, &self, table.cheap_clone(), dst_nsp.clone())
+                        .await?;
                     // Copy final entities. This can happen in parallel to indexing as
                     // that part of the table will not change
                     pair.copy_final_entities(
@@ -473,24 +469,27 @@ impl Layout {
                         VidBatcher::load(conn, &self.site.namespace, table, range).await?;
 
                     tracker.start_delete(conn, table, range, &batcher).await?;
+                    let qname = table.qualified_name.clone();
+                    let earliest_block = req.earliest_block;
                     while !batcher.finished() {
                         let rows = batch_with_timeout(conn, &mut batcher, |conn, start, end| {
-                            async move {
-                            sql_query(format!(
-                            "/* controller=prune,phase=delete,start_vid={start},batch_size={batch_size} */ \
-                             delete from {qname} \
-                                          where coalesce(upper(block_range), 2147483647) <= $1 \
-                                            and vid >= $2 and vid <= $3",
-                            qname = table.qualified_name,
-                            batch_size = end - start + 1
-                        ))
-                        .bind::<Integer, _>(req.earliest_block)
-                        .bind::<BigInt, _>(start)
-                        .bind::<BigInt, _>(end)
-                        .execute(conn)
-                        .await
-                        .map_err(StoreError::from)
-                        }.scope_boxed()}).await?;
+                            let qname = qname.clone();
+                            Box::pin(async move {
+                                sql_query(format!(
+                                "/* controller=prune,phase=delete,start_vid={start},batch_size={batch_size} */ \
+                                 delete from {qname} \
+                                              where coalesce(upper(block_range), 2147483647) <= $1 \
+                                                and vid >= $2 and vid <= $3",
+                                batch_size = end - start + 1
+                            ))
+                            .bind::<Integer, _>(earliest_block)
+                            .bind::<BigInt, _>(start)
+                            .bind::<BigInt, _>(end)
+                            .execute(conn)
+                            .await
+                            .map_err(StoreError::from)
+                            })
+                        }).await?;
                         let rows = rows.unwrap_or(0);
 
                         tracker
@@ -523,6 +522,14 @@ impl Layout {
     }
 }
 
+/// The type of per-batch query closure expected by `batch_with_timeout`.
+/// Callers wrap their async body in `Box::pin(async move { ... })` so that
+/// the future is type-erased and explicitly `Send`. This sidesteps the
+/// limitation that async closures don't implement `Fn`/`FnMut`, which
+/// would prevent us from calling the closure again on the timeout-retry
+/// path.
+type BatchQuery<'r, R> = Pin<Box<dyn Future<Output = Result<R, StoreError>> + Send + 'r>>;
+
 /// Perform a step with the `batcher`. If that step takes longer than
 /// `BATCH_STATEMENT_TIMEOUT`, kill the query and reset the batch size of
 /// the batcher to 1 and perform a step with that size which we assume takes
@@ -530,49 +537,48 @@ impl Layout {
 ///
 /// Doing this serves as a safeguard against very bad batch size estimations
 /// so that batches never take longer than `BATCH_SIZE_TIMEOUT`
-async fn batch_with_timeout<'a, 'conn, R, F>(
-    conn: &'conn mut AsyncPgConnection,
+async fn batch_with_timeout<R, F>(
+    conn: &mut AsyncPgConnection,
     batcher: &mut VidBatcher,
-    query: F,
+    mut query: F,
 ) -> Result<Option<R>, StoreError>
 where
     R: Send,
-    F: for<'r> Fn(
-            &'r mut AsyncPgConnection,
-            i64,
-            i64,
-        ) -> ScopedBoxFuture<'a, 'r, Result<R, StoreError>>
-        + Sync,
-    'a: 'conn,
+    F: for<'r> FnMut(&'r mut AsyncPgConnection, i64, i64) -> BatchQuery<'r, R> + Send,
 {
-    let res = batcher
-        .step(async |start, end| {
-            conn.transaction(|conn| {
-                async {
-                    if let Some(timeout) = BATCH_STATEMENT_TIMEOUT.as_ref() {
+    async fn run_attempt<R, F>(
+        conn: &mut AsyncPgConnection,
+        batcher: &mut VidBatcher,
+        query: &mut F,
+        with_timeout: bool,
+    ) -> Result<Option<R>, StoreError>
+    where
+        R: Send,
+        F: for<'r> FnMut(&'r mut AsyncPgConnection, i64, i64) -> BatchQuery<'r, R> + Send,
+    {
+        batcher
+            .step(async |start, end| {
+                conn.transaction(async |conn| {
+                    if with_timeout && let Some(timeout) = BATCH_STATEMENT_TIMEOUT.as_ref() {
                         conn.batch_execute(timeout).await?;
                     }
                     query(conn, start, end).await
-                }
-                .scope_boxed()
+                })
+                .await
             })
             .await
-        })
-        .await
-        .map(|(_, res)| res);
+            .map(|(_, res)| res)
+    }
 
-    if !matches!(res, Err(StoreError::StatementTimeout)) {
+    let res = run_attempt(conn, batcher, &mut query, true).await;
+    let Err(StoreError::StatementTimeout) = res else {
         return res;
-    }
+    };
 
+    // Timeout fired. Shrink to one row and retry without the timeout — at
+    // this size we expect the query to complete.
     batcher.set_batch_size(1);
-    batcher
-        .step(async |start, end| {
-            conn.transaction(|conn| query(conn, start, end).scope_boxed())
-                .await
-        })
-        .await
-        .map(|(_, res)| res)
+    run_attempt(conn, batcher, &mut query, false).await
 }
 
 mod status {
@@ -580,16 +586,16 @@ mod status {
 
     use chrono::{DateTime, Utc};
     use diesel::{
+        AsChangeset, ExpressionMethods as _, OptionalExtension, QueryDsl as _,
         deserialize::FromSql,
         dsl::insert_into,
         pg::{Pg, PgValue},
         query_builder::QueryFragment,
         serialize::{Output, ToSql},
         sql_types::Text,
-        table, update, AsChangeset, ExpressionMethods as _, OptionalExtension, QueryDsl as _,
+        table, update,
     };
-    use diesel_async::RunQueryDsl as _;
-    use diesel_async::{scoped_futures::ScopedFutureExt, AsyncConnection};
+    use diesel_async::{AsyncConnection, RunQueryDsl as _};
     use graph::{
         components::store::{PruneRequest, PruningStrategy, StoreResult},
         env::ENV_VARS,
@@ -597,9 +603,9 @@ mod status {
     };
 
     use crate::{
+        AsyncPgConnection, ConnectionPool,
         relational::{Layout, Table},
         vid_batcher::{VidBatcher, VidRange},
-        AsyncPgConnection, ConnectionPool,
     };
 
     table! {
@@ -792,40 +798,50 @@ mod status {
             use prune_state as ps;
             use prune_table_state as pts;
 
-            conn.transaction(|conn| {
-                async move {
-                    insert_into(ps::table)
+            let site_id = self.layout.site.id;
+            let run = self.run;
+            let first_block = req.first_block;
+            let final_block = req.final_block;
+            let latest_block = req.latest_block;
+            let history_blocks = req.history_blocks;
+            let table_entries: Vec<(String, &'static str)> = prunable_tables
+                .iter()
+                .map(|(table, strat)| {
+                    let strat = match strat {
+                        PruningStrategy::Rebuild => "r",
+                        PruningStrategy::Delete => "d",
+                    };
+                    (table.name.to_string(), strat)
+                })
+                .collect();
+
+            conn.transaction(async move |conn| {
+                insert_into(ps::table)
+                    .values((
+                        ps::id.eq(site_id),
+                        ps::run.eq(run),
+                        ps::first_block.eq(first_block),
+                        ps::final_block.eq(final_block),
+                        ps::latest_block.eq(latest_block),
+                        ps::history_blocks.eq(history_blocks),
+                        ps::started_at.eq(diesel::dsl::now),
+                    ))
+                    .execute(conn)
+                    .await?;
+
+                for (table_name, strat) in &table_entries {
+                    insert_into(pts::table)
                         .values((
-                            ps::id.eq(self.layout.site.id),
-                            ps::run.eq(self.run),
-                            ps::first_block.eq(req.first_block),
-                            ps::final_block.eq(req.final_block),
-                            ps::latest_block.eq(req.latest_block),
-                            ps::history_blocks.eq(req.history_blocks),
-                            ps::started_at.eq(diesel::dsl::now),
+                            pts::id.eq(site_id),
+                            pts::run.eq(run),
+                            pts::table_name.eq(table_name.as_str()),
+                            pts::strategy.eq(*strat),
+                            pts::phase.eq(Phase::Queued),
                         ))
                         .execute(conn)
                         .await?;
-
-                    for (table, strat) in prunable_tables {
-                        let strat = match strat {
-                            PruningStrategy::Rebuild => "r",
-                            PruningStrategy::Delete => "d",
-                        };
-                        insert_into(pts::table)
-                            .values((
-                                pts::id.eq(self.layout.site.id),
-                                pts::run.eq(self.run),
-                                pts::table_name.eq(table.name.as_str()),
-                                pts::strategy.eq(strat),
-                                pts::phase.eq(Phase::Queued),
-                            ))
-                            .execute(conn)
-                            .await?;
-                    }
-                    Ok(())
                 }
-                .scope_boxed()
+                Ok(())
             })
             .await
         }
diff --git a/store/postgres/src/relational/query_tests.rs b/store/postgres/src/relational/query_tests.rs
index 1b68ae5d0cc..3b4582c5b5b 100644
--- a/store/postgres/src/relational/query_tests.rs
+++ b/store/postgres/src/relational/query_tests.rs
@@ -2,16 +2,18 @@ use std::{collections::BTreeSet, sync::Arc};
 
 use diesel::{debug_query, pg::Pg};
 use graph::{
+    components::store::write::RowGroup,
     data_source::CausalityRegion,
-    prelude::{r, serde_json as json, DeploymentHash, EntityFilter},
+    entity,
+    prelude::{DeploymentHash, EntityFilter, r, serde_json as json},
     schema::InputSchema,
 };
 
 use crate::{
     block_range::BoundSide,
-    layout_for_tests::{make_dummy_site, Namespace},
+    layout_for_tests::{Namespace, make_dummy_site},
     relational::{Catalog, ColumnType, Layout},
-    relational_queries::{FindRangeQuery, FromColumnValue},
+    relational_queries::{FindRangeQuery, FromColumnValue, InsertQuery},
 };
 
 use crate::relational_queries::Filter;
@@ -197,3 +199,63 @@ fn test_id_type_casting(table: &crate::relational::Table, expected_cast: &str, t
         sql
     );
 }
+
+fn insert_sql_for_schema(gql: &str, entity_type_name: &str) -> String {
+    use graph::components::store::write::EntityModification;
+
+    let layout = test_layout(gql);
+    let schema = &layout.input_schema;
+    let et = schema.entity_type(entity_type_name).unwrap();
+    let table = layout.table_for_entity(&et).unwrap();
+
+    let mut entity = entity! { schema => id: "test1" };
+    entity.set_vid(1).unwrap();
+    let key = et.key(graph::data::store::Id::String("test1".into()));
+    let emod = EntityModification::Insert {
+        key,
+        data: Arc::new(entity),
+        block: 1,
+        end: None,
+    };
+
+    let mut group = RowGroup::new(et);
+    group.push(emod, 1).unwrap();
+
+    let chunks: Vec<_> = group.write_chunks(100).collect();
+    let chunk = &chunks[0];
+    let query = InsertQuery::new(table.as_ref(), chunk).unwrap();
+    debug_query::<Pg, _>(&query).to_string()
+}
+
+#[test]
+fn skip_duplicates_insert_generates_on_conflict() {
+    let schema = "
+    type Thing @entity(immutable: true, skipDuplicates: true) {
+        id: String!
+    }";
+    let sql = insert_sql_for_schema(schema, "Thing");
+    assert!(
+        sql.contains("ON CONFLICT"),
+        "Expected ON CONFLICT in SQL for skip_duplicates immutable table, got: {}",
+        sql
+    );
+    assert!(
+        sql.contains("DO NOTHING"),
+        "Expected DO NOTHING in SQL for skip_duplicates immutable table, got: {}",
+        sql
+    );
+}
+
+#[test]
+fn default_immutable_insert_has_no_on_conflict_skip_duplicates() {
+    let schema = "
+    type Thing @entity(immutable: true) {
+        id: String!
+    }";
+    let sql = insert_sql_for_schema(schema, "Thing");
+    assert!(
+        !sql.contains("ON CONFLICT"),
+        "Default immutable table should NOT have ON CONFLICT, got: {}",
+        sql
+    );
+}
diff --git a/store/postgres/src/relational/restore.rs b/store/postgres/src/relational/restore.rs
new file mode 100644
index 00000000000..081e6eebc3b
--- /dev/null
+++ b/store/postgres/src/relational/restore.rs
@@ -0,0 +1,473 @@
+//! Restore a subgraph deployment from a dump directory.
+//!
+//! The dump directory must contain:
+//! - `metadata.json` — deployment metadata and per-table state
+//! - `schema.graphql` — raw GraphQL schema text
+//! - Per-entity Parquet files in subdirectories
+
+use std::collections::BTreeSet;
+use std::fs;
+use std::path::Path;
+use std::sync::Arc;
+
+use diesel::dsl::update;
+use diesel::prelude::{ExpressionMethods, QueryDsl};
+use diesel_async::{RunQueryDsl, SimpleAsyncConnection};
+use graph::blockchain::BlockHash;
+use graph::components::store::RestoreReporter;
+use graph::data::subgraph::schema::{DeploymentCreate, SubgraphManifestEntity};
+use graph::prelude::{BlockPtr as GraphBlockPtr, StoreError};
+use graph::schema::{EntityType, InputSchema};
+use graph::semver::Version;
+
+use crate::AsyncPgConnection;
+use crate::catalog;
+use crate::deployment::create_deployment;
+use crate::dynds::DataSourcesTable;
+use crate::parquet::convert::{
+    load_clamps, record_batch_to_data_source_rows, record_batch_to_restore_rows,
+};
+use crate::parquet::reader::read_batches;
+use crate::primary::Site;
+use crate::relational::dump::{Metadata, TableInfo};
+use crate::relational::{Layout, Table, VID_COLUMN};
+use crate::relational_queries::InsertQuery;
+use crate::vid_batcher::VidRange;
+
+const DATA_SOURCES_TABLE: &str = "data_sources$";
+
+/// Convert a dump `BlockPtr` (hex hash string) to a graph `BlockPtr`.
+fn to_graph_block_ptr(bp: &super::dump::BlockPtr) -> Result<GraphBlockPtr, StoreError> {
+    let hash = BlockHash::try_from(bp.hash.as_str())
+        .map_err(|e| StoreError::InternalError(format!("invalid block hash '{}': {e}", bp.hash)))?;
+    Ok(GraphBlockPtr {
+        number: bp.number,
+        hash,
+    })
+}
+
+/// Query the current max(vid) for a table. Returns -1 if the table is empty.
+async fn current_max_vid(
+    conn: &mut AsyncPgConnection,
+    qualified_name: &str,
+) -> Result<i64, StoreError> {
+    let query = format!(
+        "select coalesce(min(vid), 0)::int8 as min_vid, \
+                coalesce(max(vid), -1)::int8 as max_vid \
+           from {}",
+        qualified_name
+    );
+    let range: VidRange = diesel::sql_query(&query)
+        .get_result(conn)
+        .await
+        .map_err(StoreError::from)?;
+    Ok(range.max)
+}
+
+/// Import a single entity table from Parquet chunks.
+///
+/// Supports resumability: checks the current max(vid) in the DB table
+/// and skips already-imported rows.
+async fn import_entity_table(
+    conn: &mut AsyncPgConnection,
+    table: &Table,
+    table_info: &TableInfo,
+    dir: &Path,
+    reporter: &mut dyn RestoreReporter,
+) -> Result<usize, StoreError> {
+    let table_name = table.object.as_str();
+    let total_rows: usize = table_info.chunks.iter().map(|c| c.row_count).sum();
+
+    if table_info.chunks.is_empty() || table_info.max_vid < 0 {
+        reporter.start_table(table_name, 0);
+        reporter.finish_table(table_name, 0);
+        return Ok(0);
+    }
+
+    let max_vid_db = current_max_vid(conn, table.qualified_name.as_str()).await?;
+    if max_vid_db >= table_info.max_vid {
+        reporter.skip_table(table_name);
+        return Ok(0);
+    }
+
+    reporter.start_table(table_name, total_rows);
+
+    // Load clamps (if any) so we can patch block_range_end during import
+    let clamp_map = if !table_info.clamps.is_empty() {
+        load_clamps(dir, &table_info.clamps)?
+    } else {
+        std::collections::HashMap::new()
+    };
+
+    let chunk_size = InsertQuery::chunk_size(table);
+    let mut total_inserted = 0usize;
+
+    for chunk_info in &table_info.chunks {
+        // Skip chunks that are fully imported
+        if chunk_info.max_vid <= max_vid_db {
+            continue;
+        }
+
+        let chunk_path = dir.join(&chunk_info.file);
+        let batches = read_batches(&chunk_path)?;
+
+        for batch in batches {
+            let batch = batch?;
+            let mut rows = record_batch_to_restore_rows(&batch, table)?;
+
+            // Filter out already-imported rows (for boundary chunks on resume)
+            if max_vid_db >= 0 {
+                rows.retain(|row| row.vid > max_vid_db);
+            }
+
+            if rows.is_empty() {
+                continue;
+            }
+
+            // Apply clamps: update block_range_end for rows that were
+            // clamped after the chunk was originally written
+            if !clamp_map.is_empty() {
+                for row in &mut rows {
+                    if let Some(&end) = clamp_map.get(&row.vid) {
+                        row.block_range_end = Some(Some(end));
+                    }
+                }
+            }
+
+            // Split into InsertQuery-sized chunks and execute
+            for chunk in rows.chunks(chunk_size) {
+                InsertQuery::for_restore(table, chunk)?
+                    .execute(conn)
+                    .await?;
+                total_inserted += chunk.len();
+                reporter.batch_imported(table_name, chunk.len());
+            }
+        }
+    }
+
+    reporter.finish_table(table_name, total_inserted);
+    Ok(total_inserted)
+}
+
+/// Import the `data_sources$` table from Parquet chunks.
+async fn import_data_sources(
+    conn: &mut AsyncPgConnection,
+    ds_table: &DataSourcesTable,
+    table_info: &TableInfo,
+    dir: &Path,
+    reporter: &mut dyn RestoreReporter,
+) -> Result<usize, StoreError> {
+    let total_rows: usize = table_info.chunks.iter().map(|c| c.row_count).sum();
+
+    if table_info.chunks.is_empty() || table_info.max_vid < 0 {
+        reporter.start_data_sources(0);
+        reporter.finish_data_sources(0);
+        return Ok(0);
+    }
+
+    let qualified = ds_table.qualified_name();
+    let max_vid_db = current_max_vid(conn, qualified).await?;
+    if max_vid_db >= table_info.max_vid {
+        reporter.skip_table(DATA_SOURCES_TABLE);
+        return Ok(0);
+    }
+
+    reporter.start_data_sources(total_rows);
+
+    // Load clamps for data_sources$ if any
+    let clamp_map = if !table_info.clamps.is_empty() {
+        load_clamps(dir, &table_info.clamps)?
+    } else {
+        std::collections::HashMap::new()
+    };
+
+    let mut total_inserted = 0usize;
+
+    for chunk_info in &table_info.chunks {
+        if chunk_info.max_vid <= max_vid_db {
+            continue;
+        }
+
+        let chunk_path = dir.join(&chunk_info.file);
+        let batches = read_batches(&chunk_path)?;
+
+        for batch in batches {
+            let batch = batch?;
+            let mut rows = record_batch_to_data_source_rows(&batch)?;
+
+            if max_vid_db >= 0 {
+                rows.retain(|row| row.vid > max_vid_db);
+            }
+
+            // Apply clamps
+            if !clamp_map.is_empty() {
+                for row in &mut rows {
+                    if let Some(&end) = clamp_map.get(&row.vid) {
+                        row.block_range_end = Some(end);
+                    }
+                }
+            }
+
+            let inserted = ds_table.insert_rows(conn, &rows).await?;
+            total_inserted += inserted;
+            reporter.batch_imported(DATA_SOURCES_TABLE, inserted);
+        }
+    }
+
+    reporter.finish_data_sources(total_inserted);
+    Ok(total_inserted)
+}
+
+/// Restore a subgraph deployment's schema and metadata from a dump
+/// directory.
+///
+/// This creates the deployment metadata rows (`subgraphs.head`,
+/// `subgraphs.deployment`, `subgraphs.subgraph_manifest`), entity
+/// tables, and optionally the `data_sources$` table.
+///
+/// The caller is responsible for:
+/// - Reading `metadata.json` via `Metadata::from_file()`
+/// - Site allocation and conflict resolution (force-drop)
+/// - Obtaining the right shard connection
+///
+/// Entity data import and finalization are handled separately.
+pub async fn create_schema(
+    conn: &mut AsyncPgConnection,
+    site: Arc<Site>,
+    metadata: &Metadata,
+    dir: &Path,
+) -> Result<Layout, StoreError> {
+    // 1. Read schema.graphql
+    let schema_path = dir.join("schema.graphql");
+    let schema_text = fs::read_to_string(&schema_path).map_err(|e| {
+        StoreError::InternalError(format!("failed to read {}: {e}", schema_path.display()))
+    })?;
+
+    // 2. Read subgraph.yaml (optional)
+    let yaml_path = dir.join("subgraph.yaml");
+    let raw_yaml = fs::read_to_string(&yaml_path).ok();
+
+    // 3. Parse schema
+    let spec_version = Version::parse(&metadata.manifest.spec_version).map_err(|e| {
+        StoreError::InternalError(format!(
+            "invalid spec_version '{}': {e}",
+            metadata.manifest.spec_version
+        ))
+    })?;
+    let input_schema = InputSchema::parse(&spec_version, &schema_text, site.deployment.clone())?;
+
+    // 4. Resolve entities_with_causality_region from names
+    let entities_with_causality_region: BTreeSet<EntityType> = metadata
+        .manifest
+        .entities_with_causality_region
+        .iter()
+        .map(|name| input_schema.entity_type(name))
+        .collect::<Result<_, _>>()
+        .map_err(StoreError::from)?;
+
+    // 5. Build SubgraphManifestEntity for create_deployment
+    let manifest_entity = SubgraphManifestEntity {
+        spec_version: metadata.manifest.spec_version.clone(),
+        description: metadata.manifest.description.clone(),
+        repository: metadata.manifest.repository.clone(),
+        features: metadata.manifest.features.clone(),
+        schema: schema_text,
+        raw_yaml,
+        entities_with_causality_region: entities_with_causality_region.iter().cloned().collect(),
+        history_blocks: metadata.manifest.history_blocks,
+    };
+
+    let start_block = metadata
+        .start_block
+        .as_ref()
+        .map(to_graph_block_ptr)
+        .transpose()?;
+    let graft_block = metadata
+        .graft_block
+        .as_ref()
+        .map(to_graph_block_ptr)
+        .transpose()?;
+
+    let create = DeploymentCreate {
+        manifest: manifest_entity,
+        start_block,
+        graft_base: metadata.graft_base.clone(),
+        graft_block,
+        debug_fork: metadata.debug_fork.clone(),
+        history_blocks_override: None,
+    };
+
+    // 6. Create deployment metadata rows
+    create_deployment(conn, &site, create, false, false).await?;
+
+    // 7. Create database schema and entity tables
+    let query = format!("create schema {}", &site.namespace);
+    conn.batch_execute(&query).await?;
+
+    let layout = Layout::create_relational_schema(
+        conn,
+        site.clone(),
+        &input_schema,
+        entities_with_causality_region,
+    )
+    .await?;
+
+    // 8. Create data_sources$ table if present in dump
+    if metadata.tables.contains_key(DATA_SOURCES_TABLE) {
+        let ds_table = DataSourcesTable::new(site.namespace.clone());
+        let ddl = ds_table.as_ddl();
+        conn.batch_execute(&ddl).await?;
+    }
+
+    Ok(layout)
+}
+
+/// Import entity data and data_sources$ from Parquet files into the
+/// database tables created by `create_schema`.
+///
+/// This is resumable: if interrupted, it can be called again and will
+/// skip already-imported rows by checking the current max(vid) in each
+/// table.
+pub async fn import_data(
+    conn: &mut AsyncPgConnection,
+    layout: &Layout,
+    metadata: &Metadata,
+    dir: &Path,
+    reporter: &mut dyn RestoreReporter,
+) -> Result<(), StoreError> {
+    // Import entity tables (sorted by name for determinism)
+    let mut table_names: Vec<_> = metadata
+        .tables
+        .keys()
+        .filter(|name| name.as_str() != DATA_SOURCES_TABLE)
+        .collect();
+    table_names.sort();
+
+    let table_count = table_names.len();
+    reporter.start(metadata.deployment.as_str(), table_count);
+
+    for table_name in table_names {
+        let table_info = &metadata.tables[table_name];
+        let table = layout
+            .tables
+            .values()
+            .find(|t| t.object.as_str() == table_name)
+            .ok_or_else(|| {
+                StoreError::InternalError(format!(
+                    "table '{}' from dump not found in layout",
+                    table_name,
+                ))
+            })?;
+        import_entity_table(conn, table, table_info, dir, reporter).await?;
+    }
+
+    // Import data_sources$ if present
+    if let Some(ds_info) = metadata.tables.get(DATA_SOURCES_TABLE) {
+        let ds_table = DataSourcesTable::new(layout.site.namespace.clone());
+        import_data_sources(conn, &ds_table, ds_info, dir, reporter).await?;
+    }
+
+    Ok(())
+}
+
+/// Finalize a restored deployment by resetting vid sequences and setting
+/// the head block pointer.
+///
+/// This must be called after `import_data` has completed successfully.
+/// Setting the head block is the very last operation — it marks the
+/// deployment as "ready".
+pub async fn finalize(
+    conn: &mut AsyncPgConnection,
+    layout: &Layout,
+    metadata: &Metadata,
+    reporter: &mut dyn RestoreReporter,
+) -> Result<(), StoreError> {
+    reporter.start_finalize();
+
+    let nsp = layout.site.namespace.as_str();
+
+    // 1. Reset vid sequences for entity tables that use bigserial.
+    //    Tables where has_vid_seq() is true use plain bigint (no sequence).
+    let mut table_names: Vec<_> = metadata
+        .tables
+        .keys()
+        .filter(|name| name.as_str() != DATA_SOURCES_TABLE)
+        .collect();
+    table_names.sort();
+
+    for table_name in table_names {
+        let table_info = &metadata.tables[table_name];
+        if table_info.max_vid < 0 {
+            continue;
+        }
+
+        let table = layout
+            .tables
+            .values()
+            .find(|t| t.object.as_str() == table_name)
+            .ok_or_else(|| {
+                StoreError::InternalError(format!(
+                    "table '{}' from dump not found in layout",
+                    table_name,
+                ))
+            })?;
+
+        if table.object.has_vid_seq() {
+            continue;
+        }
+
+        let vid_seq = catalog::seq_name(&table.name, VID_COLUMN);
+        let query = format!(
+            "SELECT setval('\"{nsp}\".\"{vid_seq}\"', {})",
+            table_info.max_vid
+        );
+        conn.batch_execute(&query).await.map_err(|e| {
+            StoreError::InternalError(format!("reset vid seq for {table_name}: {e}"))
+        })?;
+    }
+
+    // 2. Reset data_sources$ vid sequence if present
+    if let Some(ds_info) = metadata.tables.get(DATA_SOURCES_TABLE)
+        && ds_info.max_vid >= 0
+    {
+        let qualified = format!("\"{nsp}\".\"{DATA_SOURCES_TABLE}\"");
+        let query = format!(
+            "SELECT setval(pg_get_serial_sequence('{qualified}', 'vid'), {})",
+            ds_info.max_vid
+        );
+        conn.batch_execute(&query)
+            .await
+            .map_err(|e| StoreError::InternalError(format!("reset data_sources$ vid seq: {e}")))?;
+    }
+
+    // 3. Update earliest_block_number (may differ from start_block after
+    //    pruning) and set the head block pointer. Setting the head block
+    //    is the very last step: it makes the deployment "ready".
+    {
+        use crate::deployment::deployment as d;
+        use crate::deployment::head as h;
+
+        update(d::table.filter(d::id.eq(layout.site.id)))
+            .set(d::earliest_block_number.eq(metadata.earliest_block_number))
+            .execute(conn)
+            .await
+            .map_err(StoreError::from)?;
+
+        if let Some(head) = &metadata.head_block {
+            let head_ptr = to_graph_block_ptr(head)?;
+            update(h::table.filter(h::id.eq(layout.site.id)))
+                .set((
+                    h::block_number.eq(head_ptr.number),
+                    h::block_hash.eq(head_ptr.hash_slice()),
+                    h::entity_count.eq(metadata.entity_count as i64),
+                ))
+                .execute(conn)
+                .await
+                .map_err(StoreError::from)?;
+        }
+    }
+
+    reporter.finish_finalize();
+
+    Ok(())
+}
diff --git a/store/postgres/src/relational/rollup.rs b/store/postgres/src/relational/rollup.rs
index c2929f6ca05..2c1ae754e95 100644
--- a/store/postgres/src/relational/rollup.rs
+++ b/store/postgres/src/relational/rollup.rs
@@ -53,6 +53,9 @@
 //!                    group by id, timestamp, <dimensions>)
 //!   select id, timestamp, <dimensions>, <aggregates> from combined
 //! ```
+//!
+//! see also: #rollup-query-indexing for how we make sure that the `prev`
+//! query is efficient
 use std::collections::HashSet;
 use std::fmt;
 use std::ops::Range;
@@ -73,8 +76,8 @@ use graph::sqlparser::ast as p;
 use graph::sqlparser::parser::ParserError;
 use itertools::Itertools;
 
-use crate::relational::Table;
 use crate::AsyncPgConnection;
+use crate::relational::Table;
 
 use super::{Column, SqlName};
 
@@ -229,13 +232,18 @@ impl<'a> Agg<'a> {
 #[derive(Debug, Clone)]
 pub(crate) struct Rollup {
     pub(crate) interval: AggregationInterval,
-    #[allow(dead_code)]
-    agg_table: Arc<Table>,
+    pub(crate) agg_table: Arc<Table>,
     insert_sql: String,
     /// A query that determines the last time a rollup was done. The query
     /// finds the latest timestamp in the aggregation table and adds the
     /// length of the aggregation interval to deduce the last rollup time
     last_rollup_sql: String,
+
+    /// The SQL query that loads the current, partially filled bucket.
+    ///
+    /// Contains a `/*FILTERS*/` comment that can be replaced with additional filters like `and c.block$ <= $1`.
+    /// The filters are applied to the SQL query that loads the time series entities, not to the aggregated values.
+    pub(crate) select_current_sql: String,
 }
 
 impl Rollup {
@@ -264,11 +272,15 @@ impl Rollup {
         let mut insert_sql = String::new();
         sql.insert(&mut insert_sql)?;
         let last_rollup_sql = sql.last_rollup();
+        let mut select_current_sql = String::new();
+        sql.select_current(&mut select_current_sql)?;
+
         Ok(Self {
             interval,
             agg_table,
             insert_sql,
             last_rollup_sql,
+            select_current_sql,
         })
     }
 
@@ -363,23 +375,22 @@ impl<'a> RollupSql<'a> {
     ///   $2: end timestamp (exclusive)
     ///   $3: block number
     fn select_bucket(&self, with_block: bool, w: &mut dyn fmt::Write) -> fmt::Result {
-        let max_id = match self.agg_table.primary_key().column_type.id_type() {
-            Ok(IdType::Bytes) => "max(id::text)::bytea",
-            Ok(IdType::String) | Ok(IdType::Int8) => "max(id)",
-            Err(_) => unreachable!("we make sure that the primary key has an id_type"),
-        };
-        write!(w, "select {max_id} as id, timestamp")?;
+        write!(
+            w,
+            "select {max_id} as id, timestamp",
+            max_id = self.max_id(),
+        )?;
         if with_block {
             write!(w, ", $3")?;
         }
-        write_dims(self.dimensions, w)?;
-        comma_sep(self.aggregates, w, |w, agg| agg.aggregate("id", w))?;
+        write_dims(self.dimensions, w, true)?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.aggregate("id", w))?;
         let secs = self.interval.as_duration().as_secs();
         write!(
             w,
             " from (select id, date_bin('{secs}s', timestamp, 'epoch'::timestamptz) as timestamp"
         )?;
-        write_dims(self.dimensions, w)?;
+        write_dims(self.dimensions, w, true)?;
         let agg_srcs: Vec<&str> = {
             let mut agg_srcs: Vec<_> = self
                 .aggregates
@@ -392,7 +403,7 @@ impl<'a> RollupSql<'a> {
             agg_srcs.dedup();
             agg_srcs
         };
-        comma_sep(agg_srcs, w, |w, col: &str| write!(w, "\"{}\"", col))?;
+        comma_sep(agg_srcs, w, true, |w, col: &str| write!(w, "\"{}\"", col))?;
         write!(
             w,
             " from {src_table} where {src_table}.timestamp >= $1 and {src_table}.timestamp < $2",
@@ -403,7 +414,7 @@ impl<'a> RollupSql<'a> {
             " order by {src_table}.timestamp) data group by timestamp",
             src_table = self.src_table
         )?;
-        write_dims(self.dimensions, w)
+        write_dims(self.dimensions, w, true)
     }
 
     fn select(&self, w: &mut dyn fmt::Write) -> fmt::Result {
@@ -420,8 +431,8 @@ impl<'a> RollupSql<'a> {
             "insert into {}(id, timestamp, block$",
             self.agg_table.qualified_name
         )?;
-        write_dims(self.dimensions, w)?;
-        comma_sep(self.aggregates, w, |w, agg| {
+        write_dims(self.dimensions, w, true)?;
+        comma_sep(self.aggregates, w, true, |w, agg| {
             write!(w, "\"{}\"", agg.agg_column.name)
         })?;
         write!(w, ") ")
@@ -440,12 +451,15 @@ impl<'a> RollupSql<'a> {
 
     /// Generate a query that selects the previous value of the aggregates
     /// for any group keys that appear in `bucket`
+    ///
+    /// see also: #rollup-query-indexing Changes to this query might need to
+    /// reconsider the index that we build to make this query efficient
     fn select_prev(&self, w: &mut dyn fmt::Write) -> fmt::Result {
         write!(w, "select bucket.id, bucket.timestamp")?;
-        comma_sep(self.dimensions, w, |w, col| {
+        comma_sep(self.dimensions, w, true, |w, col| {
             write!(w, "bucket.\"{}\"", col.name)
         })?;
-        comma_sep(self.aggregates, w, |w, agg| agg.prev_agg(w))?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.prev_agg(w))?;
         write!(w, " from bucket cross join lateral (")?;
         write!(w, "select * from {} prev", self.agg_table.qualified_name)?;
         write!(w, " where prev.timestamp < $1")?;
@@ -461,14 +475,16 @@ impl<'a> RollupSql<'a> {
 
     fn select_combined(&self, w: &mut dyn fmt::Write) -> fmt::Result {
         write!(w, "select id, timestamp")?;
-        comma_sep(self.dimensions, w, |w, col| write!(w, "\"{}\"", col.name))?;
-        comma_sep(self.aggregates, w, |w, agg| agg.combine("seq", w))?;
+        comma_sep(self.dimensions, w, true, |w, col| {
+            write!(w, "\"{}\"", col.name)
+        })?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.combine("seq", w))?;
         write!(
             w,
             " from (select *, 1 as seq from prev union all select *, 2 as seq from bucket) u "
         )?;
         write!(w, " group by id, timestamp")?;
-        write_dims(self.dimensions, w)?;
+        write_dims(self.dimensions, w, true)?;
         Ok(())
     }
 
@@ -501,8 +517,8 @@ impl<'a> RollupSql<'a> {
         write!(w, " ")?;
         self.insert_into(w)?;
         write!(w, "select id, timestamp, $3 as block$")?;
-        write_dims(self.dimensions, w)?;
-        comma_sep(self.aggregates, w, |w, agg| {
+        write_dims(self.dimensions, w, true)?;
+        comma_sep(self.aggregates, w, true, |w, agg| {
             write!(w, "\"{}\"", agg.agg_column.name)
         })?;
         write!(w, " from combined")
@@ -528,16 +544,186 @@ impl<'a> RollupSql<'a> {
             secs, self.agg_table.qualified_name
         )
     }
+
+    fn max_id(&self) -> &'static str {
+        match self.agg_table.primary_key().column_type.id_type() {
+            Ok(IdType::Bytes) => "max(id::text)::bytea",
+            Ok(IdType::String) | Ok(IdType::Int8) => "max(id)",
+            Err(_) => unreachable!("we make sure that the primary key has an id_type"),
+        }
+    }
+
+    /// Generates the SQL query that loads the current, partially filled bucket.
+    ///
+    /// The generated SQL query contains a `/*FILTERS*/` comment that can be replaced
+    /// with additional filters like `and c.block$ <= $1`. The filters are applied to
+    /// the SQL query that loads the time series entities, not to the aggregated values.
+    fn select_current(&self, w: &mut dyn fmt::Write) -> fmt::Result {
+        if self.has_cumulative_aggregates() {
+            self.select_current_bucket_cumulative(w)?;
+        } else {
+            self.select_current_bucket(w)?;
+        }
+        Ok(())
+    }
+
+    /// Generates the SQL query that loads the current, partially filled bucket when
+    /// the aggregation has cumulative aggregates.
+    ///
+    /// The generated query has the following structure:
+    ///
+    ///   with bucket as (
+    ///     {select current bucket query}
+    ///   ), prev as (
+    ///     select
+    ///         bucket.id,
+    ///         bucket.vid,
+    ///         bucket.block$
+    ///         bucket.timestamp,
+    ///         {dimensions},
+    ///         {prev aggregates}
+    ///     from bucket cross join lateral (
+    ///         select * from {agg table} where timestamp < {last rollup timestamp}
+    ///         order by timestamp desc limit 1
+    ///     )
+    ///   ), combined (
+    ///    {select * from bucket and prev}
+    ///    group by
+    ///        id,
+    ///        vid,
+    ///        block$,
+    ///        timestamp,
+    ///        {dimensions}
+    ///   )
+    ///   select
+    ///     id,
+    ///     vid,
+    ///     block$,
+    ///     timestamp,
+    ///     {dimensions},
+    ///     {aggregates}
+    ///   from combined;
+    fn select_current_bucket_cumulative(&self, w: &mut dyn fmt::Write) -> fmt::Result {
+        write!(w, "with bucket as (")?;
+        self.select_current_bucket(w)?;
+        write!(w, "), prev as (")?;
+        write!(
+            w,
+            "select bucket.id, bucket.vid, bucket.block$, bucket.timestamp"
+        )?;
+        comma_sep(self.dimensions, w, true, |w, col| {
+            write!(w, "bucket.\"{}\"", col.name)
+        })?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.prev_agg(w))?;
+        write!(w, " from bucket cross join lateral (")?;
+        write!(w, "select * from {} prev", self.agg_table.qualified_name)?;
+        write!(
+            w,
+            " where prev.timestamp < coalesce(({last_rollup}), '-infinity'::timestamptz)",
+            last_rollup = self.last_rollup()
+        )?;
+        for dim in self.dimensions {
+            write!(
+                w,
+                " and prev.\"{name}\" = bucket.\"{name}\"",
+                name = dim.name
+            )?;
+        }
+        write!(w, " order by prev.timestamp desc limit 1) prev")?;
+        write!(w, "), combined as (")?;
+        write!(w, "select id, vid, block$, timestamp")?;
+        comma_sep(self.dimensions, w, true, |w, col| {
+            write!(w, "\"{}\"", col.name)
+        })?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.combine("seq", w))?;
+        write!(
+            w,
+            " from (select *, 1 as seq from prev union all select *, 2 as seq from bucket) u "
+        )?;
+        write!(w, " group by id, vid, block$, timestamp")?;
+        write_dims(self.dimensions, w, true)?;
+        write!(w, ")")?;
+        write!(w, "select id, vid, block$, timestamp")?;
+        write_dims(self.dimensions, w, true)?;
+        comma_sep(self.aggregates, w, true, |w, agg| {
+            write!(w, "\"{}\"", agg.agg_column.name)
+        })?;
+        write!(w, " from combined as c")
+    }
+
+    /// Generates the SQL query that loads the current, partially filled bucket when
+    /// the aggregation does not have cumulative aggregates.
+    ///
+    /// The generated query has the following structure:
+    ///
+    ///   select
+    ///     max(id) as id,
+    ///     max(vid) as vid,
+    ///     max(block$) as block$,
+    ///     max(timestamp) as timestamp,
+    ///     {dimensions},
+    ///     {aggregates}
+    ///   from
+    ///     ({select timeseries entities} where timestamp >= {last rollup timestamp} {/*FILTERS*/})
+    ///   group by
+    ///     {dimensions};
+    fn select_current_bucket(&self, w: &mut dyn fmt::Write) -> fmt::Result {
+        write!(
+            w,
+            "select {max_id} as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp",
+            max_id = self.max_id(),
+        )?;
+        write_dims(self.dimensions, w, true)?;
+        comma_sep(self.aggregates, w, true, |w, agg| agg.aggregate("id", w))?;
+        write!(
+            w,
+            " from (select id, vid, block$, date_bin('{secs}s', timestamp, 'epoch'::timestamptz) as timestamp",
+            secs = self.interval.as_duration().as_secs(),
+        )?;
+        write_dims(self.dimensions, w, true)?;
+        let agg_srcs: Vec<&str> = {
+            let mut agg_srcs: Vec<_> = self
+                .aggregates
+                .iter()
+                .flat_map(|agg| &agg.src_columns)
+                .copied()
+                .filter(|&col| col != "id" && col != "timestamp")
+                .collect();
+            agg_srcs.sort();
+            agg_srcs.dedup();
+            agg_srcs
+        };
+        comma_sep(agg_srcs, w, true, |w, col: &str| write!(w, "\"{}\"", col))?;
+        write!(
+            w,
+            " from {src_table} as c where c.timestamp >= coalesce(({last_rollup}), '-infinity'::timestamptz)",
+            src_table = self.src_table,
+            last_rollup = self.last_rollup(),
+        )?;
+        write!(w, " /*FILTERS*/) c")?;
+        if !self.dimensions.is_empty() {
+            write!(w, " group by ")?;
+            write_dims(self.dimensions, w, false)?;
+        }
+        Ok(())
+    }
 }
 
 /// Write the elements in `list` separated by commas into `w`. The list
 /// elements are written by calling `out` with each of them.
-fn comma_sep<T, F>(list: impl IntoIterator<Item = T>, w: &mut dyn fmt::Write, out: F) -> fmt::Result
+fn comma_sep<T, F>(
+    list: impl IntoIterator<Item = T>,
+    w: &mut dyn fmt::Write,
+    comma_prefix: bool,
+    out: F,
+) -> fmt::Result
 where
     F: Fn(&mut dyn fmt::Write, T) -> fmt::Result,
 {
-    for elem in list {
-        write!(w, ", ")?;
+    for (i, elem) in list.into_iter().enumerate() {
+        if comma_prefix || i != 0 {
+            write!(w, ", ")?;
+        }
         out(w, elem)?;
     }
     Ok(())
@@ -545,8 +731,10 @@ where
 
 /// Write the names of the columns in `dimensions` into `w` as a
 /// comma-separated list of quoted column names.
-fn write_dims(dimensions: &[&Column], w: &mut dyn fmt::Write) -> fmt::Result {
-    comma_sep(dimensions, w, |w, col| write!(w, "\"{}\"", col.name))
+fn write_dims(dimensions: &[&Column], w: &mut dyn fmt::Write, comma_prefix: bool) -> fmt::Result {
+    comma_sep(dimensions, w, comma_prefix, |w, col| {
+        write!(w, "\"{}\"", col.name)
+    })
 }
 
 #[cfg(test)]
@@ -557,8 +745,8 @@ mod tests {
     use itertools::Itertools as _;
 
     use crate::{
-        layout_for_tests::{make_dummy_site, Namespace},
-        relational::{rollup::Rollup, Catalog, Layout},
+        layout_for_tests::{Namespace, make_dummy_site},
+        relational::{Catalog, Layout, rollup::Rollup},
     };
 
     // Check that the two strings are the same after replacing runs of
@@ -707,6 +895,87 @@ mod tests {
              order by "sgd007"."data".timestamp) data \
         group by timestamp"#;
 
+        const STATS_HOUR_CURRENT_SQL: &str = r#"\
+        select max(id) as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp, \
+               "token", sum("price") as "sum", max("amount") as "max" \
+          from (select id, vid, block$, date_bin('3600s', timestamp, 'epoch'::timestamptz) as timestamp, \
+                       "token", "amount", "price" \
+                  from "sgd007"."data" as c \
+                 where c.timestamp >= coalesce((select max(timestamp) + '3601 s'::interval as last_rollup \
+                       from "sgd007"."stats_hour"), '-infinity'::timestamptz) /*FILTERS*/) c \
+         group by "token""#;
+
+        const STATS_DAY_CURRENT_SQL: &str = r#"\
+        select max(id) as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp, \
+               "token", sum("price") as "sum", max("amount") as "max" \
+          from (select id, vid, block$, date_bin('86400s', timestamp, 'epoch'::timestamptz) as timestamp, \
+                       "token", "amount", "price" \
+                  from "sgd007"."data" as c \
+                 where c.timestamp >= coalesce((select max(timestamp) + '86401 s'::interval as last_rollup \
+                       from "sgd007"."stats_day"), '-infinity'::timestamptz) /*FILTERS*/) c \
+         group by "token""#;
+
+        const TOTAL_CURRENT_SQL: &str = r#"\
+        select max(id) as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp, \
+               max("price") as "max", max("price" * "amount") as "max_value" \
+          from (select id, vid, block$, date_bin('86400s', timestamp, 'epoch'::timestamptz) as timestamp, \
+                       "amount", "price" \
+                  from "sgd007"."data" as c \
+                 where c.timestamp >= coalesce((select max(timestamp) + '86401 s'::interval as last_rollup \
+                       from "sgd007"."total_stats_day"), '-infinity'::timestamptz) /*FILTERS*/) c"#;
+
+        const OPEN_CLOSE_CURRENT_SQL: &str = r#"\
+        select max(id) as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp, \
+               arg_min_numeric(("price", id)) as "open", \
+               arg_max_numeric(("price", id)) as "close", \
+               arg_min_int4(("amount", id)) as "first_amt" \
+          from (select id, vid, block$, date_bin('86400s', timestamp, 'epoch'::timestamptz) as timestamp, \
+                       "amount", "price" \
+                  from "sgd007"."data" as c \
+                 where c.timestamp >= coalesce((select max(timestamp) + '86401 s'::interval as last_rollup \
+                       from "sgd007"."open_close_day"), '-infinity'::timestamptz) /*FILTERS*/) c"#;
+
+        const LIFETIME_CURRENT_SQL: &str = r#"
+        with bucket as (select max(id) as id, max(vid) as vid, max(block$) as block$,
+               max(timestamp) as timestamp,
+               count(*) as "count", sum("amount") as "sum",
+               count(*) as "total_count", sum("amount") as "total_sum"
+          from (select id, vid, block$,
+                       date_bin('86400s', timestamp, 'epoch'::timestamptz) as timestamp,
+                       "amount"
+                  from "sgd007"."data" as c
+                 where c.timestamp >= coalesce((select max(timestamp) + '86401 s'::interval
+                       as last_rollup from "sgd007"."lifetime_day"),
+                       '-infinity'::timestamptz) /*FILTERS*/) c),
+             prev as (select bucket.id, bucket.vid, bucket.block$, bucket.timestamp,
+                             null::int8 as "count", null::numeric as "sum",
+                             prev."total_count", prev."total_sum"
+                        from bucket cross join lateral (
+                             select * from "sgd007"."lifetime_day" prev
+                              where prev.timestamp < coalesce((select max(timestamp) + '86401 s'::interval
+                                    as last_rollup from "sgd007"."lifetime_day"),
+                                    '-infinity'::timestamptz)
+                              order by prev.timestamp desc limit 1) prev),
+             combined as (select id, vid, block$, timestamp,
+                                 sum("count") as "count", sum("sum") as "sum",
+                                 sum("total_count") as "total_count",
+                                 sum("total_sum") as "total_sum"
+                            from (select *, 1 as seq from prev
+                                  union all
+                                  select *, 2 as seq from bucket) u
+                            group by id, vid, block$, timestamp)select id, vid, block$, timestamp,
+               "count", "sum", "total_count", "total_sum"
+          from combined as c
+        "#;
+
+        const COUNT_ONLY_CURRENT_SQL: &str = r#"\
+        select max(id) as id, max(vid) as vid, max(block$) as block$, max(timestamp) as timestamp, \
+               count(*) as "count" \
+          from (select id, vid, block$, date_bin('86400s', timestamp, 'epoch'::timestamptz) as timestamp \
+                  from "sgd007"."data" as c \
+                 where c.timestamp >= coalesce((select max(timestamp) + '86401 s'::interval as last_rollup \
+                       from "sgd007"."count_only_day"), '-infinity'::timestamptz) /*FILTERS*/) c"#;
+
         #[track_caller]
         fn rollup_for<'a>(layout: &'a Layout, table_name: &str) -> &'a Rollup {
             layout
@@ -744,5 +1013,13 @@ mod tests {
 
         let count_only = rollup_for(&layout, "count_only_day");
         check_eqv(COUNT_ONLY_SQL, &count_only.insert_sql);
+
+        // Generated select_current_sql is correct
+        check_eqv(STATS_HOUR_CURRENT_SQL, &stats_hour.select_current_sql);
+        check_eqv(STATS_DAY_CURRENT_SQL, &stats_day.select_current_sql);
+        check_eqv(TOTAL_CURRENT_SQL, &stats_total.select_current_sql);
+        check_eqv(OPEN_CLOSE_CURRENT_SQL, &open_close.select_current_sql);
+        check_eqv(LIFETIME_CURRENT_SQL, &lifetime.select_current_sql);
+        check_eqv(COUNT_ONLY_CURRENT_SQL, &count_only.select_current_sql);
     }
 }
diff --git a/store/postgres/src/relational/value.rs b/store/postgres/src/relational/value.rs
index a59dcfe511c..1217afd6195 100644
--- a/store/postgres/src/relational/value.rs
+++ b/store/postgres/src/relational/value.rs
@@ -1,8 +1,9 @@
 //! Helpers to use diesel dynamic schema to retrieve values from Postgres
 
 use std::num::NonZeroU32;
+use std::ops::Bound;
 
-use diesel::sql_types::{Array, BigInt, Binary, Bool, Integer, Numeric, Text, Timestamptz};
+use diesel::sql_types::{Array, BigInt, Binary, Bool, Integer, Numeric, Range, Text, Timestamptz};
 use diesel::{deserialize::FromSql, pg::Pg};
 use diesel_dynamic_schema::dynamic_value::{Any, DynamicRow};
 
@@ -10,8 +11,8 @@ use graph::{
     components::store::StoreError,
     data::{
         store::{
-            scalar::{BigDecimal, Bytes, Timestamp},
             Entity, QueryObject,
+            scalar::{BigDecimal, Bytes, Timestamp},
         },
         value::{Object, Word},
     },
@@ -45,6 +46,7 @@ pub enum OidValue {
     BigDecimalArray(Vec<BigDecimal>),
     Timestamp(Timestamp),
     TimestampArray(Vec<Timestamp>),
+    Int4Range(Bound<i32>, Bound<i32>),
     Null,
 }
 
@@ -66,6 +68,7 @@ impl FromSql<Any, Pg> for OidValue {
         const NUMERIC_ARY_OID: NonZeroU32 = NonZeroU32::new(1231).unwrap();
         const TIMESTAMPTZ_OID: NonZeroU32 = NonZeroU32::new(1184).unwrap();
         const TIMESTAMPTZ_ARY_OID: NonZeroU32 = NonZeroU32::new(1185).unwrap();
+        const INT4RANGE_OID: NonZeroU32 = NonZeroU32::new(3904).unwrap();
 
         match value.get_oid() {
             VARCHAR_OID | TEXT_OID => {
@@ -102,6 +105,10 @@ impl FromSql<Any, Pg> for OidValue {
                 <Vec<Timestamp> as FromSql<Array<Timestamptz>, Pg>>::from_sql(value)
                     .map(OidValue::TimestampArray)
             }
+            INT4RANGE_OID => {
+                <(Bound<i32>, Bound<i32>) as FromSql<Range<Integer>, Pg>>::from_sql(value)
+                    .map(|(lo, hi)| OidValue::Int4Range(lo, hi))
+            }
             e => Err(format!("Unknown type: {e}").into()),
         }
     }
@@ -143,6 +150,11 @@ impl FromOidValue for r::Value {
             O::BigDecimalArray(b) => as_list(b, |b| Self::String(b.to_string())),
             O::Timestamp(t) => Self::Timestamp(t),
             O::TimestampArray(t) => as_list(t, Self::Timestamp),
+            O::Int4Range(..) => {
+                return Err(StoreError::InternalError(
+                    "int4range can not be converted to r::Value".to_string(),
+                ));
+            }
             O::Null => Self::Null,
         };
         Ok(value)
@@ -195,6 +207,11 @@ impl FromOidValue for graph::prelude::Value {
             },
             O::Timestamp(t) => Self::Timestamp(t),
             O::TimestampArray(t) => as_list(t, Self::Timestamp),
+            O::Int4Range(..) => {
+                return Err(StoreError::InternalError(
+                    "int4range can not be converted to Value".to_string(),
+                ));
+            }
             O::Null => Self::Null,
         };
         Ok(value)
diff --git a/store/postgres/src/relational_queries.rs b/store/postgres/src/relational_queries.rs
index ef066b208c8..d87b950adc1 100644
--- a/store/postgres/src/relational_queries.rs
+++ b/store/postgres/src/relational_queries.rs
@@ -5,13 +5,13 @@
 //!
 //! Code in this module works very hard to minimize the number of allocations
 //! that it performs
+use diesel::QuerySource as _;
 use diesel::pg::Pg;
 use diesel::query_builder::{AstPass, Query, QueryFragment, QueryId};
 use diesel::query_dsl::RunQueryDsl;
 use diesel::result::{Error as DieselError, QueryResult};
 use diesel::sql_types::Untyped;
 use diesel::sql_types::{Array, BigInt, Binary, Bool, Int8, Integer, Jsonb, Text, Timestamptz};
-use diesel::QuerySource as _;
 use graph::components::store::write::{EntityWrite, RowGroup, WriteChunk};
 use graph::components::store::{Child as StoreChild, DerivedEntityQuery};
 
@@ -21,12 +21,15 @@ use graph::data::store::{IdList, IdRef, QueryObject};
 use graph::data::value::{Object, Word};
 use graph::data_source::CausalityRegion;
 use graph::prelude::{
-    anyhow, r, serde_json, BlockNumber, ChildMultiplicity, Entity, EntityCollection, EntityFilter,
-    EntityLink, EntityOrder, EntityOrderByChild, EntityOrderByChildInfo, EntityRange, EntityWindow,
-    ParentLink, QueryExecutionError, StoreError, Value, ENV_VARS,
+    BlockNumber, ChildMultiplicity, ENV_VARS, Entity, EntityCollection, EntityFilter, EntityLink,
+    EntityOrder, EntityOrderByChild, EntityOrderByChildInfo, EntityRange, EntityWindow, ParentLink,
+    QueryExecutionError, StoreError, Value, anyhow, r, serde_json,
 };
 use graph::schema::{EntityType, FulltextAlgorithm, FulltextConfig, InputSchema};
-use graph::{components::store::AttributeNames, data::store::scalar};
+use graph::{
+    components::store::{AggregationCurrent, AttributeNames},
+    data::store::scalar,
+};
 use inflector::Inflector;
 use itertools::Itertools;
 use std::collections::{BTreeMap, BTreeSet, HashSet};
@@ -38,15 +41,17 @@ use std::str::FromStr;
 use std::string::ToString;
 
 use crate::block_range::{BoundSide, EntityBlockRange};
+use crate::parquet::convert::RestoreRow;
 use crate::relational::dsl::AtBlock;
 use crate::relational::{
-    dsl, Column, ColumnType, Layout, SqlName, Table, BYTE_ARRAY_PREFIX_SIZE, PRIMARY_KEY_COLUMN,
-    STRING_PREFIX_SIZE, VID_COLUMN,
+    BYTE_ARRAY_PREFIX_SIZE, Column, ColumnType, Layout, PRIMARY_KEY_COLUMN, STRING_PREFIX_SIZE,
+    SqlName, Table, VID_COLUMN, dsl, rollup::Rollup,
 };
 use crate::{
     block_range::{
-        BlockRangeColumn, BlockRangeLowerBoundClause, BlockRangeUpperBoundClause, BlockRangeValue,
-        BLOCK_COLUMN, BLOCK_RANGE_COLUMN, BLOCK_RANGE_CURRENT, CAUSALITY_REGION_COLUMN,
+        BLOCK_COLUMN, BLOCK_RANGE_COLUMN, BLOCK_RANGE_CURRENT, BlockRangeColumn,
+        BlockRangeLowerBoundClause, BlockRangeUpperBoundClause, BlockRangeValue,
+        CAUSALITY_REGION_COLUMN,
     },
     primary::Site,
 };
@@ -627,7 +632,7 @@ impl<'a> SqlValue<'a> {
 
         let value = match value {
             String(s) => match column_type {
-                ColumnType::String|ColumnType::Enum(_)|ColumnType::TSVector(_) => S::Text(s),
+                ColumnType::String | ColumnType::Enum(_) | ColumnType::TSVector(_) => S::Text(s),
                 ColumnType::Int8 => S::Int8(s.parse::<i64>().map_err(|e| {
                     internal_error!("failed to convert `{}` to an Int8: {}", s, e.to_string())
                 })?),
@@ -642,35 +647,26 @@ impl<'a> SqlValue<'a> {
             },
             Int(i) => S::Int(*i),
             Value::Int8(i) => S::Int8(*i),
-            BigDecimal(d) => {
-                S::Numeric(d.to_string())
-            }
+            BigDecimal(d) => S::Numeric(d.to_string()),
             Timestamp(ts) => S::Timestamp(*ts),
             Bool(b) => S::Bool(*b),
-            List(values) => {
-                match column_type {
-                    ColumnType::BigDecimal | ColumnType::BigInt => {
-                        let text_values: Vec<_> = values.iter().map(|v| v.to_string()).collect();
-                        S::Numerics(text_values)
-                    },
-                    ColumnType::Boolean|ColumnType::Bytes|
-                    ColumnType::Int|
-                    ColumnType::Int8|
-                    ColumnType::String|
-                    ColumnType::Timestamp|
-                    ColumnType::Enum(_)|
-                    ColumnType::TSVector(_) => {
-                        S::List(values)
-                    }
+            List(values) => match column_type {
+                ColumnType::BigDecimal | ColumnType::BigInt => {
+                    let text_values: Vec<_> = values.iter().map(|v| v.to_string()).collect();
+                    S::Numerics(text_values)
                 }
-            }
-            Null => {
-                S::Null
-            }
+                ColumnType::Boolean
+                | ColumnType::Bytes
+                | ColumnType::Int
+                | ColumnType::Int8
+                | ColumnType::String
+                | ColumnType::Timestamp
+                | ColumnType::Enum(_)
+                | ColumnType::TSVector(_) => S::List(values),
+            },
+            Null => S::Null,
             Bytes(b) => S::Bytes(b),
-            BigInt(i) => {
-                S::Numeric(i.to_string())
-            }
+            BigInt(i) => S::Numeric(i.to_string()),
         };
         Ok(value)
     }
@@ -761,7 +757,7 @@ impl<'a> QueryFragment<Pg> for QueryValue<'a> {
         use SqlValue as S;
         match &self.value {
             S::Text(s) => push_string(s, column_type, &mut out),
-            S::String(ref s) => push_string(s, column_type, &mut out),
+            S::String(s) => push_string(s, column_type, &mut out),
             S::Int(i) => out.push_bind_param::<Integer, _>(i),
             S::Int8(i) => out.push_bind_param::<Int8, _>(i),
             S::Timestamp(i) => out.push_bind_param::<Timestamptz, _>(&i.0),
@@ -1440,6 +1436,24 @@ impl<'a> Filter<'a> {
             value: &'s Value,
         ) -> Result<Filter<'s>, StoreError> {
             let column = table.column_for_field(attr)?;
+
+            // Case-insensitive operations only make sense for String columns.
+            // Other types (Bytes, BigInt, Int, etc.) don't have a concept of
+            // case and would fail at the SQL level (e.g. `bytea ~~* bytea`).
+            if matches!(op, ContainsOp::ILike | ContainsOp::NotILike)
+                && !matches!(column.column_type(), ColumnType::String)
+            {
+                let filter = if op.negated() {
+                    "not_contains_nocase"
+                } else {
+                    "contains_nocase"
+                };
+                return Err(StoreError::UnsupportedFilter(
+                    filter.to_owned(),
+                    value.to_string(),
+                ));
+            }
+
             let pattern = QueryValue::new(value, column.column_type())?;
             let pattern = match &pattern.value {
                 SqlValue::String(s) => {
@@ -2296,7 +2310,7 @@ impl<'a> InsertRow<'a> {
             let iv = if let Some(fields) = column.fulltext_fields.as_ref() {
                 let fulltext_field_values: Vec<_> = fields
                     .iter()
-                    .filter_map(|field| row.entity.get(field))
+                    .filter_map(|field| row.entity.get(field).filter(|v| !v.is_null()))
                     .map(|value| match value {
                         Value::String(s) => Ok(s),
                         _ => Err(internal_error!(
@@ -2327,6 +2341,74 @@ impl<'a> InsertRow<'a> {
             vid,
         })
     }
+
+    /// Build an `InsertRow` from a `RestoreRow` (Parquet restore path).
+    ///
+    /// Unlike `new()`, this looks up values by SQL column name rather than
+    /// entity field name, since `RestoreRow.values` is keyed by SQL name.
+    /// Fulltext columns are regenerated from their source fields.
+    fn from_restore(
+        columns: &[&'a Column],
+        row: &'a RestoreRow,
+        table: &'a Table,
+    ) -> Result<Self, StoreError> {
+        let mut values = Vec::with_capacity(columns.len());
+        for column in columns {
+            let iv = if let Some(fields) = column.fulltext_fields.as_ref() {
+                // Fulltext columns: `fields` contains GraphQL field names,
+                // but `RestoreRow.values` is keyed by SQL column names.
+                // Resolve via the table's columns.
+                let fulltext_field_values: Vec<_> = fields
+                    .iter()
+                    .filter_map(|field_name| {
+                        table
+                            .columns
+                            .iter()
+                            .find(|c| c.field.as_str() == field_name.as_str())
+                            .and_then(|src_col| {
+                                row.values
+                                    .iter()
+                                    .find(|(w, _)| w.as_str() == src_col.name.as_str())
+                                    .map(|(_, v)| v)
+                                    .filter(|v| !v.is_null())
+                            })
+                    })
+                    .map(|value| match value {
+                        Value::String(s) => Ok(s),
+                        _ => Err(internal_error!(
+                            "fulltext fields must be strings but got {:?}",
+                            value
+                        )),
+                    })
+                    .collect::<Result<_, _>>()?;
+                if let ColumnType::TSVector(config) = &column.column_type {
+                    InsertValue::Fulltext(fulltext_field_values, config)
+                } else {
+                    return Err(StoreError::FulltextColumnMissingConfig);
+                }
+            } else {
+                let value = row
+                    .values
+                    .iter()
+                    .find(|(w, _)| w.as_str() == column.name.as_str())
+                    .map(|(_, v)| v)
+                    .unwrap_or(&NULL);
+                let qv = QueryValue::new(value, &column.column_type)?;
+                InsertValue::Value(qv)
+            };
+            values.push(iv);
+        }
+        let end = row.block_range_end.flatten();
+        let br_value = BlockRangeValue::new(table, row.block, end);
+        let causality_region = CausalityRegion::from(row.causality_region.unwrap_or(0));
+        let vid = row.vid;
+        Ok(Self {
+            values,
+            br_value,
+            causality_region,
+            vid,
+        })
+    }
 }
 
 #[derive(Debug)]
@@ -2342,11 +2424,11 @@ impl<'a> InsertQuery<'a> {
             for column in table.columns.iter() {
                 if !column.is_nullable() && !row.entity.contains_key(&column.field) {
                     return Err(StoreError::QueryExecutionError(format!(
-                    "can not insert entity {}[{}] since value for non-nullable attribute {} is missing. \
+                        "can not insert entity {}[{}] since value for non-nullable attribute {} is missing. \
                      To fix this, mark the attribute as nullable in the GraphQL schema or change the \
                      mapping code to always set this attribute.",
-                    table.object, row.id, column.field
-                )));
+                        table.object, row.id, column.field
+                    )));
                 }
             }
         }
@@ -2365,6 +2447,29 @@ impl<'a> InsertQuery<'a> {
         })
     }
 
+    /// Build an `InsertQuery` from restore rows (Parquet restore path).
+    ///
+    /// All data columns from the dump are present, so `unique_columns`
+    /// includes every column in the table. Fulltext columns are
+    /// regenerated from their source fields.
+    pub fn for_restore(
+        table: &'a Table,
+        rows: &'a [RestoreRow],
+    ) -> Result<InsertQuery<'a>, StoreError> {
+        let unique_columns: Vec<&Column> = table.columns.iter().collect();
+
+        let rows: Vec<_> = rows
+            .iter()
+            .map(|row| InsertRow::from_restore(&unique_columns, row, table))
+            .collect::<Result<_, _>>()?;
+
+        Ok(InsertQuery {
+            table,
+            rows,
+            unique_columns,
+        })
+    }
+
     /// Build the column name list using the subset of all keys among present entities.
     fn unique_columns(table: &'a Table, rows: &'a WriteChunk<'a>) -> Vec<&'a Column> {
         table
@@ -2471,6 +2576,12 @@ impl<'a> QueryFragment<Pg> for InsertQuery<'a> {
             out.push_sql(")");
         }
 
+        if self.table.immutable && self.table.skip_duplicates {
+            out.push_sql("\n ON CONFLICT (");
+            out.push_identifier(self.table.primary_key().name.as_str())?;
+            out.push_sql(") DO NOTHING");
+        }
+
         Ok(())
     }
 }
@@ -2634,6 +2745,11 @@ impl<'a> ParentLimit<'a> {
         // limiting is taken care of in a wrapper around
         // the query we are currently building
     }
+
+    /// Returns the maximum number of rows that could be requested by this range filter.
+    fn max_num_rows(&self) -> u32 {
+        self.range.0.first.unwrap_or(EntityRange::FIRST) + self.range.0.skip
+    }
 }
 
 /// This is the parallel to `EntityWindow`, with names translated to
@@ -4257,6 +4373,7 @@ pub struct FilterQuery<'a> {
     block: BlockNumber,
     query_id: Option<String>,
     site: &'a Site,
+    rollup: Option<&'a Rollup>,
 }
 
 /// String representation that is useful for debugging when `walk_ast` fails
@@ -4284,10 +4401,12 @@ impl<'a> FilterQuery<'a> {
         block: BlockNumber,
         query_id: Option<String>,
         site: &'a Site,
+        aggregation_current: Option<AggregationCurrent>,
     ) -> Result<Self, QueryExecutionError> {
         let sort_key = SortKey::new(order, collection, filter, layout, block)?;
         let range = FilterRange(range);
         let limit = ParentLimit { sort_key, range };
+        let rollup = Self::find_rollup(collection, layout, aggregation_current)?;
 
         Ok(FilterQuery {
             collection,
@@ -4295,9 +4414,58 @@ impl<'a> FilterQuery<'a> {
             block,
             query_id,
             site,
+            rollup,
         })
     }
 
+    /// Finds the relevant [Rollup] for an aggregation entity query when the query requires the current bucket.
+    ///
+    /// Returns `None` for non-aggregation entity queries.
+    ///
+    /// Returns an error if the query is not supported.
+    fn find_rollup(
+        collection: &'a FilterCollection,
+        layout: &'a Layout,
+        aggregation_current: Option<AggregationCurrent>,
+    ) -> Result<Option<&'a Rollup>, QueryExecutionError> {
+        if !matches!(aggregation_current, Some(AggregationCurrent::Include)) {
+            return Ok(None);
+        }
+
+        // Determine which table and column_names to check based on collection type.
+        // We support root queries (All with 1 entity) and single-window nested queries.
+        let (object_name, column_names) = match collection {
+            FilterCollection::All(entities) if entities.len() == 1 => {
+                let entity = &entities[0];
+                (
+                    entity.table.meta.object.as_str(),
+                    &entity.column_names,
+                )
+            }
+            FilterCollection::SingleWindow(window) => (
+                window.table.meta.object.as_str(),
+                &window.column_names,
+            ),
+            _ => {
+                return Err(QueryExecutionError::NotSupported(
+                    "The current aggregation bucket can only be queried in a root query for one aggregation entity or a single-window nested query".to_string(),
+                ))
+            }
+        };
+
+        // This is not supported because the use of `SELECT *` does not always produce the expected results when combined with `UNION ALL`.
+        if matches!(column_names, AttributeNames::All) {
+            return Err(QueryExecutionError::NotSupported(
+                "The current aggregation bucket can only be queried when fields are explicitly selected".to_string())
+            );
+        }
+
+        Ok(layout
+            .rollups
+            .iter()
+            .find(|rollup| rollup.agg_table.object.as_str() == object_name))
+    }
+
     /// Generate
     ///     from schema.table c
     ///    where block_range @> $block
@@ -4343,19 +4511,61 @@ impl<'a> FilterQuery<'a> {
     ///         where block_range @> $block
     ///           and filter
     ///         order by .. limit .. skip ..) c
+    ///
+    /// For aggregation entity queries that require the current bucket,
+    /// the generated query has the following structure:
+    ///
+    ///   select '..' as entity, to_jsonb(e.*) as data
+    ///     from (
+    ///       (select {column names} from agg_table c where {filters} limit {limit + skip + 1})
+    ///         union all
+    ///       (select {column names} from ({current bucket query from agg source table} + {filters}) c)
+    ///     ) c order by .. limit .. skip ..
     fn query_no_window_one_entity<'b>(
         &'b self,
         wh: &'b WholeTable<'a>,
         out: &mut AstPass<'_, 'b, Pg>,
     ) -> QueryResult<()> {
         Self::select_entity_and_data(wh.table, out);
-        out.push_sql(" from (select ");
-        write_column_names(&wh.column_names, wh.table, Some("c."), out)?;
-        self.filtered_rows(wh, out)?;
-        out.push_sql("\n ");
-        self.limit.sort_key.order_by(out, false)?;
-        self.limit.range.walk_ast(out.reborrow())?;
-        out.push_sql(") c");
+        out.push_sql(" from (");
+
+        match self.rollup {
+            Some(rollup) => {
+                out.push_sql("(select ");
+                write_column_names(&wh.column_names, wh.table, Some("c."), out)?;
+                self.filtered_rows(wh, out)?;
+                out.push_sql("\n ");
+                self.limit.sort_key.order_by(out, false)?;
+                out.push_sql(" limit ");
+                out.push_sql(&self.limit.max_num_rows().to_string());
+                out.push_sql(") union all (select ");
+                write_column_names(&wh.column_names, wh.table, Some("c."), out)?;
+                out.push_sql(" from (");
+                let mut current_sql_split = rollup.select_current_sql.split("/*FILTERS*/");
+                out.push_sql(current_sql_split.next().unwrap());
+                out.push_sql(" and ");
+                wh.at_block.walk_ast(out.reborrow())?;
+                if let Some(filter) = &wh.filter {
+                    out.push_sql(" and ");
+                    filter.walk_ast(out.reborrow())?;
+                }
+                out.push_sql(current_sql_split.next().unwrap());
+                out.push_sql(") c ) ) c");
+                out.push_sql("\n ");
+                self.limit.sort_key.order_by(out, false)?;
+                self.limit.range.walk_ast(out.reborrow())?;
+            }
+            None => {
+                out.push_sql("select ");
+                write_column_names(&wh.column_names, wh.table, Some("c."), out)?;
+                self.filtered_rows(wh, out)?;
+                out.push_sql("\n ");
+                self.limit.sort_key.order_by(out, false)?;
+                self.limit.range.walk_ast(out.reborrow())?;
+                out.push_sql(") c");
+            }
+        }
+
         Ok(())
     }
 
@@ -4366,20 +4576,82 @@ impl<'a> FilterQuery<'a> {
     ///     from (select {column_names}, p.id as g$parent_id from {window.children(...)}) c
     ///     order by c.g$parent_id, {sort_key}
     ///     limit {first} offset {skip}
+    ///
+    /// For aggregation entity queries that require the current bucket,
+    /// the generated query has the following structure:
+    ///
+    ///   select '..' as entity, to_jsonb(e.*) as data
+    ///     from (
+    ///       (select {column_names}, p.id::text as g$parent_id from {window.children(...)})
+    ///       union all
+    ///       (select {column_names}, c.{link_col}::text as g$parent_id
+    ///          from ({current bucket query with filters}) c
+    ///         where c.{link_col} = any({parent_ids}))
+    ///     ) c
+    ///     order by c.g$parent_id, {sort_key}
     fn query_window_one_entity<'b>(
         &'b self,
         window: &'b FilterWindow,
         mut out: AstPass<'_, 'b, Pg>,
     ) -> QueryResult<()> {
         Self::select_entity_and_data(window.table, &mut out);
-        out.push_sql(" from (select ");
-        write_column_names(&window.column_names, window.table, Some("c."), &mut out)?;
-        out.push_sql(", p.id::text as ");
-        out.push_sql(PARENT_ID);
-        window.children(false, &self.limit, &mut out)?;
-        out.push_sql(") c");
-        out.push_sql("\n ");
-        self.limit.sort_key.order_by_parent(&mut out, false)
+
+        match self.rollup {
+            Some(rollup) => {
+                out.push_sql(" from ((select ");
+                write_column_names(&window.column_names, window.table, Some("c."), &mut out)?;
+                out.push_sql(", p.id::text as ");
+                out.push_sql(PARENT_ID);
+                window.children(false, &self.limit, &mut out)?;
+                out.push_sql(") union all (select ");
+                write_column_names(&window.column_names, window.table, Some("c."), &mut out)?;
+
+                // Determine the link column name from the window's link.
+                // For Direct links, the column name on the aggregation table
+                // matches the dimension column on the source timeseries table.
+                let link_col_name = match &window.link {
+                    TableLink::Direct(col, _) => col.name(),
+                    TableLink::Parent(_, _) => {
+                        return Err(diesel::result::Error::QueryBuilderError(
+                            "current aggregation bucket is not supported for Parent-linked nested queries".into(),
+                        ));
+                    }
+                };
+
+                out.push_sql(", c.\"");
+                out.push_sql(link_col_name);
+                out.push_sql("\"::text as ");
+                out.push_sql(PARENT_ID);
+                out.push_sql(" from (");
+
+                let mut current_sql_split = rollup.select_current_sql.split("/*FILTERS*/");
+                out.push_sql(current_sql_split.next().unwrap());
+                out.push_sql(" and ");
+                window.at_block.walk_ast(out.reborrow())?;
+                if let Some(filter) = &window.query_filter {
+                    out.push_sql(" and ");
+                    filter.walk_ast(out.reborrow())?;
+                }
+                out.push_sql(current_sql_split.next().unwrap());
+                out.push_sql(") c where c.\"");
+                out.push_sql(link_col_name);
+                out.push_sql("\" = any(");
+                window.ids.push_bind_param(&mut out)?;
+                out.push_sql("))) c");
+                out.push_sql("\n ");
+                self.limit.sort_key.order_by_parent(&mut out, false)
+            }
+            None => {
+                out.push_sql(" from (select ");
+                write_column_names(&window.column_names, window.table, Some("c."), &mut out)?;
+                out.push_sql(", p.id::text as ");
+                out.push_sql(PARENT_ID);
+                window.children(false, &self.limit, &mut out)?;
+                out.push_sql(") c");
+                out.push_sql("\n ");
+                self.limit.sort_key.order_by_parent(&mut out, false)
+            }
+        }
     }
 
     /// No windowing, but multiple entity types
@@ -4819,6 +5091,7 @@ pub struct CopyEntityBatchQuery<'a> {
     columns: Vec<&'a Column>,
     first_vid: i64,
     last_vid: i64,
+    target_block: BlockNumber,
 }
 
 impl<'a> CopyEntityBatchQuery<'a> {
@@ -4827,10 +5100,17 @@ impl<'a> CopyEntityBatchQuery<'a> {
         src: &'a Table,
         first_vid: i64,
         last_vid: i64,
+        target_block: BlockNumber,
     ) -> Result<Self, StoreError> {
         let mut columns = Vec::new();
         for dcol in &dst.columns {
-            if let Some(scol) = src.column(&dcol.name) {
+            // Match against all source columns, INCLUDING fulltext (tsvector)
+            // columns, which `Table::column` deliberately hides. The stored
+            // tsvector is copied verbatim; without this, fulltext columns
+            // would be silently dropped from the copy (they are nullable, so
+            // the error branch below is not taken) and the destination's
+            // search index would be left empty.
+            if let Some(scol) = src.column_including_fulltext(&dcol.name) {
                 if let Some(msg) = dcol.is_assignable_from(scol, &src.object) {
                     return Err(anyhow!("{}", msg).into());
                 } else {
@@ -4853,6 +5133,7 @@ impl<'a> CopyEntityBatchQuery<'a> {
             columns,
             first_vid,
             last_vid,
+            target_block,
         })
     }
 
@@ -4937,7 +5218,16 @@ impl<'a> QueryFragment<Pg> for CopyEntityBatchQuery<'a> {
                 );
                 out.push_sql(&checked_conversion);
             }
-            (false, false) => out.push_sql(BLOCK_RANGE_COLUMN),
+            (false, false) => {
+                let range_conv = format!(
+                    r#"
+                case when upper({BLOCK_RANGE_COLUMN}) > {}
+                     then int4range(lower({BLOCK_RANGE_COLUMN}), null)
+                     else {BLOCK_RANGE_COLUMN} end"#,
+                    self.target_block
+                );
+                out.push_sql(&range_conv)
+            }
         }
 
         match (self.src.has_causality_region, self.dst.has_causality_region) {
@@ -4967,6 +5257,16 @@ impl<'a> QueryFragment<Pg> for CopyEntityBatchQuery<'a> {
         out.push_bind_param::<BigInt, _>(&self.first_vid)?;
         out.push_sql(" and vid <= ");
         out.push_bind_param::<BigInt, _>(&self.last_vid)?;
+        out.push_sql(" and ");
+        if self.src.immutable {
+            out.push_sql(BLOCK_COLUMN);
+        } else {
+            out.push_sql("lower(");
+            out.push_sql(BLOCK_RANGE_COLUMN);
+            out.push_sql(")");
+        }
+        out.push_sql(" <= ");
+        out.push_bind_param::<Integer, _>(&self.target_block)?;
         out.push_sql("\n returning ");
         if self.dst.immutable {
             out.push_sql("true");
diff --git a/store/postgres/src/retry.rs b/store/postgres/src/retry.rs
index 2b6f3f73d75..d0dea82aca9 100644
--- a/store/postgres/src/retry.rs
+++ b/store/postgres/src/retry.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use graph::{
     prelude::StoreError,
-    slog::{warn, Logger},
+    slog::{Logger, warn},
     util::backoff::ExponentialBackoff,
 };
 
diff --git a/store/postgres/src/sql/mod.rs b/store/postgres/src/sql/mod.rs
index f08f89ae711..938db9de13d 100644
--- a/store/postgres/src/sql/mod.rs
+++ b/store/postgres/src/sql/mod.rs
@@ -12,7 +12,7 @@ mod test {
 
     use crate::{
         catalog::Catalog,
-        primary::{make_dummy_site, Namespace},
+        primary::{Namespace, make_dummy_site},
         relational::Layout,
     };
 
diff --git a/store/postgres/src/sql/parser.rs b/store/postgres/src/sql/parser.rs
index e263a54deb2..d800cdab248 100644
--- a/store/postgres/src/sql/parser.rs
+++ b/store/postgres/src/sql/parser.rs
@@ -1,6 +1,6 @@
 use super::{constants::SQL_DIALECT, validation::Validator};
 use crate::relational::Layout;
-use anyhow::{anyhow, Ok, Result};
+use anyhow::{Ok, Result, anyhow};
 use graph::{env::ENV_VARS, prelude::BlockNumber};
 use std::sync::Arc;
 
@@ -36,7 +36,7 @@ mod test {
     use std::sync::Arc;
 
     use crate::sql::{parser::SQL_DIALECT, test::make_layout};
-    use graph::prelude::{lazy_static, serde_yaml, BLOCK_NUMBER_MAX};
+    use graph::prelude::{BLOCK_NUMBER_MAX, lazy_static, serde_yaml};
     use serde::{Deserialize, Serialize};
 
     use pretty_assertions::assert_eq;
diff --git a/store/postgres/src/sql/validation.rs b/store/postgres/src/sql/validation.rs
index 73720b771b0..430925f08d6 100644
--- a/store/postgres/src/sql/validation.rs
+++ b/store/postgres/src/sql/validation.rs
@@ -246,7 +246,7 @@ impl VisitorMut for Validator<'_> {
             SetExpr::Table(_) => { /* permitted */ }
             SetExpr::Values(_) => { /* permitted */ }
             SetExpr::Insert(_) | SetExpr::Update(_) | SetExpr::Delete(_) | SetExpr::Merge(_) => {
-                return ControlFlow::Break(Error::NotSelectQuery)
+                return ControlFlow::Break(Error::NotSelectQuery);
             }
         }
 
@@ -383,12 +383,14 @@ impl VisitorMut for Validator<'_> {
                     name: Ident::new(table.name.as_str()),
                     columns: vec![],
                     explicit: true,
+                    at: None,
                 })
             });
             *table_factor = TableFactor::Derived {
                 lateral: false,
                 subquery,
                 alias,
+                sample: None,
             };
         }
         ControlFlow::Continue(())
diff --git a/store/postgres/src/store.rs b/store/postgres/src/store.rs
index 4adec80ab5b..2ddc926539a 100644
--- a/store/postgres/src/store.rs
+++ b/store/postgres/src/store.rs
@@ -12,12 +12,12 @@ use graph::{
     data::subgraph::status,
     internal_error,
     prelude::{
-        alloy::primitives::Address, BlockNumber, BlockPtr, CheapClone, DeploymentHash,
-        PartialBlockPtr, QueryExecutionError, StoreError,
+        BlockNumber, BlockPtr, CheapClone, DeploymentHash, PartialBlockPtr, QueryExecutionError,
+        StoreError, alloy::primitives::Address,
     },
 };
 
-use crate::{block_store::BlockStore, query_store::QueryStore, SubgraphStore};
+use crate::{SubgraphStore, block_store::BlockStore, query_store::QueryStore};
 
 /// The overall store of the system, consisting of a [`SubgraphStore`] and a
 /// [`BlockStore`], each of which multiplex across multiple database shards.
diff --git a/store/postgres/src/store_events.rs b/store/postgres/src/store_events.rs
index 572c3a339a3..6ed19314649 100644
--- a/store/postgres/src/store_events.rs
+++ b/store/postgres/src/store_events.rs
@@ -1,12 +1,12 @@
 use graph::futures01::Stream;
+use graph::futures03::TryStreamExt;
 use graph::futures03::compat::Stream01CompatExt;
 use graph::futures03::stream::StreamExt;
-use graph::futures03::TryStreamExt;
-use std::sync::{atomic::Ordering, Arc};
+use std::sync::{Arc, atomic::Ordering};
 
 use graph::parking_lot::RwLock;
 use std::{collections::HashMap, sync::atomic::AtomicUsize};
-use tokio::sync::mpsc::{channel, Sender};
+use tokio::sync::mpsc::{Sender, channel};
 use tokio_stream::wrappers::ReceiverStream;
 
 use crate::notification_listener::{NotificationListener, SafeChannelName};
diff --git a/store/postgres/src/subgraph_store.rs b/store/postgres/src/subgraph_store.rs
index b4b6a65edce..b4435cae0cb 100644
--- a/store/postgres/src/subgraph_store.rs
+++ b/store/postgres/src/subgraph_store.rs
@@ -5,11 +5,10 @@ use diesel::{
     serialize::{Output, ToSql},
     sql_types::{self, Text},
 };
-use diesel_async::scoped_futures::ScopedFutureExt;
 use std::fmt;
 use std::{
     collections::{BTreeMap, HashMap},
-    sync::{atomic::AtomicU8, Arc, Mutex},
+    sync::{Arc, Mutex, atomic::AtomicU8},
 };
 use std::{iter::FromIterator, time::Duration};
 
@@ -18,19 +17,22 @@ use graph::{
     components::{
         server::index_node::VersionInfo,
         store::{
-            self, BlockPtrForNumber, BlockStore, DeploymentLocator, EnsLookup as EnsLookupTrait,
-            PruneReporter, PruneRequest, SubgraphFork,
+            self, BlockPtrForNumber, BlockStore, DeploymentLocator, DeploymentSchemaVersion,
+            DumpReporter, EnsLookup as EnsLookupTrait, PruneReporter, PruneRequest,
+            RestoreReporter, SubgraphFork,
         },
     },
-    data::query::QueryTarget,
-    data::subgraph::{schema::DeploymentCreate, status, DeploymentFeatures},
+    data::{
+        query::QueryTarget,
+        store::DEFAULT_NODE_ID,
+        subgraph::{DeploymentFeatures, schema::DeploymentCreate, status},
+    },
     internal_error,
-    prelude::StoreEvent,
     prelude::{
-        anyhow, lazy_static, o, ApiVersion, BlockNumber, BlockPtr, ChainStore, DeploymentHash,
-        EntityOperation, Logger, MetricsRegistry, NodeId, PartialBlockPtr, StoreError,
-        SubgraphDeploymentEntity, SubgraphName, SubgraphStore as SubgraphStoreTrait,
-        SubgraphVersionSwitchingMode,
+        ApiVersion, BlockNumber, BlockPtr, ChainStore, DeploymentHash, EntityOperation, Logger,
+        MetricsRegistry, NodeId, PartialBlockPtr, StoreError, StoreEvent, SubgraphDeploymentEntity,
+        SubgraphName, SubgraphStore as SubgraphStoreTrait, SubgraphVersionSwitchingMode, anyhow,
+        lazy_static, o,
     },
     schema::{ApiSchema, InputSchema},
     url::Url,
@@ -39,23 +41,24 @@ use graph::{
 use graph::{derive::CheapClone, futures03::future::join_all, prelude::alloy::primitives::Address};
 
 use crate::{
+    ConnectionPool, NotificationSender,
     catalog::Catalog,
     deployment::{OnSync, SubgraphHealth},
-    primary::{self, DeploymentId, Mirror as PrimaryMirror, Primary, Site},
+    primary::{
+        self, DeploymentId, Mirror as PrimaryMirror, Primary, RestoreAction, RestoreMode, Site,
+    },
     relational::{
-        self,
+        self, Layout,
         index::{IndexList, Method},
-        Layout,
     },
     writable::{SourceableStore, WritableStore},
-    ConnectionPool, NotificationSender,
 };
 use crate::{
     deployment_store::{DeploymentStore, ReplicaId},
     detail::DeploymentDetail,
     primary::UnusedDeployment,
 };
-use crate::{fork, relational::index::CreateIndex, relational::SqlName};
+use crate::{fork, relational::SqlName, relational::index::CreateIndex};
 
 /// The name of a database shard; valid names must match `[a-z0-9_]+`
 #[derive(Clone, Debug, Eq, PartialEq, Hash, AsExpression, FromSqlRow)]
@@ -127,7 +130,7 @@ impl ToSql<Text, Pg> for Shard {
 /// shards.
 pub trait DeploymentPlacer {
     fn place(&self, name: &str, network: &str)
-        -> Result<Option<(Vec<Shard>, Vec<NodeId>)>, String>;
+    -> Result<Option<(Vec<Shard>, Vec<NodeId>)>, String>;
 }
 
 /// Tools for managing unused deployments
@@ -412,55 +415,30 @@ impl SubgraphStore {
         };
 
         // Create the actual databases schema and metadata entries
-        let index_def = if let Some(graft) = graft_base {
-            if let Some(site) = self.sites.get(graft) {
-                let store = self
-                    .stores
-                    .get(&site.shard)
-                    .ok_or_else(|| StoreError::UnknownShard(site.shard.to_string()))?;
-
-                Some(store.load_indexes(site).await?)
-            } else {
-                None
-            }
-        } else {
-            None
-        };
-
         deployment_store
-            .create_deployment(
-                schema,
-                deployment,
-                site.clone(),
-                replace,
-                OnSync::None,
-                index_def,
-            )
+            .create_deployment(schema, deployment, site.clone(), replace, OnSync::None)
             .await?;
 
         // FIXME: This simultaneously holds a `primary_conn` and a shard connection, which can
         // potentially deadlock.
         let mut pconn = self.primary_conn().await?;
+        let subgraph_store = self.cheap_clone();
+        let site_clone = site.cheap_clone();
         pconn
-            .transaction(|pconn| {
-                let subgraph_store = self.cheap_clone();
-                let site = site.cheap_clone();
-                async move {
-                    let exists_and_synced = async move |id: &DeploymentHash| {
-                        let (store, _) = subgraph_store.store(id).await?;
-                        store.deployment_exists_and_synced(id).await
-                    };
-
-                    // Create subgraph, subgraph version, and assignment
-                    let changes = pconn
-                        .create_subgraph_version(name, &site, node_id, mode, exists_and_synced)
-                        .await?;
+            .transaction(async move |pconn| {
+                let exists_and_synced = async move |id: &DeploymentHash| {
+                    let (store, _) = subgraph_store.store(id).await?;
+                    store.deployment_exists_and_synced(id).await
+                };
 
-                    let event = StoreEvent::new(changes);
-                    pconn.send_store_event(&self.sender, &event).await?;
-                    Ok(())
-                }
-                .scope_boxed()
+                // Create subgraph, subgraph version, and assignment
+                let changes = pconn
+                    .create_subgraph_version(name, &site_clone, node_id, mode, exists_and_synced)
+                    .await?;
+
+                let event = StoreEvent::new(changes);
+                pconn.send_store_event(&self.sender, &event).await?;
+                Ok(())
             })
             .await?;
         Ok(site.as_ref().into())
@@ -481,6 +459,138 @@ impl SubgraphStore {
         self.create_deployment_internal(name, schema, deployment, node_id, network_name, mode, true)
             .await
     }
+
+    pub async fn restore(
+        &self,
+        dir: &std::path::Path,
+        shard: Option<Shard>,
+        name: Option<SubgraphName>,
+        mode: RestoreMode,
+        version_switching_mode: SubgraphVersionSwitchingMode,
+        reporter: &mut dyn RestoreReporter,
+    ) -> Result<(), StoreError> {
+        use crate::relational::dump::Metadata;
+
+        let metadata_path = dir.join("metadata.json");
+        let metadata = Metadata::from_file(&metadata_path)?;
+
+        // Resolve the subgraph name for deployment rule matching. If not
+        // supplied, look up an existing name from the DB; error if none.
+        let name = match name {
+            Some(name) => {
+                // Validate that the named subgraph exists. Without this
+                // check the deployment would be created but never linked
+                // to a name, leaving it orphaned.
+                if !self.mirror.subgraph_exists(&name).await? {
+                    return Err(StoreError::Input(format!(
+                        "subgraph `{name}` does not exist; \
+                         create it first with `graphman create {name}`"
+                    )));
+                }
+                name
+            }
+            None => {
+                let names = self
+                    .mirror
+                    .subgraphs_by_deployment_hash(metadata.deployment.as_str())
+                    .await?;
+                let (name, _) = names.into_iter().next().ok_or_else(|| {
+                    StoreError::Input(
+                        "no subgraph name found for this deployment; use --name to specify one"
+                            .into(),
+                    )
+                })?;
+                SubgraphName::new(name).map_err(|n| {
+                    StoreError::InternalError(format!("invalid subgraph name `{n}` in database"))
+                })?
+            }
+        };
+
+        // Use deployment rules to determine which node should index this
+        // deployment and how to place it.
+        let (placed_shard, node) = self
+            .place(&name, &metadata.network, DEFAULT_NODE_ID.clone())
+            .await?;
+        let shard = shard.unwrap_or(placed_shard);
+
+        // Validate that the target shard exists before making any DB changes
+        self.stores
+            .get(&shard)
+            .ok_or_else(|| StoreError::UnknownShard(shard.to_string()))?;
+
+        let mut pconn = self.primary_conn().await?;
+        let action = pconn
+            .plan_restore(&shard, &metadata.deployment, &mode)
+            .await?;
+
+        // Determine schema_version the same way allocate_site does
+        let schema_version = match metadata.graft_base.as_ref() {
+            Some(graft_base) => {
+                let base_site = pconn.find_active_site(graft_base).await?.ok_or_else(|| {
+                    StoreError::DeploymentNotFound("graft_base not found".to_string())
+                })?;
+                base_site.schema_version
+            }
+            None => DeploymentSchemaVersion::LATEST,
+        };
+
+        let site = match action {
+            RestoreAction::Create { active } => {
+                pconn
+                    .create_site(
+                        shard,
+                        metadata.deployment.clone(),
+                        metadata.network.clone(),
+                        schema_version,
+                        active,
+                    )
+                    .await?
+            }
+            RestoreAction::Replace { existing } => {
+                let was_active = existing.active;
+                let existing = Arc::new(existing);
+                let store = self.for_site(&existing)?;
+                store.drop_deployment(&existing).await?;
+                pconn.drop_site(&existing).await?;
+                // Drop and re-acquire the primary connection to avoid pool
+                // deadlock: drop_deployment above used a separate connection
+                // from the same pool, and create_site below needs one too.
+                drop(pconn);
+                let mut pconn = self.primary_conn().await?;
+                pconn
+                    .create_site(
+                        shard,
+                        metadata.deployment.clone(),
+                        metadata.network.clone(),
+                        schema_version,
+                        was_active,
+                    )
+                    .await?
+            }
+        };
+
+        let site = Arc::new(site);
+        let store = self.for_site(&site)?;
+        store
+            .restore(site.cheap_clone(), dir, &metadata, &mut *reporter)
+            .await?;
+
+        // Link the restored deployment to the subgraph name and assign it
+        // to the node determined by deployment rules
+        let mut pconn = self.primary_conn().await?;
+        let subgraph_store = self.cheap_clone();
+        let exists_and_synced = async move |id: &DeploymentHash| {
+            let (store, _) = subgraph_store.store(id).await?;
+            store.deployment_exists_and_synced(id).await
+        };
+        let changes = pconn
+            .create_subgraph_version(name, &site, node, version_switching_mode, exists_and_synced)
+            .await?;
+        let event = StoreEvent::new(changes);
+        pconn.send_store_event(&self.sender, &event).await?;
+
+        Ok(())
+    }
 }
 
 impl std::ops::Deref for SubgraphStore {
@@ -768,7 +878,6 @@ impl Inner {
             )));
         }
         let deployment = src_store.load_deployment(src.clone()).await?;
-        let index_def = src_store.load_indexes(src.clone()).await?;
 
         // Transmogrify the deployment into a new one
         let deployment = DeploymentCreate {
@@ -798,23 +907,21 @@ impl Inner {
                 dst.clone(),
                 false,
                 on_sync,
-                Some(index_def),
             )
             .await?;
 
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
+        let dst_clone = dst.cheap_clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    // Create subgraph, subgraph version, and assignment. We use the
-                    // existence of an assignment as a signal that we already set up
-                    // the copy
-                    let changes = pconn.assign_subgraph(dst.as_ref(), &node).await?;
-                    let event = StoreEvent::new(changes);
-                    pconn.send_store_event(&self.sender, &event).await?;
-                    Ok(())
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                // Create subgraph, subgraph version, and assignment. We use the
+                // existence of an assignment as a signal that we already set up
+                // the copy
+                let changes = pconn.assign_subgraph(dst_clone.as_ref(), &node).await?;
+                let event = StoreEvent::new(changes);
+                pconn.send_store_event(&sender, &event).await?;
+                Ok(())
             })
             .await?;
         Ok(dst.as_ref().into())
@@ -1110,21 +1217,19 @@ impl Inner {
         join_all(self.stores.values().map(|store| store.vacuum())).await
     }
 
-    pub async fn rewind(
-        &self,
-        id: DeploymentHash,
-        block_ptr_to: BlockPtr,
-    ) -> Result<(), StoreError> {
-        let (store, site) = self.store(&id).await?;
+    pub async fn rewind(&self, id: DeploymentId, block_ptr_to: BlockPtr) -> Result<(), StoreError> {
+        let site = self.find_site(id).await?;
+        let store = self.for_site(&site)?;
         store.rewind(site, block_ptr_to).await
     }
 
     pub async fn truncate(
         &self,
-        id: DeploymentHash,
+        id: DeploymentId,
         block_ptr_to: BlockPtr,
     ) -> Result<(), StoreError> {
-        let (store, site) = self.store(&id).await?;
+        let site = self.find_site(id).await?;
+        let store = self.for_site(&site)?;
         store.truncate(site, block_ptr_to).await
     }
 
@@ -1436,6 +1541,18 @@ impl Inner {
         let src_store = self.for_site(&site)?;
         src_store.load_indexes(site).await
     }
+
+    pub async fn dump(
+        &self,
+        loc: &DeploymentLocator,
+        directory: std::path::PathBuf,
+        reporter: Box<dyn DumpReporter>,
+    ) -> Result<(), StoreError> {
+        let site = self.find_site(loc.id.into()).await?;
+        let store = self.for_site(&site)?;
+
+        store.dump(site, directory, reporter).await
+    }
 }
 
 const STATE_ENS_NOT_CHECKED: u8 = 0;
@@ -1527,7 +1644,7 @@ impl SubgraphStoreTrait for SubgraphStore {
     async fn create_subgraph(&self, name: SubgraphName) -> Result<String, StoreError> {
         let mut pconn = self.primary_conn().await?;
         pconn
-            .transaction(|pconn| pconn.create_subgraph(&name).scope_boxed())
+            .transaction(async move |pconn| pconn.create_subgraph(&name).await)
             .await
     }
 
@@ -1537,23 +1654,29 @@ impl SubgraphStoreTrait for SubgraphStore {
     ) -> Result<(), StoreError> {
         let mut pconn = self.primary_conn().await?;
         pconn
-            .transaction(|pconn| pconn.create_subgraph_features(features).scope_boxed())
+            .transaction(async move |pconn| pconn.create_subgraph_features(features).await)
             .await
     }
 
-    async fn remove_subgraph(&self, name: SubgraphName) -> Result<(), StoreError> {
+    async fn remove_subgraph(&self, name: SubgraphName) -> Result<Vec<DeploymentHash>, StoreError> {
+        let deployments = self
+            .status(status::Filter::SubgraphName(name.to_string()))
+            .await?
+            .into_iter()
+            .filter_map(|info| DeploymentHash::new(info.subgraph).ok())
+            .collect::<Vec<_>>();
+
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    let changes = pconn.remove_subgraph(name).await?;
-                    pconn
-                        .send_store_event(&self.sender, &StoreEvent::new(changes))
-                        .await
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                let changes = pconn.remove_subgraph(name).await?;
+                pconn
+                    .send_store_event(&sender, &StoreEvent::new(changes))
+                    .await
             })
-            .await
+            .await?;
+        Ok(deployments)
     }
 
     async fn reassign_subgraph(
@@ -1563,15 +1686,13 @@ impl SubgraphStoreTrait for SubgraphStore {
     ) -> Result<(), StoreError> {
         let site = self.find_site(deployment.id.into()).await?;
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    let changes = pconn.reassign_subgraph(site.as_ref(), node_id).await?;
-                    pconn
-                        .send_store_event(&self.sender, &StoreEvent::new(changes))
-                        .await
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                let changes = pconn.reassign_subgraph(site.as_ref(), node_id).await?;
+                pconn
+                    .send_store_event(&sender, &StoreEvent::new(changes))
+                    .await
             })
             .await
     }
@@ -1579,15 +1700,13 @@ impl SubgraphStoreTrait for SubgraphStore {
     async fn unassign_subgraph(&self, deployment: &DeploymentLocator) -> Result<(), StoreError> {
         let site = self.find_site(deployment.id.into()).await?;
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    let changes = pconn.unassign_subgraph(site.as_ref()).await?;
-                    pconn
-                        .send_store_event(&self.sender, &StoreEvent::new(changes))
-                        .await
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                let changes = pconn.unassign_subgraph(site.as_ref()).await?;
+                pconn
+                    .send_store_event(&sender, &StoreEvent::new(changes))
+                    .await
             })
             .await
     }
@@ -1595,15 +1714,13 @@ impl SubgraphStoreTrait for SubgraphStore {
     async fn pause_subgraph(&self, deployment: &DeploymentLocator) -> Result<(), StoreError> {
         let site = self.find_site(deployment.id.into()).await?;
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    let changes = pconn.pause_subgraph(site.as_ref()).await?;
-                    pconn
-                        .send_store_event(&self.sender, &StoreEvent::new(changes))
-                        .await
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                let changes = pconn.pause_subgraph(site.as_ref()).await?;
+                pconn
+                    .send_store_event(&sender, &StoreEvent::new(changes))
+                    .await
             })
             .await
     }
@@ -1611,15 +1728,13 @@ impl SubgraphStoreTrait for SubgraphStore {
     async fn resume_subgraph(&self, deployment: &DeploymentLocator) -> Result<(), StoreError> {
         let site = self.find_site(deployment.id.into()).await?;
         let mut pconn = self.primary_conn().await?;
+        let sender = self.sender.clone();
         pconn
-            .transaction(|pconn| {
-                async {
-                    let changes = pconn.resume_subgraph(site.as_ref()).await?;
-                    pconn
-                        .send_store_event(&self.sender, &StoreEvent::new(changes))
-                        .await
-                }
-                .scope_boxed()
+            .transaction(async move |pconn| {
+                let changes = pconn.resume_subgraph(site.as_ref()).await?;
+                pconn
+                    .send_store_event(&sender, &StoreEvent::new(changes))
+                    .await
             })
             .await
     }
@@ -1773,6 +1888,12 @@ impl SubgraphStoreTrait for SubgraphStore {
         store.block_ptr(site.cheap_clone()).await
     }
 
+    async fn earliest_block_number(&self, id: &DeploymentHash) -> Result<BlockNumber, StoreError> {
+        let (store, site) = self.store(id).await?;
+        let state = store.deployment_state(site.cheap_clone()).await?;
+        Ok(state.earliest_block_number)
+    }
+
     async fn is_healthy(&self, id: &DeploymentHash) -> Result<bool, StoreError> {
         let (store, site) = self.store(id).await?;
         let health = store.health(&site).await?;
diff --git a/store/postgres/src/vid_batcher.rs b/store/postgres/src/vid_batcher.rs
index 8cb0496bd86..1275608e364 100644
--- a/store/postgres/src/vid_batcher.rs
+++ b/store/postgres/src/vid_batcher.rs
@@ -12,10 +12,9 @@ use graph::{
 };
 
 use crate::{
-    catalog,
+    AsyncPgConnection, catalog,
     primary::Namespace,
     relational::{Table, VID_COLUMN},
-    AsyncPgConnection,
 };
 
 /// The initial batch size for tables that do not have an array column
@@ -35,6 +34,13 @@ pub(crate) struct AdaptiveBatchSize {
 }
 
 impl AdaptiveBatchSize {
+    pub fn with_size(size: i64) -> Self {
+        Self {
+            size,
+            target: ENV_VARS.store.batch_target_duration,
+        }
+    }
+
     pub fn new(table: &Table) -> Self {
         let size = if table.columns.iter().any(|col| col.is_list()) {
             INITIAL_BATCH_SIZE_LIST
diff --git a/store/postgres/src/writable.rs b/store/postgres/src/writable.rs
index 928cbdbe76f..633688aeb1a 100644
--- a/store/postgres/src/writable.rs
+++ b/store/postgres/src/writable.rs
@@ -1,35 +1,34 @@
 use std::collections::BTreeSet;
 use std::ops::{Deref, Range};
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
+use std::sync::atomic::{AtomicBool, Ordering};
 
 use graph::parking_lot::RwLock;
 use std::time::Instant;
 use std::{collections::BTreeMap, sync::Arc};
 
 use async_trait::async_trait;
-use diesel_async::scoped_futures::ScopedFutureExt;
-use graph::blockchain::block_stream::{EntitySourceOperation, FirehoseCursor};
 use graph::blockchain::BlockTime;
+use graph::blockchain::block_stream::{EntitySourceOperation, FirehoseCursor};
 use graph::components::store::{Batch, DeploymentCursorTracker, DerivedEntityQuery, ReadStore};
 use graph::data::store::IdList;
 use graph::data::subgraph::schema;
 use graph::data_source::CausalityRegion;
 use graph::internal_error;
 use graph::prelude::{
-    BlockNumber, CacheWeight, Entity, MetricsRegistry, SubgraphDeploymentEntity,
-    SubgraphStore as _, BLOCK_NUMBER_MAX,
+    BLOCK_NUMBER_MAX, BlockNumber, CacheWeight, Entity, MetricsRegistry, SubgraphDeploymentEntity,
+    SubgraphStore as _,
 };
 use graph::schema::{EntityKey, EntityType, InputSchema};
 use graph::slog::{debug, info, warn};
 use graph::util::bounded_queue::BoundedQueue;
 use graph::{
     cheap_clone::CheapClone,
-    components::store::{self, write::EntityOp, WritableStore as WritableStoreTrait},
+    components::store::{self, WritableStore as WritableStoreTrait, write::EntityOp},
     data::subgraph::schema::SubgraphError,
     prelude::{
-        BlockPtr, DeploymentHash, EntityModification, Logger, StopwatchMetrics, StoreError,
-        StoreEvent, UnfailOutcome, ENV_VARS,
+        BlockPtr, DeploymentHash, ENV_VARS, EntityModification, Logger, StopwatchMetrics,
+        StoreError, StoreEvent, UnfailOutcome,
     },
     slog::error,
 };
@@ -41,8 +40,8 @@ use tokio::task::JoinHandle;
 use crate::deployment_store::DeploymentStore;
 use crate::primary::DeploymentId;
 use crate::relational::index::IndexList;
-use crate::{primary, primary::Site, relational::Layout, SubgraphStore};
-use crate::{retry, NotificationSender};
+use crate::{NotificationSender, retry};
+use crate::{SubgraphStore, primary, primary::Site, relational::Layout};
 
 /// A wrapper around `SubgraphStore` that only exposes functions that are
 /// safe to call from `WritableStore`, i.e., functions that either do not
@@ -374,14 +373,11 @@ impl SyncStore {
             let mut pconn = self.store.primary_conn().await?;
             let sender = self.store.notification_sender();
             pconn
-                .transaction(|pconn| {
-                    async {
-                        let changes = pconn.unassign_subgraph(site).await?;
-                        pconn
-                            .send_store_event(&sender, &StoreEvent::new(changes))
-                            .await
-                    }
-                    .scope_boxed()
+                .transaction(async move |pconn| {
+                    let changes = pconn.unassign_subgraph(site).await?;
+                    pconn
+                        .send_store_event(&sender, &StoreEvent::new(changes))
+                        .await
                 })
                 .await
         })
@@ -393,14 +389,11 @@ impl SyncStore {
             let mut pconn = self.store.primary_conn().await?;
             let sender = self.store.notification_sender();
             pconn
-                .transaction(|pconn| {
-                    async {
-                        let changes = pconn.pause_subgraph(site).await?;
-                        pconn
-                            .send_store_event(&sender, &StoreEvent::new(changes))
-                            .await
-                    }
-                    .scope_boxed()
+                .transaction(async move |pconn| {
+                    let changes = pconn.pause_subgraph(site).await?;
+                    pconn
+                        .send_store_event(&sender, &StoreEvent::new(changes))
+                        .await
                 })
                 .await
         })
@@ -450,13 +443,11 @@ impl SyncStore {
                 // store so that we do not hold two database connections which
                 // might come from the same pool and could therefore deadlock
                 let mut pconn = self.store.primary_conn().await?;
+                let deployment = self.site.deployment.clone();
                 pconn
-                    .transaction(|pconn| {
-                        async {
-                            let changes = pconn.promote_deployment(&self.site.deployment).await?;
-                            Ok(StoreEvent::new(changes))
-                        }
-                        .scope_boxed()
+                    .transaction(async move |pconn| {
+                        let changes = pconn.promote_deployment(&deployment).await?;
+                        Ok(StoreEvent::new(changes))
                     })
                     .await?
             };
@@ -464,18 +455,17 @@ impl SyncStore {
             // Handle on_sync actions. They only apply to copies (not
             // grafts) so we make sure that the source, if it exists, has
             // the same hash as `self.site`
-            if let Some(src) = self.writable.source_of_copy(&self.site).await? {
-                if let Some(src) = self.maybe_find_site(src).await? {
-                    if src.deployment == self.site.deployment {
-                        let on_sync = self.writable.on_sync(&self.site).await?;
-                        if on_sync.activate() {
-                            let mut pconn = self.store.primary_conn().await?;
-                            pconn.activate(&self.site.as_ref().into()).await?;
-                        }
-                        if on_sync.replace() {
-                            self.unassign_subgraph(&src).await?;
-                        }
-                    }
+            if let Some(src) = self.writable.source_of_copy(&self.site).await?
+                && let Some(src) = self.maybe_find_site(src).await?
+                && src.deployment == self.site.deployment
+            {
+                let on_sync = self.writable.on_sync(&self.site).await?;
+                if on_sync.activate() {
+                    let mut pconn = self.store.primary_conn().await?;
+                    pconn.activate(&self.site.as_ref().into()).await?;
+                }
+                if on_sync.replace() {
+                    self.unassign_subgraph(&src).await?;
                 }
             }
 
@@ -486,7 +476,7 @@ impl SyncStore {
             let mut pconn = self.store.primary_conn().await?;
             let sender = self.store.notification_sender();
             pconn
-                .transaction(|pconn| pconn.send_store_event(&sender, &event).scope_boxed())
+                .transaction(async move |pconn| pconn.send_store_event(&sender, &event).await)
                 .await
         })
         .await
@@ -503,6 +493,12 @@ impl SyncStore {
         .await
     }
 
+    async fn create_postponed_indexes(&self) -> Result<(), StoreError> {
+        self.writable
+            .create_postponed_indexes(&self.logger, self.site.cheap_clone());
+        Ok(())
+    }
+
     fn input_schema(&self) -> InputSchema {
         self.input_schema.cheap_clone()
     }
@@ -991,7 +987,7 @@ impl Queue {
                 // add to it again.
                 if queue.batch_writes() && queue.queue.len() <= 1 {
                     loop {
-                        let _section = queue.stopwatch.start_section("queue_wait");
+                        let _section = queue.stopwatch.start_section("queue_idle");
                         let req = queue.queue.peek().await;
 
                         // When this is true, push_write would never add to
@@ -1022,7 +1018,7 @@ impl Queue {
                 // the write transaction commits, causing them to return
                 // incorrect results.
                 let req = {
-                    let _section = queue.stopwatch.start_section("queue_wait");
+                    let _section = queue.stopwatch.start_section("queue_idle");
                     // Mark the request as being processed so push_write
                     // will not modify it again, even after we are done with
                     // it here
@@ -1132,7 +1128,11 @@ impl Queue {
     /// to fill up before writing them to maximize the chances that we build
     /// a 'full' write batch, i.e., one that is either big enough or old
     /// enough
-    async fn push_write(&self, batch: Batch) -> Result<(), StoreError> {
+    async fn push_write(
+        &self,
+        batch: Batch,
+        stopwatch: &StopwatchMetrics,
+    ) -> Result<(), StoreError> {
         let batch = if ENV_VARS.store.write_batch_size == 0
             || ENV_VARS.store.write_batch_duration.is_zero()
             || !self.batch_writes()
@@ -1205,6 +1205,7 @@ impl Queue {
                 self.stopwatch.cheap_clone(),
                 batch,
             );
+            let _section = stopwatch.start_section("queue_push_blocked");
             self.push(req).await?;
         }
         Ok(())
@@ -1489,7 +1490,7 @@ impl Writer {
             Writer::Sync(store) => store.transact_block_operations(&batch, stopwatch).await,
             Writer::Async { queue, .. } => {
                 self.check_queue_running()?;
-                queue.push_write(batch).await
+                queue.push_write(batch, stopwatch).await
             }
         }
     }
@@ -1815,14 +1816,14 @@ impl WritableStoreTrait for WritableStore {
             self.writer.start_batching();
         }
 
-        if let Some(block_ptr) = self.block_ptr.lock().unwrap().as_ref() {
-            if block_ptr_to.number <= block_ptr.number {
-                return Err(internal_error!(
-                    "transact_block_operations called for block {} but its head is already at {}",
-                    block_ptr_to,
-                    block_ptr
-                ));
-            }
+        if let Some(block_ptr) = self.block_ptr.lock().unwrap().as_ref()
+            && block_ptr_to.number <= block_ptr.number
+        {
+            return Err(internal_error!(
+                "transact_block_operations called for block {} but its head is already at {}",
+                block_ptr_to,
+                block_ptr
+            ));
         }
 
         let batch = Batch::new(
@@ -1834,6 +1835,7 @@ impl WritableStoreTrait for WritableStore {
             deterministic_errors,
             processed_data_sources,
             is_non_fatal_errors_active,
+            self.store.logger.clone(),
         )?;
         self.writer.write(batch, stopwatch).await?;
 
@@ -1887,6 +1889,10 @@ impl WritableStoreTrait for WritableStore {
         self.store.health().await
     }
 
+    async fn create_postponed_indexes(&self) -> Result<(), StoreError> {
+        self.store.create_postponed_indexes().await
+    }
+
     async fn flush(&self) -> Result<(), StoreError> {
         self.writer.flush().await
     }
diff --git a/store/test-store/Cargo.toml b/store/test-store/Cargo.toml
index aebee01399f..45027b972d3 100644
--- a/store/test-store/Cargo.toml
+++ b/store/test-store/Cargo.toml
@@ -12,7 +12,7 @@ graph-node = { path = "../../node" }
 graph = { path = "../../graph" }
 graph-store-postgres = { path = "../postgres" }
 graph-chain-ethereum = { path = "../../chain/ethereum" }
-lazy_static = "1.5"
+lazy_static = { workspace = true }
 hex-literal = "1.1"
 diesel = { workspace = true }
 diesel-async = { workspace = true }
diff --git a/store/test-store/src/block_store.rs b/store/test-store/src/block_store.rs
index 77bacf0ae53..70459d6b39b 100644
--- a/store/test-store/src/block_store.rs
+++ b/store/test-store/src/block_store.rs
@@ -1,16 +1,16 @@
 use std::{convert::TryFrom, str::FromStr, sync::Arc};
 
 use graph::blockchain::{BlockTime, ChainIdentifier};
+use graph::prelude::LightEthereumBlock;
 use graph::prelude::alloy::consensus::Header as ConsensusHeader;
-use graph::prelude::alloy::primitives::{Bloom, B256, U256};
+use graph::prelude::alloy::primitives::{B256, Bloom, U256};
 use graph::prelude::alloy::rpc::types::{Block, Header};
-use graph::prelude::LightEthereumBlock;
 use lazy_static::lazy_static;
 
 use graph::components::store::BlockStore;
 use graph::{
     blockchain::Block as BlockchainBlock,
-    prelude::{serde_json, BlockHash, BlockNumber, BlockPtr, EthereumBlock},
+    prelude::{BlockHash, BlockNumber, BlockPtr, EthereumBlock, serde_json},
 };
 use graph_chain_ethereum::codec::{Block as FirehoseBlock, BlockHeader};
 use prost_types::Timestamp;
@@ -117,7 +117,7 @@ impl FakeBlock {
 
         let rpc_header = Header {
             hash: block_hash,
-            inner: consensus_header,
+            inner: graph::components::ethereum::AnyHeader::from(consensus_header),
             total_difficulty: None,
             size: None,
         };
@@ -125,7 +125,7 @@ impl FakeBlock {
         let block = Block::empty(rpc_header);
 
         EthereumBlock {
-            block: Arc::new(LightEthereumBlock::new(block.into())),
+            block: Arc::new(LightEthereumBlock::new(block)),
             transaction_receipts: Vec::new(),
         }
     }
@@ -181,7 +181,7 @@ impl BlockchainBlock for FakeBlock {
         // can never be null and therefore impossible to test without manipulating the JSON blob directly.
         if let serde_json::Value::Object(ref mut map) = value {
             map.entry("block").and_modify(|ref mut block| {
-                if let serde_json::Value::Object(ref mut block) = block {
+                if let serde_json::Value::Object(block) = block {
                     block.remove_entry("timestamp");
                 }
             });
diff --git a/store/test-store/src/store.rs b/store/test-store/src/store.rs
index 8c2fb08d188..ba57dff430d 100644
--- a/store/test-store/src/store.rs
+++ b/store/test-store/src/store.rs
@@ -1,13 +1,13 @@
 use diesel;
-use graph::blockchain::mock::MockDataSource;
 use graph::blockchain::BlockTime;
 use graph::blockchain::ChainIdentifier;
-use graph::components::store::BlockStore;
+use graph::blockchain::mock::MockDataSource;
+use graph::components::store::{BlockStore, SeqGenerator};
 use graph::data::graphql::load_manager::LoadManager;
 use graph::data::query::QueryResults;
 use graph::data::query::QueryTarget;
-use graph::data::subgraph::schema::{DeploymentCreate, SubgraphError};
 use graph::data::subgraph::SubgraphFeature;
+use graph::data::subgraph::schema::{DeploymentCreate, SubgraphError};
 use graph::data_source::DataSource;
 use graph::log;
 use graph::prelude::alloy::primitives::B256;
@@ -21,16 +21,16 @@ use graph::{
     data::subgraph::status, prelude::NodeId,
 };
 use graph_graphql::prelude::{
-    execute_query, Query as PreparedQuery, QueryExecutionOptions, StoreResolver,
+    Query as PreparedQuery, QueryExecutionOptions, StoreResolver, execute_query,
 };
 use graph_graphql::test_support::GraphQLMetrics;
 use graph_node::config::{Config, Opt};
 use graph_node::store_builder::StoreBuilder;
 use graph_store_postgres::AsyncPgConnection;
 use graph_store_postgres::{
-    layout_for_tests::FAKE_NETWORK_SHARED, BlockStore as DieselBlockStore, ConnectionPool,
-    DeploymentPlacer, Shard, SubgraphStore as DieselSubgraphStore, SubscriptionManager,
-    PRIMARY_SHARD,
+    BlockStore as DieselBlockStore, ConnectionPool, DeploymentPlacer, PRIMARY_SHARD, Shard,
+    SubgraphStore as DieselSubgraphStore, SubscriptionManager,
+    layout_for_tests::FAKE_NETWORK_SHARED,
 };
 use hex_literal::hex;
 use lazy_static::lazy_static;
@@ -68,6 +68,13 @@ lazy_static! {
     pub static ref NODE_ID: NodeId = NodeId::new("test").unwrap();
     pub static ref SUBGRAPH_STORE: Arc<DieselSubgraphStore> = STORE.subgraph_store();
     static ref BLOCK_STORE: DieselBlockStore = STORE.block_store();
+    pub static ref STOPWATCH: StopwatchMetrics = StopwatchMetrics::new(
+        Logger::root(slog::Discard, o!()),
+        DeploymentHash::new("test").unwrap(),
+        "test",
+        METRICS_REGISTRY.clone(),
+        "dummy".to_string(),
+    );
     pub static ref GENESIS_PTR: BlockPtr = (
         B256::from(hex!(
             "bd34884280958002c51d3f7b5f853e6febeba33de0f40d15b0363006533c924f"
@@ -260,19 +267,9 @@ pub async fn create_test_subgraph_with_features(
     locator
 }
 
-pub async fn create_subgraph_name(name: &str) -> Result<(), StoreError> {
-    let subgraph_name = SubgraphName::new_unchecked(name.to_string());
-    SUBGRAPH_STORE.create_subgraph(subgraph_name).await?;
-    Ok(())
-}
-
 pub async fn remove_subgraph(id: &DeploymentHash) {
     let name = SubgraphName::new_unchecked(id.to_string());
-    // Ignore SubgraphNotFound errors during cleanup
-    match SUBGRAPH_STORE.remove_subgraph(name).await {
-        Ok(_) | Err(StoreError::SubgraphNotFound(_)) => {}
-        Err(e) => panic!("unexpected error removing subgraph: {}", e),
-    }
+    SUBGRAPH_STORE.remove_subgraph(name).await.unwrap();
     let locs = SUBGRAPH_STORE.locators(id.as_str()).await.unwrap();
     let mut conn = primary_connection().await;
     for loc in locs {
@@ -372,13 +369,6 @@ pub async fn transact_entities_and_dynamic_data_sources(
         Arc::new(manifest_idx_and_name),
     ))?;
 
-    let mut entity_cache = EntityCache::new(Arc::new(store.clone()));
-    entity_cache.append(ops);
-    let mods = entity_cache
-        .as_modifications(block_ptr_to.number)
-        .await
-        .expect("failed to convert to modifications")
-        .modifications;
     let metrics_registry = Arc::new(MetricsRegistry::mock());
     let stopwatch_metrics = StopwatchMetrics::new(
         Logger::root(slog::Discard, o!()),
@@ -387,6 +377,17 @@ pub async fn transact_entities_and_dynamic_data_sources(
         metrics_registry.clone(),
         store.shard().to_string(),
     );
+
+    let mut entity_cache = EntityCache::new(
+        Arc::new(store.clone()),
+        SeqGenerator::new(block_ptr_to.number),
+    );
+    entity_cache.append(ops);
+    let mods = entity_cache
+        .as_modifications(block_ptr_to.number, &stopwatch_metrics)
+        .await
+        .expect("failed to convert to modifications")
+        .modifications;
     let block_time = BlockTime::for_test(&block_ptr_to);
     store
         .transact_block_operations(
@@ -418,8 +419,8 @@ pub async fn revert_block(store: &Arc<Store>, deployment: &DeploymentLocator, pt
 }
 
 pub async fn insert_ens_name(hash: &str, name: &str) {
-    use diesel::insert_into;
     use diesel::ExpressionMethods;
+    use diesel::insert_into;
     use diesel_async::RunQueryDsl;
     use graph_store_postgres::command_support::catalog::ens_names;
 
@@ -569,7 +570,7 @@ async fn execute_subgraph_query_internal(
                 error_policy,
                 query.schema.id().clone(),
                 graphql_metrics(),
-                LOAD_MANAGER.clone()
+                LOAD_MANAGER.clone(),
             )
             .await
         );
@@ -583,6 +584,7 @@ async fn execute_subgraph_query_internal(
                 max_first: u32::MAX,
                 max_skip: u32::MAX,
                 trace,
+                log_store: std::sync::Arc::new(graph::components::log_store::NoOpLogStore),
             },
         )
         .await;
@@ -618,6 +620,7 @@ pub fn all_shards() -> Vec<Shard> {
 }
 
 fn build_store() -> (Arc<Store>, ConnectionPool, Config, Arc<SubscriptionManager>) {
+    graph::tls::install_default_crypto_provider();
     let mut opt = Opt::default();
     let url = std::env::var_os("THEGRAPH_STORE_POSTGRES_DIESEL_URL").filter(|s| !s.is_empty());
     let file = std::env::var_os("GRAPH_NODE_TEST_CONFIG").filter(|s| !s.is_empty());
@@ -625,13 +628,17 @@ fn build_store() -> (Arc<Store>, ConnectionPool, Config, Arc<SubscriptionManager
         let file = file.into_string().unwrap();
         opt.config = Some(file);
         if url.is_some() {
-            eprintln!("WARNING: ignoring THEGRAPH_STORE_POSTGRES_DIESEL_URL because GRAPH_NODE_TEST_CONFIG is set");
+            eprintln!(
+                "WARNING: ignoring THEGRAPH_STORE_POSTGRES_DIESEL_URL because GRAPH_NODE_TEST_CONFIG is set"
+            );
         }
     } else if let Some(url) = url {
         let url = url.into_string().unwrap();
         opt.postgres_url = Some(url);
     } else {
-        panic!("You must set either THEGRAPH_STORE_POSTGRES_DIESEL_URL or GRAPH_NODE_TEST_CONFIG (see ./CONTRIBUTING.md).");
+        panic!(
+            "You must set either THEGRAPH_STORE_POSTGRES_DIESEL_URL or GRAPH_NODE_TEST_CONFIG (see ./CONTRIBUTING.md)."
+        );
     }
     opt.store_connection_pool_size = CONN_POOL_SIZE;
 
diff --git a/store/test-store/tests/chain/ethereum/manifest.rs b/store/test-store/tests/chain/ethereum/manifest.rs
index a201a9c233e..b58540679ce 100644
--- a/store/test-store/tests/chain/ethereum/manifest.rs
+++ b/store/test-store/tests/chain/ethereum/manifest.rs
@@ -8,11 +8,11 @@ use async_trait::async_trait;
 use graph::amp;
 use graph::blockchain::DataSource;
 use graph::components::store::BLOCK_NUMBER_MAX;
-use graph::data::store::scalar::Bytes;
 use graph::data::store::Value;
+use graph::data::store::scalar::Bytes;
 use graph::data::subgraph::schema::SubgraphError;
 use graph::data::subgraph::{
-    Prune, LATEST_VERSION, SPEC_VERSION_0_0_4, SPEC_VERSION_0_0_7, SPEC_VERSION_0_0_8,
+    LATEST_VERSION, Prune, SPEC_VERSION_0_0_4, SPEC_VERSION_0_0_7, SPEC_VERSION_0_0_8,
     SPEC_VERSION_0_0_9, SPEC_VERSION_1_0_0, SPEC_VERSION_1_2_0, SPEC_VERSION_1_3_0,
 };
 use graph::data_source::offchain::OffchainDataSourceKind;
@@ -21,9 +21,9 @@ use graph::entity;
 use graph::env::ENV_VARS;
 use graph::prelude::alloy::primitives::B256;
 use graph::prelude::{
-    anyhow, serde_yaml, BigDecimal, BigInt, DeploymentHash, Link, SubgraphManifest,
-    SubgraphManifestResolveError, SubgraphManifestValidationError, SubgraphStore,
-    UnvalidatedSubgraphManifest,
+    BigDecimal, BigInt, DeploymentHash, Link, SubgraphManifest, SubgraphManifestResolveError,
+    SubgraphManifestValidationError, SubgraphStore, UnvalidatedSubgraphManifest, anyhow,
+    serde_yaml,
 };
 use graph::{
     blockchain::NodeCapabilities as _,
@@ -308,9 +308,10 @@ specVersion: 1.3.0
     let result = try_resolve_manifest(yaml, SPEC_VERSION_1_3_0).await;
     assert!(result.is_err());
     let err = result.unwrap_err();
-    assert!(err
-        .to_string()
-        .contains("Entity TokenStats is an aggregation and cannot be used as a mapping entity"));
+    assert!(
+        err.to_string()
+            .contains("Entity TokenStats is an aggregation and cannot be used as a mapping entity")
+    );
 }
 
 #[graph::test]
@@ -823,18 +824,18 @@ specVersion: 1.2.0
     );
 
     assert_eq!(
-        Some(vec![B256::from_str(
-            "0000000000000000000000000000000000000000000000000000000000000001"
-        )
-        .unwrap()]),
+        Some(vec![
+            B256::from_str("0000000000000000000000000000000000000000000000000000000000000001")
+                .unwrap()
+        ]),
         topic2.clone()
     );
 
     assert_eq!(
-        Some(vec![B256::from_str(
-            "0000000000000000000000000000000000000000000000000000000000000002"
-        )
-        .unwrap()]),
+        Some(vec![
+            B256::from_str("0000000000000000000000000000000000000000000000000000000000000002")
+                .unwrap()
+        ]),
         topic3.clone()
     );
 }
@@ -1763,9 +1764,10 @@ specVersion: 1.3.0
     assert!(result.is_err());
     let err = result.unwrap_err();
     println!("Error: {}", err);
-    assert!(err
-        .to_string()
-        .contains("Subgraph datasources cannot be used alongside onchain datasources"));
+    assert!(
+        err.to_string()
+            .contains("Subgraph datasources cannot be used alongside onchain datasources")
+    );
 }
 
 #[test]
@@ -1855,8 +1857,11 @@ specVersion: 1.3.0
                 assert!(matches!(e, SubgraphManifestResolveError::ResolveError(_)));
                 let error_msg = e.to_string();
                 println!("{}", error_msg);
-                assert!(error_msg
-                    .contains("Nested subgraph data sources [SubgraphSource] are not supported."));
+                assert!(
+                    error_msg.contains(
+                        "Nested subgraph data sources [SubgraphSource] are not supported."
+                    )
+                );
             }
         }
     })
@@ -1893,9 +1898,11 @@ specVersion: 1.3.0
     let result = try_resolve_manifest(yaml, SPEC_VERSION_1_3_0).await;
     assert!(result.is_err());
     let err = result.unwrap_err();
-    assert!(err
-        .to_string()
-        .contains("Entity MutableEntity is not immutable and cannot be used as a mapping entity"));
+    assert!(
+        err.to_string().contains(
+            "Entity MutableEntity is not immutable and cannot be used as a mapping entity"
+        )
+    );
 }
 
 #[graph::test]
diff --git a/store/test-store/tests/core/interfaces.rs b/store/test-store/tests/core/interfaces.rs
index 2352bd939f5..6451b173501 100644
--- a/store/test-store/tests/core/interfaces.rs
+++ b/store/test-store/tests/core/interfaces.rs
@@ -315,11 +315,9 @@ async fn conflicting_implementors_id() {
     let msg = res.unwrap_err().to_string();
     // We don't know in which order the two entities get inserted; the two
     // error messages only differ in who gets inserted first
-    const EXPECTED1: &str =
-        "tried to set entity of type `Furniture` with ID \"1\" but an entity of type `Animal`, \
+    const EXPECTED1: &str = "tried to set entity of type `Furniture` with ID \"1\" but an entity of type `Animal`, \
          which has an interface in common with `Furniture`, exists with the same ID";
-    const EXPECTED2: &str =
-        "tried to set entity of type `Animal` with ID \"1\" but an entity of type `Furniture`, \
+    const EXPECTED2: &str = "tried to set entity of type `Animal` with ID \"1\" but an entity of type `Furniture`, \
          which has an interface in common with `Animal`, exists with the same ID";
 
     assert!(msg == EXPECTED1 || msg == EXPECTED2);
diff --git a/store/test-store/tests/graph/entity_cache.rs b/store/test-store/tests/graph/entity_cache.rs
index 02b02579440..a4fe7b0a3bc 100644
--- a/store/test-store/tests/graph/entity_cache.rs
+++ b/store/test-store/tests/graph/entity_cache.rs
@@ -1,10 +1,11 @@
 use async_trait::async_trait;
-use graph::blockchain::block_stream::FirehoseCursor;
 use graph::blockchain::BlockTime;
+use graph::blockchain::block_stream::FirehoseCursor;
 use graph::components::store::{
-    DeploymentCursorTracker, DerivedEntityQuery, GetScope, LoadRelatedRequest, ReadStore,
-    StoredDynamicDataSource, WritableStore,
+    DeploymentCursorTracker, DerivedEntityQuery, EntityLfuCache, GetScope, LoadRelatedRequest,
+    ReadStore, StoredDynamicDataSource, WritableStore,
 };
+use graph::components::subgraph::BlockState;
 use graph::data::store::Id;
 use graph::data::subgraph::schema::{DeploymentCreate, SubgraphError, SubgraphHealth};
 use graph::data_source::CausalityRegion;
@@ -169,6 +170,10 @@ impl WritableStore for MockStore {
         unimplemented!()
     }
 
+    async fn create_postponed_indexes(&self) -> Result<(), StoreError> {
+        unimplemented!()
+    }
+
     async fn flush(&self) -> Result<(), StoreError> {
         unimplemented!()
     }
@@ -194,8 +199,8 @@ fn sort_by_entity_key(mut mods: Vec<EntityModification>) -> Vec<EntityModificati
 #[graph::test]
 async fn empty_cache_modifications() {
     let store = Arc::new(MockStore::new(BTreeMap::new()));
-    let cache = EntityCache::new(store);
-    let result = cache.as_modifications(0).await;
+    let cache = EntityCache::new(store, SeqGenerator::new(0));
+    let result = cache.as_modifications(0, &STOPWATCH).await;
     assert_eq!(result.unwrap().modifications, vec![]);
 }
 
@@ -206,26 +211,26 @@ async fn insert_modifications() {
     let store = MockStore::new(BTreeMap::new());
 
     let store = Arc::new(store);
-    let mut cache = EntityCache::new(store);
+    let mut cache = EntityCache::new(store, SeqGenerator::new(0));
 
     let mut mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai" };
     let mogwai_key = make_band_key("mogwai");
     cache
-        .set(mogwai_key.clone(), mogwai_data.clone(), 0, None)
+        .set(mogwai_key.clone(), mogwai_data.clone(), None)
         .await
         .unwrap();
 
     let mut sigurros_data = entity! { SCHEMA => id: "sigurros", name: "Sigur Ros" };
     let sigurros_key = make_band_key("sigurros");
     cache
-        .set(sigurros_key.clone(), sigurros_data.clone(), 0, None)
+        .set(sigurros_key.clone(), sigurros_data.clone(), None)
         .await
         .unwrap();
 
     mogwai_data.set_vid(100).unwrap();
     sigurros_data.set_vid(101).unwrap();
 
-    let result = cache.as_modifications(0).await;
+    let result = cache.as_modifications(0, &STOPWATCH).await;
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
@@ -257,26 +262,26 @@ async fn overwrite_modifications() {
     };
 
     let store = Arc::new(store);
-    let mut cache = EntityCache::new(store);
+    let mut cache = EntityCache::new(store, SeqGenerator::new(0));
 
     let mut mogwai_data = entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995 };
     let mogwai_key = make_band_key("mogwai");
     cache
-        .set(mogwai_key.clone(), mogwai_data.clone(), 0, None)
+        .set(mogwai_key.clone(), mogwai_data.clone(), None)
         .await
         .unwrap();
 
     let mut sigurros_data = entity! { SCHEMA => id: "sigurros", name: "Sigur Ros", founded: 1994};
     let sigurros_key = make_band_key("sigurros");
     cache
-        .set(sigurros_key.clone(), sigurros_data.clone(), 0, None)
+        .set(sigurros_key.clone(), sigurros_data.clone(), None)
         .await
         .unwrap();
 
     mogwai_data.set_vid(100).unwrap();
     sigurros_data.set_vid(101).unwrap();
 
-    let result = cache.as_modifications(0).await;
+    let result = cache.as_modifications(0, &STOPWATCH).await;
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
@@ -298,25 +303,25 @@ async fn consecutive_modifications() {
     };
 
     let store = Arc::new(store);
-    let mut cache = EntityCache::new(store);
+    let mut cache = EntityCache::new(store, SeqGenerator::new(0));
 
     // First, add "founded" and change the "label".
     let update_data =
         entity! { SCHEMA => id: "mogwai", founded: 1995, label: "Rock Action Records" };
     let update_key = make_band_key("mogwai");
-    cache.set(update_key, update_data, 0, None).await.unwrap();
+    cache.set(update_key, update_data, None).await.unwrap();
 
     // Then, just reset the "label".
     let update_data = entity! { SCHEMA => id: "mogwai", label: Value::Null };
     let update_key = make_band_key("mogwai");
     cache
-        .set(update_key.clone(), update_data, 0, None)
+        .set(update_key.clone(), update_data, None)
         .await
         .unwrap();
 
     // We expect a single overwrite modification for the above that leaves "id"
     // and "name" untouched, sets "founded" and removes the "label" field.
-    let result = cache.as_modifications(0).await;
+    let result = cache.as_modifications(0, &STOPWATCH).await;
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![EntityModification::overwrite(
@@ -331,7 +336,7 @@ async fn consecutive_modifications() {
 async fn check_vid_sequence() {
     let store = MockStore::new(BTreeMap::new());
     let store = Arc::new(store);
-    let mut cache = EntityCache::new(store);
+    let mut cache = EntityCache::new(store, SeqGenerator::new(0));
 
     for n in 0..10 {
         let id = (10 - n).to_string();
@@ -339,12 +344,12 @@ async fn check_vid_sequence() {
         let mogwai_key = make_band_key(id.as_str());
         let mogwai_data = entity! { SCHEMA => id: id, name: name };
         cache
-            .set(mogwai_key.clone(), mogwai_data.clone(), 0, None)
+            .set(mogwai_key.clone(), mogwai_data.clone(), None)
             .await
             .unwrap();
     }
 
-    let result = cache.as_modifications(0).await;
+    let result = cache.as_modifications(0, &STOPWATCH).await;
     let mods = result.unwrap().modifications;
     for m in mods {
         match m {
@@ -366,6 +371,134 @@ async fn check_vid_sequence() {
     }
 }
 
+// Test that demonstrates the VID collision bug when multiple offchain triggers
+// use separate VidGenerators. Each gets its own sequence starting at RESERVED_VIDS
+// (100), so entities in the same block get identical VIDs.
+#[graph::test]
+async fn offchain_trigger_vid_collision_without_shared_generator() {
+    let block: i32 = 2_163_923;
+
+    // Simulate first offchain trigger with its own VidGenerator
+    let store1 = Arc::new(MockStore::new(BTreeMap::new()));
+    let mut cache1 = EntityCache::new(store1, SeqGenerator::new(block));
+    let band1_data = entity! { SCHEMA => id: "band1", name: "First Band" };
+    let band1_key = make_band_key("band1");
+    cache1
+        .set(band1_key.clone(), band1_data, None)
+        .await
+        .unwrap();
+    let result1 = cache1.as_modifications(block, &STOPWATCH).await.unwrap();
+
+    // Simulate second offchain trigger with a SEPARATE VidGenerator
+    let store2 = Arc::new(MockStore::new(BTreeMap::new()));
+    let mut cache2 = EntityCache::new(store2, SeqGenerator::new(block));
+    let band2_data = entity! { SCHEMA => id: "band2", name: "Second Band" };
+    let band2_key = make_band_key("band2");
+    cache2
+        .set(band2_key.clone(), band2_data, None)
+        .await
+        .unwrap();
+    let result2 = cache2.as_modifications(block, &STOPWATCH).await.unwrap();
+
+    let vid1 = match &result1.modifications[0] {
+        EntityModification::Insert { data, .. } => data.vid(),
+        _ => panic!("expected Insert"),
+    };
+    let vid2 = match &result2.modifications[0] {
+        EntityModification::Insert { data, .. } => data.vid(),
+        _ => panic!("expected Insert"),
+    };
+
+    // BUG: Both VIDs are identical because each VidGenerator starts at 100
+    let expected_vid = ((block as i64) << 32) + 100;
+    assert_eq!(vid1, expected_vid);
+    assert_eq!(vid2, expected_vid);
+    assert_eq!(vid1, vid2, "VIDs collide when using separate VidGenerators");
+}
+
+// Test that demonstrates the fix: sharing a single VidGenerator across
+// multiple EntityCaches prevents VID collisions.
+#[graph::test]
+async fn offchain_trigger_vid_no_collision_with_shared_generator() {
+    let block: i32 = 2_163_923;
+    let vid_gen = SeqGenerator::new(block);
+
+    // First offchain trigger
+    let store1 = Arc::new(MockStore::new(BTreeMap::new()));
+    let mut cache1 = EntityCache::new(store1, vid_gen.cheap_clone());
+    let band1_data = entity! { SCHEMA => id: "band1", name: "First Band" };
+    let band1_key = make_band_key("band1");
+    cache1
+        .set(band1_key.clone(), band1_data, None)
+        .await
+        .unwrap();
+    let result1 = cache1.as_modifications(block, &STOPWATCH).await.unwrap();
+
+    // Second offchain trigger shares the same VidGenerator
+    let store2 = Arc::new(MockStore::new(BTreeMap::new()));
+    let mut cache2 = EntityCache::new(store2, vid_gen.cheap_clone());
+    let band2_data = entity! { SCHEMA => id: "band2", name: "Second Band" };
+    let band2_key = make_band_key("band2");
+    cache2
+        .set(band2_key.clone(), band2_data, None)
+        .await
+        .unwrap();
+    let result2 = cache2.as_modifications(block, &STOPWATCH).await.unwrap();
+
+    let vid1 = match &result1.modifications[0] {
+        EntityModification::Insert { data, .. } => data.vid(),
+        _ => panic!("expected Insert"),
+    };
+    let vid2 = match &result2.modifications[0] {
+        EntityModification::Insert { data, .. } => data.vid(),
+        _ => panic!("expected Insert"),
+    };
+
+    // With a shared VidGenerator, VIDs are different
+    assert_ne!(
+        vid1, vid2,
+        "VIDs should NOT collide when sharing a VidGenerator"
+    );
+    let expected_vid1 = ((block as i64) << 32) + 100;
+    let expected_vid2 = ((block as i64) << 32) + 101;
+    assert_eq!(vid1, expected_vid1, "first trigger starts at vid_seq 100");
+    assert_eq!(
+        vid2, expected_vid2,
+        "second trigger continues at vid_seq 101"
+    );
+}
+
+// Simulate the ipfs.map() pattern: multiple EntityCache instances each create
+// an entity using a shared SeqGenerator. VIDs must be unique and sequential.
+#[graph::test]
+async fn ipfs_map_pattern_vid_uniqueness() {
+    let block: i32 = 42;
+    let vid_gen = SeqGenerator::new(block);
+
+    let mut all_vids = Vec::new();
+    for i in 0..5u32 {
+        let store = Arc::new(MockStore::new(BTreeMap::new()));
+        let mut cache = EntityCache::new(store, vid_gen.cheap_clone());
+        let data = entity! { SCHEMA => id: format!("band{i}"), name: format!("Band {i}") };
+        let key = make_band_key(&format!("band{i}"));
+        cache.set(key, data, None).await.unwrap();
+        let result = cache.as_modifications(block, &STOPWATCH).await.unwrap();
+        let vid = match &result.modifications[0] {
+            EntityModification::Insert { data, .. } => data.vid(),
+            _ => panic!("expected Insert"),
+        };
+        all_vids.push(vid);
+    }
+
+    for i in 1..all_vids.len() {
+        assert_eq!(
+            all_vids[i],
+            all_vids[i - 1] + 1,
+            "VIDs should be sequential"
+        );
+    }
+}
+
 const ACCOUNT_GQL: &str = "
     type Account @entity {
         id: ID!
@@ -440,7 +573,7 @@ where
 
         let read_store = Arc::new(writable.clone());
 
-        let cache = EntityCache::new(read_store);
+        let cache = EntityCache::new(read_store, SeqGenerator::new(0));
         // Run test and wait for the background writer to finish its work so
         // it won't conflict with the next test
         test(cache, subgraph_store.clone(), deployment, writable.clone()).await;
@@ -773,7 +906,7 @@ fn scoped_get() {
         let mut wallet5 = create_wallet_entity_no_vid("5", &account5, 100);
         let key5 = WALLET_TYPE.parse_key("5").unwrap();
         cache
-            .set(key5.clone(), wallet5.clone(), 0, None)
+            .set(key5.clone(), wallet5.clone(), None)
             .await
             .unwrap();
 
@@ -801,7 +934,7 @@ fn scoped_get() {
         let mut wallet1 = wallet1;
         wallet1.set("balance", 70).unwrap();
         cache
-            .set(key1.clone(), wallet1.clone(), 0, None)
+            .set(key1.clone(), wallet1.clone(), None)
             .await
             .unwrap();
         wallet1a = wallet1;
@@ -852,6 +985,382 @@ fn no_interface_mods() {
 
         let entity = entity! { LOAD_RELATED_SUBGRAPH => id: "1", balance: 100 };
 
-        cache.set(key, entity, 0, None).await.unwrap_err();
+        cache.set(key, entity, None).await.unwrap_err();
     })
 }
+
+// ---------------------------------------------------------------------------
+// Tests for `EntityCache::load_related` under same-block changes to
+// derived field membership. Each test exercises a write that should
+// move an entity into or out of an `account.wallets` derived
+// collection (reassignment, removal, or fresh creation), asserting
+// that the returned collection reflects the entity's final state.
+//
+// Fixture (from `insert_test_data`):
+//   - account "1" owns wallets "1", "2", "3"
+//   - account "2" owns wallet "4"
+//   - account "3" owns no wallets
+//
+// Tests that need writes in `EntityCache::handler_updates` (rather than
+// `updates`) drive a handler lifecycle through `BlockState::enter_handler`
+// / `exit_handler`. `EntityCache` has two in-block write layers: writes
+// outside a handler go to `self.updates`; writes inside an active
+// handler go to `self.handler_updates`. `exit_handler` merges
+// `handler_updates` into `updates`. Driving this lifecycle requires
+// `BlockState` because the `enter`/`exit` methods on `EntityCache` are
+// crate-private.
+// ---------------------------------------------------------------------------
+
+/// Wallet "1" is reassigned from account "1" to account "3" within a
+/// single handler. Account "1"'s derived `wallets` collection must
+/// reflect the final state and exclude wallet "1".
+#[test]
+fn load_related_excludes_wallet_that_leaves_collection() {
+    run_store_test(|mut cache, _store, _deployment, _writable| async move {
+        let acc_1 = ACCOUNT_TYPE.parse_id("1").unwrap();
+        let acc_3 = ACCOUNT_TYPE.parse_id("3").unwrap();
+        let wallet_1_key = WALLET_TYPE.parse_key("1").unwrap();
+
+        // Precondition: fixture placed wallet "1" under account "1".
+        // The `set` below is a reassignment of an existing row.
+        let pre = cache
+            .get(&wallet_1_key, GetScope::Store)
+            .await
+            .unwrap()
+            .expect("fixture should have inserted wallet 1");
+        assert_eq!(pre.get("account").unwrap(), &Value::from(acc_1.clone()));
+
+        let reassigned = create_wallet_entity_no_vid("1", &acc_3, 67_i32);
+        cache.set(wallet_1_key, reassigned, None).await.unwrap();
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_1.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = cache.load_related(&request).await.unwrap();
+
+        let result_ids: Vec<_> = result
+            .iter()
+            .map(|e| e.get("id").unwrap().clone())
+            .collect();
+
+        assert_eq!(
+            result.len(),
+            2,
+            "account 1 should own 2 wallets after reassignment, got {:?}",
+            result_ids,
+        );
+        for w in &result {
+            assert_eq!(
+                w.get("account").unwrap(),
+                &Value::from(acc_1.clone()),
+                "every wallet in account 1's collection must have account=1, got {:?}",
+                w,
+            );
+        }
+    });
+}
+
+/// Wallet "4" is moved from account "2" to account "3" in handler 1,
+/// then back to account "2" in handler 2. Account "3"'s derived
+/// `wallets` collection must reflect the final state and exclude
+/// wallet "4".
+#[test]
+fn load_related_excludes_wallet_that_leaves_collection_across_handlers() {
+    run_store_test(|_cache, _store, _deployment, writable| async move {
+        let acc_2 = ACCOUNT_TYPE.parse_id("2").unwrap();
+        let acc_3 = ACCOUNT_TYPE.parse_id("3").unwrap();
+        let wallet_4_key = WALLET_TYPE.parse_key("4").unwrap();
+
+        let mut state = BlockState::new(
+            writable.clone(),
+            EntityLfuCache::new(),
+            SeqGenerator::new(10),
+        );
+
+        // Precondition: fixture placed wallet "4" under account "2".
+        let pre = writable
+            .get(&wallet_4_key)
+            .await
+            .unwrap()
+            .expect("fixture should have inserted wallet 4");
+        assert_eq!(pre.get("account").unwrap(), &Value::from(acc_2.clone()));
+
+        // Handler 1: move wallet "4" to account "3". On exit, this
+        // write is promoted from handler_updates into updates.
+        state.enter_handler();
+        state
+            .entity_cache
+            .set(
+                wallet_4_key.clone(),
+                create_wallet_entity_no_vid("4", &acc_3, 32_i32),
+                None,
+            )
+            .await
+            .unwrap();
+        state.exit_handler();
+
+        // Handler 2: move wallet "4" back to account "2". This write
+        // is in handler_updates; the prior handler's write is in updates.
+        state.enter_handler();
+        state
+            .entity_cache
+            .set(
+                wallet_4_key,
+                create_wallet_entity_no_vid("4", &acc_2, 32_i32),
+                None,
+            )
+            .await
+            .unwrap();
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_3.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = state.entity_cache.load_related(&request).await.unwrap();
+
+        assert!(
+            result.is_empty(),
+            "account 3 should own no wallets (wallet 4's final account is 2), got {:?}",
+            result,
+        );
+    });
+}
+
+/// Wallet "4" is touched in handler 1 without changing its `account`,
+/// then reassigned from account "2" to account "3" in handler 2.
+/// Account "3"'s derived `wallets` collection must reflect the final
+/// state and include wallet "4".
+#[test]
+fn load_related_includes_wallet_that_joins_collection_across_handlers() {
+    run_store_test(|_cache, _store, _deployment, writable| async move {
+        let acc_2 = ACCOUNT_TYPE.parse_id("2").unwrap();
+        let acc_3 = ACCOUNT_TYPE.parse_id("3").unwrap();
+        let wallet_4_key = WALLET_TYPE.parse_key("4").unwrap();
+
+        let mut state = BlockState::new(
+            writable.clone(),
+            EntityLfuCache::new(),
+            SeqGenerator::new(10),
+        );
+
+        // Precondition: fixture placed wallet "4" under account "2".
+        let pre = writable
+            .get(&wallet_4_key)
+            .await
+            .unwrap()
+            .expect("fixture should have inserted wallet 4");
+        assert_eq!(pre.get("account").unwrap(), &Value::from(acc_2.clone()));
+
+        // Handler 1: touch wallet "4" (bump balance) but keep its account.
+        // On exit, this write is promoted into updates.
+        state.enter_handler();
+        state
+            .entity_cache
+            .set(
+                wallet_4_key.clone(),
+                create_wallet_entity_no_vid("4", &acc_2, 999_i32),
+                None,
+            )
+            .await
+            .unwrap();
+        state.exit_handler();
+
+        // Handler 2: reassign wallet "4" to account "3". This write is
+        // in handler_updates; handler 1's write remains in updates.
+        state.enter_handler();
+        state
+            .entity_cache
+            .set(
+                wallet_4_key.clone(),
+                create_wallet_entity_no_vid("4", &acc_3, 999_i32),
+                None,
+            )
+            .await
+            .unwrap();
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_3.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = state.entity_cache.load_related(&request).await.unwrap();
+
+        assert_eq!(
+            result.len(),
+            1,
+            "account 3 should own wallet 4 after reassignment, got {:?}",
+            result,
+        );
+        assert_eq!(result[0].get("id").unwrap(), &Value::from("4"),);
+        assert_eq!(
+            result[0].get("account").unwrap(),
+            &Value::from(acc_3.clone()),
+            "wallet 4 must carry handler 2's post-merge account=3",
+        );
+    });
+}
+
+/// Wallet "1" is removed via a write that lands directly in
+/// `EntityCache::updates` (no active handler). Account "1"'s derived
+/// `wallets` collection must reflect the final state and exclude
+/// wallet "1".
+#[test]
+fn load_related_excludes_wallet_removed_via_updates() {
+    run_store_test(|mut cache, _store, _deployment, _writable| async move {
+        let acc_1 = ACCOUNT_TYPE.parse_id("1").unwrap();
+        let wallet_1_key = WALLET_TYPE.parse_key("1").unwrap();
+
+        // Precondition: fixture placed wallet "1" under account "1".
+        let pre = cache
+            .get(&wallet_1_key, GetScope::Store)
+            .await
+            .unwrap()
+            .expect("fixture should have inserted wallet 1");
+        assert_eq!(pre.get("account").unwrap(), &Value::from(acc_1.clone()));
+
+        cache.remove(wallet_1_key);
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_1.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = cache.load_related(&request).await.unwrap();
+
+        let result_ids: Vec<_> = result
+            .iter()
+            .map(|e| e.get("id").unwrap().clone())
+            .collect();
+
+        assert_eq!(
+            result.len(),
+            2,
+            "account 1 should own 2 wallets after wallet 1 is removed, got {:?}",
+            result_ids,
+        );
+        assert!(
+            !result_ids.contains(&Value::from("1")),
+            "removed wallet 1 must not appear, got {:?}",
+            result_ids,
+        );
+    });
+}
+
+/// Wallet "1" is removed inside an active handler so the Remove op
+/// sits in `EntityCache::handler_updates` at query time. Account "1"'s
+/// derived `wallets` collection must reflect the final state and
+/// exclude wallet "1".
+#[test]
+fn load_related_excludes_wallet_removed_via_handler_updates() {
+    run_store_test(|_cache, _store, _deployment, writable| async move {
+        let acc_1 = ACCOUNT_TYPE.parse_id("1").unwrap();
+        let wallet_1_key = WALLET_TYPE.parse_key("1").unwrap();
+
+        let mut state = BlockState::new(
+            writable.clone(),
+            EntityLfuCache::new(),
+            SeqGenerator::new(10),
+        );
+
+        // Precondition: fixture placed wallet "1" under account "1".
+        let pre = writable
+            .get(&wallet_1_key)
+            .await
+            .unwrap()
+            .expect("fixture should have inserted wallet 1");
+        assert_eq!(pre.get("account").unwrap(), &Value::from(acc_1.clone()));
+
+        // Remove wallet "1" inside an active handler. The Remove op
+        // sits in handler_updates and is queried before exit_handler.
+        state.enter_handler();
+        state.entity_cache.remove(wallet_1_key);
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_1.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = state.entity_cache.load_related(&request).await.unwrap();
+
+        let result_ids: Vec<_> = result
+            .iter()
+            .map(|e| e.get("id").unwrap().clone())
+            .collect();
+
+        assert_eq!(
+            result.len(),
+            2,
+            "account 1 should own 2 wallets after wallet 1 is removed, got {:?}",
+            result_ids,
+        );
+        assert!(
+            !result_ids.contains(&Value::from("1")),
+            "removed wallet 1 must not appear, got {:?}",
+            result_ids,
+        );
+    });
+}
+
+/// A wallet is created inside a handler with no prior store baseline.
+/// `load_related` called from the same handler must observe the new
+/// wallet in its parent account's derived collection.
+#[test]
+fn load_related_includes_wallet_created_in_handler() {
+    run_store_test(|_cache, _store, _deployment, writable| async move {
+        let acc_3 = ACCOUNT_TYPE.parse_id("3").unwrap();
+        let new_wallet_key = WALLET_TYPE.parse_key("99").unwrap();
+
+        let mut state = BlockState::new(
+            writable.clone(),
+            EntityLfuCache::new(),
+            SeqGenerator::new(10),
+        );
+
+        // Precondition: account "3" starts with no wallets and
+        // wallet "99" does not exist in the store.
+        assert!(
+            writable.get(&new_wallet_key).await.unwrap().is_none(),
+            "wallet 99 should not exist in the store baseline",
+        );
+
+        // Create a fresh wallet under account "3" inside a handler.
+        state.enter_handler();
+        state
+            .entity_cache
+            .set(
+                new_wallet_key,
+                create_wallet_entity_no_vid("99", &acc_3, 500_i32),
+                None,
+            )
+            .await
+            .unwrap();
+
+        let request = LoadRelatedRequest {
+            entity_type: ACCOUNT_TYPE.clone(),
+            entity_field: "wallets".into(),
+            entity_id: acc_3.clone(),
+            causality_region: CausalityRegion::ONCHAIN,
+        };
+        let result = state.entity_cache.load_related(&request).await.unwrap();
+
+        assert_eq!(
+            result.len(),
+            1,
+            "account 3 should own the newly created wallet 99, got {:?}",
+            result,
+        );
+        assert_eq!(result[0].get("id").unwrap(), &Value::from("99"));
+        assert_eq!(
+            result[0].get("account").unwrap(),
+            &Value::from(acc_3.clone()),
+        );
+    });
+}
diff --git a/store/test-store/tests/graphql/introspection.rs b/store/test-store/tests/graphql/introspection.rs
index 6a978bccfc5..bda2cb99b31 100644
--- a/store/test-store/tests/graphql/introspection.rs
+++ b/store/test-store/tests/graphql/introspection.rs
@@ -5,16 +5,16 @@ use std::time::Duration;
 
 use async_trait::async_trait;
 use graph::components::store::QueryPermit;
-use graph::data::graphql::{object_value, ObjectOrInterface};
+use graph::data::graphql::{ObjectOrInterface, object_value};
 use graph::data::query::Trace;
 use graph::prelude::{
-    o, q, r, s, serde_json, slog, tokio, DeploymentHash, Logger, Query, QueryExecutionError,
-    QueryResult,
+    DeploymentHash, Logger, Query, QueryExecutionError, QueryResult, o, q, r, s, serde_json, slog,
+    tokio,
 };
 use graph::schema::{ApiSchema, InputSchema};
 
 use graph_graphql::prelude::{
-    a, execute_query, ExecutionContext, Query as PreparedQuery, QueryExecutionOptions, Resolver,
+    ExecutionContext, Query as PreparedQuery, QueryExecutionOptions, Resolver, a, execute_query,
 };
 use test_store::graphql_metrics;
 
@@ -125,6 +125,7 @@ async fn introspection_query(schema: Arc<ApiSchema>, query: &str) -> QueryResult
         max_first: u32::MAX,
         max_skip: u32::MAX,
         trace: false,
+        log_store: Arc::new(graph::components::log_store::NoOpLogStore),
     };
 
     let result =
@@ -883,6 +884,8 @@ async fn successfully_runs_introspection_query_against_complex_schema() {
           description
           type { ...TypeRef }
           defaultValue
+          isDeprecated
+          deprecationReason
         }
 
         fragment TypeRef on __Type {
diff --git a/store/test-store/tests/graphql/mock_introspection.json b/store/test-store/tests/graphql/mock_introspection.json
index d2eca61b928..802c423bf63 100644
--- a/store/test-store/tests/graphql/mock_introspection.json
+++ b/store/test-store/tests/graphql/mock_introspection.json
@@ -6,6 +6,29 @@
     "mutationType": null,
     "subscriptionType": null,
     "types": [
+      {
+        "kind": "ENUM",
+        "name": "Aggregation_current",
+        "description": "Indicates whether the current, partially filled bucket should be included in the response. Defaults to `exclude`",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "exclude",
+            "description": "Exclude the current, partially filled bucket from the response",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "include",
+            "description": "Include the current, partially filled bucket in the response",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "ENUM",
         "name": "Aggregation_interval",
@@ -175,6 +198,47 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "LogLevel",
+        "description": "The severity level of a log entry.\nLog levels are ordered from most to least severe: CRITICAL > ERROR > WARNING > INFO > DEBUG",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "CRITICAL",
+            "description": "Critical errors that require immediate attention",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ERROR",
+            "description": "Error conditions that indicate a failure",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "WARNING",
+            "description": "Warning conditions that may require attention",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "INFO",
+            "description": "Informational messages about normal operations",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "DEBUG",
+            "description": "Detailed diagnostic information for debugging",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "INTERFACE",
         "name": "Node",
@@ -720,6 +784,101 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "_logs",
+            "description": "Query execution logs emitted by the subgraph during indexing. Results are sorted by timestamp in descending order (newest first).",
+            "args": [
+              {
+                "name": "level",
+                "description": "Filter logs by severity level. Only logs at this level will be returned.",
+                "type": {
+                  "kind": "ENUM",
+                  "name": "LogLevel",
+                  "ofType": null
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "from",
+                "description": "Filter logs from this timestamp onwards (inclusive). Must be in RFC3339 format (e.g., '2024-01-15T10:30:00Z').",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "to",
+                "description": "Filter logs until this timestamp (inclusive). Must be in RFC3339 format (e.g., '2024-01-15T23:59:59Z').",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "search",
+                "description": "Search for logs containing this text in the message. Case-insensitive substring match. Maximum length: 1000 characters.",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                },
+                "defaultValue": null
+              },
+              {
+                "name": "first",
+                "description": "Maximum number of logs to return. Default: 100, Maximum: 1000.",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "100"
+              },
+              {
+                "name": "skip",
+                "description": "Number of logs to skip (for pagination). Default: 0, Maximum: 10000.",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0"
+              },
+              {
+                "name": "orderDirection",
+                "description": "Sort direction for results. Default: desc (newest first).",
+                "type": {
+                  "kind": "ENUM",
+                  "name": "OrderDirection",
+                  "ofType": null
+                },
+                "defaultValue": "desc"
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "_Log_",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -1344,6 +1503,239 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "_LogArgument_",
+        "description": "A key-value pair of additional data associated with a log entry.\nThese correspond to arguments passed to the log function in the subgraph code.",
+        "fields": [
+          {
+            "name": "key",
+            "description": "The parameter name",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "value",
+            "description": "The parameter value, serialized as a string",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "_LogMeta_",
+        "description": "Source code location metadata for a log entry.\nIndicates where in the subgraph's AssemblyScript code the log statement was executed.",
+        "fields": [
+          {
+            "name": "module",
+            "description": "The module or file path where the log was emitted",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "line",
+            "description": "The line number in the source file",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "column",
+            "description": "The column number in the source file",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "_Log_",
+        "description": "A log entry emitted by a subgraph during indexing.\nLogs can be generated by the subgraph's AssemblyScript code using the `log.*` functions.",
+        "fields": [
+          {
+            "name": "id",
+            "description": "Unique identifier for this log entry",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "subgraphId",
+            "description": "The deployment hash of the subgraph that emitted this log",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "timestamp",
+            "description": "The timestamp when the log was emitted, in RFC3339 format (e.g., '2024-01-15T10:30:00Z')",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "level",
+            "description": "The severity level of the log entry",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "LogLevel",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "text",
+            "description": "The log message text",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "arguments",
+            "description": "Additional structured data passed to the log function as key-value pairs",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "_LogArgument_",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "meta",
+            "description": "Metadata about the source location in the subgraph code where the log was emitted",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "_LogMeta_",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "_Meta_",
@@ -1431,7 +1823,9 @@
       {
         "name": "language",
         "description": null,
-        "locations": ["FIELD_DEFINITION"],
+        "locations": [
+          "FIELD_DEFINITION"
+        ],
         "args": [
           {
             "name": "language",
@@ -1448,7 +1842,11 @@
       {
         "name": "skip",
         "description": null,
-        "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+        "locations": [
+          "FIELD",
+          "FRAGMENT_SPREAD",
+          "INLINE_FRAGMENT"
+        ],
         "args": [
           {
             "name": "if",
@@ -1469,7 +1867,11 @@
       {
         "name": "include",
         "description": null,
-        "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+        "locations": [
+          "FIELD",
+          "FRAGMENT_SPREAD",
+          "INLINE_FRAGMENT"
+        ],
         "args": [
           {
             "name": "if",
@@ -1490,13 +1892,17 @@
       {
         "name": "entity",
         "description": "Marks the GraphQL type as indexable entity.  Each type that should be an entity is required to be annotated with this directive.",
-        "locations": ["OBJECT"],
+        "locations": [
+          "OBJECT"
+        ],
         "args": []
       },
       {
         "name": "subgraphId",
         "description": "Defined a Subgraph ID for an object type",
-        "locations": ["OBJECT"],
+        "locations": [
+          "OBJECT"
+        ],
         "args": [
           {
             "name": "id",
@@ -1517,7 +1923,9 @@
       {
         "name": "derivedFrom",
         "description": "creates a virtual field on the entity that may be queried but cannot be set manually through the mappings API.",
-        "locations": ["FIELD_DEFINITION"],
+        "locations": [
+          "FIELD_DEFINITION"
+        ],
         "args": [
           {
             "name": "field",
diff --git a/store/test-store/tests/graphql/query.rs b/store/test-store/tests/graphql/query.rs
index f206fe2644f..d2410d62b2e 100644
--- a/store/test-store/tests/graphql/query.rs
+++ b/store/test-store/tests/graphql/query.rs
@@ -1,21 +1,21 @@
 use graph::blockchain::{Block, BlockTime};
 use graph::data::query::Trace;
 use graph::data::store::scalar::Timestamp;
-use graph::data::subgraph::schema::DeploymentCreate;
 use graph::data::subgraph::LATEST_VERSION;
+use graph::data::subgraph::schema::DeploymentCreate;
 use graph::entity;
 use graph::prelude::Value;
 use graph::schema::InputSchema;
 use std::iter::FromIterator;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Instant;
 use std::{
     collections::{BTreeSet, HashMap},
     marker::PhantomData,
 };
 use test_store::block_store::{
-    FakeBlock, BLOCK_FOUR, BLOCK_ONE, BLOCK_THREE, BLOCK_TWO, GENESIS_BLOCK,
+    BLOCK_FOUR, BLOCK_ONE, BLOCK_THREE, BLOCK_TWO, FakeBlock, GENESIS_BLOCK,
 };
 
 use graph::{
@@ -27,16 +27,15 @@ use graph::{
         subgraph::SubgraphFeature,
     },
     prelude::{
-        lazy_static, q, r, serde_json, BlockPtr, DeploymentHash, Entity, EntityOperation,
-        GraphQlRunner as _, NodeId, Query, QueryError, QueryExecutionError, QueryResult,
-        QueryVariables, SubgraphManifest, SubgraphName, SubgraphStore,
-        SubgraphVersionSwitchingMode,
+        BlockPtr, DeploymentHash, Entity, EntityOperation, GraphQlRunner as _, NodeId, Query,
+        QueryError, QueryExecutionError, QueryResult, QueryVariables, SubgraphManifest,
+        SubgraphName, SubgraphStore, SubgraphVersionSwitchingMode, lazy_static, q, r, serde_json,
     },
 };
 use graph_graphql::prelude::*;
 use test_store::{
-    deployment_state, execute_subgraph_query, execute_subgraph_query_with_deadline, revert_block,
-    run_test_sequentially, transact_errors, Store, LOAD_MANAGER, LOGGER, METRICS_REGISTRY, STORE,
+    LOAD_MANAGER, LOGGER, METRICS_REGISTRY, STORE, Store, deployment_state, execute_subgraph_query,
+    execute_subgraph_query_with_deadline, revert_block, run_test_sequentially, transact_errors,
 };
 
 /// Ids for the various entities that we create in `insert_entities` and
@@ -616,6 +615,7 @@ async fn execute_query_document_with_variables(
         STORE.clone(),
         LOAD_MANAGER.clone(),
         METRICS_REGISTRY.clone(),
+        Arc::new(graph::components::log_store::NoOpLogStore),
     ));
     let target = QueryTarget::Deployment(id.clone(), Default::default());
     let query = Query::new(query, variables, false);
@@ -726,6 +726,7 @@ where
                     STORE.clone(),
                     LOAD_MANAGER.clone(),
                     METRICS_REGISTRY.clone(),
+                    Arc::new(graph::components::log_store::NoOpLogStore),
                 ));
                 let target = QueryTarget::Deployment(id.clone(), Default::default());
                 let query = Query::new(query, variables, false);
@@ -2160,7 +2161,10 @@ fn leaf_selection_mismatch() {
                         _pos,
                         message,
                     )) => {
-                        assert_eq!(message, "Field \"name\" must not have a selection since type \"String!\" has no subfields.");
+                        assert_eq!(
+                            message,
+                            "Field \"name\" must not have a selection since type \"String!\" has no subfields."
+                        );
                     }
                     r => panic!("unexpexted query error: {:?}", r),
                 };
@@ -2196,7 +2200,10 @@ fn leaf_selection_mismatch() {
                         _pos,
                         message,
                     )) => {
-                        assert_eq!(message, "Field \"mainBand\" of type \"Band\" must have a selection of subfields. Did you mean \"mainBand { ... }\"?");
+                        assert_eq!(
+                            message,
+                            "Field \"mainBand\" of type \"Band\" must have a selection of subfields. Did you mean \"mainBand { ... }\"?"
+                        );
                     }
                     r => panic!("unexpexted query error: {:?}", r),
                 };
diff --git a/store/test-store/tests/graphql/sql.rs b/store/test-store/tests/graphql/sql.rs
index ba0b1613879..27802ef469b 100644
--- a/store/test-store/tests/graphql/sql.rs
+++ b/store/test-store/tests/graphql/sql.rs
@@ -4,15 +4,15 @@
 use graph::components::store::QueryStoreManager;
 use graph::data::query::QueryTarget;
 use graph::data::store::SqlQueryObject;
-use graph::prelude::{r, QueryExecutionError};
+use graph::prelude::{QueryExecutionError, r};
 use std::collections::BTreeSet;
-use test_store::{run_test_sequentially, STORE};
+use test_store::{STORE, run_test_sequentially};
 
 #[cfg(debug_assertions)]
 use graph::env::ENV_VARS;
 
 // Import test setup from query.rs module
-use super::query::{setup, IdType};
+use super::query::{IdType, setup};
 
 /// Synchronous wrapper for SQL query execution
 fn run_sql_query<F>(sql: &str, test: F)
@@ -52,12 +52,11 @@ fn sql_can_query_simple_select() {
         assert_eq!(results.len(), 5, "Should return 5 musicians");
 
         // Check first musician
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                if let Some(r::Value::String(name)) = obj.get("name") {
-                    assert_eq!(name, "John", "First musician should be John");
-                }
-            }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+            && let Some(r::Value::String(name)) = obj.get("name")
+        {
+            assert_eq!(name, "John", "First musician should be John");
         }
     });
 }
@@ -70,12 +69,11 @@ fn sql_can_query_with_where_clause() {
         let results = result.expect("SQL query should succeed");
         assert_eq!(results.len(), 1, "Should return 1 musician named John");
 
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                if let Some(r::Value::String(name)) = obj.get("name") {
-                    assert_eq!(name, "John", "Should return John");
-                }
-            }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+            && let Some(r::Value::String(name)) = obj.get("name")
+        {
+            assert_eq!(name, "John", "Should return John");
         }
     });
 }
@@ -88,16 +86,15 @@ fn sql_can_query_with_aggregation() {
         let results = result.expect("SQL query should succeed");
         assert_eq!(results.len(), 1, "Should return 1 row with count");
 
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                if let Some(total) = obj.get("total") {
-                    // The count should be a number (could be various forms)
-                    match total {
-                        r::Value::Int(n) => assert_eq!(*n, 5),
-                        r::Value::String(s) => assert_eq!(s, "5"),
-                        _ => panic!("Total should be a number: {:?}", total),
-                    }
-                }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+            && let Some(total) = obj.get("total")
+        {
+            // The count should be a number (could be various forms)
+            match total {
+                r::Value::Int(n) => assert_eq!(*n, 5),
+                r::Value::String(s) => assert_eq!(s, "5"),
+                _ => panic!("Total should be a number: {:?}", total),
             }
         }
     });
@@ -112,13 +109,12 @@ fn sql_can_query_with_limit_offset() {
         assert_eq!(results.len(), 2, "Should return 2 musicians with offset");
 
         // Should skip first musician (order may vary by id type)
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                if let Some(r::Value::String(name)) = obj.get("name") {
-                    // Just check we got a valid musician name
-                    assert!(["John", "Lisa", "Tom", "Valerie", "Paul"].contains(&name.as_str()));
-                }
-            }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+            && let Some(r::Value::String(name)) = obj.get("name")
+        {
+            // Just check we got a valid musician name
+            assert!(["John", "Lisa", "Tom", "Valerie", "Paul"].contains(&name.as_str()));
         }
     });
 }
@@ -253,13 +249,13 @@ fn sql_can_query_with_case_expression() {
         );
 
         // Check that popularity field exists in first result
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                assert!(
-                    obj.get("popularity").is_some(),
-                    "Should have popularity field"
-                );
-            }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+        {
+            assert!(
+                obj.get("popularity").is_some(),
+                "Should have popularity field"
+            );
         }
     });
 }
@@ -279,11 +275,11 @@ fn sql_can_query_with_subquery() {
         let results = result.expect("SQL query with CTE should succeed");
         assert_eq!(results.len(), 1, "Should return one count result");
 
-        if let Some(first) = results.first() {
-            if let r::Value::Object(ref obj) = first.0 {
-                let count = obj.get("active_count");
-                assert!(count.is_some(), "Should have active_count field");
-            }
+        if let Some(first) = results.first()
+            && let r::Value::Object(ref obj) = first.0
+        {
+            let count = obj.get("active_count");
+            assert!(count.is_some(), "Should have active_count field");
         }
     });
 }
diff --git a/store/test-store/tests/postgres/aggregation.rs b/store/test-store/tests/postgres/aggregation.rs
index b83e71cf39c..f005a15b73d 100644
--- a/store/test-store/tests/postgres/aggregation.rs
+++ b/store/test-store/tests/postgres/aggregation.rs
@@ -1,19 +1,22 @@
+use std::collections::BTreeSet;
 use std::fmt::Write;
 use std::{future::Future, sync::Arc};
 
 use graph::{
-    blockchain::{block_stream::FirehoseCursor, BlockPtr, BlockTime},
+    blockchain::{BlockPtr, BlockTime, block_stream::FirehoseCursor},
     components::{
         metrics::stopwatch::StopwatchMetrics,
         store::{
-            AttributeNames, BlockNumber, DeploymentLocator, EntityCache, EntityCollection,
-            EntityOperation, EntityQuery, ReadStore, StoreError, SubgraphStore as _, WritableStore,
+            AggregationCurrent, AttributeNames, BlockNumber, ChildMultiplicity, DeploymentLocator,
+            EntityCache, EntityCollection, EntityFilter, EntityLink, EntityOperation, EntityQuery,
+            EntityWindow, ReadStore, SeqGenerator, StoreError, SubgraphStore as _, WindowAttribute,
+            WritableStore,
         },
     },
     data::{
         store::{
-            scalar::{BigDecimal, Bytes},
-            Entity, Value,
+            Entity, Id, IdList, Value,
+            scalar::{BigDecimal, Bytes, Timestamp},
         },
         subgraph::DeploymentHash,
     },
@@ -23,14 +26,20 @@ use graph::{
 };
 use graph_store_postgres::Store as DieselStore;
 use test_store::{
-    create_test_subgraph, remove_subgraphs, run_test_sequentially, BLOCKS, LOGGER, METRICS_REGISTRY,
+    BLOCKS, LOGGER, METRICS_REGISTRY, STOPWATCH, create_test_subgraph, remove_subgraphs,
+    run_test_sequentially,
 };
 
 const SCHEMA: &str = r#"
-type Data @entity(timeseries: true) {
+type Token @entity {
+    id: Bytes!
+    name: String!
+  }
+
+  type Data @entity(timeseries: true) {
     id: Int8!
     timestamp: Timestamp!
-    token: Bytes!
+    token: Token!
     price: BigDecimal!
     amount: BigDecimal!
   }
@@ -38,7 +47,7 @@ type Data @entity(timeseries: true) {
   type Stats @aggregation(intervals: ["day", "hour"], source: "Data") {
     id: Int8!
     timestamp: Timestamp!
-    token: Bytes!
+    token: Token!
     sum: BigDecimal! @aggregate(fn: "sum", arg: "price")
     sum_sq: BigDecimal! @aggregate(fn: "sum", arg: "price * price")
     max: BigDecimal! @aggregate(fn: "max", arg: "amount")
@@ -62,31 +71,50 @@ fn minutes(n: u32) -> BlockTime {
 lazy_static! {
     static ref TOKEN1: Bytes = "0xdeadbeef01".parse().unwrap();
     static ref TOKEN2: Bytes = "0xdeadbeef02".parse().unwrap();
-    static ref TIMES: Vec<BlockTime> = vec![minutes(30), minutes(40), minutes(65), minutes(120)];
+    static ref TOKEN3: Bytes = "0xdeadbeef03".parse().unwrap();
+    static ref TIMES: Vec<BlockTime> = vec![minutes(30), minutes(40), minutes(65), minutes(121)];
 }
 
-pub async fn insert(
+const STATS_HOUR_FIELDS: &[&str] = &[
+    "id",
+    "timestamp",
+    "token",
+    "sum",
+    "sum_sq",
+    "max",
+    "first",
+    "last",
+    "value",
+    "totalValue",
+];
+
+pub async fn insert_entities(
     store: &Arc<dyn WritableStore>,
     deployment: &DeploymentLocator,
     block_ptr_to: BlockPtr,
     block_time: BlockTime,
-    entities: Vec<Entity>,
+    typed_entities: Vec<(&str, Vec<Entity>)>,
 ) -> Result<(), StoreError> {
     let schema = ReadStore::input_schema(store);
-    let ops = entities
+    let ops: Vec<EntityOperation> = typed_entities
         .into_iter()
-        .map(|mut data| {
-            let data_type = schema.entity_type("Data").unwrap();
-            let key = data_type.key(data.id());
-            data.set_vid_if_empty();
-            EntityOperation::Set { data, key }
+        .flat_map(|(type_name, entities)| {
+            let entity_type = schema.entity_type(type_name).unwrap();
+            entities.into_iter().map(move |mut data| {
+                let key = entity_type.key(data.id());
+                data.set_vid_if_empty();
+                EntityOperation::Set { data, key }
+            })
         })
         .collect();
 
-    let mut entity_cache = EntityCache::new(Arc::new(store.clone()));
+    let mut entity_cache = EntityCache::new(
+        Arc::new(store.clone()),
+        SeqGenerator::new(block_ptr_to.number),
+    );
     entity_cache.append(ops);
     let mods = entity_cache
-        .as_modifications(block_ptr_to.number)
+        .as_modifications(block_ptr_to.number, &STOPWATCH)
         .await
         .expect("failed to convert to modifications")
         .modifications;
@@ -114,22 +142,55 @@ pub async fn insert(
         .await
 }
 
+pub async fn insert(
+    store: &Arc<dyn WritableStore>,
+    deployment: &DeploymentLocator,
+    block_ptr_to: BlockPtr,
+    block_time: BlockTime,
+    entities: Vec<Entity>,
+) -> Result<(), StoreError> {
+    insert_entities(
+        store,
+        deployment,
+        block_ptr_to,
+        block_time,
+        vec![("Data", entities)],
+    )
+    .await
+}
+
 fn bd(n: i32) -> Value {
     Value::BigDecimal(BigDecimal::from(n))
 }
 
+fn ts(epoch_secs: i64) -> Value {
+    Value::Timestamp(Timestamp::since_epoch(epoch_secs, 0).unwrap())
+}
+
 async fn insert_test_data(store: Arc<dyn WritableStore>, deployment: DeploymentLocator) {
     let schema = ReadStore::input_schema(&store);
 
+    // Insert Token entities alongside first Data entities at BLOCKS[0]
+    let token_entities = vec![
+        entity! { schema => id: TOKEN1.clone(), name: "Token1", vid: 1i64 },
+        entity! { schema => id: TOKEN2.clone(), name: "Token2", vid: 2i64 },
+        entity! { schema => id: TOKEN3.clone(), name: "Token3", vid: 3i64 },
+    ];
     let ts64 = TIMES[0];
-    let entities = vec![
+    let data_entities = vec![
         entity! { schema => id: 1i64, timestamp: ts64, token: TOKEN1.clone(), price: bd(1), amount: bd(10), vid: 11i64 },
         entity! { schema => id: 2i64, timestamp: ts64, token: TOKEN2.clone(), price: bd(1), amount: bd(1), vid: 12i64 },
     ];
 
-    insert(&store, &deployment, BLOCKS[0].clone(), TIMES[0], entities)
-        .await
-        .unwrap();
+    insert_entities(
+        &store,
+        &deployment,
+        BLOCKS[0].clone(),
+        TIMES[0],
+        vec![("Token", token_entities), ("Data", data_entities)],
+    )
+    .await
+    .unwrap();
 
     let ts64 = TIMES[1];
     let entities = vec![
@@ -220,6 +281,96 @@ impl TestEnv {
             .await
             .expect("query succeeds")
     }
+
+    /// Build an `EntityQuery` for an aggregation entity with explicit column
+    /// selection and configurable `AggregationCurrent`. The current bucket
+    /// UNION ALL query requires `AttributeNames::Select` (not `All`).
+    fn aggregation_query(
+        &self,
+        entity_type_name: &str,
+        current: AggregationCurrent,
+        block: BlockNumber,
+    ) -> EntityQuery {
+        let schema = self.writable.input_schema();
+        let entity_type = schema
+            .entity_type(entity_type_name)
+            .expect("entity type exists");
+
+        let columns: BTreeSet<String> = STATS_HOUR_FIELDS.iter().map(|s| s.to_string()).collect();
+        let mut query = EntityQuery::new(
+            self.deployment.hash.clone(),
+            block,
+            EntityCollection::All(vec![(entity_type, AttributeNames::Select(columns))]),
+        );
+        query.aggregation_current = Some(current);
+        query
+    }
+
+    async fn find_aggregation(
+        &self,
+        entity_type_name: &str,
+        current: AggregationCurrent,
+        block: BlockNumber,
+    ) -> Vec<Entity> {
+        let query = self.aggregation_query(entity_type_name, current, block);
+        self.store
+            .subgraph_store()
+            .find(query)
+            .await
+            .expect("aggregation query succeeds")
+    }
+
+    /// Build an `EntityQuery` for a nested aggregation using
+    /// `EntityCollection::Window` where Token is the parent and Stats_hour
+    /// is the child.
+    fn nested_aggregation_query(
+        &self,
+        current: AggregationCurrent,
+        block: BlockNumber,
+        parent_ids: &[&Bytes],
+    ) -> EntityQuery {
+        let schema = self.writable.input_schema();
+        let child_type = schema.entity_type("Stats_hour").expect("Stats_hour exists");
+
+        let columns: BTreeSet<String> = STATS_HOUR_FIELDS.iter().map(|s| s.to_string()).collect();
+
+        let mut ids = IdList::new(graph::data::store::IdType::Bytes);
+        for pid in parent_ids {
+            ids.push(Id::Bytes((*pid).clone())).expect("push parent id");
+        }
+
+        let window = EntityWindow {
+            child_type,
+            ids,
+            link: EntityLink::Direct(
+                WindowAttribute::Scalar("token".to_string()),
+                ChildMultiplicity::Many,
+            ),
+            column_names: AttributeNames::Select(columns),
+        };
+
+        let mut query = EntityQuery::new(
+            self.deployment.hash.clone(),
+            block,
+            EntityCollection::Window(vec![window]),
+        );
+        query.aggregation_current = Some(current);
+        query
+    }
+
+    async fn find_nested_aggregation(
+        &self,
+        current: AggregationCurrent,
+        block: BlockNumber,
+        parent_ids: &[&Bytes],
+    ) -> Vec<Entity> {
+        let query = self.nested_aggregation_query(current, block, parent_ids);
+        self.store
+            .subgraph_store()
+            .find(query)
+            .await
+            .expect("nested aggregation query succeeds")
+    }
 }
 
 fn run_test<R, F>(test: F)
@@ -298,3 +449,401 @@ fn simple() {
         }
     })
 }
+
+/// Query Stats_hour with AggregationCurrent::Include at BLOCKS[3].
+/// Expect 6 rows: 2 rolled-up from hour 0, 2 from hour 1, and 2
+/// current-bucket rows from hour 2 computed on-the-fly.
+#[test]
+fn current_include() {
+    run_test(|env| async move {
+        let result = env
+            .find_aggregation("Stats_hour", AggregationCurrent::Include, BLOCKS[3].number)
+            .await;
+
+        assert_eq!(
+            6,
+            result.len(),
+            "expected 6 rows (2 per hour for hours 0, 1, 2), got {}",
+            result.len()
+        );
+
+        let schema = env.writable.input_schema();
+
+        // The rolled-up rows (hours 0 and 1) should match the existing
+        // stats_hour expected data at BLOCKS[3].
+        let exp_rolled = stats_hour(&schema);
+        let hour2_ts = ts(7200);
+        let rolled_up: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("timestamp").unwrap() != &hour2_ts)
+            .collect();
+        assert_eq!(
+            4,
+            rolled_up.len(),
+            "expected 4 rolled-up rows, got {}",
+            rolled_up.len()
+        );
+
+        // Verify rolled-up entities match
+        for exp_entity in &exp_rolled[3] {
+            let matching = rolled_up.iter().find(|e| e.id() == exp_entity.id());
+            assert!(
+                matching.is_some(),
+                "expected rolled-up entity with id {} not found",
+                exp_entity.id()
+            );
+        }
+
+        // Current bucket rows (hour 2, timestamp = 7200)
+        let current_bucket: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("timestamp").unwrap() == &hour2_ts)
+            .collect();
+        assert_eq!(
+            2,
+            current_bucket.len(),
+            "expected 2 current-bucket rows for hour 2, got {}",
+            current_bucket.len()
+        );
+
+        // Verify current bucket values for TOKEN1:
+        // At BLOCKS[3], minute 120: price=4, amount=4
+        // sum(price) = 4, sum(price*price) = 16, max(amount) = 4,
+        // first(amount) = 4, last(amount) = 4, sum(price*amount) = 16
+        let token1_current = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN1.clone()))
+            .expect("TOKEN1 current bucket row exists");
+        assert_eq!(token1_current.get("sum").unwrap(), &bd(4));
+        assert_eq!(token1_current.get("sum_sq").unwrap(), &bd(16));
+        assert_eq!(token1_current.get("max").unwrap(), &bd(4));
+        assert_eq!(token1_current.get("first").unwrap(), &bd(4));
+        assert_eq!(token1_current.get("last").unwrap(), &bd(4));
+        assert_eq!(token1_current.get("value").unwrap(), &bd(16));
+
+        // Verify current bucket values for TOKEN2:
+        // At BLOCKS[3], minute 120: price=4, amount=40
+        // sum(price) = 4, sum(price*price) = 16, max(amount) = 40,
+        // first(amount) = 40, last(amount) = 40, sum(price*amount) = 160
+        let token2_current = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN2.clone()))
+            .expect("TOKEN2 current bucket row exists");
+        assert_eq!(token2_current.get("sum").unwrap(), &bd(4));
+        assert_eq!(token2_current.get("sum_sq").unwrap(), &bd(16));
+        assert_eq!(token2_current.get("max").unwrap(), &bd(40));
+        assert_eq!(token2_current.get("first").unwrap(), &bd(40));
+        assert_eq!(token2_current.get("last").unwrap(), &bd(40));
+        assert_eq!(token2_current.get("value").unwrap(), &bd(160));
+    })
+}
+
+/// Query Stats_hour with AggregationCurrent::Exclude at BLOCKS[3].
+/// Should return only the 4 rolled-up rows, same as the `simple` test.
+#[test]
+fn current_exclude() {
+    run_test(|env| async move {
+        let result = env
+            .find_aggregation("Stats_hour", AggregationCurrent::Exclude, BLOCKS[3].number)
+            .await;
+
+        let exp = stats_hour(&env.writable.input_schema());
+        assert_eq!(
+            exp[3].len(),
+            result.len(),
+            "expected {} rolled-up rows, got {}",
+            exp[3].len(),
+            result.len()
+        );
+
+        let diff = entity_diff(&exp[3], &result).unwrap();
+        if !diff.is_empty() {
+            panic!(
+                "current_exclude results differ from expected rolled-up data:\n{}",
+                diff
+            );
+        }
+    })
+}
+
+/// Query Stats_hour with AggregationCurrent::Include and an EntityFilter
+/// on token == TOKEN1. Should return 3 rows: TOKEN1 for hours 0, 1, and 2.
+#[test]
+fn current_include_with_filter() {
+    run_test(|env| async move {
+        let mut query =
+            env.aggregation_query("Stats_hour", AggregationCurrent::Include, BLOCKS[3].number);
+        query.filter = Some(EntityFilter::Equal(
+            "token".to_string(),
+            Value::Bytes(TOKEN1.clone()),
+        ));
+
+        let result = env
+            .store
+            .subgraph_store()
+            .find(query)
+            .await
+            .expect("filtered aggregation query succeeds");
+
+        assert_eq!(
+            3,
+            result.len(),
+            "expected 3 rows for TOKEN1 (hours 0, 1, 2), got {}",
+            result.len()
+        );
+
+        // All rows should be for TOKEN1
+        for entity in &result {
+            assert_eq!(
+                entity.get("token").unwrap(),
+                &Value::Bytes(TOKEN1.clone()),
+                "all rows should be for TOKEN1"
+            );
+        }
+
+        // Verify we have one row per hour (timestamps 0, 3600, 7200)
+        for expected_ts in [ts(0), ts(3600), ts(7200)] {
+            assert!(
+                result
+                    .iter()
+                    .any(|e| e.get("timestamp").unwrap() == &expected_ts),
+                "expected a row with timestamp {:?}",
+                expected_ts
+            );
+        }
+    })
+}
+
+/// Query Stats_hour with AggregationCurrent::Include and verify cumulative
+/// aggregate `totalValue` in the current bucket rows.
+/// For TOKEN1: prev hour 1 totalValue=104, current hour 2 value=4*4=16,
+///   so totalValue = 104 + 16 = 120
+/// For TOKEN2: prev hour 1 totalValue=50, current hour 2 value=4*40=160,
+///   so totalValue = 50 + 160 = 210
+#[test]
+fn current_include_cumulative() {
+    run_test(|env| async move {
+        let result = env
+            .find_aggregation("Stats_hour", AggregationCurrent::Include, BLOCKS[3].number)
+            .await;
+
+        let hour2_ts = ts(7200);
+        let current_bucket: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("timestamp").unwrap() == &hour2_ts)
+            .collect();
+        assert_eq!(
+            2,
+            current_bucket.len(),
+            "expected 2 current-bucket rows, got {}",
+            current_bucket.len()
+        );
+
+        let token1 = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN1.clone()))
+            .expect("TOKEN1 current bucket exists");
+        assert_eq!(
+            token1.get("totalValue").unwrap(),
+            &bd(120),
+            "TOKEN1 cumulative totalValue = 104 + 16 = 120"
+        );
+
+        let token2 = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN2.clone()))
+            .expect("TOKEN2 current bucket exists");
+        assert_eq!(
+            token2.get("totalValue").unwrap(),
+            &bd(210),
+            "TOKEN2 cumulative totalValue = 50 + 160 = 210"
+        );
+    })
+}
+
+/// Query Stats_hour as a nested field of Token with
+/// AggregationCurrent::Include at BLOCKS[3]. Each token should have
+/// 2 rolled-up rows (hour 0 and hour 1) + 1 current bucket row (hour 2).
+/// Total: 3 rows per token, 6 rows overall.
+#[test]
+fn nested_current_include() {
+    run_test(|env| async move {
+        let result = env
+            .find_nested_aggregation(
+                AggregationCurrent::Include,
+                BLOCKS[3].number,
+                &[&TOKEN1, &TOKEN2],
+            )
+            .await;
+
+        assert_eq!(
+            6,
+            result.len(),
+            "expected 6 rows (3 per token for hours 0, 1, 2), got {}",
+            result.len()
+        );
+
+        let hour2_ts = ts(7200);
+
+        // Current bucket rows (hour 2, timestamp = 7200)
+        let current_bucket: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("timestamp").unwrap() == &hour2_ts)
+            .collect();
+        assert_eq!(
+            2,
+            current_bucket.len(),
+            "expected 2 current-bucket rows for hour 2, got {}",
+            current_bucket.len()
+        );
+
+        // Verify current bucket values for TOKEN1: sum=4, max=4
+        let token1_current = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN1.clone()))
+            .expect("TOKEN1 current bucket row exists");
+        assert_eq!(token1_current.get("sum").unwrap(), &bd(4));
+        assert_eq!(token1_current.get("max").unwrap(), &bd(4));
+
+        // Verify current bucket values for TOKEN2: sum=4, max=40
+        let token2_current = current_bucket
+            .iter()
+            .find(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN2.clone()))
+            .expect("TOKEN2 current bucket row exists");
+        assert_eq!(token2_current.get("sum").unwrap(), &bd(4));
+        assert_eq!(token2_current.get("max").unwrap(), &bd(40));
+    })
+}
+
+/// Query Stats_hour as a nested field of Token with
+/// AggregationCurrent::Exclude at BLOCKS[3]. Should return only
+/// the 4 rolled-up rows (2 per token, hours 0 and 1).
+#[test]
+fn nested_current_exclude() {
+    run_test(|env| async move {
+        let result = env
+            .find_nested_aggregation(
+                AggregationCurrent::Exclude,
+                BLOCKS[3].number,
+                &[&TOKEN1, &TOKEN2],
+            )
+            .await;
+
+        assert_eq!(
+            4,
+            result.len(),
+            "expected 4 rolled-up rows (2 per token), got {}",
+            result.len()
+        );
+
+        // No current bucket row should appear (no hour 2 timestamp)
+        let hour2_ts = ts(7200);
+        let current_bucket: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("timestamp").unwrap() == &hour2_ts)
+            .collect();
+        assert_eq!(
+            0,
+            current_bucket.len(),
+            "expected no current-bucket rows, got {}",
+            current_bucket.len()
+        );
+    })
+}
+
+/// Query at BLOCKS[3] with AggregationCurrent::Include, including TOKEN3
+/// which has no Data entries at all. TOKEN1 and TOKEN2 each have 3 rows
+/// (2 rolled-up + 1 current bucket). TOKEN3 should have 0 rows because
+/// it has no timeseries data — no rolled-up buckets and no current bucket.
+#[test]
+fn nested_current_include_empty_bucket() {
+    run_test(|env| async move {
+        // Query with TOKEN1, TOKEN2, and TOKEN3
+        let result = env
+            .find_nested_aggregation(
+                AggregationCurrent::Include,
+                BLOCKS[3].number,
+                &[&TOKEN1, &TOKEN2, &TOKEN3],
+            )
+            .await;
+
+        assert_eq!(
+            6,
+            result.len(),
+            "expected 6 rows (3 per token for TOKEN1/TOKEN2, 0 for TOKEN3), got {}",
+            result.len()
+        );
+
+        // TOKEN1 and TOKEN2 each have 3 rows (2 rolled-up + 1 current)
+        let token1_rows: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN1.clone()))
+            .collect();
+        assert_eq!(
+            3,
+            token1_rows.len(),
+            "expected 3 rows for TOKEN1, got {}",
+            token1_rows.len()
+        );
+
+        let token2_rows: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN2.clone()))
+            .collect();
+        assert_eq!(
+            3,
+            token2_rows.len(),
+            "expected 3 rows for TOKEN2, got {}",
+            token2_rows.len()
+        );
+
+        // TOKEN3 has no data entries, so no rows should appear
+        let token3_rows: Vec<&Entity> = result
+            .iter()
+            .filter(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN3.clone()))
+            .collect();
+        assert_eq!(
+            0,
+            token3_rows.len(),
+            "expected 0 rows for TOKEN3 (no timeseries data), got {}",
+            token3_rows.len()
+        );
+    })
+}
+
+/// Verify result counts per parent token at BLOCKS[3] with
+/// AggregationCurrent::Include. TOKEN1 should have 3 rows and
+/// TOKEN2 should have 3 rows.
+#[test]
+fn nested_current_include_count() {
+    run_test(|env| async move {
+        let result = env
+            .find_nested_aggregation(
+                AggregationCurrent::Include,
+                BLOCKS[3].number,
+                &[&TOKEN1, &TOKEN2],
+            )
+            .await;
+
+        // Group results by token (dimension) to count per parent
+        let token1_count = result
+            .iter()
+            .filter(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN1.clone()))
+            .count();
+        let token2_count = result
+            .iter()
+            .filter(|e| e.get("token").unwrap() == &Value::Bytes(TOKEN2.clone()))
+            .count();
+
+        assert_eq!(
+            3, token1_count,
+            "TOKEN1 should have 3 rows (2 rolled-up + 1 current), got {}",
+            token1_count
+        );
+        assert_eq!(
+            3, token2_count,
+            "TOKEN2 should have 3 rows (2 rolled-up + 1 current), got {}",
+            token2_count
+        );
+    })
+}
diff --git a/store/test-store/tests/postgres/chain_head.rs b/store/test-store/tests/postgres/chain_head.rs
index 6ee612de191..d72641b29b6 100644
--- a/store/test-store/tests/postgres/chain_head.rs
+++ b/store/test-store/tests/postgres/chain_head.rs
@@ -12,21 +12,21 @@ use std::future::Future;
 use std::sync::Arc;
 
 use graph::cheap_clone::CheapClone;
-use graph::prelude::{alloy, serde_json as json, EthereumBlock};
-use graph::prelude::{anyhow::anyhow, anyhow::Error};
+use graph::prelude::alloy;
 use graph::prelude::{BlockNumber, QueryStoreManager, QueryTarget};
+use graph::prelude::{anyhow::Error, anyhow::anyhow};
 use graph::{components::store::BlockStore as _, prelude::DeploymentHash};
 use graph::{
     components::store::ChainHeadStore as _, components::store::ChainStore as _,
     prelude::EthereumCallCache as _,
 };
 use graph_store_postgres::Store as DieselStore;
-use graph_store_postgres::{layout_for_tests::FAKE_NETWORK_SHARED, ChainStore as DieselChainStore};
+use graph_store_postgres::{ChainStore as DieselChainStore, layout_for_tests::FAKE_NETWORK_SHARED};
 
 use test_store::block_store::{
-    FakeBlock, FakeBlockList, BLOCK_FIVE, BLOCK_FIVE_AFTER_SKIP, BLOCK_FOUR,
-    BLOCK_FOUR_SKIPPED_2_AND_3, BLOCK_ONE, BLOCK_ONE_NO_PARENT, BLOCK_ONE_SIBLING, BLOCK_THREE,
-    BLOCK_THREE_NO_PARENT, BLOCK_TWO, BLOCK_TWO_NO_PARENT, GENESIS_BLOCK, NO_PARENT,
+    BLOCK_FIVE, BLOCK_FIVE_AFTER_SKIP, BLOCK_FOUR, BLOCK_FOUR_SKIPPED_2_AND_3, BLOCK_ONE,
+    BLOCK_ONE_NO_PARENT, BLOCK_ONE_SIBLING, BLOCK_THREE, BLOCK_THREE_NO_PARENT, BLOCK_TWO,
+    BLOCK_TWO_NO_PARENT, FakeBlock, FakeBlockList, GENESIS_BLOCK, NO_PARENT,
 };
 use test_store::*;
 
@@ -328,8 +328,7 @@ fn check_ancestor(
         return Err(anyhow!("expected ptr `{}` but got `{}`", exp_ptr, act_ptr));
     }
 
-    let act_block = json::from_value::<EthereumBlock>(act.0)?;
-    let act_hash = format!("{:x}", act_block.block.hash());
+    let act_hash = format!("{:x}", act.0.light_block().hash());
     let exp_hash = &exp.hash;
 
     if &act_hash != exp_hash {
diff --git a/store/test-store/tests/postgres/graft.rs b/store/test-store/tests/postgres/graft.rs
index dc7c759ef64..6536fc3e06c 100644
--- a/store/test-store/tests/postgres/graft.rs
+++ b/store/test-store/tests/postgres/graft.rs
@@ -9,7 +9,7 @@ use graph::components::store::{
     DeploymentLocator, EntityOrder, EntityQuery, PruneReporter, PruneRequest, PruningStrategy,
     VersionStats,
 };
-use graph::data::store::{scalar, Id};
+use graph::data::store::{Id, scalar};
 use graph::data::subgraph::schema::*;
 use graph::data::subgraph::*;
 use graph::semver::Version;
diff --git a/store/test-store/tests/postgres/relational.rs b/store/test-store/tests/postgres/relational.rs
index 4a029709408..c4946b408c5 100644
--- a/store/test-store/tests/postgres/relational.rs
+++ b/store/test-store/tests/postgres/relational.rs
@@ -5,15 +5,15 @@ use graph::data::store::scalar;
 use graph::entity;
 use graph::prelude::alloy::primitives::B256;
 use graph::prelude::{
-    o, slog, DeploymentHash, Entity, EntityCollection, EntityFilter, EntityOrder, EntityQuery,
-    Logger, StopwatchMetrics, Value, ValueType, BLOCK_NUMBER_MAX,
+    BLOCK_NUMBER_MAX, DeploymentHash, Entity, EntityCollection, EntityFilter, EntityOrder,
+    EntityQuery, Logger, StopwatchMetrics, Value, ValueType, o, slog,
 };
 use graph::prelude::{BlockNumber, MetricsRegistry};
 use graph::schema::{EntityKey, EntityType, InputSchema};
-use graph_store_postgres::layout_for_tests::set_account_like;
+use graph_store_postgres::AsyncPgConnection;
 use graph_store_postgres::layout_for_tests::LayoutCache;
 use graph_store_postgres::layout_for_tests::SqlName;
-use graph_store_postgres::AsyncPgConnection;
+use graph_store_postgres::layout_for_tests::set_account_like;
 use hex_literal::hex;
 use lazy_static::lazy_static;
 use std::collections::BTreeSet;
@@ -128,6 +128,11 @@ const THINGS_GQL: &str = r#"
         order: Int,
     }
 
+    type SkipDupMink @entity(immutable: true, skipDuplicates: true) {
+        id: ID!,
+        order: Int,
+    }
+
     type User @entity {
         id: ID!,
         name: String!,
@@ -228,6 +233,7 @@ lazy_static! {
     static ref CAT_TYPE: EntityType = THINGS_SCHEMA.entity_type("Cat").unwrap();
     static ref FERRET_TYPE: EntityType = THINGS_SCHEMA.entity_type("Ferret").unwrap();
     static ref MINK_TYPE: EntityType = THINGS_SCHEMA.entity_type("Mink").unwrap();
+    static ref SKIP_DUP_MINK_TYPE: EntityType = THINGS_SCHEMA.entity_type("SkipDupMink").unwrap();
     static ref CHAIR_TYPE: EntityType = THINGS_SCHEMA.entity_type("Chair").unwrap();
     static ref NULLABLE_STRINGS_TYPE: EntityType =
         THINGS_SCHEMA.entity_type("NullableStrings").unwrap();
@@ -508,7 +514,7 @@ async fn create_schema(conn: &mut AsyncPgConnection) -> Layout {
     let query = format!("create schema {}", NAMESPACE.as_str());
     conn.batch_execute(&query).await.unwrap();
 
-    Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new(), None)
+    Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new())
         .await
         .expect("Failed to create relational schema")
 }
@@ -626,6 +632,83 @@ async fn insert_null_fulltext_fields() {
     .await;
 }
 
+/// Copying a table must also populate its fulltext (tsvector) search
+/// columns. These columns are not returned by `Table::column`, so a naive
+/// copy would silently drop them and leave the destination's search index
+/// empty. This copies the `User` table into a fresh schema and checks that a
+/// fulltext query against the copy still returns the expected entity.
+#[graph::test]
+async fn copy_populates_fulltext() {
+    use diesel_async::RunQueryDsl;
+    use graph_store_postgres::layout_for_tests::CopyEntityBatchQuery;
+
+    run_test(async |conn, layout| {
+        // Populate the source `User` table with searchable text
+        insert_users(conn, layout).await;
+
+        // Create a destination schema with the same layout in a separate
+        // namespace to copy into. Drop it first in case a previous run left
+        // it behind, since `remove_schema` only cleans up the source
+        // namespace.
+        let dst_namespace = Namespace::new("sgd0816".to_string()).unwrap();
+        conn.batch_execute(&format!(
+            "drop schema if exists {ns} cascade; create schema {ns}",
+            ns = dst_namespace.as_str()
+        ))
+        .await
+        .unwrap();
+        let dst_site = make_dummy_site(
+            THINGS_SUBGRAPH_ID.clone(),
+            dst_namespace,
+            NETWORK_NAME.to_string(),
+        );
+        let dst_layout = Layout::create_relational_schema(
+            conn,
+            Arc::new(dst_site),
+            &THINGS_SCHEMA,
+            BTreeSet::new(),
+        )
+        .await
+        .expect("Failed to create destination relational schema");
+
+        // Copy the `User` table from the source into the destination
+        let src_table = layout.table_for_entity(&USER_TYPE).unwrap();
+        let dst_table = dst_layout.table_for_entity(&USER_TYPE).unwrap();
+        CopyEntityBatchQuery::new(
+            dst_table.as_ref(),
+            src_table.as_ref(),
+            0,
+            i64::MAX,
+            BLOCK_NUMBER_MAX,
+        )
+        .unwrap()
+        .count_current()
+        .get_result::<i64>(conn)
+        .await
+        .expect("Failed to copy User table");
+
+        // A fulltext query against the copy must find the matching user,
+        // which is only possible if the tsvector column was copied.
+        let mut query =
+            user_query().filter(EntityFilter::Fulltext("userSearch".into(), "Shaq:*".into()));
+        query.block = BLOCK_NUMBER_MAX;
+        let entities = dst_layout
+            .query::<Entity>(&LOGGER, conn, query)
+            .await
+            .expect("fulltext query on copy failed")
+            .0;
+        let ids: Vec<_> = entities
+            .iter()
+            .map(|entity| match entity.get("id") {
+                Some(Value::String(id)) => id.clone(),
+                _ => panic!("entity without string id"),
+            })
+            .collect();
+        assert_eq!(ids, vec!["3".to_string()]);
+    })
+    .await;
+}
+
 #[graph::test]
 async fn update() {
     run_test(async |conn, layout| {
@@ -767,13 +850,11 @@ async fn serialize_bigdecimal() {
 
         // Update with overwrite
         let mut entity = SCALAR_ENTITY.clone();
-        let mut vid = 1i64;
 
-        for d in &["50", "50.00", "5000", "0.5000", "0.050", "0.5", "0.05"] {
+        for (vid, d) in (1i64..).zip(&["50", "50.00", "5000", "0.5000", "0.050", "0.5", "0.05"]) {
             let d = BigDecimal::from_str(d).unwrap();
             entity.set("bigDecimal", d).unwrap();
             entity.set("vid", vid).unwrap();
-            vid += 1;
 
             let key = SCALAR_TYPE.key(entity.id());
             let entity_type = layout.input_schema.entity_type("Scalar").unwrap();
@@ -996,7 +1077,7 @@ async fn conflicting_entity() {
             let fred = entity! { layout.input_schema => id: id.clone(), name: id.clone() };
             let fred = Arc::new(fred);
             let types: Vec<_> = types.into_iter().cloned().collect();
-            let mut group = RowGroup::new(entity_type.clone(), false);
+            let mut group = RowGroup::new(entity_type.clone());
             group
                 .push(
                     EntityModification::Insert {
@@ -2126,3 +2207,59 @@ async fn check_filters() {
     })
     .await;
 }
+
+fn store_layer_row_group_update(
+    entity_type: &EntityType,
+    block: BlockNumber,
+    data: impl IntoIterator<Item = (EntityKey, Entity)>,
+) -> RowGroup {
+    let mut group = RowGroup::new(entity_type.clone());
+    for (key, data) in data {
+        group
+            .push(EntityModification::overwrite(key, data, block), block)
+            .unwrap();
+    }
+    group
+}
+
+fn store_layer_row_group_delete(
+    entity_type: &EntityType,
+    block: BlockNumber,
+    data: impl IntoIterator<Item = EntityKey>,
+) -> RowGroup {
+    let mut group = RowGroup::new(entity_type.clone());
+    for key in data {
+        group
+            .push(EntityModification::remove(key, block), block)
+            .unwrap();
+    }
+    group
+}
+
+#[graph::test]
+async fn skip_duplicates_update_returns_ok() {
+    run_test(async |conn, layout| {
+        let entity = entity! { layout.input_schema =>
+            id: "sd1",
+            order: 1,
+            vid: 0i64
+        };
+        let key = SKIP_DUP_MINK_TYPE.key(entity.id());
+        let entities = vec![(key, entity)];
+        let group = store_layer_row_group_update(&SKIP_DUP_MINK_TYPE, 1, entities);
+        let result = layout.update(conn, &group, &MOCK_STOPWATCH).await;
+        assert_eq!(result.unwrap(), 0);
+    })
+    .await;
+}
+
+#[graph::test]
+async fn skip_duplicates_delete_returns_ok() {
+    run_test(async |conn, layout| {
+        let key = SKIP_DUP_MINK_TYPE.parse_key("sd1").unwrap();
+        let group = store_layer_row_group_delete(&SKIP_DUP_MINK_TYPE, 1, vec![key]);
+        let result = layout.delete(conn, &group, &MOCK_STOPWATCH).await;
+        assert_eq!(result.unwrap(), 0);
+    })
+    .await;
+}
diff --git a/store/test-store/tests/postgres/relational_bytes.rs b/store/test-store/tests/postgres/relational_bytes.rs
index 470d4e17412..1d608114eac 100644
--- a/store/test-store/tests/postgres/relational_bytes.rs
+++ b/store/test-store/tests/postgres/relational_bytes.rs
@@ -15,12 +15,11 @@ use std::collections::BTreeSet;
 use std::str::FromStr;
 use std::{collections::BTreeMap, sync::Arc};
 
-use graph::data::store::scalar::{BigDecimal, BigInt};
 use graph::data::store::IdList;
+use graph::data::store::scalar::{BigDecimal, BigInt};
 use graph::prelude::{
-    o, slog, AttributeNames, ChildMultiplicity, DeploymentHash, Entity, EntityCollection,
-    EntityLink, EntityWindow, Logger, ParentLink, StopwatchMetrics, WindowAttribute,
-    BLOCK_NUMBER_MAX,
+    AttributeNames, BLOCK_NUMBER_MAX, ChildMultiplicity, DeploymentHash, Entity, EntityCollection,
+    EntityLink, EntityWindow, Logger, ParentLink, StopwatchMetrics, WindowAttribute, o, slog,
 };
 use graph_store_postgres::{
     layout_for_tests::make_dummy_site,
@@ -85,7 +84,7 @@ pub fn row_group_update(
     block: BlockNumber,
     data: impl IntoIterator<Item = (EntityKey, Entity)>,
 ) -> RowGroup {
-    let mut group = RowGroup::new(entity_type.clone(), false);
+    let mut group = RowGroup::new(entity_type.clone());
     for (key, data) in data {
         group
             .push(EntityModification::overwrite(key, data, block), block)
@@ -99,7 +98,7 @@ pub fn row_group_insert(
     block: BlockNumber,
     data: impl IntoIterator<Item = (EntityKey, Entity)>,
 ) -> RowGroup {
-    let mut group = RowGroup::new(entity_type.clone(), false);
+    let mut group = RowGroup::new(entity_type.clone());
     for (key, data) in data {
         group
             .push(EntityModification::insert(key, data, block), block)
@@ -113,7 +112,7 @@ pub fn row_group_delete(
     block: BlockNumber,
     data: impl IntoIterator<Item = EntityKey>,
 ) -> RowGroup {
-    let mut group = RowGroup::new(entity_type.clone(), false);
+    let mut group = RowGroup::new(entity_type.clone());
     for key in data {
         group
             .push(EntityModification::remove(key, block), block)
@@ -171,7 +170,7 @@ async fn create_schema(conn: &mut AsyncPgConnection) -> Layout {
         NAMESPACE.clone(),
         NETWORK_NAME.to_string(),
     );
-    Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new(), None)
+    Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new())
         .await
         .expect("Failed to create relational schema")
 }
diff --git a/store/test-store/tests/postgres/store.rs b/store/test-store/tests/postgres/store.rs
index f85a9e89e2d..f6365d292b3 100644
--- a/store/test-store/tests/postgres/store.rs
+++ b/store/test-store/tests/postgres/store.rs
@@ -1,5 +1,5 @@
-use graph::blockchain::block_stream::FirehoseCursor;
 use graph::blockchain::BlockTime;
+use graph::blockchain::block_stream::FirehoseCursor;
 use graph::data::graphql::ext::TypeDefinitionExt;
 use graph::data::subgraph::schema::DeploymentCreate;
 use graph::data_source::common::MappingABI;
diff --git a/store/test-store/tests/postgres/subgraph.rs b/store/test-store/tests/postgres/subgraph.rs
index 5fa9b8c89ba..5dd3c273160 100644
--- a/store/test-store/tests/postgres/subgraph.rs
+++ b/store/test-store/tests/postgres/subgraph.rs
@@ -6,8 +6,8 @@ use graph::{
     data::{
         query::QueryTarget,
         subgraph::{
-            schema::{DeploymentCreate, SubgraphError, SubgraphHealth},
             DeploymentFeatures, SubgraphFeature,
+            schema::{DeploymentCreate, SubgraphError, SubgraphHealth},
         },
     },
     prelude::{
@@ -18,8 +18,8 @@ use graph::{
     schema::InputSchema,
     semver::Version,
 };
-use graph_store_postgres::layout_for_tests::Connection as Primary;
 use graph_store_postgres::SubgraphStore;
+use graph_store_postgres::layout_for_tests::Connection as Primary;
 use std::{collections::HashSet, marker::PhantomData, sync::Arc};
 use test_store::*;
 
@@ -483,9 +483,9 @@ fn status() {
             .await
             .unwrap();
         let infos = store
-            .status(status::Filter::Deployments(vec![deployment
-                .hash
-                .to_string()]))
+            .status(status::Filter::Deployments(vec![
+                deployment.hash.to_string(),
+            ]))
             .await
             .unwrap();
         assert_eq!(1, infos.len());
@@ -1215,14 +1215,14 @@ fn fail_unfail_non_deterministic_error_noop() {
         // Fail the subgraph with a non-deterministic error, but with an advanced block.
         writable.fail_subgraph(error).await.unwrap();
 
-        // Since the block range of the block won't match the deployment head, this will be NOOP.
+        // Since the deployment head is behind the error block, this returns BehindErrorBlock.
         let outcome = writable
             .unfail_non_deterministic_error(&BLOCKS[1])
             .await
             .unwrap();
 
         // State continues the same besides a new error added to the database.
-        assert_eq!(outcome, UnfailOutcome::Noop);
+        assert_eq!(outcome, UnfailOutcome::BehindErrorBlock);
         assert_eq!(count().await, 2);
         let vi = get_version_info(&store, NAME).await;
         assert_eq!(NAME, vi.deployment_id.as_str());
@@ -1232,18 +1232,3 @@ fn fail_unfail_non_deterministic_error_noop() {
         test_store::remove_subgraphs().await;
     })
 }
-
-#[test]
-fn remove_nonexistent_subgraph_returns_not_found() {
-    test_store::run_test_sequentially(|store| async move {
-        remove_subgraphs().await;
-
-        let name = SubgraphName::new("nonexistent/subgraph").unwrap();
-        let result = store.subgraph_store().remove_subgraph(name.clone()).await;
-
-        assert!(matches!(
-            result,
-            Err(StoreError::SubgraphNotFound(n)) if n == name.to_string()
-        ));
-    })
-}
diff --git a/store/test-store/tests/postgres/writable.rs b/store/test-store/tests/postgres/writable.rs
index 2ac4eddd5ce..7c17e8f201f 100644
--- a/store/test-store/tests/postgres/writable.rs
+++ b/store/test-store/tests/postgres/writable.rs
@@ -442,8 +442,10 @@ fn read_immutable_only_range_test() {
 #[test]
 fn read_range_pool_created_test() {
     run_test(|store, writable, sourceable, deployment| async move {
-        let result_entities = ["(1, [EntitySourceOperation { entity_op: Create, entity_type: EntityType(PoolCreated), entity: Entity { blockNumber: BigInt(12369621), blockTimestamp: BigInt(1620243254), fee: Int(500), id: Bytes(0xff80818283848586), logIndex: BigInt(0), pool: Bytes(0x8ad599c3a0ff1de082011efddc58f1908eb6e6d8), tickSpacing: Int(10), token0: Bytes(0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48), token1: Bytes(0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2), transactionFrom: Bytes(0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48), transactionGasPrice: BigInt(100000000000), transactionHash: Bytes(0x12340000000000000000000000000000000000000000000000000000000000000000000000000000), vid: Int8(1) }, vid: 1 }])",
-            "(2, [EntitySourceOperation { entity_op: Create, entity_type: EntityType(PoolCreated), entity: Entity { blockNumber: BigInt(12369622), blockTimestamp: BigInt(1620243255), fee: Int(3000), id: Bytes(0xff90919293949596), logIndex: BigInt(1), pool: Bytes(0x4585fe77225b41b697c938b018e2ac67ac5a20c0), tickSpacing: Int(60), token0: Bytes(0x2260fac5e5542a773aa44fbcfedf7c193bc2c599), token1: Bytes(0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2), transactionFrom: Bytes(0x2260fac5e5542a773aa44fbcfedf7c193bc2c599), transactionGasPrice: BigInt(100000000000), transactionHash: Bytes(0x12340000000000000000000000000000000000000000000000000000000000000000000000000001), vid: Int8(2) }, vid: 2 }])"];
+        let result_entities = [
+            "(1, [EntitySourceOperation { entity_op: Create, entity_type: EntityType(PoolCreated), entity: Entity { blockNumber: BigInt(12369621), blockTimestamp: BigInt(1620243254), fee: Int(500), id: Bytes(0xff80818283848586), logIndex: BigInt(0), pool: Bytes(0x8ad599c3a0ff1de082011efddc58f1908eb6e6d8), tickSpacing: Int(10), token0: Bytes(0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48), token1: Bytes(0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2), transactionFrom: Bytes(0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48), transactionGasPrice: BigInt(100000000000), transactionHash: Bytes(0x12340000000000000000000000000000000000000000000000000000000000000000000000000000), vid: Int8(1) }, vid: 1 }])",
+            "(2, [EntitySourceOperation { entity_op: Create, entity_type: EntityType(PoolCreated), entity: Entity { blockNumber: BigInt(12369622), blockTimestamp: BigInt(1620243255), fee: Int(3000), id: Bytes(0xff90919293949596), logIndex: BigInt(1), pool: Bytes(0x4585fe77225b41b697c938b018e2ac67ac5a20c0), tickSpacing: Int(60), token0: Bytes(0x2260fac5e5542a773aa44fbcfedf7c193bc2c599), token1: Bytes(0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2), transactionFrom: Bytes(0x2260fac5e5542a773aa44fbcfedf7c193bc2c599), transactionGasPrice: BigInt(100000000000), transactionHash: Bytes(0x12340000000000000000000000000000000000000000000000000000000000000000000000000001), vid: Int8(2) }, vid: 2 }])",
+        ];
 
         // Rest of the test remains the same
         let subgraph_store = store.subgraph_store();
diff --git a/tests/.gitignore b/tests/.gitignore
index b3458a8f91a..b6f5b85637c 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -2,3 +2,4 @@ contracts/cache/
 contracts/out/build-info/
 integration-tests/graph-node.log
 integration-tests/*/subgraph.yaml.patched
+runner-tests.log
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 955c8d80449..547466909a5 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -19,19 +19,13 @@ graph-runtime-wasm = { path = "../runtime/wasm" }
 serde = { workspace = true }
 serde_yaml = { workspace = true }
 slog = { workspace = true }
-tokio = { version = "1.49.0", features = ["rt", "macros", "process"] }
-# Once graph upgrades to web3 0.19, we don't need this anymore. The version
-# here needs to be kept in sync with the web3 version that the graph crate
-# uses until then
-secp256k1 = { version = "0.21", features = ["recovery"] }
+slog-async = { workspace = true }
+slog-term = { workspace = true }
+tokio = { version = "1.50.0", features = ["rt", "macros", "process"] }
 tokio-util.workspace = true
-web3 = { git = "https://github.com/graphprotocol/rust-web3", branch = "graph-patches-onto-0.18", features = [
-    "arbitrary_precision",
-    "test",
-] }
 
 [dev-dependencies]
-anyhow = "1.0.100"
+anyhow = "1.0.102"
 tokio-stream = "0.1"
 
 [lints]
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 19dfa1f86c5..8bf5f4c62be 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -22,10 +22,10 @@ services:
   anvil:
     # Pinned to specific version since newer versions do not produce
     # deterministic block hashes. Unpin once that's fixed upstream
-    image: ghcr.io/foundry-rs/foundry:v1.2.3
+    image: ghcr.io/foundry-rs/foundry:v1.4.0
     ports:
       - '3021:8545'
-    command: "'anvil --host 0.0.0.0 --gas-limit 100000000000 --base-fee 1 --block-time 2 --timestamp 1743944919 --mnemonic \"test test test test test test test test test test test junk\"'"
+    command: "'anvil --host 0.0.0.0 --gas-limit 100000000000 --base-fee 1 --timestamp 1743944919 --mnemonic \"test test test test test test test test test test test junk\"'"
 
 # graph-node ports:
 #   json-rpc: 8020
diff --git a/tests/integration-tests/base/package.json b/tests/integration-tests/base/package.json
index 010c05d6f37..43234781f5e 100644
--- a/tests/integration-tests/base/package.json
+++ b/tests/integration-tests/base/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/base-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/integration-tests/block-handlers/package.json b/tests/integration-tests/block-handlers/package.json
index 85a0970b2a2..1914ac70dcb 100644
--- a/tests/integration-tests/block-handlers/package.json
+++ b/tests/integration-tests/block-handlers/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/block-handlers --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/declared-calls-basic/package.json b/tests/integration-tests/declared-calls-basic/package.json
index a8de0d65d4c..75ffa2b4081 100644
--- a/tests/integration-tests/declared-calls-basic/package.json
+++ b/tests/integration-tests/declared-calls-basic/package.json
@@ -7,7 +7,6 @@
     "codegen": "graph codegen"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.97.1",
     "@graphprotocol/graph-ts": "0.33.0"
   }
 }
diff --git a/tests/integration-tests/declared-calls-struct-fields/package.json b/tests/integration-tests/declared-calls-struct-fields/package.json
index 8f1d708761b..480acf52726 100644
--- a/tests/integration-tests/declared-calls-struct-fields/package.json
+++ b/tests/integration-tests/declared-calls-struct-fields/package.json
@@ -7,7 +7,6 @@
     "codegen": "graph codegen"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.97.1",
     "@graphprotocol/graph-ts": "0.33.0"
   }
 }
diff --git a/tests/integration-tests/ethereum-api-tests/package.json b/tests/integration-tests/ethereum-api-tests/package.json
index 19a9f43e983..8bed6a2e310 100644
--- a/tests/integration-tests/ethereum-api-tests/package.json
+++ b/tests/integration-tests/ethereum-api-tests/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/block-handlers --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.36.0-alpha-20240422133139-8761ea3"
   }
 }
diff --git a/tests/integration-tests/grafted/package.json b/tests/integration-tests/grafted/package.json
index 089c9398e85..b6960fd85fe 100644
--- a/tests/integration-tests/grafted/package.json
+++ b/tests/integration-tests/grafted/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/grafted-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/integration-tests/grafted/subgraph.yaml b/tests/integration-tests/grafted/subgraph.yaml
index c0435df9c11..6cd33f93006 100644
--- a/tests/integration-tests/grafted/subgraph.yaml
+++ b/tests/integration-tests/grafted/subgraph.yaml
@@ -26,5 +26,5 @@ dataSources:
 features:
   - grafting
 graft:
-  base: QmTQbJ234d2Po7xKZS5wKPiYuMYsCAqqY4df5czESjEXn4
-  block: 2
\ No newline at end of file
+  base: '@base@'
+  block: 2
diff --git a/tests/integration-tests/host-exports/package.json b/tests/integration-tests/host-exports/package.json
index e959b38cd70..c8b5c906fb5 100644
--- a/tests/integration-tests/host-exports/package.json
+++ b/tests/integration-tests/host-exports/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/host-exports --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/int8/package.json b/tests/integration-tests/int8/package.json
index 6f1c9686235..bd70d90c42f 100644
--- a/tests/integration-tests/int8/package.json
+++ b/tests/integration-tests/int8/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/int8 --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/logs-query/abis/Contract.abi b/tests/integration-tests/logs-query/abis/Contract.abi
new file mode 100644
index 00000000000..02da1a9e7f3
--- /dev/null
+++ b/tests/integration-tests/logs-query/abis/Contract.abi
@@ -0,0 +1,33 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "Trigger",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint16",
+        "name": "x",
+        "type": "uint16"
+      }
+    ],
+    "name": "emitTrigger",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
diff --git a/tests/integration-tests/logs-query/package.json b/tests/integration-tests/logs-query/package.json
new file mode 100644
index 00000000000..c1a68515054
--- /dev/null
+++ b/tests/integration-tests/logs-query/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "logs-query-subgraph",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "codegen": "graph codegen --skip-migrations",
+    "deploy:test": "graph deploy test/logs-query --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
+  },
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.69.0",
+    "@graphprotocol/graph-ts": "0.34.0"
+  }
+}
diff --git a/tests/integration-tests/logs-query/schema.graphql b/tests/integration-tests/logs-query/schema.graphql
new file mode 100644
index 00000000000..1459e34353b
--- /dev/null
+++ b/tests/integration-tests/logs-query/schema.graphql
@@ -0,0 +1,4 @@
+type Trigger @entity {
+  id: ID!
+  x: Int!
+}
diff --git a/tests/integration-tests/logs-query/src/mapping.ts b/tests/integration-tests/logs-query/src/mapping.ts
new file mode 100644
index 00000000000..8f4d55e6a9f
--- /dev/null
+++ b/tests/integration-tests/logs-query/src/mapping.ts
@@ -0,0 +1,39 @@
+import { Trigger as TriggerEvent } from "../generated/Contract/Contract";
+import { Trigger } from "../generated/schema";
+import { log } from "@graphprotocol/graph-ts";
+
+export function handleTrigger(event: TriggerEvent): void {
+  let entity = new Trigger(event.transaction.hash.toHex());
+  entity.x = event.params.x;
+  entity.save();
+
+  // Generate various log levels and types for testing
+  let x = event.params.x as i32;
+
+  if (x == 0) {
+    log.info("Processing trigger with value zero", []);
+  }
+
+  if (x == 1) {
+    log.error("Error processing trigger", []);
+  }
+
+  if (x == 2) {
+    log.warning("Warning: unusual trigger value", ["hash", event.transaction.hash.toHexString()]);
+  }
+
+  if (x == 3) {
+    log.debug("Debug: trigger details", ["blockNumber", event.block.number.toString()]);
+  }
+
+  if (x == 4) {
+    log.info("Handler execution successful", ["entity_id", entity.id]);
+  }
+
+  if (x == 5) {
+    log.error("Critical timeout error", []);
+  }
+
+  // Log for every event to test general log capture
+  log.info("Trigger event processed", []);
+}
diff --git a/tests/integration-tests/logs-query/subgraph.yaml b/tests/integration-tests/logs-query/subgraph.yaml
new file mode 100644
index 00000000000..be3061d5533
--- /dev/null
+++ b/tests/integration-tests/logs-query/subgraph.yaml
@@ -0,0 +1,26 @@
+specVersion: 0.0.5
+description: Logs Query Test Subgraph
+repository: https://github.com/graphprotocol/graph-node
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Contract
+    network: test
+    source:
+      address: "0x5FbDB2315678afecb367f032d93F642f64180aa3"
+      abi: Contract
+      startBlock: 0
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      entities:
+        - Trigger
+      abis:
+        - name: Contract
+          file: ./abis/Contract.abi
+      eventHandlers:
+        - event: Trigger(uint16)
+          handler: handleTrigger
+      file: ./src/mapping.ts
diff --git a/tests/integration-tests/multiple-subgraph-datasources/package.json b/tests/integration-tests/multiple-subgraph-datasources/package.json
index bba81762437..62e390226aa 100644
--- a/tests/integration-tests/multiple-subgraph-datasources/package.json
+++ b/tests/integration-tests/multiple-subgraph-datasources/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/multiple-subgraph-datasources --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc",
     "@graphprotocol/graph-ts": "0.36.0-alpha-20241129215038-b75cda9"
   }
-} 
\ No newline at end of file
+}
diff --git a/tests/integration-tests/multiple-subgraph-datasources/src/mapping.ts b/tests/integration-tests/multiple-subgraph-datasources/src/mapping.ts
index 4eac3b203db..72220584836 100644
--- a/tests/integration-tests/multiple-subgraph-datasources/src/mapping.ts
+++ b/tests/integration-tests/multiple-subgraph-datasources/src/mapping.ts
@@ -1,7 +1,7 @@
 import { dataSource, EntityTrigger, log } from '@graphprotocol/graph-ts'
 import { AggregatedData } from '../generated/schema'
-import { SourceAData } from '../generated/subgraph-QmZBecjQfrQG5BfpapLywSAzVb5FSFty4j9hVSAhkxbBas'
-import { SourceBData } from '../generated/subgraph-QmaqX7yefmvgVTbc2ZukVYasSgXtE7Xg5b79Z7afVx4y6u'
+import { SourceAData } from '../generated/subgraph-SourceA'
+import { SourceBData } from '../generated/subgraph-SourceB'
 
 
 // We know this handler will run first since its defined first in the manifest
diff --git a/tests/integration-tests/multiple-subgraph-datasources/subgraph.yaml b/tests/integration-tests/multiple-subgraph-datasources/subgraph.yaml
index bcaab1b6e6e..00afb4e60b6 100644
--- a/tests/integration-tests/multiple-subgraph-datasources/subgraph.yaml
+++ b/tests/integration-tests/multiple-subgraph-datasources/subgraph.yaml
@@ -6,7 +6,7 @@ dataSources:
     name: SourceA
     network: test
     source:
-      address: 'QmZBecjQfrQG5BfpapLywSAzVb5FSFty4j9hVSAhkxbBas'
+      address: '@source-subgraph-a@'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
@@ -22,7 +22,7 @@ dataSources:
     name: SourceB
     network: test
     source:
-      address: 'QmaqX7yefmvgVTbc2ZukVYasSgXtE7Xg5b79Z7afVx4y6u'
+      address: '@source-subgraph-b@'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
diff --git a/tests/integration-tests/non-fatal-errors/package.json b/tests/integration-tests/non-fatal-errors/package.json
index 05a004f7f4f..bf2417b6e7f 100644
--- a/tests/integration-tests/non-fatal-errors/package.json
+++ b/tests/integration-tests/non-fatal-errors/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/non-fatal-errors --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/overloaded-functions/package.json b/tests/integration-tests/overloaded-functions/package.json
index 8faaafff019..d00de20329c 100644
--- a/tests/integration-tests/overloaded-functions/package.json
+++ b/tests/integration-tests/overloaded-functions/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/overloaded-contract-functions --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/poi-for-failed-subgraph/package.json b/tests/integration-tests/poi-for-failed-subgraph/package.json
index e49d0b52e9a..fc5e9048f43 100644
--- a/tests/integration-tests/poi-for-failed-subgraph/package.json
+++ b/tests/integration-tests/poi-for-failed-subgraph/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/poi-for-failed-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/remove-then-update/package.json b/tests/integration-tests/remove-then-update/package.json
index 95a0e600cbf..d9b4f5fd213 100644
--- a/tests/integration-tests/remove-then-update/package.json
+++ b/tests/integration-tests/remove-then-update/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/remove-then-update --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/reverted-calls/package.json b/tests/integration-tests/reverted-calls/package.json
index 6bfaaeb54f6..ee985b1752a 100644
--- a/tests/integration-tests/reverted-calls/package.json
+++ b/tests/integration-tests/reverted-calls/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/ganache-reverts --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/source-subgraph-a/package.json b/tests/integration-tests/source-subgraph-a/package.json
index 7b4f032405e..6126ae1235a 100644
--- a/tests/integration-tests/source-subgraph-a/package.json
+++ b/tests/integration-tests/source-subgraph-a/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/source-subgraph-a --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
-} 
\ No newline at end of file
+}
diff --git a/tests/integration-tests/source-subgraph-b/package.json b/tests/integration-tests/source-subgraph-b/package.json
index 1ec8b338c00..e7e72faa5f1 100644
--- a/tests/integration-tests/source-subgraph-b/package.json
+++ b/tests/integration-tests/source-subgraph-b/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/source-subgraph-b --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
-} 
\ No newline at end of file
+}
diff --git a/tests/integration-tests/source-subgraph/package.json b/tests/integration-tests/source-subgraph/package.json
index 73d7e936a53..a39da7175bc 100644
--- a/tests/integration-tests/source-subgraph/package.json
+++ b/tests/integration-tests/source-subgraph/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/source-subgraph --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.91.0-alpha-20241129215038-b75cda9",
     "@graphprotocol/graph-ts": "0.36.0-alpha-20241129215038-b75cda9"
   }
 }
diff --git a/tests/integration-tests/subgraph-data-sources/package.json b/tests/integration-tests/subgraph-data-sources/package.json
index e9051603e37..8d95dc89bad 100644
--- a/tests/integration-tests/subgraph-data-sources/package.json
+++ b/tests/integration-tests/subgraph-data-sources/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/subgraph-data-sources --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.93.4-alpha-20250105163501-f401d0c57c4ba1f1af95a928d447efd63a56ecdc",
     "@graphprotocol/graph-ts": "0.36.0-alpha-20241129215038-b75cda9"
   }
 }
diff --git a/tests/integration-tests/subgraph-data-sources/src/mapping.ts b/tests/integration-tests/subgraph-data-sources/src/mapping.ts
index 8fc8fc54279..261d9e2796d 100644
--- a/tests/integration-tests/subgraph-data-sources/src/mapping.ts
+++ b/tests/integration-tests/subgraph-data-sources/src/mapping.ts
@@ -1,5 +1,5 @@
 import { log, store } from '@graphprotocol/graph-ts';
-import { Block, Block2, Block3 } from '../generated/subgraph-QmRWTEejPDDwALaquFGm6X2GBbbh5osYDXwCRRkoZ6KQhb';
+import { Block, Block2, Block3 } from '../generated/subgraph-Contract';
 import { MirrorBlock, MirrorBlockBytes } from '../generated/schema';
 
 export function handleEntity(block: Block): void {
diff --git a/tests/integration-tests/subgraph-data-sources/subgraph.yaml b/tests/integration-tests/subgraph-data-sources/subgraph.yaml
index a4ce72ae034..0ac8574126e 100644
--- a/tests/integration-tests/subgraph-data-sources/subgraph.yaml
+++ b/tests/integration-tests/subgraph-data-sources/subgraph.yaml
@@ -6,7 +6,7 @@ dataSources:
     name: Contract
     network: test
     source:
-      address: 'QmRWTEejPDDwALaquFGm6X2GBbbh5osYDXwCRRkoZ6KQhb'
+      address: '@source-subgraph@'
       startBlock: 0
     mapping:
       apiVersion: 0.0.7
diff --git a/tests/integration-tests/timestamp/package.json b/tests/integration-tests/timestamp/package.json
index 27a681ecb02..2f518adccde 100644
--- a/tests/integration-tests/timestamp/package.json
+++ b/tests/integration-tests/timestamp/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/timestamp --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/integration-tests/topic-filter/package.json b/tests/integration-tests/topic-filter/package.json
index a32c3f47381..90ecd3c1f5f 100644
--- a/tests/integration-tests/topic-filter/package.json
+++ b/tests/integration-tests/topic-filter/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/block-handlers --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.71.0-alpha-20240419180731-51ea29d",
     "@graphprotocol/graph-ts": "0.35.0"
   }
 }
diff --git a/tests/integration-tests/topic-filter/schema.graphql b/tests/integration-tests/topic-filter/schema.graphql
index 1ff0f94adab..01dfa0433dd 100644
--- a/tests/integration-tests/topic-filter/schema.graphql
+++ b/tests/integration-tests/topic-filter/schema.graphql
@@ -1,5 +1,5 @@
 type AnotherTriggerEntity @entity {
-  id: ID!
+  id: Int8!
   a: BigInt
   b: BigInt
   c: BigInt
diff --git a/tests/integration-tests/topic-filter/src/mapping.ts b/tests/integration-tests/topic-filter/src/mapping.ts
index 9a5ab36b221..fc15ef5dda0 100644
--- a/tests/integration-tests/topic-filter/src/mapping.ts
+++ b/tests/integration-tests/topic-filter/src/mapping.ts
@@ -1,9 +1,8 @@
-import { Address, ethereum } from "@graphprotocol/graph-ts";
 import { AnotherTrigger } from "../generated/Contract/Contract";
 import { AnotherTriggerEntity } from "../generated/schema";
 
 export function handleAnotherTrigger(event: AnotherTrigger): void {
-  let entity = new AnotherTriggerEntity(event.transaction.hash.toHex());
+  let entity = new AnotherTriggerEntity();
   entity.a = event.params.a;
   entity.b = event.params.b;
   entity.c = event.params.c;
diff --git a/tests/integration-tests/value-roundtrip/package.json b/tests/integration-tests/value-roundtrip/package.json
index 665348c84ac..f321b0b5810 100644
--- a/tests/integration-tests/value-roundtrip/package.json
+++ b/tests/integration-tests/value-roundtrip/package.json
@@ -7,7 +7,6 @@
     "deploy:test": "graph deploy test/value-roundtrip --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
   },
   "devDependencies": {
-    "@graphprotocol/graph-cli": "0.69.0",
     "@graphprotocol/graph-ts": "0.34.0"
   }
 }
diff --git a/tests/runner-tests/aggregation-current-bucket/abis/Contract.abi b/tests/runner-tests/aggregation-current-bucket/abis/Contract.abi
new file mode 100644
index 00000000000..9d9f56b9263
--- /dev/null
+++ b/tests/runner-tests/aggregation-current-bucket/abis/Contract.abi
@@ -0,0 +1,15 @@
+[
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "testCommand",
+                "type": "string"
+            }
+        ],
+        "name": "TestEvent",
+        "type": "event"
+    }
+]
diff --git a/tests/runner-tests/aggregation-current-bucket/package.json b/tests/runner-tests/aggregation-current-bucket/package.json
new file mode 100644
index 00000000000..d97282562f1
--- /dev/null
+++ b/tests/runner-tests/aggregation-current-bucket/package.json
@@ -0,0 +1,13 @@
+{
+    "name": "aggregation-current-bucket",
+    "version": "0.0.0",
+    "private": true,
+    "scripts": {
+        "codegen": "graph codegen --skip-migrations",
+        "deploy:test": "graph deploy test/aggregation-current-bucket --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI 2>&1 | sed 's/\u001b[[0-9;]*m//g'"
+    },
+    "devDependencies": {
+        "@graphprotocol/graph-cli": "0.98.1",
+        "@graphprotocol/graph-ts": "0.35.0"
+    }
+}
diff --git a/tests/runner-tests/aggregation-current-bucket/schema.graphql b/tests/runner-tests/aggregation-current-bucket/schema.graphql
new file mode 100644
index 00000000000..2e8e713d72e
--- /dev/null
+++ b/tests/runner-tests/aggregation-current-bucket/schema.graphql
@@ -0,0 +1,19 @@
+type Token @entity(immutable: true) {
+  id: Bytes!
+  name: String!
+  stats: [Stats!]! @derivedFrom(field: "token")
+}
+
+type Data @entity(timeseries: true) {
+  id: Int8!
+  timestamp: Timestamp!
+  token: Token!
+  amount: BigDecimal!
+}
+
+type Stats @aggregation(intervals: ["hour"], source: "Data") {
+  id: Int8!
+  timestamp: Timestamp!
+  token: Token!
+  sum: BigDecimal! @aggregate(fn: "sum", arg: "amount")
+}
diff --git a/tests/runner-tests/aggregation-current-bucket/src/mapping.ts b/tests/runner-tests/aggregation-current-bucket/src/mapping.ts
new file mode 100644
index 00000000000..19e2e7750d8
--- /dev/null
+++ b/tests/runner-tests/aggregation-current-bucket/src/mapping.ts
@@ -0,0 +1,21 @@
+import { BigDecimal, Bytes } from "@graphprotocol/graph-ts";
+import { TestEvent } from "../generated/Contract/Contract";
+import { Token, Data } from "../generated/schema";
+
+export function handleTestEvent(event: TestEvent): void {
+  let command = event.params.testCommand;
+  let parts = command.split(":");
+
+  if (parts[0] == "token") {
+    // Format: "token:<hex_id>:<name>"
+    let token = new Token(Bytes.fromHexString(parts[1]));
+    token.name = parts[2];
+    token.save();
+  } else if (parts[0] == "data") {
+    // Format: "data:<token_hex_id>:<amount>"
+    let data = new Data(0);
+    data.token = Bytes.fromHexString(parts[1]);
+    data.amount = BigDecimal.fromString(parts[2]);
+    data.save();
+  }
+}
diff --git a/tests/runner-tests/aggregation-current-bucket/subgraph.yaml b/tests/runner-tests/aggregation-current-bucket/subgraph.yaml
new file mode 100644
index 00000000000..9386681ae18
--- /dev/null
+++ b/tests/runner-tests/aggregation-current-bucket/subgraph.yaml
@@ -0,0 +1,24 @@
+specVersion: 1.1.0
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Contract
+    network: test
+    source:
+      address: "0x0000000000000000000000000000000000000000"
+      abi: Contract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.7
+      language: wasm/assemblyscript
+      entities:
+        - Token
+        - Data
+      abis:
+        - name: Contract
+          file: ./abis/Contract.abi
+      eventHandlers:
+        - event: TestEvent(string)
+          handler: handleTestEvent
+      file: ./src/mapping.ts
diff --git a/tests/runner-tests/file-data-sources/src/mapping.ts b/tests/runner-tests/file-data-sources/src/mapping.ts
index 19716ce4503..a7f6ffa70ab 100644
--- a/tests/runner-tests/file-data-sources/src/mapping.ts
+++ b/tests/runner-tests/file-data-sources/src/mapping.ts
@@ -126,6 +126,13 @@ export function handleFile(data: Bytes): void {
   let contextCommand = context.getString('command');
 
   if (contextCommand == SPAWN_FDS_FROM_OFFCHAIN_HANDLER) {
+    // Create an entity for THIS file data source too, so that two offchain
+    // triggers in the same block each write an entity. This exercises the
+    // shared VID generator: if VIDs collide the DB will reject the insert.
+    let entity = new FileEntity(dataSource.stringParam());
+    entity.content = data.toString();
+    entity.save();
+
     let hash = context.getString('hash');
     log.info('Creating file data source from handleFile: {}', [hash]);
     dataSource.createWithContext('File', [hash], new DataSourceContext());
diff --git a/tests/runner-tests/skip-duplicates/abis/Contract.abi b/tests/runner-tests/skip-duplicates/abis/Contract.abi
new file mode 100644
index 00000000000..9d9f56b9263
--- /dev/null
+++ b/tests/runner-tests/skip-duplicates/abis/Contract.abi
@@ -0,0 +1,15 @@
+[
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "testCommand",
+                "type": "string"
+            }
+        ],
+        "name": "TestEvent",
+        "type": "event"
+    }
+]
diff --git a/tests/runner-tests/skip-duplicates/package.json b/tests/runner-tests/skip-duplicates/package.json
new file mode 100644
index 00000000000..da0ba3e3e87
--- /dev/null
+++ b/tests/runner-tests/skip-duplicates/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "skip-duplicates",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "codegen": "graph codegen --skip-migrations",
+    "deploy:test": "graph deploy test/skip-duplicates --version-label v0.0.1 --ipfs $IPFS_URI --node $GRAPH_NODE_ADMIN_URI"
+  },
+  "devDependencies": {
+    "@graphprotocol/graph-cli": "0.60.0",
+    "@graphprotocol/graph-ts": "0.31.0"
+  }
+}
diff --git a/tests/runner-tests/skip-duplicates/schema.graphql b/tests/runner-tests/skip-duplicates/schema.graphql
new file mode 100644
index 00000000000..94c5a2862d0
--- /dev/null
+++ b/tests/runner-tests/skip-duplicates/schema.graphql
@@ -0,0 +1,4 @@
+type Ping @entity(immutable: true, skipDuplicates: true) {
+  id: ID!
+  value: String!
+}
diff --git a/tests/runner-tests/skip-duplicates/src/mapping.ts b/tests/runner-tests/skip-duplicates/src/mapping.ts
new file mode 100644
index 00000000000..bf756595b5d
--- /dev/null
+++ b/tests/runner-tests/skip-duplicates/src/mapping.ts
@@ -0,0 +1,8 @@
+import { ethereum } from "@graphprotocol/graph-ts";
+import { Ping } from "../generated/schema";
+
+export function handleBlock(block: ethereum.Block): void {
+  let entity = new Ping("duplicate-entity");
+  entity.value = "ping";
+  entity.save();
+}
diff --git a/tests/runner-tests/skip-duplicates/subgraph.yaml b/tests/runner-tests/skip-duplicates/subgraph.yaml
new file mode 100644
index 00000000000..068301105c2
--- /dev/null
+++ b/tests/runner-tests/skip-duplicates/subgraph.yaml
@@ -0,0 +1,25 @@
+specVersion: 0.0.8
+schema:
+  file: ./schema.graphql
+dataSources:
+  - kind: ethereum/contract
+    name: Contract
+    network: test
+    source:
+      address: "0x0000000000000000000000000000000000000000"
+      abi: Contract
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.7
+      language: wasm/assemblyscript
+      entities:
+        - Ping
+      abis:
+        - name: Contract
+          file: ./abis/Contract.abi
+      blockHandlers:
+        - handler: handleBlock
+          filter:
+            kind: polling
+            every: 1
+      file: ./src/mapping.ts
diff --git a/tests/src/config.rs b/tests/src/config.rs
index 46f22b141e7..e35fbb6bf0d 100644
--- a/tests/src/config.rs
+++ b/tests/src/config.rs
@@ -140,10 +140,17 @@ impl GraphNodeConfig {
         let bin = fs::canonicalize("../target/debug/gnd")
             .expect("failed to infer `graph-node` program location. (Was it built already?)");
 
+        // Allow overriding IPFS port via environment variable
+        let ipfs_port = std::env::var("IPFS_TEST_PORT")
+            .ok()
+            .and_then(|p| p.parse().ok())
+            .unwrap_or(3001);
+        let ipfs_uri = format!("http://localhost:{}", ipfs_port);
+
         Self {
             bin,
             ports: GraphNodePorts::default(),
-            ipfs_uri: "http://localhost:3001".to_string(),
+            ipfs_uri,
             log_file: TestFile::new("integration-tests/graph-node.log"),
         }
     }
@@ -154,10 +161,17 @@ impl Default for GraphNodeConfig {
         let bin = fs::canonicalize("../target/debug/graph-node")
             .expect("failed to infer `graph-node` program location. (Was it built already?)");
 
+        // Allow overriding IPFS port via environment variable
+        let ipfs_port = std::env::var("IPFS_TEST_PORT")
+            .ok()
+            .and_then(|p| p.parse().ok())
+            .unwrap_or(3001);
+        let ipfs_uri = format!("http://localhost:{}", ipfs_port);
+
         Self {
             bin,
             ports: GraphNodePorts::default(),
-            ipfs_uri: "http://localhost:3001".to_string(),
+            ipfs_uri,
             log_file: TestFile::new("integration-tests/graph-node.log"),
         }
     }
@@ -184,21 +198,61 @@ impl Config {
     ) -> anyhow::Result<Child> {
         let ports = &self.graph_node.ports;
 
+        // Generate a TOML config file so we can include [log_store]
+        let log_dir = "/tmp/integration-test-logs";
+        std::fs::create_dir_all(log_dir).ok();
+        let config_content = format!(
+            r#"
+[store]
+[store.primary]
+connection = "{db_url}"
+pool_size = 10
+
+[deployment]
+[[deployment.rule]]
+store = "primary"
+indexers = ["default"]
+
+[chains]
+ingestor = "default"
+
+[chains.test]
+shard = "primary"
+provider = [
+  {{ label = "test", url = "{eth_url}", features = ["archive", "traces"] }}
+]
+
+[log_store]
+backend = "file"
+directory = "{log_dir}"
+retention_hours = 0
+"#,
+            db_url = self.db.url(),
+            eth_url = self.eth.url(),
+            log_dir = log_dir,
+        );
+        let config_path = std::env::temp_dir().join("graph-node-integration-test.toml");
+        std::fs::write(&config_path, &config_content)?;
+
+        let config_path_str = config_path.to_string_lossy().to_string();
+        let http_port = ports.http.to_string();
+        let index_port = ports.index.to_string();
+        let admin_port = ports.admin.to_string();
+        let metrics_port = ports.metrics.to_string();
+
         let args = [
-            "--postgres-url",
-            &self.db.url(),
-            "--ethereum-rpc",
-            &self.eth.network_url(),
+            "--config",
+            &config_path_str,
             "--ipfs",
             &self.graph_node.ipfs_uri,
             "--http-port",
-            &ports.http.to_string(),
+            &http_port,
             "--index-node-port",
-            &ports.index.to_string(),
+            &index_port,
             "--admin-port",
-            &ports.admin.to_string(),
+            &admin_port,
             "--metrics-port",
-            &ports.metrics.to_string(),
+            &metrics_port,
         ];
 
         let args = args
@@ -279,22 +333,37 @@ impl Config {
 
 impl Default for Config {
     fn default() -> Self {
-        let graph_cli =
-            std::env::var("GRAPH_CLI").unwrap_or_else(|_| "node_modules/.bin/graph".to_string());
+        let graph_cli = std::env::var("GRAPH_CLI").unwrap_or_else(|_| {
+            fs::canonicalize("../target/debug/gnd")
+                .expect("failed to infer gnd location. (Was it built already?)")
+                .to_string_lossy()
+                .into_owned()
+        });
         let num_parallel_tests = std::env::var("N_CONCURRENT_TESTS")
             .map(|x| x.parse().expect("N_CONCURRENT_TESTS must be a number"))
             .unwrap_or(1000);
+
+        // Allow overriding ports via environment variables
+        let postgres_port = std::env::var("POSTGRES_TEST_PORT")
+            .ok()
+            .and_then(|p| p.parse().ok())
+            .unwrap_or(3011);
+        let eth_port = std::env::var("ETHEREUM_TEST_PORT")
+            .ok()
+            .and_then(|p| p.parse().ok())
+            .unwrap_or(3021);
+
         Config {
             db: DbConfig {
                 host: "localhost".to_string(),
-                port: 3011,
+                port: postgres_port,
                 user: "graph-node".to_string(),
                 password: "let-me-in".to_string(),
                 name: "graph-node".to_string(),
             },
             eth: EthConfig {
                 network: "test".to_string(),
-                port: 3021,
+                port: eth_port,
                 host: "localhost".to_string(),
             },
             graph_node: GraphNodeConfig::from_env(),
diff --git a/tests/src/contract.rs b/tests/src/contract.rs
index 80a9ba57031..82fc89fec87 100644
--- a/tests/src/contract.rs
+++ b/tests/src/contract.rs
@@ -1,57 +1,81 @@
-use std::str::FromStr;
-
 use graph::prelude::{
-    lazy_static,
+    alloy::{
+        contract::{ContractInstance, Interface},
+        dyn_abi::DynSolValue,
+        json_abi::JsonAbi,
+        network::{Ethereum, TransactionBuilder},
+        primitives::{Address, Bytes, U256},
+        providers::{Provider, ProviderBuilder, WalletProvider, ext::AnvilApi},
+        rpc::types::{Block, TransactionReceipt, TransactionRequest},
+        signers::local::PrivateKeySigner,
+    },
+    hex, lazy_static,
     serde_json::{self, Value},
 };
 
-use web3::{
-    api::{Eth, Namespace},
-    contract::{tokens::Tokenize, Contract as Web3Contract, Options},
-    transports::Http,
-    types::{Address, Block, BlockId, BlockNumber, Bytes, TransactionReceipt, H256},
-};
-// web3 version 0.18 does not expose this; once the graph crate updates to
-// version 0.19, we can use web3::signing::SecretKey from the graph crate
-use secp256k1::SecretKey;
-
-use crate::{error, helpers::TestFile, status, CONFIG};
+use crate::{CONFIG, error, helpers::TestFile, status};
 
 // `FROM` and `FROM_KEY` are the address and private key of the first
 // account that anvil prints on startup
 lazy_static! {
-    static ref FROM: Address =
-        Address::from_str("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266").unwrap();
-    static ref FROM_KEY: SecretKey = {
-        SecretKey::from_str("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
-            .unwrap()
-    };
+    static ref FROM: Address = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+        .parse()
+        .unwrap();
+    static ref FROM_KEY: PrivateKeySigner =
+        "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+            .parse()
+            .unwrap();
     static ref CONTRACTS: Vec<Contract> = {
         vec![
             Contract {
                 name: "SimpleContract".to_string(),
-                address: Address::from_str("0x5fbdb2315678afecb367f032d93f642f64180aa3").unwrap(),
+                address: "0x5fbdb2315678afecb367f032d93f642f64180aa3"
+                    .parse()
+                    .unwrap(),
             },
             Contract {
                 name: "LimitedContract".to_string(),
-                address: Address::from_str("0xb7f8bc63bbcad18155201308c8f3540b07f84f5e").unwrap(),
+                address: "0x0b306bf915c4d645ff596e518faf3f9669b97016"
+                    .parse()
+                    .unwrap(),
             },
             Contract {
                 name: "RevertingContract".to_string(),
-                address: Address::from_str("0xa51c1fc2f0d1a1b8494ed1fe312d7c3a78ed91c0").unwrap(),
+                address: "0x959922be3caee4b8cd9a407cc3ac1c251c2007b1"
+                    .parse()
+                    .unwrap(),
             },
             Contract {
                 name: "OverloadedContract".to_string(),
-                address: Address::from_str("0x0dcd1bf9a1b36ce34237eeafef220932846bcd82").unwrap(),
+                address: "0x9a9f2ccfde556a7e9ff0848998aa4a0cfd8863ae"
+                    .parse()
+                    .unwrap(),
             },
             Contract {
                 name: "DeclaredCallsContract".to_string(),
-                address: Address::from_str("0x9a676e781a523b5d0c0e43731313a708cb607508").unwrap(),
+                address: "0x68b1d87f95878fe05b998f19b66f4baba5de1aed"
+                    .parse()
+                    .unwrap(),
             },
         ]
     };
 }
 
+/// Helper function to create a DynSolValue::Uint from a u64 value
+pub fn uint(val: u64, bits: usize) -> DynSolValue {
+    DynSolValue::Uint(U256::from(val), bits)
+}
+
+/// Helper function to create a DynSolValue::Address
+pub fn addr(a: Address) -> DynSolValue {
+    DynSolValue::Address(a)
+}
+
+/// Helper function to create a DynSolValue::String
+pub fn string(s: &str) -> DynSolValue {
+    DynSolValue::String(s.to_string())
+}
+
 #[derive(Debug, Clone)]
 pub struct Contract {
     pub name: String,
@@ -59,66 +83,74 @@ pub struct Contract {
 }
 
 impl Contract {
-    fn eth() -> Eth<Http> {
-        let web3 = Http::new(&CONFIG.eth.url()).unwrap();
-        Eth::new(web3)
+    fn provider() -> impl Provider<Ethereum> + WalletProvider + Clone {
+        ProviderBuilder::new()
+            .wallet(FROM_KEY.clone())
+            .connect_http(CONFIG.eth.url().parse().unwrap())
     }
 
     async fn exists(&self) -> bool {
         let bytes = self.code().await;
-        !bytes.0.is_empty()
+        !bytes.is_empty()
     }
 
     pub async fn code(&self) -> Bytes {
-        let eth = Self::eth();
-        eth.code(self.address, None).await.unwrap()
+        let provider = Self::provider();
+        provider.get_code_at(self.address).await.unwrap()
     }
 
-    fn code_and_abi(name: &str) -> anyhow::Result<(String, Vec<u8>)> {
-        let src = TestFile::new(&format!("contracts/src/{}.sol", name));
+    fn code_and_abi(name: &str) -> anyhow::Result<(Bytes, JsonAbi)> {
         let bin = TestFile::new(&format!("contracts/out/{}.sol/{}.json", name, name));
-        if src.newer(&bin) {
-            println!(
-                "The source {} is newer than the compiled contract {}. Please recompile.",
-                src, bin
-            );
-        }
 
         let json: Value = serde_json::from_reader(bin.reader()?).unwrap();
-        let abi = serde_json::to_string(&json["abi"]).unwrap();
-        let code = json["bytecode"]["object"].as_str().unwrap();
-        Ok((code.to_string(), abi.as_bytes().to_vec()))
+        let abi: JsonAbi = serde_json::from_value(json["abi"].clone())?;
+        let code_hex = json["bytecode"]["object"].as_str().unwrap();
+        let code = Bytes::from(hex::decode(code_hex.trim_start_matches("0x"))?);
+        Ok((code, abi))
     }
 
     pub async fn deploy(name: &str) -> anyhow::Result<Self> {
-        let eth = Self::eth();
-        let (code, abi) = Self::code_and_abi(name)?;
-        let contract = Web3Contract::deploy(eth, &abi)
-            .unwrap()
-            .confirmations(1)
-            .execute(code, (), FROM.to_owned())
-            .await
-            .unwrap();
+        let provider = Self::provider();
+        let (code, _abi) = Self::code_and_abi(name)?;
+
+        let deploy_tx = TransactionRequest::default().with_deploy_code(code);
+
+        let receipt = provider
+            .send_transaction(deploy_tx)
+            .await?
+            .with_required_confirmations(1)
+            .get_receipt()
+            .await?;
+
+        let address = receipt
+            .contract_address
+            .ok_or_else(|| anyhow::anyhow!("No contract address in receipt"))?;
 
         Ok(Self {
             name: name.to_string(),
-            address: contract.address(),
+            address,
         })
     }
 
     pub async fn call(
         &self,
         func: &str,
-        params: impl Tokenize,
+        params: &[DynSolValue],
     ) -> anyhow::Result<TransactionReceipt> {
-        let eth = Self::eth();
+        let provider = Self::provider();
         let (_, abi) = Self::code_and_abi(&self.name)?;
-        let contract = Web3Contract::from_json(eth, self.address, &abi)?;
-        let options = Options::default();
+
+        let interface = Interface::new(abi);
+        let contract = ContractInstance::new(self.address, provider, interface);
+
         let receipt = contract
-            .signed_call_with_confirmations(func, params, options, 1, &*FROM_KEY)
-            .await
-            .unwrap();
+            .function(func, params)?
+            .send()
+            .await?
+            .with_required_confirmations(1)
+            .get_receipt()
+            .await?;
+
         Ok(receipt)
     }
 
@@ -154,54 +186,79 @@ impl Contract {
                 // Some tests want 10 calls to `emitTrigger` in place
                 if contract.name == "SimpleContract" {
                     status!("contracts", "Calling SimpleContract.emitTrigger 10 times");
-                    for i in 1..=10 {
-                        contract.call("emitTrigger", (i as u16,)).await.unwrap();
+                    for i in 1u64..=10 {
+                        contract.call("emitTrigger", &[uint(i, 16)]).await.unwrap();
                     }
                 }
                 // Declared calls tests need a Transfer
                 if contract.name == "DeclaredCallsContract" {
                     status!("contracts", "Emitting transfers from DeclaredCallsContract");
-                    let addr1 = "0x1111111111111111111111111111111111111111"
-                        .parse::<web3::types::Address>()
+                    let addr1: Address = "0x1111111111111111111111111111111111111111"
+                        .parse()
                         .unwrap();
-                    let addr2 = "0x2222222222222222222222222222222222222222"
-                        .parse::<web3::types::Address>()
+                    let addr2: Address = "0x2222222222222222222222222222222222222222"
+                        .parse()
                         .unwrap();
-                    let addr3 = "0x3333333333333333333333333333333333333333"
-                        .parse::<web3::types::Address>()
+                    let addr3: Address = "0x3333333333333333333333333333333333333333"
+                        .parse()
                         .unwrap();
-                    let addr4 = "0x4444444444444444444444444444444444444444"
-                        .parse::<web3::types::Address>()
+                    let addr4: Address = "0x4444444444444444444444444444444444444444"
+                        .parse()
                         .unwrap();
 
                     contract
-                        .call("emitTransfer", (addr1, addr2, 100u64))
+                        .call(
+                            "emitTransfer",
+                            &[addr(addr1), addr(addr2), uint(100u64, 256)],
+                        )
                         .await
                         .unwrap();
 
                     // Emit an asset transfer event to trigger struct field declared calls
                     contract
-                        .call("emitAssetTransfer", (addr1, 150u64, true, addr3))
+                        .call(
+                            "emitAssetTransfer",
+                            &[
+                                addr(addr1),
+                                uint(150u64, 256),
+                                DynSolValue::Bool(true),
+                                addr(addr3),
+                            ],
+                        )
                         .await
                         .unwrap();
 
                     // Also emit a complex asset event for nested struct testing
-                    let values = vec![1u64, 2u64, 3u64];
+                    let values =
+                        DynSolValue::Array(vec![uint(1u64, 256), uint(2u64, 256), uint(3u64, 256)]);
                     contract
                         .call(
                             "emitComplexAssetCreated",
-                            (
-                                addr4,
-                                250u64,
-                                true,
-                                "Complex Asset Metadata".to_string(),
+                            &[
+                                addr(addr4),
+                                uint(250u64, 256),
+                                DynSolValue::Bool(true),
+                                string("Complex Asset Metadata"),
                                 values,
-                                99u64,
-                            ),
+                                uint(99u64, 256),
+                            ],
                         )
                         .await
                         .unwrap();
                 }
+                // The topic-filter test needs some events emitted
+                if contract.name == "SimpleContract" {
+                    status!("contracts", "Emitting anotherTrigger from SimpleContract");
+                    let args = &[
+                        [uint(1, 256), uint(2, 256), uint(3, 256), string("abc")],
+                        [uint(1, 256), uint(1, 256), uint(1, 256), string("abc")],
+                        [uint(4, 256), uint(2, 256), uint(3, 256), string("abc")],
+                        [uint(4, 256), uint(4, 256), uint(3, 256), string("abc")],
+                    ];
+                    for arg in args {
+                        contract.call("emitAnotherTrigger", arg).await.unwrap();
+                    }
+                }
             } else {
                 status!(
                     "contracts",
@@ -215,12 +272,48 @@ impl Contract {
         Ok(contracts)
     }
 
-    pub async fn latest_block() -> Option<Block<H256>> {
-        let eth = Self::eth();
-        let block = eth
-            .block(BlockId::Number(BlockNumber::Latest))
+    pub async fn latest_block() -> Option<Block> {
+        let provider = Self::provider();
+        provider
+            .get_block_by_number(Default::default())
             .await
-            .unwrap_or_default();
-        block
+            .ok()
+            .flatten()
+    }
+
+    /// Mine the specified number of empty blocks using Anvil's evm_mine RPC.
+    pub async fn mine_blocks(count: u64) -> anyhow::Result<u64> {
+        let provider = Self::provider();
+
+        for _ in 0..count {
+            provider
+                .evm_mine(None)
+                .await
+                .map_err(|e| anyhow::anyhow!("Failed to mine block: {}", e))?;
+        }
+
+        let block = provider
+            .get_block_number()
+            .await
+            .map_err(|e| anyhow::anyhow!("Failed to get block number: {}", e))?;
+
+        Ok(block)
+    }
+
+    /// Ensure the blockchain has reached at least the specified block number.
+    /// Mines empty blocks if needed.
+    pub async fn ensure_block(target_block: u64) -> anyhow::Result<()> {
+        let provider = Self::provider();
+        let current = provider
+            .get_block_number()
+            .await
+            .map_err(|e| anyhow::anyhow!("Failed to get block number: {}", e))?;
+
+        if current < target_block {
+            let blocks_needed = target_block - current;
+            Self::mine_blocks(blocks_needed).await?;
+        }
+
+        Ok(())
     }
 }
diff --git a/tests/src/fixture/ethereum.rs b/tests/src/fixture/ethereum.rs
index 713df0af40f..bba946a9ae9 100644
--- a/tests/src/fixture/ethereum.rs
+++ b/tests/src/fixture/ethereum.rs
@@ -3,8 +3,8 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use super::{
-    test_ptr, CommonChainConfig, MutexBlockStreamBuilder, NoopAdapterSelector,
-    NoopRuntimeAdapterBuilder, StaticBlockRefetcher, StaticStreamBuilder, Stores, TestChain,
+    CommonChainConfig, MutexBlockStreamBuilder, NoopAdapterSelector, NoopRuntimeAdapterBuilder,
+    StaticBlockRefetcher, StaticStreamBuilder, Stores, TestChain, test_ptr,
 };
 use graph::abi;
 use graph::blockchain::block_stream::BlockWithTriggers;
@@ -13,16 +13,16 @@ use graph::blockchain::client::ChainClient;
 use graph::blockchain::{BlockPtr, Trigger, TriggersAdapterSelector};
 use graph::cheap_clone::CheapClone;
 use graph::data_source::subgraph;
-use graph::prelude::alloy::primitives::{Address, B256, U256};
+use graph::prelude::alloy::primitives::{Address, B256, U256, keccak256};
 use graph::prelude::alloy::rpc::types::BlockTransactions;
 use graph::prelude::{
-    create_dummy_transaction, create_minimal_block_for_test, tiny_keccak, DeploymentHash, Entity,
-    LightEthereumBlock, ENV_VARS,
+    DeploymentHash, ENV_VARS, Entity, LightEthereumBlock, create_dummy_transaction,
+    create_minimal_block_for_test,
 };
 use graph::schema::EntityType;
 use graph_chain_ethereum::network::EthereumNetworkAdapters;
 use graph_chain_ethereum::trigger::LogRef;
-use graph_chain_ethereum::Chain;
+use graph_chain_ethereum::{Chain, chain::ChainSettings};
 use graph_chain_ethereum::{
     chain::BlockFinality,
     trigger::{EthereumBlockTriggerType, EthereumTrigger},
@@ -67,9 +67,9 @@ pub async fn chain(
         Arc::new(NoopRuntimeAdapterBuilder {}),
         eth_adapters,
         ENV_VARS.reorg_threshold(),
-        ENV_VARS.ingestor_polling_interval,
         // We assume the tested chain is always ingestible for now
         true,
+        Arc::new(ChainSettings::from_env_defaults()),
     );
 
     TestChain {
@@ -84,7 +84,7 @@ pub fn genesis() -> BlockWithTriggers<graph_chain_ethereum::Chain> {
     let block = create_minimal_block_for_test(ptr.number as u64, ptr.hash.as_b256());
 
     BlockWithTriggers::<graph_chain_ethereum::Chain> {
-        block: BlockFinality::Final(Arc::new(LightEthereumBlock::new(block.into()))),
+        block: BlockFinality::Final(Arc::new(LightEthereumBlock::new(block))),
         trigger_data: vec![Trigger::Chain(EthereumTrigger::Block(
             ptr,
             EthereumBlockTriggerType::End,
@@ -128,7 +128,7 @@ pub fn empty_block(parent_ptr: BlockPtr, ptr: BlockPtr) -> BlockWithTriggers<Cha
         .with_transactions(transactions);
 
     BlockWithTriggers::<graph_chain_ethereum::Chain> {
-        block: BlockFinality::Final(Arc::new(LightEthereumBlock::new(alloy_block.into()))),
+        block: BlockFinality::Final(Arc::new(LightEthereumBlock::new(alloy_block))),
         trigger_data: vec![Trigger::Chain(EthereumTrigger::Block(
             ptr,
             EthereumBlockTriggerType::End,
@@ -143,7 +143,7 @@ pub fn push_test_log(block: &mut BlockWithTriggers<Chain>, payload: impl Into<St
         inner: alloy::primitives::Log {
             address: Address::ZERO,
             data: LogData::new_unchecked(
-                vec![tiny_keccak::keccak256(b"TestEvent(string)").into()],
+                vec![keccak256(b"TestEvent(string)")],
                 abi::DynSolValue::String(payload.into()).abi_encode().into(),
             ),
         },
@@ -199,7 +199,7 @@ pub fn push_test_command(
         inner: alloy::primitives::Log {
             address: Address::ZERO,
             data: LogData::new_unchecked(
-                vec![tiny_keccak::keccak256(b"TestEvent(string,string)").into()],
+                vec![keccak256(b"TestEvent(string,string)")],
                 abi::DynSolValue::Tuple(vec![
                     abi::DynSolValue::String(test_command.into()),
                     abi::DynSolValue::String(data.into()),
diff --git a/tests/src/fixture/mod.rs b/tests/src/fixture/mod.rs
index 197eb41392e..90949c81be2 100644
--- a/tests/src/fixture/mod.rs
+++ b/tests/src/fixture/mod.rs
@@ -20,7 +20,8 @@ use graph::blockchain::{
 };
 use graph::cheap_clone::CheapClone;
 use graph::components::link_resolver::{
-    ArweaveClient, ArweaveResolver, FileLinkResolver, FileSizeLimit, LinkResolverContext,
+    ArweaveClient, ArweaveClientError, ArweaveResolver, FileLinkResolver, FileSizeLimit,
+    LinkResolverContext,
 };
 use graph::components::metrics::MetricsRegistry;
 use graph::components::network_provider::ChainName;
@@ -35,29 +36,30 @@ use graph::env::EnvVars;
 use graph::firehose::{FirehoseEndpoint, FirehoseEndpoints, SubgraphLimit};
 use graph::futures03::{Stream, StreamExt};
 use graph::http_body_util::Full;
-use graph::hyper::body::Bytes;
 use graph::hyper::Request;
+use graph::hyper::body::Bytes;
 use graph::ipfs::{IpfsClient, IpfsMetrics};
 use graph::prelude::alloy::primitives::B256;
 use graph::prelude::alloy::primitives::U256;
 use graph::prelude::serde_json::{self, json};
 use graph::prelude::{
-    lazy_static, q, r, ApiVersion, BigInt, BlockNumber, DeploymentHash, GraphQlRunner as _,
-    IpfsResolver, LinkResolver, LoggerFactory, NodeId, QueryError, SubgraphCountMetric,
-    SubgraphName, SubgraphRegistrar, SubgraphStore as _, SubgraphVersionSwitchingMode,
-    TriggerProcessor,
+    ApiVersion, BigInt, BlockNumber, DeploymentHash, GraphQlRunner as _, IpfsResolver,
+    LinkResolver, LoggerFactory, NodeId, QueryError, SubgraphCountMetric, SubgraphName,
+    SubgraphRegistrar, SubgraphStore as _, SubgraphVersionSwitchingMode, TriggerProcessor,
+    lazy_static, q, r,
 };
+use graph_chain_ethereum::Chain;
 use graph_chain_ethereum::chain::RuntimeAdapterBuilder;
 use graph_chain_ethereum::network::EthereumNetworkAdapters;
-use graph_chain_ethereum::Chain;
 use graph_core::polling_monitor::{arweave_service, ipfs_service};
+use graph_node::config::Opt;
 use graph_node::manager::PanicSubscriptionManager;
 use graph_node::{config::Config, store_builder::StoreBuilder};
 use graph_runtime_wasm::RuntimeHostBuilder;
 use graph_server_index_node::IndexNodeService;
 use graph_store_postgres::{ChainHeadUpdateListener, ChainStore, Store, SubgraphStore};
 use serde::Deserialize;
-use slog::{crit, debug, info, o, Discard, Logger};
+use slog::{Discard, Logger, crit, debug, info, o};
 use std::env::VarError;
 use std::pin::Pin;
 use std::sync::Arc;
@@ -321,7 +323,7 @@ impl TestContext {
 
     pub async fn rewind(&self, block_ptr_to: BlockPtr) {
         self.store
-            .rewind(self.deployment.hash.clone(), block_ptr_to)
+            .rewind(self.deployment.id.into(), block_ptr_to)
             .await
             .unwrap()
     }
@@ -358,11 +360,12 @@ graph::prelude::lazy_static! {
 }
 
 fn test_logger(test_name: &str) -> Logger {
-    graph::log::logger(true).new(o!("test" => test_name.to_string()))
+    crate::output::test_logger(test_name)
 }
 
 #[allow(clippy::await_holding_lock)]
 pub async fn stores(test_name: &str, store_config_path: &str) -> Stores {
+    graph::tls::install_default_crypto_provider();
     let _mutex_guard = STORE_MUTEX.lock().unwrap();
 
     let config = {
@@ -376,7 +379,7 @@ pub async fn stores(test_name: &str, store_config_path: &str) -> Stores {
             Err(e) => panic!("{}", e.to_string()),
         };
         let config = config.replace("$THEGRAPH_STORE_POSTGRES_DIESEL_URL", &db_url);
-        Config::from_str(&config, "default").expect("failed to create configuration")
+        Config::from_str(&config, &Opt::default()).expect("failed to create configuration")
     };
 
     let logger = test_logger(test_name);
@@ -422,6 +425,38 @@ pub struct TestInfo {
     pub hash: DeploymentHash,
 }
 
+#[derive(Debug)]
+pub struct StaticArweaveResolver {
+    content: HashMap<String, Vec<u8>>,
+}
+
+impl StaticArweaveResolver {
+    pub fn new(content: HashMap<String, Vec<u8>>) -> Self {
+        Self { content }
+    }
+}
+
+#[async_trait]
+impl ArweaveResolver for StaticArweaveResolver {
+    async fn get(
+        &self,
+        file: &graph::data_source::offchain::Base64,
+    ) -> Result<Vec<u8>, ArweaveClientError> {
+        self.get_with_limit(file, &FileSizeLimit::Unlimited).await
+    }
+
+    async fn get_with_limit(
+        &self,
+        file: &graph::data_source::offchain::Base64,
+        _limit: &FileSizeLimit,
+    ) -> Result<Vec<u8>, ArweaveClientError> {
+        self.content
+            .get(file.as_str())
+            .cloned()
+            .ok_or(ArweaveClientError::UnableToCheckFileSize)
+    }
+}
+
 pub async fn setup<C: Blockchain>(
     test_info: &TestInfo,
     stores: &Stores,
@@ -429,7 +464,7 @@ pub async fn setup<C: Blockchain>(
     graft_block: Option<BlockPtr>,
     env_vars: Option<EnvVars>,
 ) -> TestContext {
-    setup_inner(test_info, stores, chain, graft_block, env_vars, None).await
+    setup_inner(test_info, stores, chain, graft_block, env_vars, None, None).await
 }
 
 pub async fn setup_with_file_link_resolver<C: Blockchain>(
@@ -449,6 +484,27 @@ pub async fn setup_with_file_link_resolver<C: Blockchain>(
         graft_block,
         env_vars,
         Some(link_resolver),
+        None,
+    )
+    .await
+}
+
+pub async fn setup_with_arweave_resolver<C: Blockchain>(
+    test_info: &TestInfo,
+    stores: &Stores,
+    chain: &impl TestChainTrait<C>,
+    graft_block: Option<BlockPtr>,
+    env_vars: Option<EnvVars>,
+    arweave_resolver: Arc<dyn ArweaveResolver>,
+) -> TestContext {
+    setup_inner(
+        test_info,
+        stores,
+        chain,
+        graft_block,
+        env_vars,
+        None,
+        Some(arweave_resolver),
     )
     .await
 }
@@ -460,6 +516,7 @@ pub async fn setup_inner<C: Blockchain>(
     graft_block: Option<BlockPtr>,
     env_vars: Option<EnvVars>,
     link_resolver: Option<Arc<dyn LinkResolver>>,
+    arweave_resolver: Option<Arc<dyn ArweaveResolver>>,
 ) -> TestContext {
     let env_vars = Arc::new(match env_vars {
         Some(ev) => ev,
@@ -484,7 +541,7 @@ pub async fn setup_inner<C: Blockchain>(
 
     let ipfs_client: Arc<dyn IpfsClient> = Arc::new(
         graph::ipfs::IpfsRpcClient::new_unchecked(
-            graph::ipfs::ServerAddress::local_rpc_api(),
+            graph::ipfs::ServerAddress::test_rpc_api(),
             IpfsMetrics::new(&mock_registry),
             &logger,
         )
@@ -506,7 +563,8 @@ pub async fn setup_inner<C: Blockchain>(
         env_vars.mappings.ipfs_request_limit,
     );
 
-    let arweave_resolver = Arc::new(ArweaveClient::default());
+    let arweave_resolver: Arc<dyn ArweaveResolver> =
+        arweave_resolver.unwrap_or_else(|| Arc::new(ArweaveClient::default()));
     let arweave_service = arweave_service(
         arweave_resolver.cheap_clone(),
         env_vars.mappings.ipfs_request_limit,
@@ -557,6 +615,7 @@ pub async fn setup_inner<C: Blockchain>(
         stores.network_store.clone(),
         Arc::new(load_manager),
         mock_registry.clone(),
+        Arc::new(graph::components::log_store::NoOpLogStore),
     ));
 
     let indexing_status_service = Arc::new(IndexNodeService::new(
@@ -580,6 +639,7 @@ pub async fn setup_inner<C: Blockchain>(
         node_id.clone(),
         SubgraphVersionSwitchingMode::Instant,
         Arc::new(Settings::default()),
+        Arc::new(graph::components::network_provider::AmpChainNames::default()),
     ));
 
     SubgraphRegistrar::create_subgraph(
@@ -603,8 +663,6 @@ pub async fn setup_inner<C: Blockchain>(
     .await
     .expect("failed to create subgraph version");
 
-    let arweave_resolver = Arc::new(ArweaveClient::default());
-
     TestContext {
         logger: logger_factory.subgraph_logger(&deployment),
         provider: subgraph_provider,
@@ -627,12 +685,7 @@ pub async fn cleanup(
     hash: &DeploymentHash,
 ) -> Result<(), Error> {
     let locators = subgraph_store.locators(hash).await?;
-    // Remove subgraph if it exists, ignore not found errors
-    match subgraph_store.remove_subgraph(name.clone()).await {
-        Ok(_) | Err(graph::prelude::StoreError::SubgraphNotFound(_)) => {}
-        Err(e) => return Err(e.into()),
-    }
-
+    subgraph_store.remove_subgraph(name.clone()).await?;
     for locator in locators {
         subgraph_store.remove_deployment(locator.id.into()).await?;
     }
diff --git a/tests/src/helpers.rs b/tests/src/helpers.rs
index 4a59c1df7ef..50403d46eea 100644
--- a/tests/src/helpers.rs
+++ b/tests/src/helpers.rs
@@ -1,11 +1,12 @@
 use std::fs::File;
-use std::io::BufReader;
+use std::io::{BufReader, Write};
 use std::path::PathBuf;
 use std::process::Command;
 
-use anyhow::{bail, Context};
+use crate::output::OutputConfig;
+use anyhow::{Context, bail};
 use graph::itertools::Itertools;
-use graph::prelude::serde_json::{json, Value};
+use graph::prelude::serde_json::{Value, json};
 use graph::prelude::{reqwest, serde_json};
 
 /// Parses stdout bytes into a prefixed String
@@ -80,14 +81,20 @@ pub fn run_cmd(command: &mut Command) -> String {
         .output()
         .context(format!("failed to run {}", program))
         .unwrap();
-    println!(
+
+    let mut out = OutputConfig::get();
+    writeln!(
+        out,
         "stdout:\n{}",
         pretty_output(&output.stdout, &format!("[{}:stdout] ", program))
-    );
-    println!(
+    )
+    .unwrap();
+    writeln!(
+        out,
         "stderr:\n{}",
         pretty_output(&output.stderr, &format!("[{}:stderr] ", program))
-    );
+    )
+    .unwrap();
 
     String::from_utf8(output.stdout).unwrap()
 }
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
index 2b67fc4dc44..860f6da714d 100644
--- a/tests/src/lib.rs
+++ b/tests/src/lib.rs
@@ -4,7 +4,9 @@ pub mod fixture;
 pub mod helpers;
 #[macro_use]
 pub mod macros;
+pub mod output;
 pub mod recipe;
 pub mod subgraph;
 
-pub use config::{Config, DbConfig, EthConfig, CONFIG};
+pub use config::{CONFIG, Config, DbConfig, EthConfig};
+pub use output::OutputConfig;
diff --git a/tests/src/output.rs b/tests/src/output.rs
new file mode 100644
index 00000000000..fece1947528
--- /dev/null
+++ b/tests/src/output.rs
@@ -0,0 +1,142 @@
+//! Output configuration for runner tests.
+//!
+//! When running locally, verbose output (slog logs, command stdout/stderr) is redirected
+//! to `tests/runner-tests.log` while progress messages appear on the console.
+//! In CI (detected via `GITHUB_ACTIONS` env var), all output goes to the console.
+
+use slog::{Drain, Logger, o};
+use std::fs::File;
+use std::io::{self, Write};
+use std::path::PathBuf;
+use std::sync::{Mutex, OnceLock};
+
+/// Log file name relative to the `tests` crate root.
+const LOG_FILE_NAME: &str = "runner-tests.log";
+
+/// Global output configuration, initialized once.
+static OUTPUT_CONFIG: OnceLock<OutputConfig> = OnceLock::new();
+
+/// Output configuration for runner tests.
+pub struct OutputConfig {
+    /// Log file handle (None in CI mode).
+    log_file: Option<Mutex<File>>,
+    /// Absolute path to log file (None in CI mode).
+    log_file_path: Option<PathBuf>,
+    /// Whether running in CI.
+    is_ci: bool,
+}
+
+impl OutputConfig {
+    /// Initialize the global output configuration.
+    ///
+    /// In CI (when `GITHUB_ACTIONS` is set), output goes to stdout.
+    /// Locally, verbose output is redirected to the log file.
+    ///
+    /// Prints the log file path at startup (local only).
+    pub fn init() -> &'static Self {
+        OUTPUT_CONFIG.get_or_init(|| {
+            let is_ci = std::env::var("GITHUB_ACTIONS").is_ok();
+
+            if is_ci {
+                OutputConfig {
+                    log_file: None,
+                    log_file_path: None,
+                    is_ci,
+                }
+            } else {
+                let cwd = std::env::current_dir()
+                    .expect("Failed to get current directory")
+                    .canonicalize()
+                    .expect("Failed to canonicalize current directory");
+                let log_file_path = cwd.join(LOG_FILE_NAME);
+
+                let file = File::create(&log_file_path).unwrap_or_else(|e| {
+                    panic!(
+                        "Failed to create log file {}: {}",
+                        log_file_path.display(),
+                        e
+                    )
+                });
+
+                let config = OutputConfig {
+                    log_file: Some(Mutex::new(file)),
+                    log_file_path: Some(log_file_path),
+                    is_ci,
+                };
+
+                // Print log file path at startup
+                config.print_log_file_info();
+
+                config
+            }
+        })
+    }
+
+    /// Get the global output configuration, initializing if needed.
+    pub fn get() -> &'static Self {
+        Self::init()
+    }
+
+    /// Print the log file path to console.
+    pub fn print_log_file_info(&self) {
+        if let Some(ref path) = self.log_file_path {
+            println!("Runner test logs: {}", path.display());
+        }
+    }
+
+    /// Returns true if running in CI.
+    pub fn is_ci(&self) -> bool {
+        self.is_ci
+    }
+}
+
+impl Write for &OutputConfig {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        if let Some(ref file_mutex) = self.log_file {
+            file_mutex.lock().unwrap().write(buf)
+        } else {
+            io::stdout().write(buf)
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        if let Some(ref file_mutex) = self.log_file {
+            file_mutex.lock().unwrap().flush()
+        } else {
+            io::stdout().flush()
+        }
+    }
+}
+
+/// Create a slog logger for a test, respecting the output configuration.
+///
+/// In CI, logs go to stdout. Locally, logs go to the log file.
+pub fn test_logger(test_name: &str) -> Logger {
+    let output = OutputConfig::get();
+
+    if output.is_ci {
+        // CI: use default logger that writes to stdout
+        graph::log::logger(true).new(o!("test" => test_name.to_string()))
+    } else {
+        // Local: write to log file
+        let decorator = slog_term::PlainDecorator::new(LogFileWriter);
+        let drain = slog_term::FullFormat::new(decorator).build().fuse();
+        let drain = slog_async::Async::new(drain).build().fuse();
+        Logger::root(drain, o!("test" => test_name.to_string()))
+    }
+}
+
+/// A writer that forwards to the OutputConfig log file.
+struct LogFileWriter;
+
+impl io::Write for LogFileWriter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        let mut output = OutputConfig::get();
+        output.write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        let mut output = OutputConfig::get();
+        output.flush()
+    }
+}
diff --git a/tests/src/recipe.rs b/tests/src/recipe.rs
index 0fde590f546..d1d424ad190 100644
--- a/tests/src/recipe.rs
+++ b/tests/src/recipe.rs
@@ -1,5 +1,5 @@
 use crate::{
-    fixture::{stores, Stores, TestInfo},
+    fixture::{Stores, TestInfo, stores},
     helpers::run_cmd,
 };
 use graph::prelude::{DeploymentHash, SubgraphName};
@@ -92,7 +92,7 @@ pub async fn build_subgraph_with_pnpm_cmd_and_arg(
 ) -> DeploymentHash {
     // Test that IPFS is up.
     ipfs::IpfsRpcClient::new(
-        ipfs::ServerAddress::local_rpc_api(),
+        ipfs::ServerAddress::test_rpc_api(),
         ipfs::IpfsMetrics::new(&MetricsRegistry::mock()),
         &graph::log::discard(),
     )
@@ -110,7 +110,7 @@ pub async fn build_subgraph_with_pnpm_cmd_and_arg(
     let deploy_output = run_cmd(
         Command::new("pnpm")
             .args(&args)
-            .env("IPFS_URI", "http://127.0.0.1:5001")
+            .env("IPFS_URI", ipfs::ServerAddress::test_rpc_api().to_string())
             .env("GRAPH_NODE_ADMIN_URI", "http://localhost:0")
             .current_dir(dir),
     );
diff --git a/tests/src/subgraph.rs b/tests/src/subgraph.rs
index e1057fccdcb..43c970fbd40 100644
--- a/tests/src/subgraph.rs
+++ b/tests/src/subgraph.rs
@@ -12,9 +12,9 @@ use serde_yaml;
 use tokio::{process::Command, time::sleep};
 
 use crate::{
-    contract::Contract,
-    helpers::{graphql_query, graphql_query_with_vars, run_checked, TestFile},
     CONFIG,
+    contract::Contract,
+    helpers::{TestFile, graphql_query, graphql_query_with_vars, run_checked},
 };
 
 #[derive(Clone, Debug)]
@@ -47,16 +47,41 @@ impl Subgraph {
         Ok(())
     }
 
+    /// Patch source subgraph placeholders in the manifest with their deployment hashes.
+    /// This must be called after `patch()` since it reads from `subgraph.yaml.patched`.
+    pub fn patch_sources(dir: &TestFile, sources: &[(String, String)]) -> anyhow::Result<()> {
+        if sources.is_empty() {
+            return Ok(());
+        }
+
+        let patched_path = dir.path.join("subgraph.yaml.patched");
+        let mut content = fs::read_to_string(&patched_path)?;
+
+        for (placeholder, deployment_hash) in sources {
+            let repl = format!("@{}@", placeholder);
+            content = content.replace(&repl, deployment_hash);
+        }
+
+        fs::write(&patched_path, content)?;
+        Ok(())
+    }
+
     /// Prepare the subgraph for deployment by patching contracts and checking for subgraph datasources
     pub async fn prepare(
         name: &str,
         contracts: &[Contract],
+        sources: Option<&[(String, String)]>,
     ) -> anyhow::Result<(TestFile, String, bool)> {
         let dir = Self::dir(name);
         let name = format!("test/{name}");
 
         Self::patch(&dir, contracts).await?;
 
+        // Patch source subgraph placeholders if provided
+        if let Some(sources) = sources {
+            Self::patch_sources(&dir, sources)?;
+        }
+
         // Check if subgraph has subgraph datasources
         let yaml_content = fs::read_to_string(dir.path.join("subgraph.yaml.patched"))?;
         let yaml: serde_yaml::Value = serde_yaml::from_str(&yaml_content)?;
@@ -68,9 +93,15 @@ impl Subgraph {
         Ok((dir, name, has_subgraph_datasource))
     }
 
-    /// Deploy the subgraph by running the required `graph` commands
-    pub async fn deploy(name: &str, contracts: &[Contract]) -> anyhow::Result<String> {
-        let (dir, name, has_subgraph_datasource) = Self::prepare(name, contracts).await?;
+    /// Deploy the subgraph by running the required `graph` commands.
+    /// If `sources` is provided, the deployment hashes will be used to patch
+    /// source subgraph placeholders (e.g., `@source-subgraph@`) in the manifest.
+    pub async fn deploy(
+        name: &str,
+        contracts: &[Contract],
+        sources: Option<&[(String, String)]>,
+    ) -> anyhow::Result<String> {
+        let (dir, name, has_subgraph_datasource) = Self::prepare(name, contracts, sources).await?;
 
         // graph codegen subgraph.yaml
         let mut prog = Command::new(&CONFIG.graph_cli);
@@ -124,10 +155,10 @@ impl Subgraph {
     pub async fn wait_ready(name: &str) -> anyhow::Result<Subgraph> {
         let start = Instant::now();
         while start.elapsed() <= CONFIG.timeout {
-            if let Some(subgraph) = Self::status(name).await? {
-                if subgraph.synced || !subgraph.healthy {
-                    return Ok(subgraph);
-                }
+            if let Some(subgraph) = Self::status(name).await?
+                && (subgraph.synced || !subgraph.healthy)
+            {
+                return Ok(subgraph);
             }
             sleep(Duration::from_millis(2000)).await;
         }
diff --git a/tests/tests/file_link_resolver.rs b/tests/tests/file_link_resolver.rs
index 0213c209457..0fdab778a3b 100644
--- a/tests/tests/file_link_resolver.rs
+++ b/tests/tests/file_link_resolver.rs
@@ -10,7 +10,9 @@ use graph_tests::{
 
 #[graph::test]
 async fn file_link_resolver() -> anyhow::Result<()> {
-    std::env::set_var("GRAPH_NODE_DISABLE_DEPLOYMENT_HASH_VALIDATION", "true");
+    unsafe {
+        std::env::set_var("GRAPH_NODE_DISABLE_DEPLOYMENT_HASH_VALIDATION", "true");
+    }
     let RunnerTestRecipe { stores, test_info } = RunnerTestRecipe::new_with_file_link_resolver(
         "file_link_resolver",
         "file-link-resolver",
diff --git a/tests/tests/gnd_cli_tests.rs b/tests/tests/gnd_cli_tests.rs
new file mode 100644
index 00000000000..1bbeb88cbc8
--- /dev/null
+++ b/tests/tests/gnd_cli_tests.rs
@@ -0,0 +1,173 @@
+//! Integration tests that verify `gnd` works as a drop-in replacement for `graph-cli`.
+//!
+//! These tests run a subset of the integration tests using `gnd` instead of `graph-cli`
+//! for the deployment workflow (codegen, create, deploy).
+//!
+//! # How it works
+//!
+//! The integration test infrastructure uses `CONFIG.graph_cli` for deployment commands.
+//! By setting the `GRAPH_CLI` environment variable to point to the `gnd` binary,
+//! the tests use `gnd codegen`, `gnd create`, and `gnd deploy` instead of the
+//! corresponding `graph` commands.
+//!
+//! # Prerequisites
+//!
+//! - Build the gnd binary: `cargo build -p gnd`
+//! - Start integration test services: `nix run .#integration`
+//!   - PostgreSQL on localhost:3011
+//!   - IPFS on localhost:3001
+//!   - Anvil on localhost:3021
+//!
+//! # Running
+//!
+//! ```bash
+//! just test-gnd-cli
+//! ```
+
+use std::path::PathBuf;
+
+use anyhow::anyhow;
+use graph::futures03::StreamExt;
+use graph_tests::contract::Contract;
+use graph_tests::{CONFIG, error, status};
+
+mod integration_tests;
+
+use integration_tests::{
+    TestCase, TestResult, stop_graph_node, test_block_handlers, test_int8, test_value_roundtrip,
+};
+
+/// Get the path to the gnd binary
+fn gnd_binary_path() -> PathBuf {
+    // The gnd binary should be at target/debug/gnd relative to the workspace root
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    PathBuf::from(manifest_dir)
+        .parent()
+        .unwrap()
+        .join("target")
+        .join("debug")
+        .join("gnd")
+}
+
+/// Verify the gnd binary exists before running tests
+fn verify_gnd_binary() -> anyhow::Result<PathBuf> {
+    let gnd_path = gnd_binary_path();
+    if !gnd_path.exists() {
+        return Err(anyhow!(
+            "gnd binary not found at {}. Run `cargo build -p gnd` first.",
+            gnd_path.display()
+        ));
+    }
+    Ok(gnd_path)
+}
+
+/// The main test entrypoint for gnd CLI integration tests.
+///
+/// This test sets `GRAPH_CLI` to point to the gnd binary, then runs a subset
+/// of integration tests to verify gnd works as a drop-in replacement.
+#[graph::test]
+async fn gnd_cli_tests() -> anyhow::Result<()> {
+    // Verify gnd binary exists
+    let gnd_path = verify_gnd_binary()?;
+    status!("gnd-cli", "Using gnd binary at {}", gnd_path.display());
+
+    // Set GRAPH_CLI to point to gnd - this is already set via the environment
+    // when running `just test-gnd-cli`, but we verify it here
+    let graph_cli =
+        std::env::var("GRAPH_CLI").unwrap_or_else(|_| gnd_path.to_string_lossy().to_string());
+    status!("gnd-cli", "GRAPH_CLI={}", graph_cli);
+
+    // Verify the configured CLI is actually gnd
+    if !graph_cli.contains("gnd") {
+        return Err(anyhow!(
+            "GRAPH_CLI ({}) does not point to gnd binary. Set GRAPH_CLI=../target/debug/gnd",
+            graph_cli
+        ));
+    }
+
+    let test_name_to_run = std::env::var("TEST_CASE").ok();
+
+    // Run a subset of integration tests that exercise the core deployment workflow
+    // These tests cover:
+    // - codegen: Generate AssemblyScript types from schema and ABIs
+    // - create: Register subgraph name with Graph Node
+    // - deploy: Deploy subgraph to Graph Node
+    let cases = vec![
+        TestCase::new("block-handlers", test_block_handlers),
+        TestCase::new("value-roundtrip", test_value_roundtrip),
+        TestCase::new("int8", test_int8),
+    ];
+
+    // Filter the test cases if a specific test name is provided
+    let cases_to_run: Vec<_> = if let Some(test_name) = test_name_to_run {
+        cases
+            .into_iter()
+            .filter(|case| case.name == test_name)
+            .collect()
+    } else {
+        cases
+    };
+
+    if cases_to_run.is_empty() {
+        status!("gnd-cli", "No test cases to run");
+        return Ok(());
+    }
+
+    status!(
+        "gnd-cli",
+        "Running {} test case(s) with gnd as CLI",
+        cases_to_run.len()
+    );
+
+    let contracts = Contract::deploy_all().await?;
+
+    status!("setup", "Resetting database");
+    CONFIG.reset_database();
+
+    // Spawn graph-node
+    status!("graph-node", "Starting graph-node");
+    let mut graph_node_child_command = CONFIG.spawn_graph_node().await?;
+
+    let stream = tokio_stream::iter(cases_to_run)
+        .map(|case| case.run(&contracts))
+        .buffered(CONFIG.num_parallel_tests);
+
+    let mut results: Vec<TestResult> = stream.collect::<Vec<_>>().await;
+    results.sort_by_key(|result| result.name.clone());
+
+    // Stop graph-node and read its output
+    let graph_node_res = stop_graph_node(&mut graph_node_child_command).await;
+
+    status!(
+        "graph-node",
+        "graph-node logs are in {}",
+        CONFIG.graph_node.log_file.path.display()
+    );
+
+    match graph_node_res {
+        Ok(_) => {
+            status!("graph-node", "Stopped graph-node");
+        }
+        Err(e) => {
+            error!("graph-node", "Failed to stop graph-node: {}", e);
+        }
+    }
+
+    println!("\n\n{:=<60}", "");
+    println!("gnd CLI Test Results:");
+    println!("{:-<60}", "");
+    for result in &results {
+        result.print();
+    }
+    println!("\n");
+
+    if results.iter().any(|result| !result.success()) {
+        Err(anyhow!("Some gnd CLI tests failed"))
+    } else {
+        status!(
+            "gnd-cli",
+            "All tests passed - gnd works as drop-in replacement!"
+        );
+        Ok(())
+    }
+}
diff --git a/tests/tests/gnd_tests.rs b/tests/tests/gnd_tests.rs
index 3e3a2e0f448..f1dbde81a53 100644
--- a/tests/tests/gnd_tests.rs
+++ b/tests/tests/gnd_tests.rs
@@ -3,13 +3,13 @@ use graph::futures03::StreamExt;
 use graph_tests::config::set_dev_mode;
 use graph_tests::contract::Contract;
 use graph_tests::subgraph::Subgraph;
-use graph_tests::{error, status, CONFIG};
+use graph_tests::{CONFIG, error, status};
 
 mod integration_tests;
 
 use integration_tests::{
-    stop_graph_node, subgraph_data_sources, test_block_handlers,
-    test_multiple_subgraph_datasources, TestCase, TestResult,
+    TestCase, TestResult, stop_graph_node, subgraph_data_sources, test_block_handlers,
+    test_multiple_subgraph_datasources,
 };
 
 /// The main test entrypoint.
@@ -104,7 +104,7 @@ async fn gnd_tests() -> anyhow::Result<()> {
         .enumerate()
         .map(|(index, case)| {
             let subgraph_name = format!("subgraph-{}", num_sources + index);
-            case.check_health_and_test(&contracts, subgraph_name)
+            case.check_health_and_test(subgraph_name)
         })
         .buffered(CONFIG.num_parallel_tests);
 
diff --git a/tests/tests/integration_tests.rs b/tests/tests/integration_tests.rs
index b5c7d3405ca..4f3457cda41 100644
--- a/tests/tests/integration_tests.rs
+++ b/tests/tests/integration_tests.rs
@@ -9,21 +9,29 @@
 //! tasks are really worth parallelizing, and applying this trick
 //! indiscriminately will only result in messy code and diminishing returns.
 
+use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
-use std::time::{self, Duration, Instant};
-
-use anyhow::{anyhow, bail, Context, Result};
+use std::time::{Duration, Instant};
+
+use anyhow::{Context, Result, anyhow, bail};
+use graph::components::subgraph::{
+    ProofOfIndexing, ProofOfIndexingEvent, ProofOfIndexingFinisher, ProofOfIndexingVersion,
+};
+use graph::data::store::Id;
+use graph::entity;
 use graph::futures03::StreamExt;
 use graph::itertools::Itertools;
-use graph::prelude::serde_json::{json, Value};
+use graph::prelude::serde_json::{Value, json};
+use graph::prelude::{BlockPtr, DeploymentHash, alloy::primitives::Address, hex};
+use graph::schema::InputSchema;
+use graph::slog::{Discard, Logger, o};
 use graph_tests::contract::Contract;
 use graph_tests::subgraph::Subgraph;
-use graph_tests::{error, status, CONFIG};
+use graph_tests::{CONFIG, error, status};
 use tokio::process::Child;
 use tokio::task::JoinError;
 use tokio::time::sleep;
-use web3::types::U256;
 
 const SUBGRAPH_LAST_GRAFTING_BLOCK: i32 = 3;
 
@@ -35,7 +43,6 @@ type TestFn = Box<
 
 pub struct TestContext {
     pub subgraph: Subgraph,
-    pub contracts: Vec<Contract>,
 }
 
 pub enum TestStatus {
@@ -113,6 +120,7 @@ impl SourceSubgraph {
         }
     }
 
+    #[allow(dead_code)] // Used by gnd_tests.rs
     pub fn alias(&self) -> Option<&str> {
         match self {
             Self::Subgraph(_) => None,
@@ -172,7 +180,7 @@ impl TestCase {
         contracts: &[Contract],
     ) -> Result<Subgraph> {
         status!(&self.name, "Deploying subgraph");
-        let subgraph_name = match Subgraph::deploy(subgraph_name, contracts).await {
+        let subgraph_name = match Subgraph::deploy(subgraph_name, contracts, None).await {
             Ok(name) => name,
             Err(e) => {
                 error!(&self.name, "Deploy failed");
@@ -198,32 +206,35 @@ impl TestCase {
         Ok(subgraph)
     }
 
+    #[allow(dead_code)] // Used by gnd_tests.rs
     pub async fn prepare(&self, contracts: &[Contract]) -> anyhow::Result<String> {
-        // If a subgraph has subgraph datasources, prepare them first
-        if let Some(_subgraphs) = &self.source_subgraph {
-            if let Err(e) = self.prepare_multiple_sources(contracts).await {
-                error!(&self.name, "source subgraph deployment failed: {:?}", e);
-                return Err(e);
+        // If a subgraph has subgraph datasources, prepare them first and collect their deployment hashes
+        let source_mappings = if let Some(_subgraphs) = &self.source_subgraph {
+            match self.prepare_multiple_sources(contracts).await {
+                Ok(mappings) => Some(mappings),
+                Err(e) => {
+                    error!(&self.name, "source subgraph deployment failed: {:?}", e);
+                    return Err(e);
+                }
             }
-        }
+        } else {
+            None
+        };
 
         status!(&self.name, "Preparing subgraph");
-        let (_, subgraph_name, _) = match Subgraph::prepare(&self.name, contracts).await {
-            Ok(name) => name,
-            Err(e) => {
-                error!(&self.name, "Prepare failed: {:?}", e);
-                return Err(e);
-            }
-        };
+        let (_, subgraph_name, _) =
+            match Subgraph::prepare(&self.name, contracts, source_mappings.as_deref()).await {
+                Ok(name) => name,
+                Err(e) => {
+                    error!(&self.name, "Prepare failed: {:?}", e);
+                    return Err(e);
+                }
+            };
 
         Ok(subgraph_name)
     }
 
-    pub async fn check_health_and_test(
-        self,
-        contracts: &[Contract],
-        subgraph_name: String,
-    ) -> TestResult {
+    pub async fn check_health_and_test(self, subgraph_name: String) -> TestResult {
         status!(
             &self.name,
             "Waiting for subgraph ({}) to become ready",
@@ -249,7 +260,6 @@ impl TestCase {
 
         let ctx = TestContext {
             subgraph: subgraph.clone(),
-            contracts: contracts.to_vec(),
         };
 
         status!(&self.name, "Starting test");
@@ -276,45 +286,64 @@ impl TestCase {
         }
     }
 
-    async fn run(self, contracts: &[Contract]) -> TestResult {
-        // If a subgraph has subgraph datasources, deploy them first
-        if let Some(_subgraphs) = &self.source_subgraph {
-            if let Err(e) = self.deploy_multiple_sources(contracts).await {
-                error!(&self.name, "source subgraph deployment failed");
-                return TestResult {
-                    name: self.name.clone(),
-                    subgraph: None,
-                    status: TestStatus::Err(e),
-                };
+    pub async fn run(self, contracts: &[Contract]) -> TestResult {
+        // If a subgraph has subgraph datasources, deploy them first and collect their deployment hashes
+        let source_mappings = if let Some(_subgraphs) = &self.source_subgraph {
+            match self.deploy_multiple_sources(contracts).await {
+                Ok(mappings) => Some(mappings),
+                Err(e) => {
+                    error!(&self.name, "source subgraph deployment failed");
+                    return TestResult {
+                        name: self.name.clone(),
+                        subgraph: None,
+                        status: TestStatus::Err(e),
+                    };
+                }
             }
-        }
+        } else {
+            None
+        };
 
         status!(&self.name, "Deploying subgraph");
-        let subgraph_name = match Subgraph::deploy(&self.name, contracts).await {
-            Ok(name) => name,
-            Err(e) => {
-                error!(&self.name, "Deploy failed");
-                return TestResult {
-                    name: self.name.clone(),
-                    subgraph: None,
-                    status: TestStatus::Err(e.context("Deploy failed")),
-                };
-            }
-        };
+        let subgraph_name =
+            match Subgraph::deploy(&self.name, contracts, source_mappings.as_deref()).await {
+                Ok(name) => name,
+                Err(e) => {
+                    error!(&self.name, "Deploy failed");
+                    return TestResult {
+                        name: self.name.clone(),
+                        subgraph: None,
+                        status: TestStatus::Err(e.context("Deploy failed")),
+                    };
+                }
+            };
 
-        self.check_health_and_test(contracts, subgraph_name).await
+        self.check_health_and_test(subgraph_name).await
     }
 
-    async fn prepare_multiple_sources(&self, contracts: &[Contract]) -> Result<()> {
+    async fn prepare_multiple_sources(
+        &self,
+        contracts: &[Contract],
+    ) -> Result<Vec<(String, String)>> {
+        let mut mappings = Vec::new();
         if let Some(sources) = &self.source_subgraph {
             for source in sources {
-                let _ = Subgraph::prepare(source.test_name(), contracts).await?;
+                // Source subgraphs don't have their own sources, so pass None
+                let _ = Subgraph::prepare(source.test_name(), contracts, None).await?;
+                // If the source has an alias (pre-known IPFS hash), use it for the mapping
+                if let Some(alias) = source.alias() {
+                    mappings.push((source.test_name().to_string(), alias.to_string()));
+                }
             }
         }
-        Ok(())
+        Ok(mappings)
     }
 
-    async fn deploy_multiple_sources(&self, contracts: &[Contract]) -> Result<()> {
+    async fn deploy_multiple_sources(
+        &self,
+        contracts: &[Contract],
+    ) -> Result<Vec<(String, String)>> {
+        let mut mappings = Vec::new();
         if let Some(sources) = &self.source_subgraph {
             for source in sources {
                 let subgraph = self.deploy_and_wait(source.test_name(), contracts).await?;
@@ -323,9 +352,11 @@ impl TestCase {
                     "Source subgraph deployed with hash {}",
                     subgraph.deployment
                 );
+                // Use the test_name as the placeholder key
+                mappings.push((source.test_name().to_string(), subgraph.deployment.clone()));
             }
         }
-        Ok(())
+        Ok(mappings)
     }
 }
 
@@ -369,7 +400,7 @@ pub async fn query_succeeds(
 * the `cases` variable in `integration_tests`.
 */
 
-async fn test_int8(ctx: TestContext) -> anyhow::Result<()> {
+pub async fn test_int8(ctx: TestContext) -> anyhow::Result<()> {
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
@@ -635,63 +666,7 @@ async fn test_topic_filters(ctx: TestContext) -> anyhow::Result<()> {
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
-    let contract = ctx
-        .contracts
-        .iter()
-        .find(|x| x.name == "SimpleContract")
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(1),
-                U256::from(2),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(1),
-                U256::from(1),
-                U256::from(1),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(4),
-                U256::from(2),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
-
-    contract
-        .call(
-            "emitAnotherTrigger",
-            (
-                U256::from(4),
-                U256::from(4),
-                U256::from(3),
-                "abc".to_string(),
-            ),
-        )
-        .await
-        .unwrap();
+    // Events we need are already emitted from Contract::deploy_all
 
     let exp = json!({
         "anotherTriggerEntities": [
@@ -830,7 +805,7 @@ async fn test_overloaded_functions(ctx: TestContext) -> anyhow::Result<()> {
     Ok(())
 }
 
-async fn test_value_roundtrip(ctx: TestContext) -> anyhow::Result<()> {
+pub async fn test_value_roundtrip(ctx: TestContext) -> anyhow::Result<()> {
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
@@ -892,24 +867,23 @@ async fn test_subgraph_grafting(ctx: TestContext) -> anyhow::Result<()> {
 
     assert!(subgraph.healthy);
 
-    let block_hashes: Vec<&str> = vec![
-        "e26fccbd24dcc76074b432becf29cad3bcba11a8467a7b770fad109c2b5d14c2",
-        "249dbcbee975c22f8c9cc937536945ca463568c42d8933a3f54129dec352e46b",
-        "408675f81c409dede08d0eeb2b3420a73b067c4fa8c5f0fc49ce369289467c33",
-    ];
+    // Fetch block hashes from the chain
+    let mut block_hashes: Vec<String> = Vec::new();
+    for i in 1..4 {
+        let hash = get_block_hash(i)
+            .await
+            .ok_or_else(|| anyhow!("Failed to get block hash for block {}", i))?;
+        block_hashes.push(hash);
+    }
 
-    let pois: Vec<&str> = vec![
-        "0x606c1ed77564ef9ab077e0438da9f3c6af79a991603aecf74650971a88d05b65",
-        "0xbb21d5cf5fd62892159f95211da4a02f0dfa1b43d68aeb64baa52cc67fbb6c8e",
-        "0x5a01b371017c924e8cedd62a76cf8dcf05987f80d2b91aaf3fb57872ab75887f",
-    ];
+    // The deployment hash is dynamic (depends on the base subgraph's hash)
+    let deployment_hash = DeploymentHash::new(&subgraph.deployment).unwrap();
+
+    // Compute the expected POIs using the actual block hashes
+    let expected_pois = compute_expected_pois(&deployment_hash, &block_hashes);
 
     for i in 1..4 {
-        let block_hash = get_block_hash(i).await.unwrap();
-        // We need to make sure that the preconditions for POI are fulfiled
-        // namely that the blockchain produced the proper block hashes for the
-        // blocks of which we will check the POI.
-        assert_eq!(block_hash, block_hashes[(i - 1) as usize]);
+        let block_hash = &block_hashes[(i - 1) as usize];
 
         const FETCH_POI: &str = r#"
         query proofOfIndexing($subgraph: String!, $blockNumber: Int!, $blockHash: String!, $indexer: String!) {
@@ -938,12 +912,146 @@ async fn test_subgraph_grafting(ctx: TestContext) -> anyhow::Result<()> {
         // Change on the block #2 would mean a change in the transitioning
         // from the old to the new algorithm hence would be reflected only
         // subgraphs that are grafting from pre 0.0.5 to 0.0.6 or newer.
-        assert_eq!(poi, pois[(i - 1) as usize]);
+        assert_eq!(
+            poi,
+            expected_pois[(i - 1) as usize],
+            "POI mismatch for block {}",
+            i
+        );
     }
 
     Ok(())
 }
 
+/// Compute the expected POI values for the grafted subgraph.
+///
+/// The grafted subgraph:
+/// - Spec version 0.0.6 (uses Fast POI algorithm)
+/// - Grafts from base subgraph at block 2
+/// - Creates GraftedData entities starting from block 3
+///
+/// The base subgraph:
+/// - Spec version 0.0.5 (uses Legacy POI algorithm)
+/// - Creates BaseData entities for each block
+///
+/// POI algorithm transition:
+/// - Blocks 0-2: Legacy POI digests (from base subgraph)
+/// - Block 3+: Fast POI algorithm with transition from Legacy
+fn compute_expected_pois(deployment_hash: &DeploymentHash, block_hashes: &[String]) -> Vec<String> {
+    let logger = Logger::root(Discard, o!());
+    let causality_region = "ethereum/test";
+
+    // Create schemas for the entity types
+    let base_schema = InputSchema::parse_latest(
+        "type BaseData @entity(immutable: true) { id: ID!, data: String!, blockNumber: BigInt! }",
+        deployment_hash.clone(),
+    )
+    .unwrap();
+
+    let grafted_schema = InputSchema::parse_latest(
+        "type GraftedData @entity(immutable: true) { id: ID!, data: String!, blockNumber: BigInt! }",
+        deployment_hash.clone(),
+    )
+    .unwrap();
+
+    // Compute POI digests at each block checkpoint
+    // Store the accumulated state after each block so we can compute POI at any block
+    let mut db_at_block: HashMap<i32, HashMap<Id, Vec<u8>>> = HashMap::new();
+    let mut db: HashMap<Id, Vec<u8>> = HashMap::new();
+
+    // Process blocks 0-3:
+    // - Blocks 0-2: Legacy POI (from base subgraph, creates BaseData entities)
+    // - Block 3: Fast POI (grafted subgraph starts here, creates GraftedData entity)
+    //
+    // The base subgraph starts from block 0 (genesis block triggers handlers in Anvil).
+    //
+    // The grafted subgraph:
+    // - spec version 0.0.6 → uses Fast POI algorithm
+    // - grafts from base subgraph at block 2
+    // - inherits POI digests from base for blocks 0-2
+    // - transitions from Legacy to Fast at block 3
+    for block_i in 0..=3i32 {
+        let version = if block_i <= 2 {
+            ProofOfIndexingVersion::Legacy
+        } else {
+            ProofOfIndexingVersion::Fast
+        };
+
+        let mut stream = ProofOfIndexing::new(block_i, version);
+
+        if block_i <= 2 {
+            // Base subgraph creates BaseData
+            let id_str = block_i.to_string();
+            let entity = entity! {
+                base_schema =>
+                    id: &id_str,
+                    data: "from base",
+                    blockNumber: graph::prelude::Value::BigInt(block_i.into()),
+            };
+
+            let event = ProofOfIndexingEvent::SetEntity {
+                entity_type: "BaseData",
+                id: &id_str,
+                data: &entity,
+            };
+            stream.write(&logger, causality_region, &event);
+        } else {
+            // Grafted subgraph creates GraftedData
+            let id_str = block_i.to_string();
+            let entity = entity! {
+                grafted_schema =>
+                    id: &id_str,
+                    data: "to grafted",
+                    blockNumber: graph::prelude::Value::BigInt(block_i.into()),
+            };
+
+            let event = ProofOfIndexingEvent::SetEntity {
+                entity_type: "GraftedData",
+                id: &id_str,
+                data: &entity,
+            };
+            stream.write(&logger, causality_region, &event);
+        }
+
+        for (name, region) in stream.take() {
+            let prev = db.get(&name);
+            let update = region.pause(prev.map(|v| &v[..]));
+            db.insert(name, update);
+        }
+
+        db_at_block.insert(block_i, db.clone());
+    }
+
+    // Compute POI for blocks 1, 2, 3
+    let mut pois = Vec::new();
+    for (block_idx, block_hash_hex) in block_hashes.iter().enumerate() {
+        let block_number = (block_idx + 1) as i32;
+
+        // Get the POI version for this block - grafted subgraph uses Fast (spec 0.0.6)
+        let version = ProofOfIndexingVersion::Fast;
+
+        let block_hash_bytes = hex::decode(block_hash_hex).unwrap();
+        let block_ptr = BlockPtr::from((block_hash_bytes, block_number as u64));
+
+        // Use zero address to match the test query's indexer parameter
+        let indexer = Some(Address::ZERO);
+        let mut finisher =
+            ProofOfIndexingFinisher::new(&block_ptr, deployment_hash, &indexer, version);
+
+        if let Some(db_state) = db_at_block.get(&block_number) {
+            for (name, region) in db_state.iter() {
+                finisher.add_causality_region(name, region);
+            }
+        }
+
+        let poi_bytes = finisher.finish();
+        let poi = format!("0x{}", hex::encode(poi_bytes));
+        pois.push(poi);
+    }
+
+    pois
+}
+
 async fn test_poi_for_failed_subgraph(ctx: TestContext) -> anyhow::Result<()> {
     let subgraph = ctx.subgraph;
     const INDEXING_STATUS: &str = r#"
@@ -1028,6 +1136,71 @@ async fn test_poi_for_failed_subgraph(ctx: TestContext) -> anyhow::Result<()> {
     let resp = Subgraph::query_with_vars(FETCH_POI, vars).await?;
     assert_eq!(None, resp.get("errors"));
     assert!(resp["data"]["proofOfIndexing"].is_string());
+
+    // Test that _logs query works on failed subgraphs (critical for debugging!)
+    // Wait a moment for logs to be written
+    sleep(Duration::from_secs(2)).await;
+
+    let query = r#"{
+            _logs(first: 100) {
+                id
+                timestamp
+                level
+                text
+            }
+        }"#
+    .to_string();
+
+    let resp = subgraph.query(&query).await?;
+
+    // Should not have GraphQL errors when querying logs on failed subgraph
+    assert!(
+        resp.get("errors").is_none(),
+        "Expected no errors when querying _logs on failed subgraph, got: {:?}",
+        resp.get("errors")
+    );
+
+    let logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // The critical assertion: _logs query works on failed subgraphs
+    // This enables debugging even when the subgraph has crashed
+    println!(
+        "Successfully queried _logs on failed subgraph, found {} log entries",
+        logs.len()
+    );
+
+    // Print a sample of logs to see what's available (for documentation/debugging)
+    if !logs.is_empty() {
+        println!("Sample logs from failed subgraph:");
+        for (i, log) in logs.iter().take(5).enumerate() {
+            println!(
+                "  Log {}: level={:?}, text={:?}",
+                i + 1,
+                log["level"].as_str(),
+                log["text"].as_str()
+            );
+        }
+    }
+
+    // Verify we can also filter by level on failed subgraphs
+    let query = r#"{
+            _logs(level: ERROR, first: 100) {
+                level
+                text
+            }
+        }"#
+    .to_string();
+
+    let resp = subgraph.query(&query).await?;
+    assert!(
+        resp.get("errors").is_none(),
+        "Expected no errors when filtering _logs by level on failed subgraph"
+    );
+
+    println!("✓ _logs query works on failed subgraphs - critical for debugging!");
+
     Ok(())
 }
 
@@ -1040,8 +1213,6 @@ pub async fn test_multiple_subgraph_datasources(ctx: TestContext) -> anyhow::Res
     let subgraph = ctx.subgraph;
     assert!(subgraph.healthy);
 
-    println!("subgraph: {:?}", subgraph);
-
     // Test querying data aggregated from multiple sources
     let exp = json!({
         "aggregatedDatas": [
@@ -1094,9 +1265,9 @@ async fn test_declared_calls_basic(ctx: TestContext) -> anyhow::Result<()> {
             );
             let Some(act_value) = call_result["value"].as_str() else {
                 panic!(
-                "Expected call result with label '{}' to have a string 'value' field, but got: {:?}",
-                label, call_result["value"]
-            );
+                    "Expected call result with label '{}' to have a string 'value' field, but got: {:?}",
+                    label, call_result["value"]
+                );
             };
             assert_eq!(
                 exp_value, act_value,
@@ -1284,23 +1455,294 @@ async fn test_declared_calls_struct_fields(ctx: TestContext) -> anyhow::Result<(
     Ok(())
 }
 
-async fn wait_for_blockchain_block(block_number: i32) -> bool {
-    // Wait up to 5 minutes for the expected block to appear
-    const STATUS_WAIT: Duration = Duration::from_secs(300);
-    const REQUEST_REPEATING: Duration = time::Duration::from_secs(1);
-    let start = Instant::now();
-    while start.elapsed() < STATUS_WAIT {
-        let latest_block = Contract::latest_block().await;
-        if let Some(latest_block) = latest_block {
-            if let Some(number) = latest_block.number {
-                if number >= block_number.into() {
-                    return true;
+async fn test_logs_query(ctx: TestContext) -> anyhow::Result<()> {
+    let subgraph = ctx.subgraph;
+    assert!(subgraph.healthy);
+
+    // Wait a moment for logs to be written
+    sleep(Duration::from_secs(2)).await;
+
+    // Test 1: Query all logs
+    let query = r#"{
+            _logs(first: 100) {
+                id
+                timestamp
+                level
+                text
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+
+    let logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // We should have logs from the subgraph (user logs + system logs)
+    assert!(
+        !logs.is_empty(),
+        "Expected to have logs, got none. Response: {:?}",
+        resp
+    );
+
+    // Test 2: Filter by ERROR level
+    let query = r#"{
+            _logs(level: ERROR, first: 100) {
+                level
+                text
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+    let error_logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // Check that we have error logs and they're all ERROR level
+    for log in error_logs {
+        assert_eq!(
+            log["level"].as_str(),
+            Some("ERROR"),
+            "Expected ERROR level, got: {:?}",
+            log
+        );
+    }
+
+    // Test 3: Search for specific text
+    let query = r#"{
+            _logs(search: "timeout", first: 100) {
+                id
+                text
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+    let timeout_logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // If we have timeout logs, verify they contain the word "timeout"
+    for log in timeout_logs {
+        let text = log["text"]
+            .as_str()
+            .context("Expected text field to be a string")?;
+        assert!(
+            text.to_lowercase().contains("timeout"),
+            "Expected log to contain 'timeout', got: {}",
+            text
+        );
+    }
+
+    // Test 4: Pagination
+    let query = r#"{
+            _logs(first: 2, skip: 0) {
+                id
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+    let first_page = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    let query = r#"{
+            _logs(first: 2, skip: 2) {
+                id
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+    let second_page = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // If we have enough logs, verify pages are different
+    if first_page.len() == 2 && !second_page.is_empty() {
+        let first_ids: Vec<_> = first_page.iter().map(|l| &l["id"]).collect();
+        let second_ids: Vec<_> = second_page.iter().map(|l| &l["id"]).collect();
+
+        // Verify no overlap between pages
+        for id in &second_ids {
+            assert!(
+                !first_ids.contains(id),
+                "Log ID {:?} appears in both pages",
+                id
+            );
+        }
+    }
+
+    // Test 5: Query with arguments field to verify structured logging
+    let query = r#"{
+            _logs(first: 10) {
+                text
+                arguments {
+                    key
+                    value
                 }
             }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+    let logs_with_args = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // Verify arguments field is present (even if empty for some logs)
+    for log in logs_with_args {
+        assert!(
+            log.get("arguments").is_some(),
+            "Expected arguments field to exist in log: {:?}",
+            log
+        );
+    }
+
+    // Test 6: Verify that combining _logs with regular entity queries returns a validation error
+    let query = r#"{
+            _logs(first: 10) {
+                id
+                text
+            }
+            triggers {
+                id
+                x
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+
+    // Should have errors, not data
+    assert!(
+        resp.get("errors").is_some(),
+        "Expected errors when combining _logs with entity queries, got: {:?}",
+        resp
+    );
+
+    // Verify the error message mentions the validation issue
+    let errors = resp["errors"]
+        .as_array()
+        .context("Expected errors to be an array")?;
+    assert!(
+        !errors.is_empty(),
+        "Expected at least one error in response"
+    );
+
+    let error_msg = errors[0]["message"]
+        .as_str()
+        .context("Expected error message to be a string")?;
+    assert!(
+        error_msg.contains("_logs") && error_msg.contains("cannot be combined"),
+        "Expected validation error about _logs combination, got: {}",
+        error_msg
+    );
+
+    // Test 7: Field selection - verify only requested fields are returned
+    let query = r#"{
+            _logs(first: 1) {
+                id
+                timestamp
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+
+    let logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    if !logs.is_empty() {
+        let log = &logs[0];
+
+        // Verify requested fields are present
+        assert!(log.get("id").is_some(), "Expected id field to be present");
+        assert!(
+            log.get("timestamp").is_some(),
+            "Expected timestamp field to be present"
+        );
+
+        // Verify non-requested fields are NOT present
+        assert!(
+            log.get("text").is_none(),
+            "Expected text field to NOT be present (field selection bug)"
+        );
+        assert!(
+            log.get("level").is_none(),
+            "Expected level field to NOT be present (field selection bug)"
+        );
+        assert!(
+            log.get("subgraphId").is_none(),
+            "Expected subgraphId field to NOT be present (field selection bug)"
+        );
+        assert!(
+            log.get("arguments").is_none(),
+            "Expected arguments field to NOT be present (field selection bug)"
+        );
+        assert!(
+            log.get("meta").is_none(),
+            "Expected meta field to NOT be present (field selection bug)"
+        );
+
+        println!("✓ Field selection works correctly - only requested fields returned");
+    }
+
+    // Test 8: Order direction - ascending
+    let query = r#"{
+            _logs(first: 10, orderDirection: asc) {
+                id
+                timestamp
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+
+    let logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // Verify ascending order (each timestamp >= previous)
+    if logs.len() > 1 {
+        for i in 1..logs.len() {
+            let prev_ts = logs[i - 1]["timestamp"].as_str().unwrap();
+            let curr_ts = logs[i]["timestamp"].as_str().unwrap();
+            assert!(
+                curr_ts >= prev_ts,
+                "Expected ascending order, but {} came before {}",
+                prev_ts,
+                curr_ts
+            );
         }
-        tokio::time::sleep(REQUEST_REPEATING).await;
+        println!("✓ Ascending order works correctly");
     }
-    false
+
+    // Test 9: Order direction - descending (explicit)
+    let query = r#"{
+            _logs(first: 10, orderDirection: desc) {
+                id
+                timestamp
+            }
+        }"#
+    .to_string();
+    let resp = subgraph.query(&query).await?;
+
+    let logs = resp["data"]["_logs"]
+        .as_array()
+        .context("Expected _logs to be an array")?;
+
+    // Verify descending order (each timestamp <= previous)
+    if logs.len() > 1 {
+        for i in 1..logs.len() {
+            let prev_ts = logs[i - 1]["timestamp"].as_str().unwrap();
+            let curr_ts = logs[i]["timestamp"].as_str().unwrap();
+            assert!(
+                curr_ts <= prev_ts,
+                "Expected descending order, but {} came before {}",
+                prev_ts,
+                curr_ts
+            );
+        }
+        println!("✓ Descending order works correctly");
+    }
+
+    Ok(())
 }
 
 /// The main test entrypoint.
@@ -1337,22 +1779,30 @@ async fn integration_tests() -> anyhow::Result<()> {
             "declared-calls-struct-fields",
             test_declared_calls_struct_fields,
         ),
+        TestCase::new("logs-query", test_logs_query),
     ];
 
     // Filter the test cases if a specific test name is provided
-    let cases_to_run: Vec<_> = if let Some(test_name) = test_name_to_run {
+    let cases_to_run: Vec<_> = if let Some(ref test_name) = test_name_to_run {
         cases
             .into_iter()
-            .filter(|case| case.name == test_name)
+            .filter(|case| case.name == *test_name)
             .collect()
     } else {
         cases
     };
 
-    // Here we wait for a block in the blockchain in order not to influence
-    // block hashes for all the blocks until the end of the grafting tests.
-    // Currently the last used block for grafting test is the block 3.
-    assert!(wait_for_blockchain_block(SUBGRAPH_LAST_GRAFTING_BLOCK).await);
+    // Mine empty blocks to reach the required block number for grafting tests.
+    // This ensures deterministic block hashes for blocks 1-3 before any
+    // contract deployments occur.
+    status!(
+        "setup",
+        "Mining blocks to reach block {}",
+        SUBGRAPH_LAST_GRAFTING_BLOCK
+    );
+    Contract::ensure_block(SUBGRAPH_LAST_GRAFTING_BLOCK as u64)
+        .await
+        .context("Failed to mine initial blocks for grafting test")?;
 
     let contracts = Contract::deploy_all().await?;
 
diff --git a/tests/tests/runner_tests.rs b/tests/tests/runner_tests.rs
index 0b846b7c49a..1d44657c441 100644
--- a/tests/tests/runner_tests.rs
+++ b/tests/tests/runner_tests.rs
@@ -1,7 +1,8 @@
+use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::str::FromStr;
-use std::sync::atomic::{self, AtomicBool};
 use std::sync::Arc;
+use std::sync::atomic::{self, AtomicBool};
 use std::time::Duration;
 
 use assert_json_diff::assert_json_eq;
@@ -16,18 +17,26 @@ use graph::env::{EnvVars, TEST_WITH_NO_REORG};
 use graph::ipfs::test_utils::add_files_to_local_ipfs_node_for_testing;
 use graph::object;
 use graph::prelude::alloy::primitives::{Address, B256, U256};
-use graph::prelude::{hex, CheapClone, SubgraphName, SubgraphStore};
+use graph::prelude::{CheapClone, SubgraphName, SubgraphStore, hex};
 use graph_tests::fixture::ethereum::{
     chain, empty_block, generate_empty_blocks_for_range, genesis, push_test_command, push_test_log,
     push_test_polling_trigger,
 };
 
+use graph::blockchain::Trigger;
+use graph::prelude::alloy::rpc::types::BlockTransactions;
+use graph::prelude::{LightEthereumBlock, create_dummy_transaction, create_minimal_block_for_test};
+use graph_chain_ethereum::{
+    chain::BlockFinality,
+    trigger::{EthereumBlockTriggerType, EthereumTrigger},
+};
+
 use graph_tests::fixture::{
-    self, test_ptr, test_ptr_reorged, MockAdapterSelector, NoopAdapterSelector, TestChainTrait,
-    TestContext, TestInfo,
+    self, MockAdapterSelector, NoopAdapterSelector, StaticArweaveResolver, TestChainTrait,
+    TestContext, TestInfo, test_ptr, test_ptr_reorged,
 };
-use graph_tests::recipe::{build_subgraph_with_pnpm_cmd_and_arg, RunnerTestRecipe};
-use slog::{o, Discard, Logger};
+use graph_tests::recipe::{RunnerTestRecipe, build_subgraph_with_pnpm_cmd_and_arg};
+use slog::{Discard, Logger, o};
 
 fn assert_eq_ignore_backtrace(err: &SubgraphError, expected: &SubgraphError) {
     let equal = {
@@ -447,7 +456,7 @@ async fn end_block() -> anyhow::Result<()> {
     ) {
         let runner = ctx.runner(block_ptr.clone()).await;
         let runner = runner.run_for_test(false).await.unwrap();
-        let filter = runner.context().filter.as_ref().unwrap();
+        let filter = runner.build_filter_for_test();
         let addresses = filter
             .chain_filter
             .log()
@@ -664,11 +673,25 @@ async fn file_data_sources() {
         assert!(datasources.len() == 1);
     }
 
-    // Create a File data source from a same type of file data source handler
+    // Create a File data source from a same type of file data source handler.
+    // Both hash_2 and hash_3 handlers create entities in the same block,
+    // exercising the shared VID generator: colliding VIDs would cause a DB
+    // constraint violation.
     {
         ctx.start_and_sync_to(test_ptr(4)).await;
 
-        let content = "EXAMPLE_3";
+        let query_res = ctx
+            .query(&format!(
+                r#"{{ fileEntity(id: "{}") {{ id, content }} }}"#,
+                hash_2.clone()
+            ))
+            .await
+            .unwrap();
+        assert_json_eq!(
+            query_res,
+            Some(object! { fileEntity: object!{ id: hash_2.clone(), content: "EXAMPLE_2" } })
+        );
+
         let query_res = ctx
             .query(&format!(
                 r#"{{ fileEntity(id: "{}") {{ id, content }} }}"#,
@@ -678,7 +701,7 @@ async fn file_data_sources() {
             .unwrap();
         assert_json_eq!(
             query_res,
-            Some(object! { fileEntity: object!{ id: hash_3.clone(), content: content } })
+            Some(object! { fileEntity: object!{ id: hash_3.clone(), content: "EXAMPLE_3" } })
         );
     }
 
@@ -804,11 +827,22 @@ async fn file_data_sources() {
 
         chain.set_block_stream(blocks);
 
-        let message = "error while executing at wasm backtrace:\t    0:   0x3490 - <unknown>!generated/schema/Foo#save\t    1:   0x3eb2 - <unknown>!src/mapping/handleFile: entity type `Foo` is not on the 'entities' list for data source `File`. Hint: Add `Foo` to the 'entities' list, which currently is: `FileEntity`. in handler `handleFile` at block #5 () at block #5 (0000000000000000000000000000000000000000000000000000000000000005)";
-
         let err = ctx.start_and_sync_to_error(block_5.ptr()).await;
-
-        assert_eq!(err.to_string(), message);
+        let err_msg = err.to_string();
+
+        // Don't check exact wasm hex offsets since they change with any
+        // modification to the wasm binary.
+        assert!(
+            err_msg
+                .contains("entity type `Foo` is not on the 'entities' list for data source `File`"),
+            "unexpected error: {err_msg}"
+        );
+        assert!(
+            err_msg.contains(
+                "Hint: Add `Foo` to the 'entities' list, which currently is: `FileEntity`"
+            ),
+            "unexpected error: {err_msg}"
+        );
     }
 }
 
@@ -1141,23 +1175,22 @@ async fn arweave_file_data_sources() {
     // HASH used in the mappings.
     let id = "8APeQ5lW0-csTcBaGdPBDLAL2ci2AT9pTn2tppGPU_8";
 
-    // This test assumes the file data sources will be processed in the same block in which they are
-    // created. But the test might fail due to a race condition if for some reason it takes longer
-    // than expected to fetch the file from arweave. The sleep here will conveniently happen after the
-    // data source is added to the offchain monitor but before the monitor is checked, in an an
-    // attempt to ensure the monitor has enough time to fetch the file.
-    let adapter_selector = NoopAdapterSelector {
-        x: PhantomData,
-        triggers_in_block_sleep: Duration::from_millis(1500),
-    };
-    let chain = chain(
-        &test_info.test_name,
-        blocks.clone(),
+    // Use a mock arweave resolver to avoid real network calls and eliminate the
+    // race condition that caused this test to be flaky.
+    let arweave_content: HashMap<String, Vec<u8>> =
+        HashMap::from([(id.to_string(), b"test arweave content".to_vec())]);
+    let arweave_resolver = Arc::new(StaticArweaveResolver::new(arweave_content));
+
+    let chain = chain(&test_info.test_name, blocks.clone(), &stores, None).await;
+    let ctx = fixture::setup_with_arweave_resolver(
+        &test_info,
         &stores,
-        Some(Arc::new(adapter_selector)),
+        &chain,
+        None,
+        None,
+        arweave_resolver,
     )
     .await;
-    let ctx = fixture::setup(&test_info, &stores, &chain, None, None).await;
     ctx.start_and_sync_to(test_ptr(2)).await;
 
     let store = ctx.store.cheap_clone();
@@ -1187,3 +1220,275 @@ async fn arweave_file_data_sources() {
         Some(object! { file: object!{ id: id, content: content.clone() } })
     );
 }
+
+#[graph::test]
+async fn aggregation_current_bucket() {
+    let RunnerTestRecipe { stores, test_info } =
+        RunnerTestRecipe::new("aggregation_current_bucket", "aggregation-current-bucket").await;
+
+    // Helper to create a block with a specific timestamp (seconds since epoch)
+    fn empty_block_with_timestamp(
+        parent_ptr: BlockPtr,
+        ptr: BlockPtr,
+        timestamp: u64,
+    ) -> BlockWithTriggers<graph_chain_ethereum::Chain> {
+        let dummy_txn =
+            create_dummy_transaction(ptr.number as u64, ptr.hash.as_b256(), Some(0), B256::ZERO);
+        let transactions = BlockTransactions::Full(vec![dummy_txn]);
+        let alloy_block = create_minimal_block_for_test(ptr.number as u64, ptr.hash.as_b256())
+            .map_header(|mut header| {
+                header.inner.parent_hash = parent_ptr.hash.as_b256();
+                header.inner.timestamp = timestamp;
+                header
+            })
+            .with_transactions(transactions);
+
+        BlockWithTriggers::<graph_chain_ethereum::Chain> {
+            block: BlockFinality::Final(Arc::new(LightEthereumBlock::new(alloy_block))),
+            trigger_data: vec![Trigger::Chain(EthereumTrigger::Block(
+                ptr,
+                EthereumBlockTriggerType::End,
+            ))],
+        }
+    }
+
+    // Block layout:
+    // Block 0: genesis (timestamp 0)
+    // Block 1: timestamp 3601 (hour 1, +1s) — create tokens
+    // Block 2: timestamp 3660 (hour 1, +1 min) — create data: TOKEN_A=10, TOKEN_B=20
+    // Block 3: timestamp 3720 (hour 1, +2 min) — create data: TOKEN_A=30, TOKEN_B=40
+    // Block 4: timestamp 7201 (hour 2, +1s, triggers hour-1 rollup) — create data: TOKEN_A=5, TOKEN_B=15
+    // Block 5: timestamp 7261 (hour 2, +1 min +1s) — create data: TOKEN_A=7, TOKEN_B=25
+    //
+    // Expected results:
+    // Hour 1 (rolled up): TOKEN_A sum=40, TOKEN_B sum=60
+    // Hour 2 (current):   TOKEN_A sum=12, TOKEN_B sum=40
+
+    let block_0 = genesis();
+
+    let mut block_1 = empty_block_with_timestamp(block_0.ptr(), test_ptr(1), 3601);
+    push_test_log(&mut block_1, "token:0xaa:TokenA");
+    push_test_log(&mut block_1, "token:0xbb:TokenB");
+
+    let mut block_2 = empty_block_with_timestamp(block_1.ptr(), test_ptr(2), 3660);
+    push_test_log(&mut block_2, "data:0xaa:10");
+    push_test_log(&mut block_2, "data:0xbb:20");
+
+    let mut block_3 = empty_block_with_timestamp(block_2.ptr(), test_ptr(3), 3720);
+    push_test_log(&mut block_3, "data:0xaa:30");
+    push_test_log(&mut block_3, "data:0xbb:40");
+
+    let mut block_4 = empty_block_with_timestamp(block_3.ptr(), test_ptr(4), 7201);
+    push_test_log(&mut block_4, "data:0xaa:5");
+    push_test_log(&mut block_4, "data:0xbb:15");
+
+    let mut block_5 = empty_block_with_timestamp(block_4.ptr(), test_ptr(5), 7261);
+    push_test_log(&mut block_5, "data:0xaa:7");
+    push_test_log(&mut block_5, "data:0xbb:25");
+
+    let blocks = vec![block_0, block_1, block_2, block_3, block_4, block_5];
+    let chain = chain(&test_info.test_name, blocks, &stores, None).await;
+    let ctx = fixture::setup(&test_info, &stores, &chain, None, None).await;
+
+    ctx.start_and_sync_to(test_ptr(5)).await;
+
+    // Query 1: Root query with current: include
+    // Expect 4 rows: hour-1 TOKEN_A(sum=40), hour-1 TOKEN_B(sum=60),
+    //                hour-2 TOKEN_A(sum=12), hour-2 TOKEN_B(sum=40)
+    let query_res = ctx
+        .query(
+            r#"{
+                stats_collection(interval: "hour", current: include, orderBy: timestamp, orderDirection: asc) {
+                    token { id }
+                    sum
+                }
+            }"#,
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(
+        query_res,
+        Some(object! {
+            stats_collection: vec![
+                object! { token: object! { id: "0xaa" }, sum: "40" },
+                object! { token: object! { id: "0xbb" }, sum: "60" },
+                object! { token: object! { id: "0xaa" }, sum: "12" },
+                object! { token: object! { id: "0xbb" }, sum: "40" },
+            ]
+        })
+    );
+
+    // Query 2: Root query with current: exclude (only rolled-up data)
+    // Expect 2 rows: hour-1 TOKEN_A(sum=40), hour-1 TOKEN_B(sum=60)
+    let query_res = ctx
+        .query(
+            r#"{
+                stats_collection(interval: "hour", current: exclude, orderBy: timestamp, orderDirection: asc) {
+                    token { id }
+                    sum
+                }
+            }"#,
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(
+        query_res,
+        Some(object! {
+            stats_collection: vec![
+                object! { token: object! { id: "0xaa" }, sum: "40" },
+                object! { token: object! { id: "0xbb" }, sum: "60" },
+            ]
+        })
+    );
+
+    // Query 3: Nested query with current: include
+    // Each token should have 2 stats entries (hour-1 rolled-up + hour-2 current)
+    let query_res = ctx
+        .query(
+            r#"{
+                tokens(orderBy: id) {
+                    id
+                    stats(interval: "hour", current: include, orderBy: timestamp, orderDirection: asc) {
+                        sum
+                    }
+                }
+            }"#,
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(
+        query_res,
+        Some(object! {
+            tokens: vec![
+                object! {
+                    id: "0xaa",
+                    stats: vec![
+                        object! { sum: "40" },
+                        object! { sum: "12" },
+                    ]
+                },
+                object! {
+                    id: "0xbb",
+                    stats: vec![
+                        object! { sum: "60" },
+                        object! { sum: "40" },
+                    ]
+                },
+            ]
+        })
+    );
+}
+
+#[graph::test]
+async fn skip_duplicates() {
+    let RunnerTestRecipe { stores, test_info } =
+        RunnerTestRecipe::new("skip_duplicates", "skip-duplicates").await;
+
+    let blocks = {
+        let block_0 = genesis();
+        let mut block_1 = empty_block(block_0.ptr(), test_ptr(1));
+        push_test_polling_trigger(&mut block_1);
+        let mut block_2 = empty_block(block_1.ptr(), test_ptr(2));
+        push_test_polling_trigger(&mut block_2);
+        let mut block_3 = empty_block(block_2.ptr(), test_ptr(3));
+        push_test_polling_trigger(&mut block_3);
+        let mut block_4 = empty_block(block_3.ptr(), test_ptr(4));
+        push_test_polling_trigger(&mut block_4);
+        vec![block_0, block_1, block_2, block_3, block_4]
+    };
+
+    let stop_block = blocks.last().unwrap().block.ptr();
+    let chain = chain(&test_info.test_name, blocks, &stores, None).await;
+    let ctx = fixture::setup(&test_info, &stores, &chain, None, None).await;
+
+    ctx.start_and_sync_to(stop_block).await;
+
+    let query_res = ctx
+        .query(r#"{ ping(id: "duplicate-entity") { id, value } }"#)
+        .await
+        .unwrap();
+
+    assert_eq!(
+        query_res,
+        Some(object! {
+            ping: object! { id: "duplicate-entity", value: "ping" }
+        })
+    );
+}
+
+/// Test that the unfail mechanism retries until the deployment head reaches
+/// the error block. This is a regression test for issue #6205.
+///
+/// Scenario:
+/// 1. Sync to block 1
+/// 2. Inject non-deterministic error at block 3 (ahead of head)
+/// 3. Run runner to block 3
+/// 4. At blocks 1-2: unfail returns BehindErrorBlock, keeps trying
+/// 5. At block 3: unfail succeeds, health → Healthy
+#[graph::test]
+async fn non_deterministic_unfail_retries_until_error_block() -> anyhow::Result<()> {
+    let RunnerTestRecipe { stores, test_info } =
+        RunnerTestRecipe::new("non_deterministic_unfail_retries", "end-block").await;
+
+    let blocks = {
+        let block_0 = genesis();
+        let mut block_1 = empty_block(block_0.ptr(), test_ptr(1));
+        let mut block_2 = empty_block(block_1.ptr(), test_ptr(2));
+        let mut block_3 = empty_block(block_2.ptr(), test_ptr(3));
+
+        // Add triggers to exercise normal block processing.
+        push_test_log(&mut block_1, "a");
+        push_test_log(&mut block_2, "b");
+        push_test_log(&mut block_3, "c");
+
+        vec![block_0, block_1, block_2, block_3]
+    };
+
+    let chain = chain(&test_info.test_name, blocks, &stores, None).await;
+    let ctx = fixture::setup(&test_info, &stores, &chain, None, None).await;
+
+    // Advance head to block 1.
+    ctx.start_and_sync_to(test_ptr(1)).await;
+
+    // Inject non-deterministic fatal error at block 3 (ahead of current head).
+    let writable = ctx
+        .store
+        .clone()
+        .writable(ctx.logger.clone(), ctx.deployment.id, Arc::new(vec![]))
+        .await
+        .unwrap();
+
+    writable
+        .fail_subgraph(SubgraphError {
+            subgraph_id: ctx.deployment.hash.clone(),
+            message: "injected transient error".to_string(),
+            block_ptr: Some(test_ptr(3)),
+            handler: None,
+            deterministic: false,
+        })
+        .await
+        .unwrap();
+
+    writable.flush().await.unwrap();
+
+    // Precondition: deployment is failed with non-deterministic error.
+    let status = ctx.indexing_status().await;
+    assert!(status.health == SubgraphHealth::Failed);
+    assert!(!status.fatal_error.as_ref().unwrap().deterministic);
+
+    // Run runner to block 3. The unfail mechanism should:
+    // - Return BehindErrorBlock at blocks 1-2 (keep trying)
+    // - Return Unfailed at block 3 (success)
+    let stop_block = test_ptr(3);
+    let _runner = ctx.runner(stop_block).await.run_for_test(false).await?;
+
+    // Postcondition: deployment is healthy, no fatal error.
+    let status = ctx.indexing_status().await;
+    assert!(status.health == SubgraphHealth::Healthy);
+    assert!(status.fatal_error.is_none());
+
+    Ok(())
+}