@jinn-network/client 0.1.1 → 0.1.2-canary.6237288d

package/dist/adapters/mech/contracts.js

@@ -1,5 +1,6 @@
 import { encodeFunctionData, decodeEventLog, } from 'viem';
-import { MECH_MARKETPLACE_ABI, MECH_ABI, JINN_ROUTER_ABI, JINN_ROUTER_CLAIM_DELIVERY_V1_ABI, JINN_ROUTER_CLAIM_DELIVERY_V2_ABI, CLAIM_REGISTRY_ABI, NATIVE_PAYMENT_TYPE, } from './types.js';
+import { MECH_MARKETPLACE_ABI, MECH_ABI, JINN_ROUTER_ABI, JINN_ROUTER_CLAIM_DELIVERY_V1_ABI, JINN_ROUTER_CLAIM_DELIVERY_V2_ABI, NATIVE_PAYMENT_TYPE, } from './types.js';
+import { CLAIM_REGISTRY_ABI } from '../claim-registry/abi.js';
 import { executeSafeTransaction } from './safe.js';
 import { isRecoverableTransactionError, waitForTransactionReceiptWithRetry, backoffDelay, } from '../../tx-retry.js';
 export async function submitRestorationJob(publicClient, walletClient, safeAddress, routerAddress, mechAddress, requestDataHex, priceWei, responseTimeout) {
@@ -36,7 +37,7 @@ export async function submitRestorationJob(publicClient, walletClient, safeAddre
             // Not our event
         }
     }
