@spirobel/monero-wallet-api 0.3.10 → 0.3.11

package/dist/scanning-syncing/scanSettings.d.ts

@@ -5,7 +5,7 @@ export type ScanSetting = {
     halted?: boolean;
     wallet_route?: string;
     wallet_name?: string;
-    wallet_index?: number;
+    wallet_slot?: number;
 };
 export type WriteScanSettingParams = {
     primary_address: string;
@@ -16,7 +16,7 @@ export type WriteScanSettingParams = {
     node_url?: string;
     wallet_route?: string;
     wallet_name?: string;
-    wallet_index?: number;
+    wallet_slot?: number;
 };
 export type ScanSettingOpened = {
     primary_address: string;
@@ -28,7 +28,7 @@ export type ScanSettingOpened = {
     secret_spend_key?: string;
     wallet_route?: string;
     wallet_name?: string;
-    wallet_index?: number;
+    wallet_slot?: number;
 };
 export type ScanSettings = {
     wallets: ScanSetting[];
@@ -101,7 +101,7 @@ export declare function walletSettingsPlusKeys(wallet_settings: ScanSettingOpene
     halted?: boolean;
     wallet_route?: string;
     wallet_name?: string;
-    wallet_index?: number;
+    wallet_slot?: number;
 }>;
 export declare function writeWalletToScanSettings(params: WriteScanSettingParams): Promise<number>;
 export declare function openScanSettingsFile(scan_settings_path?: string): Promise<ScanSettings | undefined>;

package/dist/scanning-syncing/scanSettings.js

@@ -192,7 +192,7 @@ export async function writeWalletToScanSettings(params) {
                     halted: params.halted,
                     wallet_route: params.wallet_route,
                     wallet_name: params.wallet_name,
-                    wallet_index: params.wallet_index,
+                    wallet_slot: params.wallet_slot,
                 },
             ],
             node_url: params.node_url,
@@ -213,7 +213,7 @@ export async function writeWalletToScanSettings(params) {
             halted: params.halted,
             wallet_route: params.wallet_route,
             wallet_name: params.wallet_name,
-            wallet_index: params.wallet_index,
+            wallet_slot: params.wallet_slot,
         });
     }
     else {
@@ -225,7 +225,7 @@ export async function writeWalletToScanSettings(params) {
             wallet.halted = params.halted || wallet.halted;
             wallet.wallet_route = params.wallet_route || wallet.wallet_route;
             wallet.wallet_name = params.wallet_name || wallet.wallet_name;
-            wallet.wallet_index = params.wallet_index || wallet.wallet_index;
+            wallet.wallet_slot = params.wallet_slot || wallet.wallet_slot;
         }
     }
     return await atomicWrite(params.scan_settings_path, JSON.stringify(scanSettings, null, 2));

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

