@spirobel/monero-wallet-api 0.6.1 → 0.6.3

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

@@ -1,4 +1,4 @@
-import { sleep, ViewPair } from "../../xmr3";
+import { sleep, ViewPair } from "../../xmr3_common";
 import { log } from "../../io/logging";
 import {} from "../scanresult/scanLoop";
 /**

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

@@ -1,4 +1,4 @@
-import { DistributedKeyGenerator, type DkgParticipateParams, type DkgVerifyParams } from "../../xmr3";
+import { DistributedKeyGenerator, type DkgParticipateParams, type DkgVerifyParams } from "../../xmr3_common";
 export type MultiSigParticipateCall = {
     type: "multisig-call";
     functionName: "participate";

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

@@ -1,4 +1,4 @@
-import { DistributedKeyGenerator, } from "../../xmr3";
+import { DistributedKeyGenerator, } from "../../xmr3_common";
 import { log } from "../../io/logging";
 export function multisigMainWorkerCall(msg, dkg) {
     if (!dkg) {

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

@@ -2,7 +2,12 @@ import { coordinatorMainWorker, requestCoordinatorShutdown, } from "./coordinato
 import { handleCpuboundScanTry, sendFromCpuWorker } from "./cpubound-main";
 import { log, setupLoggingPath } from "../../io/logging";
 import { multisigMainWorkerCall } from "./multisig-main";
-import { DistributedKeyGenerator, SCAN_SETTINGS_STORE_NAME_DEFAULT, } from "../../xmr3";
+import { DistributedKeyGenerator, SCAN_SETTINGS_STORE_NAME_DEFAULT, } from "../../xmr3_common";
+import { monero_wallet_api_wasm, frost_dkg_wasm } from "../../wasm-processing/wasmFile";
+import { setInlineWasm, setWasmUrls } from "../../wasm-processing/wasmLoader";
+// packed worker bundle has inlined bytes, unpacked has empty bytes
+// setInlineWasm ignores empty input
+setInlineWasm(monero_wallet_api_wasm, frost_dkg_wasm);
 self.onerror = (e) => self.postMessage({ type: "ERROR", payload: e });
 self.addEventListener("unhandledrejection", (e) => self.postMessage({ type: "ERROR", payload: e.reason }));
 let SCAN_SETTINGS_PATH;
@@ -77,6 +82,9 @@ const handleMessage = async (e) => {
         return;
     }
     if (msg.type === "setup") {
+        if (msg.moneroWasmUrl || msg.dkgWasmUrl) {
+            setWasmUrls({ monero: msg.moneroWasmUrl, dkg: msg.dkgWasmUrl });
+        }
         const settingsPath = msg.scan_settings_path || SCAN_SETTINGS_STORE_NAME_DEFAULT;
         SCAN_SETTINGS_PATH = settingsPath;
         PATH_PREFIX = msg.pathPrefix;

package/dist/scansettings/scanSettings.js

@@ -1,4 +1,4 @@
-import { get_info } from "../xmr3";
+import { get_info } from "../xmr3_common";
 import { atomicWrite } from "../io/atomicWrite";
 import { refreshEnvIndexedDB } from "../io/indexedDB";
 import { LOCAL_NODE_DEFAULT_URL } from "../node-interaction/nodeUrl";

package/dist/scansettings/scanSettingsOpened.d.ts

@@ -1,5 +1,5 @@
 import { type LogSetting, type PossibleLogs } from "../io/logging";
-import { type ScanSetting, type ScanSettingOpened } from "../xmr3";
+import { type ScanSetting, type ScanSettingOpened } from "../xmr3_common";
 export declare class ScanSettingsOpened {
     private _scan_settings_path;
     private _pathPrefix;
@@ -20,6 +20,7 @@ export declare class ScanSettingsOpened {
     get pathPrefix(): string;
     setNodeUrl(node_url: string): Promise<void>;
     setStartHeight(start_height: number | null): Promise<void>;
+    setNodeUrlAndStartHeight(node_url?: string, start_height?: number | null): Promise<void>;
     setMerchantConfirmations(merchant_confirmations: number | undefined | null): Promise<void>;
     setCpuWorkerCount(cpu_worker_count: number | undefined | null): Promise<void>;
     setLogSettings(logs?: LogSetting | null, logs_include?: PossibleLogs[] | null, logs_exclude?: PossibleLogs[] | null): Promise<void>;

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, parseAddress, SCAN_SETTINGS_STORE_NAME_DEFAULT, SUB_ADDRESS_INDEX_DEFAULT_VALUE, walletSettingsPlusKeys, writeEnvLineToDotEnvRefresh, writeScanSettings, writeViewKeyToDotEnv, } from "../xmr3";
+import { getPathPrefix, makeSpendKeyFromSeed, makeViewKey, openScanSettingsFile, parseAddress, SCAN_SETTINGS_STORE_NAME_DEFAULT, SUB_ADDRESS_INDEX_DEFAULT_VALUE, walletSettingsPlusKeys, writeEnvLineToDotEnvRefresh, writeScanSettings, writeViewKeyToDotEnv, } from "../xmr3_common";
 export class ScanSettingsOpened {
     _scan_settings_path;
     _pathPrefix;
@@ -54,14 +54,21 @@ export class ScanSettingsOpened {
         return this._pathPrefix;
     }
     async setNodeUrl(node_url) {
-        await this.reload();
-        this._settings.node_url = ScanSettingsOpened._validateNodeUrl(node_url);
-        await this._persist();
+        await this.setNodeUrlAndStartHeight(node_url, undefined);
     }
     async setStartHeight(start_height) {
+        await this.setNodeUrlAndStartHeight(undefined, start_height);
+    }
+    // one read and one write. a second reload must not put the old url back.
+    async setNodeUrlAndStartHeight(node_url, start_height) {
         await this.reload();
-        ScanSettingsOpened._validateStartHeight(start_height);
-        this._settings.start_height = start_height;
+        if (node_url !== undefined) {
+            this._settings.node_url = ScanSettingsOpened._validateNodeUrl(node_url);
+        }
+        if (start_height !== undefined) {
+            ScanSettingsOpened._validateStartHeight(start_height);
+            this._settings.start_height = start_height;
+        }
         await this._persist();
     }
     async setMerchantConfirmations(merchant_confirmations) {

package/dist/send-functionality/inputSelection.d.ts

@@ -1,4 +1,4 @@
-import type { GetOutsResponseBuffer, NodeUrl, Output } from "../xmr3";
+import type { GetOutsResponseBuffer, NodeUrl, Output } from "../xmr3_common";
 import type { SampledDecoys } from "./transactionBuilding";
 export type Payment = {
     address: string;

package/dist/send-functionality/transactionBuilding.d.ts

@@ -1,4 +1,4 @@
-import type { GetFeeEstimateResult, Output } from "../xmr3";
+import type { GetFeeEstimateResult, Output } from "../xmr3_common";
 import { WasmProcessor } from "../wasm-processing/wasmProcessor";
 export type Input = string;
 export type UnsignedTransaction = string;

package/dist/send-functionality/transactionBuilding.js

@@ -1,4 +1,4 @@
-import { monero_wallet_api_wasm } from "../wasm-processing/wasmFile";
+import { getMoneroWasmBytes } from "../wasm-processing/wasmLoader";
 import { WasmProcessor } from "../wasm-processing/wasmProcessor";
 export function makeInput(processor, outputToBeSpent, candidates, get_outs_Response) {
     const makeInputArgs = JSON.stringify({
@@ -89,7 +89,7 @@ export function makeTransaction(processor, params) {
     return result["signable_transaction"];
 }
 export async function signTransaction(tx, sender_spend_key) {
-    const wasmProcessor = await WasmProcessor.init(monero_wallet_api_wasm);
+    const wasmProcessor = await WasmProcessor.init(await getMoneroWasmBytes());
     wasmProcessor.writeToWasmMemory = (ptr, len) => {
         wasmProcessor.writeString(ptr, len, tx);
         wasmProcessor.writeToWasmMemory = (ptr, len) => {
@@ -108,7 +108,7 @@ export async function signTransaction(tx, sender_spend_key) {
     return result["signed_transaction"];
 }
 export async function parseAddress(address) {
-    const wasmProcessor = await WasmProcessor.init(monero_wallet_api_wasm);
+    const wasmProcessor = await WasmProcessor.init(await getMoneroWasmBytes());
     wasmProcessor.writeToWasmMemory = (ptr, len) => {
         wasmProcessor.writeString(ptr, len, address);
     };

package/dist/viewpair/ViewPair.d.ts

@@ -6,7 +6,7 @@ import { type ScanCache } from "../scanning-syncing/scanresult/scanCache";
 import { type MakeTransactionParams, type UnsignedTransaction } from "../send-functionality/transactionBuilding";
 import { WasmProcessor } from "../wasm-processing/wasmProcessor";
 import { type NETWORKS } from "../node-interaction/nodeUrl";
-import { type GetBlockHeadersRangeParams } from "../xmr3";
+import { type GetBlockHeadersRangeParams } from "../xmr3_common";
 /**
  * This class is useful to interact with Moneros DaemonRpc binary requests in a convenient way.
  * (similar to how you would interact with a REST api that gives you json back.)
@@ -35,7 +35,7 @@ export declare class ViewPair extends WasmProcessor {
      * @param stopSync optional AbortSignal to stop the syncing process
      * @returns The difference to the same method on NodeUrl is: It returns {@link ScanResult} (outputs that belong to viewpair) and not just the blocks as json.
      */
