bitmask-core 0.7.0-beta.1 → 0.7.0-beta.2

package/bitmask_core.d.ts

@@ -1,6 +1,31 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
+* @returns {Promise<any>}
+*/
+export function get_network(): Promise<any>;
+/**
+* @param {string} network_str
+* @returns {Promise<any>}
+*/
+export function switch_network(network_str: string): Promise<any>;
+/**
+* @param {string} key
+* @returns {Promise<any>}
+*/
+export function get_env(key: string): Promise<any>;
+/**
+* @param {string} key
+* @param {string} value
+* @returns {Promise<any>}
+*/
+export function set_env(key: string, value: string): Promise<any>;
+/**
+* @param {number} ms
+* @returns {Promise<any>}
+*/
+export function sleep(ms: number): Promise<any>;
+/**
 * @param {string} password
 * @returns {string}
 */
@@ -181,43 +206,6 @@ export function decode_hex(string: string): Uint8Array;
 */
 export function decode_base64(string: string): Uint8Array;
 /**
-* @returns {Promise<any>}
-*/
-export function get_network(): Promise<any>;
-/**
-* @param {string} network_str
-* @returns {Promise<any>}
-*/
-export function switch_network(network_str: string): Promise<any>;
-/**
-* @param {string} key
-* @returns {Promise<any>}
-*/
-export function get_env(key: string): Promise<any>;
-/**
-* @param {string} key
-* @param {string} value
-* @returns {Promise<any>}
-*/
-export function set_env(key: string, value: string): Promise<any>;
-/**
-* @param {number} ms
-* @returns {Promise<any>}
-*/
-export function sleep(ms: number): Promise<any>;
-/**
-* @param {string} pubkey
-* @param {string} token
-* @returns {Promise<any>}
-*/
-export function new_nostr_pubkey(pubkey: string, token: string): Promise<any>;
-/**
-* @param {string} pubkey
-* @param {string} token
-* @returns {Promise<any>}
-*/
-export function update_nostr_pubkey(pubkey: string, token: string): Promise<any>;
-/**
 * @param {string} nostr_hex_sk
 * @param {any} request
 * @returns {Promise<any>}
@@ -416,6 +404,12 @@ export function create_bid(nostr_hex_sk: string, request: any): Promise<any>;
 export function create_swap(nostr_hex_sk: string, request: any): Promise<any>;
 /**
 * @param {string} nostr_hex_sk
+* @param {any} request
+* @returns {Promise<any>}
+*/
+export function direct_swap(nostr_hex_sk: string, request: any): Promise<any>;
+/**
+* @param {string} nostr_hex_sk
 * @returns {Promise<any>}
 */
 export function public_offers(nostr_hex_sk: string): Promise<any>;
@@ -454,11 +448,27 @@ export function import_media(request: any): Promise<any>;
 * @returns {Promise<any>}
 */
 export function get_media(media_id: string): Promise<any>;
+/**
+* @param {string} pubkey
+* @param {string} token
+* @returns {Promise<any>}
+*/
+export function new_nostr_pubkey(pubkey: string, token: string): Promise<any>;
+/**
+* @param {string} pubkey
+* @param {string} token
+* @returns {Promise<any>}
+*/
+export function update_nostr_pubkey(pubkey: string, token: string): Promise<any>;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
+  readonly switch_network: (a: number, b: number) => number;
+  readonly get_env: (a: number, b: number) => number;
+  readonly set_env: (a: number, b: number, c: number, d: number) => number;
+  readonly sleep: (a: number) => number;
   readonly hash_password: (a: number, b: number, c: number) => void;
   readonly new_mnemonic: (a: number, b: number) => number;
   readonly decrypt_wallet: (a: number, b: number, c: number, d: number) => number;