@@ -21,7 +21,7 @@ export declare class ScanCacheOpened {
     readonly view_pair: ViewPair;
     readonly wallet_route: string | undefined;
     readonly wallet_name: string | undefined;
-    readonly wallet_index: number | undefined;
+    readonly wallet_slot: number | undefined;
     readonly no_worker: boolean;
     readonly masterCacheChanged: CacheChangedCallback | null;
     private _start_height;

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

@@ -10,7 +10,7 @@ export class ScanCacheOpened {
     view_pair;
     wallet_route;
     wallet_name;
-    wallet_index;
+    wallet_slot;
     no_worker;
     masterCacheChanged;
     _start_height;
@@ -29,7 +29,7 @@ export class ScanCacheOpened {
         // read secret_view_key and secret_spend_key from env
         const walletSettingsWithKeys = await walletSettingsPlusKeys(walletSettings);
         // create viewpair + ScanCacheOpened instance
-        const scanCacheOpen = new ScanCacheOpened(await ViewPair.create(params.primary_address, walletSettingsWithKeys.secret_view_key, walletSettings.subaddress_index, walletSettings.node_url), walletSettings.wallet_route, walletSettings.wallet_name, walletSettings.wallet_index, params.no_worker || false, params.masterCacheChanged || null, walletSettings.start_height, params.scan_settings_path, params.pathPrefix, params.workerError);
+        const scanCacheOpen = new ScanCacheOpened(await ViewPair.create(params.primary_address, walletSettingsWithKeys.secret_view_key, walletSettings.subaddress_index, walletSettings.node_url), walletSettings.wallet_route, walletSettings.wallet_name, walletSettings.wallet_slot, params.no_worker || false, params.masterCacheChanged || null, walletSettings.start_height, params.scan_settings_path, params.pathPrefix, params.workerError);
         if (theCatchToBeOpened)
             scanCacheOpen._cache = theCatchToBeOpened;
         if (!walletSettings.halted) {
@@ -522,11 +522,11 @@ export class ScanCacheOpened {
         primary_address: "",
     };
     worker = undefined;
-    constructor(view_pair, wallet_route, wallet_name, wallet_index, no_worker, masterCacheChanged, _start_height, scan_settings_path, pathPrefix, workerError) {
+    constructor(view_pair, wallet_route, wallet_name, wallet_slot, no_worker, masterCacheChanged, _start_height, scan_settings_path, pathPrefix, workerError) {
         this.view_pair = view_pair;
         this.wallet_route = wallet_route;
         this.wallet_name = wallet_name;
-        this.wallet_index = wallet_index;
+        this.wallet_slot = wallet_slot;
         this.no_worker = no_worker;
         this.masterCacheChanged = masterCacheChanged;
         this._start_height = _start_height;

package/dist/tools/monero-tools.d.ts

@@ -57,5 +57,10 @@ export type ShareViewkeyResult = {
     successUrl: string | null;
 };
 export declare function shareViewKey002(payload: ShareViewkeyPayload): Promise<ShareViewkeyResult>;
+export type ShareViewkey002Pruned = {
+    viewkey: string;
+    primary_address: string;
+    wallet_slot: string;
+};
 export declare function potentialSuccessRedirect002(payload: ShareViewkeyPayload): Promise<void>;
-export declare function constructPositive002Response(successUrl?: string): ShareViewkeyResult;
+export declare function handle002ShareRequest(req: Request, parsed_cb: (parsed_body: ShareViewkey002Pruned) => Promise<void>, successUrl?: string): Promise<ShareViewkeyResult>;

package/dist/tools/monero-tools.js

@@ -189,6 +189,7 @@ export async function shareViewKey002(payload) {
         body: JSON.stringify({
             viewkey: payload.viewkey,
             primary_address: payload.primary_address,
+            wallet_slot: invo.tool.payload.wallet_slot,
         }),
     });
     if (result.ok) {
@@ -213,15 +214,35 @@ export async function shareViewKey002(payload) {
         };
     }
 }
+// client wallet side
 export async function potentialSuccessRedirect002(payload) {
     const shareVKresult = await shareViewKey002(payload);
     if (shareVKresult.ok && shareVKresult.successUrl) {
         window.location.href = shareVKresult.successUrl;
+        window.location.reload();
     }
 }
-export function constructPositive002Response(successUrl) {
-    return {
-        ok: true,
-        successUrl: successUrl ?? null,
-    };
+// backend response
+export async function handle002ShareRequest(req, parsed_cb, successUrl) {
+    try {
+        const json_body = await req.json();
+        const { viewkey, primary_address, wallet_slot } = json_body;
+        if (Number.isNaN(parseInt(wallet_slot))) {
+            return { ok: false, successUrl: null };
+        }
+        if (typeof viewkey !== "string" ||
+            viewkey.trim().length === 0 ||
+            typeof primary_address !== "string" ||
+            primary_address.trim().length === 0) {
+            return { ok: false, successUrl: null };
+        }
+        await parsed_cb({ viewkey, primary_address, wallet_slot });
+        return {
+            ok: true,
+            successUrl: successUrl ?? null,
+        };
+    }
+    catch {
+        return { ok: false, successUrl: null };
+    }
 }

package/package.json

@@ -40,7 +40,7 @@
     "clean": "rm -rf ./dist"
   },
   "files": ["dist"],
-  "version": "0.3.10",
+  "version": "0.3.11",
   "devDependencies": {
     "@types/bun": "latest"
   },