-    getBlocksBin(params: GetBlocksBinRequest, metaCallBack?: GetBlocksBinMetaCallback, stopSync?: AbortSignal): Promise<ScanResult | ErrorResponse | undefined>;
+    getBlocksBin(params: GetBlocksBinRequest, metaCallBack?: GetBlocksBinMetaCallback, stopSync?: AbortSignal): Promise<ErrorResponse | ScanResult | undefined>;
     addGenesisHashToBlockIds(params: GetBlocksBinRequest): Promise<GetBlocksBinRequest>;
     /**
      * This function helps with making requests to the get_blocks.bin endpoint of the Monerod nodes.
@@ -66,7 +66,7 @@ export declare class ViewPair extends WasmProcessor {
      * @param getBlocksBinResponseBuffer the raw binary response from the get_blocks.bin endpoint
      * @returns metadata about the loaded blocks (new_height, daemon_height, status, block_infos)
      */
-    loadGetBlocksBinResponse(getBlocksBinResponseBuffer: Uint8Array): Promise<import("../xmr3").GetBlocksResultMeta>;
+    loadGetBlocksBinResponse(getBlocksBinResponseBuffer: Uint8Array): Promise<import("../xmr3_common").GetBlocksResultMeta>;
     /**
      * scan one block from a getblocks.bin response that was loaded into wasm memory.
      * call loadGetBlocksBinResponse first to populate the response in the wasm module.
@@ -134,7 +134,7 @@ export declare class ViewPair extends WasmProcessor {
      * @param params The parameters including start_height, end_height, and optional fill_pow_hash.
      * @returns The result object with headers, status, etc. Throws if the range is invalid:(end_height > daemonheight)
      */
