@gzeoneth/gov-tracker 0.1.2 → 0.2.0-1

package/dist/tracker/cache.js

@@ -0,0 +1,287 @@
+"use strict";
+/**
+ * Cache utilities for tracker state
+ *
+ * Provides cache implementations and utility functions.
+ * All other state management is handled directly in tracker.ts.
+ *
+ * Available cache adapters:
+ * - FileCache: File-based persistence (Node.js only)
+ * - LocalStorageCache: Browser localStorage (web only)
+ * - MemoryCache: In-memory, no persistence (universal)
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryCache = exports.LocalStorageCache = exports.FileCache = void 0;
+exports.txHashCacheKey = txHashCacheKey;
+exports.readCacheStatus = readCacheStatus;
+const fs = __importStar(require("fs"));
+const discovery_1 = require("./discovery");
+/**
+ * File-based cache that persists to JSON file.
+ * Synchronously loads on construction, persists on every write.
+ * Uses a write queue to prevent race conditions from concurrent writes.
+ */
+class FileCache {
+    constructor(path) {
+        this.writeQueue = Promise.resolve();
+        this.path = path;
+        this.cache = this.load();
+    }
+    load() {
+        try {
+            const data = JSON.parse(fs.readFileSync(this.path, "utf8"));
+            return new Map(Object.entries(data));
+        }
+        catch {
+            return new Map();
+        }
+    }
+    persistSync() {
+        const obj = Object.fromEntries(this.cache);
+        fs.writeFileSync(this.path, JSON.stringify(obj, null, 2));
+    }
+    async persist() {
+        // Chain writes to prevent race conditions
+        // Create the write promise that may reject on error
+        const writePromise = this.writeQueue.then(() => {
+            this.persistSync();
+        });
+        // Update the queue with error recovery to prevent getting stuck
+        // This ensures future writes can proceed even if this one fails
+        this.writeQueue = writePromise.catch(() => {
+            // Silently recover the queue - error is propagated via writePromise
+        });
+        // Return the original promise so errors propagate to caller
+        return writePromise;
+    }
+    async get(key) {
+        return this.cache.get(key) ?? null;
+    }
+    async set(key, value) {
+        this.cache.set(key, value);
+        await this.persist();
+    }
+    async delete(key) {
+        this.cache.delete(key);
+        await this.persist();
+    }
+    async clear() {
+        this.cache.clear();
+        await this.persist();
+    }
+    async has(key) {
+        return this.cache.has(key);
+    }
+    keys() {
+        return this.cache.keys();
+    }
+}
+exports.FileCache = FileCache;
+/**
+ * Get localStorage if available (browser environment)
+ */
+function getLocalStorage() {
+    // Check for browser environment with localStorage
+    if (typeof globalThis !== "undefined") {
+        const global = globalThis;
+        if (typeof global.localStorage !== "undefined") {
+            return global.localStorage;
+        }
+    }
+    return null;
+}
+/**
+ * Browser localStorage-based cache adapter.
+ * Persists to localStorage with a configurable key prefix.
+ *
+ * Limitations:
+ * - 5MB storage limit (varies by browser)
+ * - Synchronous API (blocks main thread, usually negligible)
+ * - String-only storage (JSON serialization handled internally)
+ *
+ * @example
+ * ```typescript
+ * import { createTracker, LocalStorageCache } from "@gzeoneth/gov-tracker";
+ *
+ * const tracker = createTracker({
+ *   l2Provider,
+ *   l1Provider,
+ *   cache: new LocalStorageCache("arb-gov:"),
+ * });
+ * ```
+ */
+class LocalStorageCache {
+    constructor(prefix = "tracker:") {
+        this.prefix = prefix;
+    }
+    fullKey(key) {
+        return `${this.prefix}${key}`;
+    }
+    async get(key) {
+        const storage = getLocalStorage();
+        if (!storage)
+            return null;
+        const data = storage.getItem(this.fullKey(key));
+        if (data === null)
+            return null;
+        try {
+            return JSON.parse(data);
+        }
+        catch {
+            return null;
+        }
+    }
+    async set(key, value) {
+        const storage = getLocalStorage();
+        if (!storage)
+            return;
+        storage.setItem(this.fullKey(key), JSON.stringify(value));
+    }
+    async delete(key) {
+        const storage = getLocalStorage();
+        if (!storage)
+            return;
+        storage.removeItem(this.fullKey(key));
+    }
+    async clear() {
+        const storage = getLocalStorage();
+        if (!storage)
+            return;
+        const keysToRemove = [];
+        for (let i = 0; i < storage.length; i++) {
+            const key = storage.key(i);
+            if (key?.startsWith(this.prefix)) {
+                keysToRemove.push(key);
+            }
+        }
+        keysToRemove.forEach((k) => storage.removeItem(k));
+    }
+    async has(key) {
+        const storage = getLocalStorage();
+        if (!storage)
+            return false;
+        return storage.getItem(this.fullKey(key)) !== null;
+    }
+    async keys(prefix) {
+        const storage = getLocalStorage();
+        if (!storage)
+            return [];
+        const result = [];
+        for (let i = 0; i < storage.length; i++) {
+            const fullKey = storage.key(i);
+            if (fullKey?.startsWith(this.prefix)) {
+                const key = fullKey.slice(this.prefix.length);
+                if (!prefix || key.startsWith(prefix)) {
+                    result.push(key);
+                }
+            }
+        }
+        return result;
+    }
+}
+exports.LocalStorageCache = LocalStorageCache;
+/**
+ * In-memory cache adapter with no persistence.
+ * Useful for testing, short-lived sessions, or as a fallback.
+ *
+ * Data is lost when the page is refreshed or the process exits.
+ *
+ * @example
+ * ```typescript
+ * import { createTracker, MemoryCache } from "@gzeoneth/gov-tracker";
+ *
+ * const tracker = createTracker({
+ *   l2Provider,
+ *   l1Provider,
+ *   cache: new MemoryCache(),
+ * });
+ * ```
+ */
+class MemoryCache {
+    constructor() {
+        this.cache = new Map();
+    }
+    async get(key) {
+        return this.cache.get(key) ?? null;
+    }
+    async set(key, value) {
+        this.cache.set(key, value);
+    }
+    async delete(key) {
+        this.cache.delete(key);
+    }
+    async clear() {
+        this.cache.clear();
+    }
+    async has(key) {
+        return this.cache.has(key);
+    }
+    keys() {
+        return this.cache.keys();
+    }
+}
+exports.MemoryCache = MemoryCache;
+/**
+ * Generate cache key from transaction hash (primary cache key format)
+ */
+function txHashCacheKey(txHash) {
+    return `tx:${txHash.toLowerCase()}`;
+}
+/**
+ * Read all cache data without requiring RPC providers.
+ * Use this for status/dashboard views that only need cached data.
+ *
+ * @param cachePath - Path to the cache file
+ */
+async function readCacheStatus(cachePath) {
+    const cache = new FileCache(cachePath);
+    // Load watermarks from discovery checkpoint (unified format)
+    const discoveryCheckpoint = await cache.get(discovery_1.WATERMARKS_KEY);
+    const watermarks = discoveryCheckpoint?.cachedData.discoveryWatermarks ?? {};
+    const checkpoints = new Map();
+    const allKeys = cache.keys();
+    const keys = Array.from(allKeys);
+    for (const key of keys) {
+        if (key.startsWith("tx:")) {
+            const checkpoint = await cache.get(key);
+            if (checkpoint) {
+                checkpoints.set(key, checkpoint);
+            }
+        }
+    }
+    return { watermarks, checkpoints };
+}
+//# sourceMappingURL=cache.js.map

