@jinn-network/client 0.1.2 → 0.1.3-canary.2d6b2676

package/dist/daemon/jinn-claim-loop-mock.js

@@ -0,0 +1,122 @@
+/**
+ * MockMessenger submission path for the cross-chain JINN claim loop.
+ *
+ * Used when `jinnMessengerMode === 'mock'` — primarily for testnet burn-in
+ * (Phase D / r5z) when canonical OP-Stack finality is impractical and CI.
+ * The daemon's wallet must be the MockMessenger's owner during burn-in;
+ * `setFixture` is `onlyOwner`.
+ *
+ * Flow:
+ *   1. Read the latest ClaimTicket event from the JinnClaimEmitter on L2.
+ *   2. Plant the matching fixture on the L1 MockMessenger via `setFixture`.
+ *   3. Submit `JinnDistributor.claim(abi.encode(claimId))`.
+ *
+ * The MockMessenger encodes the proof as `abi.encode(uint256 claimId)` —
+ * the messenger looks up the planted snapshot fixture and returns it. The
+ * distributor's per-service accumulator handles replay; resubmitting the
+ * same `proof` mints zero on the second call.
+ */
+import { decodeEventLog, encodeAbiParameters, } from 'viem';
+import { CLAIM_TICKET_TOPIC0, JINN_CLAIM_EMITTER_ABI, JINN_DISTRIBUTOR_ABI, MOCK_MESSENGER_ABI, } from '../earning/contracts.js';
+/**
+ * Read the latest ClaimTicket emitted by `claimEmitter` for the given
+ * `serviceId`, optionally bounded to a recent block range. Returns null when
+ * no matching event exists.
+ */
+export async function fetchLatestClaimTicket(l2Client, claimEmitter, serviceId, options = {}) {
+    const fromBlock = options.fromBlock ?? 0n;
+    const toBlock = options.toBlock ?? 'latest';
+    const logs = await l2Client.getLogs({
+        address: claimEmitter,
+        event: JINN_CLAIM_EMITTER_ABI[0],
+        args: { serviceId },
+        fromBlock,
+        toBlock,
+    });
+    if (logs.length === 0)
+        return null;
+    // Sort by blockNumber, logIndex; the last one is the latest.
+    logs.sort((a, b) => {
+        const aBn = a.blockNumber ?? 0n;
+        const bBn = b.blockNumber ?? 0n;
+        if (aBn === bBn)
+            return (a.logIndex ?? 0) - (b.logIndex ?? 0);
+        return aBn < bBn ? -1 : 1;
+    });
+    const latest = logs[logs.length - 1];
+    const decoded = decodeEventLog({
+        abi: JINN_CLAIM_EMITTER_ABI,
+        data: latest.data,
+        topics: latest.topics,
+        eventName: 'ClaimTicket',
+    });
+    const args = decoded.args;
+    return {
+        claimId: args.claimId,
+        serviceId: args.serviceId,
+        verifiedCreations: args.verifiedCreations,
+        noveltyWeightedRestorationDeliveries: args.noveltyWeightedRestorationDeliveries,
+        evaluationDeliveryCount: args.evaluationDeliveryCount,
+        multisig: args.multisig,
+        claimer: args.claimer,
+        emitTxHash: latest.transactionHash ?? '0x',
+        emitBlockNumber: latest.blockNumber ?? 0n,
+    };
+}
+/**
+ * Plant a fixture on the L1 MockMessenger that mirrors the L2 ClaimTicket
+ * snapshot exactly. The daemon's L1 wallet must be the MockMessenger's
+ * owner. Returns the L1 tx hash.
+ */
+export async function plantMockFixture(l1Client, l1Wallet, messenger, snapshot) {
+    const account = l1Wallet.account;
+    if (!account)
+        throw new Error('L1 wallet has no account configured');
+    const { request } = await l1Client.simulateContract({
+        address: messenger,
+        abi: MOCK_MESSENGER_ABI,
+        functionName: 'setFixture',
+        args: [
+            snapshot.claimId,
+            {
+                serviceId: snapshot.serviceId,
+                verifiedCreations: snapshot.verifiedCreations,
+                noveltyWeightedRestorationDeliveries: snapshot.noveltyWeightedRestorationDeliveries,
+                evaluationDeliveryCount: snapshot.evaluationDeliveryCount,
+                multisig: snapshot.multisig,
+            },
+        ],
+        account,
+    });
+    return l1Wallet.writeContract(request);
+}
+/**
+ * Encode the MockMessenger proof: `abi.encode(uint256 claimId)`. The
+ * messenger looks up the previously planted fixture by claimId.
+ */
+export function encodeMockProof(claimId) {
+    return encodeAbiParameters([{ type: 'uint256' }], [claimId]);
+}
+/**
+ * Submit `JinnDistributor.claim(proof)` on L1. Returns the L1 tx hash.
+ *
+ * Idempotent at the contract layer — the distributor's per-service
+ * accumulator clamps repeated submissions to zero mint.
+ */
+export async function submitMockClaim(l1Client, l1Wallet, distributor, claimId) {
+    const account = l1Wallet.account;
+    if (!account)
+        throw new Error('L1 wallet has no account configured');
+    const proof = encodeMockProof(claimId);
+    const { request } = await l1Client.simulateContract({
+        address: distributor,
+        abi: JINN_DISTRIBUTOR_ABI,
+        functionName: 'claim',
+        args: [proof],
+        account,
+    });
+    return l1Wallet.writeContract(request);
+}
+// Re-export for tests that want to assert on the topic0 directly.
+export { CLAIM_TICKET_TOPIC0 };
+//# sourceMappingURL=jinn-claim-loop-mock.js.map

