diff --git a/.github/workflows/gnd-binary-build.yml b/.github/workflows/gnd-binary-build.yml
index fd642606e69..237de3342b5 100644
--- a/.github/workflows/gnd-binary-build.yml
+++ b/.github/workflows/gnd-binary-build.yml
@@ -1,8 +1,14 @@
 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
@@ -130,7 +136,7 @@ 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
@@ -153,10 +159,8 @@ 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
+          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 \
@@ -169,7 +173,7 @@ jobs:
   publish-npm:
     name: Publish npm package for ${{ matrix.platform }}
     needs: release
-    if: startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/') || inputs.release_tag != ''
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -212,7 +216,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download "${{ github.ref_name }}" \
+          gh release download "${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}" \
             --repo "${{ github.repository }}" \
             --pattern "${{ matrix.asset }}" \
             --output ./binary-archive
@@ -232,7 +236,7 @@ jobs:
         id: version
         shell: bash
         run: |
-          VERSION="${{ github.ref_name }}"
+          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
@@ -283,7 +287,7 @@ jobs:
   publish-npm-wrapper:
     name: Publish @graphprotocol/gnd wrapper
     needs: publish-npm
-    if: startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/') || inputs.release_tag != ''
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -299,7 +303,7 @@ jobs:
         id: version
         shell: bash
         run: |
-          VERSION="${{ github.ref_name }}"
+          VERSION="${{ inputs.release_tag != '' && inputs.release_tag || github.ref_name }}"
           VERSION="${VERSION#v}"
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
           if [[ "$VERSION" == *-* ]]; then
diff --git a/CLAUDE.md b/CLAUDE.md
index 4432890bfd8..b8ec983428b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -98,6 +98,9 @@ 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:**
@@ -111,6 +114,8 @@ GRAPH_CLI=node_modules/.bin/graph 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
 
diff --git a/Cargo.lock b/Cargo.lock
index 7b6822ecc95..5e204e6ad4d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,9 +14,9 @@ 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",
 ]
@@ -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",
@@ -73,9 +73,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4973038846323e4e69a433916522195dce2947770076c03078fc21c80ea0f1c4"
+checksum = "5e1e915a830ea2ee123c9d3886bfec3302a7ddcd73a973ab165ed45aca2e42c3"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -111,9 +111,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c0dc44157867da82c469c13186015b86abef209bf0e41625e4b68bac61d728"
+checksum = "83447eeb17816e172f1dfc0db1f9dc0b7c5d069bd1f7cecbecceb382bf931015"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -129,8 +129,8 @@ dependencies = [
  "either",
  "k256",
  "once_cell",
- "rand 0.8.5",
- "secp256k1",
+ "rand 0.8.6",
+ "secp256k1 0.30.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -139,9 +139,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4cdb42df3871cd6b346d6a938ec2ba69a9a0f49d1f82714bc5c48349268434"
+checksum = "5406343e306856dc2be762700e98a16904de45dee14a07f233e742ce68daff2f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -154,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca63b7125a981415898ffe2a2a696c83696c9c6bdb1671c8a912946bbd8e49e7"
+checksum = "3ae8b60d71b92824e095b4003ff01fd2bc923017b7568997c5f459240e83499c"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -173,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",
@@ -190,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",
@@ -203,7 +204,7 @@ dependencies = [
  "proptest",
  "serde",
  "serde_json",
- "winnow 0.7.13",
+ "winnow 1.0.0",
 ]
 
 [[package]]
@@ -216,7 +217,7 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "crc",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "thiserror 2.0.18",
 ]
@@ -231,7 +232,7 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "borsh",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
 ]
 
@@ -246,7 +247,7 @@ dependencies = [
  "arbitrary",
  "borsh",
  "k256",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "thiserror 2.0.18",
 ]
@@ -266,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f7ef09f21bd1e9cb8a686f168cb4a206646804567f0889eadb8dcc4c9288c8"
+checksum = "0dca4c89ace90684b4b77366d00631ed498c9af962079af2a5dbc593a0618a77"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -286,14 +287,13 @@ dependencies = [
  "serde",
  "serde_with",
  "sha2 0.10.9",
- "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "alloy-genesis"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9cf3b99f46615fbf7dc1add0c96553abb7bf88fc9ec70dfbe7ad0b47ba7fe8"
+checksum = "ab0e0fe9e6d1120ad7bb9254c3fc2b9bc80a8df42a033fb626be6559c13d5153"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -306,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",
@@ -318,13 +318,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff42cd777eea61f370c0b10f2648a1c81e0b783066cd7269228aa993afd487f7"
+checksum = "ec0a82e56b1843bce483942d54fcadea92e676f1bde162e93c7d3b621fabc4e1"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
- "http 1.4.0",
+ "http 1.4.2",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -333,9 +333,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cbca04f9b410fdc51aaaf88433cbac761213905a65fe832058bcf6690585762"
+checksum = "a7db7b095b0b1db1d18ce7e91dcd2e82007f2d52bfb8125e6b64633a74a06bc3"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d6d15e069a8b11f56bef2eccbad2a873c6dd4d4c81d04dda29710f5ea52f04"
+checksum = "cd28d9bfd11729037d194f2b1d43db8642eb3f342032691f4ca96bb745479c3c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -372,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",
  "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.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d181c8cc7cf4805d7e589bf4074d56d55064fa1a979f005a45a62b047616d870"
+checksum = "8955ab30418343de57b356de2ea60200f9fb8016a7ea3bc7f5c6176f01a8b1cf"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -436,7 +436,7 @@ dependencies = [
  "lru",
  "parking_lot",
  "pin-project",
- "reqwest",
+ "reqwest 0.13.2",
  "serde",
  "serde_json",
  "thiserror 2.0.18",
@@ -448,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8bd82953194dec221aa4cbbbb0b1e2df46066fe9d0333ac25b43a311e122d13"
+checksum = "7cd85cfea1fa8ebd20d3475e961fe3a3624c0eb4659ea137715c0c83c8aeaff0"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -475,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",
 ]
 
@@ -487,14 +487,14 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2792758a93ae32a32e9047c843d536e1448044f78422d71bf7d7c05149e103f"
+checksum = "24f461f091dc8f657e73b5dea18fd63d5c7049720cd252f1eade4a7ebed6a7e1"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -505,7 +505,7 @@ dependencies = [
  "alloy-transport-ws",
  "futures 0.3.31",
  "pin-project",
- "reqwest",
+ "reqwest 0.13.2",
  "serde",
  "serde_json",
  "tokio",
@@ -518,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bdcbf9dfd5eea8bfeb078b1d906da8cd3a39c4d4dbe7a628025648e323611f6"
+checksum = "052c031d1f7c5611997056bbcb8814e5cbf20f7efeee8c3de690555172038cf2"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -535,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a3100b76987c1b1dc81f3abe592b7edc29e92b1242067a69d65e0030b35cf9"
+checksum = "2ff111a54268dc0bbd3b17f98571a7e27cc661dc081ad2999d91888647eb2e11"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -547,22 +547,27 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd720b63f82b457610f2eaaf1f32edf44efffe03ae25d537632e7d23e7929e1a"
+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.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b21e1ad18ff1b31ff1030e046462ab8168cf8894e6778cd805c8bdfe2bd649"
+checksum = "48b9ad6eee93dd35a9ec0a6c1c6b180892a900ee17a6ed6500921552dd71e846"
 dependencies = [
  "alloy-primitives",
+ "alloy-rlp",
  "derive_more",
  "serde",
  "serde_with",
@@ -570,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ac61f03f1edabccde1c687b5b25fff28f183afee64eaa2e767def3929e4457"
+checksum = "7eba59e1c069f168a01982f42a57797736923b76aa854194df4930be17867e1c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -581,16 +586,16 @@ dependencies = [
  "alloy-serde",
  "arbitrary",
  "derive_more",
- "rand 0.8.5",
+ "rand 0.8.6",
  "serde",
  "strum 0.27.2",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2dc411f13092f237d2bf6918caf80977fc2f51485f9b90cb2a2f956912c8c9"
+checksum = "175a2a5b6017d7f61b5e4b800d21215fe8e94fe729d00828e13bb6d93dcf3492"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -601,7 +606,7 @@ dependencies = [
  "alloy-serde",
  "alloy-sol-types",
  "arbitrary",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -610,9 +615,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad79f1e27e161943b5a4f99fe5534ef0849876214be411e0032c12f38e94daa"
+checksum = "514b4b1ce3354f65067b4fc7eb75358e0f2ec8be3340c96dea65d6894f9ca435"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -624,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-txpool"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d459f902a2313737bc66d18ed094c25d2aeb268b74d98c26bbbda2aa44182ab0"
+checksum = "76e34a42ebb4a71ab0bfdebc6d2f3c7bf809f01edf154d08fed159d10d1ef1d4"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -636,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2ce1e0dbf7720eee747700e300c99aac01b1a95bb93f493a01e78ee28bb1a37"
+checksum = "cc21a8772af7d78bba286726aa245bd2ff81cd9abe230afea2e91578996831c9"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -648,9 +653,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2425c6f314522c78e8198979c8cbf6769362be4da381d4152ea8eefce383535d"
+checksum = "8ffbce94c50dd9d4d1f83e044c5595bbd3ada981bd3057ce28b3a5470e77385d"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -663,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ecb71ee53d8d9c3fa7bac17542c8116ebc7a9726c91b1bf333ec3d04f5a789"
+checksum = "e48366d2c42b8d95ef951101bafa28486590f21b7a1e68b6b2d069746557bbe3"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -673,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.117",
+ "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.117",
+ "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",
@@ -724,25 +729,25 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.117",
+ "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",
@@ -752,13 +757,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa186e560d523d196580c48bf00f1bf62e63041f28ecf276acc22f8b27bb9f53"
+checksum = "86052fdcec72d37ca4aa4b66254601e7453c45a6e1c70aa4561033d002fb80cc"
 dependencies = [
  "alloy-json-rpc",
  "auto_impl",
- "base64 0.22.1",
+ "base64",
  "derive_more",
  "futures 0.3.31",
  "futures-utils-wasm",
@@ -775,14 +780,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa501ad58dd20acddbfebc65b52e60f05ebf97c52fa40d1b35e91f5e2da0ad0e"
+checksum = "b273587487921274f4f5d0ef2c7ef36944dcbb75a4e2318e69eae822bd263f91"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
- "itertools 0.14.0",
- "reqwest",
+ "itertools 0.13.0",
+ "reqwest 0.13.2",
  "serde_json",
  "tower 0.5.2",
  "tracing",
@@ -791,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ef85688e5ac2da72afc804e0a1f153a1f309f05a864b1998bbbed7804dbaab"
+checksum = "bfb89df168b24773ef603af14f2449c05a7d3f27d05d3eceaea6bf96cccae168"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -811,18 +816,20 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f00445db69d63298e2b00a0ea1d859f00e6424a3144ffc5eba9c31da995e16"
+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",
 ]
 
@@ -835,7 +842,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arbitrary",
- "arrayvec 0.7.4",
+ "arrayvec",
  "derive_arbitrary",
  "derive_more",
  "nybbles",
@@ -848,14 +855,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.7.3"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa0c53e8c1e1ef4d01066b01c737fb62fc9397ab52c6e7bb5669f97d281b9bc"
+checksum = "01a0035943b75fe1e249f52e688492d7a1b1826bc2d19b8e1d5d3c24a2ad8f50"
 dependencies = [
- "darling 0.21.3",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -867,6 +874,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "anstream"
+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"
@@ -874,7 +896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
- "anstyle-parse",
+ "anstyle-parse 1.0.0",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
@@ -888,6 +910,15 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle-parse"
 version = "1.0.0"
@@ -914,14 +945,14 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.1",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "arbitrary"
@@ -934,9 +965,9 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "1.8.2"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5"
+checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207"
 dependencies = [
  "rustversion",
 ]
@@ -995,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",
@@ -1032,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1070,7 +1101,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1101,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",
 ]
@@ -1113,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]]
@@ -1123,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]]
@@ -1133,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"
@@ -1159,9 +1178,9 @@ dependencies = [
 
 [[package]]
 name = "arrow"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d441fdda254b65f3e9025910eb2c2066b6295d9c8ed409522b8d2ace1ff8574c"
+checksum = "ffaaa3e009861fd829d0a24dd6f115aa8e4634324bb092147d43baafe69ca4a7"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -1180,9 +1199,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-arith"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced5406f8b720cc0bc3aa9cf5758f93e8593cda5490677aa194e4b4b383f9a59"
+checksum = "3ac95125e1d71c4a252b5a9c729aef111e80418f08aaa6dbabd1ba66918247fc"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1194,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-array"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772bd34cacdda8baec9418d80d23d0fb4d50ef0735685bd45158b83dfeb6e62d"
+checksum = "0c60c79628e9a97cb90d7a0dc3e944f216a902f837d4ecabc14d524bddbbc137"
 dependencies = [
  "ahash",
  "arrow-buffer",
@@ -1204,7 +1223,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "num-complex",
  "num-integer",
  "num-traits",
@@ -1212,9 +1231,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-buffer"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898f4cf1e9598fdb77f356fdf2134feedfd0ee8d5a4e0a5f573e7d0aec16baa4"
+checksum = "6026f638c400e9878c1b1cc05c3cfd46fbf381285916ab408678701c1df46c1a"
 dependencies = [
  "bytes",
  "half",
@@ -1224,9 +1243,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-cast"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0127816c96533d20fc938729f48c52d3e48f99717e7a0b5ade77d742510736d"
+checksum = "c82c236c3caf8df5664284f3f1fbe89938852163998c3fdbf37e84ac220445e9"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1235,7 +1254,7 @@ dependencies = [
  "arrow-schema",
  "arrow-select",
  "atoi",
- "base64 0.22.1",
+ "base64",
  "chrono",
  "half",
  "lexical-core",
@@ -1245,9 +1264,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-csv"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca025bd0f38eeecb57c2153c0123b960494138e6a957bbda10da2b25415209fe"
+checksum = "12714e5fb7954159af1e26d4e0d37108bcf1a2ad5ee5c5bf02a944d564d588b7"
 dependencies = [
  "arrow-array",
  "arrow-cast",
@@ -1260,9 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-data"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d10beeab2b1c3bb0b53a00f7c944a178b622173a5c7bcabc3cb45d90238df4"
+checksum = "7bd568aa70c4ec5947027b0d5caee94877433b661a0bb9e8ddceeeb5f0c9b1ab"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
@@ -1273,9 +1292,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-flight"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302b2e036335f3f04d65dad3f74ff1f2aae6dc671d6aa04dc6b61193761e16fb"
+checksum = "68365401e834743d708094927e2ca727a32d639fe900df04b936e07a36701b74"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -1288,7 +1307,7 @@ dependencies = [
  "arrow-schema",
  "arrow-select",
  "arrow-string",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures 0.3.31",
  "once_cell",
@@ -1301,9 +1320,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ipc"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609a441080e338147a84e8e6904b6da482cefb957c5cdc0f3398872f69a315d0"
+checksum = "e57ee4d470eab1a021bc4b63fa2b2c15d572892bf227b0a982d3b755a6c662b5"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1315,18 +1334,19 @@ dependencies = [
 
 [[package]]
 name = "arrow-json"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ead0914e4861a531be48fe05858265cf854a4880b9ed12618b1d08cba9bebc8"
+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",
@@ -1339,9 +1359,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-ord"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a7ba279b20b52dad300e68cfc37c17efa65e68623169076855b3a9e941ca5"
+checksum = "a79cf73ad2eba8686ec2aa9bbf8671208e509025f166afc040cedbd94ffe4983"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1352,9 +1372,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-row"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14fe367802f16d7668163ff647830258e6e0aeea9a4d79aaedf273af3bdcd3e"
+checksum = "cea0f7d8ed6182f14952761e2c0f989852d5aa334fcbc49f73a9f2247c25b879"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1365,15 +1385,15 @@ dependencies = [
 
 [[package]]
 name = "arrow-schema"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c30a1365d7a7dc50cc847e54154e6af49e4c4b0fddc9f607b687f29212082743"
+checksum = "80b3e786a0dd9103acd583a6fb486dbf2f3268466cc0bd571dcf34cef231c1f1"
 
 [[package]]
 name = "arrow-select"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78694888660a9e8ac949853db393af2a8b8fc82c19ce333132dfa2e72cc1a7fe"
+checksum = "067a67e0361f6c31f4a7248759f36ca4ca71b187a941ed4d49da1c7d3d4db624"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -1385,9 +1405,9 @@ dependencies = [
 
 [[package]]
 name = "arrow-string"
-version = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e04a01f8bb73ce54437514c5fd3ee2aa3e8abe4c777ee5cc55853b1652f79e"
+checksum = "99bc95847f3ff62a2b03d6f8ce2e3e78f01362060549a2a311898dd442f6256d"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -1442,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",
@@ -1494,7 +1514,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strum 0.27.2",
- "syn 2.0.117",
+ "syn 2.0.118",
  "thiserror 2.0.18",
 ]
 
@@ -1517,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",
 ]
@@ -1529,15 +1549,15 @@ 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]]
@@ -1559,7 +1579,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1581,18 +1601,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "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.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1633,9 +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"
+checksum = "21e4227379beff4205943696e6c3e0cd809bacdf3f0edd6e3dd153e2269571a4"
 
 [[package]]
 name = "auto_impl"
@@ -1645,7 +1665,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1654,18 +1674,40 @@ 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 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -1683,7 +1725,7 @@ dependencies = [
  "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)",
@@ -1698,7 +1740,7 @@ checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "mime",
@@ -1730,12 +1772,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[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"
@@ -1760,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"
@@ -1816,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"
@@ -1834,30 +1859,14 @@ 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.4"
+version = "1.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e"
+checksum = "6d9e454fc11f76977dc803893aff6304ed33d6a26efae8696573bea74baa27ae"
 dependencies = [
- "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec",
  "cc",
- "cfg-if 1.0.0",
- "constant_time_eq 0.4.2",
+ "cfg-if",
+ "constant_time_eq",
  "cpufeatures 0.3.0",
 ]
 
@@ -1911,7 +1920,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1962,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",
 ]
@@ -1983,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",
 ]
@@ -2008,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",
@@ -2019,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"
@@ -2042,42 +2051,41 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures 0.3.0",
  "rand_core 0.10.0",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+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]]
 name = "clap"
-version = "4.6.0"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2085,11 +2093,11 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.6.0"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
- "anstream",
+ "anstream 0.6.21",
  "anstyle",
  "clap_lex",
  "strsim",
@@ -2107,27 +2115,39 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.6.0"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "1.1.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
+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"
@@ -2173,14 +2193,14 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
+checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c"
 dependencies = [
  "encode_unicode",
  "libc",
  "unicode-width",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2189,7 +2209,7 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures 0.2.12",
  "proptest",
  "serde_core",
@@ -2224,15 +2244,9 @@ 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.4.2"
@@ -2274,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]]
@@ -2312,46 +2317,48 @@ dependencies = [
 
 [[package]]
 name = "cranelift-assembler-x64"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c088d3406f0c0252efa7445adfd2d05736bfb5218838f64eaf79d567077aed14"
+checksum = "e06aeba2c965fc446d13c56a6ccb2631b78445d7544543dd9a25289977630914"
 dependencies = [
  "cranelift-assembler-x64-meta",
 ]
 
 [[package]]
 name = "cranelift-assembler-x64-meta"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c03f887a763abb9c1dc08f722aa82b69067fda623b6f0273050f45f8b1a6776"
+checksum = "ee2d2dde4ec1352715595b5cfa6fe2e5b8ebb9da3457b3ee8db0aa2808c069aa"
 dependencies = [
  "cranelift-srcgen",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206887a11a43f507fee320a218dc365980bfc42ec2696792079a9f8c9369e90"
+checksum = "03b4982ef9fa54ec9eee841e891e7ddc5434be1250e88de31572e000c888f30b"
 dependencies = [
  "cranelift-entity",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac0790c83cfdab95709c5d0105fd888221e3af9049a7d7ec376ec901ab4e4dba"
+checksum = "529143118c4eeb58c39ecb02319557d512be6c61348486422974ab8e3906b8a8"
 dependencies = [
  "serde",
  "serde_derive",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a98aed2d262eda69310e84bae8e053ee4f17dbdd3347b8d9156aa618ba2de0a"
+checksum = "b7780677247ad3577e3a6a3ebf43f39b325a11d6393db72b2c9968a910d4d13d"
 dependencies = [
  "bumpalo",
  "cranelift-assembler-x64",
@@ -2363,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.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6906852826988563e9b0a9232ad951f53a47aa41ffd02f8ac852d3f41aae836a"
+checksum = "ac9645250416cbf92454fe61160e17e026e0ce405906a54500b114f923ddffc9"
 dependencies = [
  "cranelift-assembler-x64-meta",
  "cranelift-codegen-shared",
@@ -2389,37 +2400,39 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a50105aab667b5cc845f2be37c78475d7cc127cd8ec0a31f7b2b71d526099a7"
+checksum = "20ee8d222ff0fd3681791979afbf88586ac9f49010d3db96b3cbe4c96759aee3"
 
 [[package]]
 name = "cranelift-control"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6adcc7aa7c0bc1727176a6f2d99c28a9e79a541ccd5ca911a0cb352da8befa36"
+checksum = "591abe6f5312bd2c4220f1b3bead56c2ad00257c52668015ba013b85dcf2a17a"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "981b56af777f9a34ea6dcce93255125776d391410c2a68b75bed5941b714fa15"
+checksum = "a5300c49cf940526fe771517b3b3eabd5d0ff164ee61698579cf403fe8d3af3c"
 dependencies = [
  "cranelift-bitset",
  "serde",
  "serde_derive",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea982589684dfb71afecb9fc09555c3a266300a1162a60d7fa39d41a5705b1c"
+checksum = "da4adbf760207fdbbe130f1191cce01cdef66831a9f648b1f39ff2800d126d45"
 dependencies = [
  "cranelift-codegen",
+ "hashbrown 0.17.0",
  "log",
  "smallvec",
  "target-lexicon",
@@ -2427,15 +2440,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0422686b22ed6a1f33cc40e3c43eb84b67155788568d1a5cac8439d3dca1783"
+checksum = "8315b21ff018226a42a60a4702c2dd75f6447cac26e9bca622e14c22088c2ff5"
 
 [[package]]
 name = "cranelift-native"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f697bbbe135c655ea1deb7af0bae4a5c4fae2c88fdfc0fa57b34ae58c91040"
+checksum = "d506ef23a60715bde451b06620b14402166ded3b648454fccbf04f3e46a4aa70"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -2444,9 +2457,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-srcgen"
-version = "0.125.4"
+version = "0.133.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718efe674f3df645462677e22a3128e890d88ba55821bb091083d257707be76c"
+checksum = "48ed47e602652e3410f9387fc0db70fefadcee4d78a78881421aabcab4e26b89"
 
 [[package]]
 name = "crc"
@@ -2469,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]]
@@ -2534,13 +2547,13 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "crossterm_winapi",
  "derive_more",
  "document-features",
  "mio",
  "parking_lot",
- "rustix 1.0.7",
+ "rustix 1.1.4",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -2592,16 +2605,6 @@ dependencies = [
  "hybrid-array",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "csv"
 version = "1.4.0"
@@ -2664,7 +2667,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2677,9 +2680,8 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "serde",
  "strsim",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2691,8 +2693,9 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
+ "serde",
  "strsim",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2703,7 +2706,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2714,7 +2717,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2725,7 +2728,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2734,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",
@@ -2860,7 +2863,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2881,7 +2884,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2891,7 +2894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2913,24 +2916,24 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.0",
- "syn 2.0.117",
+ "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",
@@ -2940,16 +2943,15 @@ dependencies = [
 
 [[package]]
 name = "diesel-async"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b95864e58597509106f1fddfe0600de7e589e1fddddd87f54eee0a49fd111bbc"
+checksum = "dd39af30158d444884f166fe4c58f35dc40ad71ad017bb59408a3448526ff4bd"
 dependencies = [
  "deadpool 0.13.0",
  "diesel",
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "scoped-futures",
  "tokio",
  "tokio-postgres",
 ]
@@ -2963,7 +2965,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2977,22 +2979,22 @@ dependencies = [
 
 [[package]]
 name = "diesel_derives"
-version = "2.3.7"
+version = "2.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47618bf0fac06bb670c036e48404c26a865e6a71af4114dfd97dfe89936e404e"
+checksum = "d1817b7f4279b947fc4cafddec12b0e5f8727141706561ce3ac94a60bddd1cf5"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "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",
@@ -3005,7 +3007,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3058,7 +3060,7 @@ 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",
 ]
 
@@ -3077,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",
 ]
 
@@ -3112,7 +3114,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3147,7 +3149,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3186,7 +3188,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3242,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]]
@@ -3262,14 +3264,14 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "env_filter"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
+checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217"
 dependencies = [
  "log",
  "regex",
@@ -3277,11 +3279,11 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.10"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
+checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6"
 dependencies = [
- "anstream",
+ "anstream 1.0.0",
  "anstyle",
  "env_filter",
  "jiff",
@@ -3305,7 +3307,7 @@ checksum = "452c458dfb890a2fea64e4c894f83daad61689fb9bbe84c382e1ce6d7536710b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3377,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"
@@ -3387,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",
 ]
@@ -3398,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",
 ]
@@ -3415,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"
@@ -3438,11 +3440,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand 0.8.6",
  "rustc-hex",
  "static_assertions",
 ]
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
@@ -3455,7 +3463,7 @@ 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",
 ]
 
@@ -3512,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"
@@ -3599,7 +3613,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3654,9 +3668,9 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25234f20a3ec0a962a61770cfe39ecf03cb529a6e474ad8cff025ed497eda557"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "debugid",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3679,7 +3693,7 @@ 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",
@@ -3692,7 +3706,7 @@ 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",
@@ -3706,7 +3720,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "r-efi",
  "rand_core 0.10.0",
@@ -3716,12 +3730,13 @@ dependencies = [
 
 [[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",
 ]
 
@@ -3743,7 +3758,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "time",
 ]
 
@@ -3768,14 +3783,14 @@ dependencies = [
 
 [[package]]
 name = "gnd"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "Inflector",
  "anyhow",
  "async-trait",
  "clap",
  "clap_complete",
- "console 0.16.3",
+ "console 0.16.4",
  "env_logger",
  "git-testament",
  "globset",
@@ -3795,7 +3810,7 @@ dependencies = [
  "pgtemp",
  "pq-sys",
  "regex",
- "reqwest",
+ "reqwest 0.12.23",
  "semver 1.0.28",
  "serde",
  "serde_json",
@@ -3814,7 +3829,7 @@ dependencies = [
 
 [[package]]
 name = "graph"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "Inflector",
  "ahash",
@@ -3825,8 +3840,8 @@ dependencies = [
  "async-stream",
  "async-trait",
  "atomic_refcell",
- "base64 0.21.7",
- "bigdecimal 0.1.2",
+ "base64",
+ "bigdecimal",
  "bs58 0.5.1",
  "bytes",
  "chrono",
@@ -3846,12 +3861,12 @@ dependencies = [
  "hex",
  "hex-literal",
  "http 0.2.12",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body-util",
  "hyper",
  "hyper-util",
  "indoc",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "lazy-regex",
  "lazy_static",
  "lru_time_cache",
@@ -3861,16 +3876,17 @@ 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",
+ "reqwest 0.12.23",
+ "rustls",
  "semver 1.0.28",
  "serde",
  "serde_derive",
@@ -3884,17 +3900,17 @@ dependencies = [
  "slog-envlogger",
  "slog-term",
  "sqlparser 0.57.0",
- "sqlparser 0.61.0",
+ "sqlparser 0.62.0",
  "stable-hash 0.3.4",
  "stable-hash 0.4.4",
  "strum_macros 0.28.0",
+ "tempfile",
  "thiserror 2.0.18",
- "tiny-keccak 1.5.0",
  "tokio",
  "tokio-retry",
  "tokio-stream",
  "tokio-util",
- "toml 1.1.0+spec-1.1.0",
+ "toml 1.1.2+spec-1.1.0",
  "tonic",
  "tonic-prost",
  "tonic-prost-build",
@@ -3905,7 +3921,7 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-common"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
@@ -3915,25 +3931,24 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-ethereum"
-version = "0.42.1"
+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.28",
  "serde",
  "thiserror 2.0.18",
- "tiny-keccak 1.5.0",
  "tokio",
  "tokio-stream",
  "tonic-prost-build",
@@ -3942,7 +3957,7 @@ dependencies = [
 
 [[package]]
 name = "graph-chain-near"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3959,7 +3974,7 @@ dependencies = [
 
 [[package]]
 name = "graph-core"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "alloy",
  "anyhow",
@@ -3973,7 +3988,7 @@ dependencies = [
  "graph-chain-near",
  "graph-runtime-wasm",
  "indoc",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "parking_lot",
  "prometheus",
  "serde_yaml",
@@ -3990,7 +4005,7 @@ dependencies = [
 
 [[package]]
 name = "graph-graphql"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -4006,11 +4021,11 @@ dependencies = [
 
 [[package]]
 name = "graph-node"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "clap",
- "console 0.16.3",
+ "console 0.16.4",
  "diesel",
  "diesel-async",
  "env_logger",
@@ -4028,7 +4043,7 @@ dependencies = [
  "graphman",
  "graphman-server",
  "indicatif",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "json-structural-diff",
  "lazy_static",
  "prometheus",
@@ -4042,21 +4057,21 @@ dependencies = [
 
 [[package]]
 name = "graph-runtime-derive"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "graph-runtime-test"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "graph",
  "graph-chain-ethereum",
  "graph-runtime-wasm",
- "rand 0.9.2",
+ "rand 0.9.3",
  "semver 1.0.28",
  "test-store",
  "wasmtime",
@@ -4064,7 +4079,7 @@ dependencies = [
 
 [[package]]
 name = "graph-runtime-wasm"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4082,7 +4097,7 @@ dependencies = [
 
 [[package]]
 name = "graph-server-http"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "graph",
@@ -4093,10 +4108,10 @@ dependencies = [
 
 [[package]]
 name = "graph-server-index-node"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "async-trait",
- "blake3 1.8.4",
+ "blake3",
  "git-testament",
  "graph",
  "graph-chain-ethereum",
@@ -4106,7 +4121,7 @@ dependencies = [
 
 [[package]]
 name = "graph-server-json-rpc"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "axum",
  "graph",
@@ -4119,20 +4134,20 @@ dependencies = [
 
 [[package]]
 name = "graph-server-metrics"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "graph",
 ]
 
 [[package]]
 name = "graph-store-postgres"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "Inflector",
  "anyhow",
  "arrow",
  "async-trait",
- "blake3 1.8.4",
+ "blake3",
  "chrono",
  "clap",
  "deadpool 0.13.0",
@@ -4148,7 +4163,7 @@ dependencies = [
  "graph",
  "graphman-store",
  "hex",
- "itertools 0.14.0",
+ "itertools 0.15.0",
  "lazy_static",
  "lru_time_cache",
  "openssl",
@@ -4156,11 +4171,11 @@ dependencies = [
  "postgres",
  "postgres-openssl",
  "pretty_assertions",
- "rand 0.9.2",
+ "rand 0.9.3",
  "serde",
  "serde_json",
  "serde_yaml",
- "sqlparser 0.61.0",
+ "sqlparser 0.62.0",
  "stable-hash 0.3.4",
  "thiserror 2.0.18",
  "tokio",
@@ -4169,7 +4184,7 @@ dependencies = [
 
 [[package]]
 name = "graph-tests"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -4195,17 +4210,17 @@ dependencies = [
 
 [[package]]
 name = "graph_derive"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "proc-macro-utils",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "graphman"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "diesel",
@@ -4213,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.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-graphql",
@@ -4234,19 +4249,19 @@ 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.42.1"
+version = "0.45.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4284,17 +4299,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
+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",
@@ -4307,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",
@@ -4348,7 +4363,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "foldhash 0.1.5",
- "serde",
 ]
 
 [[package]]
@@ -4360,6 +4374,15 @@ 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",
  "serde_core",
 ]
@@ -4410,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]]
@@ -4450,9 +4473,9 @@ 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",
@@ -4465,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]]
@@ -4476,7 +4499,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body",
  "pin-project-lite",
 ]
@@ -4510,16 +4533,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
  "atomic-waker",
  "bytes",
  "futures-channel",
  "futures-core",
  "h2",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body",
  "httparse",
  "httpdate",
@@ -4537,16 +4560,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
- "http 1.4.0",
+ "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]]
@@ -4584,18 +4605,18 @@ version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.4.0",
+ "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)",
@@ -4633,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",
 ]
 
@@ -4754,14 +4775,14 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "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"
@@ -4823,24 +4844,24 @@ 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.4"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb"
+checksum = "993f007684f2e9727160da8b960ec161264703bfd1af084fd2e34d040c9a0dd4"
 dependencies = [
- "console 0.16.3",
+ "console 0.16.4",
  "portable-atomic",
  "unicode-width",
  "unit-prefix",
@@ -4862,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",
 ]
@@ -4882,7 +4903,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6654738b8024300cf062d04a1c13c10c8e2cea598ec1c47dc9b6641159429756"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "crossterm",
  "dyn-clone",
  "fuzzy-matcher",
@@ -4890,12 +4911,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "integer-encoding"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
-
 [[package]]
 name = "interprocess"
 version = "2.2.3"
@@ -4917,16 +4932,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -4990,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"
@@ -5037,7 +5051,51 @@ checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.61",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5051,11 +5109,12 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
@@ -5092,7 +5151,7 @@ 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",
@@ -5102,18 +5161,19 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
+checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa"
 dependencies = [
- "cpufeatures 0.2.12",
+ "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",
@@ -5159,7 +5219,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5239,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"
@@ -5255,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",
 ]
 
@@ -5267,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"
@@ -5330,22 +5390,19 @@ dependencies = [
 
 [[package]]
 name = "mach2"
-version = "0.4.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
+checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
 
 [[package]]
 name = "macro-string"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
+checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5366,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",
 ]
 
@@ -5378,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]]
@@ -5453,7 +5510,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http 1.4.0",
+ "http 1.4.2",
  "httparse",
  "memchr",
  "mime",
@@ -5474,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]]
@@ -5511,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",
@@ -5634,7 +5702,7 @@ checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5645,7 +5713,7 @@ checksum = "7b5676b5c379cf5b03da1df2b3061c4a4e2aa691086a56ac923e08c143f53f59"
 dependencies = [
  "alloy-rlp",
  "arbitrary",
- "cfg-if 1.0.0",
+ "cfg-if",
  "proptest",
  "ruint",
  "serde",
@@ -5654,41 +5722,42 @@ 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.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622acbc9100d3c10e2ee15804b0caa40e55c933d5aa53814cd520805b7958a49"
+checksum = "765784b4390c6bcf80316e5a22f4e3661b639c9d8c83246856643c27d8ce9dbe"
 dependencies = [
  "async-trait",
- "base64 0.22.1",
+ "aws-lc-rs",
+ "base64",
  "bytes",
  "chrono",
  "form_urlencoded",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body-util",
  "humantime",
  "hyper",
- "itertools 0.14.0",
+ "itertools 0.15.0",
+ "nix",
  "parking_lot",
  "percent-encoding",
  "quick-xml",
- "rand 0.10.0",
- "reqwest",
- "ring",
+ "rand 0.10.1",
+ "reqwest 0.13.2",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -5700,6 +5769,7 @@ dependencies = [
  "walkdir",
  "wasm-bindgen-futures",
  "web-time",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5716,26 +5786,24 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "open"
-version = "5.3.3"
+version = "5.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc"
+checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a"
 dependencies = [
  "is-wsl",
  "libc",
- "pathdiff",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.76"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf"
+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",
 ]
@@ -5748,7 +5816,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5768,9 +5836,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.112"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
@@ -5785,22 +5853,13 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "parity-scale-codec"
 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",
@@ -5848,18 +5907,18 @@ 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 = "58.1.0"
+version = "59.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3f9f2205199603564127932b89695f52b62322f541d0fc7179d57c2e1c9877"
+checksum = "970dff83e97d953c827ae8176f6bf4e9f77bf62daacc01ec5df348ec5eacd913"
 dependencies = [
  "ahash",
  "arrow-array",
@@ -5868,13 +5927,13 @@ dependencies = [
  "arrow-ipc",
  "arrow-schema",
  "arrow-select",
- "base64 0.22.1",
+ "base64",
  "brotli",
  "bytes",
  "chrono",
  "flate2",
  "half",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
  "lz4_flex",
  "num-bigint 0.4.6",
  "num-integer",
@@ -5883,7 +5942,6 @@ dependencies = [
  "seq-macro",
  "simdutf8",
  "snap",
- "thrift",
  "twox-hash",
  "zstd",
 ]
@@ -5894,12 +5952,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -5937,7 +5989,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5951,15 +6003,25 @@ dependencies = [
  "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]]
 name = "petgraph"
 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",
 ]
 
@@ -6020,7 +6082,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6057,12 +6119,12 @@ 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]]
@@ -6082,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",
@@ -6108,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",
@@ -6124,14 +6186,14 @@ 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",
+ "rand 0.9.3",
  "sha2 0.10.9",
  "stringprep",
 ]
@@ -6198,7 +6260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6219,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",
 ]
 
@@ -6229,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]]
@@ -6251,7 +6313,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6280,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",
 ]
 
@@ -6299,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",
@@ -6318,25 +6380,25 @@ checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "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.117",
+ "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",
@@ -6349,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.117",
+ "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.117",
+ "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",
 ]
@@ -6403,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",
@@ -6436,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",
 ]
@@ -6452,25 +6514,25 @@ dependencies = [
 
 [[package]]
 name = "pulley-interpreter"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beafc309a2d35e16cc390644d88d14dfa45e45e15075ec6a9e37f6dfb43e926f"
+checksum = "38b92604caae1a1899b6a5b54967289dd538177c626004c91accf9d0ec7e4a12"
 dependencies = [
  "cranelift-bitset",
  "log",
  "pulley-macros",
- "wasmtime-internal-math",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "pulley-macros"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885fbb6c07454cfc8725a18a1da3cfc328ee8c53fb8d0671ea313edc8567947"
+checksum = "5a7ac85c0bb3fb351f10d531230aaa5e366b46d7c4e5328e5f02801d6dac1165"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6481,9 +6543,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-xml"
-version = "0.39.2"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "2474bd2e5029e7ccb6abb2ba48cf2383a333851dedf495901544281590c7da7f"
 dependencies = [
  "memchr",
  "serde",
@@ -6491,19 +6553,22 @@ 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]]
@@ -6512,12 +6577,13 @@ version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
+ "aws-lc-rs",
  "bytes",
  "getrandom 0.3.1",
  "lru-slab",
- "rand 0.9.2",
+ "rand 0.9.3",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "rustls",
  "rustls-pki-types",
  "slab",
@@ -6529,22 +6595,23 @@ dependencies = [
 
 [[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.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -6574,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",
@@ -6586,9 +6653,9 @@ 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",
@@ -6597,9 +6664,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
  "chacha20",
  "getrandom 0.4.2",
@@ -6706,7 +6773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
 dependencies = [
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6717,16 +6784,16 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redis"
-version = "1.1.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e41a79ae5cbb41257d84cf4cf0db0bb5a95b11bf05c62c351de4fe748620d"
+checksum = "a12e6b5f4d8ef33944e833e2b1859ad478deab6e431d7337b30ee2efe21f7543"
 dependencies = [
  "arc-swap",
  "arcstr",
  "async-lock",
  "backon",
  "bytes",
- "cfg-if 1.0.0",
+ "cfg-if",
  "combine",
  "futures-channel",
  "futures-util",
@@ -6736,7 +6803,7 @@ dependencies = [
  "pin-project-lite",
  "ryu",
  "sha1_smol",
- "socket2 0.6.0",
+ "socket2",
  "tokio",
  "tokio-util",
  "url",
@@ -6758,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]]
@@ -6772,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.13.5"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08effbc1fa53aaebff69521a5c05640523fab037b34a4a2c109506bc938246fa"
+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",
@@ -6811,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"
@@ -6822,14 +6910,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
 dependencies = [
  "async-compression",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "encoding_rs",
  "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -6843,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",
@@ -6853,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",
  "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]]
@@ -6883,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",
@@ -6920,8 +7044,8 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.6",
+ "rand 0.9.3",
  "rlp",
  "ruint-macro",
  "serde_core",
@@ -6941,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"
@@ -6983,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",
@@ -6992,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",
@@ -7020,54 +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"
-dependencies = [
- "web-time",
-]
+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",
@@ -7125,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]]
@@ -7161,11 +7300,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
- "secp256k1-sys",
+ "rand 0.8.6",
+ "secp256k1-sys 0.10.1",
  "serde",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
+dependencies = [
+ "bitcoin_hashes",
+ "rand 0.9.3",
+ "secp256k1-sys 0.11.0",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.10.1"
@@ -7175,13 +7325,22 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 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",
@@ -7190,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",
@@ -7203,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",
@@ -7253,9 +7412,9 @@ 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",
@@ -7263,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.117",
+ "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]]
@@ -7313,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",
@@ -7323,18 +7484,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876ac351060d4f882bb1032b6369eb0aef79ad9df1ea8bc404874d8cc3d0cd98"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
  "serde_core",
 ]
@@ -7353,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",
@@ -7371,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.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7387,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",
@@ -7410,7 +7564,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures 0.2.12",
  "digest 0.10.7",
 ]
@@ -7421,7 +7575,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures 0.3.0",
  "digest 0.11.2",
 ]
@@ -7438,7 +7592,7 @@ version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures 0.2.12",
  "digest 0.10.7",
 ]
@@ -7449,29 +7603,29 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
 dependencies = [
- "cfg-if 1.0.0",
+ "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]]
@@ -7543,9 +7697,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "similar"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d0b06eba54f0ca0770f970a3e89823e766ca638dd940f8469fa0fa50c75396"
+checksum = "e6505efef05804732ed8a3f2d4f279429eb485bd69d5b0cc6b19cc02005cda16"
 dependencies = [
  "bstr",
 ]
@@ -7641,9 +7795,9 @@ 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",
@@ -7655,16 +7809,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "socket2"
 version = "0.6.0"
@@ -7704,9 +7848,9 @@ dependencies = [
 
 [[package]]
 name = "sqlparser"
-version = "0.61.0"
+version = "0.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7"
+checksum = "13c6d1b651dc4edf07eead2a0c6c78016ce971bc2c10da5266861b13f25e7cec"
 dependencies = [
  "log",
  "recursive",
@@ -7721,7 +7865,7 @@ checksum = "da5fc6819faabb412da764b99d3b713bb55083c11e7e0c00144d386cd6a1939c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7732,15 +7876,15 @@ checksum = "a6dd45d8fc1c79299bfbb7190e42ccbbdf6a5f52e4a6ad98d92357ea965bd289"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "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",
@@ -7751,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",
 ]
 
@@ -7776,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",
@@ -7838,7 +7982,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7850,7 +7994,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7872,9 +8016,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7883,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.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7910,7 +8054,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7919,7 +8063,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -7948,21 +8092,21 @@ 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.12.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
- "cfg-if 1.0.0",
  "fastrand",
+ "getrandom 0.4.2",
  "once_cell",
- "rustix 0.38.34",
- "windows-sys 0.59.0",
+ "rustix 1.1.4",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7987,17 +8131,17 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 1.0.7",
- "windows-sys 0.61.1",
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "test-store"
-version = "0.42.1"
+version = "0.45.0"
 dependencies = [
  "async-trait",
  "diesel",
@@ -8042,7 +8186,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8053,7 +8197,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8062,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",
 ]
 
@@ -8075,17 +8219,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "thrift"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09"
-dependencies = [
- "byteorder",
- "integer-encoding",
- "ordered-float",
-]
-
 [[package]]
 name = "time"
 version = "0.3.47"
@@ -8117,15 +8250,6 @@ dependencies = [
  "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"
@@ -8172,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]]
@@ -8185,7 +8309,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8229,8 +8353,8 @@ dependencies = [
  "pin-project-lite",
  "postgres-protocol",
  "postgres-types",
- "rand 0.9.2",
- "socket2 0.6.0",
+ "rand 0.9.3",
+ "socket2",
  "tokio",
  "tokio-util",
  "whoami",
@@ -8238,12 +8362,12 @@ dependencies = [
 
 [[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",
 ]
 
@@ -8284,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",
@@ -8294,20 +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",
+ "tungstenite 0.29.0",
 ]
 
 [[package]]
@@ -8324,41 +8448,31 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
-dependencies = [
- "serde",
- "serde_spanned 0.6.6",
- "toml_datetime 0.6.6",
- "toml_edit 0.22.16",
-]
-
 [[package]]
 name = "toml"
 version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.1.0",
+ "serde_spanned",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
+ "toml_writer",
  "winnow 0.7.13",
 ]
 
 [[package]]
 name = "toml"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8195ca05e4eb728f4ba94f3e3291661320af739c4e43779cbdfae82ab239fcc"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "serde_core",
- "serde_spanned 1.1.0",
- "toml_datetime 1.1.0+spec-1.1.0",
+ "serde_spanned",
+ "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
  "winnow 1.0.0",
@@ -8369,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"
@@ -8384,9 +8495,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
@@ -8397,52 +8508,39 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "toml_datetime 0.6.6",
  "winnow 0.5.40",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.22.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
-dependencies = [
- "indexmap 2.11.4",
- "serde",
- "serde_spanned 0.6.6",
- "toml_datetime 0.6.6",
- "winnow 0.6.13",
-]
-
 [[package]]
 name = "toml_parser"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
  "winnow 1.0.0",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d282ade6016312faf3e41e57ebbba0c073e4056dab1232ab1cb624199648f8ed"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tonic"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec"
+checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef"
 dependencies = [
  "async-trait",
  "axum",
- "base64 0.22.1",
+ "base64",
  "bytes",
  "flate2",
  "h2",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -8450,8 +8548,8 @@ dependencies = [
  "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",
@@ -8464,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.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "tonic-prost"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309"
+checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0"
 dependencies = [
  "bytes",
  "prost",
@@ -8487,16 +8585,16 @@ dependencies = [
 
 [[package]]
 name = "tonic-prost-build"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3144df636917574672e93d0f56d7edec49f90305749c668df5101751bb8f95a"
+checksum = "654e5643eff75d7f8c99197ce1440ed19a3474eada74c12bbac488b2cafdae27"
 dependencies = [
  "prettyplease",
  "proc-macro2",
  "prost-build",
  "prost-types",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "tempfile",
  "tonic-build",
 ]
@@ -8510,7 +8608,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -8524,12 +8622,12 @@ dependencies = [
 [[package]]
 name = "tower"
 version = "0.5.3"
-source = "git+https://github.com/tower-rs/tower.git#251296dc54a044383dffd16d2179b443e2615672"
+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",
@@ -8542,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 1.4.2",
  "http-body",
- "iri-string",
  "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]]
@@ -8567,7 +8680,7 @@ checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
-source = "git+https://github.com/tower-rs/tower.git#251296dc54a044383dffd16d2179b443e2615672"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 
 [[package]]
 name = "tower-service"
@@ -8578,12 +8691,12 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 [[package]]
 name = "tower-service"
 version = "0.3.3"
-source = "git+https://github.com/tower-rs/tower.git#251296dc54a044383dffd16d2179b443e2615672"
+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#251296dc54a044383dffd16d2179b443e2615672"
+source = "git+https://github.com/tower-rs/tower.git#df06d70dbea345facbffb5881fe8647f53bf424d"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -8612,7 +8725,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8632,16 +8745,16 @@ 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 0.10.6",
@@ -8651,19 +8764,18 @@ dependencies = [
 
 [[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",
+ "rand 0.9.3",
  "sha1 0.10.6",
  "thiserror 2.0.18",
- "utf-8",
 ]
 
 [[package]]
@@ -8686,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",
@@ -8780,12 +8892,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "unsigned-varint"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
-
 [[package]]
 name = "unsigned-varint"
 version = "0.8.0"
@@ -8928,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.117",
  "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",
@@ -8976,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.117",
- "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.239.0"
+name = "wasm-compose"
+version = "0.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be00faa2b4950c76fe618c409d2c3ea5a3c9422013e079482d78544bb2d184c"
+checksum = "b089037d7eb453ed57b560fe7833de0707411c8b9fdc429745ced77e2a1bacb9"
 dependencies = [
- "leb128fmt",
- "wasmparser 0.239.0",
+ "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]]
@@ -9016,11 +9114,31 @@ 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",
 ]
@@ -9032,7 +9150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "wasm-encoder 0.244.0",
  "wasmparser 0.244.0",
 ]
@@ -9050,70 +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",
+ "indexmap 2.14.0",
  "semver 1.0.28",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.239.0"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "hashbrown 0.15.2",
- "indexmap 2.11.4",
+ "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",
- "hashbrown 0.15.2",
- "indexmap 2.11.4",
+ "bitflags 2.11.1",
+ "indexmap 2.14.0",
  "semver 1.0.28",
 ]
 
 [[package]]
 name = "wasmprinter"
-version = "0.239.0"
+version = "0.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3981f3d51f39f24f5fc90f93049a90f08dbbca8deba602cd46bb8ca67a94718"
+checksum = "8798c1a699bd25648b6708eefe94d97c6f9891febb94b42cca1f7a4b086ea64e"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser 0.239.0",
+ "wasmparser 0.251.0",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81eafc07c867be94c47e0dc66355d9785e09107a18901f76a20701ba0663ad7"
+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",
@@ -9124,44 +9264,47 @@ dependencies = [
  "postcard",
  "pulley-interpreter",
  "rayon",
- "rustix 1.0.7",
+ "rustix 1.1.4",
  "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "smallvec",
  "target-lexicon",
- "wasm-encoder 0.239.0",
- "wasmparser 0.239.0",
+ "tempfile",
+ "wasm-compose",
+ "wasm-encoder 0.251.0",
+ "wasmparser 0.251.0",
  "wasmtime-environ",
  "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 = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78587abe085a44a13c90fa16fea6db014e9883e627a7044d7f0cb397ad08d1da"
+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",
@@ -9169,63 +9312,76 @@ dependencies = [
  "semver 1.0.28",
  "serde",
  "serde_derive",
+ "sha2 0.10.9",
  "smallvec",
  "target-lexicon",
- "wasm-encoder 0.239.0",
- "wasmparser 0.239.0",
+ "wasm-encoder 0.251.0",
+ "wasmparser 0.251.0",
  "wasmprinter",
  "wasmtime-internal-component-util",
+ "wasmtime-internal-core",
 ]
 
 [[package]]
 name = "wasmtime-internal-cache"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78fb9299e318b0af3efb75d88321515a20a5ccb040bcde1f0f7d46d656fa8fef"
+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 0.10.9",
- "toml 0.8.15",
- "windows-sys 0.60.2",
+ "toml 0.9.12+spec-1.1.0",
+ "wasmtime-environ",
+ "windows-sys 0.61.2",
  "zstd",
 ]
 
 [[package]]
 name = "wasmtime-internal-component-macro"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d843bb444f2d1509ea9304ad749242d1fa5de95cde67665bfcdcafa0f360925c"
+checksum = "f1e48f8d4966d62a10b6d70722bc432c1e163890be2801d3b5784589ad36ffc3"
 dependencies = [
  "anyhow",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "wasmtime-internal-component-util",
  "wasmtime-internal-wit-bindgen",
- "wit-parser 0.239.0",
+ "wit-parser 0.251.0",
 ]
 
 [[package]]
 name = "wasmtime-internal-component-util"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801ee1a80ab66f065a88c6a62f2d495d5540d027b366757c6a53e9c42f153aef"
+checksum = "819ad5abd5822a22dbf4014475cdfd1fe790707761cd732d74aaa3ba4d5ba489"
 
 [[package]]
-name = "wasmtime-internal-cranelift"
-version = "38.0.4"
+name = "wasmtime-internal-core"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb50f1c50365c32e557266ca85acdf77696c44a3f98797ba6af58cebc6d6d1e"
+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",
@@ -9239,120 +9395,87 @@ dependencies = [
  "smallvec",
  "target-lexicon",
  "thiserror 2.0.18",
- "wasmparser 0.239.0",
+ "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 = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9308cdb17f8d51e3164185616d809e28c29a6515c03b9dd95c89436b71f6d154"
+checksum = "18a1d3a39d0d210f6b8574ee96a4315e0a14c67f3a1fc3cd5372cb10d2fb4422"
 dependencies = [
- "anyhow",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "rustix 1.0.7",
+ "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 = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c9b63a22bf2a8b6a149a41c6768bc17a8b2e3288a249cb8216987fbd7128e81"
+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 = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb8e042b6e3de2f3d708279f89f50b4b9aa1b9bab177300cdffb0ffcd2816df5"
+checksum = "eba651d44ab0faad4c58106b3adb45068189fb65ef50f0c404b6d9e3bf81a357"
 dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "wasmtime-internal-math"
-version = "38.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1f0674f38cd7d014eb1a49ea1d1766cca1a64459e8856ee118a10005302e16"
-dependencies = [
- "libm",
+ "wasmtime-internal-core",
+ "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "wasmtime-internal-slab"
-version = "38.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb24b7535306713e7a250f8b71e35f05b6a5031bf9c3ed7330c308e899cbe7d3"
-
 [[package]]
 name = "wasmtime-internal-unwinder"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d5a80e2623a49cb8e8c419542337b8fe0260b162c40dcc201080a84cbe9b7c"
+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 = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e277f734b9256359b21517c3b0c26a2a9de6c53a51b670ae55cdcde548bf4e"
+checksum = "e747f4a074699ba1b4e4d841fb263f9b7df5bd1555181c4752bf5990d21ba676"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "wasmtime-internal-winch"
-version = "38.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4dc9333737142f6ece4369c8bcdda03a11edbd43d8fbd3e15004c194b9b743"
-dependencies = [
- "anyhow",
- "cranelift-codegen",
- "gimli",
- "log",
- "object",
- "target-lexicon",
- "wasmparser 0.239.0",
- "wasmtime-environ",
- "wasmtime-internal-cranelift",
- "winch-codegen",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "wasmtime-internal-wit-bindgen"
-version = "38.0.4"
+version = "46.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f758625553fe33fdce0713f63bb7784c4f5fecb7f7cd4813414519ec24b6a4c"
+checksum = "80009f46991622814196d96fac6fc0a938f46b5cba737a8f4e21e24e5a03856f"
 dependencies = [
  "anyhow",
- "bitflags 2.9.0",
+ "bitflags 2.11.1",
  "heck 0.5.0",
- "indexmap 2.11.4",
- "wit-parser 0.239.0",
+ "indexmap 2.14.0",
+ "wit-parser 0.251.0",
 ]
 
 [[package]]
@@ -9371,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",
@@ -9411,6 +9534,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.11"
@@ -9489,26 +9621,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winch-codegen"
-version = "38.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c0bb17ae9bf89ebc74512150e6ee0a27b1eac5ff3b54d8cec264f4b4255022d"
-dependencies = [
- "anyhow",
- "cranelift-assembler-x64",
- "cranelift-codegen",
- "gimli",
- "regalloc2",
- "smallvec",
- "target-lexicon",
- "thiserror 2.0.18",
- "wasmparser 0.239.0",
- "wasmtime-environ",
- "wasmtime-internal-cranelift",
- "wasmtime-internal-math",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -9526,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"
@@ -9559,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"
@@ -9597,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 = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows-link 0.2.0",
+ "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]]
@@ -9652,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"
@@ -9670,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"
@@ -9688,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"
@@ -9718,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"
@@ -9736,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"
@@ -9754,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"
@@ -9772,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"
@@ -9799,29 +9977,20 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-dependencies = [
- "memchr",
-]
 
 [[package]]
 name = "winnow"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "wiremock"
@@ -9830,10 +9999,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031"
 dependencies = [
  "assert-json-diff",
- "base64 0.22.1",
+ "base64",
  "deadpool 0.12.3",
  "futures 0.3.31",
- "http 1.4.0",
+ "http 1.4.2",
  "http-body-util",
  "hyper",
  "hyper-util",
@@ -9872,7 +10041,7 @@ 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]]
@@ -9883,9 +10052,9 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "prettyplease",
- "syn 2.0.117",
+ "syn 2.0.118",
  "wasm-metadata",
  "wit-bindgen-core",
  "wit-component",
@@ -9901,7 +10070,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "wit-bindgen-core",
  "wit-bindgen-rust",
 ]
@@ -9913,8 +10082,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.9.0",
- "indexmap 2.11.4",
+ "bitflags 2.11.1",
+ "indexmap 2.14.0",
  "log",
  "serde",
  "serde_derive",
@@ -9927,38 +10096,39 @@ dependencies = [
 
 [[package]]
 name = "wit-parser"
-version = "0.239.0"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c92c939d667b7bf0c6bf2d1f67196529758f99a2a45a3355cc56964fd5315d"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.239.0",
+ "wasmparser 0.244.0",
 ]
 
 [[package]]
 name = "wit-parser"
-version = "0.244.0"
+version = "0.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+checksum = "e960732e824fab95099971a09e638979347c94ca48568d3c854c945729196947"
 dependencies = [
  "anyhow",
+ "hashbrown 0.17.0",
  "id-arena",
- "indexmap 2.11.4",
+ "indexmap 2.14.0",
  "log",
  "semver 1.0.28",
  "serde",
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.244.0",
+ "wasmparser 0.251.0",
 ]
 
 [[package]]
@@ -10033,7 +10203,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "synstructure",
 ]
 
@@ -10054,7 +10224,7 @@ checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -10074,7 +10244,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
  "synstructure",
 ]
 
@@ -10095,7 +10265,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -10117,7 +10287,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -10126,6 +10296,12 @@ 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 cfe09925a4a..a956a514a95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,8 @@ members = [
 ]
 
 [workspace.package]
-version = "0.42.1"
-edition = "2021"
+version = "0.45.0"
+edition = "2024"
 authors = ["The Graph core developers & contributors"]
 readme = "README.md"
 homepage = "https://thegraph.com"
@@ -35,13 +35,18 @@ repository = "https://github.com/graphprotocol/graph-node"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
-alloy = { version = "1.7.3", 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"
+axum = "0.8.9"
 chrono = "0.4.44"
 bs58 = "0.5.1"
 clap = { version = "4.5.4", features = ["derive", "env", "wrap_help"] }
@@ -56,11 +61,11 @@ diesel = { version = "2.2.7", features = [
     "chrono",
     "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ] }
-diesel-async = { version = "0.8.0", 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.7"
-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"
@@ -73,11 +78,11 @@ graphman-store = { path = "./core/graphman_store" }
 graphql-tools = "0.5.1"
 indicatif = "0.18"
 Inflector = "0.11.3"
-itertools = "0.14.0"
+itertools = "0.15.0"
 lazy_static = "1.5.0"
 prost = "0.14"
 prost-types = "0.14"
-redis = { version = "1.1.0", features = [
+redis = { version = "1.2.2", features = [
     "aio",
     "connection-manager",
     "tokio-comp",
@@ -93,7 +98,7 @@ serde_yaml = "0.9.21"
 slog = { version = "2.8.2", features = ["release_max_level_trace", "max_level_trace"] }
 slog-async = "2.5.0"
 slog-term = "2.7.0"
-sqlparser = { version = "0.61.0", features = ["visitor"] }
+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" }
@@ -106,19 +111,19 @@ 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 = "38.0.4", 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 = "=58.1.0" }
-arrow-flight = { version = "=58.1.0", features = ["flight-sql-experimental"] }
-parquet = { version = "=58.1.0" }
+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"
diff --git a/NEWS.md b/NEWS.md
index 1c8682503af..8068ecbc9fa 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,148 @@
 # 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
diff --git a/README.md b/README.md
index f5c3416ce29..667c606a045 100644
--- a/README.md
+++ b/README.md
@@ -115,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 c9a125136bf..a9c9d42a124 100644
--- a/chain/ethereum/Cargo.toml
+++ b/chain/ethereum/Cargo.toml
@@ -12,7 +12,6 @@ serde = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 anyhow = "1.0"
-tiny-keccak = "1.5.0"
 hex = "0.4.3"
 semver = { workspace = true }
 thiserror = { workspace = true }
@@ -21,7 +20,7 @@ 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 5f7fb7d84c0..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,15 +352,113 @@ 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> {
@@ -458,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,
@@ -479,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,
@@ -505,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;
@@ -523,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.
@@ -555,15 +663,15 @@ impl EthereumLogFilter {
         // 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
@@ -1186,7 +1294,7 @@ pub trait EthereumAdapter: Send + Sync + 'static {
 
 #[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};
@@ -1194,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;
@@ -1264,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()],
         };
 
@@ -1282,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]]))),
@@ -1335,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,
@@ -1405,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(),
@@ -1421,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,
@@ -1651,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))]),
@@ -1757,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,
@@ -1769,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(ENV_VARS.get_logs_max_contracts)
-            .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!(
@@ -1840,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);
@@ -1875,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![];
 
@@ -1980,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 ef0b85fc293..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,
 };
@@ -57,21 +58,32 @@ const RPC_EXECUTION_ERRORS: &[&str] = &[
     "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.
+/// Helper that checks if a RPC error message corresponds to a revert.
 fn is_rpc_revert_message(message: &str) -> bool {
-    let env_geth_call_errors = ENV_VARS.geth_eth_call_errors.iter();
+    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..])
@@ -93,10 +105,10 @@ pub fn interpret_eth_call_error(
         Ok(call::Retval::Null)
     }
 
-    if let RpcError::ErrorResp(rpc_error) = &err {
-        if is_rpc_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 {
@@ -106,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 ee7d45ca2a6..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,9 +60,7 @@ 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,
@@ -396,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;
             }
@@ -581,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
@@ -815,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 {
@@ -1062,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?;
@@ -1260,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))
@@ -1372,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 8a73ce83136..b40bcd11910 100644
--- a/chain/ethereum/src/codec.rs
+++ b/chain/ethereum/src/codec.rs
@@ -12,15 +12,15 @@ use graph::{
         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},
         },
-        BlockNumber, Error, EthereumBlock, EthereumBlockWithCalls, EthereumCall,
-        LightEthereumBlock,
     },
 };
 use std::sync::Arc;
@@ -162,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
@@ -241,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 },
             });
@@ -451,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
         })
@@ -528,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 {
@@ -650,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,
diff --git a/chain/ethereum/src/data_source.rs b/chain/ethereum/src/data_source.rs
index b2303b6d053..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"];
@@ -446,7 +446,7 @@ fn create_dummy_transaction(
 ) -> Result<AnyTransaction, anyhow::Error> {
     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,
     };
 
@@ -468,6 +468,7 @@ fn create_dummy_transaction(
         inner: recovered,
         block_hash: Some(block_hash),
         block_number: Some(block_number),
+        block_timestamp: None,
         transaction_index,
         effective_gas_price: None,
     })
@@ -1589,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 e58055a97a7..9c85f0ac551 100644
--- a/chain/ethereum/src/ethereum_adapter.rs
+++ b/chain/ethereum/src/ethereum_adapter.rs
@@ -3,24 +3,24 @@ 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::derive::CheapClone;
-use graph::futures01::stream;
 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::{
@@ -28,15 +28,15 @@ use graph::prelude::{
         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},
     },
@@ -44,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, 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;
@@ -61,6 +62,9 @@ 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;
@@ -68,17 +72,14 @@ 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<
@@ -173,13 +174,11 @@ impl EthereumAdapter {
             Transport::RPC(client) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_client(client.clone()),
             ),
             Transport::IPC(ipc_connect) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_ipc(ipc_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum IPC"),
@@ -187,7 +186,6 @@ impl EthereumAdapter {
             Transport::WS(ws_connect) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_ws(ws_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum WS"),
@@ -1014,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<_, _>>();
 
@@ -1053,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<_>>()
         });
@@ -1126,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);
@@ -1140,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);
@@ -1587,15 +1569,26 @@ impl EthereumAdapterTrait for EthereumAdapter {
 
         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
+                ),
             }
         }
 
@@ -2001,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.
@@ -2042,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,
             ));
         }
     }
@@ -2125,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()
@@ -2696,15 +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::AnyNetworkBare;
-    use graph::prelude::alloy::primitives::{Address, Bytes, B256};
-    use graph::prelude::alloy::providers::mock::Asserter;
+    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;
@@ -2779,7 +2776,6 @@ mod tests {
             let asserter = Asserter::new();
             let provider = ProviderBuilder::<_, _, AnyNetworkBare>::default()
                 .network::<AnyNetworkBare>()
-                .with_recommended_fillers()
                 .connect_mocked_client(asserter.clone());
 
             asserter.push_success(&json_value);
@@ -2919,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 e2d469a3954..dcbcc42c6f8 100644
--- a/chain/ethereum/src/ingestor.rs
+++ b/chain/ethereum/src/ingestor.rs
@@ -1,9 +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 futures::future::select_ok;
-use graph::blockchain::client::ChainClient;
 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;
@@ -12,8 +12,8 @@ use graph::{
     blockchain::{BlockHash, BlockIngestor, BlockPtr, IngestorError},
     cheap_clone::CheapClone,
     prelude::{
-        debug, 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};
@@ -281,10 +281,10 @@ async fn on_poll_failure<A: crate::EthereumAdapterTrait>(
     // 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 {
-        if current.is_reachable().await {
-            return;
-        }
+    if let Some(current) = current
+        && current.is_reachable().await
+    {
+        return;
     }
 
     // Probe all alternatives in parallel; switch to the first that responds.
@@ -378,7 +378,7 @@ mod tests {
     use graph::components::ethereum::LightEthereumBlock;
     use graph::data::store::ethereum::call;
     use graph::data_source::common::ContractCall;
-    use graph::prelude::alloy::primitives::{Address, Bytes, B256, U256};
+    use graph::prelude::alloy::primitives::{Address, B256, Bytes, U256};
     use graph::prelude::{BlockNumber, Error, EthereumCallCache, Logger};
     use graph::slog::Discard;
     use std::collections::HashSet;
diff --git a/chain/ethereum/src/network.rs b/chain/ethereum/src/network.rs
index efd6bc6d317..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,
         );
 
@@ -329,14 +329,14 @@ mod tests {
         endpoint::EndpointMetrics,
         firehose::SubgraphLimit,
         prelude::MetricsRegistry,
-        slog::{o, Discard, Logger},
+        slog::{Discard, Logger, o},
         url::Url,
     };
     use std::sync::Arc;
 
     use crate::{
-        chain::ChainSettings, Compression, EthereumAdapter, EthereumAdapterTrait,
-        ProviderEthRpcMetrics, Transport,
+        Compression, EthereumAdapter, EthereumAdapterTrait, ProviderEthRpcMetrics, Transport,
+        chain::ChainSettings,
     };
 
     use super::{EthereumNetworkAdapter, EthereumNetworkAdapters, NodeCapabilities};
@@ -465,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
diff --git a/chain/ethereum/src/polling_block_stream.rs b/chain/ethereum/src/polling_block_stream.rs
index 55d2aed3df8..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.
@@ -569,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) => {
@@ -589,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 8f85866b3d4..4311fed3c48 100644
--- a/chain/ethereum/src/runtime/abi.rs
+++ b/chain/ethereum/src/runtime/abi.rs
@@ -12,8 +12,8 @@ use graph::prelude::alloy::rpc::types::{Log, TransactionReceipt};
 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;
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 ea5d63bc83b..5b5414c4a5d 100644
--- a/chain/ethereum/src/transport.rs
+++ b/chain/ethereum/src/transport.rs
@@ -265,12 +265,10 @@ impl Service<RequestPacket> for PatchingHttp {
                 ));
             }
 
-            if should_patch {
-                if 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))
-                    });
-                }
+            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)))
diff --git a/chain/ethereum/src/trigger.rs b/chain/ethereum/src/trigger.rs
index 6a5e1503073..b5d51d9a379 100644
--- a/chain/ethereum/src/trigger.rs
+++ b/chain/ethereum/src/trigger.rs
@@ -8,19 +8,19 @@ 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::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 93cf30252a6..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,7 +21,7 @@ use futures::future::BoxFuture;
 use graph::{
     cheap_clone::CheapClone, components::store::DeploymentLocator, log::factory::LoggerFactory,
 };
