onekey-monero-runtime 0.1.0-alpha.2 → 0.1.0-alpha.4

package/onekey_monero_runtime.d.ts

@@ -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, reservation_id: 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
@@ -89,18 +89,13 @@ export function init(): Promise<void>;
 
 export function listAccounts(): string;
 
-/**
- * Called before signing; every selected input must still belong to this review.
- */
-export function markReservationSigned(reservation_id: string, expected_inputs: number): string;
-
 /**
  * Open (or create) a wallet DB.
  */
 export function openWallet(db_name: string, network: string): string;
 
 /**
- * Select inputs, build and reserve. Needs no spend private key; does not broadcast.
+ * Select inputs and build. Needs no spend private key; does not broadcast.
  *
  * `recipientsJson` is `[{ "address": "...", "amountAtomic": "1000000000000" }]`.
  *
@@ -108,25 +103,20 @@ export function openWallet(db_name: string, network: string): string;
  * spendable total minus fee; the passed amount is ignored. Merely omitting change
  * would fold the remainder into the fee.
  *
- * Returns `{ reservationId, signableHex, feeAtomic, amountAtomic, changeAtomic,
- * inputsAtomic, inputCount }`. `feeAtomic` and `amountAtomic` are what the
+ * Returns `{ signableHex, feeAtomic, amountAtomic, changeAtomic, inputsAtomic,
+ * inputCount }`. `feeAtomic` and `amountAtomic` are what the
  * transaction will use: the confirmation page shows them and signing keeps them.
  *
- * Failure leaves no reservation. On success the host must call `signTransaction` +
- * `broadcastTransaction`, or `releaseReservation`; otherwise the inputs stay locked.
+ * Inputs are not reserved: a second prepare before broadcast may select the same
+ * ones, and broadcast then refuses the later transaction as `inputAlreadySpent`.
  */
-export function prepareTransaction(account_id: bigint, recipients_json: string, max_send: boolean, reservation_id: string, chain_tip: bigint, priority: string): Promise<string>;
+export function prepareTransaction(account_id: bigint, recipients_json: string, max_send: boolean, chain_tip: bigint, priority: string): Promise<string>;
 
 /**
  * Register a subaddress and return its address. Funds to unregistered subaddresses go undetected.
  */
 export function registerSubaddress(account_id: bigint, major: number, minor: number, label?: string | null): string;
 
-/**
- * Release a reservation (user cancelled or construction failed).
- */
-export function releaseReservation(reservation_id: string): string;
-
 /**
  * Delete an identity and all its data. Irreversible.
  */
@@ -203,6 +193,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.
  */
