@secondlayer/subgraphs 3.23.0 → 3.23.2

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

@@ -1,4 +1,5 @@
 import { AbiContract as AbiContract2 } from "@secondlayer/stacks/clarity";
+import { AssetIdentifier } from "@secondlayer/stacks/filters";
 /**
 * How long a read stays valid.
 *
@@ -147,38 +148,38 @@ interface FactoryScope {
 /** FT event filters */
 interface FtTransferFilter extends TraitScope {
 	type: "ft_transfer";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	sender?: string;
 	recipient?: string;
 	minAmount?: bigint;
 }
 interface FtMintFilter extends TraitScope {
 	type: "ft_mint";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	recipient?: string;
 	minAmount?: bigint;
 }
 interface FtBurnFilter extends TraitScope {
 	type: "ft_burn";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	sender?: string;
 	minAmount?: bigint;
 }
 /** NFT event filters */
 interface NftTransferFilter extends TraitScope {
 	type: "nft_transfer";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	sender?: string;
 	recipient?: string;
 }
 interface NftMintFilter extends TraitScope {
 	type: "nft_mint";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	recipient?: string;
 }
 interface NftBurnFilter extends TraitScope {
 	type: "nft_burn";
-	assetIdentifier?: string;
+	assetIdentifier?: AssetIdentifier;
 	sender?: string;
 }
 /**
@@ -276,7 +277,10 @@ type PrintField = ColumnType | {
 interface PrintEventFilter extends TraitScope, FactoryScope {
 	type: "print_event";
 	/** One contract id, or a set of them (max 20). Supports `*` wildcards.
-	*  Mutually exclusive with `trait`. */
+	*  COMPOSES with `trait` — the matcher ANDs them, so the pair means
+	*  "contracts conforming to this trait, narrowed to these ids". (The Index
+	*  read API refuses the combination, but that is its query planner's
+	*  constraint, not a semantic one.) */
 	contractId?: string | readonly string[];
 	topic?: string;
 	/**
@@ -308,27 +312,6 @@ interface TxMeta {
 type RowValue = string | number | bigint | boolean | null | undefined | Record<string, unknown> | unknown[];
 /** Value or computed function that receives existing row */
 type ComputedValue = RowValue | ((existing: Record<string, unknown> | null) => unknown);
-interface BlockMeta {
-	height: number;
-	hash: string;
-	timestamp: number;
-	burnBlockHeight: number;
-	/**
-	* Nakamoto StacksBlockId — the identifier `?tip=` accepts, and the only way
-	* to pin a read-only call to THIS block. Null on rows ingested before it
-	* was persisted; `ctx.client.readOnly` refuses to run rather than silently
-	* reading at the node's tip.
-	*/
-	indexBlockHash?: string | null;
-}
-interface TxMeta2 {
-	txId: string;
-	sender: string;
-	type: string;
-	status: string;
-	contractId?: string | null;
-	functionName?: string | null;
-}
 interface MatchedTx {
 	tx: TxRecord;
 	events: EventRecord[];
@@ -354,6 +337,27 @@ type EventRecord = {
 	event_index: number
 	data: unknown
 };
+interface BlockMeta {
+	height: number;
+	hash: string;
+	timestamp: number;
+	burnBlockHeight: number;
+	/**
+	* Nakamoto StacksBlockId — the identifier `?tip=` accepts, and the only way
+	* to pin a read-only call to THIS block. Null on rows ingested before it
+	* was persisted; `ctx.client.readOnly` refuses to run rather than silently
+	* reading at the node's tip.
+	*/
+	indexBlockHash?: string | null;
+}
+interface TxMeta2 {
+	txId: string;
+	sender: string;
+	type: string;
+	status: string;
+	contractId?: string | null;
+	functionName?: string | null;
+}
 /**
 * Build a typed event payload based on the source filter type.
 * Returns the payload the handler will receive.

package/dist/src/testing/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // src/runtime/context.ts
-import { logger } from "@secondlayer/shared/logger";
+import { logger as logger2 } from "@secondlayer/shared/logger";
 import { formatUnits } from "@secondlayer/stacks/utils";
 import { sql } from "kysely";
 
@@ -147,6 +147,7 @@ function generateSubgraphSQL(def, schemaNameOverride) {
 
 // src/runtime/chain-read.ts
 import { getSourceDb } from "@secondlayer/shared/db";
+import { logger } from "@secondlayer/shared/logger";
 import { http, createPublicClient } from "@secondlayer/stacks";
 import {
   ContractResponseError,
@@ -232,6 +233,14 @@ function createChainReadClient(ctx) {
     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 () => {
+      if (!ctx.indexBlockHash) {
+        logger.warn("Chain read is not pinned to a block (no index_block_hash)", {
+          contractId,
+          functionName: fn.name,
+          blockHeight: ctx.blockHeight,
+          note: 'cache: "contract-constant" asserts this value cannot change; the node answered at its own tip'
+        });
+      }
       const value2 = await readContract(nodeClient(rpcUrl), {
         contract: contractId,
         functionName: fn.name,
@@ -346,7 +355,7 @@ class SubgraphContext {
         data: { ...key, ...row, ...meta, _upsert_keys: keyColumns }
       });
     } else {
-      logger.warn("upsert called without matching uniqueKeys constraint, using fallback", {
+      logger2.warn("upsert called without matching uniqueKeys constraint, using fallback", {
         table,
         keys: keyColumns
       });
@@ -906,7 +915,7 @@ function decodeFunctionArgs(args) {
 
 // src/runtime/runner.ts
 import { getErrorMessage } from "@secondlayer/shared";
-import { logger as logger2 } from "@secondlayer/shared/logger";
+import { logger as logger3 } from "@secondlayer/shared/logger";
 import {
   clarityValueToJS,
   deserializeCV as deserializeCV3,
@@ -1257,7 +1266,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
   units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || (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", {
+      logger3.error("Subgraph error threshold reached, skipping remaining events", {
         subgraph: subgraph.name,
         errors,
         threshold
@@ -1266,7 +1275,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
     }
     const handler = subgraph.handlers[sourceName] ?? subgraph.handlers["*"] ?? null;
     if (!handler) {
-      logger2.warn("No handler found for source", {
+      logger3.warn("No handler found for source", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id
@@ -1323,7 +1332,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
         const verdict = validatePrintPayload(filter.prints, printPayload.topic ?? "", printPayload.data ?? {});
         if (!verdict.ok) {
           skipped++;
-          logger2.warn("Print payload does not match declared prints schema", {
+          logger3.warn("Print payload does not match declared prints schema", {
             subgraph: subgraph.name,
             sourceName,
             topic: printPayload.topic,
@@ -1338,7 +1347,7 @@ async function runHandlers(subgraph, matched, ctx, opts) {
     } catch (err) {
       ctx.rollbackTo(checkpoint);
       errors++;
-      logger2.error("Subgraph handler error", {
+      logger3.error("Subgraph handler error", {
         subgraph: subgraph.name,
         sourceName,
         txId: tx.tx_id,
@@ -1459,5 +1468,5 @@ export {
   buildEvent
 };
 
-//# debugId=FEF5AC4898A3E56764756E2164756E21
+//# debugId=723A35E8C93CB61C64756E2164756E21
 //# sourceMappingURL=index.js.map