package/dist/tracker/cache.js.map

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

package/dist/tracker/execute.js

@@ -13,7 +13,7 @@ const proposal_queued_1 = require("../stages/proposal-queued");
 const timelock_1 = require("../stages/timelock");
 const l2_to_l1_message_1 = require("../stages/l2-to-l1-message");
 const retryables_1 = require("../stages/retryables");
-const base_1 = require("../stages/base");
+const utils_1 = require("../stages/utils");
 const logger_1 = require("../utils/logger");
 const log = logger_1.loggers.execution;
 /**
@@ -50,11 +50,11 @@ async function prepareTransaction(stage, context, options = {}) {
             // Queue a proposal on the governor (calls governor.queue())
             const queueData = (0, types_1.getStageData)(stage, "PROPOSAL_QUEUED");
             if (!queueData) {
-                return (0, base_1.failPrepare)("Stage is not a PROPOSAL_QUEUED stage");
+                return (0, utils_1.failPrepare)("Stage is not a PROPOSAL_QUEUED stage");
             }
             const { governorAddress, proposalId, targets, values, calldatas, description } = queueData;
             if (!governorAddress || !proposalId || !targets || !values || !calldatas || !description) {
-                return (0, base_1.failPrepare)("Missing proposal queue params in stage data");
+                return (0, utils_1.failPrepare)("Missing proposal queue params in stage data");
             }
             return (0, proposal_queued_1.prepareGovernorQueue)(governorAddress, proposalId, {
                 targets,
@@ -74,7 +74,7 @@ async function prepareTransaction(stage, context, options = {}) {
                 prepareCompleted: options.prepareCompleted,
             });
             if (results.length === 0) {
-                return (0, base_1.failPrepare)("No messages to prepare");
+                return (0, utils_1.failPrepare)("No messages to prepare");
             }
             // Find first successful result
             const successResult = results.find((r) => r.success);
@@ -100,17 +100,17 @@ async function prepareTransaction(stage, context, options = {}) {
             const targetChain = retryableData?.targetChains?.[0];
             // Validate target chain exists before selecting provider
             if (!targetChain) {
-                return (0, base_1.failPrepare)("No target chain found in retryable stage data");
+                return (0, utils_1.failPrepare)("No target chain found in retryable stage data");
             }
-            const targetProvider = targetChain === "Nova" ? novaProvider : l2Provider;
+            const targetProvider = targetChain === "nova" ? novaProvider : l2Provider;
             if (!targetProvider) {
-                return (0, base_1.failPrepare)("Target chain provider not available");
+                return (0, utils_1.failPrepare)("Target chain provider not available");
             }
             const { total, results } = await (0, retryables_1.prepareRetryableStage)(stage, l1Provider, targetProvider, {
                 prepareCompleted: options.prepareCompleted,
             });
             if (results.length === 0) {
-                return (0, base_1.failPrepare)("No tickets to prepare");
+                return (0, utils_1.failPrepare)("No tickets to prepare");
             }
             // Find first successful result
             const successResult = results.find((r) => r.success);
@@ -132,7 +132,7 @@ async function prepareTransaction(stage, context, options = {}) {
             return results[0];
         }
         default:
-            return (0, base_1.failPrepare)(`Preparation not supported for stage type: ${stage.type}`);
+            return (0, utils_1.failPrepare)(`Preparation not supported for stage type: ${stage.type}`);
     }
 }
 //# sourceMappingURL=execute.js.map

package/dist/tracker/execute.js.map

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

package/dist/tracker/pipeline.d.ts

@@ -4,44 +4,15 @@
  * Pure functions that track stages and return updated state.
  * Each function reads from state, performs tracking, and returns new state.
  */