-use slog::{debug, error, info, warn, Logger};
+use slog::{Logger, debug, error, info, warn};
 use tokio::{
     sync::mpsc::{self, error::SendError},
     task::JoinHandle,
diff --git a/core/src/amp_subgraph/runner/context.rs b/core/src/amp_subgraph/runner/context.rs
index 8ea0bb9e1f1..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,
diff --git a/core/src/amp_subgraph/runner/data_processing.rs b/core/src/amp_subgraph/runner/data_processing.rs
index b9b2f20aba1..d5bf991d505 100644
--- a/core/src/amp_subgraph/runner/data_processing.rs
+++ b/core/src/amp_subgraph/runner/data_processing.rs
@@ -6,7 +6,7 @@ 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,
@@ -15,7 +15,7 @@ use graph::{
 };
 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>,
diff --git a/core/src/amp_subgraph/runner/data_stream.rs b/core/src/amp_subgraph/runner/data_stream.rs
index 1d7d9a11c4e..693ae9384a7 100644
--- a/core/src/amp_subgraph/runner/data_stream.rs
+++ b/core/src/amp_subgraph/runner/data_stream.rs
@@ -3,16 +3,16 @@ use std::{collections::HashMap, ops::RangeInclusive, sync::Arc};
 use alloy::primitives::BlockNumber;
 use anyhow::anyhow;
 use futures::{
-    stream::{self, 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,
@@ -152,10 +152,10 @@ where
             match result {
                 Ok(response) => {
                     if !start_block_checked {
-                        if let Some(((first_block, _), _)) = response.0.first_key_value() {
-                            if *first_block < start_block {
-                                return Err(Error::NonDeterministic(anyhow!("chain reorg")));
-                            }
+                        if let Some(((first_block, _), _)) = response.0.first_key_value()
+                            && *first_block < start_block
+                        {
+                            return Err(Error::NonDeterministic(anyhow!("chain reorg")));
                         }
 
                         start_block_checked = true;
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 e90b5c257c2..4e0e85294b6 100644
--- a/core/src/amp_subgraph/runner/mod.rs
+++ b/core/src/amp_subgraph/runner/mod.rs
@@ -119,11 +119,9 @@ where
             )
             .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;
             }
         }
 
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 d0e557905f6..cc42f7af5ea 100644
--- a/core/src/polling_monitor/arweave_service.rs
+++ b/core/src/polling_monitor/arweave_service.rs
@@ -8,7 +8,7 @@ use graph::{
     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>>>;
 
diff --git a/core/src/polling_monitor/ipfs_service.rs b/core/src/polling_monitor/ipfs_service.rs
index ef061530fd3..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>>>;
 
@@ -109,10 +109,10 @@ mod test {
     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::*;
 
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 07af703d7d7..affbc09aa0f 100644
--- a/core/src/subgraph/context/mod.rs
+++ b/core/src/subgraph/context/mod.rs
@@ -1,7 +1,7 @@
 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;
@@ -10,9 +10,9 @@ use graph::{
     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,
@@ -132,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);
             }
         }
 
diff --git a/core/src/subgraph/error.rs b/core/src/subgraph/error.rs
index 6aad9f7cb3e..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 {}
 
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 8273b0045cf..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";
diff --git a/core/src/subgraph/registrar.rs b/core/src/subgraph/registrar.rs
index d718b4131f1..e9422671e25 100644
--- a/core/src/subgraph/registrar.rs
+++ b/core/src/subgraph/registrar.rs
@@ -10,12 +10,12 @@ use graph::components::{
     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> {
@@ -420,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))
diff --git a/core/src/subgraph/runner/mod.rs b/core/src/subgraph/runner/mod.rs
index 1a6efbc1d6c..026be3dfc27 100644
--- a/core/src/subgraph/runner/mod.rs
+++ b/core/src/subgraph/runner/mod.rs
@@ -29,19 +29,19 @@ use graph::components::{
 use graph::data::store::scalar::Bytes;
 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 _, 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;
@@ -109,6 +109,7 @@ where
                 ),
                 entity_lfu_cache: LfuCache::new(),
                 cached_head_ptr: None,
+                postponed_indexes_created: false,
             },
             logger,
             metrics,
@@ -290,16 +291,16 @@ 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(RunnerState::Stopped {
-                        reason: StopReason::MaxEndBlockReached,
-                    });
-                }
+                self.inputs.store.flush().await?;
+                return Ok(RunnerState::Stopped {
+                    reason: StopReason::MaxEndBlockReached,
+                });
             }
         }
 
