@secondlayer/subgraphs 6.3.3 → 6.3.5

package/README.md

@@ -2,6 +2,8 @@
 
 Typed on-chain indexing for Stacks. Declare event filters + column schema with `defineSubgraph()`; the runtime decodes blocks, matches filters, runs your handlers inside a transactional context, and exposes the result as a Postgres schema you query over REST or SQL.
 
+Run subgraphs on your own instance, or hosted on `api.secondlayer.tools` with `secondlayer subgraphs deploy` and your account key (`SECONDLAYER_API_KEY`). Hosted subgraphs are private to your account and limited to event filters and `contract_call`/`contract_deploy` sources (`422 SOURCE_NOT_HOSTABLE` otherwise); set `startBlock`. Subgraph webhooks are self-host only.
+
 Subgraph rows fan out to HTTP subscribers through a post-flush outbox emitter — signed Standard Webhooks POSTs with retries, circuit breaker, and replay.
 
 ## Install

package/dist/index.d.ts

@@ -1197,7 +1197,15 @@ type SparseProbeTarget = {
 *  a contract_call/contract_deploy source matches transactions, which the
 *  event probe can't see. */
 declare function canSparseScan(subgraph: SubgraphDefinition): boolean;
-/** Probe targets for a subgraph's filters: decoded type + contract scope when\\n*  the filter pins one (assetIdentifier "SP….contract::asset" or contractId). */
+/**
+* The (decoded event type, contract scope) pairs a subgraph's filters can
+* match. One function feeds BOTH the sparse probe and the event walks, so a
+* new contract-pinning filter field is added here once.
+*
+* Per event type: if ANY filter for it is unscoped, a single unscoped target
+* covers everything (today's behavior); otherwise one target per distinct
+* pinned contract.
+*/
 declare function sparseProbeTargets(subgraph: SubgraphDefinition): SparseProbeTarget[];
 /**
 * streams-index eligibility: every source must be a known event-type or

package/dist/index.js

@@ -1979,18 +1979,44 @@ function canSparseScan(subgraph) {
     return false;
   return filters.every((f) => Boolean(EVENT_FILTER_TO_INDEX_TYPE[f.type]));
 }
+var MAX_PINNED_CONTRACTS = 20;
+function pinnedContracts(filter) {
+  const f = filter;
+  if (f.trait || f.factory)
+    return null;
+  const ids = Array.isArray(f.contractId) ? [...f.contractId] : f.contractId ? [f.contractId] : f.assetIdentifier ? [f.assetIdentifier.split("::")[0]] : [];
+  if (ids.length === 0 || ids.length > MAX_PINNED_CONTRACTS)
+    return null;
+  if (ids.some((id) => !id || id.includes("*")))
+    return null;
+  return ids;
+}
 function sparseProbeTargets(subgraph) {
-  const targets = new Map;
+  const byType = new Map;
   for (const f of sourceFilters(subgraph)) {
     const eventType = EVENT_FILTER_TO_INDEX_TYPE[f.type];
     if (!eventType)
       continue;
-    const scoped = f;
-    const contractId = scoped.contractId ?? scoped.assetIdentifier?.split("::")[0];
-    const key = `${eventType}|${contractId ?? ""}`;
-    targets.set(key, { eventType, ...contractId ? { contractId } : {} });
+    const pinned = pinnedContracts(f);
+    const prev = byType.get(eventType);
+    if (!pinned || prev === "all") {
+      byType.set(eventType, "all");
+      continue;
+    }
+    const set = prev ?? new Set;
+    for (const id of pinned)
+      set.add(id);
+    byType.set(eventType, set);
   }
-  return [...targets.values()];
+  const targets = [];
+  for (const [eventType, scope] of byType) {
+    if (scope === "all")
+      targets.push({ eventType });
+    else
+      for (const contractId of scope)
+        targets.push({ eventType, contractId });
+  }
+  return targets;
 }
 
 class PostgresBlockSource {
@@ -2069,6 +2095,16 @@ function isStreamsIndexEligible(subgraph) {
   }
   return true;
 }
+function dedupeEvents(rows) {
+  const seen = new Set;
+  return rows.filter((e) => {
+    const key = `${e.event_type}|${e.block_height}|${e.event_index}`;
+    if (seen.has(key))
+      return false;
+    seen.add(key);
+    return true;
+  });
+}
 
 class PublicApiBlockSource {
   http;
@@ -2081,6 +2117,13 @@ class PublicApiBlockSource {
     this.probeTargets = probeTargets;
     this.needsTransactions = needsTransactions;
   }
+  walkTargets() {
+    const scoped = this.needsTransactions ? undefined : this.probeTargets;
+    return this.eventTypes.flatMap((eventType) => {
+      const own = scoped?.filter((t) => t.eventType === eventType);
+      return own?.length ? own : [{ eventType }];
+    });
+  }
   async nextDataHeight(afterHeight, untilHeight) {
     if (!this.probeTargets?.length)
       return afterHeight + 1;
@@ -2102,8 +2145,9 @@ class PublicApiBlockSource {
     const [blocks, txRows, eventLists] = await Promise.all([
       this.http.walkBlocks(fromHeight, toHeight),
       this.needsTransactions ? this.http.walkTransactions(fromHeight, toHeight) : Promise.resolve([]),
-      Promise.all(this.eventTypes.map((t) => this.http.walkEvents(t, fromHeight, toHeight, withTx)))
+      Promise.all(this.walkTargets().map((t) => this.http.walkEvents(t.eventType, fromHeight, toHeight, withTx, t.contractId)))
     ]);
+    const events = dedupeEvents(eventLists.flat());
     const map = new Map;
     for (const b of blocks) {
       map.set(b.block_height, {
@@ -2112,21 +2156,19 @@ class PublicApiBlockSource {
         events: []
       });
     }
-    const txs = this.needsTransactions ? txRows.map(reconstructTransaction) : synthesizeTxsFromEvents(eventLists.flat());
+    const txs = this.needsTransactions ? txRows.map(reconstructTransaction) : synthesizeTxsFromEvents(events);
     for (const t of txs) {
       map.get(t.block_height)?.txs.push(t);
     }
-    for (const list of eventLists) {
-      for (const e of list) {
-        const bd = map.get(e.block_height);
-        if (!bd)
-          continue;
-        if (VM_INDEX_EVENT_TYPES.has(e.event_type)) {
-          bd.vmEvents ??= [];
-          bd.vmEvents.push(reconstructEvent(e));
-        } else {
-          bd.events.push(reconstructEvent(e));
-        }
+    for (const e of events) {
+      const bd = map.get(e.block_height);
+      if (!bd)
+        continue;
+      if (VM_INDEX_EVENT_TYPES.has(e.event_type)) {
+        bd.vmEvents ??= [];
+        bd.vmEvents.push(reconstructEvent(e));
+      } else {
+        bd.events.push(reconstructEvent(e));
       }
     }
     for (const bd of map.values()) {
@@ -2165,5 +2207,5 @@ export {
   validateSubgraphDefinition
 };
 
-//# debugId=171BB1FAA9B94DE264756E2164756E21
+//# debugId=9E0F3F4652CCD15164756E2164756E21
 //# sourceMappingURL=index.js.map