-    getBlockHeadersRange(params: GetBlockHeadersRangeParams): Promise<import("../xmr3").GetBlockHeadersRange>;
+    getBlockHeadersRange(params: GetBlockHeadersRangeParams): Promise<import("../xmr3_common").GetBlockHeadersRange>;
     /**
      * Fetch general information about the Monero daemon.
      * @link https://docs.getmonero.org/rpc-library/monerod-rpc/#get_info

package/dist/viewpair/ViewPair.js

@@ -4,11 +4,11 @@ export { NodeUrl } from "../node-interaction/nodeUrl";
 import { getBlocksBinScan, getBlocksBinExecuteRequest, getBlocksBinScanOneBlock, loadGetBlocksBinResponse, MAINNET_GENESIS_BLOCK_HASH, STAGENET_GENESIS_BLOCK_HASH, } from "../node-interaction/binaryEndpoints";
 import { lastRange, writeCacheFileDefaultLocationThrows, } from "../scanning-syncing/scanresult/scanCache";
 import { makeSweepTransaction, makeTransaction, } from "../send-functionality/transactionBuilding";
-import { monero_wallet_api_wasm } from "../wasm-processing/wasmFile";
+import { getMoneroWasmBytes } from "../wasm-processing/wasmLoader";
 import { WasmProcessor } from "../wasm-processing/wasmProcessor";
 import { LOCAL_NODE_DEFAULT_URL, } from "../node-interaction/nodeUrl";
-import { get_block_headers_range, get_info, } from "../xmr3";
-import { readWalletFromScanSettings } from "../xmr3";
+import { get_block_headers_range, get_info, } from "../xmr3_common";
+import { readWalletFromScanSettings } from "../xmr3_common";
 import { sleep } from "../io/sleep";
 /**
  * This class is useful to interact with Moneros DaemonRpc binary requests in a convenient way.
@@ -38,7 +38,7 @@ export class ViewPair extends WasmProcessor {
     }
     static async create(primary_address, secret_view_key, subaddress_index = 0, node_url) {
         const viewPair = new ViewPair(node_url || LOCAL_NODE_DEFAULT_URL, primary_address);
-        const tinywasi = await viewPair.initWasmModule(monero_wallet_api_wasm);
+        const tinywasi = await viewPair.initWasmModule(await getMoneroWasmBytes());
         viewPair.writeToWasmMemory = (ptr, len) => {
             viewPair.writeString(ptr, len, primary_address);
             viewPair.writeToWasmMemory = (ptr, len) => {

package/dist/wasm-processing/wasmLoader.d.ts

@@ -0,0 +1,10 @@
+export type WasmUrls = {
+    monero?: string;
+    dkg?: string;
+};
+export declare function setInlineWasm(monero?: Uint8Array<ArrayBuffer>, dkg?: Uint8Array<ArrayBuffer>): void;
+export declare function setWasmUrls(urls: WasmUrls): void;
+export declare function getWasmUrls(): WasmUrls;
+export declare function resetWasmLoaderForTests(): void;
+export declare function getMoneroWasmBytes(): Promise<Uint8Array<ArrayBuffer>>;
+export declare function getDkgWasmBytes(): Promise<Uint8Array<ArrayBuffer>>;

package/dist/wasm-processing/wasmLoader.js

@@ -0,0 +1,108 @@
+// loader for wasm bytes in packed and unpacked mode
+// packed mode uses inlined bytes from wasmFile
+// unpacked mode fetches bytes from files
+// this keeps chrome store builds free from base64 blobs
+let inlineMonero;
+let inlineDkg;
+let moneroUrl;
+let dkgUrl;
+let moneroCache;
+let dkgCache;
+let moneroFlight;
+let dkgFlight;
+// set inlined bytes, called once by packed entry
+export function setInlineWasm(monero, dkg) {
+    if (monero && monero.length)
+        inlineMonero = monero;
+    if (dkg && dkg.length)
+        inlineDkg = dkg;
+}
+// set file urls, called by unpacked entry
+export function setWasmUrls(urls) {
+    if (urls.monero) {
+        moneroUrl = urls.monero;
+        moneroCache = undefined;
+    }
+    if (urls.dkg) {
+        dkgUrl = urls.dkg;
+        dkgCache = undefined;
+    }
+}
+// get current urls, used to pass urls to worker
+export function getWasmUrls() {
+    return { monero: moneroUrl, dkg: dkgUrl };
+}
+// clear cache and urls, used in tests
+// inline bytes stay set, packed tests need them
+// unpacked tests set urls, urls win over inline so order does not matter
+export function resetWasmLoaderForTests() {
+    moneroUrl = undefined;
+    dkgUrl = undefined;
+    moneroCache = undefined;
+    dkgCache = undefined;
+    moneroFlight = undefined;
+    dkgFlight = undefined;
+}
+async function fetchWasmBytes(url) {
+    // bun can read local files directly
+    try {
+        // @ts-ignore bun only
+        if (typeof Bun !== "undefined") {
+            // @ts-ignore bun only
+            const f = Bun.file(url);
+            if (await f.exists())
+                return new Uint8Array(await f.arrayBuffer());
+        }
+    }
+    catch {
+        // fall through to fetch
+    }
+    const res = await fetch(url);
+    if (!res.ok)
+        throw new Error("wasm fetch failed: " + url + " " + res.status);
+    return new Uint8Array(await res.arrayBuffer());
+}
+// get monero wasm bytes, urls win over inline when set
+// concurrent calls share one fetch via flight promise
+export async function getMoneroWasmBytes() {
+    if (moneroUrl) {
+        if (moneroCache)
+            return moneroCache;
+        if (moneroFlight)
+            return moneroFlight;
+        moneroFlight = fetchWasmBytes(moneroUrl).then((b) => {
+            moneroCache = b;
+            moneroFlight = undefined;
+            return b;
+        }).catch((e) => {
+            moneroFlight = undefined;
+            throw e;
+        });
+        return moneroFlight;
+    }
+    if (inlineMonero && inlineMonero.length)
+        return inlineMonero;
+    throw new Error("monero wasm has no inline bytes and no url, call setWasmUrls first");
+}
+// get dkg wasm bytes, urls win over inline when set
+// concurrent calls share one fetch via flight promise
+export async function getDkgWasmBytes() {
+    if (dkgUrl) {
+        if (dkgCache)
+            return dkgCache;
+        if (dkgFlight)
+            return dkgFlight;
+        dkgFlight = fetchWasmBytes(dkgUrl).then((b) => {
+            dkgCache = b;
+            dkgFlight = undefined;
+            return b;
+        }).catch((e) => {
+            dkgFlight = undefined;
+            throw e;
+        });
+        return dkgFlight;
+    }
+    if (inlineDkg && inlineDkg.length)
+        return inlineDkg;
+    throw new Error("dkg wasm has no inline bytes and no url, call setWasmUrls first");
+}