-    return requestIds;
+    return { requestIds, txHash, receiptLogCount: receipt.logs.length };
 }
 export async function submitEvaluationJob(publicClient, walletClient, safeAddress, routerAddress, restorationRequestId, mechAddress, requestDataHex, priceWei, responseTimeout) {
     const calldata = encodeFunctionData({
@@ -77,7 +78,28 @@ export async function submitEvaluationJob(publicClient, walletClient, safeAddres
 const CLAIM_RETRY_ATTEMPTS = 6;
 const CLAIM_RETRY_DELAY_MS = 2000;
 const ZERO_EVIDENCE = '0x0000000000000000000000000000000000000000000000000000000000000000';
+const JINN_ROUTER_CLAIMED_ABI = [
+    {
+        name: 'claimed',
+        type: 'function',
+        stateMutability: 'view',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [{ name: '', type: 'bool' }],
+    },
+];
+async function isDeliveryAlreadyClaimed(publicClient, routerAddress, requestId) {
+    return Boolean(await publicClient.readContract({
+        address: routerAddress,
+        abi: JINN_ROUTER_CLAIMED_ABI,
+        functionName: 'claimed',
+        args: [requestId],
+    }));
+}
 export async function claimDelivery(publicClient, walletClient, safeAddress, routerAddress, requestId, options) {
+    if (await isDeliveryAlreadyClaimed(publicClient, routerAddress, requestId)) {
+        console.error(`[router] claimDelivery: already claimed ${requestId}`);
+        return '0x';
+    }
     const calldata = options.variant === 'v2'
         ? encodeFunctionData({
             abi: JINN_ROUTER_CLAIM_DELIVERY_V2_ABI,
@@ -105,6 +127,10 @@ export async function claimDelivery(publicClient, walletClient, safeAddress, rou
                 console.error(`[router] claimDelivery: already claimed ${requestId}`);
                 return '0x';
             }
+            if (await isDeliveryAlreadyClaimed(publicClient, routerAddress, requestId)) {
+                console.error(`[router] claimDelivery: already claimed ${requestId}`);
+                return '0x';
+            }
             // RequestNotFound — not a router request, skip entirely
             if (message.includes('RequestNotFound')) {
                 throw err;
@@ -267,11 +293,20 @@ export function decodeMarketplaceRequestLogs(logs) {
             });
             if (decoded.eventName === 'MarketplaceRequest') {
                 const args = decoded.args;
+                if (!args.requestIds?.length || !args.requestDatas?.length) {
+                    console.error('[mech] MarketplaceRequest decode missing requestIds/requestDatas', {
+                        hasRequestIds: args.requestIds != null,
+                        hasRequestDatas: args.requestDatas != null,
+                    });
+                    continue;
+                }
                 for (let i = 0; i < args.requestIds.length; i++) {
                     results.push({
                         requestId: String(args.requestIds[i]),
                         requestDataHex: String(args.requestDatas[i]),
                         priorityMech: String(args.priorityMech),
+                        transactionHash: log.transactionHash ?? undefined,
+                        blockNumber: log.blockNumber != null ? Number(log.blockNumber) : undefined,
                     });
                 }
             }
@@ -306,18 +341,87 @@ export function decodeDeliverLogs(logs) {
     }
     return results;
 }
+const LOG_SCAN_CHUNK = 9999n;
+export async function scanLatestRequestDataByRid(publicClient, marketplaceAddress, fromBlock, toBlock) {
+    const results = new Map();
+    for (let start = fromBlock; start <= toBlock; start += LOG_SCAN_CHUNK + 1n) {
+        const end = start + LOG_SCAN_CHUNK > toBlock ? toBlock : start + LOG_SCAN_CHUNK;
+        const logs = await publicClient.getLogs({
+            address: marketplaceAddress,
+            fromBlock: start,
+            toBlock: end,
+        });
+        for (const decoded of decodeMarketplaceRequestLogs(logs)) {
+            results.set(decoded.requestId.toLowerCase(), decoded.requestDataHex);
+        }
+    }
+    return results;
+}
+export async function scanLatestDeliveryDataByRid(publicClient, mechContractAddress, fromBlock, toBlock) {
+    const results = new Map();
+    for (let start = fromBlock; start <= toBlock; start += LOG_SCAN_CHUNK + 1n) {
+        const end = start + LOG_SCAN_CHUNK > toBlock ? toBlock : start + LOG_SCAN_CHUNK;
+        const logs = await publicClient.getLogs({
+            address: mechContractAddress,
+            fromBlock: start,
+            toBlock: end,
+        });
+        for (const decoded of decodeDeliverLogs(logs)) {
+            results.set(decoded.requestId.toLowerCase(), decoded.deliveryDataHex);
+        }
+    }
+    return results;
+}
+/**
+ * Most recent `requestData` for `requestId` from MarketplaceRequest events on
+ * `marketplaceAddress` in [fromBlock, toBlock] (inclusive), by block then log index.
+ */
+export async function findLatestRequestDataHexForMarketplaceRequest(publicClient, marketplaceAddress, requestId, fromBlock, toBlock) {
+    const dataByRid = await scanLatestRequestDataByRid(publicClient, marketplaceAddress, fromBlock, toBlock);
+    return dataByRid.get(requestId.toLowerCase()) ?? null;
+}
+/**
+ * `data` field of the most recent Deliver event for `requestId` on the mech contract
+ * in [fromBlock, toBlock] (inclusive).
+ */
+export async function findLatestDeliveryDataHexForRequest(publicClient, mechContractAddress, requestId, fromBlock, toBlock) {
+    const dataByRid = await scanLatestDeliveryDataByRid(publicClient, mechContractAddress, fromBlock, toBlock);
+    return dataByRid.get(requestId.toLowerCase()) ?? null;
+}
 // ── Delivery ─────────────────────────────────────────────────────────────────
+// Error names reported by the Mech Marketplace contract for duplicate delivery.
+// The exact name varies across contract versions; we match all known variants.
+const ALREADY_DELIVERED_PATTERNS = [
+    'AlreadyDelivered',
+    'DeliveryAlreadyCompleted',
+    'JobAlreadyDelivered',
+    'RequestAlreadyDelivered',
+];
 export async function callDeliverToMarketplace(publicClient, walletClient, safeAddress, mechContractAddress, requestIds, datas) {
     const calldata = encodeFunctionData({
         abi: MECH_ABI,
         functionName: 'deliverToMarketplace',
         args: [requestIds, datas],
     });
-    return executeSafeTransaction(publicClient, walletClient, {
-        safeAddress,
-        to: mechContractAddress,
-        value: 0n,
-        data: calldata,
-    });
+    try {
+        return await executeSafeTransaction(publicClient, walletClient, {
+            safeAddress,
+            to: mechContractAddress,
+            value: 0n,
+            data: calldata,
+        });
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        // Idempotent: if the mech already recorded this delivery (e.g. crash
+        // recovery re-entered this path), treat it as success. The tx hash is
+        // unavailable at this point, but the engine's deliveryTxHash column would
+        // have been set by the previous attempt's onDeliveryTxLanded callback.
+        if (ALREADY_DELIVERED_PATTERNS.some(p => message.includes(p))) {
+            console.error(`[mech] callDeliverToMarketplace: already delivered (idempotent), requestIds=${requestIds.join(',')}`);
+            return '0x';
+        }
+        throw err;
+    }
 }
 //# sourceMappingURL=contracts.js.map

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

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

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

@@ -8,6 +8,14 @@ export interface DesiredStatePayload {
     attemptId?: string;
     attemptNumber?: number;
     restorationRequestId?: string;
+    spec?: {
+        kind: string;
+    } & Record<string, unknown>;
+    window?: {
+        startTs: number;
+        endTs: number;
+    };
+    eligibility?: Record<string, unknown>;
 }
 export interface RestorationResultPayload {
     requestId: string;
@@ -17,12 +25,36 @@ export interface RestorationResultPayload {
 export declare function buildDesiredStatePayload(state: DesiredState): DesiredStatePayload;
 export declare function parseDesiredStateFromPayload(payload: Record<string, unknown>): DesiredState;
 export declare function buildResultPayload(requestId: string, result: RestorationResult): RestorationResultPayload;
+export declare function normalizeIpfsRegistryAddUrl(registryUrl: string): string;
 /**
- * Upload JSON to IPFS via the Autonolas registry.
- * Uses pushJsonToIpfs from mech-client-ts — the same function jinn-node uses.
- * Returns [digestHex, cidString].
+ * Normalizes operator-configured `ipfsGatewayUrl` into a base that ends with `/ipfs/`
+ * so we can append a CID path without double `/ipfs/ipfs/`.
+ *
+ * jinn-node defaults to `https://gateway.autonolas.tech/ipfs/`; operators sometimes set
+ * the origin only (`https://gateway.autonolas.tech`) or paste the full `/ipfs/` URL.
+ * See: jinn-node `fetchIpfsMetadata` / `shared/ipfs` gateway joining.
+ */
+export declare function normalizeIpfsGatewayBase(gatewayUrl: string): string;
+/**
+ * For the same 32-byte on-chain digest, Autonolas may address content as CIDv1 **raw** (`f01551220…`)
+ * or **dag-pb** (`f01701220…`). Gateways can 404/500 on the wrong codec — jinn-node always tries both.
+ * See: `jinn-node/src/worker/metadata/fetchIpfsMetadata.ts` (buildIpfsHashCandidates).
+ */
+export declare function buildIpfsHexCidCandidatesFromPartialHex(hex: string): string[];
+/**
+ * Build CID path segments to try for `fetchFromIpfs`. Accepts on-chain f01… hex, or full base32 (bafy…, Qm…).
+ */
+export declare function buildIpfsFetchCidPathCandidates(cidOrPath: string): string[];
+/**
+ * Fetch JSON from IPFS gateways, mirroring jinn-node:
+ * 1) Normalize base URL (avoid `/ipfs//ipfs/` when env already includes `/ipfs/`).
+ * 2) Try raw then dag-pb hex CIDs for the same digest.
+ * 3) Retry on primary gateway then public ipfs.io fallback.
+ *
+ * Upload JSON to an IPFS registry compatible with Autonolas `/api/v0/add`.
+ * The registry returns newline-delimited JSON and the last `Hash` is the file CID.
  */
-export declare function uploadToIpfs(_registryUrl: string, data: unknown): Promise<string>;
+export declare function uploadToIpfs(registryUrl: string, data: unknown): Promise<string>;
 export declare function fetchFromIpfs(gatewayUrl: string, cid: string): Promise<unknown>;
 /**
  * Extract the 32-byte SHA256 digest from a CIDv1 string.
@@ -38,6 +70,7 @@ export declare function cidToDigestHex(cid: string): Hex;
  */
 export declare function digestHexToGatewayUrl(digestHex: string): string;
 /**
- * Fetch content from IPFS using a raw SHA256 digest hex.
+ * Fetch content from IPFS using a raw SHA256 digest hex (with or without `0x`).
+ * Uses the same multi-codec and multi-gateway path as `fetchFromIpfs`.
  */
 export declare function fetchFromDigest(digestHex: string): Promise<unknown>;

package/dist/adapters/mech/ipfs.js

@@ -8,9 +8,18 @@ export function buildDesiredStatePayload(state) {
         attemptId: state.attemptId,
         attemptNumber: state.attemptNumber,
         restorationRequestId: state.restorationRequestId,
+        ...(state.spec ? { spec: state.spec } : {}),
+        ...(state.window ? { window: state.window } : {}),
+        ...(state.eligibility ? { eligibility: state.eligibility } : {}),
     };
 }
 export function parseDesiredStateFromPayload(payload) {
+    const spec = payload.spec;
+    const rawWindow = payload.window;
+    const window = rawWindow && typeof rawWindow.startTs === 'number' && typeof rawWindow.endTs === 'number'
+        ? { startTs: rawWindow.startTs, endTs: rawWindow.endTs }
+        : undefined;
+    const eligibility = payload.eligibility;
     return {
         id: payload.desiredStateId ?? '',
         description: payload.description ?? '',
@@ -19,6 +28,9 @@ export function parseDesiredStateFromPayload(payload) {
         attemptId: payload.attemptId,
         attemptNumber: payload.attemptNumber,
         restorationRequestId: payload.restorationRequestId,
+        ...(spec ? { spec } : {}),
+        ...(window ? { window } : {}),
+        ...(eligibility ? { eligibility } : {}),
     };
 }
 export function buildResultPayload(requestId, result) {
@@ -29,20 +41,167 @@ export function buildResultPayload(requestId, result) {
     };
 }
 /**
- * Upload JSON to IPFS via the Autonolas registry.
- * Uses pushJsonToIpfs from mech-client-ts — the same function jinn-node uses.
- * Returns [digestHex, cidString].
+ * Default per-request timeout (ms) when fetching from a gateway.
+ * jinn-node uses 7–10s; we allow a bit more for slow public gateways.
  */
-export async function uploadToIpfs(_registryUrl, data) {
-    const { pushJsonToIpfs } = await import('@jinn-network/mech-client-ts/dist/ipfs.js');
-    const [, cidString] = await pushJsonToIpfs(data);
-    return cidString;
+const IPFS_FETCH_TIMEOUT_MS = 15_000;
+const IPFS_UPLOAD_TIMEOUT_MS = 60_000;
+const FALLBACK_IPFS_GATEWAY_BASE = 'https://ipfs.io/ipfs/';
+export function normalizeIpfsRegistryAddUrl(registryUrl) {
+    let t = registryUrl.trim();
+    if (t === '')
+        t = 'https://registry.autonolas.tech';
+    t = t.replace(/\/+$/, '');
+    if (t.endsWith('/api/v0/add'))
+        return t;
+    return `${t}/api/v0/add`;
+}
+/**
+ * Normalizes operator-configured `ipfsGatewayUrl` into a base that ends with `/ipfs/`
+ * so we can append a CID path without double `/ipfs/ipfs/`.
+ *
+ * jinn-node defaults to `https://gateway.autonolas.tech/ipfs/`; operators sometimes set
+ * the origin only (`https://gateway.autonolas.tech`) or paste the full `/ipfs/` URL.
+ * See: jinn-node `fetchIpfsMetadata` / `shared/ipfs` gateway joining.
+ */
+export function normalizeIpfsGatewayBase(gatewayUrl) {
+    let t = gatewayUrl.trim();
+    if (t === '')
+        t = 'https://gateway.autonolas.tech';
+    t = t.replace(/\/+$/, '');
+    if (!t.toLowerCase().endsWith('/ipfs')) {
+        t = `${t}/ipfs`;
+    }
+    return `${t}/`;
+}
+/**
+ * For the same 32-byte on-chain digest, Autonolas may address content as CIDv1 **raw** (`f01551220…`)
+ * or **dag-pb** (`f01701220…`). Gateways can 404/500 on the wrong codec — jinn-node always tries both.
+ * See: `jinn-node/src/worker/metadata/fetchIpfsMetadata.ts` (buildIpfsHashCandidates).
+ */
+export function buildIpfsHexCidCandidatesFromPartialHex(hex) {
+    const h = (hex.startsWith('0x') ? hex.slice(2) : hex).toLowerCase();
+    if (!/^[0-9a-f]{64}$/.test(h)) {
+        return [hex];
+    }
+    // Raw (registry file JSON) first — matches mech `pushJsonToIpfs` / on-chain requestData
+    return [`f01551220${h}`, `f01701220${h}`];
+}
+/**
+ * Build CID path segments to try for `fetchFromIpfs`. Accepts on-chain f01… hex, or full base32 (bafy…, Qm…).
+ */
+export function buildIpfsFetchCidPathCandidates(cidOrPath) {
+    const s = cidOrPath.trim();
+    const lower = s.toLowerCase();
+    // Prefixes are CIDv1 multibase+version+codec (9 hex chars for f015 / f017 forms we use)
+    if (lower.startsWith('f01551220') && lower.length > 9) {
+        return buildIpfsHexCidCandidatesFromPartialHex(lower.slice(9));
+    }
+    if (lower.startsWith('f01701220') && lower.length > 9) {
+        return buildIpfsHexCidCandidatesFromPartialHex(lower.slice(9));
+    }
+    if (/^[0-9a-f]+$/i.test(s) && s.length === 64) {
+        return buildIpfsHexCidCandidatesFromPartialHex(s);
+    }
+    return [s];
+}
+async function fetchJsonFromUrl(url, signal) {
+    const response = await fetch(url, { method: 'GET', signal });
+    if (!response.ok) {
+        throw new Error(`IPFS fetch failed: ${response.status} ${response.statusText} (${url.slice(0, 80)}…)`);
+    }
+    const contentType = response.headers.get('content-type') || '';
+    if (contentType.includes('application/json')) {
+        return response.json();
+    }
+    const text = await response.text();
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        throw new Error(`IPFS response is not JSON (content-type: ${contentType || 'none'})`);
+    }
+}
+function parseRegistryUploadCid(responseText) {
+    let lastHash;
+    for (const line of responseText.trim().split('\n')) {
+        if (!line.trim())
+            continue;
+        try {
+            const entry = JSON.parse(line);
+            if (typeof entry.Hash === 'string' && entry.Hash.length > 0) {
+                lastHash = entry.Hash;
+            }
+        }
+        catch {
+            // The registry returns newline-delimited JSON. Ignore non-JSON lines so
+            // callers get the same "no CID" failure as the old mech-client helper.
+        }
+    }
+    if (!lastHash)
+        throw new Error('IPFS registry upload did not return a CID');
+    return lastHash;
+}
+/**
+ * Fetch JSON from IPFS gateways, mirroring jinn-node:
+ * 1) Normalize base URL (avoid `/ipfs//ipfs/` when env already includes `/ipfs/`).
+ * 2) Try raw then dag-pb hex CIDs for the same digest.
+ * 3) Retry on primary gateway then public ipfs.io fallback.
+ *
+ * Upload JSON to an IPFS registry compatible with Autonolas `/api/v0/add`.
+ * The registry returns newline-delimited JSON and the last `Hash` is the file CID.
+ */
+export async function uploadToIpfs(registryUrl, data) {
+    const url = new URL(normalizeIpfsRegistryAddUrl(registryUrl));
+    url.searchParams.set('pin', 'true');
+    url.searchParams.set('cid-version', '1');
+    url.searchParams.set('wrap-with-directory', 'false');
+    const formData = new FormData();
+    const body = JSON.stringify(data, null, 2);
+    formData.append('file', new Blob([body], { type: 'application/json' }), 'content.json');
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), IPFS_UPLOAD_TIMEOUT_MS);
+    try {
+        const response = await fetch(url, {
+            method: 'POST',
+            body: formData,
+            signal: controller.signal,
+        });
+        const responseText = await response.text();
+        if (response.status !== 200) {
+            throw new Error(`IPFS registry upload failed with status ${response.status}: ${responseText.slice(0, 200)}`);
+        }
+        return parseRegistryUploadCid(responseText);
+    }
+    finally {
+        clearTimeout(timer);
+    }
 }
 export async function fetchFromIpfs(gatewayUrl, cid) {
-    const response = await fetch(`${gatewayUrl}/ipfs/${cid}`);
-    if (!response.ok)
-        throw new Error(`IPFS fetch failed: ${response.statusText}`);
-    return response.json();
+    const base = normalizeIpfsGatewayBase(gatewayUrl);
+    const candidates = buildIpfsFetchCidPathCandidates(cid);
+    const errors = [];
+    for (const cidPath of candidates) {
+        for (const [name, baseUrl] of [
+            ['primary', base],
+            ['fallback', FALLBACK_IPFS_GATEWAY_BASE],
+        ]) {
+            const url = `${baseUrl}${cidPath}`;
+            const controller = new AbortController();
+            const timer = setTimeout(() => controller.abort(), IPFS_FETCH_TIMEOUT_MS);
+            try {
+                return await fetchJsonFromUrl(url, controller.signal);
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                errors.push(`${name}:${url.slice(0, 100)}: ${message}`);
+            }
+            finally {
+                clearTimeout(timer);
+            }
+        }
+    }
+    throw new Error(`IPFS JSON fetch failed after all candidates: ${errors.join(' | ')}`);
 }
 /**
  * Extract the 32-byte SHA256 digest from a CIDv1 string.
@@ -85,14 +244,12 @@ export function digestHexToGatewayUrl(digestHex) {
     return `${IPFS_GATEWAY_PREFIX}${hex}`;
 }
 /**
- * Fetch content from IPFS using a raw SHA256 digest hex.
+ * Fetch content from IPFS using a raw SHA256 digest hex (with or without `0x`).
+ * Uses the same multi-codec and multi-gateway path as `fetchFromIpfs`.
  */
 export async function fetchFromDigest(digestHex) {
-    const url = digestHexToGatewayUrl(digestHex);
-    const response = await fetch(url);
-    if (!response.ok)
-        throw new Error(`IPFS fetch failed: ${response.statusText}`);
-    return response.json();
+    const hex = (digestHex.startsWith('0x') ? digestHex.slice(2) : digestHex).toLowerCase();
+    return fetchFromIpfs('https://gateway.autonolas.tech', `f01551220${hex}`);
 }
 // ── Base encoding helpers ────────────────────────────────────────────────────
 const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';

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

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

package/dist/adapters/mech/safe.js

@@ -22,11 +22,6 @@ export async function executeSafeTransaction(publicClient, walletClient, params)
     await pending;
     try {
         const hash = await executeSafeTransactionInner(publicClient, walletClient, params);
-        // Wait for the tx to mine before releasing the lock so the next caller sees
-        // the updated Safe nonce. Without this, the next signer reads a stale nonce
-        // (the broadcast tx is still pending) and the resulting signature recovers
-        // a different address at execution time, causing GS026 (invalid owner).
-        await publicClient.waitForTransactionReceipt({ hash });
         return hash;
     }
     finally {
@@ -69,7 +64,7 @@ async function executeSafeTransactionInner(publicClient, walletClient, params) {
         sigBytes[64] = sigBytes[64] + 4;
         const safeSignature = `0x${sigBytes.toString('hex')}`;
         const feeOverrides = await viemFeeOverridesForAttempt(publicClient, attemptIndex);
-        return walletClient.writeContract({
+        const hash = await walletClient.writeContract({
             address: safeAddress,
             abi: SAFE_ABI,
             functionName: 'execTransaction',
@@ -90,6 +85,13 @@ async function executeSafeTransactionInner(publicClient, walletClient, params) {
             value: params.value,
             ...feeOverrides,
         });
+        // 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') {
+            throw new Error(`Safe execTransaction reverted (GS026/GS013 possible stale nonce, txHash=${hash})`);
+        }
+        return hash;
     }, {
         onRetry: ({ attempt, message }) => {
             console.error(`[safe/viem] execTransaction retry ${attempt}: ${message}`);

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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"}