@jinn-network/client 0.1.2 → 0.1.3-canary.262e5cda

package/dist/earning/orphan-sweep.js

@@ -4,11 +4,12 @@
  *
  * ERC-20 balances on the old Safe are not swept yet — see TODO below.
  */
-import { formatEther, getAddress, zeroAddress } from 'viem';
+import { encodeFunctionData, formatEther, getAddress, zeroAddress } from 'viem';
 import { executeSafeTxDirect } from './safe-adapter.js';
 import { createJinnWalletClient } from './viem-clients.js';
 import { privateKeyToAccount } from 'viem/accounts';
 import { viemSendTransactionWithRetry, waitForTransactionReceiptWithRetry, } from '../tx-retry.js';
+import { ERC20_ABI } from './contracts.js';
 function isZeroishAddress(addr) {
     if (!addr)
         return true;
@@ -128,7 +129,67 @@ async function runOrphanSweepBody(params) {
             }
         }
     }
-    // TODO: sweep ERC-20 (e.g. OLAS) from abandoned Safe via Safe.execTransaction(transfer).
+    // Sweep ERC-20 tokens (e.g. OLAS bond) from the abandoned Safe.
+    const erc20Tokens = params.erc20Tokens ?? [];
+    for (const token of erc20Tokens) {
+        let tokenAddress;
+        try {
+            tokenAddress = getAddress(token.address);
+        }
+        catch {
+            console.error(`[jinn-earning] Service ${serviceIndex}: skipping ERC-20 sweep for invalid address ${token.address} (${token.symbol}).`);
+            continue;
+        }
+        let tokenBalance;
+        try {
+            tokenBalance = await publicClient.readContract({
+                address: tokenAddress,
+                abi: ERC20_ABI,
+                functionName: 'balanceOf',
+                args: [getAddress(abandonedSafeAddress)],
+            });
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            console.error(`[jinn-earning] Service ${serviceIndex}: could not read ${token.symbol} balance on Safe ${abandonedSafeAddress} (${msg}). Skipping ERC-20 sweep for this token.`);
+            continue;
+        }
+        if (tokenBalance === 0n) {
+            continue;
+        }
+        // Encode transfer(masterAddress, balance) calldata for the inner call.
+        const transferData = encodeFunctionData({
+            abi: ERC20_ABI,
+            functionName: 'transfer',
+            args: [getAddress(masterNorm), tokenBalance],
+        });
+        try {
+            const agentBal = await publicClient.getBalance({ address: getAddress(agentAddress) });
+            if (agentBal < minAgentReserveWei) {
+                console.error(`[jinn-earning] Service ${serviceIndex}: agent EOA lacks gas to sweep ${token.symbol} (${tokenBalance}) from Safe ${abandonedSafeAddress}. Fund agent and re-run bootstrap.`);
+                continue;
+            }
+            const { hash } = await executeSafeTxDirect({
+                rpcUrl,
+                signerKey: agentPrivateKey,
+                safeAddress: abandonedSafeAddress,
+                to: tokenAddress,
+                value: 0n,
+                data: transferData,
+            });
+            const receipt = await waitForTransactionReceiptWithRetry(publicClient, hash);
+            if (receipt.status !== 'success') {
+                console.error(`[jinn-earning] Service ${serviceIndex}: ERC-20 sweep tx for ${token.symbol} failed or timed out (safe=${abandonedSafeAddress}, tx=${hash}). Re-run bootstrap to retry.`);
+            }
+            else {
+                console.error(`[jinn-earning] Service ${serviceIndex}: swept ${tokenBalance} ${token.symbol} from orphan Safe ${abandonedSafeAddress} to master (tx: ${hash}).`);
+            }
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            console.error(`[jinn-earning] Service ${serviceIndex}: ERC-20 sweep failed for ${token.symbol} on Safe ${abandonedSafeAddress} (${msg}). Re-run bootstrap to retry or transfer manually to master ${masterNorm}.`);
+        }
+    }
     const agentAccount = privateKeyToAccount(agentPrivateKey);
     const agentWallet = createJinnWalletClient(rpcUrl, network, agentAccount);
     const finalAgentBal = await publicClient.getBalance({ address: getAddress(agentAddress) });

package/dist/earning/orphan-sweep.js.map

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

