@gzeoneth/gov-tracker 0.4.0 → 0.5.0-alpha.fix-refresh.3fdec9c

package/dist/tracker/bundled-cache.js

@@ -0,0 +1,220 @@
+"use strict";
+/**
+ * Bundled Cache Extraction Utilities
+ *
+ * Type-safe utilities for extracting data from the bundled cache JSON.
+ * These eliminate the need for consumers to parse checkpoint internals.
+ *
+ * @example
+ * ```typescript
+ * import bundledCache from "@gzeoneth/gov-tracker/bundled-cache.json";
+ * import { extractProposals, getWatermarksFromCache } from "@gzeoneth/gov-tracker";
+ *
+ * const proposals = extractProposals(bundledCache);
+ * const watermarks = getWatermarksFromCache(bundledCache);
+ * ```
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractProposals = extractProposals;
+exports.extractTimelockOps = extractTimelockOps;
+exports.extractElections = extractElections;
+exports.getWatermarksFromCache = getWatermarksFromCache;
+exports.extractOperationIds = extractOperationIds;
+exports.extractTimelockLinkFromStages = extractTimelockLinkFromStages;
+exports.getVotingDataFromStages = getVotingDataFromStages;
+const utils_1 = require("../stages/utils");
+const checkpoint_helpers_1 = require("./checkpoint-helpers");
+/**
+ * Extract proposal metadata from bundled cache
+ *
+ * Filters to governor-type checkpoints (excludes elections, timelocks, discovery).
+ *
+ * @example
+ * ```typescript
+ * import bundledCache from "@gzeoneth/gov-tracker/bundled-cache.json";
+ * const proposals = extractProposals(bundledCache);
+ *
+ * for (const p of proposals) {
+ *   console.log(`Proposal ${p.proposalId}: ${p.isComplete ? "done" : "active"}`);
+ * }
+ * ```
+ */
+function extractProposals(cache) {
+    const results = [];
+    for (const [key, checkpoint] of Object.entries(cache)) {
+        if (checkpoint.input.type !== "governor")
+            continue;
+        if ((0, checkpoint_helpers_1.isElectionKey)(key) || (0, checkpoint_helpers_1.isTimelockOpKey)(key) || (0, checkpoint_helpers_1.isDiscoveryKey)(key))
+            continue;
+        const input = checkpoint.input;
+        const parentStages = checkpoint.cachedData?.completedStages ?? [];
+        // Merge linked timelock stages so consumers see the full lifecycle. Under
+        // modular caching the parent stores only the 3 governor stages
+        // (PROPOSAL_CREATED, VOTING_ACTIVE, PROPOSAL_QUEUED) and the timelock
+        // stages live in a separate checkpoint referenced via metadata.timelockOpKey.
+        // Without this merge the list view would freeze at "Queued" forever.
+        const timelockOpKey = checkpoint.metadata?.timelockOpKey;
+        const linkedStages = typeof timelockOpKey === "string"
+            ? (cache[timelockOpKey]?.cachedData?.completedStages ?? [])
+            : [];
+        const stages = linkedStages.length > 0
+            ? (0, utils_1.normalizeTimeline)((0, utils_1.mergeStages)(parentStages, linkedStages))
+            : parentStages;
+        const queuedStage = (0, utils_1.findStage)(stages, "PROPOSAL_QUEUED");
+        const votingStage = (0, utils_1.findStage)(stages, "VOTING_ACTIVE");
+        const timelockLink = extractTimelockLinkFromStages(stages);
+        const votingData = votingStage?.data;
+        const snapshotState = votingData?.proposalState;
+        const currentState = (0, utils_1.deriveProposalState)(stages, snapshotState);
+        results.push({
+            cacheKey: key,
+            proposalId: input.proposalId,
+            governorAddress: input.governorAddress,
+            creationTxHash: input.creationTxHash,
+            stages,
+            isComplete: stages.length > 0 && stages.every((s) => isTerminal(s.status)),
+            timelockLink,
+            currentState,
+            operationId: queuedStage?.data?.operationId,
+        });
+    }
+    return results;
+}
+/**
+ * Extract timelock operation metadata from bundled cache
+ *
+ * Filters to timelock-type checkpoints only.
+ */
+function extractTimelockOps(cache) {
+    const results = [];
+    for (const [key, checkpoint] of Object.entries(cache)) {
+        if (checkpoint.input.type !== "timelock")
+            continue;
+        const input = checkpoint.input;
+        const stages = checkpoint.cachedData?.completedStages ?? [];
+        results.push({
+            cacheKey: key,
+            timelockAddress: input.timelockAddress,
+            operationId: input.operationId,
+            scheduledTxHash: input.scheduledTxHash,
+            stages,
+            isComplete: stages.length > 0 && stages.every((s) => isTerminal(s.status)),
+        });
+    }
+    return results;
+}
+/**
+ * Extract election metadata from bundled cache
+ *
+ * Filters to election-type checkpoints only.
+ */
+function extractElections(cache) {
+    const results = [];
+    for (const [key, checkpoint] of Object.entries(cache)) {
+        if (checkpoint.input.type !== "election")
+            continue;
+        const input = checkpoint.input;
+        const stages = checkpoint.cachedData?.completedStages ?? [];
+        const electionStatus = checkpoint.cachedData?.electionStatus;
+        results.push({
+            cacheKey: key,
+            electionIndex: input.electionIndex,
+            stages,
+            phase: electionStatus?.phase,
+            isComplete: electionStatus?.phase === "COMPLETED",
+        });
+    }
+    return results;
+}
+/**
+ * Get discovery watermarks from bundled cache
+ *
+ * Returns the watermarks stored in the discovery:watermarks checkpoint.
+ *
+ * @example
+ * ```typescript
+ * import bundledCache from "@gzeoneth/gov-tracker/bundled-cache.json";
+ * const watermarks = getWatermarksFromCache(bundledCache);
+ *
+ * if (watermarks) {
+ *   console.log("Core Governor scanned to block:", watermarks.constitutionalGovernor);
+ * }
+ * ```
+ */
+function getWatermarksFromCache(cache) {
+    const checkpoint = cache["discovery:watermarks"];
+    if (!checkpoint)
+        return null;
+    return checkpoint.cachedData?.discoveryWatermarks ?? null;
+}
+/**
+ * Extract all operation IDs from governor checkpoints
+ *
+ * Returns a Map of proposalId -> operationId for all proposals that have
+ * been queued in a timelock.
+ *
+ * @param cache - The bundled cache object to extract from
+ * @returns Map of proposalId to operationId for queued proposals
+ */
+function extractOperationIds(cache) {
+    const result = new Map();
+    for (const [, checkpoint] of Object.entries(cache)) {
+        if (checkpoint.input.type !== "governor")
+            continue;
+        const input = checkpoint.input;
+        const stages = checkpoint.cachedData?.completedStages ?? [];
+        const queuedStage = (0, utils_1.findStage)(stages, "PROPOSAL_QUEUED");
+        const operationId = queuedStage?.data?.operationId;
+        if (operationId) {
+            result.set(input.proposalId, operationId);
+        }
+    }
+    return result;
+}
+/**
+ * Extract TimelockLink from stages array
+ *
+ * Helper to get timelock link data from completed PROPOSAL_QUEUED stage.
+ *
+ * @param stages - Array of tracked stages from a proposal
+ * @returns TimelockLink if PROPOSAL_QUEUED stage is complete, undefined otherwise
+ */
+function extractTimelockLinkFromStages(stages) {
+    const queuedStage = (0, utils_1.findStage)(stages, "PROPOSAL_QUEUED");
+    if (queuedStage?.status !== "COMPLETED" || queuedStage.type !== "PROPOSAL_QUEUED") {
+        return undefined;
+    }
+    const tx = queuedStage.transactions[0];
+    const data = queuedStage.data;
+    const { operationId, timelockAddress } = data;
+    return tx?.hash && operationId && timelockAddress && tx.blockNumber
+        ? { txHash: tx.hash, operationId, timelockAddress, queueBlockNumber: tx.blockNumber }
+        : undefined;
+}
+/**
+ * Get voting data from stages array
+ *
+ * Extracts typed vote counts and proposal state from VOTING_ACTIVE stage.
+ *
+ * @param stages - Array of tracked stages from a proposal
+ * @returns VotingActiveData if VOTING_ACTIVE stage exists, null otherwise
+ *
+ * @example
+ * ```typescript
+ * const votingData = getVotingDataFromStages(result.stages);
+ * if (votingData) {
+ *   console.log(`For: ${votingData.forVotesRaw}, Against: ${votingData.againstVotesRaw}`);
+ * }
+ * ```
+ */
+function getVotingDataFromStages(stages) {
+    const votingStage = (0, utils_1.findStage)(stages, "VOTING_ACTIVE");
+    if (!votingStage || votingStage.type !== "VOTING_ACTIVE") {
+        return null;
+    }
+    return votingStage.data;
+}
+function isTerminal(status) {
+    return status === "COMPLETED" || status === "SKIPPED" || status === "FAILED";
+}
+//# sourceMappingURL=bundled-cache.js.map

