@jinn-network/client 0.1.2 → 0.1.3-canary.12cf8b76

package/dist/adapters/mech/safe.js

@@ -3,6 +3,7 @@ import { privateKeyToAccount } from 'viem/accounts';
 import { base } from 'viem/chains';
 import { SAFE_ABI } from './types.js';
 import { withRecoverableRetry, viemFeeOverridesForAttempt, } from '../../tx-retry.js';
+import { SafeInnerRevertError, decodeSafeInnerRevert, formatDecodedRevert, } from './safe-revert.js';
 export function buildSafeSignature(signerAddress) {
     const r = signerAddress.toLowerCase().replace('0x', '').padStart(64, '0');
     const s = '0'.repeat(64);
@@ -10,7 +11,7 @@ export function buildSafeSignature(signerAddress) {
     return `0x${r}${s}${v}`;
 }
 // Per-Safe transaction lock to prevent nonce races when concurrent
-// loops (creator + restorer) share the same Safe
+// loops (creator + harness) share the same Safe
 const safeLocks = new Map();
 export async function executeSafeTransaction(publicClient, walletClient, params) {
     const lockKey = params.safeAddress.toLowerCase();
@@ -64,31 +65,56 @@ async function executeSafeTransactionInner(publicClient, walletClient, params) {
         sigBytes[64] = sigBytes[64] + 4;
         const safeSignature = `0x${sigBytes.toString('hex')}`;
         const feeOverrides = await viemFeeOverridesForAttempt(publicClient, attemptIndex);
-        const hash = await walletClient.writeContract({
-            address: safeAddress,
-            abi: SAFE_ABI,
-            functionName: 'execTransaction',
-            args: [
-                to,
-                value,
-                data,
-                0,
-                0n,
-                0n,
-                0n,
-                '0x0000000000000000000000000000000000000000',
-                '0x0000000000000000000000000000000000000000',
-                safeSignature,
-            ],
-            account,
-            chain: walletClient.chain,
-            value: params.value,
-            ...feeOverrides,
-        });
+        let hash;
+        try {
+            hash = await walletClient.writeContract({
+                address: safeAddress,
+                abi: SAFE_ABI,
+                functionName: 'execTransaction',
+                args: [
+                    to,
+                    value,
+                    data,
+                    0,
+                    0n,
+                    0n,
+                    0n,
+                    '0x0000000000000000000000000000000000000000',
+                    '0x0000000000000000000000000000000000000000',
+                    safeSignature,
+                ],
+                account,
+                chain: walletClient.chain,
+                value: params.value,
+                ...feeOverrides,
+            });
+        }
+        catch (writeErr) {
+            // viem pre-flight gas estimation may revert with GS013 when the inner
+            // call would fail. Decode the inner reason so callers (and tx-retry)
+            // can distinguish self-already-claimed from lost-race from transient.
+            const msg = writeErr instanceof Error ? writeErr.message : String(writeErr);
+            if (msg.includes('GS013') || msg.includes('GS026')) {
+                const inner = await decodeSafeInnerRevert(publicClient, params);
+                if (inner.decodedName) {
+                    const formatted = formatDecodedRevert(inner.decodedName, inner.decodedArgs);
+                    throw new SafeInnerRevertError(`Safe execTransaction inner revert (estimate): ${formatted}`, inner.innerSelector, inner.innerData, inner.decodedName, inner.decodedArgs, null);
+                }
+            }
+            throw writeErr;
+        }
         // Wait inside the retry attempt so reverted Safe executions caused by
         // stale nonce signatures (GS026/GS013) re-read nonce and re-sign.
         const receipt = await publicClient.waitForTransactionReceipt({ hash });
         if (receipt.status !== 'success') {
+            // Safe v1.3 wraps inner reverts as GS013 — re-simulate to recover
+            // the actual selector + args for diagnostics and to let tx-retry
+            // mark known-permanent inner errors as non-recoverable.
+            const inner = await decodeSafeInnerRevert(publicClient, params);
+            if (inner.decodedName) {
+                const formatted = formatDecodedRevert(inner.decodedName, inner.decodedArgs);
+                throw new SafeInnerRevertError(`Safe execTransaction inner revert: ${formatted} (txHash=${hash})`, inner.innerSelector, inner.innerData, inner.decodedName, inner.decodedArgs, hash);
+            }
             throw new Error(`Safe execTransaction reverted (GS026/GS013 possible stale nonce, txHash=${hash})`);
         }
         return hash;

package/dist/adapters/mech/safe.js.map

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

package/dist/adapters/mech/types.d.ts

@@ -1,4 +1,10 @@
-import type { ClaimPolicy } from './claim-policy.js';
+import type { Address, WalletClient } from 'viem';
+export interface EvictionRecoveryConfig {
+    serviceId: number;
+    stakingProxyAddress: Address;
+    distributorAddress: Address;
+    masterWalletClient: WalletClient;
+}
 export interface MechAdapterConfig {
     rpcUrl: string;
     mechMarketplaceAddress: `0x${string}`;
@@ -9,13 +15,12 @@ export interface MechAdapterConfig {
     ipfsRegistryUrl: string;
     ipfsGatewayUrl: string;
     pollIntervalMs: number;
-    /** Optional delivery backfill horizon for late evaluation creation retries. */
+    /** Optional cap for delivery-log scans; omit for full-history recovery. */
     mechDeliverBackfillLookbackBlocks?: bigint;
     chainId: number;
-    /** Base mainnet V1 vs Phase 1b V2 `claimDelivery` — align with `ChainConfig.routerClaimDeliveryVersion`. */
-    routerClaimDeliveryVariant: 'v1' | 'v2';
-    claimPolicy?: ClaimPolicy;
-    claimRegistryAddress?: `0x${string}`;
+    /** Base mainnet V1, Phase 1b V2, or Task-native V3 delivery claim ABI. */
+    routerClaimDeliveryVariant: 'v1' | 'v2' | 'v3';
+    evictionRecovery?: EvictionRecoveryConfig;
 }
 export declare const MECH_MARKETPLACE_ABI: readonly [{
     readonly name: "request";
@@ -159,6 +164,18 @@ export declare const MECH_ABI: readonly [{
         readonly name: "deliveredRequests";
         readonly type: "bool[]";
     }];
+}, {
+    readonly name: "isOperator";
+    readonly type: "function";
+    readonly stateMutability: "view";
+    readonly inputs: readonly [{
+        readonly name: "operator";
+        readonly type: "address";
+    }];
+    readonly outputs: readonly [{
+        readonly name: "";
+        readonly type: "bool";
+    }];
 }, {
     readonly name: "getOperator";
     readonly type: "function";
@@ -235,162 +252,306 @@ export declare const JINN_ROUTER_CLAIM_DELIVERY_V2_ABI: readonly [{
     readonly outputs: readonly [];
 }];
 export declare const JINN_ROUTER_ABI: readonly [{
-    readonly name: "createRestorationJob";
+    readonly name: "taskCoordinator";
     readonly type: "function";
-    readonly stateMutability: "payable";
-    readonly inputs: readonly [{
-        readonly name: "requestData";
-        readonly type: "bytes";
-    }, {
-        readonly name: "priorityMech";
-        readonly type: "address";
-    }, {
-        readonly name: "maxDeliveryRate";
-        readonly type: "uint256";
-    }, {
-        readonly name: "responseTimeout";
-        readonly type: "uint256";
-    }, {
-        readonly name: "paymentType";
-        readonly type: "bytes32";
-    }, {
-        readonly name: "paymentData";
-        readonly type: "bytes";
-    }];
+    readonly stateMutability: "view";
+    readonly inputs: readonly [];
     readonly outputs: readonly [{
-        readonly name: "requestId";
-        readonly type: "bytes32";
+        readonly name: "";
+        readonly type: "address";
     }];
 }, {
-    readonly name: "createEvaluationJob";
+    readonly name: "createTask";
     readonly type: "function";
     readonly stateMutability: "payable";
     readonly inputs: readonly [{
-        readonly name: "restorationRequestId";
+        readonly name: "taskCidDigest";
         readonly type: "bytes32";
     }, {
-        readonly name: "requestData";
-        readonly type: "bytes";
+        readonly name: "manifestDigest";
+        readonly type: "bytes32";
     }, {
-        readonly name: "evaluationMech";
-        readonly type: "address";
+        readonly name: "policy";
+        readonly type: "tuple";
+        readonly components: readonly [{
+            readonly name: "claimWindowStart";
+            readonly type: "uint64";
+        }, {
+            readonly name: "claimWindowEnd";
+            readonly type: "uint64";
+        }, {
+            readonly name: "submissionDeadline";
+            readonly type: "uint64";
+        }, {
+            readonly name: "claimLeaseTtlSeconds";
+            readonly type: "uint32";
+        }, {
+            readonly name: "maxClaims";
+            readonly type: "uint16";
+        }, {
+            readonly name: "maxClaimsPerOperator";
+            readonly type: "uint16";
+        }, {
+            readonly name: "policyHook";
+            readonly type: "address";
+        }, {
+            readonly name: "evaluationPolicy";
+            readonly type: "tuple";
+            readonly components: readonly [{
+                readonly name: "requiredVerdicts";
+                readonly type: "uint16";
+            }, {
+                readonly name: "passThreshold";
+                readonly type: "uint16";
+            }, {
+                readonly name: "evaluationDeadline";
+                readonly type: "uint64";
+            }, {
+                readonly name: "maxVerdictsPerEvaluator";
+                readonly type: "uint16";
+            }, {
+                readonly name: "disallowSolverSelfEvaluation";
+                readonly type: "bool";
+            }];
+        }];
+    }, {
+        readonly name: "solutionMaxDeliveryRate";
+        readonly type: "uint256";
     }, {
-        readonly name: "maxDeliveryRate";
+        readonly name: "verdictMaxDeliveryRate";
         readonly type: "uint256";
     }, {
         readonly name: "responseTimeout";
         readonly type: "uint256";
-    }, {
-        readonly name: "paymentType";
-        readonly type: "bytes32";
-    }, {
-        readonly name: "paymentData";
-        readonly type: "bytes";
     }];
     readonly outputs: readonly [{
-        readonly name: "requestId";
-        readonly type: "bytes32";
+        readonly name: "taskId";
+        readonly type: "uint256";
     }];
 }, {
-    readonly name: "claimDelivery";
+    readonly name: "claimTask";
     readonly type: "function";
     readonly stateMutability: "nonpayable";
     readonly inputs: readonly [{
+        readonly name: "taskId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "priorityMech";
+        readonly type: "address";
+    }];
+    readonly outputs: readonly [{
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
+    }, {
         readonly name: "requestId";
         readonly type: "bytes32";
     }];
-    readonly outputs: readonly [];
 }, {
-    readonly name: "RestorationJobCreated";
+    readonly name: "TaskCreated";
     readonly type: "event";
     readonly inputs: readonly [{
         readonly name: "creator";
         readonly type: "address";
         readonly indexed: true;
     }, {
-        readonly name: "requestId";
+        readonly name: "taskId";
+        readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "manifestDigest";
         readonly type: "bytes32";
         readonly indexed: true;
+    }, {
+        readonly name: "taskCidDigest";
+        readonly type: "bytes32";
+        readonly indexed: false;
+    }, {
+        readonly name: "maxClaims";
+        readonly type: "uint16";
+        readonly indexed: false;
+    }, {
+        readonly name: "requiredVerdicts";
+        readonly type: "uint16";
+        readonly indexed: false;
+    }, {
+        readonly name: "solutionBudget";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "verdictBudget";
+        readonly type: "uint256";
+        readonly indexed: false;
     }];
 }, {
-    readonly name: "EvaluationJobCreated";
+    readonly name: "TaskAttemptCreated";
     readonly type: "event";
     readonly inputs: readonly [{
-        readonly name: "creator";
-        readonly type: "address";
+        readonly name: "taskId";
+        readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
         readonly indexed: true;
     }, {
         readonly name: "requestId";
         readonly type: "bytes32";
         readonly indexed: true;
     }, {
-        readonly name: "restorationRequestId";
+        readonly name: "operator";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "priorityMech";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "deliveryRate";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }];
+}, {
+    readonly name: "claimEvaluation";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly name: "taskId";
+        readonly type: "uint256";
+    }, {
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
+    }, {
+        readonly name: "evaluatorMech";
+        readonly type: "address";
+    }, {
+        readonly name: "evaluationTaskCidDigest";
+        readonly type: "bytes32";
+    }];
+    readonly outputs: readonly [{
+        readonly name: "verdictIndex";
+        readonly type: "uint32";
+    }, {
+        readonly name: "verdictRequestId";
         readonly type: "bytes32";
-        readonly indexed: true;
     }];
 }, {
-    readonly name: "DeliveryClaimed";
+    readonly name: "EvaluationAttemptCreated";
     readonly type: "event";
     readonly inputs: readonly [{
-        readonly name: "claimer";
-        readonly type: "address";
+        readonly name: "taskId";
+        readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
+        readonly indexed: true;
+    }, {
+        readonly name: "verdictIndex";
+        readonly type: "uint32";
         readonly indexed: true;
     }, {
         readonly name: "requestId";
         readonly type: "bytes32";
-        readonly indexed: true;
+        readonly indexed: false;
     }, {
-        readonly name: "jobType";
-        readonly type: "uint8";
+        readonly name: "evaluator";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "priorityMech";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "deliveryRate";
+        readonly type: "uint256";
         readonly indexed: false;
     }];
 }, {
-    readonly name: "creationCount";
+    readonly name: "claimSolutionDelivery";
     readonly type: "function";
-    readonly stateMutability: "view";
+    readonly stateMutability: "nonpayable";
     readonly inputs: readonly [{
-        readonly name: "multisig";
-        readonly type: "address";
-    }];
-    readonly outputs: readonly [{
-        readonly name: "";
-        readonly type: "uint256";
+        readonly name: "requestId";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "solutionDigest";
+        readonly type: "bytes32";
     }];
+    readonly outputs: readonly [];
 }, {
-    readonly name: "restorationDeliveryCount";
+    readonly name: "claimVerdictDelivery";
     readonly type: "function";
-    readonly stateMutability: "view";
+    readonly stateMutability: "nonpayable";
     readonly inputs: readonly [{
-        readonly name: "multisig";
-        readonly type: "address";
+        readonly name: "verdictRequestId";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "verdictDigest";
+        readonly type: "bytes32";
+    }, {
+        readonly name: "verdictCode";
+        readonly type: "uint8";
     }];
-    readonly outputs: readonly [{
-        readonly name: "";
+    readonly outputs: readonly [];
+}, {
+    readonly name: "SolutionDeliveryClaimed";
+    readonly type: "event";
+    readonly inputs: readonly [{
+        readonly name: "operator";
+        readonly type: "address";
+        readonly indexed: true;
+    }, {
+        readonly name: "requestId";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
+        readonly name: "taskId";
         readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
+        readonly indexed: false;
     }];
 }, {
-    readonly name: "evaluationCreationCount";
-    readonly type: "function";
-    readonly stateMutability: "view";
+    readonly name: "VerdictDeliveryClaimed";
+    readonly type: "event";
     readonly inputs: readonly [{
-        readonly name: "multisig";
+        readonly name: "evaluator";
         readonly type: "address";
-    }];
-    readonly outputs: readonly [{
-        readonly name: "";
+        readonly indexed: true;
+    }, {
+        readonly name: "requestId";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
+        readonly name: "taskId";
         readonly type: "uint256";
+        readonly indexed: true;
+    }, {
+        readonly name: "attemptIndex";
+        readonly type: "uint32";
+        readonly indexed: false;
+    }, {
+        readonly name: "verdictIndex";
+        readonly type: "uint32";
+        readonly indexed: false;
+    }, {
+        readonly name: "verdictCode";
+        readonly type: "uint8";
+        readonly indexed: false;
     }];
 }, {
-    readonly name: "evaluationDeliveryCount";
+    readonly name: "claimed";
     readonly type: "function";
     readonly stateMutability: "view";
     readonly inputs: readonly [{
-        readonly name: "multisig";
-        readonly type: "address";
+        readonly name: "requestId";
+        readonly type: "bytes32";
     }];
     readonly outputs: readonly [{
         readonly name: "";
-        readonly type: "uint256";
+        readonly type: "bool";
     }];
 }];
 export declare const SAFE_ABI: readonly [{