renamed some tests; (partial) uncommented fee est fns

monero_utils/MyMoneroCoreBridge.js

@@ -55,9 +55,9 @@ function api_safe_wordset_name(wordset_name)
 //
 class MyMoneroCoreBridge
 {
-	constructor(Module)
+	constructor(this_Module)
 	{
-		this.Module = Module;
+		this.Module = this_Module;
 	}
 	//
 	//
@@ -453,7 +453,7 @@ module.exports = function(options)
 		const ENVIRONMENT_IS_WORKER = typeof importScripts==="function";
 		const ENVIRONMENT_IS_NODE = typeof process==="object" && process.browser !== true && typeof require==="function" && ENVIRONMENT_IS_WORKER == false; // we want this to be true for Electron but not for a WebView
 		const ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
-		var _Module_template =
+		var Module_template =
 		{
 			locateFile: function(filename, scriptDirectory)
 			{
@@ -491,9 +491,9 @@ module.exports = function(options)
 		// 	const filepath = path.normalize(path.join(__dirname, "MyMoneroCoreCpp.wasm"));
 		// 	const wasmBinary = fs.readFileSync(filepath)
 		// 	console.log("wasmBinary", wasmBinary)
-		// 	_Module_template["wasmBinary"] = wasmBinary
+		// 	Module_template["wasmBinary"] = wasmBinary
 		// }
-		require("./MyMoneroCoreCpp")(_Module_template).ready.then(function(thisModule) 
+		require("./MyMoneroCoreCpp")(Module_template).ready.then(function(thisModule) 
 		{
 			const instance = new MyMoneroCoreBridge(thisModule);
 			resolve(instance);

monero_utils/monero_utils.js

@@ -58,6 +58,7 @@ const moneroUtils_promise = new Promise(function(resolve, reject)
 				return retVal;
 			}
 		}
+		local_fns.Module = coreBridge_instance.Module;
 		resolve(local_fns);
 	}
 	if (wants_electronRemote) {

src/index.cpp

@@ -53,10 +53,9 @@ EMSCRIPTEN_BINDINGS(my_module)
     emscripten::function("seed_and_keys_from_mnemonic", &serial_bridge::seed_and_keys_from_mnemonic);
     emscripten::function("validate_components_for_login", &serial_bridge::validate_components_for_login);
     //
-    // keeping these in JS for now -- much more practical; don't have to async wait for the module to load
-    // emscripten::function("estimate_rct_tx_size", &serial_bridge::estimate_rct_tx_size);
-    // emscripten::function("calculate_fee", &serial_bridge::calculate_fee);
-    // emscripten::function("estimated_tx_network_fee", &serial_bridge::estimated_tx_network_fee);
+    emscripten::function("estimate_rct_tx_size", &serial_bridge::estimate_rct_tx_size);
+    emscripten::function("calculate_fee", &serial_bridge::calculate_fee);
+    emscripten::function("estimated_tx_network_fee", &serial_bridge::estimated_tx_network_fee);
     //
     emscripten::function("generate_key_image", &serial_bridge::generate_key_image);
 }

tests/MyMoneroCoreCpp.node.js

@@ -31,13 +31,13 @@
 console.time("Load module")
 async function tests()
 {
-
 	const monero_utils = await require("../monero_utils/monero_utils")
-		//
 	const Module = monero_utils.Module;
 
 	console.timeEnd("Load module")
-		//
+
+	console.log("Module", Module)
+	//
 	setTimeout(function() {
 		console.time("create_transaction")
 		const args_str = '{"nettype_string":"MAINNET","from_address_string":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","sec_viewKey_string":"7bea1907940afdd480eff7c4bcadb478a0fbb626df9e3ed74ae801e18f53e104","sec_spendKey_string":"4e6d43cd03812b803c6f3206689f5fcc910005fc7e91d50d79b0776dbefcd803","to_address_string":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","payment_id_string":"b79f8efc81f58f67","unlock_time":"0","sending_amount":"10000000000","change_amount":"112832250000","fee_amount":"2167750000","outputs":[{"amount":"125000000000","public_key":"596fa47b6b3905269503435099a05e3ede54564026c93cbe5285e2df074c7118","rct":"920ee8d99299f304d17fdb104720d1f62be0b03383c7bb466ff39c6a264d80d616ce1eccd6c4de1cc0fba87e463f2e0c373146c475e8a1517f36e7a37351d50034688cc8cb528c14188cae45d89b313d444e583c9d68a32cb80938a5e2aa200b","global_index":"6451664","index":"0","tx_pub_key":"0a86e588dc67ca11993737e003a9e60c57174a663a47495e3b1d764f486fc88f"}],"mix_outs":[{"amount":"0","outputs":[{"global_index":"5260585","public_key":"da77082624fce921891c4fb80a1e7076a6714ca8c9fc547311737926a0b85a46","rct":"bb227b27e36b7f3e695dffb641c29bb60bfd991accdb5ef4b580c9acd48c16b6"},{"global_index":"1929918","public_key":"8c983e7053d7a1dc9de8ac00468bcf11836a787d712dc0c02bd54a3ee00a55e8","rct":"8dec45867644d1a76aafe4487292d7cf401302e6bbbb99a61c2f3b6cef4f4f34"},{"global_index":"3921094","public_key":"0133219bd5e247eef51003921ec792784c41fc34289c703e9326d46f78d9b10a","rct":"75082f4ce31904acba4af37699c28d8d4f0f74fdf63b1e4a8069ebed50df3220"},{"global_index":"6627106","public_key":"daef1663dd1084bd7fe585c3d493480ee1c4cefb93254eac5855afdf38f662b1","rct":"1d96763c5bc3300090c286705b7d544f02c185d9be8c32baac6bbfb8e0d0d283"},{"global_index":"3308654","public_key":"ae135f58762b1133667002538f8c353a1869db815aa686e2544b5243c2d2212f","rct":"15046b93bb181189f2917eed38173202fbbb9cdbfcf3d1bc3e432df999ae1b1c"},{"global_index":"1972531","public_key":"39e44fa88d684d71762c40eb64ac80ddc694b74a99ac445667bf433536c09c8f","rct":"66a42d0e8123768b392ad4a230759258d9156fab1aea00a19b041832326aca0a"},{"global_index":"3274424","public_key":"a89b91648645ba6f32e214ba5720f5387376e5a144e698d5d5d1ebac971de349","rct":"815a6b1da6fc6a3bd791c4342782381cf948ee822ac9da7149f1b3717e0266d2"}]}]}'
@@ -130,27 +130,27 @@ async function tests()
 		console.log("validate_components_for_login ret", ret_string)
 	})
 	//
-	// setTimeout(function() {
-	// 	console.time("estimate_rct_tx_size")
-	// 	const args_str = '{"n_inputs":"2","mixin":"6","n_outputs":"2","extra_size":"0","bulletproof":"false"}'
-	// 	const ret_string = Module.estimate_rct_tx_size(args_str)
-	// 	console.timeEnd("estimate_rct_tx_size")
-	// 	console.log("estimate_rct_tx_size ret", ret_string)
-	// })
-	// setTimeout(function() {
-	// 	console.time("calculate_fee")
-	// 	const args_str = '{"fee_per_kb":"9000000","num_bytes":"13762","fee_multiplier":"4"}'
-	// 	const ret_string = Module.calculate_fee(args_str)
-	// 	console.timeEnd("calculate_fee")
-	// 	console.log("calculate_fee ret", ret_string)
-	// })
-	// setTimeout(function() {
-	// 	console.time("estimated_tx_network_fee")
-	// 	const args_str = '{"fee_per_kb":"9000000","priority":"2"}'
-	// 	const ret_string = Module.estimated_tx_network_fee(args_str)
-	// 	console.timeEnd("estimated_tx_network_fee")
-	// 	console.log("estimated_tx_network_fee ret", ret_string)
-	// })
+	setTimeout(function() {
+		console.time("estimate_rct_tx_size")
+		const args_str = '{"n_inputs":"2","mixin":"6","n_outputs":"2","extra_size":"0","bulletproof":"false"}'
+		const ret_string = Module.estimate_rct_tx_size(args_str)
+		console.timeEnd("estimate_rct_tx_size")
+		console.log("estimate_rct_tx_size ret", ret_string)
+	})
+	setTimeout(function() {
+		console.time("calculate_fee")
+		const args_str = '{"fee_per_kb":"9000000","num_bytes":"13762","fee_multiplier":"4"}'
+		const ret_string = Module.calculate_fee(args_str)
+		console.timeEnd("calculate_fee")
+		console.log("calculate_fee ret", ret_string)
+	})
+	setTimeout(function() {
+		console.time("estimated_tx_network_fee")
+		const args_str = '{"fee_per_kb":"9000000","priority":"2"}'
+		const ret_string = Module.estimated_tx_network_fee(args_str)
+		console.timeEnd("estimated_tx_network_fee")
+		console.log("estimated_tx_network_fee ret", ret_string)
+	})
 	//
 	setTimeout(function() {
 		console.time("generate_key_image")