@@ -736,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(
@@ -1303,32 +1319,34 @@ 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)
diff --git a/core/src/subgraph/runner/state.rs b/core/src/subgraph/runner/state.rs
index 01ad9648341..d6401842522 100644
--- a/core/src/subgraph/runner/state.rs
+++ b/core/src/subgraph/runner/state.rs
@@ -3,8 +3,8 @@
 //! 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::block_stream::{BlockStream, BlockWithTriggers, FirehoseCursor};
 use graph::blockchain::Blockchain;
+use graph::blockchain::block_stream::{BlockStream, BlockWithTriggers, FirehoseCursor};
 use graph::ext::futures::Cancelable;
 use graph::prelude::BlockPtr;
 
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/docs/environment-variables.md b/docs/environment-variables.md
index bdb3c3d0ecc..7a601e32e64 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -315,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/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/gnd/README.md b/gnd/README.md
index 7d6ed59c7db..375e1ef0e01 100644
--- a/gnd/README.md
+++ b/gnd/README.md
@@ -26,11 +26,11 @@ 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 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 my-name/my-subgraph
+gnd deploy -l v0.0.1 my-name/my-subgraph
 ```
 
 ## Commands
@@ -165,7 +165,7 @@ gnd deploy <SUBGRAPH_NAME> [MANIFEST]
 | `--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 |
+| `--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 |
@@ -173,17 +173,20 @@ gnd deploy <SUBGRAPH_NAME> [MANIFEST]
 | `--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 my-name/my-subgraph
+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 my-name/my-subgraph
+gnd deploy --node http://localhost:8020 --ipfs http://localhost:5001 -l v1.0.0 my-name/my-subgraph
 
-# Deploy with version label
-gnd deploy -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`
@@ -378,6 +381,52 @@ gnd dev [OPTIONS]
 | `--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.
diff --git a/gnd/docs/migrating-from-graph-cli.md b/gnd/docs/migrating-from-graph-cli.md
index 792f5727d06..6203a6f2f21 100644
--- a/gnd/docs/migrating-from-graph-cli.md
+++ b/gnd/docs/migrating-from-graph-cli.md
@@ -15,7 +15,7 @@ graph deploy --studio my-subgraph
 # Use:
 gnd codegen
 gnd build
-gnd deploy my-subgraph  # defaults to Studio
+gnd deploy my-subgraph  # defaults to Studio; prompts for version label in interactive terminals
 ```
 
 ## Command Mapping
@@ -25,7 +25,7 @@ gnd deploy my-subgraph  # defaults to Studio
 | `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 |
+| `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 |
@@ -33,6 +33,7 @@ gnd deploy my-subgraph  # defaults to Studio
 | `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` |
 
@@ -67,6 +68,7 @@ Same success checkmarks, step descriptions, and progress indicators:
 
 - `0` for success
 - `1` for any error
+- `gnd indexer` passes through the exit code from `graph-indexer`
 
 ### Configuration Files
 
@@ -83,6 +85,20 @@ Code generation produces identical AssemblyScript output (after formatting). You
 
 ## 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`
@@ -192,12 +208,12 @@ Replace `graph` with `gnd` in your CI configuration:
 # Before
 - run: graph codegen
 - run: graph build
-- run: graph deploy --studio ${{ secrets.SUBGRAPH_NAME }}
+- run: graph deploy --studio -l ${{ github.sha }} ${{ secrets.SUBGRAPH_NAME }}
 
 # After
 - run: gnd codegen
 - run: gnd build
