@spirobel/monero-wallet-api 0.5.3 → 0.5.4

package/dist/scanning-syncing/worker-mains/coordinator-main.js

@@ -18,7 +18,6 @@ export async function coordinatorMainWorker(scan_settings_path, pathPrefix, cpuP
         }
     }
     catch (error) {
-        console.error("[coordinatorMainWorker] error:", error);
         self.postMessage({ type: "ERROR", payload: error });
     }
 }

package/dist/scanning-syncing/worker-mains/cpubound-main.d.ts

@@ -1,5 +1,8 @@
 import { type ScanLoopInput, type ScanLoopYield } from "../scanresult/scanLoop";
-export declare function handleCpuboundScan(msg: ScanLoopInput, port?: MessagePort): Promise<ScanLoopYield>;
-export declare function handleCpuboundScanTry(msg: ScanLoopInput, port?: MessagePort): Promise<ScanLoopYield>;
+export declare function handleCpuboundScan(msg: ScanLoopInput, cpu_worker_status: CpuWorkerStatus): Promise<ScanLoopYield>;
+export declare function handleCpuboundScanTry(msg: ScanLoopInput, cpu_worker_status: CpuWorkerStatus): Promise<ScanLoopYield>;
+export type CpuWorkerStatus = {
+    cancel: boolean;
+};
 export declare function sendFromCpuWorker(port: MessagePort, msg: ScanLoopYield): void;
 export declare function sendToCpuWorker(port: MessagePort, msg: ScanLoopInput): void;

package/dist/scanning-syncing/worker-mains/cpubound-main.js

@@ -6,7 +6,7 @@ import {} from "../scanresult/scanLoop";
  * logs progress every 10 blocks, then sends the final result.
  */
 let callcounter = 0;