package/dist/earning/reconcile.d.ts

@@ -27,6 +27,7 @@ export interface ReconcilePatch {
  */
 export declare function reconcileStandardService(index: number, svc: ServiceState, chain: ServiceChainSignals, ctx: {
     stakingContract: string;
+    preserveExistingSetup?: boolean;
 }): ReconcilePatch | null;
 /**
  * Self-bond mode: registry + Safe bytecode + staking.
@@ -34,4 +35,5 @@ export declare function reconcileStandardService(index: number, svc: ServiceStat
 export declare function reconcileSelfBondService(index: number, svc: ServiceState, chain: ServiceChainSignals): ReconcilePatch | null;
 export declare function reconcileServiceAgainstChain(stakingMode: 'standard' | 'self-bond', svc: ServiceState, chain: ServiceChainSignals, ctx: {
     stakingContract: string;
+    preserveExistingSetup?: boolean;
 }): ReconcilePatch | null;

package/dist/earning/reconcile.js

@@ -7,12 +7,16 @@ const ZERO = '0x0000000000000000000000000000000000000000';
 const STANDARD_POST_STAKE = new Set([
     'staked',
     'mech_deployed',
+    'agent_registered',
+    'safe_binding_pending',
     'complete',
 ]);
 const SELF_BOND_STAKE_STEPS = new Set([
     'service_staked',
     'staked',
     'mech_deployed',
+    'agent_registered',
+    'safe_binding_pending',
     'complete',
 ]);
 /** Self-bond registry state → latest local step that must not be ahead of chain (bootstrap idempotency). */
@@ -32,6 +36,8 @@ const STEP_ORDER = [
     'service_staked',
     'staked',
     'mech_deployed',
+    'agent_registered',
+    'safe_binding_pending',
     'complete',
 ];
 function stepIndex(step) {
@@ -69,6 +75,14 @@ export function reconcileStandardService(index, svc, chain, ctx) {
         return null;
     }
     if (chain.stakingState === 'revert') {
+        if (ctx.preserveExistingSetup) {
+            return {
+                message: `[jinn-earning] Service ${index}: existing setup could not be verified automatically. Leaving local service id and wallet fields unchanged for recovery/support.`,
+                patch: {
+                    error: 'Existing setup could not be verified automatically; local setup was preserved.',
+                },
+            };
+        }
         return {
             message: `[jinn-earning] Service ${index}: persisted id=${id} is unknown to the staking contract (RPC reverted). Clearing local service id and Safe/mech fields; next bootstrap will run a fresh distributor stake().`,
             patch: clearServiceIdentity(),
@@ -80,6 +94,14 @@ export function reconcileStandardService(index, svc, chain, ctx) {
     }
     // Crashed after assigning service_id but before stake confirmed — or stale id
     if (svc.step === 'awaiting_stake' && chain.stakingState === 0) {
+        if (ctx.preserveExistingSetup) {
+            return {
+                message: `[jinn-earning] Service ${index}: existing setup appears inactive before bootstrap completed, but it uses a non-default setup address. Leaving local service id and wallet fields unchanged for recovery/support.`,
+                patch: {
+                    error: 'Existing setup appears inactive; local setup was preserved for recovery.',
+                },
+            };
+        }
         return {
             message: `[jinn-earning] Service ${index}: local step was awaiting_stake but service_id=${id} is not staked on-chain. Clearing stale id/Safe/mech; next bootstrap will call distributor stake() cleanly.`,
             patch: clearServiceIdentity(),
@@ -104,6 +126,14 @@ export function reconcileStandardService(index, svc, chain, ctx) {
         };
     }
     if (STANDARD_POST_STAKE.has(svc.step) && chain.stakingState === 0) {
+        if (ctx.preserveExistingSetup) {
+            return {
+                message: `[jinn-earning] Service ${index}: existing setup appears inactive, but it uses a non-default setup address. Leaving local service id and wallet fields unchanged for recovery/support.`,
+                patch: {
+                    error: 'Existing setup appears inactive; local setup was preserved for recovery.',
+                },
+            };
+        }
         return {
             message: `[jinn-earning] Service ${index}: on-chain staking is unstaked for id=${id} while local step was '${svc.step}' (e.g. unstakeAndWithdraw or a crashed tx). Resetting to awaiting_stake; next bootstrap will provision a new service via the distributor.`,
             patch: clearServiceIdentity(),

package/dist/earning/reconcile.js.map

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

package/dist/earning/stolas-claim.d.ts

@@ -1,19 +1,40 @@
 /**
- * stOLAS ExternalStakingDistributor reward claims for fleet services.
+ * Staking reward claims for fleet services.
  *
- * The distributor's claim() calls checkpointAndClaim on each staking proxy; the OLAS-style
- * staking implementation reverts on zero reward, so we read calculateStakingReward first and
- * skip sends when pending is zero (no revert loop).
+ * Two paths depending on staking_mode:
  *
- * TODO(self-bond): rewards are owned by the service Safe; wire Safe-batched staking.claim /
- * checkpointAndClaim when staking_mode is self-bond (not distributor-mediated).
+ * standard — delegates to the stOLAS ExternalStakingDistributor.
+ *   The distributor's claim() calls checkpointAndClaim on each staking proxy;
+ *   the OLAS-style staking implementation reverts on zero reward, so we read
+ *   calculateStakingReward first and skip sends when pending is zero (no revert
+ *   loop).
+ *
+ * self-bond — rewards are owned by the service Safe (not the distributor).
+ *   The operator must call staking.checkpointAndClaim(serviceId) directly from
+ *   the Safe. This path builds and submits a Safe transaction via
+ *   executeSafeTxDirect, signed by the agent EOA (1-of-1 Safe owner).
  */
+import { type Hex } from 'viem';
 import type { PublicClient } from 'viem';
 import type { WalletClient } from 'viem';
 import type { ServiceState, StakingMode } from './types.js';
+import { executeSafeTxDirect } from './safe-adapter.js';
+import { viemSendTransactionWithRetry, waitForTransactionReceiptWithRetry } from '../tx-retry.js';
 export interface StolasClaimTarget {
     stakingProxy: string;
     serviceId: number;
+    /**
+     * Required for self-bond claims: the service Safe address that owns the
+     * staking position and will receive the reward.
+     */
+    safeAddress?: string;
+    /**
+     * Required for self-bond claims: the agent EOA private key (1-of-1 Safe
+     * owner) that signs and submits the Safe transaction.
+     */
+    agentPrivateKey?: Hex;
+    /** RPC URL forwarded from the fleet config for self-bond Safe execution. */
+    rpcUrl?: string;
 }
 /**
  * Services that may need distributor.claim (pure filter for tests and tick).
@@ -37,6 +58,14 @@ export interface StolasClaimTickResult {
         amountWei: string;
     }>;
 }
+/**
+ * Injectable retry-function dependencies for {@link tickStolasDistributorClaims}.
+ * Defaults to the production implementations from `tx-retry.ts`.
+ */
+export interface StolasClaimRetryDeps {
+    sendTx: typeof viemSendTransactionWithRetry;
+    waitForReceipt: typeof waitForTransactionReceiptWithRetry;
+}
 /**
  * For each fleet service with pending staking rewards, submit distributor.claim([proxy],[id]).
  * Errors on individual services are logged and swallowed so the daemon loop stays healthy.
@@ -50,4 +79,55 @@ export declare function tickStolasDistributorClaims(publicClient: PublicClient,
      * any permanent/receipt failure surfaces a normal Error. Daemon callers omit this.
      */
     strict?: boolean;
+    /** Injectable retry deps — defaults to production implementations. */
+    retryDeps?: StolasClaimRetryDeps;
 }): Promise<StolasClaimTickResult>;
+export interface SelfBondClaimTickResult {
+    attempted: number;
+    submitted: number;
+    skippedNoPending: number;
+    skippedWrongMode: boolean;
+    /** Services skipped due to missing safeAddress / agentPrivateKey / rpcUrl. */
+    skippedMissingConfig: number;
+    claimAttempted: number;
+    failedRecoverable: number;
+    failedPermanent: number;
+    claims: Array<{
+        serviceId: number;
+        stakingProxy: string;
+        txHash: string;
+        amountWei: string;
+    }>;
+}
+/**
+ * Injectable Safe execution dependency for {@link tickSelfBondStakingClaims}.
+ * Defaults to the production {@link executeSafeTxDirect} helper.
+ */
+export interface SelfBondClaimDeps {
+    executeSafeTx: typeof executeSafeTxDirect;
+    waitForReceipt: typeof waitForTransactionReceiptWithRetry;
+}
+/**
+ * For each self-bond service with pending staking rewards, submit
+ * staking.checkpointAndClaim(serviceId) from the service Safe via
+ * executeSafeTxDirect.
+ *
+ * In self-bond mode rewards accrue directly to the service Safe (no
+ * distributor intermediary). The caller must populate each target's
+ * `safeAddress`, `agentPrivateKey`, and `rpcUrl` fields.
+ *
+ * Errors on individual services are logged and swallowed so the daemon loop
+ * stays healthy.
+ */
+export declare function tickSelfBondStakingClaims(publicClient: PublicClient, options: {
+    stakingMode: StakingMode;
+    targets: StolasClaimTarget[];
+    /**
+     * When true (CLI), all claim sends failing recoverably surfaces
+     * {@link TransientError}; any permanent failure surfaces a normal Error.
+     * Daemon callers omit this.
+     */
+    strict?: boolean;
+    /** Injectable deps — defaults to production implementations. */
+    deps?: SelfBondClaimDeps;
+}): Promise<SelfBondClaimTickResult>;

package/dist/earning/stolas-claim.js

@@ -1,22 +1,31 @@
 /**
- * stOLAS ExternalStakingDistributor reward claims for fleet services.
+ * Staking reward claims for fleet services.
  *
- * The distributor's claim() calls checkpointAndClaim on each staking proxy; the OLAS-style
- * staking implementation reverts on zero reward, so we read calculateStakingReward first and
- * skip sends when pending is zero (no revert loop).
+ * Two paths depending on staking_mode:
  *
- * TODO(self-bond): rewards are owned by the service Safe; wire Safe-batched staking.claim /
- * checkpointAndClaim when staking_mode is self-bond (not distributor-mediated).
+ * standard — delegates to the stOLAS ExternalStakingDistributor.
+ *   The distributor's claim() calls checkpointAndClaim on each staking proxy;
+ *   the OLAS-style staking implementation reverts on zero reward, so we read
+ *   calculateStakingReward first and skip sends when pending is zero (no revert
+ *   loop).
+ *
+ * self-bond — rewards are owned by the service Safe (not the distributor).
+ *   The operator must call staking.checkpointAndClaim(serviceId) directly from
+ *   the Safe. This path builds and submits a Safe transaction via
+ *   executeSafeTxDirect, signed by the agent EOA (1-of-1 Safe owner).
  */
 import { encodeFunctionData, getAddress } from 'viem';
 import { STOLAS_DISTRIBUTOR_ABI } from './contracts.js';
 import { JINN_STAKING_ABI } from './jinn-rewards.js';
+import { executeSafeTxDirect } from './safe-adapter.js';
 import { isRecoverableTransactionError, viemSendTransactionWithRetry, waitForTransactionReceiptWithRetry, } from '../tx-retry.js';
 import { TransientError } from '../types/errors.js';
 /** Steps where the service is staked and may accrue staking rewards. */
 const STEPS_WITH_STAKING_REWARDS = new Set([
     'staked',
     'mech_deployed',
+    'agent_registered',
+    'safe_binding_pending',
     'complete',
 ]);
 /**
@@ -38,6 +47,7 @@ export function listStolasClaimTargets(services) {
  * Errors on individual services are logged and swallowed so the daemon loop stays healthy.
  */
 export async function tickStolasDistributorClaims(publicClient, masterWallet, options) {
+    const { sendTx = viemSendTransactionWithRetry, waitForReceipt = waitForTransactionReceiptWithRetry } = options.retryDeps ?? {};
     const result = {
         attempted: 0,
         submitted: 0,
@@ -77,13 +87,13 @@ export async function tickStolasDistributorClaims(publicClient, masterWallet, op
                 functionName: 'claim',
                 args: [[getAddress(stakingProxy)], [BigInt(serviceId)]],
             });
-            const txHash = await viemSendTransactionWithRetry(masterWallet, publicClient, {
+            const txHash = await sendTx(masterWallet, publicClient, {
                 account: masterWallet.account,
                 to: getAddress(distributor),
                 data,
                 gas: 1200000n,
             });
-            const receipt = await waitForTransactionReceiptWithRetry(publicClient, txHash);
+            const receipt = await waitForReceipt(publicClient, txHash);
             if (receipt.status !== 'success') {
                 result.failedPermanent += 1;
                 console.error(`[reward-claim] claim tx failed for service ${serviceId} (hash=${txHash})`);
@@ -96,7 +106,9 @@ export async function tickStolasDistributorClaims(publicClient, masterWallet, op
                 txHash: String(txHash),
                 amountWei: pending.toString(),
             });
-            console.log(`[reward-claim] Submitted distributor.claim for service ${serviceId} (~${pending.toString()} wei pending before tx)`);
+            console.log(`[reward-claim] Submitted distributor.claim for service ${serviceId} ` +
+                `(~${pending.toString()} wei pre-split — actual operator share is the ` +
+                `collector slot only; protocol/curating shares route per stOLAS proxy config)`);
         }
         catch (err) {
             if (isRecoverableTransactionError(err)) {
@@ -119,4 +131,106 @@ export async function tickStolasDistributorClaims(publicClient, masterWallet, op
     }
     return result;
 }
+/**
+ * For each self-bond service with pending staking rewards, submit
+ * staking.checkpointAndClaim(serviceId) from the service Safe via
+ * executeSafeTxDirect.
+ *
+ * In self-bond mode rewards accrue directly to the service Safe (no
+ * distributor intermediary). The caller must populate each target's
+ * `safeAddress`, `agentPrivateKey`, and `rpcUrl` fields.
+ *
+ * Errors on individual services are logged and swallowed so the daemon loop
+ * stays healthy.
+ */
+export async function tickSelfBondStakingClaims(publicClient, options) {
+    const { executeSafeTx = executeSafeTxDirect, waitForReceipt = waitForTransactionReceiptWithRetry, } = options.deps ?? {};
+    const result = {
+        attempted: 0,
+        submitted: 0,
+        skippedNoPending: 0,
+        skippedWrongMode: false,
+        skippedMissingConfig: 0,
+        claimAttempted: 0,
+        failedRecoverable: 0,
+        failedPermanent: 0,
+        claims: [],
+    };
+    if (options.stakingMode !== 'self-bond') {
+        result.skippedWrongMode = true;
+        return result;
+    }
+    for (const target of options.targets) {
+        const { stakingProxy, serviceId, safeAddress, agentPrivateKey, rpcUrl } = target;
+        result.attempted += 1;
+        if (!safeAddress || !agentPrivateKey || !rpcUrl) {
+            result.skippedMissingConfig += 1;
+            console.error(`[reward-claim] Self-bond: service ${serviceId} skipped — missing safeAddress, agentPrivateKey, or rpcUrl on claim target.`);
+            continue;
+        }
+        try {
+            const pending = await publicClient.readContract({
+                address: getAddress(stakingProxy),
+                abi: JINN_STAKING_ABI,
+                functionName: 'calculateStakingReward',
+                args: [BigInt(serviceId)],
+            });
+            if (pending === 0n) {
+                result.skippedNoPending += 1;
+                continue;
+            }
+            result.claimAttempted += 1;
+            // Build checkpointAndClaim(serviceId) calldata — the staking contract
+            // gates normal claim() with a checkpoint requirement on OLAS-style
+            // staking proxies; checkpointAndClaim is safe to call in either case.
+            const data = encodeFunctionData({
+                abi: JINN_STAKING_ABI,
+                functionName: 'checkpointAndClaim',
+                args: [BigInt(serviceId)],
+            });
+            const { hash: txHash } = await executeSafeTx({
+                rpcUrl,
+                signerKey: agentPrivateKey,
+                safeAddress,
+                to: getAddress(stakingProxy),
+                value: 0n,
+                data,
+                gasLimit: 500000n,
+            });
+            const receipt = await waitForReceipt(publicClient, txHash);
+            if (receipt.status !== 'success') {
+                result.failedPermanent += 1;
+                console.error(`[reward-claim] Self-bond claim tx failed for service ${serviceId} (hash=${txHash})`);
+                continue;
+            }
+            result.submitted += 1;
+            result.claims.push({
+                serviceId,
+                stakingProxy: getAddress(stakingProxy),
+                txHash: String(txHash),
+                amountWei: pending.toString(),
+            });
+            console.log(`[reward-claim] Self-bond: submitted checkpointAndClaim for service ${serviceId} via Safe ${safeAddress} (~${pending.toString()} wei pending before tx)`);
+        }
+        catch (err) {
+            if (isRecoverableTransactionError(err)) {
+                result.failedRecoverable += 1;
+            }
+            else {
+                result.failedPermanent += 1;
+            }
+            console.error(`[reward-claim] Self-bond: skipped service ${serviceId}:`, err instanceof Error ? err.message : err);
+        }
+    }
+    if (options.strict) {
+        const totalFailed = result.failedRecoverable + result.failedPermanent;
+        if (result.submitted === 0 && totalFailed > 0 && result.failedPermanent === 0) {
+            throw new TransientError(`Self-bond claim: all ${totalFailed} failed service check(s) / claim attempt(s) hit recoverable errors.`);
+        }
+        if (result.submitted === 0 && result.failedPermanent > 0) {
+            throw new Error(`Self-bond claim: all ${totalFailed} failed service check(s) / claim attempt(s) were non-recoverable or had bad receipts.`);
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=stolas-claim.js.map

package/dist/earning/stolas-claim.js.map

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

package/dist/earning/store.d.ts

@@ -10,6 +10,38 @@ export declare const DEFAULT_EARNING_DIR: string;
 export declare const STATE_FILE = "earning_state.json";
 export declare const MNEMONIC_KEYSTORE_FILE = "master_keystore.json";
 export declare const LEGACY_KEYSTORE_FILE = "agent_keystore.json";
+export declare const MIGRATIONS_FILE = "earning_migrations.json";
+export type EarningMigrationKind = 'base-sepolia-standard-setup';
+export type EarningMigrationRetireStatus = 'pending' | 'retired' | 'already_inactive' | 'failed';
+export interface EarningMigrationArchiveEntry {
+    migration_id: string;
+    kind: EarningMigrationKind;
+    chain: 'base' | 'base-sepolia';
+    service_index: number;
+    created_at: string;
+    updated_at: string;
+    backup_state_path: string;
+    from: {
+        service_id: number | null;
+        safe_address: string | null;
+        mech_address: string | null;
+        staking_address: string | null;
+        step: string;
+        agent_id: string | null;
+    };
+    to: {
+        staking_address: string;
+    };
+    retire_status: EarningMigrationRetireStatus;
+    retire_tx_hash?: string | null;
+    retire_error?: string | null;
+    state_reset_at?: string | null;
+}
+export interface EarningMigrationArchive {
+    schemaVersion: 1;
+    updated_at: string;
+    entries: EarningMigrationArchiveEntry[];
+}
 /** Absolute path to the encrypted mnemonic keystore for a given earning dir. */
 export declare function mnemonicKeystorePath(earningDir: string): string;
 /** Parse fleet JSON without side effects (for status / read-only tools). */
@@ -18,6 +50,7 @@ export declare class FleetStateStore {
     private readonly statePath;
     private readonly mnemonicKeystorePath;
     private readonly legacyKeystorePath;
+    private readonly migrationsPath;
     private readonly earningDir;
     constructor(earningDir?: string);
     get dir(): string;
@@ -33,6 +66,12 @@ export declare class FleetStateStore {
     tryLoadExisting(): Promise<FleetState | null>;
     load(chain?: 'base' | 'base-sepolia'): Promise<FleetState>;
     save(state: FleetState): Promise<FleetState>;
+    backupStateFile(label: string): Promise<string | null>;
+    loadMigrationArchive(): Promise<EarningMigrationArchive>;
+    upsertMigrationArchiveEntry(entry: Omit<EarningMigrationArchiveEntry, 'created_at' | 'updated_at'> & {
+        created_at?: string;
+        updated_at?: string;
+    }): Promise<EarningMigrationArchiveEntry>;
     patchFleet(patch: Partial<Omit<FleetState, 'services'>>): Promise<FleetState>;
     updateService(index: number, patch: Partial<ServiceState>): Promise<FleetState>;
     addService(service: ServiceState): Promise<FleetState>;