-- run: gnd deploy ${{ secrets.SUBGRAPH_NAME }}
+- run: gnd deploy -l ${{ github.sha }} ${{ secrets.SUBGRAPH_NAME }}
 ```
 
 ### Step 5: Update package.json Scripts (Optional)
@@ -209,11 +225,13 @@ If you have npm scripts calling graph-cli:
   "scripts": {
     "codegen": "gnd codegen",
     "build": "gnd build",
-    "deploy": "gnd deploy"
+    "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"
diff --git a/gnd/src/abi.rs b/gnd/src/abi.rs
index 49ca4727ee1..0a5fa695cf4 100644
--- a/gnd/src/abi.rs
+++ b/gnd/src/abi.rs
@@ -3,7 +3,7 @@
 //! Handles extraction of bare ABI arrays from various artifact formats
 //! (raw arrays, Hardhat/Foundry, Truffle).
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 
 /// Normalize ABI JSON to extract the actual ABI array from various artifact formats.
 ///
@@ -21,19 +21,18 @@ pub fn normalize_abi_json(abi_str: &str) -> Result<serde_json::Value> {
     }
 
     // Case 2: Object with "abi" field (Foundry/Hardhat format)
-    if let Some(abi) = value.get("abi") {
-        if abi.is_array() {
-            return Ok(abi.clone());
-        }
+    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") {
-        if let Some(abi) = compiler_output.get("abi") {
-            if abi.is_array() {
-                return Ok(abi.clone());
-            }
-        }
+    if let Some(compiler_output) = value.get("compilerOutput")
+        && let Some(abi) = compiler_output.get("abi")
+        && abi.is_array()
+    {
+        return Ok(abi.clone());
     }
 
     Err(anyhow!(
@@ -92,9 +91,11 @@ mod tests {
         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"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("Invalid ABI format")
+        );
     }
 }
diff --git a/gnd/src/codegen/abi.rs b/gnd/src/codegen/abi.rs
index 292a303260c..9b881fdcbe9 100644
--- a/gnd/src/codegen/abi.rs
+++ b/gnd/src/codegen/abi.rs
@@ -1375,6 +1375,7 @@ fn indexed_input_type(param_type: &DynSolType) -> DynSolType {
 
 #[cfg(test)]
 mod tests {
+
     use super::*;
 
     fn parse_abi(json: &str) -> JsonAbi {
@@ -1397,8 +1398,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "Token");
-        let types = gen.generate_types();
+        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"));
@@ -1417,17 +1418,19 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "Token");
-        let types = gen.generate_types();
+        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"));
+        assert!(
+            token_class
+                .methods
+                .iter()
+                .any(|m| m.name == "try_balanceOf")
+        );
     }
 
     #[test]
@@ -1443,8 +1446,8 @@ mod tests {
 
     #[test]
     fn test_name_sanitization() {
-        let gen = AbiCodeGenerator::new(JsonAbi::default(), "Test!Contract@Name");
-        assert_eq!(gen.name, "Test_Contract_Name");
+        let generator = AbiCodeGenerator::new(JsonAbi::default(), "Test!Contract@Name");
+        assert_eq!(generator.name, "Test_Contract_Name");
     }
 
     #[test]
@@ -1500,8 +1503,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "Token");
-        let types = gen.generate_types();
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
 
         // Get all event class names
         let event_names: Vec<&str> = types
@@ -1555,8 +1558,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "Token");
-        let types = gen.generate_types();
+        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();
@@ -1612,8 +1615,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "TestContract");
-        let types = gen.generate_types();
+        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();
@@ -1699,8 +1702,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "TestContract");
-        let types = gen.generate_types();
+        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();
@@ -1758,8 +1761,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "TestContract");
-        let types = gen.generate_types();
+        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();
@@ -1803,8 +1806,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "TestContract");
-        let types = gen.generate_types();
+        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();
@@ -1846,8 +1849,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "Token");
-        let types = gen.generate_types();
+        let generator = AbiCodeGenerator::new(contract, "Token");
+        let types = generator.generate_types();
 
         // Find the params class
         let params_class = types
@@ -1924,8 +1927,8 @@ mod tests {
         ]"#;
 
         let contract = parse_abi(abi_json);
-        let gen = AbiCodeGenerator::new(contract, "TestContract");
-        let types = gen.generate_types();
+        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();
diff --git a/gnd/src/codegen/mod.rs b/gnd/src/codegen/mod.rs
index 3b300e5eb94..4c8f5fdbd98 100644
--- a/gnd/src/codegen/mod.rs
+++ b/gnd/src/codegen/mod.rs
@@ -15,6 +15,6 @@ pub use abi::AbiCodeGenerator;
 pub use schema::SchemaCodeGenerator;
 pub use template::{Template, TemplateCodeGenerator, TemplateKind};
 pub use typescript::{
-    ArrayType, Class, ClassMember, Method, ModuleImports, NamedType, NullableType, Param,
-    StaticMethod, GENERATED_FILE_NOTE,
+    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
index 97118cfb2a2..a8a276f1ca0 100644
--- a/gnd/src/codegen/schema.rs
+++ b/gnd/src/codegen/schema.rs
@@ -2,7 +2,7 @@
 //!
 //! Generates AssemblyScript entity classes from GraphQL schemas.
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use graphql_tools::parser::schema::{
     Definition, Document, Field, ObjectType, Type, TypeDefinition,
 };
@@ -210,50 +210,50 @@ impl SchemaCodeGenerator {
 
         // First pass: collect entity names and their ID types
         for def in &document.definitions {
-            if let Definition::TypeDefinition(TypeDefinition::Object(obj)) = def {
-                if 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);
-                }
+            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 {
-                if 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,
-                    });
-                }
+            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,
+                });
             }
         }
 
@@ -713,6 +713,7 @@ enum StoreMethod {
 #[cfg(test)]
 mod tests {
     use super::*;
+
     use graphql_tools::parser::parse_schema;
 
     #[test]
@@ -726,9 +727,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let transfer = &classes[0];
@@ -747,9 +748,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         // Check that we have methods for nullable and non-nullable fields
@@ -802,9 +803,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let counter = &classes[0];
@@ -846,9 +847,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let event = &classes[0];
@@ -890,9 +891,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let user = &classes[0];
@@ -937,11 +938,11 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
         // The Post.author field should be treated as a string (entity ID reference)
-        assert!(gen.entity_names.contains("User"));
-        assert!(gen.entity_names.contains("Post"));
+        assert!(generator.entity_names.contains("User"));
+        assert!(generator.entity_names.contains("Post"));
     }
 
     #[test]
@@ -953,9 +954,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let token = &classes[0];
@@ -989,9 +990,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         assert_eq!(classes.len(), 1);
 
         let matrix = &classes[0];
@@ -1100,19 +1101,19 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
         // Find the entity
-        let entity = &gen.entities[0];
+        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!(gen.value_type_from_field(scalar_field), "String");
-        assert_eq!(gen.value_type_from_field(array_field), "[String]");
-        assert_eq!(gen.value_type_from_field(matrix_field), "[[String]]");
+        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]
@@ -1129,9 +1130,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         let balance = classes.iter().find(|c| c.name == "Balance").unwrap();
         let output = balance.to_string();
 
@@ -1170,9 +1171,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         let snapshot = classes.iter().find(|c| c.name == "Snapshot").unwrap();
         let output = snapshot.to_string();
 
@@ -1211,9 +1212,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         let token = classes.iter().find(|c| c.name == "Token").unwrap();
         let output = token.to_string();
 
@@ -1244,9 +1245,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         let balance = classes.iter().find(|c| c.name == "Balance").unwrap();
         let output = balance.to_string();
 
@@ -1272,9 +1273,9 @@ mod tests {
             }
         "#;
         let doc = parse_schema::<String>(schema).unwrap();
-        let gen = SchemaCodeGenerator::new(&doc).unwrap();
+        let generator = SchemaCodeGenerator::new(&doc).unwrap();
 
-        let classes = gen.generate_types(true);
+        let classes = generator.generate_types(true);
         let token = classes.iter().find(|c| c.name == "Token").unwrap();
         let output = token.to_string();
 
diff --git a/gnd/src/codegen/template.rs b/gnd/src/codegen/template.rs
index d067ea928c2..72a27f9e733 100644
--- a/gnd/src/codegen/template.rs
+++ b/gnd/src/codegen/template.rs
@@ -159,6 +159,7 @@ impl TemplateCodeGenerator {
 
 #[cfg(test)]
 mod tests {
+
     use super::*;
 
     #[test]
@@ -185,16 +186,16 @@ mod tests {
     #[test]
     fn test_ethereum_template() {
         let template = Template::new("DynamicToken", TemplateKind::Ethereum);
-        let gen = TemplateCodeGenerator::new(vec![template]);
+        let generator = TemplateCodeGenerator::new(vec![template]);
 
-        let imports = gen.generate_module_imports();
+        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 = gen.generate_types();
+        let types = generator.generate_types();
         assert_eq!(types.len(), 1);
 
         let klass = &types[0];
@@ -218,9 +219,9 @@ mod tests {
     #[test]
     fn test_file_ipfs_template() {
         let template = Template::new("TokenMetadata", TemplateKind::FileIpfs);
-        let gen = TemplateCodeGenerator::new(vec![template]);
+        let generator = TemplateCodeGenerator::new(vec![template]);
 
-        let imports = gen.generate_module_imports();
+        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()));
@@ -228,7 +229,7 @@ mod tests {
         // No Address for file templates
         assert!(!import_names.contains(&&"Address".to_string()));
 
-        let types = gen.generate_types();
+        let types = generator.generate_types();
         assert_eq!(types.len(), 1);
 
         let klass = &types[0];
@@ -246,30 +247,30 @@ mod tests {
             Template::new("DynamicToken", TemplateKind::Ethereum),
             Template::new("TokenMetadata", TemplateKind::FileIpfs),
         ];
-        let gen = TemplateCodeGenerator::new(templates);
+        let generator = TemplateCodeGenerator::new(templates);
 
-        let imports = gen.generate_module_imports();
+        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 = gen.generate_types();
+        let types = generator.generate_types();
         assert_eq!(types.len(), 2);
     }
 
     #[test]
     fn test_empty_templates() {
-        let gen = TemplateCodeGenerator::new(vec![]);
-        assert!(gen.generate_module_imports().is_empty());
-        assert!(gen.generate_types().is_empty());
+        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 gen = TemplateCodeGenerator::new(vec![template]);
+        let generator = TemplateCodeGenerator::new(vec![template]);
 
-        let types = gen.generate_types();
+        let types = generator.generate_types();
         let output = types[0].to_string();
 
         assert!(output.contains("export class DynamicToken extends DataSourceTemplate"));
diff --git a/gnd/src/commands/add.rs b/gnd/src/commands/add.rs
index 4a6191a6274..ef936884dfe 100644
--- a/gnd/src/commands/add.rs
+++ b/gnd/src/commands/add.rs
@@ -3,19 +3,23 @@
 //! 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::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use clap::Parser;
-use inflector::Inflector;
+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::{extract_events_from_abi, EventInfo};
-use crate::scaffold::ScaffoldOptions;
+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)]
@@ -97,6 +101,14 @@ pub async fn run_add(opt: AddOpt) -> Result<()> {
     // 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);
 
@@ -111,14 +123,20 @@ pub async fn run_add(opt: AddOpt) -> Result<()> {
         index_events: true, // Always index events for add command
     };
 
-    // Extract events from ABI
+    // 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, &events)?;
+    add_mapping_file(project_dir, &contract_name, &resolved)?;
 
     // Update manifest
     update_manifest(
@@ -127,22 +145,27 @@ pub async fn run_add(opt: AddOpt) -> Result<()> {
         &contract_name,
         &network,
         start_block,
-        &events,
+        &resolved,
     )?;
 
-    // Update networks.json
+    // 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);
-    update_networks_file(
-        &networks_path,
-        &network,
-        &contract_name,
-        &opt.address,
-        start_block,
-    )?;
-    step(
-        Step::Write,
-        &format!("Updated {}", opt.network_file.display()),
-    );
+    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));
 
@@ -232,41 +255,16 @@ fn add_abi_file(project_dir: &Path, contract_name: &str, abi: &JsonValue) -> Res
     Ok(())
 }
 
-/// Sanitize a field name for GraphQL.
-fn sanitize_field_name(name: &str) -> String {
-    if name.is_empty() {
-        return "value".to_string();
-    }
-
-    let mut result = name.to_string();
-
-    // Convert to camelCase if starts with uppercase
-    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 reserved words
-    match result.as_str() {
-        "id" => "eventId".to_string(),
-        "type" => "eventType".to_string(),
-        _ => result,
-    }
-}
-
 /// Add mapping file for the new data source.
-fn add_mapping_file(project_dir: &Path, contract_name: &str, events: &[EventInfo]) -> Result<()> {
+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", contract_name.to_kebab_case()));
+    let mapping_file = src_dir.join(format!("{}.ts", to_kebab_case(contract_name)));
 
     if mapping_file.exists() {
         step(
@@ -276,7 +274,7 @@ fn add_mapping_file(project_dir: &Path, contract_name: &str, events: &[EventInfo
         return Ok(());
     }
 
-    let mapping_content = generate_mapping(contract_name, events);
+    let mapping_content = generate_event_handlers(contract_name, events);
     let formatted = format_typescript(&mapping_content).unwrap_or(mapping_content);
 
     step(
@@ -288,74 +286,167 @@ fn add_mapping_file(project_dir: &Path, contract_name: &str, events: &[EventInfo
     Ok(())
 }
 
-/// Generate mapping handlers for events.
-fn generate_mapping(contract_name: &str, events: &[EventInfo]) -> String {
-    let mut imports = String::new();
-    let mut handlers = String::new();
-
-    imports.push_str("import { BigInt, Bytes } from \"@graphprotocol/graph-ts\"\n");
+/// 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
+}
 
-    if events.is_empty() {
-        return imports;
+/// 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
+}
 
-    // Import event types
-    let event_imports: Vec<String> = events
-        .iter()
-        .map(|e| format!("{} as {}Event", e.name, e.name))
-        .collect();
+/// 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)
+}
 
-    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.name.clone()).collect();
-
-    imports.push_str(&format!(
-        "import {{ {} }} from \"../generated/schema\"\n",
-        entity_imports.join(", ")
-    ));
-
-    // Generate handler for each event
-    for event in events {
-        handlers.push('\n');
-        handlers.push_str(&generate_event_handler(event));
+/// 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;
+        }
     }
 
-    format!("{}\n{}", imports, handlers)
+    Ok(resolved)
 }
 
-/// Generate a handler function for an event.
-fn generate_event_handler(event: &EventInfo) -> String {
-    let event_name = &event.name;
-
-    let mut field_assignments = String::new();
-    for input in &event.inputs {
-        let field_name = sanitize_field_name(&input.name);
-        field_assignments.push_str(&format!(
-            "  entity.{} = event.params.{}\n",
-            field_name, input.name
+/// 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(());
     }
 
-    format!(
-        r#"export function handle{event_name}(event: {event_name}Event): void {{
-  let entity = new {event_name}(
-    event.transaction.hash.concatI32(event.logIndex.toI32())
-  )
+    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);
 
-{field_assignments}  entity.blockNumber = event.block.number
-  entity.blockTimestamp = event.block.timestamp
-  entity.transactionHash = event.transaction.hash
+    step(Step::Write, &format!("Updating {}", schema_path.display()));
 
-  entity.save()
-}}
-"#
-    )
+    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.
@@ -365,7 +456,7 @@ fn update_manifest(
     contract_name: &str,
     network: &str,
     start_block: Option<u64>,
-    events: &[EventInfo],
+    events: &[ResolvedEvent],
 ) -> Result<()> {
     let content = fs::read_to_string(manifest_path).context("Failed to read manifest")?;
 
@@ -391,15 +482,15 @@ fn update_manifest(
 
     // Build event handlers
     let mut event_handlers = Vec::new();
-    for event in events {
+    for resolved in events {
         let mut handler = serde_yaml::Mapping::new();
         handler.insert(
             serde_yaml::Value::String("event".to_string()),
-            serde_yaml::Value::String(event.signature.clone()),
+            serde_yaml::Value::String(resolved.event.signature.clone()),
         );
         handler.insert(
             serde_yaml::Value::String("handler".to_string()),
-            serde_yaml::Value::String(format!("handle{}", event.name)),
+            serde_yaml::Value::String(format!("handle{}", resolved.alias)),
         );
         event_handlers.push(serde_yaml::Value::Mapping(handler));
     }
@@ -407,7 +498,7 @@ fn update_manifest(
     // Build entities list
     let entities: Vec<serde_yaml::Value> = events
         .iter()
-        .map(|e| serde_yaml::Value::String(e.name.clone()))
+        .map(|e| serde_yaml::Value::String(e.entity_name.clone()))
         .collect();
 
     // Build ABI entry
@@ -429,7 +520,7 @@ fn update_manifest(
     );
     mapping.insert(
         serde_yaml::Value::String("apiVersion".to_string()),
-        serde_yaml::Value::String("0.0.9".to_string()),
+        serde_yaml::Value::String(MAPPING_API_VERSION.to_string()),
     );
     mapping.insert(
         serde_yaml::Value::String("language".to_string()),
@@ -449,7 +540,7 @@ fn update_manifest(
     );
     mapping.insert(
         serde_yaml::Value::String("file".to_string()),
-        serde_yaml::Value::String(format!("./src/{}.ts", contract_name.to_kebab_case())),
+        serde_yaml::Value::String(format!("./src/{}.ts", to_kebab_case(contract_name))),
     );
 
     // Build the data source
@@ -494,7 +585,6 @@ fn update_manifest(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::scaffold::manifest::{EventInfo, EventInput};
 
     #[tokio::test]
     async fn test_invalid_address() {
@@ -511,91 +601,12 @@ mod tests {
 
         let result = run_add(opt).await;
         assert!(result.is_err());
-        assert!(result
-            .unwrap_err()
-            .to_string()
-            .contains("Invalid contract address"));
-    }
-
-    #[test]
-    fn test_sanitize_field_name() {
-        assert_eq!(sanitize_field_name("owner"), "owner");
-        assert_eq!(sanitize_field_name("Owner"), "owner");
-        assert_eq!(sanitize_field_name(""), "value");
-        // Reserved words
-        assert_eq!(sanitize_field_name("id"), "eventId");
-        assert_eq!(sanitize_field_name("type"), "eventType");
-    }
-
-    #[test]
-    fn test_to_kebab_case() {
-        assert_eq!("MyContract".to_kebab_case(), "my-contract");
-        assert_eq!("SimpleToken".to_kebab_case(), "simple-token");
-        assert_eq!("Contract".to_kebab_case(), "contract");
-        assert_eq!("contract".to_kebab_case(), "contract");
-        assert_eq!("ERC20Token".to_kebab_case(), "erc20-token");
-    }
-
-    #[test]
-    fn test_generate_event_handler() {
-        let event = EventInfo {
-            name: "Approval".to_string(),
-            signature: "Approval(address,address,uint256)".to_string(),
-            inputs: vec![
-                EventInput {
-                    name: "owner".to_string(),
-                    solidity_type: "address".to_string(),
-                    indexed: true,
-                },
-                EventInput {
-                    name: "spender".to_string(),
-                    solidity_type: "address".to_string(),
-                    indexed: true,
-                },
-                EventInput {
-                    name: "value".to_string(),
-                    solidity_type: "uint256".to_string(),
-                    indexed: false,
-                },
-            ],
-        };
-
-        let handler = generate_event_handler(&event);
-        assert!(handler.contains("export function handleApproval"));
-        assert!(handler.contains("event: ApprovalEvent"));
-        assert!(handler.contains("new Approval("));
-        assert!(handler.contains("entity.owner = event.params.owner"));
-        assert!(handler.contains("entity.spender = event.params.spender"));
-        assert!(handler.contains("entity.value = event.params.value"));
-        assert!(handler.contains("entity.save()"));
-    }
-
-    #[test]
-    fn test_generate_mapping() {
-        let events = vec![EventInfo {
-            name: "Transfer".to_string(),
-            signature: "Transfer(address,address,uint256)".to_string(),
-            inputs: vec![EventInput {
-                name: "from".to_string(),
-                solidity_type: "address".to_string(),
-                indexed: true,
-            }],
-        }];
-
-        let mapping = generate_mapping("Token", &events);
-        assert!(mapping.contains("import { BigInt, Bytes }"));
-        assert!(mapping.contains("Transfer as TransferEvent"));
-        assert!(mapping.contains("../generated/Token/Token"));
-        assert!(mapping.contains("import { Transfer }"));
-        assert!(mapping.contains("../generated/schema"));
-    }
-
-    #[test]
-    fn test_generate_mapping_empty_events() {
-        let events: Vec<EventInfo> = vec![];
-        let mapping = generate_mapping("Empty", &events);
-        assert!(mapping.contains("import { BigInt, Bytes }"));
-        assert!(!mapping.contains("export function handle"));
+        assert!(
+            result
+                .unwrap_err()
+                .to_string()
+                .contains("Invalid contract address")
+        );
     }
 
     #[tokio::test]
@@ -615,4 +626,111 @@ mod tests {
         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/build.rs b/gnd/src/commands/build.rs
index 2d9c7b36bd7..b33731330aa 100644
--- a/gnd/src/commands/build.rs
+++ b/gnd/src/commands/build.rs
@@ -8,16 +8,16 @@ use std::collections::HashMap;
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use clap::Parser;
 use sha1::{Digest, Sha1};
 
 use crate::abi::normalize_abi_json;
-use crate::compiler::{compile_mapping, find_graph_ts, AscCompileOptions};
+use crate::compiler::{AscCompileOptions, compile_mapping, find_graph_ts};
 use crate::config::{apply_network_config, get_network_config, load_networks_config};
-use crate::manifest::{load_manifest, resolve_path, DataSource, Manifest, Template};
+use crate::manifest::{DataSource, Manifest, Template, load_manifest, resolve_path};
 use crate::migrations;
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 use crate::services::IpfsClient;
 use crate::validation::{
     collect_handler_names, collect_template_handler_names, format_manifest_errors,
@@ -496,35 +496,34 @@ fn create_ipfs_manifest(
             .unwrap_or("schema.graphql");
 
         // Find the hash for this file
-        if let Some(hash) = uploaded.path_to_ipfs.get(schema_name) {
-            if let Some(schema) = value.get_mut("schema") {
-                if let Some(file) = schema.get_mut("file") {
-                    *file = create_ipfs_link(hash);
-                }
-            }
+        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") {
-        if 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);
-                }
+    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") {
-        if 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);
-                }
+    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);
             }
         }
     }
@@ -558,16 +557,16 @@ fn update_data_source_ipfs_paths(
         }
 
         // Update ABIs
-        if let Some(abis) = mapping.get_mut("abis") {
-            if 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);
-                            }
+        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);
                         }
                     }
                 }
@@ -592,16 +591,16 @@ fn update_template_ipfs_paths(
         }
 
         // Update ABIs
-        if let Some(abis) = mapping.get_mut("abis") {
-            if 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);
-                            }
+        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);
                         }
                     }
                 }
@@ -751,38 +750,37 @@ fn write_output_manifest(
     let mut value: serde_yaml::Value = serde_yaml::from_str(&manifest_str)?;
 
     // Update schema path
-    if let Some(schema) = value.get_mut("schema") {
-        if let Some(file) = schema.get_mut("file") {
-            if 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());
-            }
-        }
+    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") {
-        if 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);
-                }
+    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") {
-        if 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);
-                }
+    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);
             }
         }
     }
@@ -804,19 +802,19 @@ fn update_data_source_paths(ds: &mut serde_yaml::Value, ds_name: &str, output_fo
         }
 
         // Update ABI paths
-        if let Some(abis) = mapping.get_mut("abis") {
-            if 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 {
-                        if let Some(file) = abi.get_mut("file") {
-                            *file = serde_yaml::Value::String(format!("{}/{}.json", ds_name, name));
-                        }
-                    }
+        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));
                 }
             }
         }
@@ -840,22 +838,22 @@ fn update_template_paths(
         }
 
         // Update ABI paths
-        if let Some(abis) = mapping.get_mut("abis") {
-            if 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 {
-                        if let Some(file) = abi.get_mut("file") {
-                            *file = serde_yaml::Value::String(format!(
-                                "templates/{}/{}.json",
-                                template_name, name
-                            ));
-                        }
-                    }
+        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
+                    ));
                 }
             }
         }
diff --git a/gnd/src/commands/codegen.rs b/gnd/src/commands/codegen.rs
index fafa88d2b43..deb0feb0ca5 100644
--- a/gnd/src/commands/codegen.rs
+++ b/gnd/src/commands/codegen.rs
@@ -9,7 +9,7 @@
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use clap::Parser;
 use graph::abi::JsonAbi;
 use graphql_tools::parser::schema as gql;
@@ -17,13 +17,13 @@ use semver::Version;
 
 use crate::abi::normalize_abi_json;
 use crate::codegen::{
-    AbiCodeGenerator, Class, ModuleImports, SchemaCodeGenerator, Template as CodegenTemplate,
-    TemplateCodeGenerator, TemplateKind, GENERATED_FILE_NOTE,
+    AbiCodeGenerator, Class, GENERATED_FILE_NOTE, ModuleImports, SchemaCodeGenerator,
+    Template as CodegenTemplate, TemplateCodeGenerator, TemplateKind,
 };
 use crate::formatter::try_format_typescript;
-use crate::manifest::{load_manifest, resolve_path, DataSource, Manifest, Template};
+use crate::manifest::{DataSource, Manifest, Template, load_manifest, resolve_path};
 use crate::migrations;
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 use crate::services::IpfsClient;
 use crate::validation::{
     format_manifest_errors, format_schema_errors, validate_manifest_files, validate_schema,
@@ -209,7 +209,7 @@ fn generate_schema_types(
     step(Step::Generate, "Generate types for GraphQL schema");
 
     let generator = match SchemaCodeGenerator::new(&ast) {
-        Ok(gen) => gen,
+        Ok(generator) => generator,
         Err(e) => {
             // Schema validation failed - skip schema.ts generation but don't fail
             eprintln!("Warning: {}", e);
@@ -277,13 +277,13 @@ fn preprocess_abi_json(abi_str: &str) -> Result<String> {
 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() {
-                if !obj.contains_key("name") {
-                    obj.insert(
-                        "name".to_string(),
-                        serde_json::Value::String(format!("param{}", index)),
-                    );
-                }
+            if let Some(obj) = param.as_object_mut()
+                && !obj.contains_key("name")
+            {
+                obj.insert(
+                    "name".to_string(),
+                    serde_json::Value::String(format!("param{}", index)),
+                );
             }
         }
     }
@@ -407,7 +407,7 @@ async fn generate_subgraph_source_types(
 
         // Generate entity types WITHOUT store methods (false = no store methods)
         let generator = match SchemaCodeGenerator::new(&ast) {
-            Ok(gen) => gen,
+            Ok(generator) => generator,
             Err(e) => {
                 eprintln!(
                     "Warning: Failed to create schema generator for subgraph {} ({}): {}",
diff --git a/gnd/src/commands/deploy.rs b/gnd/src/commands/deploy.rs
index 7c305c72d11..5c9e744ba02 100644
--- a/gnd/src/commands/deploy.rs
+++ b/gnd/src/commands/deploy.rs
@@ -3,15 +3,19 @@
 //! This command builds a subgraph (unless an IPFS hash is provided),
 //! uploads it to IPFS, and deploys it to a Graph Node.
 
-use std::path::PathBuf;
+use std::{
+    io::{self, IsTerminal},
+    path::PathBuf,
+};
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use clap::Parser;
 use url::Url;
 
 use crate::commands::auth::get_deploy_key;
-use crate::commands::build::{run_build, BuildOpt};
-use crate::output::{step, Step};
+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
@@ -91,6 +95,12 @@ pub async fn run_deploy(opt: DeployOpt) -> Result<()> {
         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) => {
@@ -104,7 +114,14 @@ pub async fn run_deploy(opt: DeployOpt) -> Result<()> {
     };
 
     // Deploy to Graph Node
-    deploy_to_node(&opt, node, &ipfs_hash, deploy_key.as_deref()).await
+    deploy_to_node(
+        &opt,
+        node,
+        &ipfs_hash,
+        &version_label,
+        deploy_key.as_deref(),
+    )
+    .await
 }
 
 /// Validate that a URL is well-formed.
@@ -127,6 +144,32 @@ fn validate_url(url: &str, name: &str) -> Result<()> {
     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
@@ -155,6 +198,7 @@ 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));
@@ -165,7 +209,7 @@ async fn deploy_to_node(
         .deploy_subgraph(
             &opt.subgraph_name,
             ipfs_hash,
-            opt.version_label.as_deref(),
+            Some(version_label),
             opt.debug_fork.as_deref(),
         )
         .await
@@ -240,4 +284,35 @@ mod tests {
         // 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
index f7ce6f1a01a..044cefa877e 100644
--- a/gnd/src/commands/dev.rs
+++ b/gnd/src/commands/dev.rs
@@ -6,7 +6,7 @@ use graph::{
     components::link_resolver::FileLinkResolver,
     env::EnvVars,
     prelude::{CheapClone, DeploymentHash, LinkResolver, SubgraphName},
-    slog::{error, info, Logger},
+    slog::{Logger, error, info},
 };
 use graph_core::polling_monitor::ipfs_service;
 use graph_node::{launcher, opt::Opt};
diff --git a/gnd/src/commands/init.rs b/gnd/src/commands/init.rs
index 1bf20aa070c..629297616d0 100644
--- a/gnd/src/commands/init.rs
+++ b/gnd/src/commands/init.rs
@@ -13,20 +13,20 @@ use std::fs;
 use std::io::{self, IsTerminal};
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use clap::{Parser, ValueEnum};
 use graphql_tools::parser::schema as gql;
 
-use crate::commands::add::{run_add, AddOpt};
-use crate::commands::codegen::{run_codegen, CodegenOpt};
+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, with_spinner, Step};
+use crate::output::{Step, step, with_spinner};
 use crate::prompt::{
-    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, InitForm, SourceType,
+    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::{generate_scaffold, init_git, install_dependencies, ScaffoldOptions};
+use crate::scaffold::{ScaffoldOptions, generate_scaffold, init_git, install_dependencies};
 use crate::services::{ContractInfo, ContractService, IpfsClient, NetworksRegistry};
 
 /// Available protocols for subgraph development.
@@ -385,10 +385,10 @@ async fn init_from_contract(opt: &InitOpt, prefetched: Option<ContractInfo>) ->
     }
 
     // Install dependencies unless skipped
-    if !opt.skip_install {
-        if let Err(e) = install_dependencies(&directory) {
-            eprintln!("Warning: {}", e);
-        }
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
     }
 
     // Run codegen to generate types (requires dependencies to be installed)
@@ -573,10 +573,10 @@ fn init_from_example(opt: &InitOpt) -> Result<()> {
     }
 
     // Install dependencies unless skipped
-    if !opt.skip_install {
-        if let Err(e) = install_dependencies(&directory) {
-            eprintln!("Warning: {}", e);
-        }
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
     }
 
     // Run codegen unless install was skipped (codegen requires dependencies)
@@ -869,7 +869,9 @@ fn print_next_steps(subgraph_name: &str, directory: &Path) {
     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.");
+    println!(
+        "Make sure to visit the documentation on https://thegraph.com/docs/ for further information."
+    );
 }
 
 /// Initialize a subgraph from an existing deployed subgraph.
@@ -908,15 +910,15 @@ async fn init_from_subgraph(opt: &InitOpt) -> Result<()> {
         serde_yaml::from_str(&manifest_yaml).context("Failed to parse subgraph manifest YAML")?;
 
     // Validate network matches
-    if let Some(manifest_network) = extract_network(&manifest) {
-        if manifest_network != network {
-            return Err(anyhow!(
-                "Network mismatch: The source subgraph is indexing '{}', but you specified '{}'.\n\
+    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
-            ));
-        }
+            manifest_network,
+            network
+        ));
     }
 
     // Get start block from manifest if not provided
@@ -999,10 +1001,10 @@ async fn init_from_subgraph(opt: &InitOpt) -> Result<()> {
     }
 
     // Install dependencies unless skipped
-    if !opt.skip_install {
-        if let Err(e) = install_dependencies(&directory) {
-            eprintln!("Warning: {}", e);
-        }
+    if !opt.skip_install
+        && let Err(e) = install_dependencies(&directory)
+    {
+        eprintln!("Warning: {}", e);
     }
 
     step(
@@ -1097,10 +1099,10 @@ 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" {
-                    if let gql::Value::Boolean(true) = value {
-                        return true;
-                    }
+                if name == "immutable"
+                    && let gql::Value::Boolean(true) = value
+                {
+                    return true;
                 }
             }
         }
@@ -1422,10 +1424,10 @@ mod tests {
 
         let ast = gql::parse_schema::<String>(schema).unwrap();
         for def in ast.definitions {
-            if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def {
-                if obj.name == "Transfer" {
-                    assert!(is_immutable_entity(&obj));
-                }
+            if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def
+                && obj.name == "Transfer"
+            {
+                assert!(is_immutable_entity(&obj));
             }
         }
 
@@ -1438,10 +1440,10 @@ mod tests {
 
         let ast = gql::parse_schema::<String>(schema).unwrap();
         for def in ast.definitions {
-            if let gql::Definition::TypeDefinition(gql::TypeDefinition::Object(obj)) = def {
-                if obj.name == "Account" {
-                    assert!(!is_immutable_entity(&obj));
-                }
+            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
index 4220fb6202f..5867cc8d584 100644
--- a/gnd/src/commands/mod.rs
+++ b/gnd/src/commands/mod.rs
@@ -11,15 +11,15 @@ mod publish;
 mod remove;
 mod test;
 
-pub use add::{run_add, AddOpt};
-pub use auth::{get_deploy_key, run_auth, AuthOpt};
-pub use build::{run_build, BuildOpt};
-pub use clean::{run_clean, CleanOpt};
-pub use codegen::{run_codegen, CodegenOpt};
-pub use create::{run_create, CreateOpt};
-pub use deploy::{run_deploy, DeployOpt};
-pub use dev::{run_dev, DevOpt};
-pub use init::{run_init, InitOpt};
-pub use publish::{run_publish, PublishOpt};
-pub use remove::{run_remove, RemoveOpt};
-pub use test::{run_test, TestOpt};
+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
index e55b5ffc0b6..e07a57de999 100644
--- a/gnd/src/commands/publish.rs
+++ b/gnd/src/commands/publish.rs
@@ -5,12 +5,12 @@
 
 use std::path::PathBuf;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::Parser;
 use inquire::Confirm;
 
-use crate::commands::build::{run_build, BuildOpt};
-use crate::output::{step, Step};
+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";
diff --git a/gnd/src/commands/test/assertion.rs b/gnd/src/commands/test/assertion.rs
index 8bb6f9ee302..9d6455c69bb 100644
--- a/gnd/src/commands/test/assertion.rs
+++ b/gnd/src/commands/test/assertion.rs
@@ -2,9 +2,9 @@
 
 use super::runner::TestContext;
 use super::schema::{Assertion, AssertionFailure, AssertionOutcome, TestResult};
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use graph::data::query::{Query, QueryResults, QueryTarget};
-use graph::prelude::{q, ApiVersion, GraphQlRunner as GraphQlRunnerTrait};
+use graph::prelude::{ApiVersion, GraphQlRunner as GraphQlRunnerTrait, q};
 
 pub(super) async fn run_assertions(
     ctx: &TestContext,
@@ -136,11 +136,11 @@ fn json_similarity(a: &serde_json::Value, b: &serde_json::Value) -> usize {
         (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) {
-                    if json_equal(v, bv) {
-                        // `id` match is a strong signal for entity identity.
-                        score += if k == "id" { 100 } else { 1 };
-                    }
+                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
diff --git a/gnd/src/commands/test/eth_calls.rs b/gnd/src/commands/test/eth_calls.rs
index 4b9dbddfaf8..5f9152037a1 100644
--- a/gnd/src/commands/test/eth_calls.rs
+++ b/gnd/src/commands/test/eth_calls.rs
@@ -1,7 +1,7 @@
 //! ABI encoding helpers for mock Ethereum call data.
 
 use super::trigger::json_to_sol_value;
-use anyhow::{anyhow, Context, Result};
+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;
diff --git a/gnd/src/commands/test/matchstick.rs b/gnd/src/commands/test/matchstick.rs
index ee2409a0ef8..08657366650 100644
--- a/gnd/src/commands/test/matchstick.rs
+++ b/gnd/src/commands/test/matchstick.rs
@@ -4,12 +4,12 @@
 //! This is the legacy path for projects that haven't migrated to the new
 //! JSON-based test format yet.
 
-use anyhow::{anyhow, Context, Result};
+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 crate::output::{Step, step};
 
 use super::TestOpt;
 
diff --git a/gnd/src/commands/test/mock_chain.rs b/gnd/src/commands/test/mock_chain.rs
index 8978284eb63..c3a1a69f01f 100644
--- a/gnd/src/commands/test/mock_chain.rs
+++ b/gnd/src/commands/test/mock_chain.rs
@@ -1,8 +1,8 @@
 //! Block pointer utilities for mock chains.
 
 use graph::blockchain::block_stream::BlockWithTriggers;
-use graph::prelude::alloy::primitives::B256;
 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.
diff --git a/gnd/src/commands/test/mock_runtime.rs b/gnd/src/commands/test/mock_runtime.rs
index 150662faa74..d18e93fd3c0 100644
--- a/gnd/src/commands/test/mock_runtime.rs
+++ b/gnd/src/commands/test/mock_runtime.rs
@@ -8,9 +8,9 @@ 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 graph_chain_ethereum::Chain;
 use std::sync::Arc;
 
 const WRAPPED_HOST_FNS: &[&str] = &["ethereum.call", "ethereum.getBalance", "ethereum.hasCode"];
diff --git a/gnd/src/commands/test/mod.rs b/gnd/src/commands/test/mod.rs
index a2f0d413495..7352ae73e48 100644
--- a/gnd/src/commands/test/mod.rs
+++ b/gnd/src/commands/test/mod.rs
@@ -42,12 +42,12 @@ mod runner;
 mod schema;
 mod trigger;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use clap::Parser;
 use console::style;
 use std::path::PathBuf;
 
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 
 const DEFAULT_TEST_DIR: &str = "tests";
 
diff --git a/gnd/src/commands/test/output.rs b/gnd/src/commands/test/output.rs
index e02b90f9179..8746574b511 100644
--- a/gnd/src/commands/test/output.rs
+++ b/gnd/src/commands/test/output.rs
@@ -5,7 +5,7 @@ use similar::{ChangeTag, TextDiff};
 
 use super::assertion::align_for_diff;
 use super::schema::{AssertionFailure, AssertionOutcome, TestResult};
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 
 pub fn print_test_start(path: &std::path::Path) {
     step(Step::Load, &format!("Running {}", path.display()));
diff --git a/gnd/src/commands/test/runner.rs b/gnd/src/commands/test/runner.rs
index 3d0955b63b7..19db7347deb 100644
--- a/gnd/src/commands/test/runner.rs
+++ b/gnd/src/commands/test/runner.rs
@@ -10,6 +10,7 @@
 //! 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;
@@ -20,9 +21,8 @@ use super::mock_transport::MockTransport;
 use super::noop::{NoopAdapterSelector, StaticBlockRefetcher};
 use super::schema::{TestFile, TestResult};
 use super::trigger::build_blocks_with_triggers;
-use super::TestOpt;
-use crate::manifest::{load_manifest, Manifest};
-use anyhow::{anyhow, ensure, Context, Result};
+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};
@@ -44,11 +44,11 @@ use graph::prelude::{
     DeploymentHash, LoggerFactory, NodeId, SubgraphCountMetric, SubgraphName, SubgraphRegistrar,
     SubgraphStore as SubgraphStoreTrait, SubgraphVersionSwitchingMode,
 };
-use graph::slog::{info, o, Logger};
+use graph::slog::{Logger, info, o};
 use graph_chain_ethereum::network::{EthereumNetworkAdapter, EthereumNetworkAdapters};
 use graph_chain_ethereum::{
-    chain::ChainSettings, Chain, EthereumAdapter, NodeCapabilities, ProviderEthRpcMetrics,
-    Transport,
+    Chain, EthereumAdapter, NodeCapabilities, ProviderEthRpcMetrics, Transport,
+    chain::ChainSettings,
 };
 use graph_core::polling_monitor::{arweave_service, ipfs_service};
 use graph_graphql::prelude::GraphQlRunner;
@@ -771,6 +771,7 @@ async fn setup_context(
         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.
diff --git a/gnd/src/commands/test/trigger.rs b/gnd/src/commands/test/trigger.rs
index 8af4272a071..6ac11557678 100644
--- a/gnd/src/commands/test/trigger.rs
+++ b/gnd/src/commands/test/trigger.rs
@@ -7,19 +7,19 @@
 //! - data = ABI-encoded `value` (non-indexed)
 
 use super::schema::{LogEvent, TestFile};
-use anyhow::{anyhow, ensure, Context, Result};
+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::{keccak256, Address, Bloom, Bytes, B256, I256, U256};
+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 graph_chain_ethereum::Chain;
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -293,11 +293,7 @@ pub fn json_to_sol_value(sol_type: &DynSolType, value: &serde_json::Value) -> Re
                         None => (s_abs, 10),
                     };
                     let abs = U256::from_str_radix(digits, radix).context("Invalid int")?;
-                    if is_neg {
-                        !abs + U256::from(1)
-                    } else {
-                        abs
-                    }
+                    if is_neg { !abs + U256::from(1) } else { abs }
                 }
                 serde_json::Value::Number(n) => {
                     if let Some(i) = n.as_i64() {
@@ -450,6 +446,7 @@ fn dummy_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,
     }
@@ -470,10 +467,10 @@ fn create_block_with_triggers(
     // 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 {
-            if let Some(tx_hash) = log.transaction_hash {
-                tx_hashes.insert(tx_hash);
-            }
+        if let EthereumTrigger::Log(LogRef::FullLog(log, _)) = trigger
+            && let Some(tx_hash) = log.transaction_hash
+        {
+            tx_hashes.insert(tx_hash);
         }
     }
 
diff --git a/gnd/src/compiler/asc.rs b/gnd/src/compiler/asc.rs
index 6c06218f27a..821adba699c 100644
--- a/gnd/src/compiler/asc.rs
+++ b/gnd/src/compiler/asc.rs
@@ -6,7 +6,7 @@
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 
 /// Options for compiling an AssemblyScript file.
 #[derive(Debug, Clone)]
diff --git a/gnd/src/compiler/mod.rs b/gnd/src/compiler/mod.rs
index 6b5bcf9b1f4..0c80a4aec89 100644
--- a/gnd/src/compiler/mod.rs
+++ b/gnd/src/compiler/mod.rs
@@ -5,4 +5,4 @@
 
 mod asc;
 
-pub use asc::{compile_mapping, find_asc_binary, find_graph_ts, AscCompileOptions};
+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
index 6a95a7043e8..38b57baf6b4 100644
--- a/gnd/src/config/mod.rs
+++ b/gnd/src/config/mod.rs
@@ -8,6 +8,6 @@
 pub mod networks;
 
 pub use networks::{
-    apply_network_config, get_network_config, init_networks_config, load_networks_config,
-    update_networks_file, DataSourceNetworkConfig, NetworkConfig, NetworksConfig,
+    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
index 48abc2c6f9a..667d72745aa 100644
--- a/gnd/src/config/networks.rs
+++ b/gnd/src/config/networks.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use std::fs;
 use std::path::Path;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use serde::{Deserialize, Serialize};
 
 /// Network-specific configuration for a data source.
@@ -85,24 +85,24 @@ pub fn apply_network_config(
     network_config: &NetworkConfig,
 ) -> Result<()> {
     // Update data sources
-    if let Some(data_sources) = manifest.get_mut("dataSources") {
-        if let Some(arr) = data_sources.as_sequence_mut() {
-            for ds in arr.iter_mut() {
-                update_data_source(ds, network, network_config)?;
-            }
+    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") {
-        if 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()),
-                    );
-                }
+    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()),
+                );
             }
         }
     }
diff --git a/gnd/src/formatter.rs b/gnd/src/formatter.rs
index 0c85f1589a7..58947e15519 100644
--- a/gnd/src/formatter.rs
+++ b/gnd/src/formatter.rs
@@ -6,7 +6,7 @@
 use std::io::Write;
 use std::process::{Command, Stdio};
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 
 /// Format TypeScript/AssemblyScript code using Prettier.
 ///
diff --git a/gnd/src/main.rs b/gnd/src/main.rs
index d4c90f72ba3..092674e5da0 100644
--- a/gnd/src/main.rs
+++ b/gnd/src/main.rs
@@ -1,17 +1,19 @@
+use std::ffi::OsString;
 use std::io;
+use std::process::Command;
 
-use anyhow::Result;
+use anyhow::{Result, bail};
 use clap::{CommandFactory, Parser, Subcommand, ValueEnum};
-use clap_complete::{generate, Shell};
+use clap_complete::{Shell, generate};
 use git_testament::{git_testament, render_testament};
 use graph::log::logger;
 use lazy_static::lazy_static;
 use tokio_util::sync::CancellationToken;
 
 use gnd::commands::{
-    run_add, run_auth, run_build, run_clean, run_codegen, run_create, run_deploy, run_dev,
-    run_init, run_publish, run_remove, run_test, AddOpt, AuthOpt, BuildOpt, CleanOpt, CodegenOpt,
-    CreateOpt, DeployOpt, DevOpt, InitOpt, PublishOpt, RemoveOpt, TestOpt,
+    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);
@@ -83,6 +85,22 @@ enum Commands {
     /// Remove build artifacts and generated files
     Clean(CleanOpt),
 
+    /// 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>,
+    },
+
     /// Generate shell completions
     Completions(CompletionsOpt),
 }
@@ -153,10 +171,64 @@ fn generate_completions(completions_opt: CompletionsOpt) -> Result<()> {
     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<()> {
-    std::env::set_var("ETHEREUM_REORG_THRESHOLD", "10");
-    std::env::set_var("GRAPH_NODE_DISABLE_DEPLOYMENT_HASH_VALIDATION", "true");
+    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();
@@ -186,6 +258,7 @@ async fn main() -> Result<()> {
             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),
     };
 
diff --git a/gnd/src/manifest.rs b/gnd/src/manifest.rs
index 947eff5fd12..0221070edfe 100644
--- a/gnd/src/manifest.rs
+++ b/gnd/src/manifest.rs
@@ -17,7 +17,7 @@ use graph::prelude::DeploymentHash;
 use graph_chain_ethereum::{BlockHandlerFilter, Chain};
 use semver::Version;
 
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 
 /// Type alias for the graph-node unresolved manifest parameterized on Ethereum.
 type GraphManifest = UnresolvedSubgraphManifest<Chain>;
diff --git a/gnd/src/migrations/api_version.rs b/gnd/src/migrations/api_version.rs
index 64ed1670ae4..f660d54ca5e 100644
--- a/gnd/src/migrations/api_version.rs
+++ b/gnd/src/migrations/api_version.rs
@@ -6,8 +6,8 @@
 use anyhow::Result;
 
 use super::{
-    load_manifest, manifest_has_api_version, replace_in_file, versions, Migration, MigrationCheck,
-    MigrationContext,
+    Migration, MigrationCheck, MigrationContext, load_manifest, manifest_has_api_version,
+    replace_in_file, versions,
 };
 
 /// Helper to create an API version migration check.
diff --git a/gnd/src/migrations/mod.rs b/gnd/src/migrations/mod.rs
index cf1e6be8317..0fa888e80e6 100644
--- a/gnd/src/migrations/mod.rs
+++ b/gnd/src/migrations/mod.rs
@@ -18,7 +18,7 @@ use std::path::Path;
 use anyhow::Result;
 use regex::Regex;
 
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 
 pub use versions::get_graph_ts_version;
 
@@ -139,10 +139,9 @@ fn manifest_has_api_version(manifest: &serde_json::Value, version: &str) -> bool
                 .get("mapping")
                 .and_then(|m| m.get("apiVersion"))
                 .and_then(|v| v.as_str())
+                && api_version == version
             {
-                if api_version == version {
-                    return true;
-                }
+                return true;
             }
         }
     }
@@ -154,10 +153,9 @@ fn manifest_has_api_version(manifest: &serde_json::Value, version: &str) -> bool
                 .get("mapping")
                 .and_then(|m| m.get("apiVersion"))
                 .and_then(|v| v.as_str())
+                && api_version == version
             {
-                if api_version == version {
-                    return true;
-                }
+                return true;
             }
         }
     }
diff --git a/gnd/src/migrations/spec_version.rs b/gnd/src/migrations/spec_version.rs
index a1b6ecd573d..ffdb6f13ce7 100644
--- a/gnd/src/migrations/spec_version.rs
+++ b/gnd/src/migrations/spec_version.rs
@@ -4,7 +4,7 @@
 
 use anyhow::Result;
 
-use super::{load_manifest, replace_in_file, Migration, MigrationCheck, MigrationContext};
+use super::{Migration, MigrationCheck, MigrationContext, load_manifest, replace_in_file};
 
 /// Migration: specVersion 0.0.1 -> 0.0.2
 ///
diff --git a/gnd/src/migrations/versions.rs b/gnd/src/migrations/versions.rs
index f33703b95ad..f0cd6a3e221 100644
--- a/gnd/src/migrations/versions.rs
+++ b/gnd/src/migrations/versions.rs
@@ -5,7 +5,7 @@
 
 use std::path::Path;
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use semver::Version;
 
 /// Get the installed graph-ts version by searching node_modules.
diff --git a/gnd/src/output/mod.rs b/gnd/src/output/mod.rs
index 9b7ea7b118f..e0cf8a356f5 100644
--- a/gnd/src/output/mod.rs
+++ b/gnd/src/output/mod.rs
@@ -1,6 +1,6 @@
 mod spinner;
 
-pub use spinner::{step as spinner_step, with_spinner, Spinner, SpinnerResult};
+pub use spinner::{Spinner, SpinnerResult, step as spinner_step, with_spinner};
 
 use console::style;
 
diff --git a/gnd/src/output/spinner.rs b/gnd/src/output/spinner.rs
index 01405fc9a16..24822e294d3 100644
--- a/gnd/src/output/spinner.rs
+++ b/gnd/src/output/spinner.rs
@@ -28,7 +28,7 @@
 use std::fmt::Display;
 use std::time::Duration;
 
-use console::{style, Term};
+use console::{Term, style};
 use indicatif::{ProgressBar, ProgressStyle};
 
 /// The checkmark symbol used for successful steps (matches TS CLI)
diff --git a/gnd/src/prompt.rs b/gnd/src/prompt.rs
index 608af7327dd..ed2a2037f98 100644
--- a/gnd/src/prompt.rs
+++ b/gnd/src/prompt.rs
@@ -6,11 +6,12 @@
 use std::path::Path;
 
 use anyhow::Result;
-use console::{style, Term};
+use console::{Term, style};
+use inquire::parser::CustomTypeParser;
 use inquire::validator::Validation;
-use inquire::{Autocomplete, Confirm, CustomUserError, Select, Text};
+use inquire::{Autocomplete, Confirm, CustomType, CustomUserError, Select, Text};
 
-use crate::output::{step, Step};
+use crate::output::{Step, step};
 use crate::services::{ContractInfo, ContractService, Network, NetworksRegistry};
 
 /// Format a network for display.
@@ -387,6 +388,32 @@ 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,
@@ -608,12 +635,12 @@ fn prompt_network_interactive(registry: &NetworksRegistry) -> Result<String> {
 
     // Extract network ID from the selection
     // Format is "Full Name (id)"
-    if let Some(start) = input.rfind('(') {
-        if let Some(end) = input.rfind(')') {
-            let id = &input[start + 1..end];
-            if registry.get_network(id).is_some() {
-                return Ok(id.to_string());
-            }
+    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());
         }
     }
 
@@ -649,6 +676,16 @@ mod tests {
         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 {
diff --git a/gnd/src/scaffold/manifest.rs b/gnd/src/scaffold/manifest.rs
index 5e1affb7673..b0b731ff4be 100644
--- a/gnd/src/scaffold/manifest.rs
+++ b/gnd/src/scaffold/manifest.rs
@@ -1,6 +1,9 @@
 //! 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 {
@@ -21,11 +24,13 @@ pub fn generate_manifest(options: &ScaffoldOptions) -> String {
         source.push_str(&format!("      startBlock: {}\n", start_block));
     }
 
-    // Get event handlers from ABI
-    let event_handlers = get_event_handlers(options);
+    // 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: 1.3.0
+        r#"specVersion: {spec_version}
 indexerHints:
   prune: auto
 schema:
@@ -37,7 +42,7 @@ dataSources:
     source:
 {source}    mapping:
       kind: ethereum/events
-      apiVersion: 0.0.9
+      apiVersion: {api_version}
       language: wasm/assemblyscript
       entities:{entities}
       abis:
@@ -46,15 +51,14 @@ dataSources:
       eventHandlers:{event_handlers}
       file: {mapping_file}
 "#,
-        entities = get_entities(options),
+        spec_version = super::SPEC_VERSION,
+        api_version = super::MAPPING_API_VERSION,
+        entities = get_entities(&events),
     )
 }
 
-/// Get event handlers from ABI.
-fn get_event_handlers(options: &ScaffoldOptions) -> String {
-    let contract_name = &options.contract_name;
-    let events = extract_events_from_abi(options);
-
+/// 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!(
@@ -66,40 +70,108 @@ fn get_event_handlers(options: &ScaffoldOptions) -> String {
 
     let mut handlers = String::new();
     for event in events {
-        let handler_name = format!("handle{}", event.name);
         handlers.push_str(&format!(
-            "\n        - event: {}\n          handler: {}",
-            event.signature, handler_name
+            "\n        - event: {}\n          handler: handle{}",
+            event.event.signature, event.alias
         ));
     }
 
     handlers
 }
 
-/// Get entities list for manifest.
-fn get_entities(options: &ScaffoldOptions) -> String {
-    let events = extract_events_from_abi(options);
-
+/// Get entities list for the manifest.
+fn get_entities(events: &[ResolvedEvent]) -> String {
     if events.is_empty() {
         return "\n        - ExampleEntity".to_string();
     }
 
-    // Always use event names from ABI, regardless of index_events
     let mut entities = String::new();
     for event in events {
-        entities.push_str(&format!("\n        - {}", event.name));
+        entities.push_str(&format!("\n        - {}", event.entity_name));
     }
     entities
 }
 
 /// Event info extracted from ABI.
-#[derive(Debug)]
+#[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 {
@@ -324,4 +396,21 @@ mod tests {
         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
index aed72e33466..8749c91ab2b 100644
--- a/gnd/src/scaffold/mapping.rs
+++ b/gnd/src/scaffold/mapping.rs
@@ -1,7 +1,8 @@
 //! Mapping (AssemblyScript) generation for scaffold.
 
-use super::manifest::{extract_events_from_abi, EventInfo};
 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 {
@@ -16,7 +17,8 @@ pub fn generate_mapping(options: &ScaffoldOptions) -> String {
         return generate_placeholder_mapping(contract_name, &events, options);
     }
 
-    generate_event_handlers(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.
@@ -51,18 +53,20 @@ fn generate_placeholder_mapping(
     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
+    // Import contract class and all events (by disambiguated alias).
     output.push_str(&format!("import {{\n  {contract_name},\n"));
-    for (i, event) in events.iter().enumerate() {
-        let suffix = if i < events.len() - 1 { ",\n" } else { "\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.name, event.name, suffix
+            event.alias, event.alias, suffix
         ));
     }
     output.push_str(&format!(
@@ -73,18 +77,17 @@ fn generate_placeholder_mapping(
     output.push_str("import { ExampleEntity } from \"../generated/schema\"\n");
 
     // Generate first handler with full example code
-    let first_event = &events[0];
     output.push_str(&generate_first_placeholder_handler(
-        first_event,
+        &resolved[0],
         contract_name,
         options,
     ));
 
     // Generate empty stub handlers for remaining events
-    for event in events.iter().skip(1) {
+    for event in resolved.iter().skip(1) {
         output.push_str(&format!(
             "\nexport function handle{}(event: {}Event): void {{}}\n",
-            event.name, event.name
+            event.alias, event.alias
         ));
     }
 
@@ -93,19 +96,20 @@ fn generate_placeholder_mapping(
 
 /// Generate the first handler with full example code.
 fn generate_first_placeholder_handler(
-    event: &EventInfo,
+    event: &ResolvedEvent,
     contract_name: &str,
     options: &ScaffoldOptions,
 ) -> String {
-    let event_name = &event.name;
+    let event_name = &event.alias;
 
     // Generate field assignments for first 2 event params
     let mut field_assignments = String::new();
-    for input in event.inputs.iter().take(2) {
-        let field_name = sanitize_param_name(&input.name);
+    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, input.name
+            field_name, accessor
         ));
     }
 
@@ -153,22 +157,18 @@ export function handle{event_name}(event: {event_name}Event): void {{
     )
 }
 
-/// Generate event handlers for all events in the ABI.
-fn generate_event_handlers(
-    contract_name: &str,
-    events: &[super::manifest::EventInfo],
-    _options: &ScaffoldOptions,
-) -> String {
-    let mut imports = String::new();
-    let mut handlers = String::new();
+/// 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");
 
-    // Import graph-ts types
-    imports.push_str("import { BigInt, Bytes } from \"@graphprotocol/graph-ts\"\n");
+    if events.is_empty() {
+        return imports;
+    }
 
-    // Import event types
+    // Import event types (by ABI alias).
     let event_imports: Vec<String> = events
         .iter()
-        .map(|e| format!("{} as {}Event", e.name, e.name))
+        .map(|e| format!("{} as {}Event", e.alias, e.alias))
         .collect();
 
     imports.push_str(&format!(
@@ -178,15 +178,16 @@ fn generate_event_handlers(
         contract_name
     ));
 
-    // Import entity types
-    let entity_imports: Vec<String> = events.iter().map(|e| e.name.clone()).collect();
+    // 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
+    // Generate handler for each event.
+    let mut handlers = String::new();
     for event in events {
         handlers.push('\n');
         handlers.push_str(&generate_single_handler(event));
@@ -195,23 +196,26 @@ fn generate_event_handlers(
     format!("{}\n{}", imports, handlers)
 }
 
-/// Generate a handler function for a single event.
-fn generate_single_handler(event: &super::manifest::EventInfo) -> String {
-    let event_name = &event.name;
+/// 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
+    // 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();
-    for input in &event.inputs {
-        let field_name = sanitize_param_name(&input.name);
+    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, input.name
+            field_name, accessor
         ));
     }
 
     format!(
-        r#"export function handle{event_name}(event: {event_name}Event): void {{
-  let entity = new {event_name}(
+        r#"export function handle{alias}(event: {alias}Event): void {{
+  let entity = new {entity_name}(
     event.transaction.hash.concatI32(event.logIndex.toI32())
   )
 
@@ -225,34 +229,6 @@ fn generate_single_handler(event: &super::manifest::EventInfo) -> String {
     )
 }
 
-/// Sanitize parameter name for use in AssemblyScript.
-fn sanitize_param_name(name: &str) -> String {
-    if name.is_empty() {
-        return "value".to_string();
-    }
-
-    // Convert to camelCase if starts with uppercase
-    let mut result = name.to_string();
-    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 reserved words
-    match result.as_str() {
-        "id" => "eventId".to_string(),
-        "type" => "eventType".to_string(),
-        _ => result,
-    }
-}
-
 /// Extract callable functions from ABI for documentation comments.
 fn extract_callable_functions(options: &ScaffoldOptions) -> String {
     let Some(abi) = &options.abi else {
@@ -276,10 +252,10 @@ fn extract_callable_functions(options: &ScaffoldOptions) -> String {
                 .unwrap_or("");
 
             // Only include view and pure functions (callable from mappings)
-            if state == "view" || state == "pure" {
-                if let Some(name) = item.get("name").and_then(|n| n.as_str()) {
-                    functions.push(format!("\n  // - contract.{}(...)", name));
-                }
+            if (state == "view" || state == "pure")
+                && let Some(name) = item.get("name").and_then(|n| n.as_str())
+            {
+                functions.push(format!("\n  // - contract.{}(...)", name));
             }
         }
     }
@@ -394,14 +370,6 @@ mod tests {
         assert!(mapping.contains("event.params.value"));
     }
 
-    #[test]
-    fn test_sanitize_param_name() {
-        assert_eq!(sanitize_param_name("from"), "from");
-        assert_eq!(sanitize_param_name("TokenId"), "tokenId");
-        assert_eq!(sanitize_param_name("id"), "eventId");
-        assert_eq!(sanitize_param_name(""), "value");
-    }
-
     #[test]
     fn test_extract_callable_functions() {
         let abi = json!([
@@ -433,4 +401,38 @@ mod tests {
         // 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
index 57345458408..72cb5d70a37 100644
--- a/gnd/src/scaffold/mod.rs
+++ b/gnd/src/scaffold/mod.rs
@@ -5,22 +5,27 @@
 
 pub mod manifest;
 mod mapping;
+mod naming;
 mod schema;
 
-pub use manifest::{extract_events_from_abi, generate_manifest, EventInfo, EventInput};
-pub use mapping::generate_mapping;
-pub use schema::generate_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::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use inflector::Inflector;
 use serde_json::Value as JsonValue;
 
 use crate::formatter::format_typescript;
-use crate::output::{step, with_spinner, Step};
+use crate::output::{Step, step, with_spinner};
 
 /// Options for scaffold generation.
 #[derive(Debug, Clone)]
@@ -60,6 +65,10 @@ 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");
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
index 35079e9dde3..ed47de3e041 100644
--- a/gnd/src/scaffold/schema.rs
+++ b/gnd/src/scaffold/schema.rs
@@ -1,7 +1,8 @@
 //! Schema (schema.graphql) generation for scaffold.
 
-use super::manifest::{extract_events_from_abi, EventInput};
 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 {
@@ -17,11 +18,11 @@ pub fn generate_schema(options: &ScaffoldOptions) -> String {
         return generate_example_entity(&events[0].inputs);
     }
 
-    // Generate entity for each event
+    // Generate an entity for each event, disambiguating overloaded names.
     let mut schema = String::new();
 
-    for event in events {
-        let entity = generate_event_entity(&event.name, &event.inputs);
+    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");
     }
@@ -55,7 +56,7 @@ fn generate_example_entity(inputs: &[EventInput]) -> String {
 }
 
 /// Generate an entity type for an event.
-fn generate_event_entity(event_name: &str, inputs: &[EventInput]) -> String {
+pub fn generate_event_entity(entity_name: &str, inputs: &[EventInput]) -> String {
     let mut fields = String::new();
 
     // ID field
@@ -76,7 +77,7 @@ fn generate_event_entity(event_name: &str, inputs: &[EventInput]) -> String {
     format!(
         "# Declare entity types as immutable when possible for better performance\n\
          type {} @entity(immutable: true) {{\n{}\n}}",
-        event_name, fields
+        entity_name, fields
     )
 }
 
@@ -88,6 +89,7 @@ fn solidity_to_graphql(solidity_type: &str) -> &'static str {
         return match solidity_to_graphql(inner) {
             "Bytes" => "[Bytes!]",
             "BigInt" => "[BigInt!]",
+            "Int" => "[Int!]",
             "String" => "[String!]",
             "Boolean" => "[Boolean!]",
             _ => "[Bytes!]",
@@ -112,53 +114,35 @@ fn solidity_to_graphql(solidity_type: &str) -> &'static str {
         | "bytes23" | "bytes24" | "bytes25" | "bytes26" | "bytes27" | "bytes28" | "bytes29"
         | "bytes30" | "bytes31" | "bytes32" => "Bytes",
 
-        // Integer types - all map to BigInt for simplicity
-        t if t.starts_with("uint") || t.starts_with("int") => "BigInt",
+        // 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",
     }
 }
 
-/// Sanitize a field name to be a valid GraphQL identifier.
-fn sanitize_field_name(name: &str) -> String {
-    if name.is_empty() {
-        return "value".to_string();
-    }
-
-    // GraphQL field names must start with a letter or underscore
-    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 to camelCase if starts with uppercase
-    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 reserved words
-    match result.as_str() {
-        "id" => "eventId".to_string(),
-        "type" => "eventType".to_string(),
-        _ => result,
-    }
+/// 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)]
@@ -270,8 +254,6 @@ mod tests {
         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("uint256"), "BigInt");
-        assert_eq!(solidity_to_graphql("int8"), "BigInt");
         assert_eq!(solidity_to_graphql("bytes32"), "Bytes");
         assert_eq!(solidity_to_graphql("bytes"), "Bytes");
         assert_eq!(solidity_to_graphql("address[]"), "[Bytes!]");
@@ -279,12 +261,20 @@ mod tests {
     }
 
     #[test]
-    fn test_sanitize_field_name() {
-        assert_eq!(sanitize_field_name("from"), "from");
-        assert_eq!(sanitize_field_name("tokenId"), "tokenId");
-        assert_eq!(sanitize_field_name("TokenId"), "tokenId");
-        assert_eq!(sanitize_field_name("123value"), "_123value");
-        assert_eq!(sanitize_field_name("id"), "eventId");
-        assert_eq!(sanitize_field_name(""), "value");
+    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
index d237577ad6c..d6dea4376c2 100644
--- a/gnd/src/services/contract.rs
+++ b/gnd/src/services/contract.rs
@@ -6,7 +6,7 @@
 use std::env;
 use std::time::Duration;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use reqwest::Client;
 use serde::Deserialize;
 use serde_json::Value as JsonValue;
@@ -220,15 +220,15 @@ impl ContractService {
 
             match self.fetch_from_etherscan(&api_url).await {
                 Ok(response) => {
-                    if response.status == "1" {
-                        if 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);
+                    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!(
                         "{} - {}",
@@ -273,16 +273,13 @@ impl ContractService {
             if response.status().is_success() {
                 match response.json::<SourceCodeResponse>().await {
                     Ok(data) => {
-                        if data.status == "1" {
-                            if let Some(results) = data.result {
-                                if let Some(first) = results.first() {
-                                    if let Some(name) = &first.contract_name {
-                                        if !name.is_empty() {
-                                            return Ok(name.clone());
-                                        }
-                                    }
-                                }
-                            }
+                        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"));
                     }
@@ -330,24 +327,21 @@ impl ContractService {
             if response.status().is_success() {
                 match response.json::<ContractCreationResponse>().await {
                     Ok(data) => {
-                        if data.status == "1" {
-                            if let Some(results) = data.result {
-                                if let Some(first) = results.first() {
-                                    // Try direct block number first
-                                    if let Some(block) = &first.block_number {
-                                        if let Ok(num) = block.parse::<u64>() {
-                                            return Ok(num);
-                                        }
-                                    }
-                                    // Fall back to fetching transaction
-                                    if let Some(tx_hash) = &first.tx_hash {
-                                        if let Ok(block) =
-                                            self.get_block_from_tx(network_id, tx_hash).await
-                                        {
-                                            return Ok(block);
-                                        }
-                                    }
-                                }
+                        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"));
@@ -570,13 +564,13 @@ impl ContractService {
                     if response.status().is_success() {
                         match response.json::<RpcResponse>().await {
                             Ok(data) => {
-                                if let Some(result) = data.result {
-                                    if 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);
-                                        }
+                                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"));
diff --git a/gnd/src/services/graph_node.rs b/gnd/src/services/graph_node.rs
index 61facbf897e..9d3faa07d2b 100644
--- a/gnd/src/services/graph_node.rs
+++ b/gnd/src/services/graph_node.rs
@@ -3,7 +3,7 @@
 //! This client is used by the `create`, `remove`, and `deploy` commands to
 //! interact with a Graph Node instance.
 
-use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION, USER_AGENT};
+use reqwest::header::{AUTHORIZATION, HeaderMap, HeaderValue, USER_AGENT};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use url::Url;
@@ -48,7 +48,7 @@ impl GraphNodeClient {
             other => {
                 return Err(GraphNodeError::UnsupportedProtocol {
                     protocol: other.to_string(),
-                })
+                });
             }
         }
 
diff --git a/gnd/src/services/ipfs.rs b/gnd/src/services/ipfs.rs
index 42f9dedd347..54070dbac2b 100644
--- a/gnd/src/services/ipfs.rs
+++ b/gnd/src/services/ipfs.rs
@@ -7,7 +7,7 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use reqwest::multipart::{Form, Part};
 use serde::Deserialize;
 use url::Url;
diff --git a/gnd/src/services/mod.rs b/gnd/src/services/mod.rs
index c9bf2c10b4b..27fa4942c99 100644
--- a/gnd/src/services/mod.rs
+++ b/gnd/src/services/mod.rs
@@ -3,8 +3,8 @@ mod graph_node;
 mod ipfs;
 
 pub use contract::{
-    get_fallback_etherscan_url, ContractInfo, ContractService, Network, NetworksRegistry,
-    SourcifyResult,
+    ContractInfo, ContractService, Network, NetworksRegistry, SourcifyResult,
+    get_fallback_etherscan_url,
 };
 pub use graph_node::{DeployResult, GraphNodeClient, GraphNodeError};
-pub use ipfs::{read_file, IpfsClient};
+pub use ipfs::{IpfsClient, read_file};
diff --git a/gnd/src/shared/mod.rs b/gnd/src/shared/mod.rs
index f2a243f57b6..4421dbd4645 100644
--- a/gnd/src/shared/mod.rs
+++ b/gnd/src/shared/mod.rs
@@ -5,4 +5,4 @@
 
 pub mod sanitize;
 
-pub use sanitize::{capitalize, handle_reserved_word, RESERVED_WORDS};
+pub use sanitize::{RESERVED_WORDS, capitalize, handle_reserved_word};
diff --git a/gnd/src/validation/mod.rs b/gnd/src/validation/mod.rs
index b64c9f41398..8991df4fba5 100644
--- a/gnd/src/validation/mod.rs
+++ b/gnd/src/validation/mod.rs
@@ -9,9 +9,9 @@ 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::data::subgraph::SubgraphManifestValidationError;
 use graph::prelude::DeploymentHash;
 use graph::schema::{InputSchema, SchemaValidationError};
 use semver::Version;
@@ -307,10 +307,10 @@ pub(crate) fn validate_manifest(
         .collect();
 
     // Only validate networks if there are data sources
-    if !manifest.data_sources.is_empty() {
-        if let Err(e) = manifest_validation::validate_single_network(&networks) {
-            errors.push(e.into());
-        }
+    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
@@ -492,26 +492,26 @@ fn validate_source_abi_references(manifest: &Manifest) -> Vec<ManifestValidation
     let mut errors = Vec::new();
 
     for ds in &manifest.data_sources {
-        if let Some(source_abi) = &ds.source_abi {
-            if !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(),
-                });
-            }
+        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 {
-            if !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(),
-                });
-            }
+        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(),
+            });
         }
     }
 
@@ -772,45 +772,45 @@ fn validate_handler_signatures(
     let mut errors = Vec::new();
 
     for ds in &manifest.data_sources {
-        if let Some(source_abi) = &ds.source_abi {
-            if 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,
-                    ));
-                }
+        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 {
-            if 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,
-                    ));
-                }
+        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,
+                ));
             }
         }
     }
diff --git a/gnd/src/watch.rs b/gnd/src/watch.rs
index a604ab38fce..cf1d3e4ea31 100644
--- a/gnd/src/watch.rs
+++ b/gnd/src/watch.rs
@@ -9,8 +9,8 @@ use std::path::PathBuf;
 use std::sync::mpsc;
 use std::time::Duration;
 
-use anyhow::{anyhow, Result};
-use notify::{recommended_watcher, RecursiveMode, Watcher};
+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);
@@ -65,12 +65,12 @@ where
     // Watch directories containing the files
     let mut watched_dirs = HashSet::new();
     for file in &files_to_watch {
-        if let Some(dir) = file.parent() {
-            if watched_dirs.insert(dir.to_path_buf()) {
-                watcher
-                    .watch(dir, RecursiveMode::NonRecursive)
-                    .map_err(|e| anyhow!("Failed to watch {}: {}", dir.display(), e))?;
-            }
+        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))?;
         }
     }
 
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
index e1b5cde09ac..192d201c3be 100644
--- a/gnd/tests/cli_commands.rs
+++ b/gnd/tests/cli_commands.rs
@@ -80,6 +80,61 @@ fn run_gnd_success(args: &[&str], cwd: &Path) -> std::process::Output {
     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
 // ============================================================================
@@ -376,6 +431,13 @@ fn test_add_datasource() {
         "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(
@@ -410,6 +472,231 @@ fn test_add_datasource() {
         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
+    );
 }
 
 // ============================================================================
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
index fcbfe1ee5a2..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,7 +18,7 @@ old_bigdecimal = { version = "=0.1.2", features = [
 ], package = "bigdecimal" }
 bytes = "1.0.1"
 bs58 = { workspace = true }
-cid = "0.11.1"
+cid = "0.11.3"
 derive_more = { workspace = true, features = ["debug"] }
 graph_derive = { path = "./derive" }
 diesel = { workspace = true }
@@ -27,6 +27,7 @@ chrono = "0.4.44"
 envconfig = { workspace = true }
 Inflector = "0.11.3"
 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"
@@ -55,18 +56,17 @@ 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" }
+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 = "1.1.0"
+toml = "1.1.2"
 url = { workspace = true }
 prometheus = "0.14.0"
 priority-queue = "2.7.0"
@@ -80,12 +80,12 @@ wasmparser = "0.118.1"
 thiserror = { workspace = true }
 parking_lot = "0.12.5"
 portable-atomic = { version = "1.13", features = ["fallback"] }
-itertools = "0.14.0"
+itertools = "0.15.0"
 defer = "0.2"
 
 serde_plain = "1.0.2"
 csv = "1.4.0"
-object_store = { version = "0.13.2", features = ["gcp"] }
+object_store = { version = "0.14.0", features = ["gcp"] }
 
 # Dependencies related to Amp subgraphs
 ahash.workspace = true
@@ -102,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/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 811484a5c02..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(
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/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 87dd747f0c8..bda2c783fd9 100644
--- a/graph/src/amp/client/flight_client.rs
+++ b/graph/src/amp/client/flight_client.rs
@@ -9,10 +9,10 @@ use arrow_flight::{
 };
 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,
 };
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 496c4a9fbd1..2c22336d379 100644
--- a/graph/src/amp/sql/query_builder/block_range_query.rs
+++ b/graph/src/amp/sql/query_builder/block_range_query.rs
@@ -6,7 +6,7 @@ use std::{
 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.
 ///
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 990d721ec8f..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::{
@@ -195,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 {
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 cc59390f3b5..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};
@@ -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 c076619bbf9..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
-                    ))
+                    ));
                 }
             }
         }
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 79ca098849e..a87e3da1fc3 100644
--- a/graph/src/blockchain/mock.rs
+++ b/graph/src/blockchain/mock.rs
@@ -13,8 +13,8 @@ use crate::{
     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};
@@ -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)]
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
index 8e2daff4684..13859c8f4a7 100644
--- a/graph/src/components/ethereum/json_patch.rs
+++ b/graph/src/components/ethereum/json_patch.rs
@@ -10,11 +10,11 @@
 use serde_json::Value;
 
 pub fn patch_type_field(obj: &mut Value) -> bool {
-    if let Value::Object(map) = obj {
-        if !map.contains_key("type") {
-            map.insert("type".to_string(), Value::String("0x0".to_string()));
-            return true;
-        }
+    if let Value::Object(map) = obj
+        && !map.contains_key("type")
+    {
+        map.insert("type".to_string(), Value::String("0x0".to_string()));
+        return true;
     }
     false
 }
diff --git a/graph/src/components/ethereum/network.rs b/graph/src/components/ethereum/network.rs
index e2407cc8e23..8460ad7bdf1 100644
--- a/graph/src/components/ethereum/network.rs
+++ b/graph/src/components/ethereum/network.rs
@@ -1,15 +1,20 @@
+use alloy::consensus::BlobTransactionSidecarVariant;
+use alloy::eips::eip7702::SignedAuthorization;
 use alloy::network::{
-    AnyHeader, AnyReceiptEnvelope, AnyTxEnvelope, AnyTxType, AnyTypedTransaction, BuildResult,
-    Network, NetworkWallet, TransactionBuilder, TransactionBuilderError,
+    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, TransactionInputKind, TransactionReceipt, TransactionRequest,
+    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;
@@ -32,6 +37,59 @@ use super::types::AnyTransaction;
 #[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;
@@ -39,7 +97,7 @@ impl Network for AnyNetworkBare {
     type ReceiptEnvelope = AnyReceiptEnvelope;
     type Header = AnyHeader;
 
-    type TransactionRequest = WithOtherFields<TransactionRequest>;
+    type TransactionRequest = AnyTransactionRequest;
     type TransactionResponse = AnyTransaction;
     type ReceiptResponse = TransactionReceipt<AnyReceiptEnvelope<Log>>;
     type HeaderResponse = Header<AnyHeader>;
@@ -55,140 +113,179 @@ impl RecommendedFillers for AnyNetworkBare {
     }
 }
 
-impl TransactionBuilder<AnyNetworkBare> for WithOtherFields<TransactionRequest> {
+// Delegate `TransactionBuilder` to the inner `WithOtherFields<TransactionRequest>`.
+// Required as a supertrait of `NetworkTransactionBuilder`.
+impl TransactionBuilder for AnyTransactionRequest {
     fn chain_id(&self) -> Option<ChainId> {
-        self.deref().chain_id()
+        self.0.chain_id()
     }
 
     fn set_chain_id(&mut self, chain_id: ChainId) {
-        self.deref_mut().set_chain_id(chain_id)
+        self.0.set_chain_id(chain_id)
     }
 
     fn nonce(&self) -> Option<u64> {
-        self.deref().nonce()
+        self.0.nonce()
     }
 
     fn set_nonce(&mut self, nonce: u64) {
-        self.deref_mut().set_nonce(nonce)
+        self.0.set_nonce(nonce)
     }
 
     fn take_nonce(&mut self) -> Option<u64> {
-        self.deref_mut().nonce.take()
+        self.0.deref_mut().nonce.take()
     }
 
     fn input(&self) -> Option<&Bytes> {
-        self.deref().input()
+        self.0.input()
     }
 
     fn set_input<T: Into<Bytes>>(&mut self, input: T) {
-        self.deref_mut().set_input(input);
+        self.0.set_input(input);
     }
 
     fn set_input_kind<T: Into<Bytes>>(&mut self, input: T, kind: TransactionInputKind) {
-        self.deref_mut().set_input_kind(input, kind)
+        self.0.set_input_kind(input, kind)
     }
 
     fn from(&self) -> Option<Address> {
-        self.deref().from()
+        self.0.from()
     }
 
     fn set_from(&mut self, from: Address) {
-        self.deref_mut().set_from(from);
+        self.0.set_from(from);
     }
 
     fn kind(&self) -> Option<TxKind> {
-        self.deref().kind()
+        self.0.kind()
     }
 
     fn clear_kind(&mut self) {
-        self.deref_mut().clear_kind()
+        self.0.clear_kind()
     }
 
     fn set_kind(&mut self, kind: TxKind) {
-        self.deref_mut().set_kind(kind)
+        self.0.set_kind(kind)
     }
 
     fn value(&self) -> Option<U256> {
-        self.deref().value()
+        self.0.value()
     }
 
     fn set_value(&mut self, value: U256) {
-        self.deref_mut().set_value(value)
+        self.0.set_value(value)
     }
 
     fn gas_price(&self) -> Option<u128> {
-        self.deref().gas_price()
+        self.0.gas_price()
     }
 
     fn set_gas_price(&mut self, gas_price: u128) {
-        self.deref_mut().set_gas_price(gas_price);
+        self.0.set_gas_price(gas_price);
     }
 
     fn max_fee_per_gas(&self) -> Option<u128> {
-        self.deref().max_fee_per_gas()
+        self.0.max_fee_per_gas()
     }
 
     fn set_max_fee_per_gas(&mut self, max_fee_per_gas: u128) {
-        self.deref_mut().set_max_fee_per_gas(max_fee_per_gas);
+        self.0.set_max_fee_per_gas(max_fee_per_gas);
     }
 
     fn max_priority_fee_per_gas(&self) -> Option<u128> {
-        self.deref().max_priority_fee_per_gas()
+        self.0.max_priority_fee_per_gas()
     }
 
     fn set_max_priority_fee_per_gas(&mut self, max_priority_fee_per_gas: u128) {
-        self.deref_mut()
+        self.0
             .set_max_priority_fee_per_gas(max_priority_fee_per_gas);
     }
 
     fn gas_limit(&self) -> Option<u64> {
-        self.deref().gas_limit()
+        self.0.gas_limit()
     }
 
     fn set_gas_limit(&mut self, gas_limit: u64) {
-        self.deref_mut().set_gas_limit(gas_limit);
+        self.0.set_gas_limit(gas_limit);
     }
 
     fn access_list(&self) -> Option<&AccessList> {
-        self.deref().access_list()
+        self.0.access_list()
     }
 
     fn set_access_list(&mut self, access_list: AccessList) {
-        self.deref_mut().set_access_list(access_list)
+        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.deref()
+        self.0
+            .deref()
             .complete_type(ty.try_into().map_err(|_| vec!["supported tx type"])?)
     }
 
     fn can_submit(&self) -> bool {
-        self.deref().can_submit()
+        self.0.deref().can_submit()
     }
 
     fn can_build(&self) -> bool {
-        self.deref().can_build()
+        self.0.deref().can_build()
     }
 
     fn output_tx_type(&self) -> <AnyNetworkBare as Network>::TxType {
-        self.deref().output_tx_type().into()
+        self.0.deref().output_tx_type().into()
     }
 
     fn output_tx_type_checked(&self) -> Option<<AnyNetworkBare as Network>::TxType> {
-        self.deref().output_tx_type_checked().map(Into::into)
+        self.0.deref().output_tx_type_checked().map(Into::into)
     }
 
     fn prep_for_submission(&mut self) {
-        self.deref_mut().prep_for_submission()
+        self.0.deref_mut().prep_for_submission()
     }
 
     fn build_unsigned(
         self,
     ) -> BuildResult<<AnyNetworkBare as Network>::UnsignedTx, AnyNetworkBare> {
-        if let Err((tx_type, missing)) = self.missing_keys() {
+        if let Err((tx_type, missing)) = self.0.missing_keys() {
             return Err(TransactionBuilderError::InvalidTransactionRequest(
                 tx_type.into(),
                 missing,
@@ -196,6 +293,7 @@ impl TransactionBuilder<AnyNetworkBare> for WithOtherFields<TransactionRequest>
             .into_unbuilt(self));
         }
         Ok(self
+            .0
             .inner
             .build_typed_tx()
             .expect("checked by missing_keys")
diff --git a/graph/src/components/ethereum/types.rs b/graph/src/components/ethereum/types.rs
index b44385dbafa..104f6dbe036 100644
--- a/graph/src/components/ethereum/types.rs
+++ b/graph/src/components/ethereum/types.rs
@@ -3,10 +3,10 @@ use alloy::{
         AnyHeader, AnyReceiptEnvelope, AnyRpcHeader, AnyTxEnvelope, ReceiptResponse,
         TransactionResponse,
     },
-    primitives::{Address, Bytes, B256, U256},
+    primitives::{Address, B256, Bytes, U256},
     rpc::types::{
-        trace::parity::{Action, LocalizedTransactionTrace, TraceOutput},
         Block, Header, Log, Transaction, TransactionReceipt,
+        trace::parity::{Action, LocalizedTransactionTrace, TraceOutput},
     },
 };
 use serde::{Deserialize, Serialize};
diff --git a/graph/src/components/link_resolver/arweave.rs b/graph/src/components/link_resolver/arweave.rs
index 266558a6466..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;
@@ -106,7 +106,7 @@ impl ArweaveResolver for ArweaveClient {
         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 });
             }
             _ => {}
         };
diff --git a/graph/src/components/link_resolver/ipfs.rs b/graph/src/components/link_resolver/ipfs.rs
index f71a73ea5bb..c1b866c9994 100644
--- a/graph/src/components/link_resolver/ipfs.rs
+++ b/graph/src/components/link_resolver/ipfs.rs
@@ -12,11 +12,11 @@ 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::*;
 
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 7aac48278b9..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, ObjectStoreExt as _};
+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 3677ed6447f..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;
diff --git a/graph/src/components/network_provider/provider_manager.rs b/graph/src/components/network_provider/provider_manager.rs
index 3c1a6e3196a..c94f71563ec 100644
--- a/graph/src/components/network_provider/provider_manager.rs
+++ b/graph/src/components/network_provider/provider_manager.rs
@@ -5,9 +5,9 @@ use std::time::Duration;
 
 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;
 
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 4750779701c..0bc3f17efef 100644
--- a/graph/src/components/store/entity_cache.rs
+++ b/graph/src/components/store/entity_cache.rs
@@ -1,15 +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::atomic::{AtomicU32, Ordering};
 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, StopwatchMetrics, 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};
@@ -291,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) {
diff --git a/graph/src/components/store/err.rs b/graph/src/components/store/err.rs
index 995f0c67648..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;
diff --git a/graph/src/components/store/mod.rs b/graph/src/components/store/mod.rs
index 4c5b96c589d..a3a85b51cc2 100644
--- a/graph/src/components/store/mod.rs
+++ b/graph/src/components/store/mod.rs
@@ -27,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;
@@ -43,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)]
@@ -521,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(),
+                    )]);
                 }
             }
         }
@@ -668,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)]
diff --git a/graph/src/components/store/traits.rs b/graph/src/components/store/traits.rs
index bb4397432ff..0249e999da6 100644
--- a/graph/src/components/store/traits.rs
+++ b/graph/src/components/store/traits.rs
@@ -17,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};
 
@@ -142,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
@@ -219,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.
@@ -447,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>;
 
@@ -582,7 +594,7 @@ pub trait ChainStore: ChainHeadStore {
     /// 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>;
+    -> Result<Option<BlockPtr>, Error>;
 
     /// Returns the blocks present in the store for the given block numbers.
     async fn block_ptrs_by_numbers(
@@ -740,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 0f8ba70251e..1a29714e51e 100644
--- a/graph/src/components/store/write.rs
+++ b/graph/src/components/store/write.rs
@@ -7,7 +7,7 @@ use std::{
 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},
@@ -202,7 +202,7 @@ impl EntityModification {
                     "can not clamp block range for removal of {:?} to {}",
                     self,
                     block
-                ))
+                ));
             }
         }
         Ok(())
@@ -415,16 +415,16 @@ impl RowGroup {
     pub fn last_op(&self, key: &EntityKey, at: BlockNumber) -> Option<EntityOp<'_>> {
         // 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) {
-            if let Some(op) = self.rows.get(idx).and_then(|emod| {
+        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
@@ -491,9 +491,12 @@ impl RowGroup {
                             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())));
+                            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 */ }
                     }
@@ -548,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
@@ -835,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;
@@ -1048,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,
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/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 589f894bf96..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};
@@ -228,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 {
@@ -371,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(),
                             )
                         })?)
                     }
@@ -525,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(),
             }
         )
     }
@@ -833,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,
@@ -844,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,
@@ -968,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
     }
 
@@ -1208,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);
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 eb7eb461f33..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,8 +95,8 @@ impl UnifiedMappingApiVersion {
     pub(super) fn try_from_versions(
         versions: impl Iterator<Item = Version>,
     ) -> Result<Self, DifferentMappingApiVersions> {
-        use super::manifest_validation::validate_api_versions;
         use super::SubgraphManifestValidationError;
+        use super::manifest_validation::validate_api_versions;
 
         let versions_vec: Vec<Version> = versions.collect();
 
diff --git a/graph/src/data/subgraph/mod.rs b/graph/src/data/subgraph/mod.rs
index 46154155319..0c20405cdf1 100644
--- a/graph/src/data/subgraph/mod.rs
+++ b/graph/src/data/subgraph/mod.rs
@@ -15,7 +15,7 @@ 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;
@@ -46,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;
@@ -580,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.
             //
@@ -591,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(())
+            }
         }
     }
 }
@@ -872,19 +896,18 @@ impl<C: Blockchain> UnvalidatedSubgraphManifest<C> {
             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/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 454f20ec29e..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;
 
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/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 c56bea2bac4..8acab1b5d05 100644
--- a/graph/src/env/mappings.rs
+++ b/graph/src/env/mappings.rs
@@ -149,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,
@@ -175,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>,
diff --git a/graph/src/env/mod.rs b/graph/src/env/mod.rs
index 536a383e0da..54c585d5ab3 100644
--- a/graph/src/env/mod.rs
+++ b/graph/src/env/mod.rs
@@ -172,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
@@ -322,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(',')
@@ -345,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),
@@ -549,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")]
diff --git a/graph/src/env/store.rs b/graph/src/env/store.rs
index e36e60c8b84..92c5564d17f 100644
--- a/graph/src/env/store.rs
+++ b/graph/src/env/store.rs
@@ -254,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");
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 41c69a0fc7d..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, ObjectStoreExt as _};
+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 908a46c338e..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 _;
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 91a9126e4f1..ff2a8a431cc 100644
--- a/graph/src/ipfs/gateway_client.rs
+++ b/graph/src/ipfs/gateway_client.rs
@@ -5,7 +5,7 @@ use async_trait::async_trait;
 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;
@@ -162,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;
@@ -551,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 1838036c6ec..8dc1a7b9445 100644
--- a/graph/src/ipfs/rpc_client.rs
+++ b/graph/src/ipfs/rpc_client.rs
@@ -140,11 +140,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::ipfs::{ContentPath, IpfsContext, IpfsMetrics};
diff --git a/graph/src/ipfs/server_address.rs b/graph/src/ipfs/server_address.rs
index 46890e4e083..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;
diff --git a/graph/src/lib.rs b/graph/src/lib.rs
index 83a8a4a9112..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,7 +79,7 @@ pub use url;
 pub mod prelude {
     pub use ::anyhow;
     pub use alloy;
-    pub use anyhow::{anyhow, Context as _, Error};
+    pub use anyhow::{Context as _, Error, anyhow};
     pub use chrono;
     pub use diesel;
     pub use envconfig;
@@ -92,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;
@@ -100,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;
@@ -119,17 +120,17 @@ 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, SeqGenerator, StaleCallCacheResult, 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, BlockStateCheckpoint, HostMetrics, InstanceDSTemplateInfo, RuntimeHost,
@@ -138,12 +139,12 @@ pub mod prelude {
     };
     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 ce5765bb38e..833f984e208 100644
--- a/graph/src/log/mod.rs
+++ b/graph/src/log/mod.rs
@@ -30,8 +30,11 @@ use std::{
 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 {
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 c91a5548b08..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;
 
diff --git a/graph/src/schema/api.rs b/graph/src/schema/api.rs
index 4ebbbdc23c4..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(
@@ -817,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![],
@@ -1016,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),
     };
 
@@ -1098,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(),
@@ -1303,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;
@@ -2044,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");
@@ -2068,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");
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/input/mod.rs b/graph/src/schema/input/mod.rs
index ef241ff831f..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,13 +15,13 @@ 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};
 
@@ -1265,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"),
             }
         })
@@ -1745,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},
         },
     };
 
@@ -1975,7 +1975,7 @@ mod validations {
                             .find(|typ| typ.name[..].eq(entity))
                         {
                             None => {
-                                return vec![SchemaValidationError::FulltextIncludedEntityNotFound]
+                                return vec![SchemaValidationError::FulltextIncludedEntityNotFound];
                             }
                             Some(t) => t,
                         };
@@ -2304,7 +2304,7 @@ mod validations {
                             object_type,
                             &field.name,
                             "the @derivedFrom `field` argument must be a string",
-                        ))
+                        ));
                     }
                 };
 
@@ -2362,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));
                 }
             }
@@ -3215,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 e32c3373dce..a215c95b585 100644
--- a/graph/src/schema/input/sqlexpr.rs
+++ b/graph/src/schema/input/sqlexpr.rs
@@ -236,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 {
@@ -263,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/mod.rs b/graph/src/schema/mod.rs
index 52a440fc04f..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_";
@@ -72,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)
@@ -90,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,
@@ -122,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),
@@ -148,7 +159,9 @@ 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")]
+    #[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),
@@ -168,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"
@@ -180,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),
@@ -309,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/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 b560906fdc0..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)
     }
 }
 
diff --git a/graph/src/util/futures.rs b/graph/src/util/futures.rs
index 01d775bfc6b..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();
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 2375f411b33..0bd954aabf4 100644
--- a/graph/src/util/test_utils.rs
+++ b/graph/src/util/test_utils.rs
@@ -54,6 +54,7 @@ pub fn create_dummy_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 57bf2c66420..cec9330f072 100644
--- a/graphql/Cargo.toml
+++ b/graphql/Cargo.toml
@@ -9,8 +9,8 @@ crossbeam = "0.8"
 graph = { path = "../graph" }
 graphql-tools = { workspace = true }
 lazy_static = { workspace = true }
-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" }
+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 4f6012dc4ea..cc9eeae5083 100644
--- a/graphql/src/execution/ast.rs
+++ b/graphql/src/execution/ast.rs
@@ -4,8 +4,8 @@ use graph::{
     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
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 5ce1385abbd..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),
     }
 }
 
@@ -391,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 c23a475a08a..e9a04c8c97b 100644
--- a/graphql/src/store/prefetch.rs
+++ b/graphql/src/store/prefetch.rs
@@ -9,7 +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::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.
diff --git a/graphql/src/store/query.rs b/graphql/src/store/query.rs
index 855b83b409a..f893663b258 100644
--- a/graphql/src/store/query.rs
+++ b/graphql/src/store/query.rs
@@ -10,7 +10,7 @@ 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};
@@ -258,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,
@@ -695,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},
     };
@@ -1218,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),
         }
@@ -1247,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/node/resources/tests/full_config.toml b/node/resources/tests/full_config.toml
index 4624af467c7..6292770a087 100644
--- a/node/resources/tests/full_config.toml
+++ b/node/resources/tests/full_config.toml
@@ -80,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 a3e8216410c..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;
@@ -1079,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> {
@@ -1132,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();
 
@@ -1499,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?;
@@ -1563,7 +1573,9 @@ async fn main() -> anyhow::Result<()> {
                             }
 
                             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)
diff --git a/node/src/chain.rs b/node/src/chain.rs
index 2e52d966311..824cbf5faeb 100644
--- a/node/src/chain.rs
+++ b/node/src/chain.rs
@@ -2,13 +2,13 @@ use crate::config::{ChainSettings as ConfigChainSettings, Config, ProviderDetail
 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};
@@ -16,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};
@@ -356,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()
                     }
                 };
diff --git a/node/src/config.rs b/node/src/config.rs
index 1da6ce6cd05..4c9b776e43a 100644
--- a/node/src/config.rs
+++ b/node/src/config.rs
@@ -6,22 +6,23 @@ use graph::{
         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, BLOCK_NUMBER_MAX,
+        serde_json, serde_regex, toml,
     },
 };
 use graph_chain_ethereum as ethereum;
 use graph_chain_ethereum::{Compression, NodeCapabilities};
-use graph_store_postgres::{DeploymentPlacer, Shard as ShardName, PRIMARY_SHARD};
+use graph_store_postgres::{DeploymentPlacer, PRIMARY_SHARD, Shard as ShardName};
 
 use graph::http::{HeaderMap, Uri};
 use serde::Serialize;
@@ -82,6 +83,7 @@ pub struct Config {
     pub stores: BTreeMap<String, Shard>,
     pub chains: ChainSection,
     pub deployment: Deployment,
+    pub log_store: Option<LogStoreSection>,
 }
 
 fn validate_name(s: &str) -> Result<()> {
@@ -234,6 +236,7 @@ impl Config {
             stores,
             chains,
             deployment,
+            log_store: None,
         })
     }
 
@@ -270,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,
@@ -517,19 +593,19 @@ impl ChainSection {
             }
             // Check that an explicit amp alias doesn't collide with
             // another chain's own name (which would be ambiguous).
-            if chain.amp.is_some() {
-                if 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,
-                        ));
-                    }
+            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());
@@ -1134,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 {
@@ -1324,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) {
@@ -1507,11 +1585,11 @@ mod tests {
     use std::time::Duration;
 
     use crate::config::{
-        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,
-        ChainSection, Web3Rule,
+        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::{
@@ -1522,7 +1600,7 @@ mod tests {
     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;
@@ -1886,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:")
+            )
         }
     }
 
@@ -2338,6 +2418,7 @@ fdw_pool_size = [
             chains: section,
             deployment: toml::from_str("[[rule]]\nshards = [\"primary\"]\nindexers = [\"test\"]")
                 .unwrap(),
+            log_store: None,
         };
 
         let amp = config.amp_chain_names();
@@ -2380,6 +2461,7 @@ fdw_pool_size = [
                     "[[rule]]\nshards = [\"primary\"]\nindexers = [\"test\"]",
                 )
                 .unwrap(),
+                log_store: None,
             }
         };
 
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 85127f0d474..18ee4c727db 100644
--- a/node/src/launcher.rs
+++ b/node/src/launcher.rs
@@ -20,15 +20,15 @@ use graph::{
     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;
@@ -367,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(
@@ -380,6 +381,7 @@ fn build_graphql_server(
         network_store.clone(),
         load_manager,
         metrics_registry,
+        log_store,
     ));
 
     GraphQLQueryServer::new(logger_factory, graphql_runner.clone())
@@ -450,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(),
@@ -580,6 +607,7 @@ pub async fn run(
             metrics_registry.clone(),
             &network_store,
             &logger_factory,
+            log_store.clone(),
         );
 
         let index_node_server = IndexNodeServer::new(
@@ -692,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/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 3943861fe56..ffce3c738a6 100644
--- a/node/src/manager/commands/chain.rs
+++ b/node/src/manager/commands/chain.rs
@@ -19,19 +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::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> {
@@ -250,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);
 
@@ -257,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
+    };
+
+    if !reuse_existing_backup {
+        let chain =
+            BlockStore::allocate_chain(&mut conn, &chain_name, &target_shard, &ident).await?;
+        store.add_chain_store(&chain, true).await?;
+    }
 
-            let chain = BlockStore::allocate_chain(conn, &chain_name, &shard, &ident).await?;
+    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,
+        );
+    }
+
+    conn.transaction::<(), StoreError, _>(async |conn| {
+        sql_query(
+            "alter table deployment_schemas drop constraint deployment_schemas_network_fkey;",
+        )
+        .execute(conn)
+        .await?;
 
-            store.add_chain_store(&chain, true).await?;
+        if let Some(backup) = existing_backup.as_ref() {
+            update_chain_name(conn, &backup.name, &temp_backup_name).await?;
+        }
 
-            // Drop the foreign key constraint on deployment_schemas
-            sql_query(
-                "alter table deployment_schemas drop constraint deployment_schemas_network_fkey;",
-            )
-            .execute(conn).await?;
+        update_chain_name(conn, &chain_name, &canonical_backup_name).await?;
 
-            // Update the current chain name to chain-old
-            update_chain_name(conn, &chain_name, &new_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 dc6b2e0aee1..d7014bd4b1c 100644
--- a/node/src/manager/commands/check_blocks.rs
+++ b/node/src/manager/commands/check_blocks.rs
@@ -8,7 +8,7 @@ use graph::{
     },
     prelude::{
         alloy::primitives::B256,
-        anyhow::{self, anyhow, Context},
+        anyhow::{self, Context, anyhow},
     },
     slog::Logger,
 };
@@ -165,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.
     ///
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 0d43f74f61d..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};
@@ -120,7 +121,8 @@ async fn create_inner(
         .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",
+        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
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/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/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 bcf9417569a..44a5e888f46 100644
--- a/node/src/manager/commands/remove.rs
+++ b/node/src/manager/commands/remove.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: &str) -> Result<(), Error> {
diff --git a/node/src/manager/commands/rewind.rs b/node/src/manager/commands/rewind.rs
index 03a75692c27..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};
diff --git a/node/src/manager/commands/run.rs b/node/src/manager/commands/run.rs
index 2c23eb5151d..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;
 
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 2191aaea0d9..e1630786345 100644
--- a/node/src/network_setup.rs
+++ b/node/src/network_setup.rs
@@ -1,7 +1,7 @@
 use ethereum::{
+    BlockIngestor,
     chain::ChainSettings,
     network::{EthereumNetworkAdapter, EthereumNetworkAdapters},
-    BlockIngestor,
 };
 use graph::components::network_provider::ChainName;
 use graph::components::network_provider::NetworkDetails;
@@ -20,10 +20,11 @@ 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};
@@ -31,8 +32,8 @@ use graph_store_postgres::{BlockStore, ChainHeadUpdateListener};
 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)]
@@ -129,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(),
+                        );
                     }
                 }
             }
@@ -181,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))
     }
@@ -260,7 +261,7 @@ impl Networks {
             )
             .collect_vec();
 
-        let s = Self {
+        Self {
             adapters: adapters2,
             rpc_provider_manager: ProviderManager::new(
                 logger.clone(),
@@ -272,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 9372d4f1472..dbcd3b68cf9 100644
--- a/node/src/opt.rs
+++ b/node/src/opt.rs
@@ -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 24132881f3b..fb3737e5b89 100644
--- a/node/src/store_builder.rs
+++ b/node/src/store_builder.rs
@@ -2,18 +2,18 @@ use std::iter::FromIterator;
 use std::{collections::HashMap, sync::Arc};
 
 use graph::components::store::BLOCK_CACHE_SIZE;
-use graph::prelude::{o, MetricsRegistry, NodeId};
+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};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3f82149eca7..deb287d228f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -60,6 +60,15 @@ importers:
         specifier: 0.34.0
         version: 0.34.0
 
+  tests/integration-tests/logs-query:
+    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/multiple-subgraph-datasources:
     devDependencies:
       '@graphprotocol/graph-ts':
@@ -296,10 +305,6 @@ packages:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
 
-  '@dnsquery/dns-packet@6.1.1':
-    resolution: {integrity: sha512-WXTuFvL3G+74SchFAtz3FgIYVOe196ycvGsMgvSH/8Goptb1qpIQtIuM4SOK9G9lhMWYpHxnXyy544ZhluFOew==}
-    engines: {node: '>=6'}
-
   '@ethersproject/abi@5.0.7':
     resolution: {integrity: sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==}
 
@@ -376,6 +381,11 @@ packages:
     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.98.1':
     resolution: {integrity: sha512-GrWFcRCBlLcRT+gIGundQl7yyrX3YWUPj66bxThKf5CJvvWXdZoNxrj27dMMqulsSwYmpCkb3YmpCiVJFGdpHw==}
     engines: {node: '>=20.18.1'}
@@ -402,12 +412,8 @@ packages:
   '@graphprotocol/graph-ts@0.36.0-alpha-20241129215038-b75cda9':
     resolution: {integrity: sha512-DPLx/owGh38n6HCQaxO6rk40zfYw3EYqSvyHp+s3ClMCxQET9x4/hberkOXrPaxxiPxgUTVa6ie4mwc7GTroEw==}
 
-  '@inquirer/ansi@1.0.2':
-    resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==}
-    engines: {node: '>=18'}
-
-  '@inquirer/checkbox@4.3.2':
-    resolution: {integrity: sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==}
+  '@inquirer/checkbox@4.2.1':
+    resolution: {integrity: sha512-bevKGO6kX1eM/N+pdh9leS5L7TBF4ICrzi9a+cbWkrxeAeIcwlo/7OfWGCDERdRCI2/Q6tjltX4bt07ALHDwFw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -415,8 +421,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/confirm@5.1.21':
-    resolution: {integrity: sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==}
+  '@inquirer/confirm@5.1.15':
+    resolution: {integrity: sha512-SwHMGa8Z47LawQN0rog0sT+6JpiL0B7eW9p1Bb7iCeKDGTI5Ez25TSc2l8kw52VV7hA4sX/C78CGkMrKXfuspA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -424,8 +430,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/core@10.3.2':
-    resolution: {integrity: sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==}
+  '@inquirer/core@10.1.15':
+    resolution: {integrity: sha512-8xrp836RZvKkpNbVvgWUlxjT4CraKk2q+I3Ksy+seI2zkcE+y6wNs1BVhgcv8VyImFecUhdQrYLdW32pAjwBdA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -433,8 +439,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/editor@4.2.23':
-    resolution: {integrity: sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==}
+  '@inquirer/editor@4.2.17':
+    resolution: {integrity: sha512-r6bQLsyPSzbWrZZ9ufoWL+CztkSatnJ6uSxqd6N+o41EZC51sQeWOzI6s5jLb+xxTWxl7PlUppqm8/sow241gg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -442,8 +448,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/expand@4.0.23':
-    resolution: {integrity: sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==}
+  '@inquirer/expand@4.0.17':
+    resolution: {integrity: sha512-PSqy9VmJx/VbE3CT453yOfNa+PykpKg/0SYP7odez1/NWBGuDXgPhp4AeGYYKjhLn5lUUavVS/JbeYMPdH50Mw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -451,8 +457,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/external-editor@1.0.3':
-    resolution: {integrity: sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==}
+  '@inquirer/external-editor@1.0.1':
+    resolution: {integrity: sha512-Oau4yL24d2B5IL4ma4UpbQigkVhzPDXLoqy1ggK4gnHg/stmkffJE4oOXHXF3uz0UEpywG68KcyXsyYpA1Re/Q==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -460,12 +466,12 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/figures@1.0.15':
-    resolution: {integrity: sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==}
+  '@inquirer/figures@1.0.13':
+    resolution: {integrity: sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==}
     engines: {node: '>=18'}
 
-  '@inquirer/input@4.3.1':
-    resolution: {integrity: sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==}
+  '@inquirer/input@4.2.1':
+    resolution: {integrity: sha512-tVC+O1rBl0lJpoUZv4xY+WGWY8V5b0zxU1XDsMsIHYregdh7bN5X5QnIONNBAl0K765FYlAfNHS2Bhn7SSOVow==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -473,8 +479,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/number@3.0.23':
-    resolution: {integrity: sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==}
+  '@inquirer/number@3.0.17':
+    resolution: {integrity: sha512-GcvGHkyIgfZgVnnimURdOueMk0CztycfC8NZTiIY9arIAkeOgt6zG57G+7vC59Jns3UX27LMkPKnKWAOF5xEYg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -482,8 +488,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/password@4.0.23':
-    resolution: {integrity: sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==}
+  '@inquirer/password@4.0.17':
+    resolution: {integrity: sha512-DJolTnNeZ00E1+1TW+8614F7rOJJCM4y4BAGQ3Gq6kQIG+OJ4zr3GLjIjVVJCbKsk2jmkmv6v2kQuN/vriHdZA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -491,8 +497,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/prompts@7.10.1':
-    resolution: {integrity: sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==}
+  '@inquirer/prompts@7.8.3':
+    resolution: {integrity: sha512-iHYp+JCaCRktM/ESZdpHI51yqsDgXu+dMs4semzETftOaF8u5hwlqnbIsuIR/LrWZl8Pm1/gzteK9I7MAq5HTA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -500,8 +506,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/rawlist@4.1.11':
-    resolution: {integrity: sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==}
+  '@inquirer/rawlist@4.1.5':
+    resolution: {integrity: sha512-R5qMyGJqtDdi4Ht521iAkNqyB6p2UPuZUbMifakg1sWtu24gc2Z8CJuw8rP081OckNDMgtDCuLe42Q2Kr3BolA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -509,8 +515,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/search@3.2.2':
-    resolution: {integrity: sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==}
+  '@inquirer/search@3.1.0':
+    resolution: {integrity: sha512-PMk1+O/WBcYJDq2H7foV0aAZSmDdkzZB9Mw2v/DmONRJopwA/128cS9M/TXWLKKdEQKZnKwBzqu2G4x/2Nqx8Q==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -518,8 +524,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/select@4.4.2':
-    resolution: {integrity: sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==}
+  '@inquirer/select@4.3.1':
+    resolution: {integrity: sha512-Gfl/5sqOF5vS/LIrSndFgOh7jgoe0UXEizDqahFRkq5aJBLegZ6WjuMh/hVEJwlFQjyLq1z9fRtvUMkb7jM1LA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -527,8 +533,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@inquirer/type@3.0.10':
-    resolution: {integrity: sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==}
+  '@inquirer/type@3.0.8':
+    resolution: {integrity: sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/node': '>=18'
@@ -539,12 +545,12 @@ packages:
   '@ipld/dag-cbor@7.0.3':
     resolution: {integrity: sha512-1VVh2huHsuohdXC1bGJNE8WR72slZ9XE2T3wbBBq31dm7ZBatmKLLxrB+XAqafxfRFjv08RZmj/W/ZqaM13AuA==}
 
-  '@ipld/dag-cbor@9.2.5':
-    resolution: {integrity: sha512-84wSr4jv30biui7endhobYhXBQzQE4c/wdoWlFrKcfiwH+ofaPg8fwsM8okX9cOzkkrsAsNdDyH3ou+kiLquwQ==}
+  '@ipld/dag-cbor@9.2.4':
+    resolution: {integrity: sha512-GbDWYl2fdJgkYtIJN0HY9oO0o50d1nB4EQb7uYWKUd2ztxCjxiEW3PjwGG0nqUpN1G4Cug6LX8NzbA7fKT+zfA==}
     engines: {node: '>=16.0.0', npm: '>=7.0.0'}
 
-  '@ipld/dag-json@10.2.6':
-    resolution: {integrity: sha512-51yc5azhmkvc9mp2HV/vtJ8SlgFXADp55wAPuuAjQZ+yPurAYuTVddS3ke5vT4sjcd4DbE+DWjsMZGXjFB2cuA==}
+  '@ipld/dag-json@10.2.5':
+    resolution: {integrity: sha512-Q4Fr3IBDEN8gkpgNefynJ4U/ZO5Kwr7WSUMBDbZx0c37t0+IwQCTM9yJh8l5L4SRFjm31MuHwniZ/kM+P7GQ3Q==}
     engines: {node: '>=16.0.0', npm: '>=7.0.0'}
 
   '@ipld/dag-json@8.0.11':
@@ -557,9 +563,17 @@ packages:
     resolution: {integrity: sha512-w4PZ2yPqvNmlAir7/2hsCRMqny1EY5jj26iZcSgxREJexmbAc2FI21jp26MqiNdfgAxvkCnf2N/TJI18GaDNwA==}
     engines: {node: '>=16.0.0', npm: '>=7.0.0'}
 
-  '@isaacs/cliui@9.0.0':
-    resolution: {integrity: sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==}
-    engines: {node: '>=18'}
+  '@isaacs/balanced-match@4.0.1':
+    resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==}
+    engines: {node: 20 || >=22}
+
+  '@isaacs/brace-expansion@5.0.0':
+    resolution: {integrity: sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==}
+    engines: {node: 20 || >=22}
+
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
 
   '@jridgewell/resolve-uri@3.1.2':
     resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
@@ -574,23 +588,20 @@ packages:
   '@leichtgewicht/ip-codec@2.0.5':
     resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==}
 
-  '@libp2p/crypto@5.1.13':
-    resolution: {integrity: sha512-8NN9cQP3jDn+p9+QE9ByiEoZ2lemDFf/unTgiKmS3JF93ph240EUVdbCyyEgOMfykzb0okTM4gzvwfx9osJebQ==}
+  '@libp2p/crypto@5.1.7':
+    resolution: {integrity: sha512-7DO0piidLEKfCuNfS420BlHG0e2tH7W/zugdsPSiC/1Apa/s1B1dBkaIEgfDkGjrRP4S/8Or86Rtq7zXeEu67g==}
 
-  '@libp2p/interface@2.11.0':
-    resolution: {integrity: sha512-0MUFKoXWHTQW3oWIgSHApmYMUKWO/Y02+7Hpyp+n3z+geD4Xo2Rku2gYWmxcq+Pyjkz6Q9YjDWz3Yb2SoV2E8Q==}
+  '@libp2p/interface@2.10.5':
+    resolution: {integrity: sha512-Z52n04Mph/myGdwyExbFi5S/HqrmZ9JOmfLc2v4r2Cik3GRdw98vrGH19PFvvwjLwAjaqsweCtlGaBzAz09YDw==}
 
-  '@libp2p/interface@3.1.0':
-    resolution: {integrity: sha512-RE7/XyvC47fQBe1cHxhMvepYKa5bFCUyFrrpj8PuM0E7JtzxU7F+Du5j4VXbg2yLDcToe0+j8mB7jvwE2AThYw==}
+  '@libp2p/logger@5.1.21':
+    resolution: {integrity: sha512-V1TWlZM5BuKkiGQ7En4qOnseVP82JwDIpIfNjceUZz1ArL32A5HXJjLQnJchkZ3VW8PVciJzUos/vP6slhPY6Q==}
 
-  '@libp2p/logger@5.2.0':
-    resolution: {integrity: sha512-OEFS529CnIKfbWEHmuCNESw9q0D0hL8cQ8klQfjIVPur15RcgAEgc1buQ7Y6l0B6tCYg120bp55+e9tGvn8c0g==}
+  '@libp2p/peer-id@5.1.8':
+    resolution: {integrity: sha512-pGaM4BwjnXdGtAtd84L4/wuABpsnFYE+AQ+h3GxNFme0IsTaTVKWd1jBBE5YFeKHBHGUOhF3TlHsdjFfjQA7TA==}
 
-  '@libp2p/peer-id@5.1.9':
-    resolution: {integrity: sha512-cVDp7lX187Epmi/zr0Qq2RsEMmueswP9eIxYSFoMcHL/qcvRFhsxOfUGB8361E26s2WJvC9sXZ0oJS9XVueJhQ==}
-
-  '@multiformats/dns@1.0.13':
-    resolution: {integrity: sha512-yr4bxtA3MbvJ+2461kYIYMsiiZj/FIqKI64hE4SdvWJUdWF9EtZLar38juf20Sf5tguXKFUruluswAO6JsjS2w==}
+  '@multiformats/dns@1.0.6':
+    resolution: {integrity: sha512-nt/5UqjMPtyvkG9BQYdJ4GfLK3nMqGpFZOzf4hAmIa0sJh2LlS9YKXZ4FgwBDsaHvzZqR/rUFIywIc7pkHNNuw==}
 
   '@multiformats/multiaddr-to-uri@11.0.2':
     resolution: {integrity: sha512-SiLFD54zeOJ0qMgo9xv1Tl9O5YktDKAVDP4q4hL16mSq4O4sfFNagNADz8eAofxd6TfQUzGQ3TkRRG9IY2uHRg==}
@@ -598,15 +609,12 @@ packages:
   '@multiformats/multiaddr@12.5.1':
     resolution: {integrity: sha512-+DDlr9LIRUS8KncI1TX/FfUn8F2dl6BIxJgshS/yFQCNB5IAF0OGzcwB39g5NLE22s4qqDePv0Qof6HdpJ/4aQ==}
 
-  '@multiformats/multiaddr@13.0.1':
-    resolution: {integrity: sha512-XToN915cnfr6Lr9EdGWakGJbPT0ghpg/850HvdC+zFX8XvpLZElwa8synCiwa8TuvKNnny6m8j8NVBNCxhIO3g==}
-
   '@noble/curves@1.4.2':
     resolution: {integrity: sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==}
 
-  '@noble/curves@2.0.1':
-    resolution: {integrity: sha512-vs1Az2OOTBiP4q0pwjW5aF0xp9n4MxVrmkFBxc6EKZc6ddYx5gaZiAsZoq0uRRXWbi3AT/sBqn05eRPtn1JCPw==}
-    engines: {node: '>= 20.19.0'}
+  '@noble/curves@1.9.7':
+    resolution: {integrity: sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==}
+    engines: {node: ^14.21.3 || >=16}
 
   '@noble/hashes@1.4.0':
     resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==}
@@ -616,10 +624,6 @@ packages:
     resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
     engines: {node: ^14.21.3 || >=16}
 
-  '@noble/hashes@2.0.1':
-    resolution: {integrity: sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw==}
-    engines: {node: '>= 20.19.0'}
-
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -648,28 +652,24 @@ packages:
     resolution: {integrity: sha512-iQzlaJQgPeUXrtrX71OzDwxPikQ7c2FhNd8U8rBB7BCtj2XYfmzBT/Hmbc+g9OKDIG/JkbJT0fXaWMMBrhi+1A==}
     engines: {node: '>=18.0.0'}
 
-  '@oclif/core@4.8.0':
-    resolution: {integrity: sha512-jteNUQKgJHLHFbbz806aGZqf+RJJ7t4gwF4MYa8fCwCxQ8/klJNWc0MvaJiBebk7Mc+J39mdlsB4XraaCKznFw==}
-    engines: {node: '>=18.0.0'}
-
   '@oclif/plugin-autocomplete@2.3.10':
     resolution: {integrity: sha512-Ow1AR8WtjzlyCtiWWPgzMyT8SbcDJFr47009riLioHa+MHX2BCDtVn2DVnN/E6b9JlPV5ptQpjefoRSNWBesmg==}
     engines: {node: '>=12.0.0'}
 
-  '@oclif/plugin-autocomplete@3.2.40':
-    resolution: {integrity: sha512-HCfDuUV3l5F5Wz7SKkaoFb+OMQ5vKul8zvsPNgI0QbZcQuGHmn3svk+392wSfXboyA1gq8kzEmKPAoQK6r6UNw==}
+  '@oclif/plugin-autocomplete@3.2.34':
+    resolution: {integrity: sha512-KhbPcNjitAU7jUojMXJ3l7duWVub0L0pEr3r3bLrpJBNuIJhoIJ7p56Ropcb7OMH2xcaz5B8HGq56cTOe1FHEg==}
     engines: {node: '>=18.0.0'}
 
   '@oclif/plugin-not-found@2.4.3':
     resolution: {integrity: sha512-nIyaR4y692frwh7wIHZ3fb+2L6XEecQwRDIb4zbEam0TvaVmBQWZoColQyWA84ljFBPZ8XWiQyTz+ixSwdRkqg==}
     engines: {node: '>=12.0.0'}
 
-  '@oclif/plugin-not-found@3.2.74':
-    resolution: {integrity: sha512-6RD/EuIUGxAYR45nMQg+nw+PqwCXUxkR6Eyn+1fvbVjtb9d+60OPwB77LCRUI4zKNI+n0LOFaMniEdSpb+A7kQ==}
+  '@oclif/plugin-not-found@3.2.65':
+    resolution: {integrity: sha512-WgP78eBiRsQYxRIkEui/eyR0l3a2w6LdGMoZTg3DvFwKqZ2X542oUfUmTSqvb19LxdS4uaQ+Mwp4DTVHw5lk/A==}
     engines: {node: '>=18.0.0'}
 
-  '@oclif/plugin-warn-if-update-available@3.1.55':
-    resolution: {integrity: sha512-VIEBoaoMOCjl3y+w/kdfZMODi0mVMnDuM0vkBf3nqeidhRXVXq87hBqYDdRwN1XoD+eDfE8tBbOP7qtSOONztQ==}
+  '@oclif/plugin-warn-if-update-available@3.1.46':
+    resolution: {integrity: sha512-YDlr//SHmC80eZrt+0wNFWSo1cOSU60RoWdhSkAoPB3pUGPSNHZDquXDpo7KniinzYPsj1rfetCYk7UVXwYu7A==}
     engines: {node: '>=18.0.0'}
 
   '@peculiar/asn1-schema@2.4.0':
@@ -694,8 +694,8 @@ packages:
     resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==}
     engines: {node: '>=12.22.0'}
 
-  '@pnpm/npm-conf@3.0.2':
-    resolution: {integrity: sha512-h104Kh26rR8tm+a3Qkc5S4VLYint3FE48as7+/5oCEcKR2idC/pF1G6AhIXKI+eHPJa/3J9i5z0Al47IeGHPkA==}
+  '@pnpm/npm-conf@2.3.1':
+    resolution: {integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==}
     engines: {node: '>=12'}
 
   '@protobufjs/aspromise@1.1.2':
@@ -764,6 +764,9 @@ packages:
   '@types/connect@3.4.38':
     resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
 
+  '@types/dns-packet@5.6.5':
+    resolution: {integrity: sha512-qXOC7XLOEe43ehtWJCMnQXvgcIpv6rPmQ1jXT98Ad8A3TB1Ue50jsCbSSSyuazScEuZ/Q026vHbrOTVkmwA+7Q==}
+
   '@types/form-data@0.0.33':
     resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==}
 
@@ -807,8 +810,8 @@ packages:
   '@whatwg-node/events@0.0.3':
     resolution: {integrity: sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==}
 
-  '@whatwg-node/fetch@0.10.13':
-    resolution: {integrity: sha512-b4PhJ+zYj4357zwk4TTuF2nEe0vVtOrwdsrNo5hL+u1ojXNhh1FgJ6pg1jzDlwlT4oBdzfSwaBwMCtFCsIWg8Q==}
+  '@whatwg-node/fetch@0.10.10':
+    resolution: {integrity: sha512-watz4i/Vv4HpoJ+GranJ7HH75Pf+OkPQ63NoVmru6Srgc8VezTArB00i/oQlnn0KWh14gM42F22Qcc9SU9mo/w==}
     engines: {node: '>=18.0.0'}
 
   '@whatwg-node/fetch@0.8.8':
@@ -817,8 +820,8 @@ packages:
   '@whatwg-node/node-fetch@0.3.6':
     resolution: {integrity: sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==}
 
-  '@whatwg-node/node-fetch@0.8.5':
-    resolution: {integrity: sha512-4xzCl/zphPqlp9tASLVeUhB5+WJHbuWGYpfoC2q1qh5dw0AqZBW7L27V5roxYWijPxj4sspRAAoOH3d2ztaHUQ==}
+  '@whatwg-node/node-fetch@0.7.25':
+    resolution: {integrity: sha512-szCTESNJV+Xd56zU6ShOi/JWROxE9IwCic8o5D9z5QECZloas6Ez5tUuKqXTAdu6fHFx1t6C+5gwj8smzOLjtg==}
     engines: {node: '>=18.0.0'}
 
   '@whatwg-node/promise-helpers@1.3.2':
@@ -877,6 +880,10 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
+  ansi-regex@6.2.0:
+    resolution: {integrity: sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==}
+    engines: {node: '>=12'}
+
   ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
@@ -885,6 +892,10 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
   ansicolors@0.3.2:
     resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==}
 
@@ -898,8 +909,8 @@ packages:
   any-signal@3.0.1:
     resolution: {integrity: sha512-xgZgJtKEa9YmDqXodIgl7Fl1C8yNXr8w6gXjqK3LW4GcEiYT+6AQfJSE/8SPsEpLLmcvbv8YU+qet94UewHxqg==}
 
-  any-signal@4.2.0:
-    resolution: {integrity: sha512-LndMvYuAPf4rC195lk7oSFuHOYFpOszIYrNYv0gHAvz+aEhE9qPZLhmrIz5pXP2BSsPOXvsuHDXEGaiQhIh9wA==}
+  any-signal@4.1.1:
+    resolution: {integrity: sha512-iADenERppdC+A2YKbOXXB2WUeABLaM6qnpZ70kZbPZ1cZMMJ7eF+3CaYm+/PhBizgkzlvssC7QuHS30oOiQYWA==}
     engines: {node: '>=16.0.0', npm: '>=7.0.0'}
 
   anymatch@3.1.3:
@@ -977,10 +988,6 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  balanced-match@4.0.2:
-    resolution: {integrity: sha512-x0K50QvKQ97fdEz2kPehIerj+YTeptKF9hyYkKf6egnwmMWAkADiO0QCzSp0R5xN8FTZgYaBfSaue46Ej62nMg==}
-    engines: {node: 20 || >=22}
-
   base-x@3.0.11:
     resolution: {integrity: sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==}
 
@@ -1033,10 +1040,6 @@ packages:
   brace-expansion@2.0.2:
     resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
-  brace-expansion@5.0.2:
-    resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
-    engines: {node: 20 || >=22}
-
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -1122,8 +1125,8 @@ packages:
     resolution: {integrity: sha512-b3tFPA9pUr2zCUiCfRd2+wok2/LBSNUMKOuRRok+WlvvAgEt/PlbgPTsZUcwCOs53IJvLgTp0eotwtosE6njug==}
     hasBin: true
 
-  cborg@4.5.8:
-    resolution: {integrity: sha512-6/viltD51JklRhq4L7jC3zgy6gryuG5xfZ3kzpE+PravtyeQLeQmCYLREhQH7pWENg5pY4Yu/XCd6a7dKScVlw==}
+  cborg@4.2.13:
+    resolution: {integrity: sha512-HAiZCITe/5Av0ukt6rOYE+VjnuFGfujN3NUKgEbIlONpRpsYMZAa+Bjk16mj6dQMuB0n81AuNrcB9YVMshcrfA==}
     hasBin: true
 
   chalk@2.4.2:
@@ -1138,8 +1141,8 @@ packages:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
-  chardet@2.1.1:
-    resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==}
+  chardet@2.1.0:
+    resolution: {integrity: sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==}
 
   chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
@@ -1318,12 +1321,12 @@ packages:
     resolution: {integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==}
     engines: {node: '>=4'}
 
-  default-browser-id@5.0.1:
-    resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==}
+  default-browser-id@5.0.0:
+    resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}
     engines: {node: '>=18'}
 
-  default-browser@5.5.0:
-    resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==}
+  default-browser@5.2.1:
+    resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}
     engines: {node: '>=18'}
 
   defaults@1.0.4:
@@ -1356,6 +1359,10 @@ packages:
   dns-over-http-resolver@1.2.3:
     resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==}
 
+  dns-packet@5.6.1:
+    resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==}
+    engines: {node: '>=6'}
+
   docker-compose@0.23.19:
     resolution: {integrity: sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==}
     engines: {node: '>= 6.0.0'}
@@ -1376,6 +1383,9 @@ packages:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
 
+  eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+
   ecc-jsbn@0.1.2:
     resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
 
@@ -1404,6 +1414,9 @@ packages:
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
   encoding@0.1.13:
     resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
 
@@ -1476,8 +1489,8 @@ packages:
     resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
     engines: {node: '>=6'}
 
-  eventemitter3@5.0.4:
-    resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
 
   evp_bytestokey@1.0.3:
     resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==}
@@ -1617,10 +1630,6 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  generator-function@2.0.1:
-    resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==}
-    engines: {node: '>= 0.4'}
-
   get-intrinsic@1.3.0:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
@@ -1658,17 +1667,15 @@ packages:
   glob@11.0.3:
     resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==}
     engines: {node: 20 || >=22}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@9.3.5:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
-    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
   globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
@@ -1678,6 +1685,10 @@ packages:
     resolution: {integrity: sha512-Cwx/8S8Z4YQg07a6AFsaGnnnmd8mN17414NcPS3OoDtZRwxgsvwRNJNg69niD6fDa8oNwslCG0xH7rEpRNNE/g==}
     hasBin: true
 
+  gluegun@5.1.6:
+    resolution: {integrity: sha512-9zbi4EQWIVvSOftJWquWzr9gLX2kaDgPkNR5dYWbM53eVvCI3iKuxLlnKoHC0v4uPoq+Kr/+F569tjoFbA4DSA==}
+    hasBin: true
+
   gluegun@5.2.0:
     resolution: {integrity: sha512-jSUM5xUy2ztYFQANne17OUm/oAd7qSX7EBksS9bQDt9UvLPqcEkeWUebmaposb8Tx7eTTD8uJVWGRe6PYSsYkg==}
     hasBin: true
@@ -1780,10 +1791,6 @@ packages:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
 
-  iconv-lite@0.7.2:
-    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
-    engines: {node: '>=0.10.0'}
-
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
@@ -1891,8 +1898,8 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  is-generator-function@1.1.2:
-    resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
+  is-generator-function@1.1.0:
+    resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==}
     engines: {node: '>= 0.4'}
 
   is-glob@4.0.3:
@@ -1954,8 +1961,8 @@ packages:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
 
-  is-wsl@3.1.1:
-    resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==}
+  is-wsl@3.1.0:
+    resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
     engines: {node: '>=16'}
 
   isarray@0.0.1:
@@ -2027,8 +2034,8 @@ packages:
   it-to-stream@1.0.0:
     resolution: {integrity: sha512-pLULMZMAB/+vbdvbZtebC0nWBTbG581lk6w8P7DfIIIKUfa8FbY7Oi0FxZcFPbxvISs7A9E+cMpLDBc1XhpAOA==}
 
-  jackspeak@4.2.3:
-    resolution: {integrity: sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==}
+  jackspeak@4.1.1:
+    resolution: {integrity: sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==}
     engines: {node: 20 || >=22}
 
   jake@10.9.4:
@@ -2093,8 +2100,8 @@ packages:
     resolution: {integrity: sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q==}
     engines: {node: '>=10.0.0'}
 
-  kubo-rpc-client@5.4.1:
-    resolution: {integrity: sha512-v86bQWtyA//pXTrt9y4iEwjW6pt1gA18Z1famWXIR/HN5TFdYwQ3yHOlRE6JSWBDQ0rR6FOMyrrGy8To78mXow==}
+  kubo-rpc-client@5.2.0:
+    resolution: {integrity: sha512-J3ppL1xf7f27NDI9jUPGkr1QiExXLyxUTUwHUMMB1a4AZR4s6113SVXPHRYwe1pFIO3hRb5G+0SuHaxYSfhzBA==}
 
   lilconfig@3.1.3:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
@@ -2148,8 +2155,8 @@ packages:
   lodash.upperfirst@4.3.1:
     resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
 
-  lodash@4.17.23:
-    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
   log-symbols@3.0.0:
     resolution: {integrity: sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==}
@@ -2164,8 +2171,8 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@11.2.6:
-    resolution: {integrity: sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==}
+  lru-cache@11.1.0:
+    resolution: {integrity: sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==}
     engines: {node: 20 || >=22}
 
   lru-cache@6.0.0:
@@ -2222,8 +2229,8 @@ packages:
   minimalistic-crypto-utils@1.0.1:
     resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==}
 
-  minimatch@10.2.1:
-    resolution: {integrity: sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==}
+  minimatch@10.0.3:
+    resolution: {integrity: sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==}
     engines: {node: 20 || >=22}
 
   minimatch@3.1.2:
@@ -2279,9 +2286,9 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
-  ms@3.0.0-canary.202508261828:
-    resolution: {integrity: sha512-NotsCoUCIUkojWCzQff4ttdCfIPoA1UGZsyQbi7KmqkNRfKCrvga8JJi2PknHymHOuor0cJSn/ylj52Cbt2IrQ==}
-    engines: {node: '>=18'}
+  ms@3.0.0-canary.1:
+    resolution: {integrity: sha512-kh8ARjh8rMN7Du2igDRO9QJnqCb2xYTJxyQYK7vJJS4TvLLmsbyhiKpSW+t+y26gyOyMd0riphX0GeWKU3ky5g==}
+    engines: {node: '>=12.13'}
 
   multiaddr-to-uri@8.0.0:
     resolution: {integrity: sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA==}
@@ -2294,8 +2301,8 @@ packages:
   multiformats@13.1.3:
     resolution: {integrity: sha512-CZPi9lFZCM/+7oRolWYsvalsyWQGFo+GpdaTmjxXXomC+nP/W1Rnxb9sUgjvmNmRZ5bOPqRAl4nuK+Ydw/4tGw==}
 
-  multiformats@13.4.2:
-    resolution: {integrity: sha512-eh6eHCrRi1+POZ3dA+Dq1C6jhP1GNtr9CRINMb67OKzqW9I5DUuZM/3jLPlzhgpGeiNUlEGEbkCYChXMCc/8DQ==}
+  multiformats@13.4.0:
+    resolution: {integrity: sha512-Mkb/QcclrJxKC+vrcIFl297h52QcKh2Az/9A5vbWytbQt4225UWWWmIuSsKksdww9NkIeYcA7DkfftyLuC/JSg==}
 
   multiformats@9.9.0:
     resolution: {integrity: sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==}
@@ -2313,8 +2320,8 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  nanoid@5.1.6:
-    resolution: {integrity: sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==}
+  nanoid@5.1.5:
+    resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
     engines: {node: ^18 || >=20}
     hasBin: true
 
@@ -2408,13 +2415,13 @@ packages:
   p-fifo@1.0.0:
     resolution: {integrity: sha512-IjoCxXW48tqdtDFz6fqo5q1UfFVjjVZe8TC1QRflvNUJtNfCUhxOUw6MOVZhDPjqhSzc26xKdugsO17gmzd5+A==}
 
-  p-queue@9.1.0:
-    resolution: {integrity: sha512-O/ZPaXuQV29uSLbxWBGGZO1mCQXV2BLIwUr59JUU9SoH76mnYvtms7aafH/isNSNGwuEfP6W/4xD0/TJXxrizw==}
-    engines: {node: '>=20'}
+  p-queue@8.1.0:
+    resolution: {integrity: sha512-mxLDbbGIBEXTJL0zEx8JIylaj3xQ7Z/7eEVjcF9fJX4DBiH9oqe+oahYnlKKxm0Ci9TlWTyhSHgygxMxjIB2jw==}
+    engines: {node: '>=18'}
 
-  p-timeout@7.0.1:
-    resolution: {integrity: sha512-AxTM2wDGORHGEkPCt8yqxOTMgpfbEHqF51f/5fJCmwFC3C/zNcGT63SymH2ttOAaiIws2zVg4+izQCjrakcwHg==}
-    engines: {node: '>=20'}
+  p-timeout@6.1.4:
+    resolution: {integrity: sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==}
+    engines: {node: '>=14.16'}
 
   package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
@@ -2429,8 +2436,8 @@ packages:
   parse-duration@1.1.2:
     resolution: {integrity: sha512-p8EIONG8L0u7f8GFgfVlL4n8rnChTt8O5FSxgxMz2tjc9FMP199wxVKVB6IbKx11uTbKHACSvaLVIKNnoeNR/A==}
 
-  parse-duration@2.1.5:
-    resolution: {integrity: sha512-/IX1KRw6zHDOOJrgIz++gvFASbFl7nc8GEXaLdD7d1t1x/GnrK6hh5Fgk8G3RLpkIEi4tsGj9pupGLWNg0EiJA==}
+  parse-duration@2.1.4:
+    resolution: {integrity: sha512-b98m6MsCh+akxfyoz9w9dt0AlH2dfYLOBss5SdDsr9pkhKNvkWBXU/r8A4ahmIGByBOLV2+4YwfCuFxbDDaGyg==}
 
   parse-json@4.0.0:
     resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
@@ -2455,8 +2462,8 @@ packages:
     resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
     engines: {node: '>=16 || 14 >=14.18'}
 
-  path-scurry@2.0.1:
-    resolution: {integrity: sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==}
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
     engines: {node: 20 || >=22}
 
   path-type@4.0.0:
@@ -2513,6 +2520,11 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  prettier@3.0.3:
+    resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   prettier@3.6.2:
     resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
     engines: {node: '>=14'}
@@ -2602,8 +2614,8 @@ packages:
   redeyed@2.1.1:
     resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==}
 
-  registry-auth-token@5.1.1:
-    resolution: {integrity: sha512-P7B4+jq8DeD2nMsAcdfaqHbssgHtZ7Z5+++a5ask90fvmJ8p5je4mOa+wzu+DB4vQ5tdJV/xywY+UnVFeQLV5Q==}
+  registry-auth-token@5.1.0:
+    resolution: {integrity: sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==}
     engines: {node: '>=14'}
 
   request@2.88.2:
@@ -2646,8 +2658,8 @@ packages:
     resolution: {integrity: sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==}
     hasBin: true
 
-  run-applescript@7.1.0:
-    resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
+  run-applescript@7.0.0:
+    resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==}
     engines: {node: '>=18'}
 
   run-parallel@1.2.0:
@@ -2687,13 +2699,13 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.3:
-    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+  semver@7.7.2:
+    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.4:
-    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -2786,6 +2798,10 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
+  string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+
   string_decoder@0.10.31:
     resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
 
@@ -2803,6 +2819,10 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
   strip-dirs@2.1.0:
     resolution: {integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==}
 
@@ -2814,10 +2834,6 @@ packages:
     resolution: {integrity: sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==}
     engines: {node: '>=6.5.0', npm: '>=3'}
 
-  supports-color@10.2.2:
-    resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
-    engines: {node: '>=18'}
-
   supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
@@ -2830,6 +2846,10 @@ packages:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
 
+  supports-color@9.4.0:
+    resolution: {integrity: sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==}
+    engines: {node: '>=12'}
+
   supports-hyperlinks@2.3.0:
     resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
     engines: {node: '>=8'}
@@ -2862,8 +2882,8 @@ packages:
   timeout-abort-controller@2.0.0:
     resolution: {integrity: sha512-2FAPXfzTPYEgw27bQGTHc0SzrbmnU2eso4qo172zMLZzaGqeu09PFa5B2FCUHM1tflgRqPgn5KQgp6+Vex4uNA==}
 
-  tinyglobby@0.2.15:
-    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
+  tinyglobby@0.2.14:
+    resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==}
     engines: {node: '>=12.0.0'}
 
   tmp-promise@3.0.3:
@@ -2966,9 +2986,6 @@ packages:
     resolution: {integrity: sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==}
     engines: {node: '>=6.14.2'}
 
-  utf8-codec@1.0.0:
-    resolution: {integrity: sha512-S/QSLezp3qvG4ld5PUfXiH7mCFxLKjSVZRFkB3DOjgwHuJPFDkInAXc/anf7BAbHt/D38ozDzL+QMZ6/7gsI6w==}
-
   utf8@3.0.0:
     resolution: {integrity: sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==}
 
@@ -3000,8 +3017,8 @@ packages:
   wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
 
-  weald@1.1.1:
-    resolution: {integrity: sha512-PaEQShzMCz8J/AD2N3dJMc1hTZWkJeLKS2NMeiVkV5KDHwgZe7qXLEzyodsT/SODxWDdXJJqocuwf3kHzcXhSQ==}
+  weald@1.0.4:
+    resolution: {integrity: sha512-+kYTuHonJBwmFhP1Z4YQK/dGi3jAnJGCYhyODFpHK73rbxnp9lnZQj7a2m+WVgn8fXr5bJaxUpF6l8qZpPeNWQ==}
 
   web-streams-polyfill@3.3.3:
     resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
@@ -3072,6 +3089,10 @@ packages:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
 
+  wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+
   wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
@@ -3118,8 +3139,8 @@ packages:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
 
-  yoctocolors-cjs@2.1.3:
-    resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==}
+  yoctocolors-cjs@2.1.2:
+    resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==}
     engines: {node: '>=18'}
 
   zod@3.25.76:
@@ -3145,11 +3166,6 @@ snapshots:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  '@dnsquery/dns-packet@6.1.1':
-    dependencies:
-      '@leichtgewicht/ip-codec': 2.0.5
-      utf8-codec: 1.0.0
-
   '@ethersproject/abi@5.0.7':
     dependencies:
       '@ethersproject/address': 5.8.0
@@ -3291,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
@@ -3330,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
@@ -3371,7 +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)
+      debug: 4.3.4
       docker-compose: 0.23.19
       dockerode: 2.5.8
       fs-extra: 9.1.0
@@ -3401,15 +3417,55 @@ snapshots:
       - typescript
       - utf-8-validate
 
+  '@graphprotocol/graph-cli@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)':
+    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
+      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
+      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.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': 4.5.5
-      '@oclif/plugin-autocomplete': 3.2.40
-      '@oclif/plugin-not-found': 3.2.74(@types/node@24.3.0)
-      '@oclif/plugin-warn-if-update-available': 3.1.55
+      '@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.13
+      '@whatwg-node/fetch': 0.10.10
       assemblyscript: 0.19.23
       chokidar: 4.0.3
       debug: 4.4.3(supports-color@8.1.1)
@@ -3422,7 +3478,7 @@ snapshots:
       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.4.1(undici@7.16.0)
+      kubo-rpc-client: 5.2.0(undici@7.16.0)
       open: 10.2.0
       prettier: 3.6.2
       progress: 2.0.3
@@ -3467,128 +3523,126 @@ snapshots:
     dependencies:
       assemblyscript: 0.19.10
 
-  '@inquirer/ansi@1.0.2': {}
-
-  '@inquirer/checkbox@4.3.2(@types/node@24.3.0)':
+  '@inquirer/checkbox@4.2.1(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/ansi': 1.0.2
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/figures': 1.0.15
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
-      yoctocolors-cjs: 2.1.3
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      ansi-escapes: 4.3.2
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/confirm@5.1.21(@types/node@24.3.0)':
+  '@inquirer/confirm@5.1.15(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/core@10.3.2(@types/node@24.3.0)':
+  '@inquirer/core@10.1.15(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/ansi': 1.0.2
-      '@inquirer/figures': 1.0.15
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
       signal-exit: 4.1.0
       wrap-ansi: 6.2.0
-      yoctocolors-cjs: 2.1.3
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/editor@4.2.23(@types/node@24.3.0)':
+  '@inquirer/editor@4.2.17(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/external-editor': 1.0.3(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/external-editor': 1.0.1(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/expand@4.0.23(@types/node@24.3.0)':
+  '@inquirer/expand@4.0.17(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
-      yoctocolors-cjs: 2.1.3
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/external-editor@1.0.3(@types/node@24.3.0)':
+  '@inquirer/external-editor@1.0.1(@types/node@24.3.0)':
     dependencies:
-      chardet: 2.1.1
-      iconv-lite: 0.7.2
+      chardet: 2.1.0
+      iconv-lite: 0.6.3
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/figures@1.0.15': {}
+  '@inquirer/figures@1.0.13': {}
 
-  '@inquirer/input@4.3.1(@types/node@24.3.0)':
+  '@inquirer/input@4.2.1(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/number@3.0.23(@types/node@24.3.0)':
+  '@inquirer/number@3.0.17(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/password@4.0.23(@types/node@24.3.0)':
+  '@inquirer/password@4.0.17(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/ansi': 1.0.2
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      ansi-escapes: 4.3.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/prompts@7.10.1(@types/node@24.3.0)':
-    dependencies:
-      '@inquirer/checkbox': 4.3.2(@types/node@24.3.0)
-      '@inquirer/confirm': 5.1.21(@types/node@24.3.0)
-      '@inquirer/editor': 4.2.23(@types/node@24.3.0)
-      '@inquirer/expand': 4.0.23(@types/node@24.3.0)
-      '@inquirer/input': 4.3.1(@types/node@24.3.0)
-      '@inquirer/number': 3.0.23(@types/node@24.3.0)
-      '@inquirer/password': 4.0.23(@types/node@24.3.0)
-      '@inquirer/rawlist': 4.1.11(@types/node@24.3.0)
-      '@inquirer/search': 3.2.2(@types/node@24.3.0)
-      '@inquirer/select': 4.4.2(@types/node@24.3.0)
+  '@inquirer/prompts@7.8.3(@types/node@24.3.0)':
+    dependencies:
+      '@inquirer/checkbox': 4.2.1(@types/node@24.3.0)
+      '@inquirer/confirm': 5.1.15(@types/node@24.3.0)
+      '@inquirer/editor': 4.2.17(@types/node@24.3.0)
+      '@inquirer/expand': 4.0.17(@types/node@24.3.0)
+      '@inquirer/input': 4.2.1(@types/node@24.3.0)
+      '@inquirer/number': 3.0.17(@types/node@24.3.0)
+      '@inquirer/password': 4.0.17(@types/node@24.3.0)
+      '@inquirer/rawlist': 4.1.5(@types/node@24.3.0)
+      '@inquirer/search': 3.1.0(@types/node@24.3.0)
+      '@inquirer/select': 4.3.1(@types/node@24.3.0)
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/rawlist@4.1.11(@types/node@24.3.0)':
+  '@inquirer/rawlist@4.1.5(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
-      yoctocolors-cjs: 2.1.3
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/search@3.2.2(@types/node@24.3.0)':
+  '@inquirer/search@3.1.0(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/figures': 1.0.15
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
-      yoctocolors-cjs: 2.1.3
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/select@4.4.2(@types/node@24.3.0)':
+  '@inquirer/select@4.3.1(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/ansi': 1.0.2
-      '@inquirer/core': 10.3.2(@types/node@24.3.0)
-      '@inquirer/figures': 1.0.15
-      '@inquirer/type': 3.0.10(@types/node@24.3.0)
-      yoctocolors-cjs: 2.1.3
+      '@inquirer/core': 10.1.15(@types/node@24.3.0)
+      '@inquirer/figures': 1.0.13
+      '@inquirer/type': 3.0.8(@types/node@24.3.0)
+      ansi-escapes: 4.3.2
+      yoctocolors-cjs: 2.1.2
     optionalDependencies:
       '@types/node': 24.3.0
 
-  '@inquirer/type@3.0.10(@types/node@24.3.0)':
+  '@inquirer/type@3.0.8(@types/node@24.3.0)':
     optionalDependencies:
       '@types/node': 24.3.0
 
@@ -3597,15 +3651,15 @@ snapshots:
       cborg: 1.10.2
       multiformats: 9.9.0
 
-  '@ipld/dag-cbor@9.2.5':
+  '@ipld/dag-cbor@9.2.4':
     dependencies:
-      cborg: 4.5.8
-      multiformats: 13.4.2
+      cborg: 4.2.13
+      multiformats: 13.4.0
 
-  '@ipld/dag-json@10.2.6':
+  '@ipld/dag-json@10.2.5':
     dependencies:
-      cborg: 4.5.8
-      multiformats: 13.4.2
+      cborg: 4.2.13
+      multiformats: 13.4.0
 
   '@ipld/dag-json@8.0.11':
     dependencies:
@@ -3618,9 +3672,22 @@ snapshots:
 
   '@ipld/dag-pb@4.1.5':
     dependencies:
-      multiformats: 13.4.2
+      multiformats: 13.4.0
+
+  '@isaacs/balanced-match@4.0.1': {}
 
-  '@isaacs/cliui@9.0.0': {}
+  '@isaacs/brace-expansion@5.0.0':
+    dependencies:
+      '@isaacs/balanced-match': 4.0.1
+
+  '@isaacs/cliui@8.0.2':
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
 
   '@jridgewell/resolve-uri@3.1.2': {}
 
@@ -3633,57 +3700,49 @@ snapshots:
 
   '@leichtgewicht/ip-codec@2.0.5': {}
 
-  '@libp2p/crypto@5.1.13':
+  '@libp2p/crypto@5.1.7':
     dependencies:
-      '@libp2p/interface': 3.1.0
-      '@noble/curves': 2.0.1
-      '@noble/hashes': 2.0.1
-      multiformats: 13.4.2
+      '@libp2p/interface': 2.10.5
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+      multiformats: 13.4.0
       protons-runtime: 5.6.0
       uint8arraylist: 2.4.8
       uint8arrays: 5.1.0
 
-  '@libp2p/interface@2.11.0':
+  '@libp2p/interface@2.10.5':
     dependencies:
-      '@multiformats/dns': 1.0.13
+      '@multiformats/dns': 1.0.6
       '@multiformats/multiaddr': 12.5.1
       it-pushable: 3.2.3
       it-stream-types: 2.0.2
       main-event: 1.0.1
-      multiformats: 13.4.2
-      progress-events: 1.0.1
-      uint8arraylist: 2.4.8
-
-  '@libp2p/interface@3.1.0':
-    dependencies:
-      '@multiformats/dns': 1.0.13
-      '@multiformats/multiaddr': 13.0.1
-      main-event: 1.0.1
-      multiformats: 13.4.2
+      multiformats: 13.4.0
       progress-events: 1.0.1
       uint8arraylist: 2.4.8
 
-  '@libp2p/logger@5.2.0':
+  '@libp2p/logger@5.1.21':
     dependencies:
-      '@libp2p/interface': 2.11.0
+      '@libp2p/interface': 2.10.5
       '@multiformats/multiaddr': 12.5.1
       interface-datastore: 8.3.2
-      multiformats: 13.4.2
-      weald: 1.1.1
+      multiformats: 13.4.0
+      weald: 1.0.4
 
-  '@libp2p/peer-id@5.1.9':
+  '@libp2p/peer-id@5.1.8':
     dependencies:
-      '@libp2p/crypto': 5.1.13
-      '@libp2p/interface': 2.11.0
-      multiformats: 13.4.2
+      '@libp2p/crypto': 5.1.7
+      '@libp2p/interface': 2.10.5
+      multiformats: 13.4.0
       uint8arrays: 5.1.0
 
-  '@multiformats/dns@1.0.13':
+  '@multiformats/dns@1.0.6':
     dependencies:
-      '@dnsquery/dns-packet': 6.1.1
-      '@libp2p/interface': 3.1.0
+      '@types/dns-packet': 5.6.5
+      buffer: 6.0.3
+      dns-packet: 5.6.1
       hashlru: 2.3.0
-      p-queue: 9.1.0
+      p-queue: 8.1.0
       progress-events: 1.0.1
       uint8arrays: 5.1.0
 
@@ -3695,16 +3754,9 @@ snapshots:
     dependencies:
       '@chainsafe/is-ip': 2.1.0
       '@chainsafe/netmask': 2.0.0
-      '@multiformats/dns': 1.0.13
+      '@multiformats/dns': 1.0.6
       abort-error: 1.0.1
-      multiformats: 13.4.2
-      uint8-varint: 2.0.4
-      uint8arrays: 5.1.0
-
-  '@multiformats/multiaddr@13.0.1':
-    dependencies:
-      '@chainsafe/is-ip': 2.1.0
-      multiformats: 13.4.2
+      multiformats: 13.4.0
       uint8-varint: 2.0.4
       uint8arrays: 5.1.0
 
@@ -3712,16 +3764,14 @@ snapshots:
     dependencies:
       '@noble/hashes': 1.4.0
 
-  '@noble/curves@2.0.1':
+  '@noble/curves@1.9.7':
     dependencies:
-      '@noble/hashes': 2.0.1
+      '@noble/hashes': 1.8.0
 
   '@noble/hashes@1.4.0': {}
 
   '@noble/hashes@1.8.0': {}
 
-  '@noble/hashes@2.0.1': {}
-
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -3743,7 +3793,7 @@ snapshots:
       chalk: 4.1.2
       clean-stack: 3.0.1
       cli-progress: 3.12.0
-      debug: 4.4.3(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
@@ -3779,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
@@ -3791,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
@@ -3816,7 +3866,7 @@ snapshots:
       chalk: 4.1.2
       clean-stack: 3.0.1
       cli-progress: 3.12.0
-      debug: 4.4.3(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
@@ -3828,7 +3878,7 @@ snapshots:
       natural-orderby: 2.0.3
       object-treeify: 1.1.33
       password-prompt: 1.1.3
-      semver: 7.7.4
+      semver: 7.7.2
       string-width: 4.2.3
       strip-ansi: 6.0.1
       supports-color: 8.1.1
@@ -3857,31 +3907,10 @@ snapshots:
       is-wsl: 2.2.0
       lilconfig: 3.1.3
       minimatch: 9.0.5
-      semver: 7.7.4
-      string-width: 4.2.3
-      supports-color: 8.1.1
-      tinyglobby: 0.2.15
-      widest-line: 3.1.0
-      wordwrap: 1.0.0
-      wrap-ansi: 7.0.0
-
-  '@oclif/core@4.8.0':
-    dependencies:
-      ansi-escapes: 4.3.2
-      ansis: 3.17.0
-      clean-stack: 3.0.1
-      cli-spinners: 2.9.2
-      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.7.4
+      semver: 7.7.3
       string-width: 4.2.3
       supports-color: 8.1.1
-      tinyglobby: 0.2.15
+      tinyglobby: 0.2.14
       widest-line: 3.1.0
       wordwrap: 1.0.0
       wrap-ansi: 7.0.0
@@ -3890,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.4.3(supports-color@8.1.1)
+      debug: 4.4.1(supports-color@8.1.1)
     transitivePeerDependencies:
       - '@swc/core'
       - '@swc/wasm'
@@ -3898,9 +3927,9 @@ snapshots:
       - supports-color
       - typescript
 
-  '@oclif/plugin-autocomplete@3.2.40':
+  '@oclif/plugin-autocomplete@3.2.34':
     dependencies:
-      '@oclif/core': 4.8.0
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
       debug: 4.4.3(supports-color@8.1.1)
       ejs: 3.1.10
@@ -3918,23 +3947,23 @@ snapshots:
       - '@types/node'
       - typescript
 
-  '@oclif/plugin-not-found@3.2.74(@types/node@24.3.0)':
+  '@oclif/plugin-not-found@3.2.65(@types/node@24.3.0)':
     dependencies:
-      '@inquirer/prompts': 7.10.1(@types/node@24.3.0)
-      '@oclif/core': 4.8.0
+      '@inquirer/prompts': 7.8.3(@types/node@24.3.0)
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
       fast-levenshtein: 3.0.0
     transitivePeerDependencies:
       - '@types/node'
 
-  '@oclif/plugin-warn-if-update-available@3.1.55':
+  '@oclif/plugin-warn-if-update-available@3.1.46':
     dependencies:
-      '@oclif/core': 4.8.0
+      '@oclif/core': 4.5.5
       ansis: 3.17.0
       debug: 4.4.3(supports-color@8.1.1)
       http-call: 5.3.0
-      lodash: 4.17.23
-      registry-auth-token: 5.1.1
+      lodash: 4.17.21
+      registry-auth-token: 5.1.0
     transitivePeerDependencies:
       - supports-color
 
@@ -3964,7 +3993,7 @@ snapshots:
     dependencies:
       graceful-fs: 4.2.10
 
-  '@pnpm/npm-conf@3.0.2':
+  '@pnpm/npm-conf@2.3.1':
     dependencies:
       '@pnpm/config.env-replace': 1.1.0
       '@pnpm/network.ca-file': 1.0.2
@@ -4029,6 +4058,10 @@ snapshots:
       '@types/node': 24.3.0
 
   '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 12.20.55
+
+  '@types/dns-packet@5.6.5':
     dependencies:
       '@types/node': 24.3.0
 
@@ -4064,7 +4097,7 @@ snapshots:
 
   '@types/ws@7.4.7':
     dependencies:
-      '@types/node': 24.3.0
+      '@types/node': 12.20.55
 
   '@whatwg-node/disposablestack@0.0.6':
     dependencies:
@@ -4073,9 +4106,9 @@ snapshots:
 
   '@whatwg-node/events@0.0.3': {}
 
-  '@whatwg-node/fetch@0.10.13':
+  '@whatwg-node/fetch@0.10.10':
     dependencies:
-      '@whatwg-node/node-fetch': 0.8.5
+      '@whatwg-node/node-fetch': 0.7.25
       urlpattern-polyfill: 10.1.0
 
   '@whatwg-node/fetch@0.8.8':
@@ -4094,7 +4127,7 @@ snapshots:
       fast-url-parser: 1.1.3
       tslib: 2.8.1
 
-  '@whatwg-node/node-fetch@0.8.5':
+  '@whatwg-node/node-fetch@0.7.25':
     dependencies:
       '@fastify/busboy': 3.2.0
       '@whatwg-node/disposablestack': 0.0.6
@@ -4150,6 +4183,8 @@ snapshots:
 
   ansi-regex@5.0.1: {}
 
+  ansi-regex@6.2.0: {}
+
   ansi-styles@3.2.1:
     dependencies:
       color-convert: 1.9.3
@@ -4158,6 +4193,8 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansi-styles@6.2.1: {}
+
   ansicolors@0.3.2: {}
 
   ansis@3.17.0: {}
@@ -4169,7 +4206,7 @@ snapshots:
 
   any-signal@3.0.1: {}
 
-  any-signal@4.2.0: {}
+  any-signal@4.1.1: {}
 
   anymatch@3.1.3:
     dependencies:
@@ -4255,10 +4292,6 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  balanced-match@4.0.2:
-    dependencies:
-      jackspeak: 4.2.3
-
   base-x@3.0.11:
     dependencies:
       safe-buffer: 5.2.1
@@ -4313,10 +4346,6 @@ snapshots:
     dependencies:
       balanced-match: 1.0.2
 
-  brace-expansion@5.0.2:
-    dependencies:
-      balanced-match: 4.0.2
-
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -4378,7 +4407,7 @@ snapshots:
 
   bundle-name@4.1.0:
     dependencies:
-      run-applescript: 7.1.0
+      run-applescript: 7.0.0
 
   busboy@1.6.0:
     dependencies:
@@ -4412,7 +4441,7 @@ snapshots:
 
   cborg@1.10.2: {}
 
-  cborg@4.5.8: {}
+  cborg@4.2.13: {}
 
   chalk@2.4.2:
     dependencies:
@@ -4430,7 +4459,7 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  chardet@2.1.1: {}
+  chardet@2.1.0: {}
 
   chokidar@3.5.3:
     dependencies:
@@ -4570,7 +4599,7 @@ snapshots:
 
   dag-jose@5.1.1:
     dependencies:
-      '@ipld/dag-cbor': 9.2.5
+      '@ipld/dag-cbor': 9.2.4
       multiformats: 13.1.3
 
   dashdash@1.14.1:
@@ -4581,15 +4610,15 @@ 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.4.1:
+  debug@4.4.1(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   debug@4.4.3(supports-color@8.1.1):
     dependencies:
@@ -4635,12 +4664,12 @@ snapshots:
       pify: 2.3.0
       strip-dirs: 2.1.0
 
-  default-browser-id@5.0.1: {}
+  default-browser-id@5.0.0: {}
 
-  default-browser@5.5.0:
+  default-browser@5.2.1:
     dependencies:
       bundle-name: 4.1.0
-      default-browser-id: 5.0.1
+      default-browser-id: 5.0.0
 
   defaults@1.0.4:
     dependencies:
@@ -4673,6 +4702,10 @@ snapshots:
       - node-fetch
       - supports-color
 
+  dns-packet@5.6.1:
+    dependencies:
+      '@leichtgewicht/ip-codec': 2.0.5
+
   docker-compose@0.23.19:
     dependencies:
       yaml: 1.10.2
@@ -4704,6 +4737,8 @@ snapshots:
       es-errors: 1.3.0
       gopd: 1.2.0
 
+  eastasianwidth@0.2.0: {}
+
   ecc-jsbn@0.1.2:
     dependencies:
       jsbn: 0.1.1
@@ -4737,6 +4772,8 @@ snapshots:
 
   emoji-regex@8.0.0: {}
 
+  emoji-regex@9.2.2: {}
+
   encoding@0.1.13:
     dependencies:
       iconv-lite: 0.6.3
@@ -4826,7 +4863,7 @@ snapshots:
 
   event-target-shim@5.0.1: {}
 
-  eventemitter3@5.0.4: {}
+  eventemitter3@5.0.1: {}
 
   evp_bytestokey@1.0.3:
     dependencies:
@@ -4909,7 +4946,7 @@ 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.4.3):
     optionalDependencies:
@@ -4972,8 +5009,6 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  generator-function@2.0.1: {}
-
   get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -5016,11 +5051,11 @@ snapshots:
   glob@11.0.3:
     dependencies:
       foreground-child: 3.3.1
-      jackspeak: 4.2.3
-      minimatch: 10.2.1
+      jackspeak: 4.1.1
+      minimatch: 10.0.3
       minipass: 7.1.2
       package-json-from-dist: 1.0.1
-      path-scurry: 2.0.1
+      path-scurry: 2.0.0
 
   glob@7.2.3:
     dependencies:
@@ -5082,6 +5117,41 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  gluegun@5.1.6(debug@4.3.4):
+    dependencies:
+      apisauce: 2.1.6(debug@4.3.4)
+      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.3):
     dependencies:
       apisauce: 2.1.6(debug@4.4.3)
@@ -5215,10 +5285,6 @@ snapshots:
     dependencies:
       safer-buffer: 2.1.2
 
-  iconv-lite@0.7.2:
-    dependencies:
-      safer-buffer: 2.1.2
-
   ieee754@1.2.1: {}
 
   ignore@5.3.2: {}
@@ -5303,7 +5369,7 @@ snapshots:
       '@ipld/dag-pb': 2.1.18
       abort-controller: 3.0.0
       any-signal: 2.1.2
-      debug: 4.4.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))
@@ -5376,10 +5442,9 @@ snapshots:
 
   is-fullwidth-code-point@3.0.0: {}
 
-  is-generator-function@1.1.2:
+  is-generator-function@1.1.0:
     dependencies:
       call-bound: 1.0.4
-      generator-function: 2.0.1
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -5429,7 +5494,7 @@ snapshots:
     dependencies:
       is-docker: 2.2.1
 
-  is-wsl@3.1.1:
+  is-wsl@3.1.0:
     dependencies:
       is-inside-container: 1.0.0
 
@@ -5495,9 +5560,9 @@ snapshots:
       p-fifo: 1.0.0
       readable-stream: 3.6.2
 
-  jackspeak@4.2.3:
+  jackspeak@4.1.1:
     dependencies:
-      '@isaacs/cliui': 9.0.0
+      '@isaacs/cliui': 8.0.2
 
   jake@10.9.4:
     dependencies:
@@ -5587,18 +5652,18 @@ snapshots:
       node-gyp-build: 4.8.4
       readable-stream: 3.6.2
 
-  kubo-rpc-client@5.4.1(undici@7.16.0):
+  kubo-rpc-client@5.2.0(undici@7.16.0):
     dependencies:
-      '@ipld/dag-cbor': 9.2.5
-      '@ipld/dag-json': 10.2.6
+      '@ipld/dag-cbor': 9.2.4
+      '@ipld/dag-json': 10.2.5
       '@ipld/dag-pb': 4.1.5
-      '@libp2p/crypto': 5.1.13
-      '@libp2p/interface': 2.11.0
-      '@libp2p/logger': 5.2.0
-      '@libp2p/peer-id': 5.1.9
+      '@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.2.0
+      any-signal: 4.1.1
       blob-to-it: 2.0.10
       browser-readablestream-to-it: 2.0.10
       dag-jose: 5.1.1
@@ -5614,10 +5679,10 @@ snapshots:
       it-peekable: 3.0.8
       it-to-stream: 1.0.0
       merge-options: 3.0.4
-      multiformats: 13.4.2
-      nanoid: 5.1.6
+      multiformats: 13.4.0
+      nanoid: 5.1.5
       native-fetch: 4.0.2(undici@7.16.0)
-      parse-duration: 2.1.5
+      parse-duration: 2.1.4
       react-native-fetch-api: 3.0.0
       stream-to-it: 1.0.1
       uint8arrays: 5.1.0
@@ -5659,7 +5724,7 @@ snapshots:
 
   lodash.upperfirst@4.3.1: {}
 
-  lodash@4.17.23: {}
+  lodash@4.17.21: {}
 
   log-symbols@3.0.0:
     dependencies:
@@ -5671,7 +5736,7 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.2.6: {}
+  lru-cache@11.1.0: {}
 
   lru-cache@6.0.0:
     dependencies:
@@ -5718,9 +5783,9 @@ snapshots:
 
   minimalistic-crypto-utils@1.0.1: {}
 
-  minimatch@10.2.1:
+  minimatch@10.0.3:
     dependencies:
-      brace-expansion: 5.0.2
+      '@isaacs/brace-expansion': 5.0.0
 
   minimatch@3.1.2:
     dependencies:
@@ -5765,7 +5830,7 @@ snapshots:
 
   ms@2.1.3: {}
 
-  ms@3.0.0-canary.202508261828: {}
+  ms@3.0.0-canary.1: {}
 
   multiaddr-to-uri@8.0.0(node-fetch@2.7.0(encoding@0.1.13)):
     dependencies:
@@ -5788,7 +5853,7 @@ snapshots:
 
   multiformats@13.1.3: {}
 
-  multiformats@13.4.2: {}
+  multiformats@13.4.0: {}
 
   multiformats@9.9.0: {}
 
@@ -5798,7 +5863,7 @@ snapshots:
 
   nanoid@3.3.11: {}
 
-  nanoid@5.1.6: {}
+  nanoid@5.1.5: {}
 
   native-abort-controller@1.0.4(abort-controller@3.0.0):
     dependencies:
@@ -5855,7 +5920,7 @@ snapshots:
 
   open@10.2.0:
     dependencies:
-      default-browser: 5.5.0
+      default-browser: 5.2.1
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
       wsl-utils: 0.1.0
@@ -5879,12 +5944,12 @@ snapshots:
       fast-fifo: 1.3.2
       p-defer: 3.0.0
 
-  p-queue@9.1.0:
+  p-queue@8.1.0:
     dependencies:
-      eventemitter3: 5.0.4
-      p-timeout: 7.0.1
+      eventemitter3: 5.0.1
+      p-timeout: 6.1.4
 
-  p-timeout@7.0.1: {}
+  p-timeout@6.1.4: {}
 
   package-json-from-dist@1.0.1: {}
 
@@ -5896,7 +5961,7 @@ snapshots:
 
   parse-duration@1.1.2: {}
 
-  parse-duration@2.1.5: {}
+  parse-duration@2.1.4: {}
 
   parse-json@4.0.0:
     dependencies:
@@ -5924,9 +5989,9 @@ snapshots:
       lru-cache: 10.4.3
       minipass: 7.1.2
 
-  path-scurry@2.0.1:
+  path-scurry@2.0.0:
     dependencies:
-      lru-cache: 11.2.6
+      lru-cache: 11.1.0
       minipass: 7.1.2
 
   path-type@4.0.0: {}
@@ -5966,6 +6031,8 @@ snapshots:
 
   prettier@1.19.1: {}
 
+  prettier@3.0.3: {}
+
   prettier@3.6.2: {}
 
   process-nextick-args@2.0.1: {}
@@ -6074,9 +6141,9 @@ snapshots:
     dependencies:
       esprima: 4.0.1
 
-  registry-auth-token@5.1.1:
+  registry-auth-token@5.1.0:
     dependencies:
-      '@pnpm/npm-conf': 3.0.2
+      '@pnpm/npm-conf': 2.3.1
 
   request@2.88.2:
     dependencies:
@@ -6134,7 +6201,7 @@ snapshots:
     dependencies:
       bn.js: 5.2.2
 
-  run-applescript@7.1.0: {}
+  run-applescript@7.0.0: {}
 
   run-parallel@1.2.0:
     dependencies:
@@ -6172,9 +6239,9 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
-  semver@7.7.3: {}
+  semver@7.7.2: {}
 
-  semver@7.7.4: {}
+  semver@7.7.3: {}
 
   set-function-length@1.2.2:
     dependencies:
@@ -6284,6 +6351,12 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  string-width@5.1.2:
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
+
   string_decoder@0.10.31: {}
 
   string_decoder@1.1.1:
@@ -6302,6 +6375,10 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
+  strip-ansi@7.1.0:
+    dependencies:
+      ansi-regex: 6.2.0
+
   strip-dirs@2.1.0:
     dependencies:
       is-natural-number: 4.0.1
@@ -6312,8 +6389,6 @@ snapshots:
     dependencies:
       is-hex-prefixed: 1.0.0
 
-  supports-color@10.2.2: {}
-
   supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
@@ -6326,6 +6401,8 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
+  supports-color@9.4.0: {}
+
   supports-hyperlinks@2.3.0:
     dependencies:
       has-flag: 4.0.0
@@ -6389,7 +6466,7 @@ snapshots:
       native-abort-controller: 1.0.4(abort-controller@3.0.0)
       retimer: 3.0.0
 
-  tinyglobby@0.2.15:
+  tinyglobby@0.2.14:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
@@ -6470,7 +6547,7 @@ snapshots:
 
   uint8arrays@5.1.0:
     dependencies:
-      multiformats: 13.4.2
+      multiformats: 13.4.0
 
   unbzip2-stream@1.4.3:
     dependencies:
@@ -6496,8 +6573,6 @@ snapshots:
       node-gyp-build: 4.8.4
     optional: true
 
-  utf8-codec@1.0.0: {}
-
   utf8@3.0.0: {}
 
   util-deprecate@1.0.2: {}
@@ -6506,7 +6581,7 @@ snapshots:
     dependencies:
       inherits: 2.0.4
       is-arguments: 1.2.0
-      is-generator-function: 1.1.2
+      is-generator-function: 1.1.0
       is-typed-array: 1.1.15
       which-typed-array: 1.1.19
 
@@ -6528,10 +6603,10 @@ snapshots:
     dependencies:
       defaults: 1.0.4
 
-  weald@1.1.1:
+  weald@1.0.4:
     dependencies:
-      ms: 3.0.0-canary.202508261828
-      supports-color: 10.2.2
+      ms: 3.0.0-canary.1
+      supports-color: 9.4.0
 
   web-streams-polyfill@3.3.3: {}
 
@@ -6570,7 +6645,7 @@ snapshots:
   web3-utils@4.3.3:
     dependencies:
       ethereum-cryptography: 2.2.1
-      eventemitter3: 5.0.4
+      eventemitter3: 5.0.1
       web3-errors: 1.3.1
       web3-types: 1.10.0
       web3-validator: 2.0.6
@@ -6634,6 +6709,12 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  wrap-ansi@8.1.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.1.0
+
   wrappy@1.0.2: {}
 
   ws@7.5.10(bufferutil@4.0.9)(utf-8-validate@5.0.10):
@@ -6643,7 +6724,7 @@ snapshots:
 
   wsl-utils@0.1.0:
     dependencies:
-      is-wsl: 3.1.1
+      is-wsl: 3.1.0
 
   xtend@4.0.2: {}
 
@@ -6662,6 +6743,6 @@ snapshots:
 
   yn@3.1.1: {}
 
-  yoctocolors-cjs@2.1.3: {}
+  yoctocolors-cjs@2.1.2: {}
 
   zod@3.25.76: {}
diff --git a/runtime/test/src/test.rs b/runtime/test/src/test.rs
index 3afe845d46e..14af4d0f8e3 100644
--- a/runtime/test/src/test.rs
+++ b/runtime/test/src/test.rs
@@ -2,7 +2,7 @@ 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;
@@ -16,7 +16,7 @@ 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};
@@ -195,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> {
@@ -309,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 {
@@ -994,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]
@@ -1130,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()),
@@ -1250,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()
+        );
     }
 }
 
@@ -1566,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(
@@ -1829,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, 1053946160531).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 b93ed2d9cfa..bd1b2de04d9 100644
--- a/runtime/test/src/test/abi.rs
+++ b/runtime/test/src/test/abi.rs
@@ -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 81c9f247688..abf96ddc0ff 100644
--- a/runtime/wasm/Cargo.toml
+++ b/runtime/wasm/Cargo.toml
@@ -14,7 +14,7 @@ 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 ab45777c428..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
@@ -670,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(
@@ -1236,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],
@@ -1299,7 +1323,7 @@ pub mod test_support {
         components::{store::GetScope, subgraph::SharedProofOfIndexing},
         data::value::Word,
         prelude::{BlockState, Entity, StopwatchMetrics, Value},
-        runtime::{gas::GasCounter, HostExportError},
+        runtime::{HostExportError, gas::GasCounter},
         slog::Logger,
     };
 
@@ -1371,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 68e7ea249f2..c185148bff0 100644
--- a/runtime/wasm/src/mapping.rs
+++ b/runtime/wasm/src/mapping.rs
@@ -9,13 +9,13 @@ use graph::futures01::{Future as _, Stream as _};
 use graph::futures03::channel::oneshot::Sender;
 use graph::parking_lot::RwLock;
 use graph::prelude::*;
-use graph::runtime::gas::Gas;
 use graph::runtime::IndexForAscTypeId;
+use graph::runtime::gas::Gas;
 use parity_wasm::elements::ExportEntry;
 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.
@@ -302,8 +302,10 @@ 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 use Cranelift as a compilation engine. Cranelift is an optimizing compiler, but that
@@ -320,7 +322,6 @@ impl ValidModule {
             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)?;
diff --git a/runtime/wasm/src/module/context.rs b/runtime/wasm/src/module/context.rs
index 68639e463b3..70d65489304 100644
--- a/runtime/wasm/src/module/context.rs
+++ b/runtime/wasm/src/module/context.rs
@@ -13,21 +13,21 @@ use anyhow::Error;
 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>,
@@ -1180,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 a4bf1f34d81..79017beadc1 100644
--- a/runtime/wasm/src/module/instance.rs
+++ b/runtime/wasm/src/module/instance.rs
@@ -2,8 +2,8 @@ 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);
@@ -282,10 +285,10 @@ fn link_chain_host_fn(
                         .iter()
                         .find(|hf| hf.name == name)
                         .ok_or_else(|| {
-                            anyhow::anyhow!(
+                            wasmtime::Error::msg(format!(
                                 "chain host function '{}' is not available for this chain",
                                 name
-                            )
+                            ))
                         })?
                         .cheap_clone();
 
@@ -303,17 +306,20 @@ fn link_chain_host_fn(
                         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,
-                    })?;
+                    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,
@@ -456,6 +462,12 @@ pub(crate) fn build_linker(
 
     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);
 
@@ -577,7 +589,9 @@ pub(crate) fn build_linker(
     linker.func_wrap(
         "gas",
         "gas",
-        |mut caller: wasmtime::Caller<'_, WasmInstanceData>, gas_used: u32| -> anyhow::Result<()> {
+        |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
@@ -585,10 +599,10 @@ pub(crate) fn build_linker(
             if let Err(e) = caller
                 .data()
                 .gas
-                .consume_host_fn_with_metrics(gas_used.saturating_into(), "gas")
+                .consume_host_fn_with_metrics(Gas::new(gas_used), "gas")
             {
                 caller.data_mut().deterministic_host_trap = true;
-                return Err(e.into());
+                return Err(wasmtime::Error::from_anyhow(e.into()));
             }
 
             Ok(())
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 fddfe4b8c01..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;
 
@@ -382,7 +381,7 @@ impl AscHeap for WasmInstanceContext<'_> {
             .await
             .map_err(|trap| {
                 host_export_error_from_trap(
-                    trap,
+                    trap.into(),
                     format!("Failed to call 'asc_type_id' with '{:?}'", type_id_index),
                 )
             })?;
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 c7997b6885f..b310281d52c 100644
--- a/server/graphman/src/resolvers/deployment_mutation/remove.rs
+++ b/server/graphman/src/resolvers/deployment_mutation/remove.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/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 fd2020ee740..6742b064f20 100644
--- a/server/graphman/tests/deployment_mutation.rs
+++ b/server/graphman/tests/deployment_mutation.rs
@@ -6,8 +6,8 @@ use graph::components::store::SubgraphStore;
 use graph::prelude::DeploymentHash;
 use serde::Deserialize;
 use serde_json::json;
-use test_store::create_test_subgraph;
 use test_store::SUBGRAPH_STORE;
+use test_store::create_test_subgraph;
 use tokio::time::sleep;
 
 use self::util::client::send_graphql_request;
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/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 4c43c4d8ec1..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;
 
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/src/handlers.rs b/server/json-rpc/src/handlers.rs
index eda2ed67154..442347cfdb5 100644
--- a/server/json-rpc/src/handlers.rs
+++ b/server/json-rpc/src/handlers.rs
@@ -8,16 +8,16 @@ 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 axum::Json;
 use graph::prelude::{
-    DeploymentHash, NodeId, SubgraphName, SubgraphRegistrar, SubgraphRegistrarError, ENV_VARS,
+    DeploymentHash, ENV_VARS, NodeId, SubgraphName, SubgraphRegistrar, SubgraphRegistrarError,
 };
 use serde::Deserialize;
 use serde_json::{self, Value as JsonValue};
-use slog::{error, info, Logger};
+use slog::{Logger, error, info};
 
 use crate::jsonrpc::{JsonRpcError, JsonRpcId, JsonRpcRequest, JsonRpcResponse};
 
diff --git a/server/json-rpc/src/server.rs b/server/json-rpc/src/server.rs
index 0495d186b1a..5fe5905ba70 100644
--- a/server/json-rpc/src/server.rs
+++ b/server/json-rpc/src/server.rs
@@ -6,14 +6,14 @@
 use std::net::{Ipv4Addr, SocketAddr};
 use std::sync::Arc;
 
-use axum::routing::post;
 use axum::Router;
+use axum::routing::post;
 use graph::prelude::{NodeId, SubgraphRegistrar};
-use slog::{info, Logger};
+use slog::{Logger, info};
 use thiserror::Error;
 use tokio::sync::Notify;
 
-use crate::handlers::{jsonrpc_handler, AppState};
+use crate::handlers::{AppState, jsonrpc_handler};
 
 /// Errors that can occur when starting the JSON-RPC server.
 #[derive(Debug, Error)]
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 289b2f4179b..96732c44c28 100644
--- a/store/postgres/Cargo.toml
+++ b/store/postgres/Cargo.toml
@@ -22,17 +22,17 @@ Inflector = { workspace = true }
 lazy_static = { workspace = true }
 lru_time_cache = "0.11"
 postgres = "0.19.1"
-openssl = { version = "0.10.76", 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.102"
 git-testament = { workspace = true }
-itertools = "0.14.0"
+itertools = "0.15.0"
 hex = "0.4.3"
 pretty_assertions = "1.4.1"
 sqlparser = { 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 87ecc5358db..4bc9b105c57 100644
--- a/store/postgres/src/block_store.rs
+++ b/store/postgres/src/block_store.rs
@@ -4,13 +4,13 @@ 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, warn, 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;
@@ -40,7 +40,7 @@ const SUPPORTED_DB_VERSION: i64 = 3;
 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},
@@ -48,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! {
@@ -253,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();
 
@@ -437,18 +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, 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
     }
 
diff --git a/store/postgres/src/catalog.rs b/store/postgres/src/catalog.rs
index 83bc7528900..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,
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 e1d9bea2538..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::{info, o, Logger};
+use graph::slog::{Logger, info, o};
 use graph::stable_hash::crypto_stable_hash;
 use graph::util::herd_cache::HerdCache;
 
@@ -31,15 +30,15 @@ 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,
-    StaleCallCacheResult, 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::vid_batcher::AdaptiveBatchSize;
 use crate::AsyncPgConnection;
+use crate::vid_batcher::AdaptiveBatchSize;
 use crate::{chain_head_listener::ChainHeadUpdateSender, pool::ConnectionPool};
 
 /// Our own internal notion of a block
@@ -127,13 +126,13 @@ pub use data::Storage;
 /// Encapuslate access to the blocks table for a chain.
 mod data {
     use crate::diesel::dsl::IntervalDsl;
-    use crate::{catalog, 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, BoolExpressionMethods, ExpressionMethods, JoinOnDsl,
-        NullableExpressionMethods, OptionalExtension, QueryDsl,
+        BoolExpressionMethods, ExpressionMethods, JoinOnDsl, NullableExpressionMethods,
+        OptionalExtension, QueryDsl, delete, sql_query,
     };
     use diesel::{
         deserialize::FromSql,
@@ -151,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;
@@ -2235,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
@@ -2273,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);
             }
         }
 
@@ -2420,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?;
 
@@ -2447,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
     }
@@ -2465,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
     }
@@ -2694,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),
@@ -2704,9 +2693,8 @@ impl ChainStore {
                     .execute(conn)
                     .await?;
                 Ok((None, Some((hash, number))))
-            }
-            .scope_boxed()
-        })
+            },
+        )
         .await
     }
 
@@ -2823,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(())
@@ -2866,10 +2851,10 @@ impl ChainStoreTrait for ChainStore {
         }
 
         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)
@@ -3658,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| {
@@ -3699,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?;
 
@@ -3732,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
     }
@@ -3765,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,
@@ -3774,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 4d8df5c3a28..d764d451ad6 100644
--- a/store/postgres/src/deployment_store.rs
+++ b/store/postgres/src/deployment_store.rs
@@ -1,12 +1,12 @@
 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, DumpReporter, PrunePhase, PruneReporter,
@@ -17,7 +17,7 @@ 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;
@@ -33,7 +33,7 @@ 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;
@@ -41,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};
 
@@ -52,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.
@@ -176,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,
@@ -188,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
     }
@@ -260,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
     }
@@ -300,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()))?;
@@ -545,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
     }
 
@@ -653,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
     }
@@ -736,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.
@@ -863,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?;
 
@@ -909,7 +887,7 @@ impl DeploymentStore {
         // 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, site.cheap_clone(), self.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,
@@ -917,21 +895,18 @@ impl DeploymentStore {
         conn.build_transaction()
             .repeatable_read()
             .read_only()
-            .run(|conn| {
-                async move {
-                    let entity_count = crate::detail::entity_count(conn, &site).await?;
-                    layout
-                        .dump(
-                            conn,
-                            index_list,
-                            dir,
-                            &site.network,
-                            entity_count,
-                            &mut *reporter,
-                        )
-                        .await
-                }
-                .scope_boxed()
+            .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
     }
@@ -1174,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?;
+
+                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();
 
-                    layout.rollup(conn, last_rollup, &batch.block_times).await?;
+                layout.rollup(conn, last_rollup, &batch.block_times).await?;
 
-                    dynds::insert(conn, &site, &batch.data_sources, manifest_idx_and_name).await?;
+                dynds::insert(conn, &site, &batch.data_sources, manifest_idx_and_name).await?;
 
-                    dynds::update_offchain_status(conn, &site, &batch.offchain_to_remove).await?;
+                dynds::update_offchain_status(conn, &site, &batch.offchain_to_remove).await?;
 
-                    if !batch.deterministic_errors.is_empty() {
-                        deployment::insert_subgraph_errors(
-                            &self.logger,
+                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
         })
@@ -1365,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
         })
@@ -1476,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)
@@ -1514,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
     }
 
@@ -1620,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.
     //
@@ -1732,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,
@@ -1807,7 +1928,7 @@ impl DeploymentStore {
 
                     Ok(UnfailOutcome::Noop)
                 }
-            } }.scope_boxed()
+            }
         }).await
     }
 
@@ -1829,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,
@@ -1869,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,
@@ -1881,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 9e1827fcddb..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);
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 6a247f824e5..714e1741245 100644
--- a/store/postgres/src/dynds/private.rs
+++ b/store/postgres/src/dynds/private.rs
@@ -1,25 +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::{BigInt, Binary, Bool, Integer, Jsonb, Nullable, Text},
-    ExpressionMethods, OptionalExtension, QueryDsl, QueryResult,
 };
 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::parquet::convert::DataSourceRestoreRow;
 
-use crate::{primary::Namespace, relational_queries::POSTGRES_MAX_PARAMETERS, AsyncPgConnection};
+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>;
@@ -181,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)
@@ -311,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
+                    ));
                 }
             }
         }
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 44b53a7130d..10cdf2ff627 100644
--- a/store/postgres/src/lib.rs
+++ b/store/postgres/src/lib.rs
@@ -47,46 +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::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, RestoreMode, 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
index 441700c09cb..193a7b3e0bf 100644
--- a/store/postgres/src/parquet/convert.rs
+++ b/store/postgres/src/parquet/convert.rs
@@ -11,8 +11,8 @@ use arrow::array::{
 use arrow::datatypes::{DataType, Schema};
 
 use graph::components::store::StoreError;
-use graph::data::store::scalar;
 use graph::data::store::Value;
+use graph::data::store::scalar;
 use graph::data::value::Word;
 use graph::prelude::BlockNumber;
 
@@ -58,6 +58,39 @@ pub fn rows_to_record_batch(schema: &Schema, rows: &[OidRow]) -> Result<RecordBa
         .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),
@@ -593,7 +626,7 @@ mod tests {
     use std::sync::Arc;
 
     use super::*;
-    use crate::layout_for_tests::{make_dummy_site, Catalog, Layout, Namespace};
+    use crate::layout_for_tests::{Catalog, Layout, Namespace, make_dummy_site};
     use crate::parquet::schema::arrow_schema;
 
     fn make_row(values: Vec<OidValue>) -> OidRow {
diff --git a/store/postgres/src/parquet/schema.rs b/store/postgres/src/parquet/schema.rs
index fd6b1d216a8..f5c06643be0 100644
--- a/store/postgres/src/parquet/schema.rs
+++ b/store/postgres/src/parquet/schema.rs
@@ -95,7 +95,7 @@ mod tests {
     use graph::prelude::DeploymentHash;
     use graph::schema::InputSchema;
 
-    use crate::layout_for_tests::{make_dummy_site, Catalog, Layout, Namespace};
+    use crate::layout_for_tests::{Catalog, Layout, Namespace, make_dummy_site};
 
     use super::*;
 
@@ -188,10 +188,12 @@ mod tests {
                 .data_type(),
             &DataType::Int32
         );
-        assert!(!schema
-            .field_with_name("block_range_start")
-            .unwrap()
-            .is_nullable());
+        assert!(
+            !schema
+                .field_with_name("block_range_start")
+                .unwrap()
+                .is_nullable()
+        );
 
         assert_eq!(
             schema
@@ -200,10 +202,12 @@ mod tests {
                 .data_type(),
             &DataType::Int32
         );
-        assert!(schema
-            .field_with_name("block_range_end")
-            .unwrap()
-            .is_nullable());
+        assert!(
+            schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .is_nullable()
+        );
 
         assert_eq!(
             schema
@@ -333,22 +337,30 @@ mod tests {
 
         // 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("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());
@@ -389,10 +401,12 @@ mod tests {
                 .data_type(),
             &DataType::Int32
         );
-        assert!(!schema
-            .field_with_name("block_range_end")
-            .unwrap()
-            .is_nullable());
+        assert!(
+            !schema
+                .field_with_name("block_range_end")
+                .unwrap()
+                .is_nullable()
+        );
     }
 
     #[test]
diff --git a/store/postgres/src/pool/coordinator.rs b/store/postgres/src/pool/coordinator.rs
index d0a7088ec47..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};
 
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 9d881ca7ebd..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,17 +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 diesel_async::scoped_futures::ScopedBoxFuture;
 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;
@@ -29,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;
@@ -71,12 +125,27 @@ impl PermittedConnection {
     ///
     /// This is analogous to `diesel_async::pg::TransactionBuilder` but
     /// works with the pool-wrapped connection type. The closure receives
-    /// `&mut PermittedConnection`, keeping the full wrapper type available
-    /// so callers can pass it to functions that expect `&mut AsyncPgConnection`
-    /// (the pool alias, not the raw diesel type).
-    pub fn build_transaction(&mut self) -> TransactionBuilder<'_> {
+    /// `&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
@@ -91,7 +160,7 @@ impl PermittedConnection {
 /// `PoolTransactionManager<PoolTransactionManager<AnsiTransactionManager>>`.
 /// Neither matches `AnsiTransactionManager`.
 #[must_use = "Transaction builder does nothing unless you call `run` on it"]
-pub struct TransactionBuilder<'a> {
+pub(crate) struct TransactionBuilder<'a> {
     conn: &'a mut PermittedConnection,
     isolation_level: Option<&'static str>,
     read_only: bool,
@@ -107,35 +176,24 @@ impl<'a> TransactionBuilder<'a> {
     }
 
     /// Set the transaction isolation level to `REPEATABLE READ`.
-    pub fn repeatable_read(mut self) -> Self {
+    pub(crate) fn repeatable_read(mut self) -> Self {
         self.isolation_level = Some("REPEATABLE READ");
         self
     }
 
-    /// Set the transaction isolation level to `SERIALIZABLE`.
-    pub fn serializable(mut self) -> Self {
-        self.isolation_level = Some("SERIALIZABLE");
-        self
-    }
-
     /// Make the transaction `READ ONLY`.
-    pub fn read_only(mut self) -> Self {
+    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 closure must return a `ScopedBoxFuture` (use `.scope_boxed()`
-    /// from `ScopedFutureExt`).
-    pub async fn run<'b, T, E, F>(self, f: F) -> Result<T, E>
+    /// 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: for<'r> FnOnce(&'r mut PermittedConnection) -> ScopedBoxFuture<'b, 'r, Result<T, E>>
-            + Send
-            + 'a,
-        T: 'b,
-        E: From<diesel::result::Error> + 'b,
+        F: TxnCallback<T, E>,
+        E: From<diesel::result::Error>,
     {
         let mut sql = String::from("BEGIN TRANSACTION");
         if let Some(level) = self.isolation_level {
@@ -816,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(())
@@ -860,19 +922,16 @@ impl PoolInner {
         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
     }
@@ -918,13 +977,10 @@ impl PoolInner {
 
         info!(&self.logger, "Dropping cross-shard views");
         let mut conn = self.get_for_setup().await?;
-        conn.transaction(|conn| {
-            async {
-                let query = format!("drop schema if exists {} cascade", CROSS_SHARD_NSP);
-                conn.batch_execute(&query).await?;
-                Ok(())
-            }
-            .scope_boxed()
+        conn.transaction(async move |conn| {
+            let query = format!("drop schema if exists {} cascade", CROSS_SHARD_NSP);
+            conn.batch_execute(&query).await?;
+            Ok(())
         })
         .await
     }
@@ -963,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
     }
@@ -996,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
     }
 
@@ -1007,7 +1060,7 @@ impl PoolInner {
         if server.shard == *PRIMARY_SHARD {
             info!(&self.logger, "Mapping primary");
             let mut conn = self.get_for_setup().await?;
-            conn.transaction(|conn| ForeignServer::map_primary(conn, &self.shard).scope_boxed())
+            conn.transaction(async |conn| ForeignServer::map_primary(conn, &self.shard).await)
                 .await?;
         }
         if server.shard != self.shard {
@@ -1017,7 +1070,7 @@ impl PoolInner {
                 server.shard.as_str()
             );
             let mut conn = self.get_for_setup().await?;
-            conn.transaction(|conn| server.map_metadata(conn).scope_boxed())
+            conn.transaction(async |conn| server.map_metadata(conn).await)
                 .await?;
         }
         Ok(())
diff --git a/store/postgres/src/primary.rs b/store/postgres/src/primary.rs
index a63fc3f98b6..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::{
@@ -816,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
@@ -1006,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)
@@ -1539,39 +1526,36 @@ 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)))
+                .execute(conn)
+                .await?;
 
-                delete(ds::table.filter(ds::id.eq(site.id)))
+            // 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
     }
@@ -2164,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
@@ -2283,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
     }
 
@@ -2305,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
     }
 
@@ -2313,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
     }
 
