@distrohelena/canton-typescript-sdk 0.1.38 → 0.1.40

package/dist/cjs/query/grpc/grpc-query-client.js

@@ -80,6 +80,10 @@ class DefaultGrpcQueryDataProvider {
             return cachedContractsDataset(cached.contracts, cached.activeAtOffset, this.options.endpointScope ?? "ledger");
         }
         else if (needsHistory) {
+            console.warn(`[GrpcQueryClient] Falling back to a full ledger replay from offset 0 for a "${query.relation}" query. `
+                + "This is expensive and should be an extreme edge case. It is usually triggered by a \"contracts\" query "
+                + "that does not explicitly prove `active: true` (so archived contracts may be in scope), or by querying "
+                + "\"transactions\"/\"events\"/\"exercises\" directly. Add an explicit active:true filter if only current state is needed.");
             const endInclusive = cached?.activeAtOffset ?? (await this.options.stateService.getLedgerEndAsync({})).offset;
             const history = await this.snapshots.readHistoryAsync(endInclusive);
             const transactions = history.updates.flatMap((response) => response.update.oneofKind === "transaction" ? [response.update.transaction] : []);
@@ -95,7 +99,13 @@ class DefaultGrpcQueryDataProvider {
         }
         const endInclusive = cached?.activeAtOffset ?? (await this.options.stateService.getLedgerEndAsync({})).offset;
         if (query.relation === "packages" || query.relation === "contractTypes" || query.relation === "exerciseTypes") {
-            return (0, grpc_relation_mapper_js_1.createGrpcQueryDataset)((0, grpc_relation_mapper_js_1.mapGrpcQueryRelationFragment)([]), await this.packages.readAllAsync(), endInclusive, this.options.endpointScope ?? "ledger");
+            // A proven-active where/include on "contracts" (see predicateRequiresHistory/includesRequireHistory)
+            // can put "contracts" in the closure here without needsHistory being true, so the ACS still has to
+            // be read — otherwise that where/include would silently resolve against an empty row set.
+            const contractsFragment = closure.has("contracts")
+                ? (0, grpc_relation_mapper_js_1.mapGrpcQueryRelationFragment)([], (await this.snapshots.readActiveContractsAsync(endInclusive, partiesFor(query))).activeContracts)
+                : (0, grpc_relation_mapper_js_1.mapGrpcQueryRelationFragment)([]);
+            return (0, grpc_relation_mapper_js_1.createGrpcQueryDataset)(contractsFragment, await this.packages.readAllAsync(), endInclusive, this.options.endpointScope ?? "ledger");
         }
         else if (query.relation === "watermark") {
             return (0, grpc_relation_mapper_js_1.createGrpcQueryDataset)((0, grpc_relation_mapper_js_1.mapGrpcQueryRelationFragment)([]), [], endInclusive, this.options.endpointScope ?? "ledger");
@@ -160,10 +170,22 @@ function predicateRequiresHistory(relation, predicate) {
         return false;
     }
     const target = query_schema_js_1.queryRelationEdges[relation]?.[predicate.edge]?.target;
-    return target === "contracts" || target === "transactions" || target === "events" || target === "exercises" || target !== undefined && predicateRequiresHistory(target, predicate.predicate);
+    if (target === "contracts") {
+        // "every"/"none" must see archived rows too (an archived row can silently violate "every",
+        // or an unseen one could exist for "none"); only "some"/"one" ask "does an active row match?",
+        // which the active contract set alone already answers completely.
+        const provenActiveOnly = (predicate.quantifier === "some" || predicate.quantifier === "one") && predicateProvesActive(predicate.predicate);
+        return !provenActiveOnly;
+    }
+    return target === "transactions" || target === "events" || target === "exercises" || target !== undefined && predicateRequiresHistory(target, predicate.predicate);
 }
 function includesRequireHistory(relation, includes) {
-    return includes.some((include) => include.relation === "contracts" || include.relation === "transactions" || include.relation === "events" || include.relation === "exercises" || predicateRequiresHistory(include.relation, include.predicate) || includesRequireHistory(include.relation, include.includes));
+    return includes.some((include) => {
+        if (include.relation === "contracts") {
+            return !predicateProvesActive(include.predicate);
+        }
+        return include.relation === "transactions" || include.relation === "events" || include.relation === "exercises" || predicateRequiresHistory(include.relation, include.predicate) || includesRequireHistory(include.relation, include.includes);
+    });
 }
 function relationClosure(query) {
     const relations = new Set([query.relation]);

package/dist/query/grpc/grpc-query-client.js

@@ -76,6 +76,10 @@ class DefaultGrpcQueryDataProvider {
             return cachedContractsDataset(cached.contracts, cached.activeAtOffset, this.options.endpointScope ?? "ledger");
         }
         else if (needsHistory) {
+            console.warn(`[GrpcQueryClient] Falling back to a full ledger replay from offset 0 for a "${query.relation}" query. `
+                + "This is expensive and should be an extreme edge case. It is usually triggered by a \"contracts\" query "
+                + "that does not explicitly prove `active: true` (so archived contracts may be in scope), or by querying "
+                + "\"transactions\"/\"events\"/\"exercises\" directly. Add an explicit active:true filter if only current state is needed.");
             const endInclusive = cached?.activeAtOffset ?? (await this.options.stateService.getLedgerEndAsync({})).offset;
             const history = await this.snapshots.readHistoryAsync(endInclusive);
             const transactions = history.updates.flatMap((response) => response.update.oneofKind === "transaction" ? [response.update.transaction] : []);
@@ -91,7 +95,13 @@ class DefaultGrpcQueryDataProvider {
         }
         const endInclusive = cached?.activeAtOffset ?? (await this.options.stateService.getLedgerEndAsync({})).offset;
         if (query.relation === "packages" || query.relation === "contractTypes" || query.relation === "exerciseTypes") {
-            return createGrpcQueryDataset(mapGrpcQueryRelationFragment([]), await this.packages.readAllAsync(), endInclusive, this.options.endpointScope ?? "ledger");
+            // A proven-active where/include on "contracts" (see predicateRequiresHistory/includesRequireHistory)
+            // can put "contracts" in the closure here without needsHistory being true, so the ACS still has to
+            // be read — otherwise that where/include would silently resolve against an empty row set.
+            const contractsFragment = closure.has("contracts")
+                ? mapGrpcQueryRelationFragment([], (await this.snapshots.readActiveContractsAsync(endInclusive, partiesFor(query))).activeContracts)
+                : mapGrpcQueryRelationFragment([]);
+            return createGrpcQueryDataset(contractsFragment, await this.packages.readAllAsync(), endInclusive, this.options.endpointScope ?? "ledger");
         }
         else if (query.relation === "watermark") {
             return createGrpcQueryDataset(mapGrpcQueryRelationFragment([]), [], endInclusive, this.options.endpointScope ?? "ledger");
@@ -156,10 +166,22 @@ function predicateRequiresHistory(relation, predicate) {
         return false;
     }
     const target = queryRelationEdges[relation]?.[predicate.edge]?.target;
-    return target === "contracts" || target === "transactions" || target === "events" || target === "exercises" || target !== undefined && predicateRequiresHistory(target, predicate.predicate);
+    if (target === "contracts") {
+        // "every"/"none" must see archived rows too (an archived row can silently violate "every",
+        // or an unseen one could exist for "none"); only "some"/"one" ask "does an active row match?",
+        // which the active contract set alone already answers completely.
+        const provenActiveOnly = (predicate.quantifier === "some" || predicate.quantifier === "one") && predicateProvesActive(predicate.predicate);
+        return !provenActiveOnly;
+    }
+    return target === "transactions" || target === "events" || target === "exercises" || target !== undefined && predicateRequiresHistory(target, predicate.predicate);
 }
 function includesRequireHistory(relation, includes) {
-    return includes.some((include) => include.relation === "contracts" || include.relation === "transactions" || include.relation === "events" || include.relation === "exercises" || predicateRequiresHistory(include.relation, include.predicate) || includesRequireHistory(include.relation, include.includes));
+    return includes.some((include) => {
+        if (include.relation === "contracts") {
+            return !predicateProvesActive(include.predicate);
+        }
+        return include.relation === "transactions" || include.relation === "events" || include.relation === "exercises" || predicateRequiresHistory(include.relation, include.predicate) || includesRequireHistory(include.relation, include.includes);
+    });
 }
 function relationClosure(query) {
     const relations = new Set([query.relation]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@distrohelena/canton-typescript-sdk",
-    "version": "0.1.38",
+    "version": "0.1.40",
     "license": "Apache-2.0",
     "type": "module",
     "main": "./dist/index.js",