@jinn-network/client 0.1.2 → 0.1.3-canary.24b69ea4

package/dist/earning/migrate-agent-id.js

@@ -0,0 +1,256 @@
+/**
+ * Legacy backfill: ERC-8004 IdentityRegistry mint for `complete` services
+ * that pre-date jinn-mono-j07.
+ *
+ * j07 added an `agent_registered` step to the bootstrap state machine,
+ * slotted between `mech_deployed` and `complete`. Operators that completed
+ * bootstrap BEFORE j07 landed have `state == 'complete' && agent_id == null`
+ * and are stuck — they cannot publish per-execution metadata via
+ * `setMetadata` (jinn-mono-3zk wires that, but it is gated on a non-null
+ * `agent_id`).
+ *
+ * This module detects such services and runs the agent-registration mint
+ * idempotently for each. It is safe to re-run: services that already have
+ * an `agent_id` are skipped, and a chain-side lookup recovers the existing
+ * agentId for any operator whose state file was lost but whose Safe still
+ * owns the NFT (per the entity-model decision record §4.1, the operator
+ * agent NFT is stable across executions / re-stakes — we MUST never
+ * mint a duplicate).
+ *
+ * Wired in two places:
+ *   - daemon startup (`main.ts` after `bootstrap`), gated by
+ *     `runLegacyMigrations` config flag (default true)
+ *   - explicit CLI subcommand `jinn migrate-agent-id`
+ *
+ * Tracked as jinn-mono-jgp.
+ */
+import { decodeEventLog, encodeFunctionData, getAddress, parseAbiItem, } from 'viem';
+import { EVENT_TOPICS, IDENTITY_REGISTRY_ABI, IDENTITY_REGISTRY_ADDRESSES, getChainConfig, } from './contracts.js';
+import { FleetStateStore } from './store.js';
+import { createJinnPublicClient, createJinnWalletClient, } from './viem-clients.js';
+import { decryptMnemonic, deriveAgentSigner, } from './wallet.js';
+import { viemSendTransactionWithRetry, waitForTransactionReceiptWithRetry, } from '../tx-retry.js';
+const REGISTERED_TOPIC = EVENT_TOPICS.Registered;
+/**
+ * Typed `Registered` event item for `publicClient.getLogs({ event, args })`.
+ * The runtime topic hash is identical to `EVENT_TOPICS.Registered` (both are
+ * `keccak256(stringToBytes('Registered(uint256,string,address)'))`).
+ */
+const REGISTERED_EVENT = parseAbiItem('event Registered(uint256 indexed agentId, string agentURI, address indexed owner)');
+/**
+ * Scan past `Registered(uint256 indexed agentId, string agentURI, address indexed owner)`
+ * events on the IdentityRegistry, filtered by indexed `owner`, and return
+ * the most recent agentId minted for that owner (or null if none).
+ *
+ * This is the duplicate-mint guard: per DR §4.1, the operator agent NFT
+ * is stable across executions and survives Safe rotation. If an
+ * operator's state file lost the `agent_id` (e.g. corrupted backup),
+ * we MUST recover the existing token rather than minting a new one.
+ *
+ * The scan uses the indexed `owner` topic so the RPC can return only
+ * matching logs cheaply. We chunk by `scanChunkSize` to stay under
+ * provider log-limit caps. The mint is one-shot per owner in our flow,
+ * so we expect 0 or 1 hits.
+ */
+export async function findAgentIdForOwner(publicClient, identityRegistry, owner, options = {}) {
+    const fromBlock = options.fromBlock ?? 0n;
+    const chunkSize = options.chunkSize ?? 9999n;
+    const latest = await publicClient.getBlockNumber();
+    for (let start = fromBlock; start <= latest; start += chunkSize + 1n) {
+        const end = start + chunkSize > latest ? latest : start + chunkSize;
+        const logs = await publicClient.getLogs({
+            address: identityRegistry,
+            event: REGISTERED_EVENT,
+            args: { owner },
+            fromBlock: start,
+            toBlock: end,
+        });
+        for (const log of logs) {
+            const args = log.args;
+            if (args.agentId === undefined)
+                continue;
+            return {
+                agentId: args.agentId.toString(),
+                agentURI: args.agentURI ?? '',
+                txHash: log.transactionHash ?? '',
+            };
+        }
+    }
+    return null;
+}
+/**
+ * Parse `agentId` from a fresh `IdentityRegistry.register()` receipt.
+ * Mirrors `FleetBootstrapper.parseAgentIdFromReceipt` (private) so we
+ * don't have to re-export the bootstrap class for tests.
+ */
+function parseAgentIdFromReceipt(receipt, identityRegistry) {
+    const target = identityRegistry.toLowerCase();
+    for (const log of receipt.logs) {
+        if (log.address.toLowerCase() !== target)
+            continue;
+        if (log.topics[0] !== REGISTERED_TOPIC)
+            continue;
+        try {
+            const decoded = decodeEventLog({
+                abi: IDENTITY_REGISTRY_ABI,
+                data: log.data,
+                topics: log.topics,
+                strict: false,
+            });
+            if (decoded.eventName !== 'Registered')
+                continue;
+            if (!('agentId' in decoded.args))
+                continue;
+            return {
+                agentId: decoded.args.agentId.toString(),
+                agentURI: 'agentURI' in decoded.args ? String(decoded.args.agentURI ?? '') : '',
+            };
+        }
+        catch {
+            // Not a matching event
+        }
+    }
+    return null;
+}
+/**
+ * Mint a fresh ERC-8004 agent NFT for the agent EOA derived at the
+ * given fleet service index. Used only when the chain-side lookup
+ * confirms no existing token. Returns the parsed agentId + tx hash.
+ *
+ * Mirrors `FleetBootstrapper.stepRegisterAgent` (private), but does
+ * NOT mutate the persisted `step` — the migration writes only to the
+ * agent_id / agent_uri / identity_registry_address / agent_registered_tx
+ * fields and leaves `step` at `complete` so the daemon picks up
+ * normally.
+ */
+async function mintAgentNftForOwner(publicClient, walletClient, account, identityRegistry) {
+    const agentURI = '';
+    const data = encodeFunctionData({
+        abi: IDENTITY_REGISTRY_ABI,
+        functionName: 'register',
+        args: [agentURI],
+    });
+    const txHash = await viemSendTransactionWithRetry(walletClient, publicClient, {
+        account: account,
+        to: identityRegistry,
+        data,
+    });
+    const receipt = await waitForTransactionReceiptWithRetry(publicClient, txHash);
+    if (receipt.status !== 'success') {
+        throw new Error(`IdentityRegistry.register() tx reverted (tx: ${txHash})`);
+    }
+    const parsed = parseAgentIdFromReceipt(receipt, identityRegistry);
+    if (parsed === null) {
+        throw new Error(`IdentityRegistry.register() succeeded but Registered event was not found (tx: ${txHash})`);
+    }
+    return { agentId: parsed.agentId, agentURI: parsed.agentURI, txHash };
+}
+/**
+ * Backfill `agent_id` on every service whose state is `complete` but
+ * which has no persisted agentId.
+ *
+ * Behaviour:
+ *   - `state == 'complete' && agent_id == null` → migrated (recover existing
+ *     NFT from chain if the agent EOA already owns one, else mint a new one).
+ *   - `state == 'complete' && agent_id != null` → skipped.
+ *   - any other step → ignored (the normal `stepRegisterAgent` path handles
+ *     them when bootstrap resumes).
+ *
+ * Failures are isolated per service; one mint reverting does not abort
+ * the rest of the migration.
+ */
+export async function migrateAgentIds(deps) {
+    const { stateStore, config, network, mnemonic } = deps;
+    const identityRegistry = config.identityRegistry
+        ?? IDENTITY_REGISTRY_ADDRESSES[config.chainId];
+    if (!identityRegistry) {
+        throw new Error(`IdentityRegistry address not configured for chainId=${config.chainId}; ` +
+            `update IDENTITY_REGISTRY_ADDRESSES in earning/contracts.ts.`);
+    }
+    const registryAddr = getAddress(identityRegistry);
+    const publicClient = deps.publicClient ?? createJinnPublicClient(config.rpcUrl, network);
+    const state = await stateStore.load(network);
+    const migrated = [];
+    const skipped = [];
+    const failed = [];
+    for (const svc of state.services) {
+        if (svc.step !== 'complete')
+            continue;
+        if (svc.agent_id) {
+            skipped.push(svc);
+            continue;
+        }
+        try {
+            const agentSigner = deriveAgentSigner(mnemonic, svc.index);
+            const agentEoa = getAddress(agentSigner.address);
+            // 1. Duplicate-mint guard: scan chain for an existing Registered
+            //    event whose `owner` is this agent EOA. If found, recover
+            //    instead of minting (DR §4.1).
+            const existing = await findAgentIdForOwner(publicClient, registryAddr, agentEoa, {
+                fromBlock: deps.scanFromBlock,
+                chunkSize: deps.scanChunkSize,
+            });
+            let agentId;
+            let agentURI;
+            let txHash;
+            if (existing) {
+                console.error(`[migrate-agent-id] Service ${svc.index}: recovered existing agentId=${existing.agentId} ` +
+                    `for agent EOA ${agentEoa} (tx=${existing.txHash || 'unknown'}); no mint needed.`);
+                agentId = existing.agentId;
+                agentURI = existing.agentURI;
+                txHash = existing.txHash;
+            }
+            else {
+                console.error(`[migrate-agent-id] Service ${svc.index}: minting ERC-8004 agent NFT ` +
+                    `(IdentityRegistry=${registryAddr}, agentEOA=${agentEoa})`);
+                const walletClient = deps.walletClientFactory?.(agentSigner)
+                    ?? createJinnWalletClient(config.rpcUrl, network, agentSigner);
+                const minted = await mintAgentNftForOwner(publicClient, walletClient, agentSigner, registryAddr);
+                agentId = minted.agentId;
+                agentURI = minted.agentURI;
+                txHash = minted.txHash;
+                console.error(`[migrate-agent-id] Service ${svc.index}: minted agentId=${agentId} (tx=${txHash})`);
+            }
+            // Persist immediately. We deliberately leave `step: 'complete'` —
+            // the migration's job is purely to backfill the agent fields, not
+            // to rewind the state machine. The daemon (main.ts) reads agent_id
+            // from the loaded state and wires the IdentityPublisher accordingly.
+            await stateStore.updateService(svc.index, {
+                agent_id: agentId,
+                agent_uri: agentURI,
+                identity_registry_address: registryAddr,
+                agent_registered_tx: txHash || null,
+                // Keep safe_bound_to_agent at its persisted value (default false);
+                // setAgentWallet is tracked by jinn-mono-aev.
+            });
+            const refreshed = (await stateStore.load(network)).services.find(s => s.index === svc.index);
+            if (refreshed) {
+                migrated.push(refreshed);
+            }
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            console.error(`[migrate-agent-id] Service ${svc.index}: migration failed — ${message}`);
+            failed.push({ service: svc, error: message });
+        }
+    }
+    return { migrated, skipped, failed };
+}
+export async function runLegacyAgentIdMigration(options) {
+    const stateStore = new FleetStateStore(options.earningDir);
+    const config = getChainConfig(options.network, {
+        testnetL2DeploymentPath: options.testnetL2DeploymentPath,
+        testnetL2TokenDeploymentPath: options.testnetL2TokenDeploymentPath,
+        testnetMechDeploymentPath: options.testnetMechDeploymentPath,
+        testnetStolasDeploymentPath: options.testnetStolasDeploymentPath,
+    });
+    config.rpcUrl = options.rpcUrl;
+    const mnemonic = await decryptMnemonic(await stateStore.loadMnemonicKeystore(), options.password);
+    return migrateAgentIds({
+        stateStore,
+        config,
+        network: options.network,
+        mnemonic,
+    });
+}
+//# sourceMappingURL=migrate-agent-id.js.map