@@ -2326,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
     }
 
@@ -2345,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
     }
 
@@ -2356,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
     }
 
@@ -2371,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
     }
 
@@ -2379,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
     }
 
@@ -2387,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
     }
 
@@ -2396,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
     }
@@ -2407,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 f5f9ab9c6dd..4059e736635 100644
--- a/store/postgres/src/relational.rs
+++ b/store/postgres/src/relational.rs
@@ -26,12 +26,11 @@ 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 _;
@@ -39,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::{debug, warn};
-use index::IndexList;
 use inflector::Inflector;
 use itertools::Itertools;
 use lazy_static::lazy_static;
@@ -71,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, CAUSALITY_REGION_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;
 
@@ -383,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)
@@ -656,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)
@@ -908,14 +905,11 @@ impl Layout {
 
         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| {
@@ -1039,7 +1033,8 @@ impl Layout {
             }
             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(", ")
             ));
         }
 
@@ -1757,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()
@@ -1765,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 06cbd60025c..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,
@@ -21,17 +21,17 @@ use diesel::sql_types::{
 };
 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::value::FromOidRow;
 use super::{BLOCK_COLUMN, BLOCK_RANGE_COLUMN, CAUSALITY_REGION_COLUMN};
 
 const TYPENAME: &str = "__typename";
