onekey-monero-runtime 0.1.0-alpha.3 → 0.1.0-alpha.5

package/onekey_monero_runtime.d.ts

@@ -4,8 +4,8 @@
 /**
  * Register an identity (view key pair).
  *
- * `spendPublicKeyHex` and `viewPrivateKeyHex` are 32-byte hex. The spend private
- * key is not taken here; it is passed only for signing (see `signTransaction`).
+ * `spendPublicKeyHex` and `viewPrivateKeyHex` are 32-byte hex. No spend secret
+ * is taken here; see `signTransactionWithBip32Key`.
  */
 export function addAccount(uuid: string, spend_public_key_hex: string, view_private_key_hex: string, birthday_height: bigint): string;
 
@@ -22,7 +22,7 @@ export function balance(account_id: bigint, chain_tip?: bigint | null): string;
  * are marked, the transaction goes in flight, and `broadcast: accepted | unknown` is
  * returned. Only an explicit node rejection errors and releases the inputs.
  */
-export function broadcastTransaction(account_id: bigint, raw_hex: string, chain_tip: bigint, outgoing_atomic?: string | null, change_atomic?: string | null): Promise<string>;
+export function broadcastTransaction(account_id: bigint, raw_hex: string, chain_tip: bigint, outgoing_atomic?: string | null, change_atomic?: string | null, signable_hex?: string | null, review_json?: string | null): Promise<string>;
 
 /**
  * Fetch the chain tip. Does not require an open wallet DB: account creation needs
@@ -57,7 +57,7 @@ export function dependencyVersions(): string;
  * Matches OneKey V4 (`spend = sc_reduce32(key)`, `view = keccak(spend)`). Changing
  * it would show existing users an empty wallet after importing the same mnemonic.
  *
- * Does not return the spend private key; the caller already has it.
+ * Does not return the spend private key.
  */
 export function deriveAccount(network: string, bip32_private_key_hex: string): string;
 
@@ -79,8 +79,11 @@ export function history(account_id: bigint, limit: number, offset: number): stri
  * Call as early as possible after unlock. Until then the balance is too high: a
  * view-only wallet cannot detect spends, so spent outputs still look unspent. This
  * only affects blocks scanned afterwards; earlier spends need a rewind and rescan.
+ *
+ * Takes the account's BIP-32 key (as `deriveAccount`); the spend key is reduced
+ * here and wiped after use.
  */
-export function importKeyImages(account_id: bigint, spend_private_key_hex: string): string;
+export function importKeyImagesWithBip32Key(account_id: bigint, bip32_private_key_hex: string): string;
 
 /**
  * Install persistent storage. Must be called once before opening any DB.
@@ -153,16 +156,12 @@ export function setRequestHandler(handler?: Function | null): void;
 /**
  * Sign a prepared transaction. No network, no DB, no broadcast.
  *
- * `spendPrivateKeyHex` is wiped after use, never stored or returned.
+ * Takes the account's BIP-32 key (as `deriveAccount`); the spend key is reduced
+ * here, and both are wiped after use, never stored or returned.
  * Returns `{ txid, rawHex, sizeBytes }`; the txid is fixed at signing, so the host
  * can record the pending transaction before broadcasting.
  */
-export function signTransaction(signable_hex: string, spend_private_key_hex: string, review_json: string): string;
-
-/**
- * Spend scalar for signing, from a BIP-32 private key. Same reduction as `deriveAccount`.
- */
-export function spendScalar(bip32_private_key_hex: string): string;
+export function signTransactionWithBip32Key(signable_hex: string, bip32_private_key_hex: string, review_json: string): string;
 
 /**
  * Preserve a failed call's result, then retire its poisoned storage owner.
@@ -193,6 +192,8 @@ export function updateChainTip(account_id: bigint, tip: bigint): string;
  */
 export function validateAddress(network: string, address: string): boolean;
 
+export function verifySignedTransaction(signable_hex: string, review_json: string, raw_hex: string): string;
+
 /**
  * Validate actual payment effects before the host presents its confirmation.
  */