package/dist/earning/migrate-agent-id.js.map

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

package/dist/earning/orphan-sweep.d.ts

@@ -14,6 +14,13 @@ import type { PublicClient } from 'viem';
  * address that will no longer be tracked so we can sweep it first.
  */
 export declare function previousSafeBeingAbandoned(svc: ServiceState, patch: Partial<ServiceState>): string | null;
+/** An ERC-20 token to sweep from the abandoned Safe. */
+export interface Erc20SweepToken {
+    /** Checksummed token contract address. */
+    address: string;
+    /** Human-readable symbol for log messages. */
+    symbol: string;
+}
 export interface SweepOrphanedServiceFundsParams {
     rpcUrl: string;
     network: JinnOnchainNetwork;
@@ -25,6 +32,13 @@ export interface SweepOrphanedServiceFundsParams {
     agentAddress: string;
     abandonedSafeAddress: string;
     minAgentReserveWei: bigint;
+    /**
+     * ERC-20 tokens to sweep from the abandoned Safe (e.g. OLAS bond).
+     * Each token with a non-zero balance on the Safe will be transferred
+     * to `masterAddress` via Safe.execTransaction. If omitted, no ERC-20
+     * sweep is attempted.
+     */
+    erc20Tokens?: Erc20SweepToken[];
 }
 /**
  * Sweep ETH from an abandoned deployed Safe (via Safe.execTransaction) and excess

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":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAwB1D,MAAM,mBAAmB,GAA6B,IAAI,GAAG,CAAC;IAC5D,QAAQ;IACR,eAAe;IACf,UAAU;CACX,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAA6B,IAAI,GAAG,CAAC;IAC9D,gBAAgB;IAChB,QAAQ;IACR,eAAe;IACf,UAAU;CACX,CAAC,CAAC;AAEH,4GAA4G;AAC5G,MAAM,iBAAiB,GAAgC;IACrD,CAAC,EAAE,iBAAiB;IACpB,CAAC,EAAE,mBAAmB;IACtB,CAAC,EAAE,mBAAmB;IACtB,CAAC,EAAE,kBAAkB;IACrB,CAAC,EAAE,gBAAgB;CACpB,CAAC;AAEF,MAAM,UAAU,GAAkB;IAChC,gBAAgB;IAChB,iBAAiB;IACjB,mBAAmB;IACnB,mBAAmB;IACnB,kBAAkB;IAClB,gBAAgB;IAChB,QAAQ;IACR,eAAe;IACf,UAAU;CACX,CAAC;AAEF,SAAS,SAAS,CAAC,IAAiB;IAClC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,gBAAgB,CAAC,IAA+B;IACvD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,CAAC;QACH,OAAO,UAAU,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,IAAI;QAClB,YAAY,EAAE,IAAI;QAClB,eAAe,EAAE,IAAI;QACrB,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,IAAI;KACZ,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAa,EACb,GAAiB,EACjB,KAA0B,EAC1B,GAAgC;IAEhC,IAAI,GAAG,CAAC,UAAU,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC;IAE1B,IAAI,KAAK,CAAC,YAAY,KAAK,cAAc,IAAI,KAAK,CAAC,aAAa,KAAK,cAAc,EAAE,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO;YACL,OAAO,EAAE,0BAA0B,KAAK,kBAAkB,EAAE,0JAA0J;YACtN,KAAK,EAAE,oBAAoB,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QAC7B,6DAA6D;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8EAA8E;IAC9E,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9D,OAAO;YACL,OAAO,EAAE,0BAA0B,KAAK,kDAAkD,EAAE,6GAA6G;YACzM,KAAK,EAAE,oBAAoB,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,0EAA0E;IAC1E,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,GACR,KAAK,CAAC,eAAe,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,eAAe,CAAC;YAC/D,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC;YACnC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC;QACvB,IAAI,CAAC,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO;YACL,OAAO,EAAE,0BAA0B,KAAK,uBAAuB,EAAE,6EAA6E,IAAI,IAAI;YACtJ,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,YAAY,EAAE,IAAI;gBAClB,eAAe,EAAE,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC;gBAChD,KAAK,EAAE,IAAI;aACZ;SACF,CAAC;IACJ,CAAC;IAED,IAAI,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QAClE,OAAO;YACL,OAAO,EAAE,0BAA0B,KAAK,yCAAyC,EAAE,0BAA0B,GAAG,CAAC,IAAI,4IAA4I;YACjQ,KAAK,EAAE,oBAAoB,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,uBAAuB,CAAC,aAAqB;IACpD,IAAI,aAAa,IAAI,CAAC;QAAE,OAAO,gBAAgB,CAAC;IAChD,OAAO,iBAAiB,CAAC,aAAa,CAAC,IAAI,iBAAiB,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CACtC,KAAa,EACb,GAAiB,EACjB,KAA0B;IAE1B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IAEtB,IAAI,KAAK,CAAC,YAAY,KAAK,cAAc,IAAI,KAAK,CAAC,aAAa,KAAK,cAAc,EAAE,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6EAA6E;IAC7E,IACE,IAAI,KAAK,gBAAgB;QACzB,GAAG,CAAC,YAAY;QAChB,KAAK,CAAC,YAAY,KAAK,KAAK,EAC5B,CAAC;QACD,OAAO;YACL,OAAO,EAAE,0BAA0B,KAAK,UAAU,GAAG,CAAC,YAAY,iDAAiD,IAAI,0EAA0E;YACjM,KAAK,EAAE,oBAAoB,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,GAAG,CAAC,UAAU,CAAC;QAE1B,IAAI,KAAK,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO;gBACL,OAAO,EAAE,0BAA0B,KAAK,4BAA4B,EAAE,8GAA8G;gBACpL,KAAK,EAAE;oBACL,UAAU,EAAE,IAAI;oBAChB,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;oBACrB,IAAI,EAAE,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB;oBACxE,KAAK,EAAE,IAAI;iBACZ;aACF,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC;QAChC,MAAM,eAAe,GACnB,KAAK,CAAC,gBAAgB,KAAK,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAE9E,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,eAAe,EAAE,CAAC;YAC5D,OAAO;gBACL,OAAO,EAAE,0BAA0B,KAAK,qCAAqC,EAAE,sHAAsH,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,IAAI;gBAC3Q,KAAK,EAAE;oBACL,UAAU,EAAE,IAAI;oBAChB,YAAY,EAAE,IAAI;oBAClB,eAAe,EAAE,IAAI;oBACrB,IAAI,EAAE,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB;oBACxE,KAAK,EAAE,IAAI;iBACZ;aACF,CAAC;QACJ,CAAC;QAED,gGAAgG;QAChG,IAAI,KAAK,CAAC,YAAY,KAAK,QAAQ,IAAI,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACvE,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;oBACL,OAAO,EAAE,0BAA0B,KAAK,aAAa,EAAE,kGAAkG;oBACzJ,KAAK,EAAE;wBACL,IAAI,EAAE,gBAAgB;wBACtB,YAAY,EAAE,IAAI;wBAClB,KAAK,EAAE,IAAI;qBACZ;iBACF,CAAC;YACJ,CAAC;YACD,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO;oBACL,OAAO,EAAE,0BAA0B,KAAK,aAAa,EAAE,iDAAiD,IAAI,kFAAkF;oBAC9L,KAAK,EAAE;wBACL,IAAI,EAAE,gBAAgB;wBACtB,YAAY,EAAE,IAAI;wBAClB,KAAK,EAAE,IAAI;qBACZ;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzC,MAAM,KAAK,GAA0B;oBACnC,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,IAAI;iBACZ,CAAC;gBACF,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC7C,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;gBAC5B,CAAC;gBACD,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACrD,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;gBAC/B,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,0BAA0B,KAAK,iBAAiB,IAAI,kCAAkC,GAAG,YAAY,EAAE,mBAAmB,OAAO,yDAAyD;oBACnM,KAAK;iBACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,WAAqC,EACrC,GAAiB,EACjB,KAA0B,EAC1B,GAAgC;IAEhC,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/earning/reconcile.ts"],"names":[],"mappings":"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"}

package/dist/earning/safe-adapter.js

@@ -10,7 +10,23 @@ import { bytesToHex, concat, createPublicClient, createWalletClient, encodeFunct
 import { base, baseSepolia } from 'viem/chains';
 import { privateKeyToAccount } from 'viem/accounts';
 import { viemFeeOverridesForAttempt, withRecoverableRetry } from '../tx-retry.js';
-const SAFE_EXECUTION_FALLBACK_GAS_LIMIT = 2_000_000;
+/**
+ * Lower bound used only when on-chain `eth_estimateGas` itself fails (RPC error,
+ * contract reverts during simulation, etc.). Real bootstrap operations call
+ * `estimateGas` first and apply a 30 % buffer; this fallback exists so a
+ * temporarily flaky RPC does not block a tx that would otherwise succeed.
+ *
+ * Set high enough to cover the most gas-heavy Safe wrapper we know about
+ * (mech deploy on Base Sepolia: ~2.23M as of 2026-05-04). 5M leaves headroom
+ * for small drifts without tripping a sane RPC's per-tx upper bound.
+ */
+const SAFE_EXECUTION_FALLBACK_GAS_LIMIT = 5_000_000;
+/** Buffer applied to `estimateGas` results to absorb minor variance between
+ *  estimation and actual execution gas (storage refunds, warm/cold slot
+ *  differences, etc.). 30 % matches viem's `multiplier` default ballpark and
+ *  keeps us well clear of the cap on the heaviest call we measure. */
+const SAFE_EXECUTION_GAS_ESTIMATE_BUFFER_NUMERATOR = 130n;
+const SAFE_EXECUTION_GAS_ESTIMATE_BUFFER_DENOMINATOR = 100n;
 const SAFE_ABI = [
     {
         type: 'function',
@@ -176,7 +192,7 @@ export async function executeSafeTxDirect(opts) {
     const safeAddress = opts.safeAddress;
     const to = opts.to;
     const value = opts.value ?? 0n;
-    const baseGas = opts.gasLimit ?? BigInt(SAFE_EXECUTION_FALLBACK_GAS_LIMIT);
+    const explicitGasLimit = opts.gasLimit;
     const hash = await withRecoverableRetry(async (attemptIndex) => {
         const nonce = await publicClient.readContract({
             address: safeAddress,
@@ -203,12 +219,38 @@ export async function executeSafeTxDirect(opts) {
             functionName: 'execTransaction',
             args: [to, value, opts.data, 0, 0n, 0n, 0n, zeroAddress, zeroAddress, adjustedSig],
         });
+        // Estimate gas dynamically — Safe wrappers around heavy contract creates
+        // (mech deploy, large storage writes) have drifted past static defaults
+        // before. Estimate once per attempt, apply a 30 % buffer, fall back to
+        // SAFE_EXECUTION_FALLBACK_GAS_LIMIT only if the RPC genuinely cannot
+        // estimate (transient failures, vendor-specific eth_estimateGas quirks).
+        let resolvedGas;
+        if (explicitGasLimit !== undefined) {
+            resolvedGas = explicitGasLimit;
+        }
+        else {
+            try {
+                const estimated = await publicClient.estimateGas({
+                    account: account.address,
+                    to: safeAddress,
+                    data,
+                    value: 0n,
+                });
+                resolvedGas =
+                    (estimated * SAFE_EXECUTION_GAS_ESTIMATE_BUFFER_NUMERATOR) /
+                        SAFE_EXECUTION_GAS_ESTIMATE_BUFFER_DENOMINATOR;
+            }
+            catch (err) {
+                console.error(`[safe-adapter] estimateGas failed for Safe.execTransaction; falling back to ${SAFE_EXECUTION_FALLBACK_GAS_LIMIT.toLocaleString()}: ${err instanceof Error ? err.message.split('\n')[0] : String(err)}`);
+                resolvedGas = BigInt(SAFE_EXECUTION_FALLBACK_GAS_LIMIT);
+            }
+        }
         const feeOverrides = await viemFeeOverridesForAttempt(publicClient, attemptIndex);
         const txParams = {
             account,
             to: safeAddress,
             data,
-            gas: baseGas + BigInt(attemptIndex) * 50000n,
+            gas: resolvedGas + BigInt(attemptIndex) * 50000n,
             ...feeOverrides,
         };
         if ('maxFeePerGas' in txParams &&

package/dist/earning/safe-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"safe-adapter.js","sourceRoot":"","sources":["../../src/earning/safe-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,UAAU,EACV,MAAM,EACN,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,IAAI,EACJ,KAAK,EACL,WAAW,GAIZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAIlF,MAAM,iCAAiC,GAAG,SAAS,CAAC;AAEpD,MAAM,QAAQ,GAAG;IACf;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,iBAAiB;QACvB,eAAe,EAAE,YAAY;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;YACpC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;SACtC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KACtC;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;QACb,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,oBAAoB;QAC1B,eAAe,EAAE,MAAM;QACvB,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;YAClC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YAC/B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;YACpC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;YACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;YACpC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;YACrC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;YAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;SACpC;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACzC;CACO,CAAC;AAwBX;;GAEG;AACH,KAAK,UAAU,eAAe;IAC5B,yDAAyD;IACzD,8DAA8D;IAC9D,MAAM,GAAG,GAAQ,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC;IAE7D,IAAI,OAAO,SAAS,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,8DAA8D;YAC5D,QAAQ,OAAO,SAAS,WAAW,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAChF,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAe,CAAC;AACtD,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,MAAc;IAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,kBAAkB,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QAC9E,IAAI,EAAE,KAAK,IAAI;YAAE,OAAO,6BAA6B,CAAC;QACtD,IAAI,EAAE,KAAK,KAAK;YAAE,OAAO,0BAA0B,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,kBAAkB;IACpB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,MAAc;IACjD,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,IAAI,OAAO,KAAK,KAAK;QAAE,OAAO,WAAW,CAAC;IAC1C,OAAO;QACL,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9D,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;KACzC,CAAC;AACJ,CAAC;AAOD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAKvC;IACC,MAAM,IAAI,GAAG,MAAM,eAAe,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;QACtB,QAAQ,EAAE,IAAI,CAAC,MAAM;QACrB,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,aAAa,EAAE;YACb,iBAAiB,EAAE;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B;SACF;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAItC;IACC,MAAM,IAAI,GAAG,MAAM,eAAe,EAAE,CAAC;IACrC,OAAO,IAAI,CAAC;QACV,QAAQ,EAAE,IAAI,CAAC,MAAM;QACrB,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAkB,EAClB,YAAmC;IAEnC,OAAO,oBAAoB,CACzB,KAAK,IAAI,EAAE;QACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAEpD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,MAAM,GAAG,CAAC;YACZ,CAAC;YAED,sEAAsE;YACtE,qFAAqF;YACrF,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBACvC,QAAQ,EAAE,iCAAiC;aAC5C,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EACD;QACE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YAChC,OAAO,CAAC,KAAK,CAAC,2CAA2C,OAAO,KAAK,OAAO,EAAE,CAAC,CAAC;QAClF,CAAC;KACF,CACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAQzC;IACC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5F,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC;KACjC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,OAAO;QACP,KAAK;QACL,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC;KACjC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,CAAC,WAAsB,CAAC;IAChD,MAAM,EAAE,GAAG,IAAI,CAAC,EAAa,CAAC;IAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,iCAAiC,CAAC,CAAC;IAE3E,MAAM,IAAI,GAAG,MAAM,oBAAoB,CACrC,KAAK,EAAE,YAAY,EAAE,EAAE;QACrB,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC;YAC5C,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC;YACjD,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,oBAAoB;YAClC,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC;SAC7E,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;YAC5C,OAAO;YACP,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE;SACzC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAQ,CAAC;QACnD,MAAM,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAQ,CAAC;QACpD,MAAM,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,kBAAkB,CAAC;YAC9B,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,iBAAiB;YAC/B,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC;SACnF,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAuD;YACnE,OAAO;YACP,EAAE,EAAE,WAAW;YACf,IAAI;YACJ,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,MAAO;YAC7C,GAAG,YAAY;SAChB,CAAC;QACF,IACE,cAAc,IAAI,QAAQ;YAC1B,QAAQ,CAAC,YAAY,KAAK,SAAS;YACnC,sBAAsB,IAAI,QAAQ;YAClC,QAAQ,CAAC,oBAAoB,KAAK,SAAS,EAC3C,CAAC;YACD,OAAQ,QAAkC,CAAC,QAAQ,CAAC;QACtD,CAAC;QACD,OAAO,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,EACD;QACE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YAChC,OAAO,CAAC,KAAK,CAAC,4CAA4C,OAAO,KAAK,OAAO,EAAE,CAAC,CAAC;QACnF,CAAC;KACF,CACF,CAAC;IAEF,OAAO,EAAE,IAAI,EAAE,CAAC;AAClB,CAAC"}
+{"version":3,"file":"safe-adapter.js","sourceRoot":"","sources":["../../src/earning/safe-adapter.ts"],"names":[],"mappings":"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"}