diff --git a/store/postgres/src/relational/dump.rs b/store/postgres/src/relational/dump.rs
index f2f679579e3..c50fb6ef64c 100644
--- a/store/postgres/src/relational/dump.rs
+++ b/store/postgres/src/relational/dump.rs
@@ -3,11 +3,11 @@ 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::QueryDsl;
 use diesel_async::RunQueryDsl;
 use diesel_dynamic_schema::DynamicSelectClause;
 
@@ -16,17 +16,17 @@ use graph::data::subgraph::schema::{SubgraphError, SubgraphHealth, SubgraphManif
 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::rows_to_record_batch;
+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::IndexList;
+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 crate::AsyncPgConnection;
 
 use super::Layout;
 
@@ -240,13 +240,14 @@ impl Metadata {
 
     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) = index.to_sql(true, true) else {
+                let Ok(index) = creat.to_sql(&index) else {
                     continue;
                 };
                 indexes2.push(index);
@@ -261,6 +262,37 @@ 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)
 }
@@ -654,22 +686,22 @@ async fn dump_entity_table(
     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) {
-            if !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);
-                }
+        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);
             }
         }
 
@@ -707,10 +739,13 @@ async fn dump_entity_table(
                 }
 
                 let count = rows.len();
-                let batch = rows_to_record_batch(&arrow_schema, &rows)?;
-                let batch_min_vid = start;
-                let batch_max_vid = end;
-                writer.write_batch(&batch, batch_min_vid, batch_max_vid)?;
+                // 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?;
@@ -733,22 +768,22 @@ async fn dump_entity_table(
     }
 
     // For incremental mutable tables, dump clamps