-import { TrackingContext } from "./context";
-export declare function pipelineTrackProposalCreated(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    found: boolean;
-}>;
-export declare function pipelineTrackVoting(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    complete: boolean;
-}>;
-export declare function pipelineTrackProposalQueued(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    queued: boolean;
-}>;
-export declare function pipelineTrackL2Timelock(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    executed: boolean;
-}>;
-export declare function pipelineTrackL2ToL1Message(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    executed: boolean;
-    needsL1: boolean;
-}>;
-export declare function pipelineTrackL1Timelock(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    executed: boolean;
-}>;
-export declare function pipelineTrackRetryables(state: TrackingContext): Promise<{
-    state: TrackingContext;
-    redeemed: boolean;
-}>;
+import { TrackingState } from "./state";
 /**
  * Track full governor proposal pipeline.
  * Returns final state after tracking all stages.
  */
-export declare function trackGovernorPipeline(state: TrackingContext): Promise<TrackingContext>;
+export declare function trackGovernorPipeline(state: TrackingState): Promise<TrackingState>;
 /**
  * Track timelock pipeline (stages 4-7).
  * Used by governor pipeline and direct timelock tracking.
  */
-export declare function trackTimelockPipeline(state: TrackingContext): Promise<TrackingContext>;
+export declare function trackTimelockPipeline(state: TrackingState): Promise<TrackingState>;
 //# sourceMappingURL=pipeline.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/tracker/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EACL,eAAe,EAiBhB,MAAM,WAAW,CAAC;AAuEnB,wBAAsB,4BAA4B,CAChD,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAwBrD;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAyBxD;AAED,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAoDtD;AAID,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CA+BxD;AAaD,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuD1E;AAID,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAkBxD;AAID,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,CAoBxD;AAgBD;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAwB5F;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CA8B5F"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/tracker/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EACL,aAAa,EAiBd,MAAM,SAAS,CAAC;AAuWjB;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAwBxF;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CA8BxF"}

