@secondlayer/subgraphs 3.21.0 → 3.23.0

package/dist/src/index.js

@@ -86,24 +86,105 @@ var VALID_FILTER_TYPES = [
   "contract_deploy",
   "print_event"
 ];
-var SubgraphFilterSchema = z.object({
-  type: z.enum(VALID_FILTER_TYPES),
-  sender: z.string().optional(),
-  recipient: z.string().optional(),
+var contractIdField = z.union([
+  z.string(),
+  z.array(z.string()).min(1).max(20)
+]);
+var traitScope = { trait: z.string().optional() };
+var factoryScope = {
+  factory: z.object({ from: z.string().min(1), field: z.string().min(1) }).strict().optional()
+};
+var amountRange = {
   minAmount: z.bigint().optional(),
-  maxAmount: z.bigint().optional(),
-  assetIdentifier: z.string().optional(),
-  contractId: z.string().optional(),
-  functionName: z.string().optional(),
-  caller: z.string().optional(),
-  deployer: z.string().optional(),
-  contractName: z.string().optional(),
-  topic: z.string().optional(),
-  lockedAddress: z.string().optional(),
-  abi: AbiContractSchema.optional(),
-  trait: z.string().optional(),
-  prints: z.record(z.string(), z.record(z.string(), PrintFieldSchema)).optional()
-}).strict();
+  maxAmount: z.bigint().optional()
+};
+var SubgraphFilterUnion = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("stx_transfer"),
+    sender: z.string().optional(),
+    recipient: z.string().optional(),
+    ...amountRange
+  }).strict(),
+  z.object({
+    type: z.literal("stx_mint"),
+    recipient: z.string().optional(),
+    minAmount: z.bigint().optional()
+  }).strict(),
+  z.object({
+    type: z.literal("stx_burn"),
+    sender: z.string().optional(),
+    minAmount: z.bigint().optional()
+  }).strict(),
+  z.object({
+    type: z.literal("stx_lock"),
+    lockedAddress: z.string().optional(),
+    minAmount: z.bigint().optional()
+  }).strict(),
+  z.object({
+    type: z.literal("ft_transfer"),
+    assetIdentifier: z.string().optional(),
+    sender: z.string().optional(),
+    recipient: z.string().optional(),
+    minAmount: z.bigint().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("ft_mint"),
+    assetIdentifier: z.string().optional(),
+    recipient: z.string().optional(),
+    minAmount: z.bigint().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("ft_burn"),
+    assetIdentifier: z.string().optional(),
+    sender: z.string().optional(),
+    minAmount: z.bigint().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("nft_transfer"),
+    assetIdentifier: z.string().optional(),
+    sender: z.string().optional(),
+    recipient: z.string().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("nft_mint"),
+    assetIdentifier: z.string().optional(),
+    recipient: z.string().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("nft_burn"),
+    assetIdentifier: z.string().optional(),
+    sender: z.string().optional(),
+    ...traitScope
+  }).strict(),
+  z.object({
+    type: z.literal("contract_call"),
+    contractId: contractIdField.optional(),
+    functionName: z.string().optional(),
+    caller: z.string().optional(),
+    abi: AbiContractSchema.optional(),
+    ...traitScope,
+    ...factoryScope
+  }).strict(),
+  z.object({
+    type: z.literal("contract_deploy"),
+    deployer: z.string().optional(),
+    contractName: z.string().optional()
+  }).strict(),
+  z.object({
+    type: z.literal("print_event"),
+    contractId: contractIdField.optional(),
+    topic: z.string().optional(),
+    prints: z.record(z.string(), z.record(z.string(), PrintFieldSchema)).optional(),
+    ...traitScope,
+    ...factoryScope
+  }).strict()
+]);
+var SubgraphFilterSchema = SubgraphFilterUnion;
 var SubgraphDefinitionSchema = z.object({
   name: SubgraphNameSchema,
   version: z.string().optional(),
@@ -117,6 +198,23 @@ var SubgraphDefinitionSchema = z.object({
 function validateSubgraphDefinition(def) {
   return SubgraphDefinitionSchema.parse(def);
 }
+function filterFieldsByType() {
+  const options = SubgraphFilterUnion?._def?.options ?? [];
+  const out = [];
+  for (const option of options) {
+    const shape = option?.shape ?? option?._def?.shape;
+    if (!shape)
+      continue;
+    const literal = shape.type?._def?.values?.[0] ?? shape.type?._def?.value ?? undefined;
+    if (typeof literal !== "string")
+      continue;
+    out.push({
+      type: literal,
+      fields: Object.keys(shape).filter((k) => k !== "type")
+    });
+  }
+  return out;
+}
 
 // src/runtime/context.ts
 import { logger } from "@secondlayer/shared/logger";
@@ -217,6 +315,18 @@ function emitJournalDDL(schemaName) {
     `CREATE INDEX IF NOT EXISTS idx_${schemaName}_journal_height ON ${schemaName}._journal (block_height)`
   ];
 }
+function emitFactoryDDL(schemaName) {
+  return [
+    `CREATE TABLE IF NOT EXISTS ${schemaName}._factory_addresses (
+  source_name TEXT NOT NULL,
+  address TEXT NOT NULL,
+  block_height BIGINT NOT NULL,
+  _created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  PRIMARY KEY (source_name, address)
+)`,
+    `CREATE INDEX IF NOT EXISTS idx_${schemaName}_factory_height ON ${schemaName}._factory_addresses (block_height)`
+  ];
+}
 function emitForeignKeyDDL(schemaName, tableName, tableDef) {
   return (tableDef.relations ?? []).map((rel) => {
     const constraintName = `fk_${schemaName}_${tableName}_${rel.name}`;
@@ -235,6 +345,9 @@ function generateSubgraphSQL(def, schemaNameOverride) {
     statements.push(...emitTableDDL(schemaName, tableName, tableDef));
   }
   statements.push(...emitJournalDDL(schemaName));
+  if (Object.values(def.sources ?? {}).some((src) => src.factory !== undefined)) {
+    statements.push(...emitFactoryDDL(schemaName));
+  }
   for (const [tableName, tableDef] of Object.entries(def.schema)) {
     statements.push(...emitForeignKeyDDL(schemaName, tableName, tableDef));
   }
@@ -247,6 +360,139 @@ function generateSubgraphSQL(def, schemaNameOverride) {
   return { statements, hash };
 }
 
+// src/runtime/chain-read.ts
+import { getSourceDb } from "@secondlayer/shared/db";
+import { http, createPublicClient } from "@secondlayer/stacks";
+import {
+  ContractResponseError,
+  buildFunctionArgs,
+  isResponseOutput,
+  readContract
+} from "@secondlayer/stacks/actions";
+import {
+  clarityValueToJSUntyped,
+  deserializeCV,
+  normalizeAbi,
+  serializeCV,
+  toCamelCase
+} from "@secondlayer/stacks/clarity";
+function readContractAt(ctx, contractId, abi, options) {
+  return ctx.client.contract(contractId, abi, options);
+}
+
+class ChainReadError extends Error {
+  name = "ChainReadError";
+}
+function nodeClient(rpcUrl) {
+  return createPublicClient({
+    transport: http(rpcUrl, { retryCount: 0, timeout: 1e4 })
+  });
+}
+
+class ConcurrencyGate {
+  limit;
+  active = 0;
+  queue = [];
+  constructor(limit) {
+    this.limit = limit;
+  }
+  async run(fn) {
+    if (this.active >= this.limit) {
+      await new Promise((resolve) => this.queue.push(resolve));
+    }
+    this.active++;
+    try {
+      return await fn();
+    } finally {
+      this.active--;
+      this.queue.shift()?.();
+    }
+  }
+}
+var DEFAULT_MAX_CONCURRENT_READS = 4;
+function maxConcurrentReads() {
+  const raw = process.env.SUBGRAPH_CHAIN_READ_CONCURRENCY;
+  const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_MAX_CONCURRENT_READS;
+}
+var gate = new ConcurrencyGate(maxConcurrentReads());
+function hashArgs(args) {
+  const serialized = args.map((arg) => serializeCV(arg)).join(",");
+  return Bun.hash(serialized).toString(16);
+}
+function findFunction(abi, name) {
+  const fn = abi.functions.find((f) => f.name === name);
+  if (!fn) {
+    throw new ChainReadError(`No function "${name}" in the supplied ABI.`);
+  }
+  if (fn.access !== "read-only") {
+    throw new ChainReadError(`"${name}" is ${fn.access}, not read-only — a handler cannot call it.`);
+  }
+  return fn;
+}
+function createChainReadClient(ctx) {
+  const readValue = async (contractId, abi, functionName, args, options) => {
+    const rpcUrl = ctx.rpcUrl ?? process.env.STACKS_NODE_RPC_URL;
+    if (!rpcUrl) {
+      throw new ChainReadError("ctx.client needs a Stacks node: set STACKS_NODE_RPC_URL on the subgraph processor.");
+    }
+    const constant = options.cache === "contract-constant";
+    if (!constant && !ctx.indexBlockHash) {
+      throw new ChainReadError(`Block ${ctx.blockHeight} has no index_block_hash, so a read cannot be pinned to it. Reading at the node's tip would make this handler non-deterministic (the same reindex would produce different rows). Re-ingest the block, or pass cache: "contract-constant" if the value genuinely cannot change.`);
+    }
+    const fn = findFunction(abi, functionName);
+    const clarityArgs = buildFunctionArgs(fn, args);
+    const db = ctx.db ?? getSourceDb();
+    const argsHash = hashArgs(clarityArgs);
+    const pinnedTo = constant ? null : ctx.indexBlockHash;
+    const cached = await db.selectFrom("chain_read_cache").select("result_hex").where("contract_id", "=", contractId).where("function_name", "=", fn.name).where("args_hash", "=", argsHash).where((eb) => pinnedTo === null ? eb("index_block_hash", "is", null) : eb("index_block_hash", "=", pinnedTo)).executeTakeFirst();
+    const resultHex = cached?.result_hex ?? await gate.run(async () => {
+      const value2 = await readContract(nodeClient(rpcUrl), {
+        contract: contractId,
+        functionName: fn.name,
+        args: clarityArgs,
+        tip: ctx.indexBlockHash ?? undefined
+      });
+      return serializeCV(value2);
+    });
+    if (!cached) {
+      await db.insertInto("chain_read_cache").values({
+        contract_id: contractId,
+        function_name: fn.name,
+        args_hash: argsHash,
+        index_block_hash: pinnedTo,
+        block_height: constant ? null : ctx.blockHeight,
+        result_hex: resultHex
+      }).onConflict((oc) => oc.doNothing()).execute();
+    }
+    const value = deserializeCV(resultHex);
+    const js = clarityValueToJSUntyped(fn.outputs, value);
+    if (isResponseOutput(fn.outputs)) {
+      const response = js;
+      if ("ok" in response)
+        return response.ok;
+      throw new ContractResponseError(`${contractId}::${fn.name} returned an err response.`, response.err);
+    }
+    return js;
+  };
+  return {
+    contract(contractId, rawAbi, options = {}) {
+      const abi = normalizeAbi(rawAbi);
+      const camelToKebab = new Map;
+      for (const fn of abi.functions) {
+        camelToKebab.set(toCamelCase(fn.name), fn.name);
+      }
+      const read = new Proxy({}, {
+        get(_target, prop) {
+          const fnName = camelToKebab.get(prop) ?? prop;
+          return (args = {}) => readValue(contractId, abi, fnName, args, options);
+        }
+      });
+      return { read };
+    }
+  };
+}
+
 // src/runtime/context.ts
 var JOURNAL_RETENTION_BLOCKS = 300;
 var journalEnsured = new Set;
@@ -265,6 +511,7 @@ class SubgraphContext {
   ops = [];
   byo;
   journal;
+  _client;
   constructor(db, pgSchemaName2, subgraphSchema, block, tx, byo = false, journal = false) {
     this.db = db;
     this.pgSchemaName = pgSchemaName2;
@@ -274,6 +521,13 @@ class SubgraphContext {
     this.byo = byo;
     this.journal = journal;
   }
+  get client() {
+    this._client ??= createChainReadClient({
+      blockHeight: this.block.height,
+      indexBlockHash: this.block.indexBlockHash
+    });
+    return this._client;
+  }
   get tx() {
     return this._tx;
   }
@@ -379,23 +633,21 @@ class SubgraphContext {
   formatUnits(value, decimals) {
     return formatUnits(value, decimals);
   }
-  async findOne(table, where) {
-    this.validateTable(table);
+  async readRows(table, where, limit) {
     const qualifiedTable = `"${this.pgSchemaName}"."${table}"`;
     const { clause } = buildWhereClause(where);
-    const query = `SELECT * FROM ${qualifiedTable} WHERE ${clause} LIMIT 1`;
+    const query = `SELECT * FROM ${qualifiedTable} WHERE ${clause}${limit !== undefined ? ` LIMIT ${limit}` : ""}`;
     const { rows } = await sql.raw(query).execute(this.db);
-    const row = rows[0] ?? null;
-    return this.overlayOne(table, where, row ? this.coerceRow(table, row) : null);
+    return rows.map((r) => this.coerceRow(table, r));
+  }
+  async findOne(table, where) {
+    this.validateTable(table);
+    const row = (await this.readRows(table, where, 1))[0] ?? null;
+    return this.overlayOne(table, where, row);
   }
   async findMany(table, where) {
     this.validateTable(table);
-    const qualifiedTable = `"${this.pgSchemaName}"."${table}"`;
-    const { clause } = buildWhereClause(where);
-    const query = `SELECT * FROM ${qualifiedTable} WHERE ${clause}`;
-    const { rows } = await sql.raw(query).execute(this.db);
-    const dbRows = rows.map((r) => this.coerceRow(table, r));
-    return this.overlayMany(table, where, dbRows);
+    return this.overlayMany(table, where, await this.readRows(table, where));
   }
   overlayOne(table, where, dbRow) {
     if (this.ops.length === 0)
@@ -837,11 +1089,11 @@ function buildWhereClause(where) {
 }
 
 // src/runtime/clarity.ts
-import { cvToValue, deserializeCV } from "@secondlayer/stacks/clarity";
+import { cvToValue, deserializeCV as deserializeCV2 } from "@secondlayer/stacks/clarity";
 function decodeClarityValue(hex) {
   try {
     const cleanHex = hex.startsWith("0x") ? hex.slice(2) : hex;
-    const cv = deserializeCV(cleanHex);
+    const cv = deserializeCV2(cleanHex);
     return cvToValue(cv);
   } catch {
     return hex;
@@ -872,8 +1124,8 @@ import { getErrorMessage } from "@secondlayer/shared";
 import { logger as logger2 } from "@secondlayer/shared/logger";
 import {
   clarityValueToJS,
-  deserializeCV as deserializeCV2,
-  toCamelCase
+  deserializeCV as deserializeCV3,
+  toCamelCase as toCamelCase2
 } from "@secondlayer/stacks/clarity";
 
 // src/runtime/print-validate.ts
@@ -1036,7 +1288,7 @@ function buildContractCallInput(filter, tx) {
       return;
     try {
       const clean = hex.startsWith("0x") ? hex.slice(2) : hex;
-      input[toCamelCase(arg.name)] = decodeArg(arg.type, deserializeCV2(clean));
+      input[toCamelCase2(arg.name)] = decodeArg(arg.type, deserializeCV3(clean));
     } catch {}
   });
   return input;
@@ -1315,6 +1567,9 @@ async function runHandlers(subgraph, matched, ctx, opts) {
 
 // src/runtime/source-matcher.ts
 var patternCache = new Map;
+function matchAny(value, pattern) {
+  return Array.isArray(pattern) ? pattern.some((p) => matchPattern(value, p)) : matchPattern(value, pattern);
+}
 function matchPattern(value, pattern) {
   if (!pattern.includes("*"))
     return value === pattern;
@@ -1327,6 +1582,22 @@ function matchPattern(value, pattern) {
   return re.test(value);
 }
 var EMPTY_SET = new Set;
+function factoryAllows(filter, contractId, factoryContracts) {
+  if (!filter.factory)
+    return true;
+  if (!contractId)
+    return false;
+  return (factoryContracts.get(filter.factory.from) ?? EMPTY_SET).has(contractId);
+}
+function readPath(payload, path) {
+  let cur = payload;
+  for (const key of path.split(".")) {
+    if (cur === null || typeof cur !== "object")
+      return;
+    cur = cur[key];
+  }
+  return cur;
+}
 function traitAllows(filter, contractId, traitContracts) {
   const trait = filter.trait;
   if (!trait)
@@ -1338,7 +1609,7 @@ function traitAllows(filter, contractId, traitContracts) {
 function assetContract(assetId) {
   return assetId?.split("::")[0];
 }
-function matchFilter(filter, transactions, eventsByTx, traitContracts) {
+function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map) {
   const results = [];
   switch (filter.type) {
     case "stx_transfer":
@@ -1465,9 +1736,11 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts) {
         if (tx.type !== "contract_call")
           continue;
         if (filter.contractId) {
-          if (!tx.contract_id || !matchPattern(tx.contract_id, filter.contractId))
+          if (!tx.contract_id || !matchAny(tx.contract_id, filter.contractId))
             continue;
         }
+        if (!factoryAllows(filter, tx.contract_id, factoryContracts))
+          continue;
         if (filter.functionName) {
           if (!tx.function_name || !matchPattern(tx.function_name, filter.functionName))
             continue;
@@ -1514,11 +1787,13 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts) {
             return false;
           const printContractId = data.contract_identifier ?? data.contract_id;
           if (filter.contractId) {
-            if (!printContractId || !matchPattern(printContractId, filter.contractId))
+            if (!printContractId || !matchAny(printContractId, filter.contractId))
               return false;
           }
           if (!traitAllows(filter, printContractId, traitContracts))
             return false;
+          if (!factoryAllows(filter, printContractId, factoryContracts))
+            return false;
           return true;
         });
         if (matched.length > 0) {
@@ -1530,7 +1805,7 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts) {
   }
   return results;
 }
-function matchSources(sources, transactions, events, traitContracts = new Map) {
+function matchSources(sources, transactions, events, traitContracts = new Map, factoryContracts = new Map) {
   const eventsByTx = new Map;
   for (const event of events) {
     const list = eventsByTx.get(event.tx_id) ?? [];
@@ -1540,7 +1815,7 @@ function matchSources(sources, transactions, events, traitContracts = new Map) {
   const seen = new Set;
   const results = [];
   for (const [sourceName, filter] of Object.entries(sources)) {
-    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts);
+    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts);
     for (const match of matches) {
       const dedupeKey = `${match.tx.tx_id}:${sourceName}`;
       if (!seen.has(dedupeKey)) {
@@ -1567,7 +1842,7 @@ import { logger as logger5 } from "@secondlayer/shared/logger";
 import { sql as sql3 } from "kysely";
 
 // src/runtime/block-source.ts
-import { getSourceDb } from "@secondlayer/shared/db";
+import { getSourceDb as getSourceDb2 } from "@secondlayer/shared/db";
 import {
   IndexHttpClient
 } from "@secondlayer/shared/index-http";
@@ -1628,6 +1903,7 @@ function reconstructBlock(b) {
     parent_hash: b.parent_hash,
     burn_block_height: b.burn_block_height,
     burn_block_hash: b.burn_block_hash,
+    index_block_hash: b.index_block_hash ?? null,
     timestamp: isoToUnixSeconds(b.block_time),
     canonical: true,
     created_at: new Date(0)
@@ -1762,11 +2038,11 @@ function sparseProbeTargets(subgraph) {
 
 class PostgresBlockSource {
   async getTip() {
-    const progress = await getSourceDb().selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
+    const progress = await getSourceDb2().selectFrom("index_progress").selectAll().where("network", "=", process.env.NETWORK ?? "mainnet").executeTakeFirst();
     return progress ? Number(progress.highest_seen_block) : 0;
   }
   loadBlockRange(fromHeight, toHeight) {
-    return loadBlockRange(getSourceDb(), fromHeight, toHeight);
+    return loadBlockRange(getSourceDb2(), fromHeight, toHeight);
   }
 }
 var EVENT_FILTER_TO_INDEX_TYPE = {
@@ -1835,8 +2111,8 @@ class PublicApiBlockSource {
   eventTypes;
   probeTargets;
   needsTransactions;
-  constructor(http, eventTypes, probeTargets, needsTransactions = true) {
-    this.http = http;
+  constructor(http2, eventTypes, probeTargets, needsTransactions = true) {
+    this.http = http2;
     this.eventTypes = eventTypes;
     this.probeTargets = probeTargets;
     this.needsTransactions = needsTransactions;
@@ -2195,6 +2471,57 @@ async function resolveRoute(subgraphName, targetDb) {
 function invalidateSubgraphRoute(subgraphName) {
   routeCache.delete(subgraphName);
 }
+async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, txs, evts) {
+  const factories = new Map;
+  for (const source of Object.values(subgraph.sources)) {
+    const factory = source.factory;
+    if (factory)
+      factories.set(factory.from, factory);
+  }
+  const resolved = new Map;
+  const discovered = [];
+  if (factories.size === 0)
+    return { resolved, discovered };
+  for (const [discoveringSource, factory] of factories) {
+    const known = new Set;
+    try {
+      const rows = await sql3`
+				SELECT address FROM ${sql3.raw(`"${schemaName}"."_factory_addresses"`)}
+				WHERE source_name = ${discoveringSource} AND block_height <= ${blockHeight}
+			`.execute(db);
+      for (const row of rows.rows)
+        known.add(row.address);
+    } catch {}
+    const discovering = subgraph.sources[factory.from];
+    if (discovering) {
+      const matches = matchSources({ [factory.from]: discovering }, txs, evts, new Map, new Map);
+      for (const match of matches) {
+        for (const event of match.events ?? []) {
+          const payload = buildEventPayload(discovering, match.tx, event);
+          const value = readPath(payload, factory.field);
+          if (typeof value === "string" && value.length > 0 && !known.has(value)) {
+            known.add(value);
+            discovered.push({ sourceName: discoveringSource, address: value });
+          }
+        }
+      }
+    }
+    resolved.set(discoveringSource, known);
+  }
+  return { resolved, discovered };
+}
+async function persistFactoryDiscoveries(schemaName, db, blockHeight, discovered) {
+  if (discovered.length === 0)
+    return;
+  for (const { sourceName, address } of discovered) {
+    await sql3`
+			INSERT INTO ${sql3.raw(`"${schemaName}"."_factory_addresses"`)}
+				(source_name, address, block_height)
+			VALUES (${sourceName}, ${address}, ${blockHeight})
+			ON CONFLICT (source_name, address) DO NOTHING
+		`.execute(db);
+  }
+}
 async function resolveTraitContracts(subgraph, blockHeight, db) {
   const traits = new Set;
   for (const source of Object.values(subgraph.sources)) {
@@ -2281,8 +2608,11 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     txs = data.txs;
     evts = data.events;
   }
+  const route = await resolveRoute(subgraphName, targetDb);
+  const schemaName = route.schemaName;
   const traitContracts = await resolveTraitContracts(subgraph, blockHeight, targetDb);
-  const matched = matchSources(subgraph.sources, txs, evts, traitContracts);
+  const { resolved: factoryContracts, discovered } = await resolveFactoryContracts(subgraph, blockHeight, schemaName, targetDb, txs, evts);
+  const matched = matchSources(subgraph.sources, txs, evts, traitContracts, factoryContracts);
   result.matched = matched.length;
   if (matched.length === 0) {
     if (!opts?.skipProgressUpdate) {
@@ -2290,13 +2620,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     }
     return result;
   }
-  const route = await resolveRoute(subgraphName, targetDb);
-  const schemaName = route.schemaName;
   const blockMeta = {
     height: block.height,
     hash: block.hash,
     timestamp: block.timestamp,
-    burnBlockHeight: block.burn_block_height
+    burnBlockHeight: block.burn_block_height,
+    indexBlockHash: block.index_block_hash
   };
   const initialTx = {
     txId: "",
@@ -2349,6 +2678,7 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     });
     result.processed = runResult.processed;
     result.errors = runResult.errors;
+    await persistFactoryDiscoveries(schemaName, route.dataDb, blockHeight, discovered);
     await targetDb.transaction().execute(async (tx) => {
       if (manifest && manifest.count > 0) {
         await emitSubscriptionOutbox(tx, subgraphName, manifest, matcher, block.height);
@@ -3068,9 +3398,12 @@ async function backfillSubgraph(def, opts) {
 function defineSubgraph(def) {
   return def;
 }
+function defineSchema(schema) {
+  return schema;
+}
 // src/print-schema.ts
 import {
-  deserializeCV as deserializeCV3
+  deserializeCV as deserializeCV4
 } from "@secondlayer/stacks/clarity";
 function camelizeDataKey(str) {
   return str.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
@@ -3338,7 +3671,7 @@ function inferPrintTopics(samples) {
     let decoded = 0;
     for (const p of picked) {
       try {
-        const cv = deserializeCV3(p.rawHex);
+        const cv = deserializeCV4(p.rawHex);
         decoded++;
         if (cv.type === "tuple")
           tuples.push(cv);
@@ -3987,8 +4320,8 @@ function diffKeyLists(existing, incoming) {
   const existingSet = new Set((existing ?? []).map(key2));
   const incomingSet = new Set((incoming ?? []).map(key2));
   return {
-    added: (incoming ?? []).filter((cols) => !existingSet.has(key2(cols))),
-    removed: (existing ?? []).filter((cols) => !incomingSet.has(key2(cols)))
+    added: (incoming ?? []).filter((cols) => !existingSet.has(key2(cols))).map((cols) => [...cols]),
+    removed: (existing ?? []).filter((cols) => !incomingSet.has(key2(cols))).map((cols) => [...cols])
   };
 }
 function diffSchema(existing, incoming) {
@@ -4337,6 +4670,7 @@ export {
   resumeReindex,
   renderDeployPlan,
   reindexSubgraph,
+  readContractAt,
   pgSchemaName,
   inferPrintTopics,
   hasBreakingChanges,
@@ -4345,15 +4679,18 @@ export {
   generateKyselySchema,
   generateIndexSchema,
   generateDrizzleSchema,
+  filterFieldsByType,
   diffSchema,
   deploySchema,
   defineSubgraph,
+  defineSchema,
   canSparseScan,
   camelizeDataKey,
   backfillSubgraph,
   INDEX_CODEGEN_TABLES,
+  ChainReadError,
   ByoBreakingChangeError
 };
 
-//# debugId=1014943AF0D5A26B64756E2164756E21
+//# debugId=A7D0F6BE4A80734464756E2164756E21
 //# sourceMappingURL=index.js.map