bitmask-core 0.1.2 → 0.2.0

package/README.md

@@ -2,6 +2,13 @@
 
 Core functionality for the BitMask wallet - <https://bitmask.app>
 
+[![Build Status](https://img.shields.io/github/workflow/status/diba-io/bitmask-core/Rust?style=flat-square)](https://github.com/diba-io/bitmask-core/actions/workflows/Rust.yml)
+[![Crates.io](https://img.shields.io/crates/v/bitmask-core?style=flat-square)](https://docs.rs/bitmask-core/latest/bitmask-core/)
+[![npm: bitmask-core](https://img.shields.io/npm/v/bitmask-core?style=flat-square)](https://www.npmjs.com/package/bitmask-core)
+[![License: MIT+APACHE](https://img.shields.io/crates/l/bitmask-core?style=flat-square)](https://mit-license.org)
+![Lines of code](https://img.shields.io/tokei/lines/github/diba-io/bitmask-core?style=flat-square)
+[![Telegram: rust_in_bitcoin](https://img.shields.io/badge/telegram-rust_in_bitcoin-blue?style=flat-square)](https://t.me/rust_in_bitcoin)
+
 ## Uses
 
 - [bdk](https://github.com/bitcoindevkit/bdk) - Bitcoin Dev Kit
@@ -19,4 +26,4 @@ If there are issues compiling, be sure to check you're compiling with the latest
 ## Test
 
 1. Lint against wasm32: `cargo clippy --target wasm32-unknown-unknown`
-2. Run tests in browser: `wasm-pack test --headless --chrome`
+2. Run tests in browser: `TEST_WALLET_SEED="replace with a 12 word mnemonic for a wallet containing testnet sats" wasm-pack test --headless --chrome`

package/bitmask_core.d.ts

@@ -2,9 +2,10 @@
 /* eslint-disable */
 /**
 * @param {string} password
+* @param {string} encrypted_descriptors
 * @returns {Promise<any>}
 */
-export function get_vault(password: string): Promise<any>;
+export function get_vault(password: string, encrypted_descriptors: string): Promise<any>;
 /**
 * @param {string} encryption_password
 * @param {string} seed_password
@@ -37,9 +38,16 @@ export function import_list_assets(): Promise<any>;
 */
 export function import_asset(descriptor: string, change_descriptor: string, asset?: string, genesis?: string): Promise<any>;
 /**
+* @param {string} unspent
+* @param {string} blinded_unspents
 * @returns {Promise<any>}
 */
-export function set_blinded_utxos(): Promise<any>;
+export function set_blinded_utxos(unspent: string, blinded_unspents: string): Promise<any>;
+/**
+* @param {string} utxo_string
+* @returns {Promise<any>}
+*/
+export function set_blinded_utxo(utxo_string: string): Promise<any>;
 /**
 * @param {string} descriptor
 * @param {string} change_descriptor
@@ -75,10 +83,10 @@ export function validate_transaction(consignment: string): Promise<any>;
 * @param {string} consignment
 * @param {string} txid
 * @param {number} vout
-* @param {BigInt} blinding
+* @param {string} blinding
 * @returns {Promise<any>}
 */
-export function accept_transaction(consignment: string, txid: string, vout: number, blinding: BigInt): Promise<any>;
+export function accept_transaction(consignment: string, txid: string, vout: number, blinding: string): Promise<any>;
 /**
 * @param {string} network_str
 */
@@ -88,19 +96,20 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly get_vault: (a: number, b: number) => number;
+  readonly get_vault: (a: number, b: number, c: number, d: number) => number;
   readonly get_mnemonic_seed: (a: number, b: number, c: number, d: number) => number;
   readonly save_mnemonic_seed: (a: number, b: number, c: number, d: number, e: number, f: number) => number;
   readonly get_wallet_data: (a: number, b: number, c: number, d: number) => number;
   readonly import_list_assets: () => number;
   readonly import_asset: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
+  readonly set_blinded_utxos: (a: number, b: number, c: number, d: number) => number;
+  readonly set_blinded_utxo: (a: number, b: number) => number;
   readonly send_sats: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
   readonly send_tokens: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
   readonly send_tokens_full: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => number;
   readonly validate_transaction: (a: number, b: number) => number;
   readonly accept_transaction: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => number;
   readonly switch_network: (a: number, b: number) => void;
-  readonly set_blinded_utxos: () => number;
   readonly rustsecp256k1_v0_4_1_context_create: (a: number) => number;
   readonly rustsecp256k1_v0_4_1_context_destroy: (a: number) => void;
   readonly rustsecp256k1_v0_4_1_default_illegal_callback_fn: (a: number, b: number) => void;

package/bitmask_core.js

@@ -1,6 +1,26 @@
 
 let wasm;
 
+const heap = new Array(32).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+function getObject(idx) { return heap[idx]; }
+
+let heap_next = heap.length;
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 
 cachedTextDecoder.decode();
@@ -17,12 +37,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(32).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
     const idx = heap_next;
@@ -32,20 +46,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 let cachedTextEncoder = new TextEncoder('utf-8');
@@ -208,12 +208,15 @@ function __wbg_adapter_28(arg0, arg1, arg2) {
 
 /**
 * @param {string} password
+* @param {string} encrypted_descriptors
 * @returns {Promise<any>}
 */
-export function get_vault(password) {
+export function get_vault(password, encrypted_descriptors) {
     var ptr0 = passStringToWasm0(password, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     var len0 = WASM_VECTOR_LEN;
-    var ret = wasm.get_vault(ptr0, len0);
+    var ptr1 = passStringToWasm0(encrypted_descriptors, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len1 = WASM_VECTOR_LEN;
+    var ret = wasm.get_vault(ptr0, len0, ptr1, len1);
     return takeObject(ret);
 }
 
@@ -291,10 +294,27 @@ export function import_asset(descriptor, change_descriptor, asset, genesis) {
 }
 
 /**
+* @param {string} unspent
+* @param {string} blinded_unspents
 * @returns {Promise<any>}
 */
-export function set_blinded_utxos() {
-    var ret = wasm.set_blinded_utxos();
+export function set_blinded_utxos(unspent, blinded_unspents) {
+    var ptr0 = passStringToWasm0(unspent, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len0 = WASM_VECTOR_LEN;
+    var ptr1 = passStringToWasm0(blinded_unspents, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len1 = WASM_VECTOR_LEN;
+    var ret = wasm.set_blinded_utxos(ptr0, len0, ptr1, len1);
+    return takeObject(ret);
+}
+
+/**
+* @param {string} utxo_string
+* @returns {Promise<any>}
+*/
+export function set_blinded_utxo(utxo_string) {
+    var ptr0 = passStringToWasm0(utxo_string, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len0 = WASM_VECTOR_LEN;
+    var ret = wasm.set_blinded_utxo(ptr0, len0);
     return takeObject(ret);
 }
 
@@ -385,7 +405,7 @@ export function validate_transaction(consignment) {
 * @param {string} consignment
 * @param {string} txid
 * @param {number} vout
-* @param {BigInt} blinding
+* @param {string} blinding
 * @returns {Promise<any>}
 */
 export function accept_transaction(consignment, txid, vout, blinding) {
@@ -393,10 +413,9 @@ export function accept_transaction(consignment, txid, vout, blinding) {
     var len0 = WASM_VECTOR_LEN;
     var ptr1 = passStringToWasm0(txid, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     var len1 = WASM_VECTOR_LEN;
-    uint64CvtShim[0] = blinding;
-    const low2 = u32CvtShim[0];
-    const high2 = u32CvtShim[1];
-    var ret = wasm.accept_transaction(ptr0, len0, ptr1, len1, vout, low2, high2);
+    var ptr2 = passStringToWasm0(blinding, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len2 = WASM_VECTOR_LEN;
+    var ret = wasm.accept_transaction(ptr0, len0, ptr1, len1, vout, ptr2, len2);
     return takeObject(ret);
 }
 
@@ -438,7 +457,7 @@ function getArrayJsValueFromWasm0(ptr, len) {
     }
     return result;
 }
-function __wbg_adapter_150(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_145(arg0, arg1, arg2, arg3) {
     wasm.wasm_bindgen__convert__closures__invoke2_mut__h989d4d5a38951b01(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
@@ -479,20 +498,12 @@ async function init(input) {
     }
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-        var ret = getStringFromWasm0(arg0, arg1);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
-    imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        var ret = JSON.stringify(obj === undefined ? null : obj);
-        var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len0 = WASM_VECTOR_LEN;
-        getInt32Memory0()[arg0 / 4 + 1] = len0;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        var ret = getStringFromWasm0(arg0, arg1);
+        return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cb_drop = function(arg0) {
         const obj = takeObject(arg0).original;
@@ -503,6 +514,14 @@ async function init(input) {
         var ret = false;
         return ret;
     };
+    imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        var ret = JSON.stringify(obj === undefined ? null : obj);
+        var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len0 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len0;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
+    };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
         const obj = getObject(arg1);
         var ret = typeof(obj) === 'string' ? obj : undefined;
@@ -511,6 +530,10 @@ async function init(input) {
         getInt32Memory0()[arg0 / 4 + 1] = len0;
         getInt32Memory0()[arg0 / 4 + 0] = ptr0;
     };
+    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
+        var ret = getObject(arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_randomFillSync_378e02b85af41ab6 = function() { return handleError(function (arg0, arg1, arg2) {
         getObject(arg0).randomFillSync(getArrayU8FromWasm0(arg1, arg2));
     }, arguments) };
@@ -554,10 +577,6 @@ async function init(input) {
         var ret = getObject(arg0).msCrypto;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
-        var ret = getObject(arg0);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_log_06b7ffc63a0f8bee = function(arg0, arg1) {
         var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
         wasm.__wbindgen_free(arg0, arg1 * 4);
@@ -571,10 +590,6 @@ async function init(input) {
         var ret = getObject(arg0) instanceof Window;
         return ret;
     };
-    imports.wbg.__wbg_localStorage_2b7091e6919605e2 = function() { return handleError(function (arg0) {
-        var ret = getObject(arg0).localStorage;
-        return isLikeNone(ret) ? 0 : addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_fetch_427498e0ccea81f4 = function(arg0, arg1) {
         var ret = getObject(arg0).fetch(getObject(arg1));
         return addHeapObject(ret);
@@ -583,6 +598,16 @@ async function init(input) {
         var ret = getObject(arg0).fetch(getObject(arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_226d109446575877 = function() { return handleError(function () {
+        var ret = new Headers();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_append_4d85f35672cbffa7 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+        getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
+    }, arguments) };
+    imports.wbg.__wbg_set_f9448486a94c9aef = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
+        getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
+    }, arguments) };
     imports.wbg.__wbg_instanceof_Response_ea36d565358a42f7 = function(arg0) {
         var ret = getObject(arg0) instanceof Response;
         return ret;
@@ -622,26 +647,6 @@ async function init(input) {
         var ret = getObject(arg0).text();
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_getItem_f92ef607397e96b1 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
-        var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3));
-        var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len0 = WASM_VECTOR_LEN;
-        getInt32Memory0()[arg0 / 4 + 1] = len0;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr0;
-    }, arguments) };
-    imports.wbg.__wbg_setItem_279b13e5ad0b82cb = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-        getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
-    }, arguments) };
-    imports.wbg.__wbg_new_226d109446575877 = function() { return handleError(function () {
-        var ret = new Headers();
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_append_4d85f35672cbffa7 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-        getObject(arg0).append(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
-    }, arguments) };
-    imports.wbg.__wbg_set_f9448486a94c9aef = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
-        getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4));
-    }, arguments) };
     imports.wbg.__wbg_newwithstrandinit_c07f0662ece15bc6 = function() { return handleError(function (arg0, arg1, arg2) {
         var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2));
         return addHeapObject(ret);
@@ -759,7 +764,7 @@ async function init(input) {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_150(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_145(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -851,8 +856,8 @@ async function init(input) {
         var ret = wasm.memory;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper2541 = function(arg0, arg1, arg2) {
-        var ret = makeMutClosure(arg0, arg1, 796, __wbg_adapter_28);
+    imports.wbg.__wbindgen_closure_wrapper2535 = function(arg0, arg1, arg2) {
+        var ret = makeMutClosure(arg0, arg1, 793, __wbg_adapter_28);
         return addHeapObject(ret);
     };
 

package/package.json

@@ -5,7 +5,7 @@
     "Hunter Trujillo <cryptoquick@pm.me>"
   ],
   "description": "Core functionality for the BitMask wallet",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",