@secondlayer/subgraphs 4.3.4 → 4.4.0

package/dist/src/runtime/runner.d.ts

@@ -272,6 +272,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.
 *
@@ -359,7 +376,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;
@@ -469,8 +486,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"
 };
 import { Database as Database2 } from "@secondlayer/shared/db";
 import { Kysely as Kysely2, Transaction } from "kysely";

package/dist/src/runtime/runner.js

@@ -82,7 +82,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":
@@ -247,6 +247,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) ?? [];
@@ -278,17 +329,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)) {
@@ -863,6 +920,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;
@@ -1056,6 +1119,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,
@@ -1084,7 +1199,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) {
       logger2.error("Subgraph error threshold reached, skipping remaining events", {
@@ -1212,5 +1328,5 @@ export {
   buildContractCallInput
 };
 
-//# debugId=B6BA5F58B8903CEC64756E2164756E21
+//# debugId=90E8BB694CDBE41B64756E2164756E21
 //# sourceMappingURL=runner.js.map