-    if let (Some(prev_info), Some(prev_head)) = (prev, prev_head_block_number) {
-        if !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);
-            }
+    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);
         }
     }
 
@@ -1070,14 +1105,13 @@ impl Layout {
         if let (Some(prev_head), Some(curr_head)) = (
             prev_head_block_number,
             metadata.head_block.as_ref().map(|b| b.number),
-        ) {
-            if curr_head <= prev_head {
-                return Err(StoreError::InternalError(format!(
-                    "incremental dump refused: current head block ({}) <= previous head block ({}); \
+        ) && 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
-                )));
-            }
+                curr_head, prev_head
+            )));
         }
 
         write_file(dir.join("schema.graphql"), &schema)?;
@@ -1201,6 +1235,36 @@ mod tests {
         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;
diff --git a/store/postgres/src/relational/index.rs b/store/postgres/src/relational/index.rs
index 5cfb8f024e8..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();
 
@@ -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,10 +666,23 @@ 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()),
+        }
+    }
+
+    /// 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,
+            }),
         }
     }
 
@@ -707,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 {
@@ -720,146 +760,191 @@ 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)
+        })
     }
 }
 
@@ -871,7 +956,7 @@ mod tests {
     use graph::prelude::{BlockNumber, DeploymentHash};
     use graph::schema::InputSchema;
 
-    use crate::layout_for_tests::{make_dummy_site, Namespace};
+    use crate::layout_for_tests::{Namespace, make_dummy_site};
     use crate::relational::Catalog;
 
     use super::*;
@@ -920,7 +1005,7 @@ mod tests {
             }
         }
 
