@secondlayer/subgraphs 4.3.4 → 4.4.0

package/dist/src/testing/index.d.ts

@@ -260,6 +260,23 @@ interface ContractDeployFilter {
 	deployer?: string;
 	contractName?: string;
 }
+interface NestedContractCallFilter extends TraitScope, FactoryScope {
+	type: "nested_contract_call";
+	contractId?: string | readonly string[];
+	functionName?: string;
+	caller?: string;
+	sender?: string;
+}
+interface VarSetFilter extends TraitScope, FactoryScope {
+	type: "var_set";
+	contractId?: string | readonly string[];
+	varName?: string;
+}
+interface MapWriteFilter extends TraitScope, FactoryScope {
+	type: "map_set" | "map_insert" | "map_delete";
+	contractId?: string | readonly string[];
+	map?: string;
+}
 /**
 * One declared field of a print payload.
 *
@@ -347,7 +364,7 @@ type UnpinnedPrintEventFilter = PrintEventFields & {
 */
 type PrintEventFilter = PinnedPrintEventFilter | TraitPrintEventFilter | UnpinnedPrintEventFilter;
 /** All subgraph filter types — discriminated on `type` */
-type SubgraphFilter = StxTransferFilter | StxMintFilter | StxBurnFilter | StxLockFilter | FtTransferFilter | FtMintFilter | FtBurnFilter | NftTransferFilter | NftMintFilter | NftBurnFilter | ContractCallFilter | ContractDeployFilter | PrintEventFilter;
+type SubgraphFilter = StxTransferFilter | StxMintFilter | StxBurnFilter | StxLockFilter | FtTransferFilter | FtMintFilter | FtBurnFilter | NftTransferFilter | NftMintFilter | NftBurnFilter | ContractCallFilter | ContractDeployFilter | PrintEventFilter | NestedContractCallFilter | VarSetFilter | MapWriteFilter;
 /** Transaction metadata available in handlers */
 interface TxMeta {
 	txId: string;
@@ -383,8 +400,11 @@ type EventRecord = {
 	id: string
 	tx_id: string
 	type: string
+	/** Classic `event_index`, or `ordinal` when `clock === "vm"`. */
 	event_index: number
 	data: unknown
+	/** Set on opt-in `vm_events` rows. Two clocks never sort or dedupe together. */
+	clock?: "vm"
 };
 interface BlockMeta {
 	height: number;
@@ -610,6 +630,42 @@ type ContractCallPayload<F> = F extends {
 } ? N extends ExtractFunctionNames<A> ? ContractCallEvent & {
 	input: ExtractFunctionArgs2<A, N>
 } : ContractCallEvent : ContractCallEvent;
+interface NestedContractCallPayload {
+	contractId: string;
+	sender: string | null;
+	caller: string;
+	functionName: string;
+	/** Decoded `function_args`. */
+	args: unknown[];
+	/** Original hex `function_args`, preserved. */
+	arguments: string[];
+	rawResult: string;
+	result: unknown;
+	tx: TxMeta;
+}
+interface VarSetPayload {
+	contractId: string;
+	varName: string;
+	rawValue: string;
+	value: unknown;
+	tx: TxMeta;
+}
+interface MapWritePayload {
+	contractId: string;
+	map: string;
+	rawKey: string;
+	key: unknown;
+	rawValue: string;
+	value: unknown;
+	tx: TxMeta;
+}
+interface MapDeletePayload {
+	contractId: string;
+	map: string;
+	rawKey: string;
+	key: unknown;
+	tx: TxMeta;
+}
 /**
 * Print event typed per topic. When a `print_event` source declares a `prints`
 * map, the payload is a discriminated union keyed by `topic` with `data` typed
@@ -671,7 +727,13 @@ type EventForFilter<F extends SubgraphFilter> = F extends {
 	type: "contract_call"
 } ? ContractCallPayload<F> : F extends {
 	type: "contract_deploy"
-} ? ContractDeployPayload : never;
+} ? ContractDeployPayload : F extends {
+	type: "nested_contract_call"
+} ? NestedContractCallPayload : F extends {
+	type: "var_set"
+} ? VarSetPayload : F extends {
+	type: infer T extends "map_set" | "map_insert" | "map_delete"
+} ? T extends "map_delete" ? MapDeletePayload : MapWritePayload : never;
 /** An in-memory subgraph context for tests. */
 interface TestSubgraphContext<S extends SubgraphSchema> extends Omit<TypedSubgraphContext<S>, never> {
 	/**

package/dist/src/testing/index.js

@@ -41,6 +41,24 @@ function safeIndexName(name) {
   const hash = createHash("sha256").update(name).digest("hex").slice(0, 8);
   return `${name.slice(0, MAX_IDENT_BYTES - hash.length - 1)}_${hash}`;
 }
+function emitIndexedColumnIndexDDL(schemaName, tableName, colName, opts) {
+  const concurrently = opts?.concurrently ? " CONCURRENTLY" : "";
+  const qualified = `${quotePgIdent(schemaName)}.${quotePgIdent(tableName)}`;
+  const plain = `idx_${schemaName}_${tableName}_${colName}`;
+  const composite = safeIndexName(`idx_${schemaName}_${tableName}_${colName}_id`);
+  const col = quotePgIdent(colName);
+  const id = quotePgIdent("_id");
+  return {
+    create: [
+      `CREATE INDEX${concurrently} IF NOT EXISTS ${quotePgIdent(plain)} ON ${qualified} (${col})`,
+      `CREATE INDEX${concurrently} IF NOT EXISTS ${quotePgIdent(composite)} ON ${qualified} (${col}, ${id})`
+    ],
+    drop: [
+      `DROP INDEX${concurrently} IF EXISTS ${quotePgIdent(schemaName)}.${quotePgIdent(plain)}`,
+      `DROP INDEX${concurrently} IF EXISTS ${quotePgIdent(schemaName)}.${quotePgIdent(composite)}`
+    ]
+  };
+}
 function escapeLiteralDefault(value) {
   if (value === null || value === undefined)
     return "NULL";
@@ -82,8 +100,7 @@ function emitTableDDL(schemaName, tableName, tableDef) {
   statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_tx_id`)} ON ${qualifiedName} (_tx_id)`);
   for (const [colName, col] of Object.entries(tableDef.columns)) {
     if (col.indexed) {
-      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_${colName}`)} ON ${qualifiedName} (${quotePgIdent(colName)})`);
-      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(safeIndexName(`idx_${schemaName}_${tableName}_${colName}_id`))} ON ${qualifiedName} (${quotePgIdent(colName)}, ${quotePgIdent("_id")})`);
+      statements.push(...emitIndexedColumnIndexDDL(schemaName, tableName, colName).create);
     }
   }
   for (const [colName, col] of Object.entries(tableDef.columns)) {
@@ -992,7 +1009,7 @@ function printContractId(data) {
   const id = (typeof data.contract_identifier === "string" ? data.contract_identifier : undefined) ?? (typeof data.contract_id === "string" ? data.contract_id : undefined);
   return id || undefined;
 }
-function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map) {
+function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map, vmEventsByTx = new Map) {
   const results = [];
   switch (filter.type) {
     case "stx_transfer":
@@ -1157,6 +1174,57 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryCo
       }
       break;
     }
+    case "nested_contract_call":
+    case "var_set":
+    case "map_set":
+    case "map_insert":
+    case "map_delete": {
+      for (const tx of transactions) {
+        const txEvents = vmEventsByTx.get(tx.tx_id) ?? [];
+        const matched = txEvents.filter((e) => {
+          if (e.type !== filter.type)
+            return false;
+          const data = e.data;
+          if (!data)
+            return false;
+          const contractId = printContractId(data);
+          if ("contractId" in filter && filter.contractId) {
+            if (!contractId || !matchAny(contractId, filter.contractId))
+              return false;
+          }
+          if (!traitAllows(filter, contractId, traitContracts))
+            return false;
+          if (!factoryAllows(filter, contractId, factoryContracts))
+            return false;
+          if (filter.type === "nested_contract_call") {
+            if (filter.functionName) {
+              if (typeof data.function_name !== "string" || !matchPattern(data.function_name, filter.functionName))
+                return false;
+            }
+            if (filter.caller) {
+              if (typeof data.caller !== "string" || !matchPattern(data.caller, filter.caller))
+                return false;
+            }
+            if (filter.sender) {
+              if (typeof data.sender !== "string" || !matchPattern(data.sender, filter.sender))
+                return false;
+            }
+          }
+          if (filter.type === "var_set" && filter.varName) {
+            if (typeof data.var_name !== "string" || !matchPattern(data.var_name, filter.varName))
+              return false;
+          }
+          if ((filter.type === "map_set" || filter.type === "map_insert" || filter.type === "map_delete") && filter.map) {
+            if (typeof data.map_name !== "string" || !matchPattern(data.map_name, filter.map))
+              return false;
+          }
+          return true;
+        });
+        if (matched.length > 0)
+          results.push({ tx, events: matched });
+      }
+      break;
+    }
     case "print_event": {
       for (const tx of transactions) {
         const txEvents = eventsByTx.get(tx.tx_id) ?? [];
@@ -1188,17 +1256,23 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryCo
   }
   return results;
 }
-function matchSources(sources, transactions, events, traitContracts = new Map, factoryContracts = new Map) {
+function matchSources(sources, transactions, events, traitContracts = new Map, factoryContracts = new Map, vmEvents = []) {
   const eventsByTx = new Map;
   for (const event of events) {
     const list = eventsByTx.get(event.tx_id) ?? [];
     list.push(event);
     eventsByTx.set(event.tx_id, list);
   }
+  const vmEventsByTx = new Map;
+  for (const event of vmEvents) {
+    const list = vmEventsByTx.get(event.tx_id) ?? [];
+    list.push(event);
+    vmEventsByTx.set(event.tx_id, list);
+  }
   const seen = new Set;
   const results = [];
   for (const [sourceName, filter] of Object.entries(sources)) {
-    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts);
+    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts, vmEventsByTx);
     for (const match of matches) {
       const dedupeKey = `${match.tx.tx_id}:${sourceName}`;
       if (!seen.has(dedupeKey)) {
@@ -1773,6 +1847,12 @@ function decodeRawResult(raw) {
   }
   return null;
 }
+function decodeRawHex(hex) {
+  if (hex.startsWith("0x") && hex.length > 2) {
+    return decodeClarityValue(hex);
+  }
+  return hex;
+}
 function safeBigInt(val) {
   if (typeof val === "bigint")
     return val;
@@ -1966,6 +2046,58 @@ function buildEventPayload(filter, tx, event) {
         deployer: tx.sender,
         tx: txMeta
       };
+    case "nested_contract_call": {
+      const data = event.data ?? {};
+      const argsHex = Array.isArray(data.function_args) ? data.function_args.filter((a) => typeof a === "string") : [];
+      return {
+        contractId: printContractId(data) ?? "",
+        sender: typeof data.sender === "string" ? data.sender : null,
+        caller: typeof data.caller === "string" ? data.caller : "",
+        functionName: typeof data.function_name === "string" ? data.function_name : "",
+        args: decodeFunctionArgs2(argsHex),
+        arguments: argsHex,
+        rawResult: typeof data.raw_result === "string" ? data.raw_result : "",
+        result: decodeRawResult(data.raw_result),
+        tx: txMeta
+      };
+    }
+    case "var_set": {
+      const data = event.data ?? {};
+      const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        varName: typeof data.var_name === "string" ? data.var_name : "",
+        rawValue,
+        value: decodeRawHex(rawValue),
+        tx: txMeta
+      };
+    }
+    case "map_set":
+    case "map_insert": {
+      const data = event.data ?? {};
+      const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
+      const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        map: typeof data.map_name === "string" ? data.map_name : "",
+        rawKey,
+        key: decodeRawHex(rawKey),
+        rawValue,
+        value: decodeRawHex(rawValue),
+        tx: txMeta
+      };
+    }
+    case "map_delete": {
+      const data = event.data ?? {};
+      const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        map: typeof data.map_name === "string" ? data.map_name : "",
+        rawKey,
+        key: decodeRawHex(rawKey),
+        tx: txMeta
+      };
+    }
     default:
       return {
         ...decoded,
@@ -1994,7 +2126,8 @@ async function runHandlers(subgraph, matched, ctx, opts) {
         units.push({ tx, sourceName, event });
     }
   }
-  units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || (a.event?.event_index ?? -1) - (b.event?.event_index ?? -1));
+  const clockRank = (e) => e?.clock === "vm" ? 1 : 0;
+  units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || clockRank(a.event) - clockRank(b.event) || (a.event?.event_index ?? -1) - (b.event?.event_index ?? -1));
   for (const { tx, event, sourceName } of units) {
     if (errors >= threshold) {
       logger4.error("Subgraph error threshold reached, skipping remaining events", {
@@ -2260,6 +2393,42 @@ function toHandlerPayload(_filter, row) {
     };
   }
   const r = row;
+  if (row.event_type === "var_set") {
+    const rawValue = typeof r.raw_value === "string" ? r.raw_value : "";
+    return {
+      contractId: row.contract_id ?? "",
+      varName: typeof r.var_name === "string" ? r.var_name : "",
+      rawValue,
+      value: rawValue,
+      tx
+    };
+  }
+  if (row.event_type === "nested_contract_call") {
+    const argsHex = Array.isArray(r.function_args) ? r.function_args.filter((a) => typeof a === "string") : [];
+    return {
+      contractId: row.contract_id ?? "",
+      sender: typeof r.sender === "string" ? r.sender : null,
+      caller: typeof r.caller === "string" ? r.caller : "",
+      functionName: typeof r.function_name === "string" ? r.function_name : "",
+      args: argsHex,
+      arguments: argsHex,
+      rawResult: typeof r.raw_result === "string" ? r.raw_result : "",
+      result: null,
+      tx
+    };
+  }
+  if (row.event_type === "map_set" || row.event_type === "map_insert" || row.event_type === "map_delete") {
+    const rawKey = typeof r.raw_key === "string" ? r.raw_key : "";
+    const rawValue = typeof r.raw_value === "string" ? r.raw_value : "";
+    return {
+      contractId: row.contract_id ?? "",
+      map: typeof r.map === "string" ? r.map : "",
+      rawKey,
+      key: rawKey,
+      ...row.event_type === "map_delete" ? {} : { rawValue, value: rawValue },
+      tx
+    };
+  }
   return {
     ...r.sender !== undefined ? { sender: r.sender } : {},
     ...r.recipient !== undefined ? { recipient: r.recipient } : {},
@@ -2530,5 +2699,5 @@ export {
   buildEvent
 };
 
-//# debugId=863DBB30C4526B5164756E2164756E21
+//# debugId=BBBAFF796E747D6364756E2164756E21
 //# sourceMappingURL=index.js.map