package/dist/tracker/bundled-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundled-cache.js","sourceRoot":"","sources":["../../src/tracker/bundled-cache.ts"],"names":[],"mappings":"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"}

package/dist/tracker/checkpoint-helpers.d.ts

@@ -19,7 +19,8 @@ export interface CheckpointMetadata {
 export declare function createCheckpointMetadata(errorCount?: number): CheckpointMetadata;
 /**
  * Increment error count for retry logic
- * Gas errors don't increment the count (transient)
+ * Gas estimation errors don't increment the count (transient)
+ * Uses centralized isGasEstimationError from rpc-utils for consistency
  */
 export declare function incrementErrorCount(currentCount: number, error: Error | string): number;
 /**
@@ -35,6 +36,20 @@ export declare function isCheckpointComplete(checkpoint: TrackingCheckpoint): bo
  * Get the error count from a checkpoint
  */
 export declare function getCheckpointErrorCount(checkpoint: TrackingCheckpoint): number;
+/**
+ * Get the on-chain anchor time for a checkpoint, in Unix **milliseconds**.
+ *
+ * Prefers the immutable timestamp of the checkpoint's first stage (proposal
+ * creation block / timelock schedule block / election creation block) over
+ * the mutable `checkpoint.createdAt`, which `saveModularCheckpoints` refreshes
+ * on every save. Falls back to `createdAt` when no stage timestamp is
+ * available (legacy / partial checkpoints).
+ *
+ * Used by `queryIncompleteCheckpoints` so the `maxAgeDays` gate measures the
+ * age of the underlying governance event, not the age of the last cache
+ * write.
+ */
+export declare function getCheckpointAnchorTime(checkpoint: TrackingCheckpoint): number | null;
 /**
  * Cache key format utilities
  */
@@ -68,6 +83,24 @@ export declare function parseTimelockOpKey(key: string): {
     txHash: string;
     operationId: string;
 } | null;
+/**
+ * Trim checkpoint stages from a specific index for re-tracking.
+ *
+ * Creates a new checkpoint with stages truncated at stageIndex, resetting
+ * the tracking position to allow re-processing from that point.
+ *
+ * @param checkpoint - The checkpoint to trim
+ * @param stageIndex - Index to trim from (0 = keep no stages, 1 = keep first stage, etc.)
+ * @returns New checkpoint with trimmed stages and updated metadata
+ *
+ * @example
+ * ```typescript
+ * // Re-track from PROPOSAL_QUEUED (index 2)
+ * const trimmed = trimFromStage(checkpoint, 2);
+ * const results = await tracker.trackByTxHash(txHash, { checkpoint: trimmed });
+ * ```
+ */
+export declare function trimFromStage(checkpoint: TrackingCheckpoint, stageIndex: number): TrackingCheckpoint;
 /**
  * Compute aggregated stats from loaded checkpoints.
  *

package/dist/tracker/checkpoint-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint-helpers.d.ts","sourceRoot":"","sources":["../../src/tracker/checkpoint-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIjE,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,SAAI,GAAG,kBAAkB,CAK3E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CASvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,SAAS,SAA0B,GAClC,OAAO,CAGT;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAc5E;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAE9E;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAC/C,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,oBAAoB,eAAe,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE5C;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAG9F;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC5C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC1C,aAAa,GAAE,MAAgC,GAC9C,YAAY,CAiEd"}
+{"version":3,"file":"checkpoint-helpers.d.ts","sourceRoot":"","sources":["../../src/tracker/checkpoint-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAKjE,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,SAAI,GAAG,kBAAkB,CAK3E;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAEvF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,SAAS,SAA0B,GAClC,OAAO,CAGT;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAiC5E;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAE9E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,GAAG,IAAI,CASrF;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,cAAc,CAAC;AAC/C,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,oBAAoB,eAAe,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE5C;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI3D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE9E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAG9F;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,MAAM,GACjB,kBAAkB,CAmBpB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC5C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC1C,aAAa,GAAE,MAAgC,GAC9C,YAAY,CAiEd"}

package/dist/tracker/checkpoint-helpers.js

@@ -12,6 +12,7 @@ exports.incrementErrorCount = incrementErrorCount;
 exports.isCheckpointErrored = isCheckpointErrored;
 exports.isCheckpointComplete = isCheckpointComplete;
 exports.getCheckpointErrorCount = getCheckpointErrorCount;
+exports.getCheckpointAnchorTime = getCheckpointAnchorTime;
 exports.electionCacheKey = electionCacheKey;
 exports.txHashCacheKey = txHashCacheKey;
 exports.isElectionKey = isElectionKey;
@@ -21,9 +22,11 @@ exports.parseElectionKey = parseElectionKey;
 exports.timelockOpCacheKey = timelockOpCacheKey;
 exports.isTimelockOpKey = isTimelockOpKey;
 exports.parseTimelockOpKey = parseTimelockOpKey;
+exports.trimFromStage = trimFromStage;
 exports.computeCacheStats = computeCacheStats;
 const utils_1 = require("../stages/utils");
 const constants_1 = require("../constants");
+const rpc_utils_1 = require("../utils/rpc-utils");
 exports.DEFAULT_ERROR_THRESHOLD = 5;
 /**
  * Create standard checkpoint metadata
@@ -36,15 +39,11 @@ function createCheckpointMetadata(errorCount = 0) {
 }
 /**
  * Increment error count for retry logic
- * Gas errors don't increment the count (transient)
+ * Gas estimation errors don't increment the count (transient)
+ * Uses centralized isGasEstimationError from rpc-utils for consistency
  */
 function incrementErrorCount(currentCount, error) {
-    const isGasError = error instanceof Error
-        ? error.message.includes("insufficient funds") ||
-            error.message.includes("gas required exceeds allowance")
-        : typeof error === "string" &&
-            (error.includes("insufficient funds") || error.includes("gas required exceeds allowance"));
-    return isGasError ? currentCount : currentCount + 1;
+    return (0, rpc_utils_1.isGasEstimationError)(error) ? currentCount : currentCount + 1;
 }
 /**
  * Check if checkpoint has too many errors to continue tracking
@@ -67,7 +66,24 @@ function isCheckpointComplete(checkpoint) {
         return false;
     }
     const stages = checkpoint.cachedData?.completedStages ?? [];
-    return stages.length > 0 && (0, utils_1.areAllStagesComplete)(stages);
+    if (stages.length === 0 || !(0, utils_1.areAllStagesComplete)(stages)) {
+        return false;
+    }
+    // Modular parent guard: a governor parent checkpoint stores only parent
+    // stages (PROPOSAL_CREATED, VOTING_ACTIVE, PROPOSAL_QUEUED). If
+    // PROPOSAL_QUEUED is COMPLETED, the proposal was queued successfully —
+    // timelock execution must follow. Unless the checkpoint also carries
+    // timelock stages (legacy combined view), the parent alone is NOT complete;
+    // tracking continues in the linked timelock checkpoint referenced by
+    // `metadata.timelockOpKey`. Without this guard, rebuilders that call
+    // `queryIncompleteCheckpoints` skip queued proposals forever.
+    if (inputType === "governor") {
+        const queuedStage = stages.find((s) => s.type === "PROPOSAL_QUEUED");
+        if (queuedStage?.status === "COMPLETED" && !stages.some((s) => (0, utils_1.isTimelockPathStage)(s.type))) {
+            return false;
+        }
+    }
+    return true;
 }
 /**
  * Get the error count from a checkpoint
@@ -75,6 +91,29 @@ function isCheckpointComplete(checkpoint) {
 function getCheckpointErrorCount(checkpoint) {
     return checkpoint.metadata?.errorCount ?? 0;
 }
+/**
+ * Get the on-chain anchor time for a checkpoint, in Unix **milliseconds**.
+ *
+ * Prefers the immutable timestamp of the checkpoint's first stage (proposal
+ * creation block / timelock schedule block / election creation block) over
+ * the mutable `checkpoint.createdAt`, which `saveModularCheckpoints` refreshes
+ * on every save. Falls back to `createdAt` when no stage timestamp is
+ * available (legacy / partial checkpoints).
+ *
+ * Used by `queryIncompleteCheckpoints` so the `maxAgeDays` gate measures the
+ * age of the underlying governance event, not the age of the last cache
+ * write.
+ */
+function getCheckpointAnchorTime(checkpoint) {
+    const stages = checkpoint.cachedData?.completedStages ?? [];
+    for (const stage of stages) {
+        const tsSec = stage.transactions?.[0]?.timestamp ?? stage.timing?.startedAt;
+        if (typeof tsSec === "number" && tsSec > 0) {
+            return tsSec * 1000;
+        }
+    }
+    return checkpoint.createdAt && checkpoint.createdAt > 0 ? checkpoint.createdAt : null;
+}
 /**
  * Cache key format utilities
  */
@@ -127,6 +166,42 @@ function parseTimelockOpKey(key) {
     const match = key.match(/^tx:([^:]+):op:(.+)$/);
     return match ? { txHash: match[1], operationId: match[2] } : null;
 }
+/**
+ * Trim checkpoint stages from a specific index for re-tracking.
+ *
+ * Creates a new checkpoint with stages truncated at stageIndex, resetting
+ * the tracking position to allow re-processing from that point.
+ *
+ * @param checkpoint - The checkpoint to trim
+ * @param stageIndex - Index to trim from (0 = keep no stages, 1 = keep first stage, etc.)
+ * @returns New checkpoint with trimmed stages and updated metadata
+ *
+ * @example
+ * ```typescript
+ * // Re-track from PROPOSAL_QUEUED (index 2)
+ * const trimmed = trimFromStage(checkpoint, 2);
+ * const results = await tracker.trackByTxHash(txHash, { checkpoint: trimmed });
+ * ```
+ */
+function trimFromStage(checkpoint, stageIndex) {
+    const stages = checkpoint.cachedData?.completedStages ?? [];
+    const trimmedStages = stages.slice(0, stageIndex);
+    const lastStage = trimmedStages[trimmedStages.length - 1];
+    return {
+        ...checkpoint,
+        lastProcessedStage: lastStage?.type ?? null,
+        cachedData: {
+            ...checkpoint.cachedData,
+            completedStages: trimmedStages,
+        },
+        metadata: {
+            ...checkpoint.metadata,
+            errorCount: 0,
+            lastTrackedAt: Date.now(),
+            timelockOpKey: stageIndex <= 2 ? undefined : checkpoint.metadata?.timelockOpKey,
+        },
+    };
+}
 /**
  * Compute aggregated stats from loaded checkpoints.
  *

package/dist/tracker/checkpoint-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkpoint-helpers.js","sourceRoot":"","sources":["../../src/tracker/checkpoint-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"checkpoint-helpers.js","sourceRoot":"","sources":["../../src/tracker/checkpoint-helpers.ts"],"names":[],"mappings":"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"}

package/dist/tracker/discovery.d.ts

@@ -25,6 +25,9 @@ export interface LoadedWatermarks {
  * Load discovery watermarks from cache.
  * Watermarks are stored as a TrackingCheckpoint for unified cache format.
  * Returns empty objects if no watermarks are cached.
+ *
+ * @param cache - Cache adapter to load from, or undefined for no cache
+ * @returns LoadedWatermarks with watermarks and block hashes for reorg detection
  */
 export declare function loadWatermarks(cache: CacheAdapter | undefined): Promise<LoadedWatermarks>;
 /**

package/dist/tracker/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/tracker/discovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAEL,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,kBAAkB,EAGnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,cAAc,yBAAyB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAO/F;AAQD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAClC,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAsDtE;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,UAAU,EAAE,mBAAmB,EAC/B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,YAAY,GAAG,SAAS,GAC9B,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAG/B;AAED;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAGjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,kBAAkB,EAAE,EAC/B,WAAW,EAAE,oBAAoB,EAAE,EACnC,KAAK,EAAE,YAAY,GAAG,SAAS,GAC9B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,cAAc,EAAE,mBAAmB,EACnC,UAAU,GAAE,eAAoB,EAChC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7D,OAAO,CAAC;IACT,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,WAAW,EAAE,oBAAoB,EAAE,CAAC;IACpC,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC,CA4LD"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/tracker/discovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAEL,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,kBAAkB,EAGnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;AAEpD;;;GAGG;AACH,eAAO,MAAM,cAAc,yBAAyB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAO/F;AAQD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,GAClC,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2DtE;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,UAAU,EAAE,mBAAmB,EAC/B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,YAAY,GAAG,SAAS,GAC9B,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAG/B;AAED;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAGjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,kBAAkB,EAAE,EAC/B,WAAW,EAAE,oBAAoB,EAAE,EACnC,KAAK,EAAE,YAAY,GAAG,SAAS,GAC9B,OAAO,CAAC,IAAI,CAAC,CAuDf;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACrC,KAAK,EAAE,YAAY,GAAG,SAAS,EAC/B,cAAc,EAAE,mBAAmB,EACnC,UAAU,GAAE,eAAoB,EAChC,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC7D,OAAO,CAAC;IACT,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,WAAW,EAAE,oBAAoB,EAAE,CAAC;IACpC,UAAU,EAAE,mBAAmB,CAAC;IAChC,MAAM,EAAE,eAAe,CAAC;CACzB,CAAC,CA0MD"}

package/dist/tracker/discovery.js

@@ -29,6 +29,9 @@ exports.WATERMARKS_KEY = "discovery:watermarks";
  * Load discovery watermarks from cache.
  * Watermarks are stored as a TrackingCheckpoint for unified cache format.
  * Returns empty objects if no watermarks are cached.
+ *
+ * @param cache - Cache adapter to load from, or undefined for no cache
+ * @returns LoadedWatermarks with watermarks and block hashes for reorg detection
  */
 async function loadWatermarks(cache) {
     if (!cache)
@@ -67,11 +70,16 @@ async function verifyWatermark(key, blockNumber, expectedHash, provider) {
                 logDiscovery("%s: no stored hash, establishing hash at block %d", key, blockNumber);
                 return { blockNumber, isValid: true, newHash: block.hash };
             }
+            // Block not found - could indicate reorg or future block
+            logDiscovery("%s: block %d not found when establishing hash", key, blockNumber);
         }
-        catch {
-            // Block might not exist yet or provider error - continue without hash
+        catch (error) {
+            logDiscovery("%s: provider error establishing hash at block %d: %s", key, blockNumber, error);
+            // Provider error during hash establishment - return invalid to trigger retry on next cycle
+            return { blockNumber, isValid: false };
         }
-        return { blockNumber, isValid: true };
+        // Block not found but no error - treat as invalid (may be future block or transient issue)
+        return { blockNumber, isValid: false };
     }
     // Verify stored hash against chain
     try {
@@ -177,38 +185,43 @@ async function createPendingCheckpoints(proposals, timelockOps, cache) {
     void timelockOps;
     if (!cache)
         return;
-    let created = 0;
-    let skippedElections = 0;
-    // Create pending checkpoints for proposals (if not already tracked)
-    // Use tx: key format to match trackByTxHash cache keys
-    // Skip election proposals - they use election:* checkpoints
-    for (const p of proposals) {
+    // Filter out election proposals first (they use election:* checkpoints)
+    const governorProposals = proposals.filter((p) => {
         const proposalType = (0, governor_discovery_1.detectProposalType)(p.governorAddress);
-        if ((0, governor_discovery_1.isElectionProposal)(proposalType)) {
-            skippedElections++;
-            continue;
-        }
-        const key = `tx:${p.creationTxHash.toLowerCase()}`;
-        const existing = await cache.get(key);
-        if (existing)
+        return !(0, governor_discovery_1.isElectionProposal)(proposalType);
+    });
+    const skippedElections = proposals.length - governorProposals.length;
+    // Build cache keys and check existing checkpoints in parallel
+    const keys = governorProposals.map((p) => `tx:${p.creationTxHash.toLowerCase()}`);
+    const existingCheckpoints = await Promise.all(keys.map((key) => cache.get(key)));
+    // Create checkpoints only for proposals that don't exist yet
+    const now = Date.now();
+    const toCreate = [];
+    for (let i = 0; i < governorProposals.length; i++) {
+        if (existingCheckpoints[i])
             continue; // Already has a checkpoint
-        const checkpoint = {
-            version: 1,
-            createdAt: Date.now(),
-            input: {
-                type: "governor",
-                governorAddress: p.governorAddress,
-                proposalId: p.proposalId,
-                creationTxHash: p.creationTxHash,
+        const p = governorProposals[i];
+        toCreate.push({
+            key: keys[i],
+            checkpoint: {
+                version: 1,
+                createdAt: now,
+                input: {
+                    type: "governor",
+                    governorAddress: p.governorAddress,
+                    proposalId: p.proposalId,
+                    creationTxHash: p.creationTxHash,
+                },
+                lastProcessedStage: null,
+                lastProcessedBlock: { l1: 0, l2: p.creationBlock },
+                cachedData: {},
+                metadata: { errorCount: 0, lastTrackedAt: 0 },
             },
-            lastProcessedStage: null,
-            lastProcessedBlock: { l1: 0, l2: p.creationBlock },
-            cachedData: {},
-            metadata: { errorCount: 0, lastTrackedAt: 0 }, // lastTrackedAt=0 means never tracked
-        };
-        await cache.set(key, checkpoint);
-        created++;
+        });
     }
+    // Write all new checkpoints in parallel
+    await Promise.all(toCreate.map(({ key, checkpoint }) => cache.set(key, checkpoint)));
+    const created = toCreate.length;
     if (created > 0 || skippedElections > 0) {
         logDiscovery("created pending checkpoints: %d proposals (skipped %d elections)", created, skippedElections);
     }
@@ -262,9 +275,21 @@ async function discoverAll(targets, toBlock, l2Provider, cache, fromWatermarks,
             }
             return { key, blockNumber: result.blockNumber };
         });
-        const verificationResults = await Promise.all(verificationPromises);
-        for (const { key, blockNumber } of verificationResults) {
-            verifiedWatermarks[key] = blockNumber;
+        const verificationResults = await Promise.allSettled(verificationPromises);
+        for (const result of verificationResults) {
+            if (result.status === "fulfilled") {
+                const { key, blockNumber } = result.value;
+                verifiedWatermarks[key] = blockNumber;
+            }
+            else {
+                logDiscovery("Watermark verification failed, using fallback: %s", (0, rpc_utils_1.getErrorMessage)(result.reason));
+            }
+        }
+        // Ensure all active keys have a watermark (fallback for rejected verifications)
+        for (const key of activeKeys) {
+            if (verifiedWatermarks[key] === undefined) {
+                verifiedWatermarks[key] = defaultStartBlock;
+            }
         }
     }
     else {