package/dist/daemon/jinn-claim-loop-mock.js.map

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

package/dist/daemon/jinn-claim-loop.d.ts

@@ -0,0 +1,123 @@
+/**
+ * Cross-chain JINN claim loop (Phase B / jinn-mono-7x5).
+ *
+ * Orchestrates the two-tx flow that turns on-chain protocol work on L2 into
+ * JINN mints on L1:
+ *
+ *   1. Step A — emit on Base. Call `JinnClaimEmitter.emitClaim(serviceId)`
+ *      on Base / Base Sepolia. The event records the three counters
+ *      (`verifiedCreations`, `noveltyWeightedCounts`, `evaluationDeliveryCount`)
+ *      atomically at one block.
+ *   2. Step B — wait for finality. In `canonical` mode, wait for the
+ *      OP dispute game to resolve and portal finality to elapse, then build
+ *      the OP-Stack storage proof. In `mock` mode, plant the matching fixture on the L1
+ *      MockMessenger.
+ *   3. Step C — submit on L1. Call `JinnDistributor.claim(proof)` on
+ *      Sepolia / Ethereum. The distributor verifies, applies channel
+ *      weights, and mints to the operator multisig + DAO Timelock.
+ *
+ * The loop is disabled when no `distributorAddress` is configured. Each
+ * tick iterates over staked services in the FleetStateStore. Failures are
+ * logged and surfaced via `tick_error` observability events; they don't
+ * crash the daemon. Replay protection lives entirely in the distributor's
+ * accumulators — repeated submissions are no-ops on the second mint.
+ *
+ * Configuration: `jinnClaimLoopIntervalMs` (default 1h), `jinnMessengerMode`
+ * (`canonical` | `mock`). The `mock` path requires the daemon's L1 wallet to
+ * be the MockMessenger's owner (set at deploy).
+ *
+ * Automated `run()` / `runOnce()` **only execute mock-mode** emit→fixture→claim.
+ * When `jinnMessengerMode === 'canonical'`, scheduled ticks **skip** emitting:
+ * canonical OP-Stack finality is multi-day (see R-1); operators should use mock
+ * for burn-in and run `tsx scripts/verify-canonical-canary.ts` for
+ * verifier-only proofs after an intentional L2 emit.
+ */
+import type { Address, Hex, PublicClient, WalletClient } from 'viem';
+import type { FleetStateStore } from '../earning/store.js';
+import type { Store } from '../store/store.js';
+export type JinnMessengerMode = 'canonical' | 'mock';
+export interface JinnClaimLoopConfig {
+    intervalMs: number;
+    /** PublicClient bound to the L2 measurement chain (Base / Base Sepolia). */
+    l2Client: PublicClient;
+    /**
+     * Optional archive/proof RPC client for canonical mode. Historical
+     * `eth_getProof` at the dispute game's L2 block can require a stronger
+     * endpoint than the daemon's normal L2 RPC.
+     */
+    l2ProofClient?: PublicClient;
+    /** WalletClient bound to L2 — pays gas for `emitClaim`. */
+    l2Wallet: WalletClient;
+    /** PublicClient bound to the L1 governance chain (Ethereum / Sepolia). */
+    l1Client: PublicClient;
+    /** WalletClient bound to L1 — pays gas for `setFixture` (mock) + `claim`. */
+    l1Wallet: WalletClient;
+    /** Per-service state. We tick each service with a stake. */
+    store: FleetStateStore;
+    chain: 'base' | 'base-sepolia';
+    /** L2 JinnClaimEmitter address. Required. */
+    claimEmitterAddress: Address;
+    /** L1 JinnDistributor address. Required. */
+    distributorAddress: Address;
+    /** L1 messenger address. Required (MockMessenger or CanonicalOpStackMessenger). */
+    messengerAddress: Address;
+    /** 'canonical' or 'mock'. Defaults to 'canonical'. */
+    messengerMode: JinnMessengerMode;
+    /** Canonical-mode only — L1 OptimismPortal2 anchoring L2 output roots. */
+    optimismPortalAddress?: Address;
+    /** Canonical-mode only — L1 DisputeGameFactory. */
+    disputeGameFactoryAddress?: Address;
+    /** Daemon observability sink. */
+    jinnStore?: Store;
+}
+export interface JinnClaimTickResult {
+    ticks: number;
+    emits: number;
+    submits: number;
+    errors: number;
+}
+/**
+ * The orchestrator. One loop, one method per stage so they're individually
+ * testable. Failures bubble to `runOnce` which records them and continues
+ * to the next service — a single bad service must not stall the fleet.
+ */
+export declare class JinnClaimLoop {
+    private readonly config;
+    private stopped;
+    constructor(config: JinnClaimLoopConfig);
+    stop(): void;
+    /**
+     * One tick: iterate the staked services and run emit → wait → submit for
+     * each. Returns counters useful for tests and operational dashboards.
+     */
+    runOnce(): Promise<JinnClaimTickResult>;
+    /**
+     * One service's full Step A → Step B → Step C run. Split out so tests
+     * can drive a single service end-to-end without the iteration scaffold.
+     */
+    tickService(args: {
+        serviceId: bigint;
+        displayIndex: number;
+        multisig: Address;
+    }, result: JinnClaimTickResult): Promise<void>;
+    /** Step A — `JinnClaimEmitter.emitClaim(serviceId)` on L2. */
+    emitOnL2(serviceId: bigint): Promise<Hex>;
+    /** Mock-mode Step B + C: read the L2 event, plant fixture on L1, claim. */
+    submitMock(args: {
+        serviceId: bigint;
+        emitTxHash: Hex;
+        multisig: Address;
+    }): Promise<Hex>;
+    /** Canonical-mode Step B + C: build OP-Stack proof, submit on L1. */
+    submitCanonical(args: {
+        serviceId: bigint;
+        emitTxHash: Hex;
+    }): Promise<Hex>;
+    /**
+     * Read the latest ClaimTicket for `serviceId` near `emitTxHash`. Bounded
+     * to the emit block to avoid scanning the full chain on every tick.
+     */
+    private readSnapshot;
+    /** Loop forever, sleeping `intervalMs` between ticks. */
+    run(): Promise<void>;
+}

