@distrohelena/canton-explorer 0.1.0 → 0.1.2

package/dist/src/pqs/pqs-summary.service.js

@@ -22,6 +22,7 @@ const package_cache_service_1 = require("../packages/package-cache.service");
 const package_registry_service_1 = require("../packages/package-registry.service");
 const grpc_operations_service_1 = require("../grpc/grpc-operations.service");
 const package_sync_service_1 = require("../packages/package-sync.service");
+const pqs_schema_1 = require("./pqs-schema");
 const SEARCH_GROUP_LIMIT = 25;
 const CANTON_COIN_TOKEN_ID = 'canton-coin';
 const CANTON_COIN_TOKEN_NAME = 'Canton Coin';
@@ -62,18 +63,33 @@ const TOKEN_TRANSFER_TEMPLATE_IDS = [
 const INFERRED_HOLDING_V2_SOURCE = 'pqs_inferred_holding_v2';
 const TOKEN_TRANSFER_CACHE_TTL_MS = 5 * 60 * 1000;
 const TOKEN_TRANSFER_CACHE_LIMIT = 250;
-const ACTIVE_QUERY = `
-  select
-    current_database() as pqs_database,
-    count(*)::int as active_contract_count,
-    max(created_at_offset) as latest_offset,
-    max(created_effective_at)::text as latest_event_at,
-    (
-      select count(*)::int
-      from participant.lapi_update_meta
-    ) as total_update_count
-  from active()
-`;
+function pqsCoreRelations(node) {
+    const qualifiedNode = {
+        ...node,
+        pqs: {
+            connectionUriEnv: node.pqs?.connectionUriEnv ?? '',
+            schema: node.pqs?.schema ?? 'public',
+        },
+    };
+    return {
+        contracts: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__contracts'),
+        contractTpe: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__contract_tpe'),
+        exercises: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__exercises'),
+        exerciseTpe: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__exercise_tpe'),
+        events: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__events'),
+        packages: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__packages'),
+        transactions: (0, pqs_schema_1.qualifyPqsRelation)(qualifiedNode, '__transactions'),
+    };
+}
+function isoUtcTimestampExpression(expression) {
+    return `to_char(${expression} at time zone 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')`;
+}
+function contractTemplateIdentifierExpression(alias) {
+    return `case
+    when ${alias}.module_name is null or ${alias}.entity_name is null then null
+    else ${alias}.module_name || ':' || ${alias}.entity_name
+  end`;
+}
 function compareGlobalMergedUpdates(left, right) {
     const leftRecordTimeMs = Date.parse(left.recordTime ?? '');
     const rightRecordTimeMs = Date.parse(right.recordTime ?? '');
@@ -360,48 +376,6 @@ function compareSearchPackageNames(left, right) {
     }
     return left.name.localeCompare(right.name);
 }
-const PARTICIPANT_FALLBACK_QUERY = `
-  select
-    current_database() as pqs_database,
-    (
-      select count(*)::int
-      from participant.par_active_contracts
-    ) as active_contract_count,
-    (
-      select max(event_offset)::text
-      from participant.lapi_update_meta
-    ) as latest_offset,
-    (
-      select to_char(
-        to_timestamp(max(record_time) / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      )
-      from participant.lapi_update_meta
-    ) as latest_event_at,
-    (
-      select count(*)::int
-      from participant.lapi_update_meta
-    ) as total_update_count
-`;
-function activityBucketsQuery(days, bucketMinutes) {
-    const normalizedDays = Number.isFinite(days) && days > 0 ? Math.trunc(days) : 30;
-    const normalizedBucketMinutes = Number.isFinite(bucketMinutes) && bucketMinutes > 0 ? Math.trunc(bucketMinutes) : 15;
-    const bucketSeconds = normalizedBucketMinutes * 60;
-    const minRecordTimeMicros = Math.floor((Date.now() - normalizedDays * 24 * 60 * 60 * 1000) * 1000);
-    return `
-    select
-      to_char(
-        to_timestamp(floor((record_time / 1000000.0) / ${bucketSeconds}) * ${bucketSeconds}) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as bucket_timestamp,
-      count(*)::int as activity_value,
-      max(event_offset)::text as latest_offset
-    from participant.lapi_update_meta
-    where record_time >= ${minRecordTimeMicros}
-    group by 1
-    order by 1 asc
-  `;
-}
 function normalizePartyFilters(parties) {
     if (!parties) {
         return [];
@@ -440,139 +414,108 @@ function normalizeTokenIssuerFilters(values) {
         .map((value) => value.trim())
         .filter((value) => value.length > 0)));
 }
-function buildUpdatePartyExistsCondition(partyId) {
-    const createMatch = partyWitnessArrayMatchCondition('create_event.tree_event_witnesses', partyId);
-    const consumingMatch = partyWitnessArrayMatchCondition('exercise_event.tree_event_witnesses', partyId);
-    const nonConsumingMatch = partyWitnessArrayMatchCondition('exercise_event.tree_event_witnesses', partyId);
-    return `(
-    exists (
-      select 1
-      from participant.lapi_events_create create_event
-      where create_event.update_id = update_meta.update_id
-        and ${createMatch}
-    )
-    or exists (
-      select 1
-      from participant.lapi_events_consuming_exercise exercise_event
-      where exercise_event.update_id = update_meta.update_id
-        and ${consumingMatch}
-    )
-    or exists (
-      select 1
-      from participant.lapi_events_non_consuming_exercise exercise_event
-      where exercise_event.update_id = update_meta.update_id
-        and ${nonConsumingMatch}
-    )
-  )`;
+function summaryQuery(node) {
+    const relations = pqsCoreRelations(node);
+    return `
+    select
+      current_database() as pqs_database,
+      (
+        select count(*)::int
+        from ${relations.contracts} contract_row
+        where contract_row.archived_at_ix is null
+      ) as active_contract_count,
+      (
+        select max(tx.offset)::text
+        from ${relations.transactions} tx
+      ) as latest_offset,
+      (
+        select ${isoUtcTimestampExpression('max(tx.effective_at)')}
+        from ${relations.transactions} tx
+      ) as latest_event_at,
+      (
+        select count(*)::int
+        from ${relations.transactions} tx
+      ) as total_update_count
+  `;
+}
+function pqsActivityBucketsQuery(node, days, bucketMinutes) {
+    const relations = pqsCoreRelations(node);
+    const normalizedDays = Number.isFinite(days) && days > 0 ? Math.trunc(days) : 30;
+    const normalizedBucketMinutes = Number.isFinite(bucketMinutes) && bucketMinutes > 0 ? Math.trunc(bucketMinutes) : 15;
+    const bucketSeconds = normalizedBucketMinutes * 60;
+    const minEffectiveAt = new Date(Date.now() - normalizedDays * 24 * 60 * 60 * 1000).toISOString();
+    return `
+    select
+      to_char(
+        to_timestamp(floor(extract(epoch from tx.effective_at) / ${bucketSeconds}) * ${bucketSeconds}) at time zone 'UTC',
+        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
+      ) as bucket_timestamp,
+      count(*)::int as activity_value,
+      max(tx.offset)::text as latest_offset
+    from ${relations.transactions} tx
+    where tx.effective_at >= '${escapeSqlLiteral(minEffectiveAt)}'::timestamptz
+    group by 1
+    order by 1 asc
+  `;
 }
-function buildNormalizedUpdatePartyExistsCondition(partyId) {
-    const partyMatch = partyScalarMatchCondition('party_string.external_string', partyId);
+function buildPqsUpdatePartyExistsCondition(node, partyId) {
+    const relations = pqsCoreRelations(node);
+    const contractMatch = partyWitnessArrayMatchCondition('contract_row.witnesses', partyId);
+    const exerciseMatch = partyWitnessArrayMatchCondition('exercise_row.witnesses', partyId);
     return `(
     exists (
       select 1
-      from participant.lapi_events_activate_contract activate_event
-      join participant.lapi_filter_activate_witness witness_filter
-        on witness_filter.event_sequential_id = activate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where activate_event.update_id = update_meta.update_id
-        and ${partyMatch}
+      from ${relations.contracts} contract_row
+      where (contract_row.created_at_ix = tx.ix or contract_row.archived_at_ix = tx.ix)
+        and ${contractMatch}
     )
     or exists (
       select 1
-      from participant.lapi_events_deactivate_contract deactivate_event
-      join participant.lapi_filter_deactivate_witness witness_filter
-        on witness_filter.event_sequential_id = deactivate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where deactivate_event.update_id = update_meta.update_id
-        and ${partyMatch}
-    )
-    or exists (
-      select 1
-      from participant.lapi_events_various_witnessed various_event
-      join participant.lapi_filter_various_witness witness_filter
-        on witness_filter.event_sequential_id = various_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where various_event.update_id = update_meta.update_id
-        and ${partyMatch}
-    )
-  )`;
-}
-function buildUpdateTemplateExistsCondition(templateId) {
-    const normalizedTemplateId = normalizeTemplateFilterValue(templateId);
-    const quotedTemplateId = `'${escapeSqlLiteral(normalizedTemplateId)}'`;
-    return `(
-    exists (
-      select 1
-      from (
-        select regexp_replace(coalesce(create_event.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_create create_event
-        where create_event.update_id = update_meta.update_id
-
-        union all
-
-        select regexp_replace(coalesce(exercise_event.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_consuming_exercise exercise_event
-        where exercise_event.update_id = update_meta.update_id
-
-        union all
-
-        select regexp_replace(coalesce(exercise_event.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_non_consuming_exercise exercise_event
-        where exercise_event.update_id = update_meta.update_id
-      ) update_event_templates
-      where update_event_templates.template_id = ${quotedTemplateId}
+      from ${relations.exercises} exercise_row
+      where exercise_row.exercised_at_ix = tx.ix
+        and ${exerciseMatch}
     )
   )`;
 }
-function buildNormalizedUpdateTemplateExistsCondition(templateId) {
+function buildPqsUpdateTemplateExistsCondition(node, templateId) {
+    const relations = pqsCoreRelations(node);
     const normalizedTemplateId = normalizeTemplateFilterValue(templateId);
     const quotedTemplateId = `'${escapeSqlLiteral(normalizedTemplateId)}'`;
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
+    const exerciseTemplateId = contractTemplateIdentifierExpression('exercise_contract_tpe_row');
     return `(
     exists (
       select 1
       from (
-        select regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_activate_contract activate_event
-        left join participant.par_contracts contract
-          on contract.internal_contract_id = activate_event.internal_contract_id
-        where activate_event.update_id = update_meta.update_id
-
-        union all
-
-        select regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_various_witnessed various_event
-        left join participant.par_contracts contract
-          on contract.internal_contract_id = various_event.internal_contract_id
-        where various_event.update_id = update_meta.update_id
-          and various_event.event_type = 6
+        select ${contractTemplateId} as template_id
+        from ${relations.contracts} contract_row
+        join ${relations.contractTpe} contract_tpe_row
+          on contract_tpe_row.pk = contract_row.tpe_pk
+        where contract_row.created_at_ix = tx.ix
 
         union all
 
-        select regexp_replace(coalesce(template_string.external_string, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_deactivate_contract deactivate_event
-        left join participant.lapi_string_interning template_string
-          on template_string.internal_id = deactivate_event.template_id
-        where deactivate_event.update_id = update_meta.update_id
+        select ${contractTemplateId} as template_id
+        from ${relations.contracts} contract_row
+        join ${relations.contractTpe} contract_tpe_row
+          on contract_tpe_row.pk = contract_row.tpe_pk
+        where contract_row.archived_at_ix = tx.ix
 
         union all
 
-        select regexp_replace(coalesce(template_string.external_string, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_various_witnessed various_event
-        left join participant.lapi_string_interning template_string
-          on template_string.internal_id = various_event.template_id
-        where various_event.update_id = update_meta.update_id
-          and various_event.event_type in (5, 7)
+        select ${exerciseTemplateId} as template_id
+        from ${relations.exercises} exercise_row
+        join ${relations.contractTpe} exercise_contract_tpe_row
+          on exercise_contract_tpe_row.pk = exercise_row.contract_tpe_pk
+        where exercise_row.exercised_at_ix = tx.ix
       ) update_event_templates
       where update_event_templates.template_id = ${quotedTemplateId}
     )
   )`;
 }
-function buildUpdatesFilterClause(parties, templates, partyMode) {
-    const partyConditions = normalizePartyFilters(parties).map((party) => buildUpdatePartyExistsCondition(party));
-    const templateConditions = normalizeTemplateFilters(templates).map((templateId) => buildUpdateTemplateExistsCondition(templateId));
+function buildPqsUpdatesFilterClause(node, parties, templates, partyMode) {
+    const partyConditions = normalizePartyFilters(parties).map((party) => buildPqsUpdatePartyExistsCondition(node, party));
+    const templateConditions = normalizeTemplateFilters(templates).map((templateId) => buildPqsUpdateTemplateExistsCondition(node, templateId));
     const groups = [];
     if (partyConditions.length > 0) {
         const partyJoiner = normalizePartyFilterMode(partyMode) === 'and' ? '\n      and ' : '\n      or ';
@@ -590,103 +533,55 @@ function buildUpdatesFilterClause(parties, templates, partyMode) {
     }
     return groups.length === 1 ? groups[0] : `(\n      ${groups.join('\n      and ')}\n    )`;
 }
-function buildNormalizedUpdatesFilterClause(parties, templates, partyMode) {
-    const partyConditions = normalizePartyFilters(parties).map((party) => buildNormalizedUpdatePartyExistsCondition(party));
-    const templateConditions = normalizeTemplateFilters(templates).map((templateId) => buildNormalizedUpdateTemplateExistsCondition(templateId));
-    const groups = [];
-    if (partyConditions.length > 0) {
-        const partyJoiner = normalizePartyFilterMode(partyMode) === 'and' ? '\n      and ' : '\n      or ';
-        groups.push(partyConditions.length === 1
-            ? partyConditions[0]
-            : `(\n      ${partyConditions.join(partyJoiner)}\n    )`);
-    }
-    if (templateConditions.length > 0) {
-        groups.push(templateConditions.length === 1
-            ? templateConditions[0]
-            : `(\n      ${templateConditions.join('\n      or ')}\n    )`);
-    }
-    if (groups.length === 0) {
-        return null;
-    }
-    return groups.length === 1 ? groups[0] : `(\n      ${groups.join('\n      and ')}\n    )`;
-}
-function recentUpdatesQuery(limit, before, after, parties, templates, partyMode, hideSplice) {
-    const normalizedBefore = normalizeEventOffsetCursor(before);
-    const normalizedAfter = normalizeEventOffsetCursor(after);
-    const filterClause = buildUpdatesFilterClause(parties, templates, partyMode);
-    const hideSpliceClause = hideSplice ? buildHideSpliceOffsetsClause() : null;
-    const queryLimit = limit + 1;
-    const afterFilters = [
-        normalizedAfter ? `update_meta.event_offset::numeric > ${normalizedAfter}` : null,
-        filterClause,
-        hideSpliceClause,
-    ].filter((value) => Boolean(value));
-    const olderFilters = [
-        normalizedBefore ? `update_meta.event_offset::numeric < ${normalizedBefore}` : null,
-        filterClause,
-        hideSpliceClause,
-    ].filter((value) => Boolean(value));
-    if (normalizedAfter && !normalizedBefore) {
-        const whereClause = afterFilters.length > 0 ? `where ${afterFilters.join('\n      and ')}` : '';
-        return `
-      select
-        update_meta.update_id::text as update_id,
-        update_meta.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time
-      from participant.lapi_update_meta update_meta
-      ${whereClause}
-      order by update_meta.event_offset::numeric asc
-      limit ${queryLimit}
-    `;
-    }
-    const whereClause = olderFilters.length > 0 ? `where ${olderFilters.join('\n      and ')}` : '';
+function buildPqsHideSpliceUpdatesClause(node) {
+    const relations = pqsCoreRelations(node);
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
+    const exerciseTemplateId = contractTemplateIdentifierExpression('exercise_contract_tpe_row');
     return `
-    select
-      update_meta.update_id::text as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
-    ${whereClause}
-    order by update_meta.event_offset::numeric desc
-  limit ${queryLimit}
-  `;
-}
-function searchUpdatesQuery(searchQuery, limit) {
-    const quotedQuery = escapeSqlLiteral(searchQuery);
-    return `
-    select
-      update_meta.update_id::text as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
-    where update_meta.event_offset::text like '${quotedQuery}%'
-      or regexp_replace(update_meta.update_id::text, '^\\\\x', '') like '${quotedQuery}%'
-    order by update_meta.record_time desc, update_meta.event_offset::numeric desc
-    limit ${limit}
+    exists (
+      select 1
+      from (
+        select ${contractTemplateId} as template_id
+        from ${relations.contracts} contract_row
+        join ${relations.contractTpe} contract_tpe_row
+          on contract_tpe_row.pk = contract_row.tpe_pk
+        where contract_row.created_at_ix = tx.ix
+
+        union all
+
+        select ${contractTemplateId} as template_id
+        from ${relations.contracts} contract_row
+        join ${relations.contractTpe} contract_tpe_row
+          on contract_tpe_row.pk = contract_row.tpe_pk
+        where contract_row.archived_at_ix = tx.ix
+
+        union all
+
+        select ${exerciseTemplateId} as template_id
+        from ${relations.exercises} exercise_row
+        join ${relations.contractTpe} exercise_contract_tpe_row
+          on exercise_contract_tpe_row.pk = exercise_row.contract_tpe_pk
+        where exercise_row.exercised_at_ix = tx.ix
+      ) update_event_templates
+      where update_event_templates.template_id is null
+        or update_event_templates.template_id not like 'Splice.%'
+    )
   `;
 }
-function normalizedRecentUpdatesQuery(limit, before, after, parties, templates, partyMode, hideSplice) {
+function pqsRecentUpdatesQuery(node, limit, before, after, parties, templates, partyMode, hideSplice) {
+    const relations = pqsCoreRelations(node);
     const normalizedBefore = normalizeEventOffsetCursor(before);
     const normalizedAfter = normalizeEventOffsetCursor(after);
-    const filterClause = buildNormalizedUpdatesFilterClause(parties, templates, partyMode);
-    const hideSpliceClause = hideSplice ? buildNormalizedHideSpliceOffsetsClause() : null;
+    const filterClause = buildPqsUpdatesFilterClause(node, parties, templates, partyMode);
+    const hideSpliceClause = hideSplice ? buildPqsHideSpliceUpdatesClause(node) : null;
     const queryLimit = limit + 1;
     const afterFilters = [
-        normalizedAfter ? `update_meta.event_offset::numeric > ${normalizedAfter}` : null,
+        normalizedAfter ? `tx.offset > ${normalizedAfter}` : null,
         filterClause,
         hideSpliceClause,
     ].filter((value) => Boolean(value));
     const olderFilters = [
-        normalizedBefore ? `update_meta.event_offset::numeric < ${normalizedBefore}` : null,
+        normalizedBefore ? `tx.offset < ${normalizedBefore}` : null,
         filterClause,
         hideSpliceClause,
     ].filter((value) => Boolean(value));
@@ -694,483 +589,277 @@ function normalizedRecentUpdatesQuery(limit, before, after, parties, templates,
         const whereClause = afterFilters.length > 0 ? `where ${afterFilters.join('\n      and ')}` : '';
         return `
       select
-        encode(update_meta.update_id, 'hex') as update_id,
-        update_meta.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time
-      from participant.lapi_update_meta update_meta
+        tx.transaction_id::text as update_id,
+        tx.offset::text as event_offset,
+        ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+      from ${relations.transactions} tx
       ${whereClause}
-      order by update_meta.event_offset::numeric asc
+      order by tx.offset asc
       limit ${queryLimit}
     `;
     }
     const whereClause = olderFilters.length > 0 ? `where ${olderFilters.join('\n      and ')}` : '';
     return `
     select
-      encode(update_meta.update_id, 'hex') as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
+      tx.transaction_id::text as update_id,
+      tx.offset::text as event_offset,
+      ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+    from ${relations.transactions} tx
     ${whereClause}
-    order by update_meta.event_offset::numeric desc
+    order by tx.offset desc
     limit ${queryLimit}
   `;
 }
-function normalizedSearchUpdatesQuery(searchQuery, limit) {
+function pqsSearchUpdatesQuery(node, searchQuery, limit) {
+    const relations = pqsCoreRelations(node);
     const quotedQuery = escapeSqlLiteral(searchQuery);
     return `
     select
-      encode(update_meta.update_id, 'hex') as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
-    where update_meta.event_offset::text like '${quotedQuery}%'
-      or encode(update_meta.update_id, 'hex') like '${quotedQuery}%'
-    order by update_meta.record_time desc, update_meta.event_offset::numeric desc
+      tx.transaction_id::text as update_id,
+      tx.offset::text as event_offset,
+      ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+    from ${relations.transactions} tx
+    where tx.offset::text like '${quotedQuery}%'
+      or tx.transaction_id like '${quotedQuery}%'
+    order by tx.effective_at desc nulls last, tx.offset desc
     limit ${limit}
   `;
 }
-function buildHideSpliceOffsetsClause() {
-    return `
-    exists (
-      select 1
-      from (
-        select create_event.template_id::text as template_id
-        from participant.lapi_events_create create_event
-        where create_event.update_id::text = update_meta.update_id::text
-
-        union all
-
-        select exercise_event.template_id::text as template_id
-        from participant.lapi_events_consuming_exercise exercise_event
-        where exercise_event.update_id::text = update_meta.update_id::text
-
-        union all
-
-        select exercise_event.template_id::text as template_id
-        from participant.lapi_events_non_consuming_exercise exercise_event
-        where exercise_event.update_id::text = update_meta.update_id::text
-      ) update_event_templates
-      where update_event_templates.template_id is null
-        or update_event_templates.template_id not like 'Splice.%'
-    )
-  `;
-}
-function buildNormalizedHideSpliceOffsetsClause() {
-    return `
-    exists (
-      select 1
-      from (
-        select regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_activate_contract activate_event
-        left join participant.par_contracts contract
-          on contract.internal_contract_id = activate_event.internal_contract_id
-        where encode(activate_event.update_id, 'hex') = encode(update_meta.update_id, 'hex')
-
-        union all
-
-        select regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_various_witnessed various_event
-        left join participant.par_contracts contract
-          on contract.internal_contract_id = various_event.internal_contract_id
-        where encode(various_event.update_id, 'hex') = encode(update_meta.update_id, 'hex')
-          and various_event.event_type = 6
-
-        union all
-
-        select regexp_replace(coalesce(template_string.external_string, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_deactivate_contract deactivate_event
-        left join participant.lapi_string_interning template_string
-          on template_string.internal_id = deactivate_event.template_id
-        where encode(deactivate_event.update_id, 'hex') = encode(update_meta.update_id, 'hex')
-
-        union all
-
-        select regexp_replace(coalesce(template_string.external_string, ''), '^t\\\\|#[^:]+:', '') as template_id
-        from participant.lapi_events_various_witnessed various_event
-        left join participant.lapi_string_interning template_string
-          on template_string.internal_id = various_event.template_id
-        where encode(various_event.update_id, 'hex') = encode(update_meta.update_id, 'hex')
-          and various_event.event_type in (5, 7)
-      ) update_event_templates
-      where update_event_templates.template_id = ''
-        or update_event_templates.template_id not like 'Splice.%'
-    )
-  `;
-}
-function buildQuotedPartyIdentifiers(partyId) {
-    const trimmed = partyId.trim();
-    if (!trimmed) {
-        return [];
-    }
-    const normalized = trimmed.replace(/^p\|/, '');
-    const identifiers = new Set([trimmed, normalized]);
-    if (normalized) {
-        identifiers.add(`p|${normalized}`);
-    }
-    return Array.from(identifiers).map((identifier) => `'${escapeSqlLiteral(identifier)}'`);
-}
-function partyWitnessArrayMatchCondition(arrayExpression, partyId) {
-    const quotedIdentifiers = buildQuotedPartyIdentifiers(partyId);
-    if (quotedIdentifiers.length === 0) {
-        return 'false';
-    }
-    return `array[${quotedIdentifiers.join(', ')}]::text[] && ${arrayExpression}::text[]`;
-}
-function partyScalarMatchCondition(columnExpression, partyId) {
-    const quotedIdentifiers = buildQuotedPartyIdentifiers(partyId);
-    if (quotedIdentifiers.length === 0) {
-        return 'false';
-    }
-    return `${columnExpression} in (${quotedIdentifiers.join(', ')})`;
-}
-function partyRecentUpdatesQuery(partyId, limit) {
-    const witnessMatch = partyWitnessArrayMatchCondition('create_event.tree_event_witnesses', partyId);
-    const consumingWitnessMatch = partyWitnessArrayMatchCondition('exercise_event.tree_event_witnesses', partyId);
-    const nonConsumingWitnessMatch = partyWitnessArrayMatchCondition('exercise_event.tree_event_witnesses', partyId);
-    return `
-    select
-      update_meta.update_id::text as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
-    where update_meta.update_id::text in (
-      select create_event.update_id::text
-      from participant.lapi_events_create create_event
-      where ${witnessMatch}
-
-      union
-
-      select exercise_event.update_id::text
-      from participant.lapi_events_consuming_exercise exercise_event
-      where ${consumingWitnessMatch}
-
-      union
-
-      select exercise_event.update_id::text
-      from participant.lapi_events_non_consuming_exercise exercise_event
-      where ${nonConsumingWitnessMatch}
-    )
-    order by update_meta.record_time desc
-    limit ${limit}
-  `;
-}
-function normalizedPartyRecentUpdatesQuery(partyId, limit) {
-    const partyMatch = partyScalarMatchCondition('party_string.external_string', partyId);
-    return `
-    with matching_updates as (
-      select distinct activate_event.update_id
-      from participant.lapi_events_activate_contract activate_event
-      join participant.lapi_filter_activate_witness witness_filter
-        on witness_filter.event_sequential_id = activate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where ${partyMatch}
-
-      union
-
-      select distinct deactivate_event.update_id
-      from participant.lapi_events_deactivate_contract deactivate_event
-      join participant.lapi_filter_deactivate_witness witness_filter
-        on witness_filter.event_sequential_id = deactivate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where ${partyMatch}
-
-      union
-
-      select distinct various_event.update_id
-      from participant.lapi_events_various_witnessed various_event
-      join participant.lapi_filter_various_witness witness_filter
-        on witness_filter.event_sequential_id = various_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where ${partyMatch}
-    )
-    select
-      encode(update_meta.update_id, 'hex') as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-    from participant.lapi_update_meta update_meta
-    join matching_updates
-      on matching_updates.update_id = update_meta.update_id
-    order by update_meta.record_time desc
-    limit ${limit}
-  `;
-}
-function recentUpdatePartiesQuery(updateIds) {
+function pqsRecentUpdatePartiesQuery(node, updateIds) {
+    const relations = pqsCoreRelations(node);
     const quotedIds = updateIds.map((updateId) => `'${escapeSqlLiteral(updateId)}'`).join(', ');
     return `
-    select
-      update_id::text as update_id,
-      array_agg(distinct party order by party) as parties
-    from (
-      select
-        update_id,
-        unnest(tree_event_witnesses) as party
-      from participant.lapi_events_create
-      where update_id in (${quotedIds})
-
-      union
-
-      select
-        update_id,
-        unnest(tree_event_witnesses) as party
-      from participant.lapi_events_consuming_exercise
-      where update_id in (${quotedIds})
-
-      union
-
-      select
-        update_id,
-        unnest(tree_event_witnesses) as party
-      from participant.lapi_events_non_consuming_exercise
-      where update_id in (${quotedIds})
-    ) update_parties
-    group by update_id
-  `;
-}
-function normalizedRecentUpdatePartiesQuery(updateIds) {
-    const quotedIds = updateIds
-        .map((updateId) => `'${escapeSqlLiteral(normalizeByteaHex(updateId))}'`)
-        .join(', ');
-    return `
     select
       update_id,
       array_agg(distinct party order by party) as parties
     from (
       select
-        encode(activate_event.update_id, 'hex') as update_id,
-        party_string.external_string as party
-      from participant.lapi_events_activate_contract activate_event
-      join participant.lapi_filter_activate_witness witness_filter
-        on witness_filter.event_sequential_id = activate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where encode(activate_event.update_id, 'hex') in (${quotedIds})
+        tx.transaction_id::text as update_id,
+        unnest(contract_row.witnesses) as party
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.created_at_ix = tx.ix
+      where tx.transaction_id in (${quotedIds})
 
       union
 
       select
-        encode(deactivate_event.update_id, 'hex') as update_id,
-        party_string.external_string as party
-      from participant.lapi_events_deactivate_contract deactivate_event
-      join participant.lapi_filter_deactivate_witness witness_filter
-        on witness_filter.event_sequential_id = deactivate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where encode(deactivate_event.update_id, 'hex') in (${quotedIds})
+        tx.transaction_id::text as update_id,
+        unnest(contract_row.witnesses) as party
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.archived_at_ix = tx.ix
+      where tx.transaction_id in (${quotedIds})
 
       union
 
       select
-        encode(various_event.update_id, 'hex') as update_id,
-        party_string.external_string as party
-      from participant.lapi_events_various_witnessed various_event
-      join participant.lapi_filter_various_witness witness_filter
-        on witness_filter.event_sequential_id = various_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      where encode(various_event.update_id, 'hex') in (${quotedIds})
+        tx.transaction_id::text as update_id,
+        unnest(exercise_row.witnesses) as party
+      from ${relations.transactions} tx
+      join ${relations.exercises} exercise_row
+        on exercise_row.exercised_at_ix = tx.ix
+      where tx.transaction_id in (${quotedIds})
     ) update_parties
     group by update_id
   `;
 }
-function activePartiesQuery() {
+function pqsActivePartiesQuery(node) {
+    const relations = pqsCoreRelations(node);
     return `
     select
       array_agg(distinct party order by party) as parties
     from (
-      select unnest(tree_event_witnesses) as party
-      from participant.lapi_events_create
+      select unnest(contract_row.witnesses) as party
+      from ${relations.contracts} contract_row
 
       union
 
-      select unnest(tree_event_witnesses) as party
-      from participant.lapi_events_consuming_exercise
-
-      union
-
-      select unnest(tree_event_witnesses) as party
-      from participant.lapi_events_non_consuming_exercise
+      select unnest(exercise_row.witnesses) as party
+      from ${relations.exercises} exercise_row
     ) observed_parties
   `;
 }
-function normalizedActivePartiesQuery() {
+function pqsPartyRecentUpdatesQuery(node, partyId, limit) {
+    const relations = pqsCoreRelations(node);
+    const contractMatch = partyWitnessArrayMatchCondition('contract_row.witnesses', partyId);
+    const exerciseMatch = partyWitnessArrayMatchCondition('exercise_row.witnesses', partyId);
     return `
     select
-      array_agg(distinct party order by party) as parties
-    from (
-      select party_string.external_string as party
-      from participant.lapi_filter_activate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-
-      union
-
-      select party_string.external_string as party
-      from participant.lapi_filter_deactivate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-
-      union
-
-      select party_string.external_string as party
-      from participant.lapi_filter_various_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-    ) observed_parties
+      tx.transaction_id::text as update_id,
+      tx.offset::text as event_offset,
+      ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+    from ${relations.transactions} tx
+    where exists (
+      select 1
+      from ${relations.contracts} contract_row
+      where (contract_row.created_at_ix = tx.ix or contract_row.archived_at_ix = tx.ix)
+        and ${contractMatch}
+    )
+    or exists (
+      select 1
+      from ${relations.exercises} exercise_row
+      where exercise_row.exercised_at_ix = tx.ix
+        and ${exerciseMatch}
+    )
+    order by tx.offset desc
+    limit ${limit}
   `;
 }
-function partyRecentContractsQuery(partyId, limit, before, after) {
-    const witnessMatch = partyWitnessArrayMatchCondition('create_event.tree_event_witnesses', partyId);
+function buildPqsActiveContractsFilterClause(parties, templates, partyMode, hideSplice) {
+    const partyConditions = normalizePartyFilters(parties).map((party) => partyWitnessArrayMatchCondition('contract_row.witnesses', party));
+    const templateExpression = contractTemplateIdentifierExpression('contract_tpe_row');
+    const templateConditions = normalizeTemplateFilters(templates).map((templateId) => {
+        const quotedTemplateId = `'${escapeSqlLiteral(templateId)}'`;
+        return `${templateExpression} = ${quotedTemplateId}`;
+    });
+    const groups = [];
+    if (partyConditions.length > 0) {
+        const partyJoiner = normalizePartyFilterMode(partyMode) === 'and' ? '\n      and ' : '\n      or ';
+        groups.push(partyConditions.length === 1
+            ? partyConditions[0]
+            : `(\n      ${partyConditions.join(partyJoiner)}\n    )`);
+    }
+    if (templateConditions.length > 0) {
+        groups.push(templateConditions.length === 1
+            ? templateConditions[0]
+            : `(\n      ${templateConditions.join('\n      or ')}\n    )`);
+    }
+    if (hideSplice) {
+        groups.push(`${templateExpression} not like 'Splice.%'`);
+    }
+    if (groups.length === 0) {
+        return null;
+    }
+    return groups.length === 1 ? groups[0] : `(\n      ${groups.join('\n      and ')}\n    )`;
+}
+function pqsActiveContractsQuery(node, limit, before, after, parties, templates, partyMode, hideSplice) {
+    const relations = pqsCoreRelations(node);
     const normalizedBefore = normalizeEventOffsetCursor(before);
     const normalizedAfter = normalizeEventOffsetCursor(after);
     const queryLimit = limit + 1;
-    const afterClause = normalizedAfter ? `and create_event.event_offset::numeric > ${normalizedAfter}` : '';
-    const beforeClause = normalizedBefore ? `and create_event.event_offset::numeric < ${normalizedBefore}` : '';
-    if (normalizedAfter && !normalizedBefore) {
-        return `
-      select
-        create_event.contract_id::text as contract_id,
-        create_event.template_id::text as template_id,
-        null::text as package_id,
-        to_char(
-          to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        create_event.event_offset::text as created_event_offset
-      from participant.lapi_events_create create_event
-      join participant.lapi_update_meta update_meta
-        on update_meta.update_id = create_event.update_id
-      where ${witnessMatch}
-        ${afterClause}
-      order by create_event.event_offset::numeric asc
-      limit ${queryLimit}
-    `;
-    }
+    const useAfterCursor = Boolean(normalizedAfter && !normalizedBefore);
+    const cursorFilter = useAfterCursor
+        ? `tx.offset > ${normalizedAfter}`
+        : normalizedBefore
+            ? `tx.offset < ${normalizedBefore}`
+            : null;
+    const orderDirection = useAfterCursor ? 'asc' : 'desc';
+    const filterClause = buildPqsActiveContractsFilterClause(parties, templates, partyMode, hideSplice);
+    const whereConditions = [
+        'contract_row.archived_at_ix is null',
+        cursorFilter,
+        filterClause,
+    ].filter((value) => Boolean(value));
+    const whereClause = whereConditions.length > 0 ? `where ${whereConditions.join('\n      and ')}` : '';
     return `
     select
-      create_event.contract_id::text as contract_id,
-      create_event.template_id::text as template_id,
-      null::text as package_id,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time
-      ,
-      create_event.event_offset::text as created_event_offset
-    from participant.lapi_events_create create_event
-    join participant.lapi_update_meta update_meta
-      on update_meta.update_id = create_event.update_id
-    where ${witnessMatch}
-      ${beforeClause}
-    order by create_event.event_offset::numeric desc
+      contract_row.contract_id::text as contract_id,
+      ${contractTemplateIdentifierExpression('contract_tpe_row')} as template_id,
+      ${isoUtcTimestampExpression('tx.effective_at')} as created_record_time,
+      tx.offset::text as created_event_offset
+    from ${relations.contracts} contract_row
+    join ${relations.contractTpe} contract_tpe_row
+      on contract_tpe_row.pk = contract_row.tpe_pk
+    join ${relations.transactions} tx
+      on tx.ix = contract_row.created_at_ix
+    ${whereClause}
+    order by tx.offset ${orderDirection}
     limit ${queryLimit}
   `;
 }
-function normalizedPartyRecentContractsQuery(partyId, limit, before, after) {
-    const partyMatch = partyScalarMatchCondition('party_string.external_string', partyId);
+function pqsSearchContractsQuery(node, searchQuery, limit) {
+    const relations = pqsCoreRelations(node);
+    const quotedQuery = escapeSqlLiteral(searchQuery);
+    return `
+    select
+      contract_row.contract_id::text as contract_id,
+      ${contractTemplateIdentifierExpression('contract_tpe_row')} as template_id,
+      ${isoUtcTimestampExpression('tx.effective_at')} as created_record_time
+    from ${relations.contracts} contract_row
+    join ${relations.contractTpe} contract_tpe_row
+      on contract_tpe_row.pk = contract_row.tpe_pk
+    join ${relations.transactions} tx
+      on tx.ix = contract_row.created_at_ix
+    where contract_row.contract_id like '${quotedQuery}%'
+      and contract_row.archived_at_ix is null
+    order by tx.effective_at desc nulls last, contract_row.contract_id asc
+    limit ${limit}
+  `;
+}
+function pqsPartyRecentContractsQuery(node, partyId, limit, before, after) {
+    const relations = pqsCoreRelations(node);
+    const witnessMatch = partyWitnessArrayMatchCondition('contract_row.witnesses', partyId);
     const normalizedBefore = normalizeEventOffsetCursor(before);
     const normalizedAfter = normalizeEventOffsetCursor(after);
     const queryLimit = limit + 1;
-    const afterFilter = normalizedAfter && !normalizedBefore
-        ? `where created_event_offset::numeric > ${normalizedAfter}`
+    const sortDirection = normalizedAfter && !normalizedBefore ? 'asc' : 'desc';
+    const cursorClause = normalizedAfter && !normalizedBefore
+        ? `and tx.offset > ${normalizedAfter}`
         : normalizedBefore
-            ? `where created_event_offset::numeric < ${normalizedBefore}`
+            ? `and tx.offset < ${normalizedBefore}`
             : '';
-    const sortDirection = normalizedAfter && !normalizedBefore ? 'asc' : 'desc';
     return `
     select
-      contract_id,
-      template_id,
-      package_id,
-      record_time,
-      created_event_offset
-    from (
-      select
-        encode(contract.contract_id, 'hex') as contract_id,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        activate_event.event_sequential_id as sort_event_sequential_id,
-        activate_event.event_offset::text as created_event_offset
-      from participant.lapi_events_activate_contract activate_event
-      join participant.lapi_filter_activate_witness witness_filter
-        on witness_filter.event_sequential_id = activate_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      left join participant.par_contracts contract
-        on contract.internal_contract_id = activate_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = activate_event.representative_package_id
-      where ${partyMatch}
-
-      union all
-
-      select
-        encode(contract.contract_id, 'hex') as contract_id,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        various_event.event_sequential_id as sort_event_sequential_id,
-        various_event.event_offset::text as created_event_offset
-      from participant.lapi_events_various_witnessed various_event
-      join participant.lapi_filter_various_witness witness_filter
-        on witness_filter.event_sequential_id = various_event.event_sequential_id
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      left join participant.par_contracts contract
-        on contract.internal_contract_id = various_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = various_event.package_id
-      where ${partyMatch}
-        and various_event.event_type = 6
-    ) recent_contracts
-    ${afterFilter}
-    order by created_event_offset::numeric ${sortDirection}
+      contract_row.contract_id::text as contract_id,
+      ${contractTemplateIdentifierExpression('contract_tpe_row')} as template_id,
+      contract_row.creation_package_id::text as package_id,
+      ${isoUtcTimestampExpression('tx.effective_at')} as record_time,
+      tx.offset::text as created_event_offset
+    from ${relations.contracts} contract_row
+    join ${relations.contractTpe} contract_tpe_row
+      on contract_tpe_row.pk = contract_row.tpe_pk
+    join ${relations.transactions} tx
+      on tx.ix = contract_row.created_at_ix
+    where ${witnessMatch}
+      ${cursorClause}
+    order by tx.offset ${sortDirection}
     limit ${queryLimit}
   `;
 }
-function singleUpdateQuery(eventOffset) {
+function buildQuotedPartyIdentifiers(partyId) {
+    const trimmed = partyId.trim();
+    if (!trimmed) {
+        return [];
+    }
+    const normalized = trimmed.replace(/^p\|/, '');
+    const identifiers = new Set([trimmed, normalized]);
+    if (normalized) {
+        identifiers.add(`p|${normalized}`);
+    }
+    return Array.from(identifiers).map((identifier) => `'${escapeSqlLiteral(identifier)}'`);
+}
+function partyWitnessArrayMatchCondition(arrayExpression, partyId) {
+    const quotedIdentifiers = buildQuotedPartyIdentifiers(partyId);
+    if (quotedIdentifiers.length === 0) {
+        return 'false';
+    }
+    return `array[${quotedIdentifiers.join(', ')}]::text[] && ${arrayExpression}::text[]`;
+}
+function singleUpdateQuery(node, eventOffset) {
+    const relations = pqsCoreRelations(node);
     const quotedOffset = `'${escapeSqlLiteral(eventOffset)}'`;
     return `
     select
-      update_meta.update_id::text as update_id,
-      update_meta.event_offset::text as event_offset,
-      to_char(
-        to_timestamp(update_meta.record_time / 1000000.0) at time zone 'UTC',
-        'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-      ) as record_time_iso,
-      to_jsonb(update_meta) as meta
-    from participant.lapi_update_meta update_meta
-    where update_meta.event_offset::text = ${quotedOffset}
-    order by update_meta.record_time desc
+      tx.transaction_id::text as update_id,
+      tx.offset::text as event_offset,
+      ${isoUtcTimestampExpression('tx.effective_at')} as record_time_iso,
+      jsonb_build_object(
+        'update_id', tx.transaction_id::text,
+        'event_offset', tx.offset::text,
+        'record_time', ${isoUtcTimestampExpression('tx.effective_at')}
+      ) as meta
+    from ${relations.transactions} tx
+    where tx.offset::text = ${quotedOffset}
+    order by tx.offset desc
     limit 1
   `;
 }
-function updateEventsQuery(updateId) {
+function updateEventsQuery(node, updateId) {
+    const relations = pqsCoreRelations(node);
     const quotedId = `'${escapeSqlLiteral(updateId)}'`;
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
+    const exerciseTemplateId = contractTemplateIdentifierExpression('exercise_contract_tpe_row');
     return `
     select
       event_kind,
@@ -1187,393 +876,149 @@ function updateEventsQuery(updateId) {
     from (
       select
         'create'::text as event_kind,
-        create_event.event_id::text as event_id,
-        create_event.contract_id::text as contract_id,
-        create_event.template_id::text as template_id,
-        null::text as package_id,
-        null::text as choice,
-        create_event.tree_event_witnesses as witnesses,
-        null::bytea as contract_instance,
-        null::bytea as exercise_argument,
-        null::bytea as exercise_result,
-        to_jsonb(create_event) as raw
-      from participant.lapi_events_create create_event
-      where create_event.update_id::text = ${quotedId}
-
-      union all
-
-      select
-        'consuming_exercise'::text as event_kind,
-        exercise_event.event_id::text as event_id,
-        exercise_event.contract_id::text as contract_id,
-        exercise_event.template_id::text as template_id,
-        null::text as package_id,
-        exercise_event.choice::text as choice,
-        exercise_event.tree_event_witnesses as witnesses,
-        null::bytea as contract_instance,
-        null::bytea as exercise_argument,
-        null::bytea as exercise_result,
-        to_jsonb(exercise_event) as raw
-      from participant.lapi_events_consuming_exercise exercise_event
-      where exercise_event.update_id::text = ${quotedId}
-
-      union all
-
-      select
-        'non_consuming_exercise'::text as event_kind,
-        exercise_event.event_id::text as event_id,
-        exercise_event.contract_id::text as contract_id,
-        exercise_event.template_id::text as template_id,
-        null::text as package_id,
-        exercise_event.choice::text as choice,
-        exercise_event.tree_event_witnesses as witnesses,
-        null::bytea as contract_instance,
-        null::bytea as exercise_argument,
-        null::bytea as exercise_result,
-        to_jsonb(exercise_event) as raw
-      from participant.lapi_events_non_consuming_exercise exercise_event
-      where exercise_event.update_id::text = ${quotedId}
-    ) update_events
-    order by event_id asc, event_kind asc, contract_id asc, template_id asc
-  `;
-}
-function normalizedUpdateEventsQuery(updateId) {
-    const quotedId = `'${escapeSqlLiteral(normalizeByteaHex(updateId))}'`;
-    return `
-    with activate_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_activate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    deactivate_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_deactivate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    various_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_various_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    )
-    select
-      event_kind,
-      event_id,
-      contract_id,
-      template_id,
-      package_id,
-      choice,
-      witnesses,
-      contract_instance,
-      exercise_argument,
-      exercise_result,
-      raw
-    from (
-      select
-        'create'::text as event_kind,
-        '#0:' || activate_event.node_id::text as event_id,
-        encode(contract.contract_id, 'hex') as contract_id,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
-        null::text as choice,
-        coalesce(activate_witnesses.witnesses, array[]::text[]) as witnesses,
-        contract.instance as contract_instance,
-        null::bytea as exercise_argument,
-        null::bytea as exercise_result,
-        jsonb_build_object(
-          'source_table', 'participant.lapi_events_activate_contract',
-          'update_id', encode(activate_event.update_id, 'hex'),
-          'event_offset', activate_event.event_offset,
-          'event_type', activate_event.event_type,
-          'event_sequential_id', activate_event.event_sequential_id,
-          'node_id', activate_event.node_id,
-          'contract_id', encode(contract.contract_id, 'hex'),
-          'template_id', contract.template_id,
-          'package_id', package_string.external_string
-        ) as raw,
-        activate_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_activate_contract activate_event
-      left join participant.par_contracts contract
-        on contract.internal_contract_id = activate_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = activate_event.representative_package_id
-      left join activate_witnesses
-        on activate_witnesses.event_sequential_id = activate_event.event_sequential_id
-      where encode(activate_event.update_id, 'hex') = ${quotedId}
-
-      union all
-
-      select
-        'create'::text as event_kind,
-        '#0:' || various_event.node_id::text as event_id,
-        encode(contract.contract_id, 'hex') as contract_id,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
+        event_row.event_id::text as event_id,
+        contract_row.contract_id::text as contract_id,
+        ${contractTemplateId} as template_id,
+        coalesce(contract_row.creation_package_id, package_row.id)::text as package_id,
         null::text as choice,
-        coalesce(various_witnesses.witnesses, array[]::text[]) as witnesses,
-        contract.instance as contract_instance,
-        null::bytea as exercise_argument,
-        null::bytea as exercise_result,
-        jsonb_build_object(
-          'source_table', 'participant.lapi_events_various_witnessed',
-          'update_id', encode(various_event.update_id, 'hex'),
-          'event_offset', various_event.event_offset,
-          'event_type', various_event.event_type,
-          'event_sequential_id', various_event.event_sequential_id,
-          'node_id', various_event.node_id,
-          'contract_id', encode(contract.contract_id, 'hex'),
-          'template_id', contract.template_id,
-          'package_id', package_string.external_string
-        ) as raw,
-        various_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_various_witnessed various_event
-      left join participant.par_contracts contract
-        on contract.internal_contract_id = various_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = various_event.package_id
-      left join various_witnesses
-        on various_witnesses.event_sequential_id = various_event.event_sequential_id
-      where encode(various_event.update_id, 'hex') = ${quotedId}
-        and various_event.event_type = 6
-
-      union all
-
-      select
-        'consuming_exercise'::text as event_kind,
-        '#0:' || deactivate_event.node_id::text as event_id,
-        encode(deactivate_event.contract_id, 'hex') as contract_id,
-        template_string.external_string as template_id,
-        package_string.external_string as package_id,
-        choice_string.external_string as choice,
-        coalesce(deactivate_witnesses.witnesses, array[]::text[]) as witnesses,
-        null::bytea as contract_instance,
-        deactivate_event.exercise_argument as exercise_argument,
-        deactivate_event.exercise_result as exercise_result,
+        contract_row.witnesses as witnesses,
+        contract_row.payload as contract_instance,
+        null::jsonb as exercise_argument,
+        null::jsonb as exercise_result,
         jsonb_build_object(
-          'source_table', 'participant.lapi_events_deactivate_contract',
-          'update_id', encode(deactivate_event.update_id, 'hex'),
-          'event_offset', deactivate_event.event_offset,
-          'event_type', deactivate_event.event_type,
-          'event_sequential_id', deactivate_event.event_sequential_id,
-          'node_id', deactivate_event.node_id,
-          'contract_id', encode(deactivate_event.contract_id, 'hex'),
-          'template_id', template_string.external_string,
-          'package_id', package_string.external_string,
-          'choice', choice_string.external_string
-        ) as raw,
-        deactivate_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_deactivate_contract deactivate_event
-      left join participant.lapi_string_interning template_string
-        on template_string.internal_id = deactivate_event.template_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = deactivate_event.package_id
-      left join participant.lapi_string_interning choice_string
-        on choice_string.internal_id = deactivate_event.exercise_choice
-      left join deactivate_witnesses
-        on deactivate_witnesses.event_sequential_id = deactivate_event.event_sequential_id
-      where encode(deactivate_event.update_id, 'hex') = ${quotedId}
+          'source_table', '__contracts',
+          'transaction_id', tx.transaction_id::text,
+          'event_offset', tx.offset::text,
+          'event_id', event_row.event_id,
+          'contract_id', contract_row.contract_id,
+          'template_id', ${contractTemplateId}
+        ) as raw
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.created_at_ix = tx.ix
+      left join ${relations.events} event_row
+        on event_row.pk = contract_row.create_event_pk
+      left join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      left join ${relations.packages} package_row
+        on package_row.pk = contract_row.package_pk
+      where tx.transaction_id = ${quotedId}
 
       union all
 
       select
         case
-          when various_event.consuming then 'consuming_exercise'::text
+          when exercise_tpe_row.consuming then 'consuming_exercise'::text
           else 'non_consuming_exercise'::text
         end as event_kind,
-        '#0:' || various_event.node_id::text as event_id,
-        encode(various_event.contract_id, 'hex') as contract_id,
-        template_string.external_string as template_id,
-        package_string.external_string as package_id,
-        choice_string.external_string as choice,
-        coalesce(various_witnesses.witnesses, array[]::text[]) as witnesses,
-        null::bytea as contract_instance,
-        various_event.exercise_argument as exercise_argument,
-        various_event.exercise_result as exercise_result,
+        event_row.event_id::text as event_id,
+        exercise_row.contract_id::text as contract_id,
+        ${exerciseTemplateId} as template_id,
+        package_row.id::text as package_id,
+        exercise_tpe_row.choice::text as choice,
+        exercise_row.witnesses as witnesses,
+        null::jsonb as contract_instance,
+        exercise_row.argument as exercise_argument,
+        exercise_row.result as exercise_result,
         jsonb_build_object(
-          'source_table', 'participant.lapi_events_various_witnessed',
-          'update_id', encode(various_event.update_id, 'hex'),
-          'event_offset', various_event.event_offset,
-          'event_type', various_event.event_type,
-          'event_sequential_id', various_event.event_sequential_id,
-          'node_id', various_event.node_id,
-          'consuming', various_event.consuming,
-          'contract_id', encode(various_event.contract_id, 'hex'),
-          'template_id', template_string.external_string,
-          'package_id', package_string.external_string,
-          'choice', choice_string.external_string
-        ) as raw,
-        various_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_various_witnessed various_event
-      left join participant.lapi_string_interning template_string
-        on template_string.internal_id = various_event.template_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = various_event.package_id
-      left join participant.lapi_string_interning choice_string
-        on choice_string.internal_id = various_event.exercise_choice
-      left join various_witnesses
-        on various_witnesses.event_sequential_id = various_event.event_sequential_id
-      where encode(various_event.update_id, 'hex') = ${quotedId}
-        and various_event.event_type in (5, 7)
+          'source_table', '__exercises',
+          'transaction_id', tx.transaction_id::text,
+          'event_offset', tx.offset::text,
+          'event_id', event_row.event_id,
+          'contract_id', exercise_row.contract_id,
+          'template_id', ${exerciseTemplateId},
+          'choice', exercise_tpe_row.choice
+        ) as raw
+      from ${relations.transactions} tx
+      join ${relations.exercises} exercise_row
+        on exercise_row.exercised_at_ix = tx.ix
+      left join ${relations.events} event_row
+        on event_row.pk = exercise_row.exercise_event_pk
+      left join ${relations.contractTpe} exercise_contract_tpe_row
+        on exercise_contract_tpe_row.pk = exercise_row.contract_tpe_pk
+      left join ${relations.exerciseTpe} exercise_tpe_row
+        on exercise_tpe_row.pk = exercise_row.tpe_pk
+      left join ${relations.packages} package_row
+        on package_row.pk = exercise_row.package_pk
+      where tx.transaction_id = ${quotedId}
     ) update_events
-    order by sort_event_sequential_id asc, event_kind asc
+    order by event_id asc nulls last, event_kind asc, contract_id asc, template_id asc
   `;
 }
-function rewardCouponInstanceQuery(updateId) {
+function rewardCouponInstanceQuery(node, updateId) {
+    const relations = pqsCoreRelations(node);
     const quotedId = `'${escapeSqlLiteral(normalizeByteaHex(updateId))}'`;
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
     return `
     select
       coupon_contract_id,
       contract_instance
     from (
       select
-        encode(contract.contract_id, 'hex') as coupon_contract_id,
-        contract.instance as contract_instance,
-        activate_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_activate_contract activate_event
-      join participant.par_contracts contract
-        on contract.internal_contract_id = activate_event.internal_contract_id
-      where encode(activate_event.update_id, 'hex') = ${quotedId}
-        and contract.template_id = 'Splice.Amulet:SvRewardCoupon'
-
-      union all
-
-      select
-        encode(contract.contract_id, 'hex') as coupon_contract_id,
-        contract.instance as contract_instance,
-        various_event.event_sequential_id as sort_event_sequential_id
-      from participant.lapi_events_various_witnessed various_event
-      join participant.par_contracts contract
-        on contract.internal_contract_id = various_event.internal_contract_id
-      where encode(various_event.update_id, 'hex') = ${quotedId}
-        and various_event.event_type = 6
-        and contract.template_id = 'Splice.Amulet:SvRewardCoupon'
+        contract_row.contract_id::text as coupon_contract_id,
+        contract_row.payload as contract_instance,
+        coalesce(contract_row.create_event_pk, 0) as sort_event_pk
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.created_at_ix = tx.ix
+      join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      where tx.transaction_id = ${quotedId}
+        and ${contractTemplateId} = 'Splice.Amulet:SvRewardCoupon'
     ) reward_coupon_events
-    order by sort_event_sequential_id desc
+    order by sort_event_pk desc
     limit 1
   `;
 }
-function contractDetailQuery(contractId) {
+function contractDetailQuery(node, contractId) {
+    const relations = pqsCoreRelations(node);
     const quotedId = `'${escapeSqlLiteral(normalizeByteaHex(contractId))}'`;
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
     return `
-    with contract_row as (
+    with selected_contract as (
       select
-        internal_contract_id,
-        encode(contract_id, 'hex') as contract_id,
-        package_id,
-        template_id,
-        instance
-      from participant.par_contracts
-      where encode(contract_id, 'hex') = ${quotedId}
+        contract_row.contract_id::text as contract_id,
+        ${contractTemplateId} as template_id,
+        coalesce(contract_row.creation_package_id, package_row.id)::text as package_id,
+        contract_row.payload as contract_instance,
+        contract_row.created_at_ix,
+        contract_row.archived_at_ix
+      from ${relations.contracts} contract_row
+      left join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      left join ${relations.packages} package_row
+        on package_row.pk = contract_row.package_pk
+      where contract_row.contract_id = ${quotedId}
       limit 1
-    ),
-    create_events as (
-      select
-        encode(activate_event.update_id, 'hex') as update_id,
-        activate_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        activate_event.event_sequential_id
-      from participant.lapi_events_activate_contract activate_event
-      join contract_row contract_row
-        on contract_row.internal_contract_id = activate_event.internal_contract_id
-
-      union all
-
-      select
-        encode(various_event.update_id, 'hex') as update_id,
-        various_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        various_event.event_sequential_id
-      from participant.lapi_events_various_witnessed various_event
-      join contract_row contract_row
-        on contract_row.internal_contract_id = various_event.internal_contract_id
-      where various_event.event_type = 6
-    ),
-    archive_events as (
-      select
-        encode(deactivate_event.update_id, 'hex') as update_id,
-        deactivate_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(deactivate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        deactivate_event.event_sequential_id
-      from participant.lapi_events_deactivate_contract deactivate_event
-      join contract_row contract_row
-        on contract_row.internal_contract_id = deactivate_event.internal_contract_id
-
-      union all
-
-      select
-        encode(various_event.update_id, 'hex') as update_id,
-        various_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        various_event.event_sequential_id
-      from participant.lapi_events_various_witnessed various_event
-      join contract_row contract_row
-        on contract_row.internal_contract_id = various_event.internal_contract_id
-      where various_event.event_type in (5, 7)
-        and various_event.consuming
     )
     select
       contract_row.contract_id,
       contract_row.template_id,
       contract_row.package_id,
-      contract_row.instance as contract_instance,
-      created_event.update_id as created_update_id,
-      created_event.event_offset as created_event_offset,
-      created_event.record_time as created_record_time,
-      archived_event.update_id as archived_update_id,
-      archived_event.event_offset as archived_event_offset,
-      archived_event.record_time as archived_record_time
-    from contract_row
-    left join lateral (
-      select
-        update_id,
-        event_offset,
-        record_time
-      from create_events
-      order by event_sequential_id asc
-      limit 1
-    ) created_event on true
-    left join lateral (
-      select
-        update_id,
-        event_offset,
-        record_time
-      from archive_events
-      order by event_sequential_id asc
-      limit 1
-    ) archived_event on true
+      contract_row.contract_instance,
+      created_tx.transaction_id::text as created_update_id,
+      created_tx.offset::text as created_event_offset,
+      ${isoUtcTimestampExpression('created_tx.effective_at')} as created_record_time,
+      archived_tx.transaction_id::text as archived_update_id,
+      archived_tx.offset::text as archived_event_offset,
+      ${isoUtcTimestampExpression('archived_tx.effective_at')} as archived_record_time
+    from selected_contract contract_row
+    left join ${relations.transactions} created_tx
+      on created_tx.ix = contract_row.created_at_ix
+    left join ${relations.transactions} archived_tx
+      on archived_tx.ix = contract_row.archived_at_ix
   `;
 }
-function tokenRowsQuery(limit, templateIds, templatePatterns = []) {
+function tokenRowsQuery(node, limit, templateIds, templatePatterns = []) {
+    const relations = pqsCoreRelations(node);
     const normalizedLimit = Number.isFinite(limit) && Number(limit) > 0 ? Math.trunc(limit) : TOKEN_TRANSFER_CACHE_LIMIT;
     const quotedTemplateIds = templateIds
         .map((templateId) => `'${escapeSqlLiteral(templateId)}'`)
         .join(',\n        ');
-    const patternClauses = templatePatterns.map((pattern) => `contract.template_id::text like '${escapeSqlLiteral(pattern)}'`);
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
+    const patternClauses = templatePatterns.map((pattern) => `${contractTemplateId} like '${escapeSqlLiteral(pattern)}'`);
     const templateFilterClause = [
-        quotedTemplateIds ? `contract.template_id in (\n        ${quotedTemplateIds}\n      )` : null,
+        quotedTemplateIds ? `${contractTemplateId} in (\n        ${quotedTemplateIds}\n      )` : null,
         ...patternClauses,
     ]
         .filter((clause) => clause !== null)
@@ -1589,100 +1034,70 @@ function tokenRowsQuery(limit, templateIds, templatePatterns = []) {
       contract_instance
     from (
       select
-        encode(contract.contract_id, 'hex') as contract_id,
-        encode(activate_event.update_id, 'hex') as update_id,
-        activate_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
-        contract.instance as contract_instance
-      from participant.lapi_events_activate_contract activate_event
-      join participant.par_contracts contract
-        on contract.internal_contract_id = activate_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = activate_event.representative_package_id
+        contract_row.contract_id::text as contract_id,
+        tx.transaction_id::text as update_id,
+        tx.offset::text as event_offset,
+        ${isoUtcTimestampExpression('tx.effective_at')} as record_time,
+        ${contractTemplateId} as template_id,
+        coalesce(contract_row.creation_package_id, package_row.id)::text as package_id,
+        contract_row.payload as contract_instance
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.created_at_ix = tx.ix
+      join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      left join ${relations.packages} package_row
+        on package_row.pk = contract_row.package_pk
       where ${templateFilterClause}
-
-      union all
-
-      select
-        encode(contract.contract_id, 'hex') as contract_id,
-        encode(various_event.update_id, 'hex') as update_id,
-        various_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time,
-        contract.template_id::text as template_id,
-        package_string.external_string as package_id,
-        contract.instance as contract_instance
-      from participant.lapi_events_various_witnessed various_event
-      join participant.par_contracts contract
-        on contract.internal_contract_id = various_event.internal_contract_id
-      left join participant.lapi_string_interning package_string
-        on package_string.internal_id = various_event.package_id
-      where various_event.event_type = 6
-        and (${templateFilterClause})
     ) token_transfer_rows
     order by event_offset::numeric desc
     limit ${normalizedLimit}
   `;
 }
-function recentCip112MovementUpdateIdsQuery(limit) {
+function recentCip112MovementUpdateIdsQuery(node, limit) {
+    const relations = pqsCoreRelations(node);
     const normalizedLimit = Number.isFinite(limit) && Number(limit) > 0 ? Math.trunc(limit) : TOKEN_TRANSFER_CACHE_LIMIT;
+    const contractTemplateId = contractTemplateIdentifierExpression('contract_tpe_row');
+    const exerciseTemplateId = contractTemplateIdentifierExpression('exercise_contract_tpe_row');
     return `
     /* cip112_movement_update_ids */
     with relevant_updates as (
       select
-        encode(activate_event.update_id, 'hex') as update_id,
-        activate_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time
-      from participant.lapi_events_activate_contract activate_event
-      join participant.par_contracts contract
-        on contract.internal_contract_id = activate_event.internal_contract_id
-      where contract.template_id::text like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
+        tx.transaction_id::text as update_id,
+        tx.offset::text as event_offset,
+        ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.created_at_ix = tx.ix
+      join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      where ${contractTemplateId} like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
 
       union all
 
       select
-        encode(deactivate_event.update_id, 'hex') as update_id,
-        deactivate_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(deactivate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time
-      from participant.lapi_events_deactivate_contract deactivate_event
-      left join participant.lapi_string_interning template_string
-        on template_string.internal_id = deactivate_event.template_id
-      where template_string.external_string like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
+        tx.transaction_id::text as update_id,
+        tx.offset::text as event_offset,
+        ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+      from ${relations.transactions} tx
+      join ${relations.contracts} contract_row
+        on contract_row.archived_at_ix = tx.ix
+      join ${relations.contractTpe} contract_tpe_row
+        on contract_tpe_row.pk = contract_row.tpe_pk
+      where ${contractTemplateId} like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
 
       union all
 
       select
-        encode(various_event.update_id, 'hex') as update_id,
-        various_event.event_offset::text as event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as record_time
-      from participant.lapi_events_various_witnessed various_event
-      left join participant.par_contracts contract
-        on contract.internal_contract_id = various_event.internal_contract_id
-      left join participant.lapi_string_interning template_string
-        on template_string.internal_id = various_event.template_id
-      where (
-        various_event.event_type = 6
-        and contract.template_id::text like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
-      ) or (
-        various_event.event_type in (5, 7)
-        and template_string.external_string like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
-      )
+        tx.transaction_id::text as update_id,
+        tx.offset::text as event_offset,
+        ${isoUtcTimestampExpression('tx.effective_at')} as record_time
+      from ${relations.transactions} tx
+      join ${relations.exercises} exercise_row
+        on exercise_row.exercised_at_ix = tx.ix
+      join ${relations.contractTpe} exercise_contract_tpe_row
+        on exercise_contract_tpe_row.pk = exercise_row.contract_tpe_pk
+      where ${exerciseTemplateId} like '${escapeSqlLiteral(CIP112_TEMPLATE_ID_LIKE_PATTERN)}'
     )
     select
       update_id,
@@ -1694,203 +1109,6 @@ function recentCip112MovementUpdateIdsQuery(limit) {
     limit ${normalizedLimit}
   `;
 }
-function buildActiveContractsFilterClause(parties, templates, partyMode, hideSplice) {
-    const partyConditions = normalizePartyFilters(parties).map((party) => partyWitnessArrayMatchCondition('create_events.witnesses', party));
-    const templateExpression = "regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '')";
-    const templateConditions = normalizeTemplateFilters(templates).map((templateId) => {
-        const quotedTemplateId = `'${escapeSqlLiteral(templateId)}'`;
-        return `${templateExpression} = ${quotedTemplateId}`;
-    });
-    const groups = [];
-    if (partyConditions.length > 0) {
-        const partyJoiner = normalizePartyFilterMode(partyMode) === 'and' ? '\n      and ' : '\n      or ';
-        groups.push(partyConditions.length === 1
-            ? partyConditions[0]
-            : `(\n      ${partyConditions.join(partyJoiner)}\n    )`);
-    }
-    if (templateConditions.length > 0) {
-        groups.push(templateConditions.length === 1
-            ? templateConditions[0]
-            : `(\n      ${templateConditions.join('\n      or ')}\n    )`);
-    }
-    if (hideSplice) {
-        groups.push(`${templateExpression} not like 'Splice.%'`);
-    }
-    if (groups.length === 0) {
-        return null;
-    }
-    return groups.length === 1 ? groups[0] : `(\n      ${groups.join('\n      and ')}\n    )`;
-}
-function activeContractsQuery(limit, before, after, parties, templates, partyMode, hideSplice) {
-    const normalizedBefore = normalizeEventOffsetCursor(before);
-    const normalizedAfter = normalizeEventOffsetCursor(after);
-    const queryLimit = limit + 1;
-    const useAfterCursor = Boolean(normalizedAfter && !normalizedBefore);
-    const cursorFilter = useAfterCursor
-        ? `create_event_offset::numeric > ${normalizedAfter}`
-        : normalizedBefore
-            ? `create_event_offset::numeric < ${normalizedBefore}`
-            : null;
-    const orderDirection = useAfterCursor ? 'asc' : 'desc';
-    const filterClause = buildActiveContractsFilterClause(parties, templates, partyMode, hideSplice);
-    const whereConditions = [
-        `not exists (
-      select 1
-      from archived_contracts archived_contract
-      where archived_contract.internal_contract_id = create_events.internal_contract_id
-    )`,
-        cursorFilter,
-        filterClause,
-    ].filter((value) => Boolean(value));
-    const whereClause = whereConditions.length > 0 ? `where ${whereConditions.join('\n      and ')}` : '';
-    return `
-    with activate_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_activate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    various_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_various_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    create_events as (
-      select
-        activate_event.internal_contract_id,
-        activate_event.event_offset::text as create_event_offset,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as created_record_time,
-        coalesce(activate_witnesses.witnesses, array[]::text[]) as witnesses
-      from participant.lapi_events_activate_contract activate_event
-      left join activate_witnesses
-        on activate_witnesses.event_sequential_id = activate_event.event_sequential_id
-
-      union all
-
-      select
-        various_event.internal_contract_id,
-        various_event.event_offset::text as create_event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as created_record_time,
-        coalesce(various_witnesses.witnesses, array[]::text[]) as witnesses
-      from participant.lapi_events_various_witnessed various_event
-      left join various_witnesses
-        on various_witnesses.event_sequential_id = various_event.event_sequential_id
-      where various_event.event_type = 6
-    ),
-    archived_contracts as (
-      select distinct deactivate_event.internal_contract_id
-      from participant.lapi_events_deactivate_contract deactivate_event
-
-      union
-
-      select distinct various_event.internal_contract_id
-      from participant.lapi_events_various_witnessed various_event
-      where various_event.event_type in (5, 7)
-        and various_event.consuming
-    )
-    select
-      encode(contract.contract_id, 'hex') as contract_id,
-      regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id,
-      create_events.created_record_time,
-      create_events.create_event_offset as created_event_offset
-    from create_events
-    join participant.par_contracts contract
-      on contract.internal_contract_id = create_events.internal_contract_id
-    ${whereClause}
-    order by create_event_offset::numeric ${orderDirection}
-    limit ${queryLimit}
-  `;
-}
-function searchContractsQuery(searchQuery, limit) {
-    const quotedQuery = escapeSqlLiteral(searchQuery);
-    return `
-    with activate_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_activate_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    various_witnesses as (
-      select
-        witness_filter.event_sequential_id,
-        array_agg(distinct party_string.external_string order by party_string.external_string) as witnesses
-      from participant.lapi_filter_various_witness witness_filter
-      join participant.lapi_string_interning party_string
-        on party_string.internal_id = witness_filter.party_id
-      group by witness_filter.event_sequential_id
-    ),
-    create_events as (
-      select
-        activate_event.internal_contract_id,
-        activate_event.event_offset::text as create_event_offset,
-        to_char(
-          to_timestamp(activate_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as created_record_time,
-        coalesce(activate_witnesses.witnesses, array[]::text[]) as witnesses
-      from participant.lapi_events_activate_contract activate_event
-      left join activate_witnesses
-        on activate_witnesses.event_sequential_id = activate_event.event_sequential_id
-
-      union all
-
-      select
-        various_event.internal_contract_id,
-        various_event.event_offset::text as create_event_offset,
-        to_char(
-          to_timestamp(various_event.record_time / 1000000.0) at time zone 'UTC',
-          'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
-        ) as created_record_time,
-        coalesce(various_witnesses.witnesses, array[]::text[]) as witnesses
-      from participant.lapi_events_various_witnessed various_event
-      left join various_witnesses
-        on various_witnesses.event_sequential_id = various_event.event_sequential_id
-      where various_event.event_type = 6
-    ),
-    archived_contracts as (
-      select distinct deactivate_event.internal_contract_id
-      from participant.lapi_events_deactivate_contract deactivate_event
-
-      union
-
-      select distinct various_event.internal_contract_id
-      from participant.lapi_events_various_witnessed various_event
-      where various_event.event_type in (5, 7)
-        and various_event.consuming
-    )
-    select
-      encode(contract.contract_id, 'hex') as contract_id,
-      regexp_replace(coalesce(contract.template_id::text, ''), '^t\\\\|#[^:]+:', '') as template_id,
-      create_events.created_record_time
-    from create_events
-    join participant.par_contracts contract
-      on contract.internal_contract_id = create_events.internal_contract_id
-    where encode(contract.contract_id, 'hex') like '${quotedQuery}%'
-      and not exists (
-        select 1
-        from archived_contracts archived_contract
-        where archived_contract.internal_contract_id = create_events.internal_contract_id
-      )
-    order by create_events.created_record_time desc nulls last, contract_id asc
-    limit ${limit}
-  `;
-}
 function escapeSqlLiteral(value) {
     return value.replaceAll("'", "''");
 }
@@ -1929,7 +1147,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchSummary(node) {
         const client = this.clientFactory.getClient(node);
-        const result = await this.querySummary(client.query.bind(client));
+        const result = await client.query(summaryQuery(node));
         const row = result.rows[0] ?? this.defaultRow();
         return {
             ledgerLabel: node.ledgerLabel ?? node.label,
@@ -1984,7 +1202,7 @@ let PqsSummaryService = class PqsSummaryService {
         const hideSplice = typeof options === 'object' ? options.hideSplice === true : false;
         const useAfterCursor = Boolean(after && !before);
         const query = client.query.bind(client);
-        const rawMetaRows = await this.queryRecentUpdateMetaRows(query, normalizedLimit, before, after, parties, templates, partyMode, hideSplice);
+        const rawMetaRows = await this.queryRecentUpdateMetaRows(node, query, normalizedLimit, before, after, parties, templates, partyMode, hideSplice);
         const hasMoreInQuery = rawMetaRows.length > normalizedLimit;
         const trimmedMetaRows = rawMetaRows.slice(0, normalizedLimit);
         const orderedUpdates = (useAfterCursor ? [...trimmedMetaRows].reverse() : trimmedMetaRows).map((row) => ({
@@ -2003,7 +1221,7 @@ let PqsSummaryService = class PqsSummaryService {
                 updates: [],
             };
         }
-        const partiesByUpdateId = await this.fetchPartiesByUpdateId(query, orderedUpdates.map((update) => update.rawUpdateId));
+        const partiesByUpdateId = await this.fetchPartiesByUpdateId(node, query, orderedUpdates.map((update) => update.rawUpdateId));
         return {
             nodeId: node.id,
             label: node.label,
@@ -2171,7 +1389,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async searchUpdatesForNode(node, query, limit) {
         const client = this.clientFactory.getClient(node);
-        const rows = await this.querySearchUpdateMetaRows(client.query.bind(client), query, limit);
+        const rows = await this.querySearchUpdateMetaRows(node, client.query.bind(client), query, limit);
         const dedupedRows = new Map();
         for (const row of rows) {
             const eventOffset = this.extractEventOffset(row);
@@ -2182,7 +1400,7 @@ let PqsSummaryService = class PqsSummaryService {
         const rawRows = Array.from(dedupedRows.values());
         const rawUpdateIds = rawRows.map((row) => row.update_id);
         const partiesByUpdateId = rawUpdateIds.length > 0
-            ? await this.fetchPartiesByUpdateId(client.query.bind(client), rawUpdateIds)
+            ? await this.fetchPartiesByUpdateId(node, client.query.bind(client), rawUpdateIds)
             : new Map();
         return rawRows
             .map((row) => {
@@ -2230,7 +1448,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async searchContractsForNode(node, query, limit) {
         const client = this.clientFactory.getClient(node);
-        const result = await client.query(searchContractsQuery(query, limit));
+        const result = await client.query(pqsSearchContractsQuery(node, query, limit));
         const rows = result.rows ?? [];
         return rows
             .filter((row) => this.hasPrefixMatch(query, [row.contract_id]))
@@ -2331,31 +1549,13 @@ let PqsSummaryService = class PqsSummaryService {
             }),
         };
     }
-    async querySearchUpdateMetaRows(queryFn, searchQuery, limit) {
-        try {
-            const result = await queryFn(searchUpdatesQuery(searchQuery, limit));
-            return result.rows ?? [];
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-        }
-        const fallbackResult = await queryFn(normalizedSearchUpdatesQuery(searchQuery, limit));
-        return fallbackResult.rows ?? [];
+    async querySearchUpdateMetaRows(node, queryFn, searchQuery, limit) {
+        const result = await queryFn(pqsSearchUpdatesQuery(node, searchQuery, limit));
+        return result.rows ?? [];
     }
-    async queryRecentUpdateMetaRows(query, limit, before, after, parties, templates, mode, hideSplice) {
-        try {
-            const result = await query(recentUpdatesQuery(limit, before, after, parties, templates, mode, hideSplice));
-            return result.rows ?? [];
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-        }
-        const fallbackResult = await query(normalizedRecentUpdatesQuery(limit, before, after, parties, templates, mode, hideSplice));
-        return fallbackResult.rows ?? [];
+    async queryRecentUpdateMetaRows(node, query, limit, before, after, parties, templates, mode, hideSplice) {
+        const result = await query(pqsRecentUpdatesQuery(node, limit, before, after, parties, templates, mode, hideSplice));
+        return result.rows ?? [];
     }
     async fetchNodeContracts(node, options) {
         const client = this.clientFactory.getClient(node);
@@ -2369,7 +1569,7 @@ let PqsSummaryService = class PqsSummaryService {
         const partyMode = options?.partyMode;
         const hideSplice = options?.hideSplice === true;
         const useAfterCursor = Boolean(after && !before);
-        const result = await client.query(activeContractsQuery(normalizedLimit, before, after, parties, templates, partyMode, hideSplice));
+        const result = await client.query(pqsActiveContractsQuery(node, normalizedLimit, before, after, parties, templates, partyMode, hideSplice));
         const rawRows = result.rows ?? [];
         const hasMoreInQuery = rawRows.length > normalizedLimit;
         const trimmedRows = rawRows.slice(0, normalizedLimit);
@@ -2404,7 +1604,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchActivityBuckets(node, days = 30, bucketMinutes = 15) {
         const client = this.clientFactory.getClient(node);
-        const result = await client.query(activityBucketsQuery(days, bucketMinutes));
+        const result = await client.query(pqsActivityBucketsQuery(node, days, bucketMinutes));
         const rows = result.rows ?? [];
         return rows
             .filter((row) => typeof row.bucket_timestamp === 'string')
@@ -2435,7 +1635,7 @@ let PqsSummaryService = class PqsSummaryService {
                 version: metadata.version,
                 uploadedAt: metadata.uploadedAt,
                 packageSize: metadata.packageSize,
-                status: inspection.reason === 'missing_package' ? 'missing_package' : 'invalid_package',
+                status: inspection.reason === 'missing_package' ? 'not_available' : 'invalid_package',
                 seenOnNodes,
                 moduleCount: 0,
                 templateCount: 0,
@@ -3162,7 +2362,7 @@ let PqsSummaryService = class PqsSummaryService {
             }
             seenContracts.add(dedupeKey);
             const client = this.clientFactory.getClient(node);
-            const contractResult = await client.query(contractDetailQuery(holder.contractId));
+            const contractResult = await client.query(contractDetailQuery(node, holder.contractId));
             const contractRow = contractResult.rows[0];
             if (!contractRow || typeof contractRow.created_update_id !== 'string') {
                 continue;
@@ -3237,7 +2437,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchUpdateDetail(node, eventOffset) {
         const client = this.clientFactory.getClient(node);
-        const detailResult = await client.query(singleUpdateQuery(eventOffset));
+        const detailResult = await client.query(singleUpdateQuery(node, eventOffset));
         const detailRows = detailResult.rows ?? [];
         const detailRow = detailRows[0];
         if (!detailRow) {
@@ -3246,10 +2446,10 @@ let PqsSummaryService = class PqsSummaryService {
         const rawUpdateId = this.extractRawUpdateId(detailRow);
         const matchedEventOffset = this.extractEventOffset(detailRow);
         const canonicalUpdateId = this.normalizeUpdateId(rawUpdateId);
-        const partiesByUpdateId = await this.fetchPartiesByUpdateId(client.query.bind(client), [rawUpdateId]);
+        const partiesByUpdateId = await this.fetchPartiesByUpdateId(node, client.query.bind(client), [rawUpdateId]);
         const events = await this.fetchEventsByUpdateId(node, client.query.bind(client), rawUpdateId);
         const exerciseData = this.shouldResolveRewardCoupon(events)
-            ? await this.fetchRewardCouponDetails(client.query.bind(client), rawUpdateId)
+            ? await this.fetchRewardCouponDetails(node, client.query.bind(client), rawUpdateId)
             : null;
         return {
             nodeId: node.id,
@@ -3264,7 +2464,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchContractDetail(node, contractId) {
         const client = this.clientFactory.getClient(node);
-        const result = await client.query(contractDetailQuery(contractId));
+        const result = await client.query(contractDetailQuery(node, contractId));
         const row = result.rows[0];
         if (!row) {
             throw new Error('Contract not found');
@@ -3289,34 +2489,13 @@ let PqsSummaryService = class PqsSummaryService {
             contractData: await this.decodeContractData(node, packageId, templateId, row.contract_instance),
         };
     }
-    async querySummary(query) {
-        try {
-            return await query(ACTIVE_QUERY);
-        }
-        catch (error) {
-            if (!this.shouldFallbackToParticipantTables(error)) {
-                throw error;
-            }
-        }
-        return query(PARTICIPANT_FALLBACK_QUERY);
-    }
     async fetchPartyRecentUpdatesForNode(node, partyId, limit) {
         const client = this.clientFactory.getClient(node);
-        let rows = [];
-        try {
-            const result = await client.query(partyRecentUpdatesQuery(partyId, limit));
-            rows = result.rows ?? [];
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-            const result = await client.query(normalizedPartyRecentUpdatesQuery(partyId, limit));
-            rows = result.rows ?? [];
-        }
+        const result = await client.query(pqsPartyRecentUpdatesQuery(node, partyId, limit));
+        const rows = result.rows ?? [];
         const rawUpdateIds = rows.map((row) => row.update_id);
         const partiesByUpdateId = rawUpdateIds.length > 0
-            ? await this.fetchPartiesByUpdateId(client.query.bind(client), rawUpdateIds)
+            ? await this.fetchPartiesByUpdateId(node, client.query.bind(client), rawUpdateIds)
             : new Map();
         return rows.map((row) => {
             const updateId = this.normalizeUpdateId(row.update_id);
@@ -3342,18 +2521,8 @@ let PqsSummaryService = class PqsSummaryService {
         const before = options?.before;
         const after = options?.after;
         const useAfterCursor = Boolean(after && !before);
-        let rows = [];
-        try {
-            const result = await client.query(partyRecentContractsQuery(partyId, normalizedLimit, before, after));
-            rows = result.rows ?? [];
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-            const result = await client.query(normalizedPartyRecentContractsQuery(partyId, normalizedLimit, before, after));
-            rows = result.rows ?? [];
-        }
+        const result = await client.query(pqsPartyRecentContractsQuery(node, partyId, normalizedLimit, before, after));
+        const rows = result.rows ?? [];
         const hasMoreInQuery = rows.length > normalizedLimit;
         const trimmedRows = rows.slice(0, normalizedLimit);
         const orderedContracts = (useAfterCursor ? [...trimmedRows].reverse() : trimmedRows)
@@ -3389,58 +2558,24 @@ let PqsSummaryService = class PqsSummaryService {
             contracts: orderedContracts.map(({ createdEventOffset: _, ...contract }) => contract),
         };
     }
-    shouldFallbackToParticipantTables(error) {
-        if (!(error instanceof Error)) {
-            return false;
-        }
-        const code = error.code;
-        return code === '42883' || error.message.includes('function active() does not exist');
-    }
-    shouldFallbackToNormalizedEventTables(error) {
-        if (!(error instanceof Error)) {
-            return false;
-        }
-        const code = error.code;
-        return code === '42P01' || error.message.includes('does not exist');
-    }
     async fetchActivePartiesForNode(node) {
         const client = this.clientFactory.getClient(node);
-        try {
-            const result = await client.query(activePartiesQuery());
-            const row = result.rows[0];
-            return this.normalizeParties(row?.parties ?? null);
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-        }
-        const fallbackResult = await client.query(normalizedActivePartiesQuery());
-        const fallbackRow = fallbackResult.rows[0];
-        return this.normalizeParties(fallbackRow?.parties ?? null);
+        const result = await client.query(pqsActivePartiesQuery(node));
+        const row = result.rows[0];
+        return this.normalizeParties(row?.parties ?? null);
     }
-    async fetchPartiesByUpdateId(query, updateIds) {
+    async fetchPartiesByUpdateId(node, query, updateIds) {
+        if (updateIds.length === 0) {
+            return new Map();
+        }
         try {
-            const result = await query(recentUpdatePartiesQuery(updateIds));
+            const result = await query(pqsRecentUpdatePartiesQuery(node, updateIds));
             const rows = result.rows ?? [];
             return new Map(rows.map((row) => [
                 this.normalizeUpdateId(row.update_id),
                 this.normalizeParties(row.parties),
             ]));
         }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                return new Map();
-            }
-        }
-        try {
-            const fallbackResult = await query(normalizedRecentUpdatePartiesQuery(updateIds));
-            const fallbackRows = fallbackResult.rows ?? [];
-            return new Map(fallbackRows.map((row) => [
-                this.normalizeUpdateId(row.update_id),
-                this.normalizeParties(row.parties),
-            ]));
-        }
         catch {
             return new Map();
         }
@@ -3475,7 +2610,7 @@ let PqsSummaryService = class PqsSummaryService {
     async fetchObservedTokensForNode(node, limit, options) {
         const client = this.clientFactory.getClient(node);
         const includeCip112 = options?.includeCip112 ?? true;
-        const result = await client.query(tokenRowsQuery(limit, includeCip112 ? TOKEN_DISCOVERY_TEMPLATE_IDS : TOKEN_DISCOVERY_NON_CIP112_TEMPLATE_IDS, includeCip112 ? TOKEN_DISCOVERY_TEMPLATE_PATTERNS : TOKEN_DISCOVERY_NON_CIP112_TEMPLATE_PATTERNS));
+        const result = await client.query(tokenRowsQuery(node, limit, includeCip112 ? TOKEN_DISCOVERY_TEMPLATE_IDS : TOKEN_DISCOVERY_NON_CIP112_TEMPLATE_IDS, includeCip112 ? TOKEN_DISCOVERY_TEMPLATE_PATTERNS : TOKEN_DISCOVERY_NON_CIP112_TEMPLATE_PATTERNS));
         const rows = result.rows ?? [];
         const dedupedTokens = new Map();
         for (const row of rows) {
@@ -3558,7 +2693,7 @@ let PqsSummaryService = class PqsSummaryService {
     async fetchTokenHoldersForNode(node, limit, options) {
         const client = this.clientFactory.getClient(node);
         const includeCip112 = options?.includeCip112 ?? true;
-        const result = await client.query(tokenRowsQuery(limit, includeCip112 ? TOKEN_HOLDER_TEMPLATE_IDS : TOKEN_HOLDER_NON_CIP112_TEMPLATE_IDS, includeCip112 ? TOKEN_HOLDER_TEMPLATE_PATTERNS : TOKEN_HOLDER_NON_CIP112_TEMPLATE_PATTERNS));
+        const result = await client.query(tokenRowsQuery(node, limit, includeCip112 ? TOKEN_HOLDER_TEMPLATE_IDS : TOKEN_HOLDER_NON_CIP112_TEMPLATE_IDS, includeCip112 ? TOKEN_HOLDER_TEMPLATE_PATTERNS : TOKEN_HOLDER_NON_CIP112_TEMPLATE_PATTERNS));
         const rows = result.rows ?? [];
         const holders = [];
         for (const row of rows) {
@@ -3620,7 +2755,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchTokenTransfersForNode(node, limit) {
         const client = this.clientFactory.getClient(node);
-        const result = await client.query(tokenRowsQuery(limit, TOKEN_TRANSFER_TEMPLATE_IDS));
+        const result = await client.query(tokenRowsQuery(node, limit, TOKEN_TRANSFER_TEMPLATE_IDS));
         const rows = result.rows ?? [];
         const transfers = [];
         for (const row of rows) {
@@ -3654,7 +2789,7 @@ let PqsSummaryService = class PqsSummaryService {
     }
     async fetchInferredCip112TransfersForNode(node, limit) {
         const client = this.clientFactory.getClient(node);
-        const result = await client.query(recentCip112MovementUpdateIdsQuery(limit));
+        const result = await client.query(recentCip112MovementUpdateIdsQuery(node, limit));
         const rows = result.rows ?? [];
         const transfers = [];
         for (const row of rows) {
@@ -3701,7 +2836,7 @@ let PqsSummaryService = class PqsSummaryService {
                 if (this.isShareLikeCip112Template(event.templateId)) {
                     continue;
                 }
-                const transfer = this.buildInferredCip112Movement(node, update, event, 'Create');
+                const transfer = this.buildInferredCip112Movement(node, update, event, 'Mint');
                 if (transfer) {
                     transfers.push(transfer);
                 }
@@ -3730,7 +2865,7 @@ let PqsSummaryService = class PqsSummaryService {
             tokenId: token.tokenId,
             tokenName: token.name,
             amount: this.readScalarField(record, 'amount'),
-            sender: this.readScalarField(record, 'issuer'),
+            sender: movementType === 'Mint' ? this.readScalarField(record, 'issuer') : null,
             receiver: this.readScalarField(record, 'owner') ?? receiverFallback,
             eventOffset: this.normalizeOptionalScalar(update.event_offset) ?? '',
             updateId: typeof update.update_id === 'string' ? this.normalizeUpdateId(update.update_id) : '',
@@ -4033,31 +3168,21 @@ let PqsSummaryService = class PqsSummaryService {
         };
     }
     async fetchEventsByUpdateId(node, query, rawUpdateId) {
-        try {
-            const result = await query(updateEventsQuery(rawUpdateId));
-            const rows = result.rows ?? [];
-            return Promise.all(rows.map((row) => this.normalizeEventRow(node, row)));
-        }
-        catch (error) {
-            if (!this.shouldFallbackToNormalizedEventTables(error)) {
-                throw error;
-            }
-        }
-        const fallbackResult = await query(normalizedUpdateEventsQuery(rawUpdateId));
-        const rows = fallbackResult.rows ?? [];
+        const result = await query(updateEventsQuery(node, rawUpdateId));
+        const rows = result.rows ?? [];
         return Promise.all(rows.map((row) => this.normalizeEventRow(node, row)));
     }
     shouldResolveRewardCoupon(events) {
         return events.some((event) => event.choice === 'ReceiveSvRewardCoupon');
     }
-    async fetchRewardCouponDetails(query, rawUpdateId) {
+    async fetchRewardCouponDetails(node, query, rawUpdateId) {
         try {
-            const result = await query(rewardCouponInstanceQuery(rawUpdateId));
+            const result = await query(rewardCouponInstanceQuery(node, rawUpdateId));
             const row = result.rows[0];
-            if (!row || !Buffer.isBuffer(row.contract_instance)) {
+            if (!row) {
                 return null;
             }
-            const decoded = this.decodeRewardCouponContractInstance(row.contract_instance);
+            const decoded = await this.decodeContractData(node, null, 'Splice.Amulet:SvRewardCoupon', row.contract_instance);
             if (!decoded || decoded.status !== 'decoded' || !this.isRecordValue(decoded.value)) {
                 return null;
             }
@@ -4195,13 +3320,19 @@ let PqsSummaryService = class PqsSummaryService {
         };
     }
     async decodeContractData(node, packageId, templateId, contractInstance) {
-        if (!Buffer.isBuffer(contractInstance) || !templateId) {
+        if (!templateId || contractInstance === null || contractInstance === undefined) {
             return null;
         }
-        if (templateId === 'Splice.Amulet:SvRewardCoupon') {
+        if (!Buffer.isBuffer(contractInstance)) {
+            const decodedJson = this.decodePqsJsonData(contractInstance);
+            if (decodedJson) {
+                return decodedJson;
+            }
+        }
+        if (templateId === 'Splice.Amulet:SvRewardCoupon' && Buffer.isBuffer(contractInstance)) {
             return this.decodeRewardCouponContractInstance(contractInstance);
         }
-        if (!this.damlValueDecoder) {
+        if (!Buffer.isBuffer(contractInstance) || !this.damlValueDecoder) {
             return null;
         }
         const initialDecode = await this.damlValueDecoder.decodeContractInstance({
@@ -4212,11 +3343,32 @@ let PqsSummaryService = class PqsSummaryService {
         return this.retryContractDecodeAfterPackageRefresh(node, packageId, templateId, contractInstance, initialDecode);
     }
     async decodeExerciseData(node, input) {
+        if (!Buffer.isBuffer(input.exerciseArgument) && !Buffer.isBuffer(input.exerciseResult)) {
+            const argument = this.decodePqsJsonData(input.exerciseArgument);
+            const result = this.decodePqsJsonData(input.exerciseResult);
+            if (argument || result) {
+                return {
+                    argument: argument ?? { status: 'not_available' },
+                    result: result ?? { status: 'not_available' },
+                };
+            }
+        }
         if (!this.damlValueDecoder) {
             return null;
         }
-        const initialDecode = await this.damlValueDecoder.decodeExerciseValue(input);
-        return this.retryExerciseDecodeAfterPackageRefresh(node, input, initialDecode);
+        if ((input.exerciseArgument !== null && input.exerciseArgument !== undefined
+            && !Buffer.isBuffer(input.exerciseArgument))
+            || (input.exerciseResult !== null && input.exerciseResult !== undefined
+                && !Buffer.isBuffer(input.exerciseResult))) {
+            return null;
+        }
+        const decoderInput = {
+            ...input,
+            exerciseArgument: (input.exerciseArgument ?? null),
+            exerciseResult: (input.exerciseResult ?? null),
+        };
+        const initialDecode = await this.damlValueDecoder.decodeExerciseValue(decoderInput);
+        return this.retryExerciseDecodeAfterPackageRefresh(node, decoderInput, initialDecode);
     }
     async retryContractDecodeAfterPackageRefresh(node, packageId, templateId, contractInstance, initialDecode) {
         const reason = initialDecode?.status === 'invalid_data' ? initialDecode.reason : null;
@@ -4327,10 +3479,15 @@ let PqsSummaryService = class PqsSummaryService {
             }
             current = field;
         }
-        if (!current ||
-            typeof current !== 'object' ||
-            !('kind' in current) ||
-            current.kind !== 'text_map') {
+        if (current && this.isRecordValue(current)) {
+            const recordEntry = current.fields.find((candidate) => candidate.label === key)?.value;
+            if (typeof recordEntry === 'string'
+                || typeof recordEntry === 'number'
+                || typeof recordEntry === 'boolean') {
+                return String(recordEntry);
+            }
+        }
+        if (!current || typeof current !== 'object' || !('kind' in current) || current.kind !== 'text_map') {
             return null;
         }
         const entry = current.entries.find((candidate) => candidate.key === key)?.value;
@@ -4348,6 +3505,54 @@ let PqsSummaryService = class PqsSummaryService {
         }
         return null;
     }
+    decodePqsJsonData(value) {
+        const decoded = this.decodePqsJsonValue(value);
+        return decoded === null
+            ? null
+            : {
+                status: 'decoded',
+                value: decoded,
+            };
+    }
+    decodePqsJsonValue(value) {
+        if (value === null || value === undefined) {
+            return null;
+        }
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+            return value;
+        }
+        if (Array.isArray(value)) {
+            return {
+                kind: 'list',
+                items: value
+                    .map((item) => this.decodePqsJsonValue(item))
+                    .filter((item) => item !== null),
+            };
+        }
+        if (!this.isPlainJsonObject(value)) {
+            return null;
+        }
+        const entries = Object.entries(value);
+        if (entries.length === 0) {
+            return { kind: 'unit' };
+        }
+        if (entries.length === 1
+            && entries[0][0] === 'number'
+            && (typeof entries[0][1] === 'string' || typeof entries[0][1] === 'number')) {
+            const numericValue = Number(entries[0][1]);
+            return Number.isFinite(numericValue) ? numericValue : String(entries[0][1]);
+        }
+        return {
+            kind: 'record',
+            fields: entries.map(([label, fieldValue]) => ({
+                label,
+                value: this.decodePqsJsonValue(fieldValue) ?? { kind: 'unit' },
+            })),
+        };
+    }
+    isPlainJsonObject(value) {
+        return typeof value === 'object' && value !== null && !Array.isArray(value);
+    }
     getFirstLengthDelimitedField(message, fieldNumber) {
         return this.parseProtobufFields(message).find((field) => field.fieldNumber === fieldNumber && field.buffer)?.buffer ?? null;
     }