@bopen-io/wallet-toolbox 2.1.21-parity-fix.2 → 2.6.2-brc153.2

package/out/src/monitor/MonitorDaemon.js

@@ -14,104 +14,114 @@ const WERR_errors_1 = require("../sdk/WERR_errors");
 const utilityHelpers_1 = require("../utility/utilityHelpers");
 const WalletError_1 = require("../sdk/WalletError");
 dotenv_1.default.config();
-const mainDojoConnection = process.env.MAIN_DOJO_CONNECTION || '';
-const testDojoConnection = process.env.TEST_DOJO_CONNECTION || '';
 class MonitorDaemon {
+    args;
+    noRunTasks;
+    setup;
+    doneListening;
+    doneTasks;
+    stopDaemon = false;
     constructor(args, noRunTasks) {
         this.args = args;
         this.noRunTasks = noRunTasks;
-        this.stopDaemon = false;
         /* */
     }
+    configureKnex(setup) {
+        if (setup.sqliteFilename != null && setup.sqliteFilename !== '') {
+            setup.knexConfig = {
+                client: 'better-sqlite3',
+                connection: { filename: setup.sqliteFilename },
+                useNullAsDefault: true
+            };
+        }
+        if (setup.mySQLConnection != null && setup.mySQLConnection !== '') {
+            setup.knexConfig = {
+                client: 'mysql2',
+                connection: JSON.parse(setup.mySQLConnection),
+                useNullAsDefault: true,
+                pool: { min: 0, max: 7, idleTimeoutMillis: 15000 }
+            };
+        }
+        if (setup.knexConfig != null)
+            setup.knex = (0, knex_1.knex)(setup.knexConfig);
+        if (setup.knex != null) {
+            setup.storageKnexOptions = {
+                knex: setup.knex,
+                chain: setup.chain,
+                feeModel: { model: 'sat/kb', value: 100 },
+                commissionSatoshis: 0
+            };
+        }
+        if (setup.storageKnexOptions != null) {
+            setup.storageProvider = new StorageKnex_1.StorageKnex(setup.storageKnexOptions);
+        }
+    }
+    async configureStorage(setup) {
+        if (setup.storageProvider != null) {
+            await setup.storageProvider.makeAvailable();
+            const settings = setup.storageProvider.getSettings();
+            setup.storageManager = new WalletStorageManager_1.WalletStorageManager(settings.storageIdentityKey, setup.storageProvider);
+            await setup.storageManager.makeAvailable();
+            return;
+        }
+        if (setup.storageManager == null) {
+            throw new WERR_errors_1.WERR_INVALID_PARAMETER('storageManager', 'valid or one of mySQLConnection, knexConfig, knex, storageKnexOptions, or storageProvider');
+        }
+    }
+    configureServices(setup) {
+        if (setup.servicesOptions != null) {
+            if (setup.servicesOptions.chain !== setup.chain) {
+                throw new WERR_errors_1.WERR_INVALID_PARAMETER('serviceOptions.chain', 'same as args.chain');
+            }
+            setup.servicesOptions.chaintracks ??= setup.chaintracks;
+            setup.services = new Services_1.Services(setup.servicesOptions);
+        }
+        setup.services ??= new Services_1.Services(setup.chain ?? 'test');
+    }
     async createSetup() {
-        var _a;
         this.setup = { ...this.args };
         const a = this.setup;
-        if (!a.monitor) {
-            a.chain || (a.chain = 'test');
-            if (a.sqliteFilename) {
-                a.knexConfig = {
-                    client: 'better-sqlite3',
-                    connection: { filename: a.sqliteFilename },
-                    useNullAsDefault: true
-                };
-            }
-            if (a.mySQLConnection) {
-                a.knexConfig = {
-                    client: 'mysql2',
-                    connection: JSON.parse(a.mySQLConnection),
-                    useNullAsDefault: true,
-                    pool: { min: 0, max: 7, idleTimeoutMillis: 15000 }
-                };
-            }
-            if (a.knexConfig) {
-                a.knex = (0, knex_1.knex)(a.knexConfig);
-            }
-            if (a.knex) {
-                a.storageKnexOptions = {
-                    knex: a.knex,
-                    chain: a.chain,
-                    feeModel: { model: 'sat/kb', value: 1 },
-                    commissionSatoshis: 0
-                };
-            }
-            if (a.storageKnexOptions) {
-                a.storageProvider = new StorageKnex_1.StorageKnex(a.storageKnexOptions);
-            }
-            if (a.storageProvider) {
-                await a.storageProvider.makeAvailable();
-                const settings = await a.storageProvider.getSettings();
-                a.storageManager = new WalletStorageManager_1.WalletStorageManager(settings.storageIdentityKey, a.storageProvider);
-                await a.storageManager.makeAvailable();
-            }
-            else if (!a.storageManager) {
-                throw new WERR_errors_1.WERR_INVALID_PARAMETER('storageManager', 'valid or one of mySQLConnection, knexConfig, knex, storageKnexOptions, or storageProvider');
-            }
-            if (a.servicesOptions) {
-                if (a.servicesOptions.chain != a.chain)
-                    throw new WERR_errors_1.WERR_INVALID_PARAMETER('serviceOptions.chain', 'same as args.chain');
-                (_a = a.servicesOptions).chaintracks || (_a.chaintracks = a.chaintracks);
-                a.services = new Services_1.Services(a.servicesOptions);
-            }
-            if (!a.services) {
-                a.services = new Services_1.Services(a.chain);
-            }
-            a.storageManager.setServices(a.services);
-            const monitorOptions = Monitor_1.Monitor.createDefaultWalletMonitorOptions(a.chain, a.storageManager, a.services, a.chaintracks, a.startupTaskMode || 'multiuser');
-            a.monitor = new Monitor_1.Monitor(monitorOptions);
-        }
+        if (a.monitor != null)
+            return;
+        a.chain ||= 'test';
+        this.configureKnex(a);
+        await this.configureStorage(a);
+        this.configureServices(a);
+        a.storageManager.setServices(a.services);
+        const monitorOptions = Monitor_1.Monitor.createDefaultWalletMonitorOptions(a.chain, a.storageManager, a.services, a.chaintracks, a.startupTaskMode ?? 'multiuser');
+        a.monitor = new Monitor_1.Monitor(monitorOptions);
     }
     async start() {
-        var _a;
-        if (!this.setup)
+        if (this.setup == null)
             await this.createSetup();
-        if (!((_a = this.setup) === null || _a === void 0 ? void 0 : _a.monitor))
+        if (this.setup?.monitor == null)
             throw new WERR_errors_1.WERR_INTERNAL('createSetup failed to initialize setup');
         const { monitor } = this.setup;
-        if (!this.noRunTasks) {
+        if (this.noRunTasks !== true) {
             console.log('\n\nRunning startTasks\n\n');
             this.doneTasks = monitor.startTasks();
         }
     }
     async stop() {
         console.log('start of stop');
-        if (!this.setup || (!this.doneTasks && !this.noRunTasks) || !this.doneListening)
+        if (this.setup == null || (this.doneTasks == null && this.noRunTasks !== true) || this.doneListening == null) {
             throw new WERR_errors_1.WERR_INTERNAL('call start or createSetup first');
+        }
         const { monitor } = this.setup;
         monitor.stopTasks();
-        if (this.doneTasks)
+        if (this.doneTasks != null)
             await this.doneTasks;
         this.doneTasks = undefined;
         await this.doneListening;
         this.doneListening = undefined;
     }
     async destroy() {
-        if (!this.setup)
+        if (this.setup == null)
             return;
-        if (this.doneTasks || this.doneListening)
+        if (this.doneTasks != null || this.doneListening != null)
             await this.stop();
-        if (this.setup.storageProvider)
-            this.setup.storageProvider.destroy();
+        if (this.setup.storageProvider != null)
+            await this.setup.storageProvider.destroy();
         this.setup = undefined;
     }
     async runDaemon() {
@@ -128,8 +138,8 @@ class MonitorDaemon {
                 await this.destroy();
                 console.log('done');
             }
-            catch (eu) {
-                const e = WalletError_1.WalletError.fromUnknown(eu);
+            catch (error_) {
+                const e = WalletError_1.WalletError.fromUnknown(error_);
                 console.log(`\n\nrunWatchman Main Error Handler\n\ncode: ${e.code}\nDescription: ${e.description}\n\n\n`);
             }
         }

package/out/src/monitor/MonitorDaemon.js.map

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

package/out/src/monitor/index.all.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.all.js","sourceRoot":"","sources":["../../../src/monitor/index.all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,kDAA+B;AAE/B,0DAAyC"}
+{"version":3,"file":"index.all.js","sourceRoot":"","sources":["../../../src/monitor/index.all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,kDAA+B;AAE/B,QAAY,IAAI,8CAAyB"}

package/out/src/monitor/tasks/TaskArcSSE.d.ts

@@ -7,21 +7,28 @@ import { WalletMonitorTask } from './WalletMonitorTask';
  * when transactions are MINED.
  */
 export declare class TaskArcadeSSE extends WalletMonitorTask {
-    static taskName: string;
+    static readonly taskName = "ArcadeSSE";
     sseClient: ArcSSEClient | null;
-    private pendingEvents;
+    private readonly pendingEvents;
     constructor(monitor: Monitor);
     asyncSetup(): Promise<void>;
+    private logSetupEvent;
     trigger(_nowMsecsSinceEpoch: number): {
         run: boolean;
     };
     runTask(): Promise<string>;
     fetchNow(): Promise<number>;
     private processStatusEvent;
+    private canRecoverRejectedRequest;
+    private applyStatusEvent;
+    private applyAcceptedStatus;
+    private applyMinedStatus;
+    private applyDoubleSpendStatus;
     /**
-     * Fetch the merklePath from Arcade's GET /tx/{txid} endpoint and
-     * create a ProvenTx record, completing the transaction.
+     * Complete a MINED/IMMUTABLE status by using the configured proof providers.
+     * Arcade is first when configured, but the shared provider path validates the
+     * proof against the wallet chaintracker before a ProvenTx is persisted.
      */
-    private fetchProofFromArcade;
+    private fetchProofFromServices;
 }
 //# sourceMappingURL=TaskArcSSE.d.ts.map

package/out/src/monitor/tasks/TaskArcSSE.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TaskArcSSE.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskArcSSE.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAe,MAAM,uCAAuC,CAAA;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAGvD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,MAAM,CAAC,QAAQ,SAAc;IAE7B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,aAAa,CAAoB;gBAE7B,OAAO,EAAE,OAAO;IAIb,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD1C,OAAO,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE;IAIhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAW1B,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;YAKnB,kBAAkB;IA6FhC;;;OAGG;YACW,oBAAoB;CA+FnC"}
+{"version":3,"file":"TaskArcSSE.d.ts","sourceRoot":"","sources":["../../../../src/monitor/tasks/TaskArcSSE.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,MAAM,uCAAuC,CAAA;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAIvD;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,MAAM,CAAC,QAAQ,CAAC,QAAQ,eAAc;IAEtC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAElD,YAAa,OAAO,EAAE,OAAO,EAE5B;IAEc,UAAU,IAAK,OAAO,CAAC,IAAI,CAAC,CAkD1C;YAEa,aAAa;IAQ3B,OAAO,CAAE,mBAAmB,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,OAAO,CAAA;KAAE,CAEtD;IAEK,OAAO,IAAK,OAAO,CAAC,MAAM,CAAC,CAShC;IAEK,QAAQ,IAAK,OAAO,CAAC,MAAM,CAAC,CAGjC;YAEa,kBAAkB;IAqChC,OAAO,CAAC,yBAAyB;YAYnB,gBAAgB;YA6BhB,mBAAmB;YA4BnB,gBAAgB;YAgBhB,sBAAsB;IAgBpC;;;;OAIG;YACW,sBAAsB;CA4DrC"}

package/out/src/monitor/tasks/TaskArcSSE.js

@@ -1,71 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskArcadeSSE = void 0;
-const sdk_1 = require("@bsv/sdk");
 const types_1 = require("../../sdk/types");
+const entities_1 = require("../../storage/schema/entities");
 const EntityProvenTxReq_1 = require("../../storage/schema/entities/EntityProvenTxReq");
-const EntityProvenTx_1 = require("../../storage/schema/entities/EntityProvenTx");
 const ArcSSEClient_1 = require("../../services/providers/ArcSSEClient");
 const WalletMonitorTask_1 = require("./WalletMonitorTask");
+const TaskUnFail_1 = require("./TaskUnFail");
 /**
  * Monitor task that receives transaction status updates from Arcade via SSE
  * and processes them — including fetching merkle proofs directly from Arcade
  * when transactions are MINED.
  */
 class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
+    static taskName = 'ArcadeSSE';
+    sseClient = null;
+    pendingEvents = [];
     constructor(monitor) {
         super(monitor, TaskArcadeSSE.taskName);
-        this.sseClient = null;
-        this.pendingEvents = [];
     }
     async asyncSetup() {
-        var _a, _b, _c, _d, _e;
         const callbackToken = this.monitor.options.callbackToken;
-        if (!callbackToken) {
-            console.log('[TaskArcadeSSE] no callbackToken configured — SSE disabled');
+        if (callbackToken == null || callbackToken === '') {
+            await this.logSetupEvent('no callbackToken configured; SSE disabled');
             return;
         }
-        const arcUrl = (_a = this.monitor.services.options) === null || _a === void 0 ? void 0 : _a.arcUrl;
-        if (!arcUrl) {
-            console.log('[TaskArcadeSSE] no arcUrl configured — SSE disabled');
+        const arcadeUrl = this.monitor.services.options?.arcadeUrl;
+        if (arcadeUrl == null || arcadeUrl === '') {
+            await this.logSetupEvent('no arcadeUrl configured; SSE disabled');
             return;
         }
         const EventSourceClass = this.monitor.options.EventSourceClass;
-        if (!EventSourceClass) {
-            console.log('[TaskArcadeSSE] no EventSourceClass provided — SSE disabled');
+        if (EventSourceClass == null) {
+            await this.logSetupEvent('no EventSourceClass provided; SSE disabled');
             return;
         }
         let lastEventId;
         try {
-            lastEventId = await ((_c = (_b = this.monitor.options).loadLastSSEEventId) === null || _c === void 0 ? void 0 : _c.call(_b));
-            console.log(`[TaskArcadeSSE] loaded persisted lastEventId: ${lastEventId !== null && lastEventId !== void 0 ? lastEventId : '(none)'}`);
+            lastEventId = await this.monitor.options.loadLastSSEEventId?.();
         }
         catch (e) {
-            console.log(`[TaskArcadeSSE] failed to load lastEventId: ${e}`);
+            await this.logSetupEvent(`failed to load lastEventId: ${stringifyError(e)}`);
         }
-        const arcApiKey = (_e = (_d = this.monitor.services.options) === null || _d === void 0 ? void 0 : _d.arcConfig) === null || _e === void 0 ? void 0 : _e.apiKey;
-        console.log(`[TaskArcadeSSE] setting up — arcUrl=${arcUrl} token=${callbackToken.substring(0, 8)}...`);
+        const arcadeApiKey = this.monitor.services.options?.arcadeConfig?.apiKey;
+        await this.logSetupEvent(`setting up SSE for arcadeUrl=${arcadeUrl}; lastEventId=${lastEventId ?? '(none)'}`);
         this.sseClient = new ArcSSEClient_1.ArcSSEClient({
-            baseUrl: arcUrl,
+            baseUrl: arcadeUrl,
             callbackToken,
-            arcApiKey,
+            arcApiKey: arcadeApiKey,
             lastEventId,
             EventSourceClass,
             onEvent: event => {
                 this.pendingEvents.push(event);
             },
             onError: err => {
-                console.log(`[TaskArcadeSSE] error: ${err.message}`);
+                void this.logSetupEvent(`SSE error: ${err.message}`);
             },
             onLastEventIdChanged: (id) => {
-                var _a, _b;
-                (_b = (_a = this.monitor.options).saveLastSSEEventId) === null || _b === void 0 ? void 0 : _b.call(_a, id).catch(e => {
-                    console.log(`[TaskArcadeSSE] failed to persist lastEventId: ${e}`);
+                this.monitor.options.saveLastSSEEventId?.(id).catch(e => {
+                    void this.logSetupEvent(`failed to persist lastEventId: ${stringifyError(e)}`);
                 });
             }
         });
         this.sseClient.connect();
     }
+    async logSetupEvent(details) {
+        try {
+            await this.monitor.logEvent(this.name, details);
+        }
+        catch {
+            // Setup diagnostics must not become a new monitor startup failure path.
+        }
+    }
     trigger(_nowMsecsSinceEpoch) {
         return { run: this.pendingEvents.length > 0 };
     }
@@ -80,7 +86,7 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
         return log;
     }
     async fetchNow() {
-        if (!this.sseClient)
+        if (this.sseClient == null)
             return 0;
         return await this.sseClient.fetchEvents();
     }
@@ -90,12 +96,16 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
             partial: { txid: event.txid }
         });
         if (reqs.length === 0) {
-            log += `  No matching ProvenTxReq\n`;
+            log += '  No matching ProvenTxReq\n';
             return log;
         }
         for (const reqApi of reqs) {
             const req = new EntityProvenTxReq_1.EntityProvenTxReq(reqApi);
-            if (types_1.ProvenTxReqTerminalStatus.includes(req.status)) {
+            // Arcade can emit REJECTED before another node accepts the same transaction.
+            // Permit a later positive network observation to heal requests that an older
+            // Monitor version prematurely marked invalid.
+            const canRecoverRejectedRequest = this.canRecoverRejectedRequest(req, event);
+            if (types_1.ProvenTxReqTerminalStatus.includes(req.status) && !canRecoverRejectedRequest) {
                 log += `  req ${req.id} already terminal: ${req.status}\n`;
                 continue;
             }
@@ -104,120 +114,113 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
                 what: 'arcSSE',
                 arcStatus: event.txStatus
             };
-            switch (event.txStatus) {
-                case 'SENT_TO_NETWORK':
-                case 'ACCEPTED_BY_NETWORK':
-                case 'SEEN_ON_NETWORK': {
-                    if (['unsent', 'sending', 'callback'].includes(req.status)) {
-                        req.status = 'unmined';
-                        req.addHistoryNote(note);
-                        await req.updateStorageDynamicProperties(this.storage);
-                        const ids = req.notify.transactionIds;
-                        if (ids) {
-                            await this.storage.runAsStorageProvider(async (sp) => {
-                                await sp.updateTransactionsStatus(ids, 'unproven');
-                            });
-                        }
-                        log += `  req ${req.id} => unmined\n`;
-                    }
-                    break;
-                }
-                case 'MINED':
-                case 'IMMUTABLE': {
-                    req.addHistoryNote(note);
-                    await req.updateStorageDynamicProperties(this.storage);
-                    // Fetch proof directly from Arcade and complete the transaction
-                    log += await this.fetchProofFromArcade(req);
-                    break;
-                }
-                case 'DOUBLE_SPEND_ATTEMPTED': {
-                    req.status = 'doubleSpend';
-                    req.addHistoryNote(note);
-                    await req.updateStorageDynamicProperties(this.storage);
-                    const ids = req.notify.transactionIds;
-                    if (ids) {
-                        await this.storage.runAsStorageProvider(async (sp) => {
-                            await sp.updateTransactionsStatus(ids, 'failed');
-                        });
-                    }
-                    log += `  req ${req.id} => doubleSpend\n`;
-                    break;
-                }
-                case 'REJECTED': {
-                    req.status = 'invalid';
-                    req.addHistoryNote(note);
-                    await req.updateStorageDynamicProperties(this.storage);
-                    const ids = req.notify.transactionIds;
-                    if (ids) {
-                        await this.storage.runAsStorageProvider(async (sp) => {
-                            await sp.updateTransactionsStatus(ids, 'failed');
-                        });
-                    }
-                    log += `  req ${req.id} => invalid\n`;
-                    break;
-                }
-                default:
-                    log += `  req ${req.id} unhandled status: ${event.txStatus}\n`;
-                    break;
-            }
+            log += await this.applyStatusEvent(req, event, note);
         }
         this.monitor.callOnTransactionStatusChanged(event.txid, event.txStatus);
         return log;
     }
+    canRecoverRejectedRequest(req, event) {
+        const acceptedStatuses = [
+            'SENT_TO_NETWORK',
+            'ACCEPTED_BY_NETWORK',
+            'SEEN_ON_NETWORK',
+            'SEEN_MULTIPLE_NODES'
+        ];
+        const confirmedStatuses = ['MINED', 'IMMUTABLE'];
+        return req.status === 'invalid' &&
+            (acceptedStatuses.includes(event.txStatus) || confirmedStatuses.includes(event.txStatus));
+    }
+    async applyStatusEvent(req, event, note) {
+        switch (event.txStatus) {
+            case 'SENT_TO_NETWORK':
+            case 'ACCEPTED_BY_NETWORK':
+            case 'SEEN_ON_NETWORK':
+            case 'SEEN_MULTIPLE_NODES':
+                return await this.applyAcceptedStatus(req, note);
+            case 'MINED':
+            case 'IMMUTABLE':
+                return await this.applyMinedStatus(req, note);
+            case 'DOUBLE_SPEND_ATTEMPTED':
+                return await this.applyDoubleSpendStatus(req, note);
+            case 'REJECTED':
+                // REJECTED is not a final consensus result: production Arcade has
+                // subsequently reported SEEN_MULTIPLE_NODES for the same txid. Keep
+                // wallet inputs reserved while proof/rebroadcast processing resolves
+                // the transaction authoritatively.
+                req.addHistoryNote(note);
+                await req.updateStorageDynamicProperties(this.storage);
+                return `  req ${req.id} rejection recorded; awaiting resolution\n`;
+            default:
+                return `  req ${req.id} unhandled status: ${event.txStatus}\n`;
+        }
+    }
+    async applyAcceptedStatus(req, note) {
+        if (!['unsent', 'sending', 'callback', 'invalid'].includes(req.status))
+            return '';
+        const wasInvalid = req.status === 'invalid';
+        let log = '';
+        if (wasInvalid) {
+            // Restore transaction state, re-reserve wallet inputs, and verify output
+            // spendability using the established unfail repair path.
+            log += await new TaskUnFail_1.TaskUnFail(this.monitor).unfailReq(req, 4);
+        }
+        else if (req.notify.transactionIds != null) {
+            await this.storage.runAsStorageProvider(async (sp) => {
+                await sp.updateTransactionsStatus(req.notify.transactionIds ?? [], 'unproven');
+            });
+        }
+        // Apply event state after recovery because the recovery helper refreshes
+        // the entity from storage before its atomic update.
+        req.status = 'unmined';
+        if (wasInvalid)
+            req.attempts = 0;
+        req.wasBroadcast = true;
+        req.addHistoryNote(note);
+        await req.updateStorageDynamicProperties(this.storage);
+        return log + `  req ${req.id} => unmined\n`;
+    }
+    async applyMinedStatus(req, note) {
+        let log = '';
+        if (req.status === 'invalid') {
+            log += await new TaskUnFail_1.TaskUnFail(this.monitor).unfailReq(req, 4);
+            req.status = 'unmined';
+            req.attempts = 0;
+            req.wasBroadcast = true;
+        }
+        req.addHistoryNote(note);
+        await req.updateStorageDynamicProperties(this.storage);
+        return log + await this.fetchProofFromServices(req);
+    }
+    async applyDoubleSpendStatus(req, note) {
+        req.status = 'doubleSpend';
+        req.addHistoryNote(note);
+        await req.updateStorageDynamicProperties(this.storage);
+        const ids = req.notify.transactionIds;
+        if (ids != null) {
+            await this.storage.runAsStorageProvider(async (sp) => {
+                await sp.updateTransactionsStatus(ids, 'failed');
+            });
+        }
+        return `  req ${req.id} => doubleSpend\n`;
+    }
     /**
-     * Fetch the merklePath from Arcade's GET /tx/{txid} endpoint and
-     * create a ProvenTx record, completing the transaction.
+     * Complete a MINED/IMMUTABLE status by using the configured proof providers.
+     * Arcade is first when configured, but the shared provider path validates the
+     * proof against the wallet chaintracker before a ProvenTx is persisted.
      */
-    async fetchProofFromArcade(req) {
-        var _a, _b, _c;
-        const arcUrl = (_a = this.monitor.services.options) === null || _a === void 0 ? void 0 : _a.arcUrl;
+    async fetchProofFromServices(req) {
         const txid = req.txid;
-        let log = `  req ${req.id} MINED/IMMUTABLE — fetching proof from Arcade\n`;
+        let log = `  req ${req.id} MINED/IMMUTABLE — fetching proof from configured services\n`;
         try {
-            const fetchHeaders = {};
-            const apiKey = (_c = (_b = this.monitor.services.options) === null || _b === void 0 ? void 0 : _b.arcConfig) === null || _c === void 0 ? void 0 : _c.apiKey;
-            if (apiKey) {
-                fetchHeaders['Authorization'] = `Bearer ${apiKey}`;
-            }
-            const response = await fetch(`${arcUrl}/tx/${txid}`, { headers: fetchHeaders });
-            if (!response.ok) {
-                log += `    Arcade GET /tx/${txid} returned ${response.status}\n`;
-                return log;
-            }
-            const data = await response.json();
-            console.log(`[TaskArcadeSSE] GET /tx/${txid}:`, JSON.stringify(data));
-            if (!data.merklePath) {
-                log += `    No merklePath in response (status=${data.txStatus})\n`;
-                return log;
-            }
-            // Parse the merklePath hex from Arcade
-            const merklePath = sdk_1.MerklePath.fromHex(data.merklePath);
-            const merkleRoot = merklePath.computeRoot(txid);
-            // Find the leaf to get the tx index
-            const leaf = merklePath.path[0].find(l => l.txid === true && l.hash === txid);
-            if (!leaf) {
-                log += `    merklePath does not contain leaf for txid\n`;
+            const proof = await this.monitor.services.getMerklePath(txid);
+            const ptx = await entities_1.EntityProvenTx.fromReq(req, proof, false, this.monitor.options.maxRebroadcastAttempts ?? 0);
+            if (ptx == null) {
+                log += `    No validated merkle proof available from ${proof.name ?? 'configured services'}\n`;
                 return log;
             }
-            const blockHash = data.blockHash || '';
-            const height = data.blockHeight || merklePath.blockHeight;
-            // Create ProvenTx entity
-            const now = new Date();
-            const ptx = new EntityProvenTx_1.EntityProvenTx({
-                created_at: now,
-                updated_at: now,
-                provenTxId: 0,
-                txid,
-                height,
-                index: leaf.offset,
-                merklePath: merklePath.toBinary(),
-                rawTx: req.rawTx,
-                merkleRoot,
-                blockHash
-            });
-            // Persist via the same path as TaskCheckForProofs
             await req.refreshFromStorage(this.storage);
             const { provenTxReqId, status, attempts, history } = req.toApi();
+            const { index, height, blockHash, merklePath, merkleRoot } = ptx.toApi();
             const r = await this.storage.runAsStorageProvider(async (sp) => {
                 return await sp.updateProvenTxReqWithNewProvenTx({
                     provenTxReqId,
@@ -225,26 +228,29 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
                     txid,
                     attempts,
                     history,
-                    index: leaf.offset,
+                    index,
                     height,
                     blockHash,
-                    merklePath: merklePath.toBinary(),
+                    merklePath,
                     merkleRoot
                 });
             });
             req.status = r.status;
             req.apiHistory = r.history;
             req.provenTxId = r.provenTxId;
-            req.notified = true;
+            if (r.notify != null)
+                req.apiNotify = r.notify;
+            req.notified = r.notified ?? true;
+            await req.updateStorageDynamicProperties(this.storage);
             this.monitor.callOnProvenTransaction({
                 txid,
-                txIndex: leaf.offset,
+                txIndex: index,
                 blockHeight: height,
                 blockHash,
-                merklePath: merklePath.toBinary(),
+                merklePath,
                 merkleRoot
             });
-            log += `    proved at height ${height}, index ${leaf.offset} => ${r.status}\n`;
+            log += `    proved by ${proof.name ?? 'configured services'} at height ${height}, index ${index} => ${r.status}\n`;
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
@@ -256,5 +262,7 @@ class TaskArcadeSSE extends WalletMonitorTask_1.WalletMonitorTask {
     }
 }
 exports.TaskArcadeSSE = TaskArcadeSSE;
-TaskArcadeSSE.taskName = 'ArcadeSSE';
+function stringifyError(error) {
+    return error instanceof Error ? error.message : String(error);
+}
 //# sourceMappingURL=TaskArcSSE.js.map