@@ -204,7 +205,7 @@ export interface InitOutput {
     readonly memory: WebAssembly.Memory;
     readonly addAccount: (a: number, b: number, c: number, d: number, e: number, f: number, g: bigint) => [number, number, number, number];
     readonly balance: (a: bigint, b: number, c: bigint) => [number, number, number, number];
-    readonly broadcastTransaction: (a: bigint, b: number, c: number, d: bigint, e: number, f: number, g: number, h: number) => any;
+    readonly broadcastTransaction: (a: bigint, b: number, c: number, d: bigint, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => any;
     readonly chainTip: () => any;
     readonly closeWallet: () => [number, number];
     readonly deleteWallet: (a: number, b: number) => any;
@@ -213,7 +214,7 @@ export interface InitOutput {
     readonly deriveSubaddress: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => [number, number, number, number];
     readonly diagDatabase: () => [number, number, number, number];
     readonly history: (a: bigint, b: number, c: number) => [number, number, number, number];
-    readonly importKeyImages: (a: bigint, b: number, c: number) => [number, number, number, number];
+    readonly importKeyImagesWithBip32Key: (a: bigint, b: number, c: number) => [number, number, number, number];
     readonly init: () => any;
     readonly listAccounts: () => [number, number, number, number];
     readonly openWallet: (a: number, b: number, c: number, d: number) => [number, number, number, number];
@@ -223,14 +224,14 @@ export interface InitOutput {
     readonly rewindTo: (a: bigint, b: bigint, c: bigint) => [number, number, number, number];
     readonly setNodeUrl: (a: number, b: number) => any;
     readonly setRequestHandler: (a: number) => void;
-    readonly signTransaction: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
-    readonly spendScalar: (a: number, b: number) => [number, number, number, number];
+    readonly signTransactionWithBip32Key: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
     readonly storageRequiresWorkerRestart: () => number;
     readonly syncPeek: (a: bigint) => [number, number, number, number];
     readonly syncStep: (a: bigint, b: bigint) => any;
     readonly transactionDetails: (a: bigint, b: number, c: number) => [number, number, number, number];
     readonly updateChainTip: (a: bigint, b: bigint) => [number, number, number, number];
     readonly validateAddress: (a: number, b: number, c: number, d: number) => [number, number, number];
+    readonly verifySignedTransaction: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number, number];
     readonly verifyTransaction: (a: number, b: number, c: number, d: number) => [number, number];
     readonly rust_sqlite_wasm_abort: () => void;
     readonly rust_sqlite_wasm_assert_fail: (a: number, b: number, c: number, d: number) => void;

package/onekey_monero_runtime.js

@@ -3,8 +3,8 @@
 /**
  * Register an identity (view key pair).
  *
- * `spendPublicKeyHex` and `viewPrivateKeyHex` are 32-byte hex. The spend private
- * key is not taken here; it is passed only for signing (see `signTransaction`).
+ * `spendPublicKeyHex` and `viewPrivateKeyHex` are 32-byte hex. No spend secret
+ * is taken here; see `signTransactionWithBip32Key`.
  * @param {string} uuid
  * @param {string} spend_public_key_hex
  * @param {string} view_private_key_hex
@@ -73,16 +73,22 @@ export function balance(account_id, chain_tip) {
  * @param {bigint} chain_tip
  * @param {string | null} [outgoing_atomic]
  * @param {string | null} [change_atomic]
+ * @param {string | null} [signable_hex]
+ * @param {string | null} [review_json]
  * @returns {Promise<string>}
  */
-export function broadcastTransaction(account_id, raw_hex, chain_tip, outgoing_atomic, change_atomic) {
+export function broadcastTransaction(account_id, raw_hex, chain_tip, outgoing_atomic, change_atomic, signable_hex, review_json) {
     const ptr0 = passStringToWasm0(raw_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
     var ptr1 = isLikeNone(outgoing_atomic) ? 0 : passStringToWasm0(outgoing_atomic, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     var len1 = WASM_VECTOR_LEN;
     var ptr2 = isLikeNone(change_atomic) ? 0 : passStringToWasm0(change_atomic, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     var len2 = WASM_VECTOR_LEN;
-    const ret = wasm.broadcastTransaction(account_id, ptr0, len0, chain_tip, ptr1, len1, ptr2, len2);
+    var ptr3 = isLikeNone(signable_hex) ? 0 : passStringToWasm0(signable_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len3 = WASM_VECTOR_LEN;
+    var ptr4 = isLikeNone(review_json) ? 0 : passStringToWasm0(review_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len4 = WASM_VECTOR_LEN;
+    const ret = wasm.broadcastTransaction(account_id, ptr0, len0, chain_tip, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4);
     return ret;
 }
 
@@ -147,7 +153,7 @@ export function dependencyVersions() {
  * Matches OneKey V4 (`spend = sc_reduce32(key)`, `view = keccak(spend)`). Changing
  * it would show existing users an empty wallet after importing the same mnemonic.
  *
- * Does not return the spend private key; the caller already has it.
+ * Does not return the spend private key.
  * @param {string} network
  * @param {string} bip32_private_key_hex
  * @returns {string}
@@ -263,17 +269,20 @@ export function history(account_id, limit, offset) {
  * Call as early as possible after unlock. Until then the balance is too high: a
  * view-only wallet cannot detect spends, so spent outputs still look unspent. This
  * only affects blocks scanned afterwards; earlier spends need a rewind and rescan.
+ *
+ * Takes the account's BIP-32 key (as `deriveAccount`); the spend key is reduced
+ * here and wiped after use.
  * @param {bigint} account_id
- * @param {string} spend_private_key_hex
+ * @param {string} bip32_private_key_hex
  * @returns {string}
  */
-export function importKeyImages(account_id, spend_private_key_hex) {
+export function importKeyImagesWithBip32Key(account_id, bip32_private_key_hex) {
     let deferred3_0;
     let deferred3_1;
     try {
-        const ptr0 = passStringToWasm0(spend_private_key_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const ptr0 = passStringToWasm0(bip32_private_key_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.importKeyImages(account_id, ptr0, len0);
+        const ret = wasm.importKeyImagesWithBip32Key(account_id, ptr0, len0);
         var ptr2 = ret[0];
         var len2 = ret[1];
         if (ret[3]) {
@@ -496,25 +505,26 @@ export function setRequestHandler(handler) {
 /**
  * Sign a prepared transaction. No network, no DB, no broadcast.
  *
- * `spendPrivateKeyHex` is wiped after use, never stored or returned.
+ * Takes the account's BIP-32 key (as `deriveAccount`); the spend key is reduced
+ * here, and both are wiped after use, never stored or returned.
  * Returns `{ txid, rawHex, sizeBytes }`; the txid is fixed at signing, so the host
  * can record the pending transaction before broadcasting.
  * @param {string} signable_hex
- * @param {string} spend_private_key_hex
+ * @param {string} bip32_private_key_hex
  * @param {string} review_json
  * @returns {string}
  */
-export function signTransaction(signable_hex, spend_private_key_hex, review_json) {
+export function signTransactionWithBip32Key(signable_hex, bip32_private_key_hex, review_json) {
     let deferred5_0;
     let deferred5_1;
     try {
         const ptr0 = passStringToWasm0(signable_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passStringToWasm0(spend_private_key_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const ptr1 = passStringToWasm0(bip32_private_key_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len1 = WASM_VECTOR_LEN;
         const ptr2 = passStringToWasm0(review_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len2 = WASM_VECTOR_LEN;
-        const ret = wasm.signTransaction(ptr0, len0, ptr1, len1, ptr2, len2);
+        const ret = wasm.signTransactionWithBip32Key(ptr0, len0, ptr1, len1, ptr2, len2);
         var ptr4 = ret[0];
         var len4 = ret[1];
         if (ret[3]) {
@@ -529,32 +539,6 @@ export function signTransaction(signable_hex, spend_private_key_hex, review_json
     }
 }
 
-/**
- * Spend scalar for signing, from a BIP-32 private key. Same reduction as `deriveAccount`.
- * @param {string} bip32_private_key_hex
- * @returns {string}
- */
-export function spendScalar(bip32_private_key_hex) {
-    let deferred3_0;
-    let deferred3_1;
-    try {
-        const ptr0 = passStringToWasm0(bip32_private_key_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.spendScalar(ptr0, len0);
-        var ptr2 = ret[0];
-        var len2 = ret[1];
-        if (ret[3]) {
-            ptr2 = 0; len2 = 0;
-            throw takeFromExternrefTable0(ret[2]);
-        }
-        deferred3_0 = ptr2;
-        deferred3_1 = len2;
-        return getStringFromWasm0(ptr2, len2);
-    } finally {
-        wasm.__wbindgen_free(deferred3_0, deferred3_1, 1);
-    }
-}
-
 /**
  * Preserve a failed call's result, then retire its poisoned storage owner.
  * @returns {boolean}
@@ -670,6 +654,37 @@ export function validateAddress(network, address) {
     return ret[0] !== 0;
 }
 
+/**
+ * @param {string} signable_hex
+ * @param {string} review_json
+ * @param {string} raw_hex
+ * @returns {string}
+ */
+export function verifySignedTransaction(signable_hex, review_json, raw_hex) {
+    let deferred5_0;
+    let deferred5_1;
+    try {
+        const ptr0 = passStringToWasm0(signable_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passStringToWasm0(review_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ptr2 = passStringToWasm0(raw_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len2 = WASM_VECTOR_LEN;
+        const ret = wasm.verifySignedTransaction(ptr0, len0, ptr1, len1, ptr2, len2);
+        var ptr4 = ret[0];
+        var len4 = ret[1];
+        if (ret[3]) {
+            ptr4 = 0; len4 = 0;
+            throw takeFromExternrefTable0(ret[2]);
+        }
+        deferred5_0 = ptr4;
+        deferred5_1 = len4;
+        return getStringFromWasm0(ptr4, len4);
+    } finally {
+        wasm.__wbindgen_free(deferred5_0, deferred5_1, 1);
+    }
+}
+
 /**
  * Validate actual payment effects before the host presents its confirmation.
  * @param {string} signable_hex
@@ -1115,12 +1130,12 @@ function __wbg_get_imports() {
             return ret;
         }, arguments); },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 938, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 935, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
             const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__h7657f6f35500acf9);
             return ret;
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 293, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 290, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
             const ret = makeMutClosure(arg0, arg1, wasm_bindgen__convert__closures_____invoke__h38334fab7c782151);
             return ret;
         },

package/package.json

@@ -2,7 +2,7 @@
   "name": "onekey-monero-runtime",
   "type": "module",
   "description": "OneKey Monero Runtime: wallet state over monero-oxide, persisted in SQLite",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-alpha.5",
   "license": "Apache-2.0",
   "files": [
     "onekey_monero_runtime.js",