@@ -214,7 +206,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: number, e: number, f: bigint, g: number, h: number, i: number, j: 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;
@@ -226,11 +218,9 @@ export interface InitOutput {
     readonly importKeyImages: (a: bigint, b: number, c: number) => [number, number, number, number];
     readonly init: () => any;
     readonly listAccounts: () => [number, number, number, number];
-    readonly markReservationSigned: (a: number, b: number, c: number) => [number, number, number, number];
     readonly openWallet: (a: number, b: number, c: number, d: number) => [number, number, number, number];
-    readonly prepareTransaction: (a: bigint, b: number, c: number, d: number, e: number, f: number, g: bigint, h: number, i: number) => any;
+    readonly prepareTransaction: (a: bigint, b: number, c: number, d: number, e: bigint, f: number, g: number) => any;
     readonly registerSubaddress: (a: bigint, b: number, c: number, d: number, e: number) => [number, number, number, number];
-    readonly releaseReservation: (a: number, b: number) => [number, number, number, number];
     readonly removeAccount: (a: number, b: number) => [number, number, number, number];
     readonly rewindTo: (a: bigint, b: bigint, c: bigint) => [number, number, number, number];
     readonly setNodeUrl: (a: number, b: number) => any;
@@ -243,6 +233,7 @@ export interface InitOutput {
     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

@@ -70,22 +70,25 @@ export function balance(account_id, chain_tip) {
  * returned. Only an explicit node rejection errors and releases the inputs.
  * @param {bigint} account_id
  * @param {string} raw_hex
- * @param {string} reservation_id
  * @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, reservation_id, 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;
-    const ptr1 = passStringToWasm0(reservation_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    var ptr2 = isLikeNone(outgoing_atomic) ? 0 : passStringToWasm0(outgoing_atomic, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    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;
-    var ptr3 = isLikeNone(change_atomic) ? 0 : passStringToWasm0(change_atomic, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var ptr3 = isLikeNone(signable_hex) ? 0 : passStringToWasm0(signable_hex, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     var len3 = WASM_VECTOR_LEN;
-    const ret = wasm.broadcastTransaction(account_id, ptr0, len0, ptr1, len1, chain_tip, ptr2, len2, ptr3, len3);
+    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;
 }
 
@@ -322,33 +325,6 @@ export function listAccounts() {
     }
 }
 
-/**
- * Called before signing; every selected input must still belong to this review.
- * @param {string} reservation_id
- * @param {number} expected_inputs
- * @returns {string}
- */
-export function markReservationSigned(reservation_id, expected_inputs) {
-    let deferred3_0;
-    let deferred3_1;
-    try {
-        const ptr0 = passStringToWasm0(reservation_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.markReservationSigned(ptr0, len0, expected_inputs);
-        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);
-    }
-}
-
 /**
  * Open (or create) a wallet DB.
  * @param {string} db_name
@@ -379,7 +355,7 @@ export function openWallet(db_name, network) {
 }
 
 /**
- * Select inputs, build and reserve. Needs no spend private key; does not broadcast.
+ * Select inputs and build. Needs no spend private key; does not broadcast.
  *
  * `recipientsJson` is `[{ "address": "...", "amountAtomic": "1000000000000" }]`.
  *
@@ -387,28 +363,25 @@ export function openWallet(db_name, network) {
  * spendable total minus fee; the passed amount is ignored. Merely omitting change
  * would fold the remainder into the fee.
  *
- * Returns `{ reservationId, signableHex, feeAtomic, amountAtomic, changeAtomic,
- * inputsAtomic, inputCount }`. `feeAtomic` and `amountAtomic` are what the
+ * Returns `{ signableHex, feeAtomic, amountAtomic, changeAtomic, inputsAtomic,
+ * inputCount }`. `feeAtomic` and `amountAtomic` are what the
  * transaction will use: the confirmation page shows them and signing keeps them.
  *
- * Failure leaves no reservation. On success the host must call `signTransaction` +
- * `broadcastTransaction`, or `releaseReservation`; otherwise the inputs stay locked.
+ * Inputs are not reserved: a second prepare before broadcast may select the same
+ * ones, and broadcast then refuses the later transaction as `inputAlreadySpent`.
  * @param {bigint} account_id
  * @param {string} recipients_json
  * @param {boolean} max_send
- * @param {string} reservation_id
  * @param {bigint} chain_tip
  * @param {string} priority
  * @returns {Promise<string>}
  */
-export function prepareTransaction(account_id, recipients_json, max_send, reservation_id, chain_tip, priority) {
+export function prepareTransaction(account_id, recipients_json, max_send, chain_tip, priority) {
     const ptr0 = passStringToWasm0(recipients_json, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(reservation_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const ptr1 = passStringToWasm0(priority, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
-    const ptr2 = passStringToWasm0(priority, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len2 = WASM_VECTOR_LEN;
-    const ret = wasm.prepareTransaction(account_id, ptr0, len0, max_send, ptr1, len1, chain_tip, ptr2, len2);
+    const ret = wasm.prepareTransaction(account_id, ptr0, len0, max_send, chain_tip, ptr1, len1);
     return ret;
 }
 
@@ -441,32 +414,6 @@ export function registerSubaddress(account_id, major, minor, label) {
     }
 }
 
-/**
- * Release a reservation (user cancelled or construction failed).
- * @param {string} reservation_id
- * @returns {string}
- */
-export function releaseReservation(reservation_id) {
-    let deferred3_0;
-    let deferred3_1;
-    try {
-        const ptr0 = passStringToWasm0(reservation_id, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.releaseReservation(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);
-    }
-}
-
 /**
  * Delete an identity and all its data. Irreversible.
  * @param {string} uuid
@@ -729,6 +676,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
@@ -1174,12 +1152,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: 941, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // 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`.
             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: 296, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 293, 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.2",
+  "version": "0.1.0-alpha.4",
   "license": "Apache-2.0",
   "files": [
     "onekey_monero_runtime.js",