-        #[derive(Debug)]
+        #[derive(Debug, Clone)]
         enum TestCond {
             Partial(BlockNumber),
             Closed,
@@ -937,7 +1022,7 @@ mod tests {
             }
         }
 
-        #[derive(Debug)]
+        #[derive(Debug, Clone)]
         struct Parsed {
             unique: bool,
             name: &'static str,
@@ -975,13 +1060,35 @@ mod tests {
         }
 
         #[track_caller]
-        fn parse_one(defn: &str, exp: Parsed) {
+        fn parses_to(defn: &str, exp: &Parsed) -> CreateIndex {
             let act = CreateIndex::parse(defn.to_string());
-            let exp = CreateIndex::from(exp);
+            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 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::*;
@@ -1048,6 +1155,16 @@ mod tests {
         };
         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,
@@ -1145,8 +1262,10 @@ mod tests {
         };
         parse_one(sql, exp);
 
-        let sql =
-            "CREATE INDEX brin_scy ON sgd314614.scy USING brin (block$, vid) where (amount > 0)";
+        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",
@@ -1156,9 +1275,14 @@ mod tests {
             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)";
+        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",
@@ -1168,7 +1292,22 @@ mod tests {
             columns: &[Name("decimals")],
             cond: Some(TestCond::Unknown("decimals > (5)::numeric")),
         };
-        parse_one(sql, exp);
+        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);
     }
 
     #[test]
diff --git a/store/postgres/src/relational/prune.rs b/store/postgres/src/relational/prune.rs
index d7747fef5e9..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);
@@ -174,16 +159,20 @@ impl TablePair {
         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 63ccb5e2ea0..3b4582c5b5b 100644
--- a/store/postgres/src/relational/query_tests.rs
+++ b/store/postgres/src/relational/query_tests.rs
@@ -5,13 +5,13 @@ use graph::{
     components::store::write::RowGroup,
     data_source::CausalityRegion,
     entity,
-    prelude::{r, serde_json as json, DeploymentHash, EntityFilter},
+    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, InsertQuery},
 };
diff --git a/store/postgres/src/relational/restore.rs b/store/postgres/src/relational/restore.rs
index a4f7eff61da..081e6eebc3b 100644
--- a/store/postgres/src/relational/restore.rs
+++ b/store/postgres/src/relational/restore.rs
@@ -20,6 +20,7 @@ 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;
@@ -32,7 +33,6 @@ use crate::relational::dump::{Metadata, TableInfo};
 use crate::relational::{Layout, Table, VID_COLUMN};
 use crate::relational_queries::InsertQuery;
 use crate::vid_batcher::VidRange;
-use crate::AsyncPgConnection;
 
 const DATA_SOURCES_TABLE: &str = "data_sources$";
 
@@ -309,7 +309,6 @@ pub async fn create_schema(
         site.clone(),
         &input_schema,
         entities_with_causality_region,
-        None,
     )
     .await?;
 
@@ -428,17 +427,17 @@ pub async fn finalize(
     }
 
     // 2. Reset data_sources$ vid sequence if present
-    if let Some(ds_info) = metadata.tables.get(DATA_SOURCES_TABLE) {
-        if 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}"))
-            })?;
-        }
+    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
diff --git a/store/postgres/src/relational/rollup.rs b/store/postgres/src/relational/rollup.rs
index c96652e7bf9..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};
 
@@ -448,6 +451,9 @@ 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, true, |w, col| {
@@ -739,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
diff --git a/store/postgres/src/relational/value.rs b/store/postgres/src/relational/value.rs
index 6e4764b14c0..1217afd6195 100644
--- a/store/postgres/src/relational/value.rs
+++ b/store/postgres/src/relational/value.rs
@@ -11,8 +11,8 @@ use graph::{
     components::store::StoreError,
     data::{
         store::{
-            scalar::{BigDecimal, Bytes, Timestamp},
             Entity, QueryObject,
+            scalar::{BigDecimal, Bytes, Timestamp},
         },
         value::{Object, Word},
     },
@@ -153,7 +153,7 @@ impl FromOidValue for r::Value {
             O::Int4Range(..) => {
                 return Err(StoreError::InternalError(
                     "int4range can not be converted to r::Value".to_string(),
-                ))
+                ));
             }
             O::Null => Self::Null,
         };
@@ -210,7 +210,7 @@ impl FromOidValue for graph::prelude::Value {
             O::Int4Range(..) => {
                 return Err(StoreError::InternalError(
                     "int4range can not be converted to Value".to_string(),
-                ))
+                ));
             }
             O::Null => Self::Null,
         };
diff --git a/store/postgres/src/relational_queries.rs b/store/postgres/src/relational_queries.rs
index eee8b6073f1..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,9 +21,9 @@ 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::{
@@ -44,13 +44,14 @@ use crate::block_range::{BoundSide, EntityBlockRange};
 use crate::parquet::convert::RestoreRow;
 use crate::relational::dsl::AtBlock;
 use crate::relational::{
-    dsl, rollup::Rollup, 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,
 };
@@ -631,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())
                 })?),
@@ -646,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)
     }
@@ -765,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),
@@ -2432,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
+                    )));
                 }
             }
         }
@@ -5099,6 +5091,7 @@ pub struct CopyEntityBatchQuery<'a> {
     columns: Vec<&'a Column>,
     first_vid: i64,
     last_vid: i64,
+    target_block: BlockNumber,
 }
 
 impl<'a> CopyEntityBatchQuery<'a> {
@@ -5107,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 {
@@ -5133,6 +5133,7 @@ impl<'a> CopyEntityBatchQuery<'a> {
             columns,
             first_vid,
             last_vid,
+            target_block,
         })
     }
 
@@ -5217,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) {
@@ -5247,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 295e3460f6c..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,6 +383,7 @@ impl VisitorMut for Validator<'_> {
                     name: Ident::new(table.name.as_str()),
                     columns: vec![],
                     explicit: true,
+                    at: None,
                 })
             });
             *table_factor = TableFactor::Derived {
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 3561999567e..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};
 
@@ -26,14 +25,14 @@ use graph::{
     data::{
         query::QueryTarget,
         store::DEFAULT_NODE_ID,
-        subgraph::{schema::DeploymentCreate, status, DeploymentFeatures},
+        subgraph::{DeploymentFeatures, schema::DeploymentCreate, status},
     },
     internal_error,
     prelude::{
-        anyhow, lazy_static, o, ApiVersion, BlockNumber, BlockPtr, ChainStore, DeploymentHash,
-        EntityOperation, Logger, MetricsRegistry, NodeId, PartialBlockPtr, StoreError, StoreEvent,
-        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,
@@ -42,25 +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, 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)]
@@ -132,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
@@ -417,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())
@@ -905,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 {
@@ -935,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())
@@ -1674,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
     }
 
@@ -1684,7 +1654,7 @@ 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
     }
 
@@ -1697,15 +1667,13 @@ impl SubgraphStoreTrait for SubgraphStore {
             .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?;
         Ok(deployments)
@@ -1718,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
     }
@@ -1734,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
     }
@@ -1750,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
     }
@@ -1766,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
     }
@@ -1928,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 7ea633058f8..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
diff --git a/store/postgres/src/writable.rs b/store/postgres/src/writable.rs
index 680a217c8be..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()
     }
@@ -1820,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(
@@ -1893,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/src/block_store.rs b/store/test-store/src/block_store.rs
index c0ca494688c..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;
@@ -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 b90d244bbcc..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::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;
@@ -419,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;
 
@@ -570,7 +570,7 @@ async fn execute_subgraph_query_internal(
                 error_policy,
                 query.schema.id().clone(),
                 graphql_metrics(),
-                LOAD_MANAGER.clone()
+                LOAD_MANAGER.clone(),
             )
             .await
         );
@@ -584,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;
@@ -619,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());
@@ -626,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 b84524e8ec0..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!()
     }
@@ -983,3 +988,379 @@ fn no_interface_mods() {
         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 277536fd220..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 =
diff --git a/store/test-store/tests/graphql/mock_introspection.json b/store/test-store/tests/graphql/mock_introspection.json
index 75e54f5787d..802c423bf63 100644
--- a/store/test-store/tests/graphql/mock_introspection.json
+++ b/store/test-store/tests/graphql/mock_introspection.json
@@ -198,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",
@@ -743,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,
@@ -1367,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_",
@@ -1454,7 +1823,9 @@
       {
         "name": "language",
         "description": null,
-        "locations": ["FIELD_DEFINITION"],
+        "locations": [
+          "FIELD_DEFINITION"
+        ],
         "args": [
           {
             "name": "language",
@@ -1471,7 +1842,11 @@
       {
         "name": "skip",
         "description": null,
-        "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+        "locations": [
+          "FIELD",
+          "FRAGMENT_SPREAD",
+          "INLINE_FRAGMENT"
+        ],
         "args": [
           {
             "name": "if",
@@ -1492,7 +1867,11 @@
       {
         "name": "include",
         "description": null,
-        "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"],
+        "locations": [
+          "FIELD",
+          "FRAGMENT_SPREAD",
+          "INLINE_FRAGMENT"
+        ],
         "args": [
           {
             "name": "if",
@@ -1513,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",
@@ -1540,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 c2cb619d63f..f005a15b73d 100644
--- a/store/test-store/tests/postgres/aggregation.rs
+++ b/store/test-store/tests/postgres/aggregation.rs
@@ -3,7 +3,7 @@ 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::{
@@ -15,8 +15,8 @@ use graph::{
     },
     data::{
         store::{
-            scalar::{BigDecimal, Bytes, Timestamp},
             Entity, Id, IdList, Value,
+            scalar::{BigDecimal, Bytes, Timestamp},
         },
         subgraph::DeploymentHash,
     },
@@ -26,8 +26,8 @@ use graph::{
 };
 use graph_store_postgres::Store as DieselStore;
 use test_store::{
-    create_test_subgraph, remove_subgraphs, run_test_sequentially, BLOCKS, LOGGER,
-    METRICS_REGISTRY, STOPWATCH,
+    BLOCKS, LOGGER, METRICS_REGISTRY, STOPWATCH, create_test_subgraph, remove_subgraphs,
+    run_test_sequentially,
 };
 
 const SCHEMA: &str = r#"
diff --git a/store/test-store/tests/postgres/chain_head.rs b/store/test-store/tests/postgres/chain_head.rs
index 941fe6f9773..d72641b29b6 100644
--- a/store/test-store/tests/postgres/chain_head.rs
+++ b/store/test-store/tests/postgres/chain_head.rs
@@ -13,20 +13,20 @@ use std::sync::Arc;
 
 use graph::cheap_clone::CheapClone;
 use graph::prelude::alloy;
-use graph::prelude::{anyhow::anyhow, anyhow::Error};
 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::*;
 
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 57cac35cc2b..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;
@@ -514,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")
 }
@@ -632,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| {
@@ -773,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();
diff --git a/store/test-store/tests/postgres/relational_bytes.rs b/store/test-store/tests/postgres/relational_bytes.rs
index 2c4ac5f27c7..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,
@@ -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 23b60ecc52c..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());
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/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/src/config.rs b/tests/src/config.rs
index fc84c243912..e35fbb6bf0d 100644
--- a/tests/src/config.rs
+++ b/tests/src/config.rs
@@ -140,11 +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: std::env::var("GRAPH_NODE_TEST_IPFS_URL")
-                .unwrap_or_else(|_| "http://127.0.0.1:3001".to_string()),
+            ipfs_uri,
             log_file: TestFile::new("integration-tests/graph-node.log"),
         }
     }
@@ -155,11 +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: std::env::var("GRAPH_NODE_TEST_IPFS_URL")
-                .unwrap_or_else(|_| "http://127.0.0.1:3001".to_string()),
+            ipfs_uri,
             log_file: TestFile::new("integration-tests/graph-node.log"),
         }
     }
@@ -186,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
@@ -290,17 +342,28 @@ impl Default for Config {
         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 d7a67ceffa9..82fc89fec87 100644
--- a/tests/src/contract.rs
+++ b/tests/src/contract.rs
@@ -5,7 +5,7 @@ use graph::prelude::{
         json_abi::JsonAbi,
         network::{Ethereum, TransactionBuilder},
         primitives::{Address, Bytes, U256},
-        providers::{ext::AnvilApi, Provider, ProviderBuilder, WalletProvider},
+        providers::{Provider, ProviderBuilder, WalletProvider, ext::AnvilApi},
         rpc::types::{Block, TransactionReceipt, TransactionRequest},
         signers::local::PrivateKeySigner,
     },
@@ -13,7 +13,7 @@ use graph::prelude::{
     serde_json::{self, Value},
 };
 
-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
diff --git a/tests/src/fixture/ethereum.rs b/tests/src/fixture/ethereum.rs
index 40bf54467cc..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,20 +13,20 @@ 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, chain::ChainSettings};
 use graph_chain_ethereum::{
     chain::BlockFinality,
     trigger::{EthereumBlockTriggerType, EthereumTrigger},
 };
-use graph_chain_ethereum::{chain::ChainSettings, Chain};
 
 pub async fn chain(
     test_name: &str,
@@ -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 19b459f2a6c..90949c81be2 100644
--- a/tests/src/fixture/mod.rs
+++ b/tests/src/fixture/mod.rs
@@ -36,21 +36,21 @@ 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;
@@ -59,7 +59,7 @@ 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;
@@ -365,6 +365,7 @@ fn test_logger(test_name: &str) -> Logger {
 
 #[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 = {
@@ -614,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(
diff --git a/tests/src/helpers.rs b/tests/src/helpers.rs
index fb06a583923..50403d46eea 100644
--- a/tests/src/helpers.rs
+++ b/tests/src/helpers.rs
@@ -4,9 +4,9 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use crate::output::OutputConfig;
-use anyhow::{bail, Context};
+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
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
index 33c6246c8b4..860f6da714d 100644
--- a/tests/src/lib.rs
+++ b/tests/src/lib.rs
@@ -8,5 +8,5 @@ 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
index a1cb960ded2..fece1947528 100644
--- a/tests/src/output.rs
+++ b/tests/src/output.rs
@@ -4,7 +4,7 @@
 //! 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::{o, Drain, Logger};
+use slog::{Drain, Logger, o};
 use std::fs::File;
 use std::io::{self, Write};
 use std::path::PathBuf;
diff --git a/tests/src/recipe.rs b/tests/src/recipe.rs
index d0e0b2fe242..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};
diff --git a/tests/src/subgraph.rs b/tests/src/subgraph.rs
index 67513f49ca0..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)]
@@ -155,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
index 43676cbed11..1bbeb88cbc8 100644
--- a/tests/tests/gnd_cli_tests.rs
+++ b/tests/tests/gnd_cli_tests.rs
@@ -29,12 +29,12 @@ use std::path::PathBuf;
 use anyhow::anyhow;
 use graph::futures03::StreamExt;
 use graph_tests::contract::Contract;
-use graph_tests::{error, status, CONFIG};
+use graph_tests::{CONFIG, error, status};
 
 mod integration_tests;
 
 use integration_tests::{
-    stop_graph_node, test_block_handlers, test_int8, test_value_roundtrip, TestCase, TestResult,
+    TestCase, TestResult, stop_graph_node, test_block_handlers, test_int8, test_value_roundtrip,
 };
 
 /// Get the path to the gnd binary
diff --git a/tests/tests/gnd_tests.rs b/tests/tests/gnd_tests.rs
index 0ed1ac5ec8a..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.
diff --git a/tests/tests/integration_tests.rs b/tests/tests/integration_tests.rs
index ee1f0f201dc..4f3457cda41 100644
--- a/tests/tests/integration_tests.rs
+++ b/tests/tests/integration_tests.rs
@@ -14,7 +14,7 @@ use std::future::Future;
 use std::pin::Pin;
 use std::time::{Duration, Instant};
 
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use graph::components::subgraph::{
     ProofOfIndexing, ProofOfIndexingEvent, ProofOfIndexingFinisher, ProofOfIndexingVersion,
 };
@@ -22,13 +22,13 @@ 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::{alloy::primitives::Address, hex, BlockPtr, DeploymentHash};
+use graph::prelude::serde_json::{Value, json};
+use graph::prelude::{BlockPtr, DeploymentHash, alloy::primitives::Address, hex};
 use graph::schema::InputSchema;
-use graph::slog::{o, Discard, Logger};
+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;
@@ -1136,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(())
 }
 
@@ -1200,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,
@@ -1390,6 +1455,296 @@ async fn test_declared_calls_struct_fields(ctx: TestContext) -> anyhow::Result<(
     Ok(())
 }
 
+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
+            );
+        }
+        println!("✓ Ascending order works correctly");
+    }
+
+    // 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.
 #[graph::test]
 async fn integration_tests() -> anyhow::Result<()> {
@@ -1424,13 +1779,14 @@ 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
diff --git a/tests/tests/runner_tests.rs b/tests/tests/runner_tests.rs
index a215d270a5d..1d44657c441 100644
--- a/tests/tests/runner_tests.rs
+++ b/tests/tests/runner_tests.rs
@@ -1,8 +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;
@@ -17,7 +17,7 @@ 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,
@@ -25,18 +25,18 @@ use graph_tests::fixture::ethereum::{
 
 use graph::blockchain::Trigger;
 use graph::prelude::alloy::rpc::types::BlockTransactions;
-use graph::prelude::{create_dummy_transaction, create_minimal_block_for_test, LightEthereumBlock};
+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,
-    StaticArweaveResolver, 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 = {
@@ -1418,3 +1418,77 @@ async fn skip_duplicates() {
         })
     );
 }
+
+/// 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(())
+}