package/dist/tracker/pipeline.js

@@ -6,18 +6,11 @@
  * Each function reads from state, performs tracking, and returns new state.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pipelineTrackProposalCreated = pipelineTrackProposalCreated;
-exports.pipelineTrackVoting = pipelineTrackVoting;
-exports.pipelineTrackProposalQueued = pipelineTrackProposalQueued;
-exports.pipelineTrackL2Timelock = pipelineTrackL2Timelock;
-exports.pipelineTrackL2ToL1Message = pipelineTrackL2ToL1Message;
-exports.pipelineTrackL1Timelock = pipelineTrackL1Timelock;
-exports.pipelineTrackRetryables = pipelineTrackRetryables;
 exports.trackGovernorPipeline = trackGovernorPipeline;
 exports.trackTimelockPipeline = trackTimelockPipeline;
 const logger_1 = require("../utils/logger");
-const context_1 = require("./context");
-const base_1 = require("../stages/base");
+const state_1 = require("./state");
+const utils_1 = require("../stages/utils");
 const proposal_created_1 = require("../stages/proposal-created");
 const voting_1 = require("../stages/voting");
 const proposal_queued_1 = require("../stages/proposal-queued");
@@ -33,19 +26,22 @@ const { pipeline: log, tracker: logTracker } = logger_1.loggers;
 // L1_TIMELOCK is the only L1 stage; RETRYABLE_EXECUTED runs on L2 (Arb1/Nova)
 const L1_STAGES = new Set(["L1_TIMELOCK"]);
 // Helper: create placeholder stage