@@ -487,14 +497,8 @@ export interface InitOutput {
   readonly encode_base64: (a: number, b: number, c: number) => void;
   readonly decode_hex: (a: number, b: number, c: number) => void;
   readonly decode_base64: (a: number, b: number, c: number) => void;
-  readonly sync_wallets: () => number;
-  readonly switch_network: (a: number, b: number) => number;
-  readonly get_env: (a: number, b: number) => number;
-  readonly set_env: (a: number, b: number, c: number, d: number) => number;
-  readonly sleep: (a: number) => number;
   readonly get_network: () => number;
-  readonly new_nostr_pubkey: (a: number, b: number, c: number, d: number) => number;
-  readonly update_nostr_pubkey: (a: number, b: number, c: number, d: number) => number;
+  readonly sync_wallets: () => number;
   readonly issue_contract: (a: number, b: number, c: number) => number;
   readonly reissue_contract: (a: number, b: number, c: number) => number;
   readonly rgb_create_invoice: (a: number, b: number, c: number) => number;
@@ -528,6 +532,7 @@ export interface InitOutput {
   readonly create_offer: (a: number, b: number, c: number) => number;
   readonly create_bid: (a: number, b: number, c: number) => number;
   readonly create_swap: (a: number, b: number, c: number) => number;
+  readonly direct_swap: (a: number, b: number, c: number) => number;
   readonly public_offers: (a: number, b: number) => number;
   readonly my_orders: (a: number, b: number) => number;
   readonly my_offers: (a: number, b: number) => number;
@@ -536,6 +541,8 @@ export interface InitOutput {
   readonly get_media: (a: number, b: number) => number;
   readonly import_consignments: (a: number) => number;
   readonly import_media: (a: number) => number;
+  readonly new_nostr_pubkey: (a: number, b: number, c: number, d: number) => number;
+  readonly update_nostr_pubkey: (a: number, b: number, c: number, d: number) => number;
   readonly rustsecp256k1zkp_v0_8_0_default_illegal_callback_fn: (a: number, b: number) => void;
   readonly rustsecp256k1zkp_v0_8_0_default_error_callback_fn: (a: number, b: number) => void;
   readonly rustsecp256k1_v0_8_1_context_create: (a: number) => number;
@@ -549,11 +556,11 @@ export interface InitOutput {
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
-  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h648fedc044bf4e36: (a: number, b: number, c: number) => void;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6d05c64ec984f162: (a: number, b: number, c: number) => void;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_exn_store: (a: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke2_mut__h6ccf611fa5523d8e: (a: number, b: number, c: number, d: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__h3e5581f88d899d55: (a: number, b: number, c: number, d: number) => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

package/bitmask_core.js

@@ -223,7 +223,60 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_48(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h648fedc044bf4e36(arg0, arg1, addHeapObject(arg2));
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h6d05c64ec984f162(arg0, arg1, addHeapObject(arg2));
+}
+
+/**
+* @returns {Promise<any>}
+*/
+export function get_network() {
+    const ret = wasm.get_network();
+    return takeObject(ret);
+}
+
+/**
+* @param {string} network_str
+* @returns {Promise<any>}
+*/
+export function switch_network(network_str) {
+    const ptr0 = passStringToWasm0(network_str, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.switch_network(ptr0, len0);
+    return takeObject(ret);
+}
+
+/**
+* @param {string} key
+* @returns {Promise<any>}
+*/
+export function get_env(key) {
+    const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.get_env(ptr0, len0);
+    return takeObject(ret);
+}
+
+/**
+* @param {string} key
+* @param {string} value
+* @returns {Promise<any>}
+*/
+export function set_env(key, value) {
+    const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passStringToWasm0(value, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len1 = WASM_VECTOR_LEN;
+    const ret = wasm.set_env(ptr0, len0, ptr1, len1);
+    return takeObject(ret);
+}
+
+/**
+* @param {number} ms
+* @returns {Promise<any>}
+*/
+export function sleep(ms) {
+    const ret = wasm.sleep(ms);
+    return takeObject(ret);
 }
 
 /**
@@ -710,87 +763,6 @@ export function decode_base64(string) {
     }
 }
 
-/**
-* @returns {Promise<any>}
-*/
-export function get_network() {
-    const ret = wasm.get_network();
-    return takeObject(ret);
-}
-
-/**
-* @param {string} network_str
-* @returns {Promise<any>}
-*/
-export function switch_network(network_str) {
-    const ptr0 = passStringToWasm0(network_str, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.switch_network(ptr0, len0);
-    return takeObject(ret);
-}
-
-/**
-* @param {string} key
-* @returns {Promise<any>}
-*/
-export function get_env(key) {
-    const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.get_env(ptr0, len0);
-    return takeObject(ret);
-}
-
-/**
-* @param {string} key
-* @param {string} value
-* @returns {Promise<any>}
-*/
-export function set_env(key, value) {
-    const ptr0 = passStringToWasm0(key, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(value, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.set_env(ptr0, len0, ptr1, len1);
-    return takeObject(ret);
-}
-
-/**
-* @param {number} ms
-* @returns {Promise<any>}
-*/
-export function sleep(ms) {
-    const ret = wasm.sleep(ms);
-    return takeObject(ret);
-}
-
-/**
-* @param {string} pubkey
-* @param {string} token
-* @returns {Promise<any>}
-*/
-export function new_nostr_pubkey(pubkey, token) {
-    const ptr0 = passStringToWasm0(pubkey, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(token, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.new_nostr_pubkey(ptr0, len0, ptr1, len1);
-    return takeObject(ret);
-}
-
-/**
-* @param {string} pubkey
-* @param {string} token
-* @returns {Promise<any>}
-*/
-export function update_nostr_pubkey(pubkey, token) {
-    const ptr0 = passStringToWasm0(pubkey, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(token, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len1 = WASM_VECTOR_LEN;
-    const ret = wasm.update_nostr_pubkey(ptr0, len0, ptr1, len1);
-    return takeObject(ret);
-}
-
 /**
 * @param {string} nostr_hex_sk
 * @param {any} request
@@ -1216,6 +1188,18 @@ export function create_swap(nostr_hex_sk, request) {
     return takeObject(ret);
 }
 
+/**
+* @param {string} nostr_hex_sk
+* @param {any} request
+* @returns {Promise<any>}
+*/
+export function direct_swap(nostr_hex_sk, request) {
+    const ptr0 = passStringToWasm0(nostr_hex_sk, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.direct_swap(ptr0, len0, addHeapObject(request));
+    return takeObject(ret);
+}
+
 /**
 * @param {string} nostr_hex_sk
 * @returns {Promise<any>}
@@ -1300,6 +1284,34 @@ export function get_media(media_id) {
     return takeObject(ret);
 }
 
+/**
+* @param {string} pubkey
+* @param {string} token
+* @returns {Promise<any>}
+*/
+export function new_nostr_pubkey(pubkey, token) {
+    const ptr0 = passStringToWasm0(pubkey, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passStringToWasm0(token, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len1 = WASM_VECTOR_LEN;
+    const ret = wasm.new_nostr_pubkey(ptr0, len0, ptr1, len1);
+    return takeObject(ret);
+}
+
+/**
+* @param {string} pubkey
+* @param {string} token
+* @returns {Promise<any>}
+*/
+export function update_nostr_pubkey(pubkey, token) {
+    const ptr0 = passStringToWasm0(pubkey, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ptr1 = passStringToWasm0(token, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len1 = WASM_VECTOR_LEN;
+    const ret = wasm.update_nostr_pubkey(ptr0, len0, ptr1, len1);
+    return takeObject(ret);
+}
+
 let cachedUint32Memory0 = null;
 
 function getUint32Memory0() {
@@ -1327,8 +1339,8 @@ function handleError(f, args) {
         wasm.__wbindgen_exn_store(addHeapObject(e));
     }
 }
-function __wbg_adapter_272(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen__convert__closures__invoke2_mut__h6ccf611fa5523d8e(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wbg_adapter_273(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__h3e5581f88d899d55(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 async function __wbg_load(module, imports) {
@@ -1392,15 +1404,6 @@ function __wbg_get_imports() {
         const ret = getObject(arg0) === undefined;
         return ret;
     };
-    imports.wbg.__wbindgen_cb_drop = function(arg0) {
-        const obj = takeObject(arg0).original;
-        if (obj.cnt-- == 1) {
-            obj.a = 0;
-            return true;
-        }
-        const ret = false;
-        return ret;
-    };
     imports.wbg.__wbindgen_is_bigint = function(arg0) {
         const ret = typeof(getObject(arg0)) === 'bigint';
         return ret;
@@ -1417,12 +1420,6 @@ function __wbg_get_imports() {
         const ret = typeof(getObject(arg0)) === 'string';
         return ret;
     };
-    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        const ret = typeof(obj) === 'number' ? obj : undefined;
-        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
-        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
-    };
     imports.wbg.__wbindgen_is_object = function(arg0) {
         const val = getObject(arg0);
         const ret = typeof(val) === 'object' && val !== null;
@@ -1432,19 +1429,34 @@ function __wbg_get_imports() {
         const ret = getObject(arg0) in getObject(arg1);
         return ret;
     };
-    imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
-        const ret = BigInt.asUintN(64, arg0);
-        return addHeapObject(ret);
+    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'number' ? obj : undefined;
+        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
+        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
     };
     imports.wbg.__wbindgen_boolean_get = function(arg0) {
         const v = getObject(arg0);
         const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
         return ret;
     };
+    imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
+        const ret = BigInt.asUintN(64, arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_cb_drop = function(arg0) {
+        const obj = takeObject(arg0).original;
+        if (obj.cnt-- == 1) {
+            obj.a = 0;
+            return true;
+        }
+        const ret = false;
+        return ret;
+    };
     imports.wbg.__wbg_new_abda76e883ba8a5f = function() {
         const ret = new Error();
         return addHeapObject(ret);
@@ -1820,7 +1832,7 @@ function __wbg_get_imports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_272(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_273(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -1920,8 +1932,8 @@ function __wbg_get_imports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper14343 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 3376, __wbg_adapter_48);
+    imports.wbg.__wbindgen_closure_wrapper14388 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 3417, __wbg_adapter_48);
         return addHeapObject(ret);
     };
 

package/package.json

@@ -6,7 +6,7 @@
     "Francisco Calderón <francisco@diba.io>"
   ],
   "description": "Core functionality for the BitMask wallet",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.0-beta.2",
   "license": "MIT",
   "repository": {
     "type": "git",

package/rgb.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMedia = exports.importMedia = exports.getConsignment = exports.importConsignments = exports.myBids = exports.myOffers = exports.myOrders = exports.publicOffers = exports.createSwap = exports.createBid = exports.createOffer = exports.decodeInvoice = exports.verifyTransfers = exports.removeTransfer = exports.saveTransfer = exports.listTransfers = exports.watcherUtxo = exports.watcherAddress = exports.watcherUnspentUtxos = exports.watcherNextUtxo = exports.watcherNextAddress = exports.watcherDetails = exports.createWatcher = exports.listSchemas = exports.listInterfaces = exports.listContracts = exports.acceptTransfer = exports.importContract = exports.fullTransferAsset = exports.transferAsset = exports.psbtSignFile = exports.createPsbt = exports.createInvoice = exports.issueContract = void 0;
+exports.getMedia = exports.importMedia = exports.getConsignment = exports.importConsignments = exports.myBids = exports.myOffers = exports.myOrders = exports.publicOffers = exports.directSwap = exports.createSwap = exports.createBid = exports.createOffer = exports.decodeInvoice = exports.verifyTransfers = exports.removeTransfer = exports.saveTransfer = exports.listTransfers = exports.watcherUtxo = exports.watcherAddress = exports.watcherUnspentUtxos = exports.watcherNextUtxo = exports.watcherNextAddress = exports.watcherDetails = exports.createWatcher = exports.listSchemas = exports.listInterfaces = exports.listContracts = exports.acceptTransfer = exports.importContract = exports.fullTransferAsset = exports.transferAsset = exports.psbtSignFile = exports.createPsbt = exports.createInvoice = exports.issueContract = void 0;
 const BMC = __importStar(require("./bitmask_core"));
 const issueContract = (nostrHexSk, request) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.issue_contract(nostrHexSk, request)); });
 exports.issueContract = issueContract;
@@ -88,6 +88,8 @@ const createBid = (nostrHexSk, request) => __awaiter(void 0, void 0, void 0, fun
 exports.createBid = createBid;
 const createSwap = (nostrHexSk, request) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.create_swap(nostrHexSk, request)); });
 exports.createSwap = createSwap;
+const directSwap = (nostrHexSk, request) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.direct_swap(nostrHexSk, request)); });
+exports.directSwap = directSwap;
 const publicOffers = (nostrHexSk) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.public_offers(nostrHexSk)); });
 exports.publicOffers = publicOffers;
 const myOrders = (nostrHexSk) => __awaiter(void 0, void 0, void 0, function* () { return JSON.parse(yield BMC.my_orders(nostrHexSk)); });

package/rgb.ts

@@ -157,6 +157,12 @@ export const createSwap = async (
 ): Promise<RgbSwapResponse> =>
   JSON.parse(await BMC.create_swap(nostrHexSk, request));
 
+export const directSwap = async (
+  nostrHexSk: string,
+  request: RgbBidRequest
+): Promise<RgbSwapResponse> =>
+  JSON.parse(await BMC.direct_swap(nostrHexSk, request));
+
 export const publicOffers = async (
   nostrHexSk: string
 ): Promise<PublicRgbOffersResponse> =>