package/dist/daemon/jinn-claim-loop.js

@@ -0,0 +1,256 @@
+/**
+ * Cross-chain JINN claim loop (Phase B / jinn-mono-7x5).
+ *
+ * Orchestrates the two-tx flow that turns on-chain protocol work on L2 into
+ * JINN mints on L1:
+ *
+ *   1. Step A — emit on Base. Call `JinnClaimEmitter.emitClaim(serviceId)`
+ *      on Base / Base Sepolia. The event records the three counters
+ *      (`verifiedCreations`, `noveltyWeightedCounts`, `evaluationDeliveryCount`)
+ *      atomically at one block.
+ *   2. Step B — wait for finality. In `canonical` mode, wait for the
+ *      OP dispute game to resolve and portal finality to elapse, then build
+ *      the OP-Stack storage proof. In `mock` mode, plant the matching fixture on the L1
+ *      MockMessenger.
+ *   3. Step C — submit on L1. Call `JinnDistributor.claim(proof)` on
+ *      Sepolia / Ethereum. The distributor verifies, applies channel
+ *      weights, and mints to the operator multisig + DAO Timelock.
+ *
+ * The loop is disabled when no `distributorAddress` is configured. Each
+ * tick iterates over staked services in the FleetStateStore. Failures are
+ * logged and surfaced via `tick_error` observability events; they don't
+ * crash the daemon. Replay protection lives entirely in the distributor's
+ * accumulators — repeated submissions are no-ops on the second mint.
+ *
+ * Configuration: `jinnClaimLoopIntervalMs` (default 1h), `jinnMessengerMode`
+ * (`canonical` | `mock`). The `mock` path requires the daemon's L1 wallet to
+ * be the MockMessenger's owner (set at deploy).
+ *
+ * Automated `run()` / `runOnce()` **only execute mock-mode** emit→fixture→claim.
+ * When `jinnMessengerMode === 'canonical'`, scheduled ticks **skip** emitting:
+ * canonical OP-Stack finality is multi-day (see R-1); operators should use mock
+ * for burn-in and run `tsx scripts/verify-canonical-canary.ts` for
+ * verifier-only proofs after an intentional L2 emit.
+ */
+import { getAddress } from 'viem';
+import { isOperationalServiceStep } from '../earning/types.js';
+import { base, baseSepolia } from 'viem/chains';
+import { emitEvent } from '../observability/emit-event.js';
+import { displayFleetServiceIndex } from '../earning/fleet-display-index.js';
+import { waitForTransactionReceiptWithRetry } from '../tx-retry.js';
+import { CLAIM_TICKET_TOPIC0, JINN_CLAIM_EMITTER_ABI } from '../earning/contracts.js';
+import { fetchLatestClaimTicket, plantMockFixture, submitMockClaim, } from './jinn-claim-loop-mock.js';
+import { buildCanonicalProof, decodeClaimTicketFromReceipt, verifyCanonicalClaimCanary, } from './jinn-claim-loop-canonical.js';
+/**
+ * The orchestrator. One loop, one method per stage so they're individually
+ * testable. Failures bubble to `runOnce` which records them and continues
+ * to the next service — a single bad service must not stall the fleet.
+ */
+export class JinnClaimLoop {
+    config;
+    stopped = false;
+    constructor(config) {
+        this.config = config;
+    }
+    stop() {
+        this.stopped = true;
+    }
+    /**
+     * One tick: iterate the staked services and run emit → wait → submit for
+     * each. Returns counters useful for tests and operational dashboards.
+     */
+    async runOnce() {
+        const result = { ticks: 0, emits: 0, submits: 0, errors: 0 };
+        // Spec / Phase D: MockMessenger drives automated Sepolia burn-in; canonical
+        // verification is verifier-only and must not spam emitClaim each interval.
+        if (this.config.messengerMode === 'canonical') {
+            const detail = '[jinn-claim] Automated runOnce skips messengerMode=canonical (multi-day OP finality). ' +
+                'Set jinnMessengerMode=mock for Sepolia burn-in, or run `tsx scripts/verify-canonical-canary.ts` ' +
+                'after finality with an existing L2 ClaimTicket tx.';
+            console.warn(detail);
+            if (this.config.jinnStore) {
+                emitEvent(this.config.jinnStore, {
+                    kind: 'jinn_claim_canonical_skip',
+                    outcome: 'warn',
+                    detail,
+                }, 'jinn-claim');
+            }
+            return result;
+        }
+        const state = await this.config.store.load(this.config.chain);
+        for (const svc of state.services) {
+            if (this.stopped)
+                break;
+            // Only services with a multisig + service id are eligible.
+            if (!isOperationalServiceStep(svc.step) && svc.step !== 'mech_deployed')
+                continue;
+            if (svc.service_id == null || !svc.safe_address)
+                continue;
+            const displayIndex = displayFleetServiceIndex(svc);
+            result.ticks++;
+            try {
+                await this.tickService({
+                    serviceId: BigInt(svc.service_id),
+                    displayIndex,
+                    multisig: getAddress(svc.safe_address),
+                }, result);
+            }
+            catch (err) {
+                result.errors++;
+                const detail = err instanceof Error ? err.message : String(err);
+                console.error(`[jinn-claim] Service ${svc.service_id}: ${detail}`);
+                if (this.config.jinnStore) {
+                    emitEvent(this.config.jinnStore, {
+                        kind: 'tick_error',
+                        serviceIndex: displayIndex,
+                        outcome: 'failed',
+                        detail,
+                    }, 'jinn-claim');
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * One service's full Step A → Step B → Step C run. Split out so tests
+     * can drive a single service end-to-end without the iteration scaffold.
+     */
+    async tickService(args, result) {
+        const { serviceId, displayIndex, multisig } = args;
+        // Step A — emit ClaimTicket on L2.
+        const emitTxHash = await this.emitOnL2(serviceId);
+        result.emits++;
+        if (this.config.jinnStore) {
+            emitEvent(this.config.jinnStore, {
+                kind: 'jinn_claim_emitted',
+                serviceIndex: displayIndex,
+                txHash: emitTxHash,
+                outcome: 'ok',
+                detail: `Emitted ClaimTicket for service ${serviceId}`,
+            }, 'jinn-claim');
+        }
+        // Step B + C — diverge by mode.
+        let submitTxHash;
+        if (this.config.messengerMode === 'mock') {
+            submitTxHash = await this.submitMock({
+                serviceId,
+                emitTxHash,
+                multisig,
+            });
+        }
+        else {
+            submitTxHash = await this.submitCanonical({
+                serviceId,
+                emitTxHash,
+            });
+        }
+        result.submits++;
+        if (this.config.jinnStore) {
+            emitEvent(this.config.jinnStore, {
+                kind: 'jinn_claim_submitted',
+                serviceIndex: displayIndex,
+                txHash: submitTxHash,
+                outcome: 'ok',
+                detail: `Submitted ${this.config.messengerMode} claim for service ${serviceId}`,
+            }, 'jinn-claim');
+        }
+    }
+    /** Step A — `JinnClaimEmitter.emitClaim(serviceId)` on L2. */
+    async emitOnL2(serviceId) {
+        const account = this.config.l2Wallet.account;
+        if (!account)
+            throw new Error('L2 wallet has no account configured');
+        const { request } = await this.config.l2Client.simulateContract({
+            address: this.config.claimEmitterAddress,
+            abi: JINN_CLAIM_EMITTER_ABI,
+            functionName: 'emitClaim',
+            args: [serviceId],
+            account,
+        });
+        const hash = await this.config.l2Wallet.writeContract(request);
+        await waitForTransactionReceiptWithRetry(this.config.l2Client, hash);
+        return hash;
+    }
+    /** Mock-mode Step B + C: read the L2 event, plant fixture on L1, claim. */
+    async submitMock(args) {
+        const snapshot = await this.readSnapshot(args.serviceId, args.emitTxHash);
+        if (snapshot.multisig.toLowerCase() !== args.multisig.toLowerCase()) {
+            throw new Error(`[jinn-claim] L2 ClaimTicket multisig ${snapshot.multisig} does not match ` +
+                `service multisig ${args.multisig} — refusing to plant mock fixture`);
+        }
+        // Plant the fixture (daemon wallet must be MockMessenger.owner).
+        const fixtureTx = await plantMockFixture(this.config.l1Client, this.config.l1Wallet, this.config.messengerAddress, snapshot);
+        await waitForTransactionReceiptWithRetry(this.config.l1Client, fixtureTx);
+        // Submit the claim on L1.
+        const claimTx = await submitMockClaim(this.config.l1Client, this.config.l1Wallet, this.config.distributorAddress, snapshot.claimId);
+        await waitForTransactionReceiptWithRetry(this.config.l1Client, claimTx);
+        return claimTx;
+    }
+    /** Canonical-mode Step B + C: build OP-Stack proof, submit on L1. */
+    async submitCanonical(args) {
+        if (!this.config.optimismPortalAddress || !this.config.disputeGameFactoryAddress) {
+            throw new Error('[jinn-claim-loop] canonical mode requires optimismPortalAddress + disputeGameFactoryAddress');
+        }
+        // Use retrying helper for same reason as readSnapshot — RPC eventual consistency.
+        const receipt = await waitForTransactionReceiptWithRetry(this.config.l2Client, args.emitTxHash);
+        const claimLog = receipt.logs.find((log) => log.address.toLowerCase() === this.config.claimEmitterAddress.toLowerCase()
+            && log.topics[0]?.toLowerCase() === CLAIM_TICKET_TOPIC0.toLowerCase());
+        if (!claimLog) {
+            throw new Error(`[jinn-claim-loop] no ClaimTicket log in receipt ${args.emitTxHash}`);
+        }
+        const snapshot = decodeClaimTicketFromReceipt(receipt.logs, this.config.claimEmitterAddress, claimLog.logIndex ?? 0);
+        const result = await buildCanonicalProof({
+            l1Client: this.config.l1Client,
+            l2ProofClient: this.config.l2ProofClient ?? this.config.l2Client,
+            targetChain: this.config.chain === 'base-sepolia' ? baseSepolia : base,
+            optimismPortal: this.config.optimismPortalAddress,
+            disputeGameFactory: this.config.disputeGameFactoryAddress,
+            claimEmitter: this.config.claimEmitterAddress,
+        }, { snapshot, l2BlockNumber: receipt.blockNumber });
+        await verifyCanonicalClaimCanary(this.config.l1Client, this.config.messengerAddress, result.proof);
+        // Verifier-only canary path: no L1 transaction submitted; return the L2 emit tx.
+        return args.emitTxHash;
+    }
+    /**
+     * Read the latest ClaimTicket for `serviceId` near `emitTxHash`. Bounded
+     * to the emit block to avoid scanning the full chain on every tick.
+     */
+    async readSnapshot(serviceId, emitTxHash) {
+        // Use the retrying helper because Tenderly's L2 RPC is load-balanced and
+        // can return "receipt not found" briefly after the tx lands when the
+        // request hits a backend that hasn't propagated the receipt yet.
+        const receipt = await waitForTransactionReceiptWithRetry(this.config.l2Client, emitTxHash);
+        // Search a small window around the emit block.
+        const fromBlock = receipt.blockNumber > 5n ? receipt.blockNumber - 5n : 0n;
+        const toBlock = receipt.blockNumber + 5n;
+        const snapshot = await fetchLatestClaimTicket(this.config.l2Client, this.config.claimEmitterAddress, serviceId, { fromBlock, toBlock });
+        if (!snapshot) {
+            throw new Error(`[jinn-claim] no ClaimTicket event for service ${serviceId} near tx ${emitTxHash}`);
+        }
+        return snapshot;
+    }
+    /** Loop forever, sleeping `intervalMs` between ticks. */
+    async run() {
+        if (this.config.intervalMs <= 0)
+            return;
+        while (!this.stopped) {
+            try {
+                await this.runOnce();
+            }
+            catch (err) {
+                const detail = err instanceof Error ? err.message : String(err);
+                console.error(`[jinn-claim] Tick failed (non-fatal): ${detail}`);
+                if (this.config.jinnStore) {
+                    emitEvent(this.config.jinnStore, {
+                        kind: 'tick_error',
+                        outcome: 'failed',
+                        detail,
+                    }, 'jinn-claim');
+                }
+            }
+            this.config.jinnStore?.setConfigValue('last_jinn_claim_tick_at', new Date().toISOString());
+            await new Promise((r) => setTimeout(r, this.config.intervalMs));
+        }
+    }
+}
+//# sourceMappingURL=jinn-claim-loop.js.map

package/dist/daemon/jinn-claim-loop.js.map

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

package/dist/daemon/reward-claim-loop.d.ts

@@ -10,6 +10,7 @@ import type { PublicClient } from 'viem';
 import type { WalletClient } from 'viem';
 import { FleetStateStore } from '../earning/store.js';
 import { type StolasClaimTickResult } from '../earning/stolas-claim.js';
+import type { FleetState } from '../earning/types.js';
 import type { Store } from '../store/store.js';
 export interface RewardClaimLoopConfig {
     intervalMs: number;
@@ -28,6 +29,7 @@ export type RewardClaimTickConfig = Omit<RewardClaimLoopConfig, 'intervalMs'> &
     strict?: boolean;
 };
 export declare function runRewardClaimOnce(cfg: RewardClaimTickConfig): Promise<StolasClaimTickResult>;
+export declare function recordRewardClaimResult(jinnStore: Store, state: FleetState, result: StolasClaimTickResult, distributorAddress: string | undefined, source?: string): void;
 export declare class RewardClaimLoop {
     private readonly config;
     private stopped;

package/dist/daemon/reward-claim-loop.js

@@ -19,6 +19,37 @@ export async function runRewardClaimOnce(cfg) {
         strict: cfg.strict,
     });
 }
+export function recordRewardClaimResult(jinnStore, state, result, distributorAddress, source = 'reward-claim') {
+    if (result.claims.length === 0)
+        return;
+    const serviceByStakingId = new Map();
+    for (const svc of state.services) {
+        if (svc.service_id != null)
+            serviceByStakingId.set(svc.service_id, svc);
+    }
+    for (const claim of result.claims) {
+        const svc = serviceByStakingId.get(claim.serviceId);
+        if (!svc)
+            continue;
+        const serviceIndex = displayFleetServiceIndex(svc);
+        jinnStore.recordRewardClaim({
+            ts: new Date().toISOString(),
+            serviceIndex,
+            serviceId: claim.serviceId,
+            stakingProxy: claim.stakingProxy,
+            distributor: distributorAddress ?? '0x',
+            txHash: claim.txHash,
+            amountWei: claim.amountWei,
+        });
+        emitEvent(jinnStore, {
+            kind: 'reward_claimed',
+            serviceIndex,
+            txHash: claim.txHash,
+            outcome: 'ok',
+            detail: `Submitted distributor.claim for service ${claim.serviceId} (pre-split queue: ${claim.amountWei} wei; operator collector-slot share only)`,
+        }, source);
+    }
+}
 export class RewardClaimLoop {
     config;
     stopped = false;
@@ -33,33 +64,7 @@ export class RewardClaimLoop {
         if (!this.config.jinnStore || result.claims.length === 0)
             return;
         const state = await this.config.store.load(this.config.chain);
-        const serviceByStakingId = new Map();
-        for (const svc of state.services) {
-            if (svc.service_id != null)
-                serviceByStakingId.set(svc.service_id, svc);
-        }
-        for (const claim of result.claims) {
-            const svc = serviceByStakingId.get(claim.serviceId);
-            if (!svc)
-                continue;
-            const serviceIndex = displayFleetServiceIndex(svc);
-            this.config.jinnStore.recordRewardClaim({
-                ts: new Date().toISOString(),
-                serviceIndex,
-                serviceId: claim.serviceId,
-                stakingProxy: claim.stakingProxy,
-                distributor: this.config.distributorAddress ?? '0x',
-                txHash: claim.txHash,
-                amountWei: claim.amountWei,
-            });
-            emitEvent(this.config.jinnStore, {
-                kind: 'reward_claimed',
-                serviceIndex,
-                txHash: claim.txHash,
-                outcome: 'ok',
-                detail: `Claimed ${claim.amountWei} reward wei for service ${claim.serviceId}`,
-            }, 'reward-claim');
-        }
+        recordRewardClaimResult(this.config.jinnStore, state, result, this.config.distributorAddress, 'reward-claim');
     }
     async run() {
         if (this.config.intervalMs <= 0) {

package/dist/daemon/reward-claim-loop.js.map

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