-export async function handleCpuboundScan(msg, port) {
+export async function handleCpuboundScan(msg, cpu_worker_status) {
     callcounter++;
     log("handleCpuboundScan", "callcounter=" + callcounter);
     if (!msg) {
@@ -21,10 +21,6 @@ export async function handleCpuboundScan(msg, port) {
         msg.walletConfig?.primary_address?.slice(0, 6));
     const walletConfig = msg.walletConfig;
     const item = msg;
-    if (!port) {
-        log("handleCpuboundScan", "no port!");
-        throw new Error("[cpubound] no port");
-    }
     log("handleCpuboundScan", "primed, feeding workItem uuid=" +
         (item && typeof item === "object"
             ? item.work_uuid?.slice(0, 8)
@@ -90,6 +86,11 @@ export async function handleCpuboundScan(msg, port) {
                 heightto,
             ]);
         }
+        if (cpu_worker_status.cancel) {
+            cpu_worker_status.cancel = false;
+            log("handleCpuboundScan", ["cpu work canceled"]);
+            return { type: "Ready" };
+        }
         await sleep(10); // make sure the loop is not tight
     }
     log("handleCpuboundScan", [
@@ -105,9 +106,9 @@ export async function handleCpuboundScan(msg, port) {
         result: scanResult,
     };
 }
-export function handleCpuboundScanTry(msg, port) {
+export function handleCpuboundScanTry(msg, cpu_worker_status) {
     try {
-        return handleCpuboundScan(msg, port);
+        return handleCpuboundScan(msg, cpu_worker_status);
     }
     catch (err) {
         console.error("[cpubound] error", err);

package/dist/scanning-syncing/worker-mains/worker.js

@@ -8,8 +8,13 @@ self.addEventListener("unhandledrejection", (e) => self.postMessage({ type: "ERR
 let SCAN_SETTINGS_PATH;
 let PATH_PREFIX;
 let cpuPort;
+const cpu_worker_status = { cancel: false };
 let multisig_dkg;
 export function CPU_PORT_HANDLER(pe) {
+    if (pe.data === "cancel") {
+        cpu_worker_status.cancel = true;
+        return;
+    }
     if (!cpuPort)
         throw new Error("[cpubound] cpuPort is undefined in port.onmessage");
     log("CPU_PORT_HANDLER", "new workitem msg received");
@@ -17,7 +22,7 @@ export function CPU_PORT_HANDLER(pe) {
         type: "WORKSTART",
         work_uuid: pe.data.work_uuid,
     });
-    handleCpuboundScanTry(pe.data, cpuPort).then((result) => {
+    handleCpuboundScanTry(pe.data, cpu_worker_status).then((result) => {
         log("CPU_PORT_HANDLER", "work finished, sending result");
         if (!cpuPort)
             throw new Error("[cpubound] cpuPort is undefined in port.onmessage");

package/dist/scansettings/scanSettingsOpened.js

@@ -1,6 +1,6 @@
 import { LOCAL_NODE_DEFAULT_URL } from "../node-interaction/nodeUrl";
 import { LOGGING_FUNCTIONS, } from "../io/logging";
-import { getPathPrefix, makeSpendKeyFromSeed, makeViewKey, openScanSettingsFile, SCAN_SETTINGS_STORE_NAME_DEFAULT, SUB_ADDRESS_INDEX_DEFAULT_VALUE, walletSettingsPlusKeys, writeEnvLineToDotEnvRefresh, writeScanSettings, writeViewKeyToDotEnv, } from "../api";
+import { getPathPrefix, makeSpendKeyFromSeed, makeViewKey, openScanSettingsFile, parseAddress, SCAN_SETTINGS_STORE_NAME_DEFAULT, SUB_ADDRESS_INDEX_DEFAULT_VALUE, walletSettingsPlusKeys, writeEnvLineToDotEnvRefresh, writeScanSettings, writeViewKeyToDotEnv, } from "../api";
 export class ScanSettingsOpened {
     _scan_settings_path;
     _pathPrefix;
@@ -309,7 +309,8 @@ export class ScanSettingsOpened {
         }
     }
     static _validateAddress(address) {
-        if (!isValidMoneroAddress(address)) {
+        const parsed = parseAddress(address);
+        if ("error" in parsed) {
             throw new Error(`invalid monero address: ${address}`);
         }
     }
@@ -404,10 +405,6 @@ export class ScanSettingsOpened {
         await writeScanSettings(this._settings, this._scan_settings_path);
     }
 }
-function isValidMoneroAddress(address) {
-    // basic sanity check
-    return (address.length >= 95 && address.length <= 106 && isAlphaNumeric(address));
-}
 function isValidMoneroPrivateKey(key) {
     return key.length === 64 && isAlphaNumeric(key);
 }

package/dist/tools/monero-tools.js

@@ -122,7 +122,7 @@ export function parseDestination(destination) {
     const url = new URL(destination);
     return getDomainWithTLD(url.hostname);
 }
-export const OPEN_DOMAINS = ["monerochan.city"];
+export const OPEN_DOMAINS = ["monerochan.cash"];
 // this validity check should happen in the contentscript when the link is clicked,
 // not in the background script
 // -> tor circuit is separated & compartmentalized

package/dist/viewpair/ViewPair.js

@@ -46,18 +46,23 @@ export class ViewPair extends WasmProcessor {
             };
         };
         let init_viewpair_result = undefined;
+        let init_viewpair_error = undefined;
         viewPair.readFromWasmMemory = (ptr, len) => {
             init_viewpair_result = JSON.parse(viewPair.readString(ptr, len));
         };
+        viewPair.readErrorFromWasmMemory = (ptr, len) => {
+            init_viewpair_error = JSON.parse(viewPair.readString(ptr, len));
+        };
         //@ts-ignore
         tinywasi.instance.exports.init_viewpair(primary_address.length, secret_view_key.length, subaddress_index);
+        if (init_viewpair_error && "error" in init_viewpair_error) {
+            throw new Error(`primary-address-not-valid (${primary_address.slice(0, 8)}...${primary_address.slice(-8)})`);
+        }
         if (!init_viewpair_result) {
             throw new Error("Failed to init viewpair");
         }
-        else {
-            //@ts-ignore
-            viewPair._network = init_viewpair_result.network;
-        }
+        //@ts-ignore
+        viewPair._network = init_viewpair_result.network;
         return viewPair;
     }
     /**