-const placeholder = (type, status, reason) => ({
+const placeholder = (type, status, reason) => 
+// Assertion needed: placeholder stages have partial data that gets filled later
+({
     type,
     status,
-    chain: L1_STAGES.has(type) ? "L1" : "L2",
+    chain: L1_STAGES.has(type) ? "ethereum" : "arb1",
+    chainId: L1_STAGES.has(type) ? 1 : 42161,
     transactions: [],
     data: { reason },
 });
 // Helper: track with cache check
 async function withCache(state, stageType, key, onCached, onTrack) {
-    const cached = (0, context_1.getCompletedStage)(state, stageType);
+    const cached = (0, state_1.getCompletedStage)(state, stageType);
     if (cached) {
         log("%s: using cached stage", stageType);
-        return { state: await (0, context_1.addStage)(state, cached), [key]: onCached(cached) };
+        return { state: await (0, state_1.addStage)(state, cached), [key]: onCached(cached) };
     }
     return onTrack();
 }
@@ -53,7 +49,7 @@ async function withCache(state, stageType, key, onCached, onTrack) {
 async function track(state, stageType, key, tracker) {
     try {
         const { stage, result } = await tracker();
-        return { state: await (0, context_1.addStage)(state, stage), [key]: result };
+        return { state: await (0, state_1.addStage)(state, stage), [key]: result };
     }
     catch (error) {
         throw new Error(`Failed to track ${stageType}: ${error instanceof Error ? error.message : String(error)}`);
@@ -61,11 +57,11 @@ async function track(state, stageType, key, tracker) {
 }
 // Governor Stages (1-3)
 async function pipelineTrackProposalCreated(state) {
-    const governorAddress = (0, context_1.getGovernorAddress)(state);
-    const proposalId = (0, context_1.getProposalId)(state);
+    const governorAddress = (0, state_1.getGovernorAddress)(state);
+    const proposalId = (0, state_1.getProposalId)(state);
     if (!governorAddress || !proposalId)
         return { state, found: false };
-    if ((0, context_1.getIsElection)(state))
+    if ((0, state_1.getIsElection)(state))
         return { state, found: false };
     return withCache(state, "PROPOSAL_CREATED", "found", () => true, async () => {
         log("PROPOSAL_CREATED: tracking");
@@ -79,9 +75,9 @@ async function pipelineTrackProposalCreated(state) {
     });
 }
 async function pipelineTrackVoting(state) {
-    const governorAddress = (0, context_1.getGovernorAddress)(state);
-    const proposalId = (0, context_1.getProposalId)(state);
-    const proposalData = (0, context_1.getProposalData)(state);
+    const governorAddress = (0, state_1.getGovernorAddress)(state);
+    const proposalId = (0, state_1.getProposalId)(state);
+    const proposalData = (0, state_1.getProposalData)(state);
     if (!governorAddress || !proposalId || !proposalData)
         return { state, complete: false };
     return withCache(state, "VOTING_ACTIVE", "complete", (c) => c.status === "COMPLETED", async () => {
@@ -93,9 +89,9 @@ async function pipelineTrackVoting(state) {
     });
 }
 async function pipelineTrackProposalQueued(state) {
-    const governorAddress = (0, context_1.getGovernorAddress)(state);
-    const proposalId = (0, context_1.getProposalId)(state);
-    const proposalData = (0, context_1.getProposalData)(state);
+    const governorAddress = (0, state_1.getGovernorAddress)(state);
+    const proposalId = (0, state_1.getProposalId)(state);
+    const proposalData = (0, state_1.getProposalData)(state);
     if (!governorAddress || !proposalId)
         return { state, queued: false };
     return withCache(state, "PROPOSAL_QUEUED", "queued", () => true, async () => {
@@ -103,7 +99,7 @@ async function pipelineTrackProposalQueued(state) {
         return track(state, "PROPOSAL_QUEUED", "queued", async () => {
             // Voting deadline is L1 block number - convert to L2 for searching
             // Use bounds to speed up binary search: min=creation block, max=creation+7M (~20 days)
-            const votingDeadlineL1 = (0, context_1.getVotingEndBlock)(state);
+            const votingDeadlineL1 = (0, state_1.getVotingEndBlock)(state);
             let votingEndBlock;
             if (votingDeadlineL1) {
                 const creationBlock = proposalData?.creationBlock ?? 0;
@@ -116,7 +112,8 @@ async function pipelineTrackProposalQueued(state) {
             }
             const r = await (0, proposal_queued_1.trackProposalQueued)(governorAddress, proposalId, state.providers.l2, proposalData?.creationBlock ?? 0, { votingEndBlock });
             let stage = r.stage;
-            if (stage.status === "READY" && proposalData) {
+            if (stage.type === "PROPOSAL_QUEUED" && stage.status === "READY" && proposalData) {
+                // Enrich stage data with proposal info for READY state
                 stage = {
                     ...stage,
                     data: {
@@ -134,16 +131,16 @@ async function pipelineTrackProposalQueued(state) {
 }
 // Timelock Stage (4)
 async function pipelineTrackL2Timelock(state) {
-    const timelockAddress = (0, context_1.getTimelockAddress)(state);
-    const operationId = (0, context_1.getOperationId)(state);
-    const firstCallScheduledData = (0, context_1.getFirstCallScheduledData)(state);
+    const timelockAddress = (0, state_1.getTimelockAddress)(state);
+    const operationId = (0, state_1.getOperationId)(state);
+    const firstCallScheduledData = (0, state_1.getFirstCallScheduledData)(state);
     if (!timelockAddress || !operationId || !firstCallScheduledData)
         return { state, executed: false };
     return withCache(state, "L2_TIMELOCK", "executed", (c) => c.status === "COMPLETED", async () => {
         log("L2_TIMELOCK: tracking");
         return track(state, "L2_TIMELOCK", "executed", async () => {
-            const r = await (0, timelock_1.trackL2Timelock)(timelockAddress, operationId, state.providers.l2, (0, context_1.getQueueBlockNumber)(state) ?? 0, firstCallScheduledData, {
-                cachedExecutionTxHash: (0, context_1.getL2ExecutionTxHash)(state),
+            const r = await (0, timelock_1.trackL2Timelock)(timelockAddress, operationId, state.providers.l2, (0, state_1.getQueueBlockNumber)(state) ?? 0, firstCallScheduledData, {
+                cachedExecutionTxHash: (0, state_1.getL2ExecutionTxHash)(state),
                 allStages: state.stages,
             });
             return { stage: r.stage, result: r.executionTxHash !== null };
@@ -155,13 +152,13 @@ const L1_ROUNDTRIP_STAGES = ["L2_TO_L1_MESSAGE", "L1_TIMELOCK", "RETRYABLE_EXECU
 async function addSkippedL1Stages(state) {
     let s = state;
     for (const type of L1_ROUNDTRIP_STAGES)
-        s = await (0, context_1.addStage)(s, placeholder(type, "SKIPPED", "L2-only path"));
+        s = await (0, state_1.addStage)(s, placeholder(type, "SKIPPED", "L2-only path"));
     return s;
 }
 async function pipelineTrackL2ToL1Message(state) {
-    const l2ExecutionTxHash = (0, context_1.getL2ExecutionTxHash)(state);
-    const addressForPath = (0, context_1.getGovernorAddress)(state) ?? (0, context_1.getTimelockAddress)(state);
-    const needsL1 = addressForPath ? (0, base_1.isConstitutional)(addressForPath) : true;
+    const l2ExecutionTxHash = (0, state_1.getL2ExecutionTxHash)(state);
+    const addressForPath = (0, state_1.getGovernorAddress)(state) ?? (0, state_1.getTimelockAddress)(state);
+    const needsL1 = addressForPath ? (0, utils_1.isConstitutional)(addressForPath) : true;
     if (!needsL1) {
         log("L2_TO_L1_MESSAGE: L2-only path, skipping L1 stages");
         return { state: await addSkippedL1Stages(state), executed: false, needsL1: false };
@@ -169,14 +166,14 @@ async function pipelineTrackL2ToL1Message(state) {
     if (!l2ExecutionTxHash)
         return { state, executed: false, needsL1: true };
     // Check completed cache
-    const cached = (0, context_1.getCompletedStage)(state, "L2_TO_L1_MESSAGE");
+    const cached = (0, state_1.getCompletedStage)(state, "L2_TO_L1_MESSAGE");
     if (cached) {
         log("L2_TO_L1_MESSAGE: using cached stage");
-        return { state: await (0, context_1.addStage)(state, cached), executed: true, needsL1: true };
+        return { state: await (0, state_1.addStage)(state, cached), executed: true, needsL1: true };
     }
     // Fast-path for pending (still in challenge period)
-    const pending = (0, context_1.getCachedStage)(state, "L2_TO_L1_MESSAGE");
-    if (pending?.status === "PENDING") {
+    const pending = (0, state_1.getCachedStage)(state, "L2_TO_L1_MESSAGE");
+    if (pending?.type === "L2_TO_L1_MESSAGE" && pending.status === "PENDING") {
         const firstExec = pending.data.firstExecutableBlock;
         if (firstExec) {
             const { blockNumber: currentL1Block, timestamp } = await (0, timing_2.getCurrentBlockInfo)(state.providers.l1);
@@ -191,7 +188,7 @@ async function pipelineTrackL2ToL1Message(state) {
                         delaySeconds: remainingSeconds,
                     },
                 };
-                return { state: await (0, context_1.addStage)(state, updated), executed: false, needsL1: true };
+                return { state: await (0, state_1.addStage)(state, updated), executed: false, needsL1: true };
             }
         }
     }
@@ -209,8 +206,8 @@ async function pipelineTrackL1Timelock(state) {
         log("L1_TIMELOCK: tracking");
         return track(state, "L1_TIMELOCK", "executed", async () => {
             const r = await (0, timelock_1.trackL1Timelock)(state.providers.l1, {
-                outboxExecutionTx: (0, context_1.getOutboxExecutionTx)(state),
-                fromBlock: (0, context_1.getFirstExecutableBlock)(state),
+                outboxExecutionTx: (0, state_1.getOutboxExecutionTx)(state),
+                fromBlock: (0, state_1.getFirstExecutableBlock)(state),
                 allStages: state.stages,
             });
             return { stage: r.stage, result: r.executionTxHash !== null };
@@ -219,7 +216,7 @@ async function pipelineTrackL1Timelock(state) {
 }
 // Retryable Stage (7)
 async function pipelineTrackRetryables(state) {
-    const l1ExecutionTxHash = (0, context_1.getL1ExecutionTxHash)(state);
+    const l1ExecutionTxHash = (0, state_1.getL1ExecutionTxHash)(state);
     if (!l1ExecutionTxHash)
         return { state, redeemed: false };
     return withCache(state, "RETRYABLE_EXECUTED", "redeemed", (c) => c.status === "COMPLETED", async () => {
@@ -237,7 +234,7 @@ async function pipelineTrackRetryables(state) {
 async function addPlaceholders(state, types, reason) {
     let s = state;
     for (const type of types)
-        s = await (0, context_1.addStage)(s, placeholder(type, "NOT_STARTED", reason));
+        s = await (0, state_1.addStage)(s, placeholder(type, "NOT_STARTED", reason));
     return s;
 }
 const RETRYABLE_STAGES = ["RETRYABLE_EXECUTED"];