@spirobel/monero-wallet-api 0.5.5 → 0.6.1

package/dist/scanning-syncing/scanresult/scanResult.js

@@ -1,4 +1,4 @@
-import { CatastrophicReorgError } from "../../api";
+import { CatastrophicReorgError } from "../../xmr3";
 import { computeKeyImage } from "./computeKeyImage";
 import { log } from "../../io/logging";
 import { mergeRanges, findRange, findRangeThrows } from "./scanCache";
@@ -39,7 +39,7 @@ export async function processScanResult(params) {
                     reverted_spends: [],
                 };
             }
-            else {
+            else if (!cache.reorg_info.split_heights.some((s) => s.block_hash === split_height.block_hash)) {
                 cache.reorg_info.split_heights.push(split_height);
             }
             // First, collect reverted spends from all outputs (before any removals)
@@ -56,11 +56,14 @@ export async function processScanResult(params) {
             for (const [id, old_output_state] of removed_outputs) {
                 // 1. find key_image of output to be removed (as it was reorged)
                 const [key_image] = Object.entries(cache.own_key_images).find(([own_key_image, globalid]) => globalid === id) || [""]; // if this is viewonly the key_image will be empty
-                cache.reorg_info.removed_outputs.push({
-                    old_output_state,
-                    key_image,
-                    split_height,
-                });
+                if (!cache.reorg_info.removed_outputs.some((r) => r.old_output_state.index_on_blockchain ===
+                    old_output_state.index_on_blockchain)) {
+                    cache.reorg_info.removed_outputs.push({
+                        old_output_state,
+                        key_image,
+                        split_height,
+                    });
+                }
                 // 2. remove from outputs and own_key_images
                 delete cache.outputs[id];
                 delete cache.own_key_images[key_image];
@@ -72,11 +75,14 @@ export async function processScanResult(params) {
             for (const [id, old_output_state_pointer] of reverted_outputs) {
                 const [key_image] = Object.entries(cache.own_key_images).find(([own_key_image, globalid]) => globalid === id) || [""]; // if this is viewonly the key_image will be empty
                 const old_output_state = Object.assign({}, old_output_state_pointer);
-                cache.reorg_info.reverted_spends.push({
-                    old_output_state,
-                    key_image, // in this case key_image only used here, does not get removed
-                    split_height,
-                });
+                if (!cache.reorg_info.reverted_spends.some((r) => r.old_output_state.index_on_blockchain ===
+                    old_output_state.index_on_blockchain)) {
+                    cache.reorg_info.reverted_spends.push({
+                        old_output_state,
+                        key_image, // in this case key_image only used here, does not get removed
+                        split_height,
+                    });
+                }
                 // remove spend info from original cache (if output still exists
                 // it may have been deleted above in the removed_outputs loop)
                 if (cache.outputs[id]) {
@@ -226,7 +232,6 @@ export function outputStatus(output, cache, current_height) {
     if (unlock_height > current_height) {
         return { status: "pending", unlock_height };
     }
-    // TODO: check that that output is not txlog input indeces
     return { status: "spendable" };
 }
 export function spendable(output, cache, current_height) {

package/dist/scanning-syncing/scanresult/scanStats.d.ts

@@ -1,4 +1,4 @@
-import { ViewPair, type Output } from "../../api";
+import { ViewPair, type Output } from "../../xmr3";
 import type { ScanCache, Subaddress, TxLog } from "./scanCache";
 import { type OutputStatus } from "./scanResult";
 export type WriteStatsFileParams = {

package/dist/scanning-syncing/scanresult/scanStats.js

@@ -1,5 +1,5 @@
 import { stat } from "fs";
-import { atomicWrite, ViewPair } from "../../api";
+import { atomicWrite, ViewPair } from "../../xmr3";
 import { outputStatus } from "./scanResult";
 export async function writeStatsFileDefaultLocation(params) {
     let stats = await readStatsFileDefaultLocation(params.primary_address, params.pathPrefix);
@@ -120,16 +120,19 @@ export function processFoundTransactions(cache, stats, current_height) {
         }
         // handle spent case
         if (output.spent_in_tx_hash) {
-            const spent_utxo_value = cache.pending_spent_utxos
-                ? cache.pending_spent_utxos[output.index_on_blockchain]
-                : null;
-            const txlog = cache.tx_logs && spent_utxo_value
-                ? cache.tx_logs[spent_utxo_value]
+            const spentIndex = cache.pending_spent_utxos
+                ? cache.pending_spent_utxos[String(output.index_on_blockchain)]
+                : undefined;
+            // index 0 is a real log. do not treat it as missing.
+            const txlog = cache.tx_logs && spentIndex !== undefined
+                ? cache.tx_logs[spentIndex]
                 : undefined;
             const spentTx = stats.found_transactions[output.spent_in_tx_hash];
             if (spentTx) {
                 spentTx.amount -= output.amount;
                 spentTx.inputs.push(output);
+                if (!spentTx.txlog && txlog)
+                    spentTx.txlog = txlog;
             }
             else {
                 stats.found_transactions[output.spent_in_tx_hash] = {