switching from wasm to asm.js for numerous reasons such as load time (currently, tradeoff is that seed-and-keys-from-mnemonic takes a long time for some reason, maybe keccak... keep JS impl?), switching optimizations to speed

pull/41/head
Paul Shapiro 6 years ago
parent 59a383c7c1
commit d517038059

@ -194,14 +194,15 @@ set(
#unsure if the -I...boost..include is necessary here due to include above
"-Wall -std=c++11 \
--bind -s MODULARIZE=1 \
-Os \
-s WASM=1 \
-Oz \
-s WASM=0 \
-s ASSERTIONS=1 \
-s NO_DYNAMIC_EXECUTION=1 \
-s \"BINARYEN_METHOD='native-wasm'\" \
-s 'EXPORT_NAME=\"MyMoneroCoreCpp\"' \
-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' \
-s PRECISE_F32=1 \
"
# -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\"]' \
# -s DISABLE_EXCEPTION_CATCHING=0 \
# -s EXPORTED_FUNCTIONS='[\"_sc_reduce\", \"_sc_reduce32\", \"_sc_check\", \"_sc_add\", \"_ge_fromfe_frombytes_vartime\", \"_ge_mul8\", \"_ge_p1p1_to_p3\", \"_ge_p3_tobytes\", \"_ge_scalarmult\", \"_ge_tobytes\", \"_sc_sub\", \"_sc_mulsub\", \"_ge_scalarmult_base\", \"_sc_0\", \"_ge_double_scalarmult_base_vartime\", \"_ge_double_scalarmult_precomp_vartime\", \"_ge_frombytes_vartime\", \"_ge_dsm_precomp\"]' \
#"-s SAFE_HEAP=1 --bind -O3 -s LEGACY_GL_EMULATION=0 -s GL_UNSAFE_OPTS=0 --pre-js pre-module.js --post-js post-module.js -s GL_ASSERTIONS=1 -s INVOKE_RUN=0 -s USE_WEBGL2=1 -s FULL_ES3=1 -s USE_GLFW=3 -s OFFSCREENCANVAS_SUPPORT=1 --preload-file shaders --preload-file extern --use-preload-plugins"

@ -2,4 +2,4 @@
bin/build-emcpp.sh &&
cp build/MyMoneroCoreCpp.js cryptonote_utils/ &&
cp build/MyMoneroCoreCpp.wasm cryptonote_utils/
cp build/MyMoneroCoreCpp.js.mem cryptonote_utils/

@ -58,6 +58,7 @@ HOST_NCORES=$(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1
./b2 -q -a -j$HOST_NCORES \
toolset=clang-emscripten \
link=static \
optimization=speed \
variant=release \
stage \
--stagedir="$INSTALL_PATH" \

File diff suppressed because one or more lines are too long

@ -1 +1 @@
Subproject commit 78c656fd0a6ed96d8767e757913c75831e64b728
Subproject commit b570efb573c847878e3dc8c0d3bd1d319fc85891

@ -41,7 +41,7 @@ dummy_test_utils.OnceModuleReady(
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","amount":"10000000000","fee_amount":"2167750000","dsts":[{"addr":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","amount":"10000000000","is_subaddress":"false"},{"addr":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","amount":"112832250000","is_subaddress":"false"}],"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"}]}]}'
const ret_string = Module.create_transaction(args_str)
// console.log("create_transaction ret", ret_string)
console.log("create_transaction ret", ret_string)
console.timeEnd("create_transaction")
})
//
@ -53,103 +53,103 @@ dummy_test_utils.OnceModuleReady(
"nettype_string": "MAINNET"
}
const ret_string = Module.decode_address(JSON.stringify(args))
console.log("decode_address ret", ret_string)
console.timeEnd("decode_address")
console.log("decode_address ret", ret_string)
})
setTimeout(function() {
console.time("is_subaddress")
const args_str = '{"nettype_string":"MAINNET","address":"4L6Gcy9TAHqPVPMnqa5cPtJK25tr7maE7LrJe67vzumiCtWwjDBvYnHZr18wFexJpih71Mxsjv8b7EpQftpB9NjPaL41VrjstLM5WevLZx"}'
const ret_string = Module.is_subaddress(args_str)
console.log("is_subaddress ret", ret_string)
console.timeEnd("is_subaddress")
console.log("is_subaddress ret", ret_string)
})
setTimeout(function() {
console.time("is_integrated_address")
const args_str = '{"nettype_string":"MAINNET","address":"4L6Gcy9TAHqPVPMnqa5cPtJK25tr7maE7LrJe67vzumiCtWwjDBvYnHZr18wFexJpih71Mxsjv8b7EpQftpB9NjPaL41VrjstLM5WevLZx"}'
const ret_string = Module.is_integrated_address(args_str)
console.log("is_integrated_address ret", ret_string)
console.timeEnd("is_integrated_address")
console.log("is_integrated_address ret", ret_string)
})
//
setTimeout(function() {
console.time("new_integrated_address")
const args_str = '{"nettype_string":"MAINNET","address":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","short_pid":"b79f8efc81f58f67"}'
const ret_string = Module.new_integrated_address(args_str)
console.log("new_integrated_address ret", ret_string)
console.timeEnd("new_integrated_address")
console.log("new_integrated_address ret", ret_string)
})
setTimeout(function() {
console.time("new_fake_address_for_rct_tx")
const args_str = '{"nettype_string":"MAINNET"}'
const ret_string = Module.new_fake_address_for_rct_tx(args_str)
console.log("new_fake_address_for_rct_tx ret", ret_string)
console.timeEnd("new_fake_address_for_rct_tx")
console.log("new_fake_address_for_rct_tx ret", ret_string)
})
setTimeout(function() {
console.time("new_payment_id")
const args_str = '{}'
const ret_string = Module.new_payment_id(args_str)
console.log("new_payment_id ret", ret_string)
console.timeEnd("new_payment_id")
console.log("new_payment_id ret", ret_string)
})
//
setTimeout(function() {
console.time("newly_created_wallet")
const args_str = '{"nettype_string":"MAINNET","wordset_name":"English"}'
const ret_string = Module.newly_created_wallet(args_str)
console.log("newly_created_wallet ret", ret_string)
console.timeEnd("newly_created_wallet")
console.log("newly_created_wallet ret", ret_string)
})
setTimeout(function() {
console.time("mnemonic_from_seed")
const args_str = '{"seed_string":"9c973aa296b79bbf452781dd3d32ad7f","wordset_name":"English"}'
const ret_string = Module.mnemonic_from_seed(args_str)
console.log("mnemonic_from_seed ret", ret_string)
console.timeEnd("mnemonic_from_seed")
console.log("mnemonic_from_seed ret", ret_string)
})
setTimeout(function() {
console.time("seed_and_keys_from_mnemonic")
const args_str = '{"mnemonic_string":"foxe selfish hum nexus juven dodeg pepp ember biscuti elap jazz vibrate biscui","wordset_name":"English"}'
const ret_string = Module.seed_and_keys_from_mnemonic(args_str)
console.log("seed_and_keys_from_mnemonic ret", ret_string)
console.timeEnd("seed_and_keys_from_mnemonic")
console.log("seed_and_keys_from_mnemonic ret", ret_string)
})
setTimeout(function() {
console.time("validate_components_for_login")
const args_str = '{"address_string":"43zxvpcj5Xv9SEkNXbMCG7LPQStHMpFCQCmkmR4u5nzjWwq5Xkv5VmGgYEsHXg4ja2FGRD5wMWbBVMijDTqmmVqm93wHGkg","sec_viewKey_string":"7bea1907940afdd480eff7c4bcadb478a0fbb626df9e3ed74ae801e18f53e104","sec_spendKey_string":"4e6d43cd03812b803c6f3206689f5fcc910005fc7e91d50d79b0776dbefcd803","seed_string":"9c973aa296b79bbf452781dd3d32ad7f","nettype_string":"MAINNET"}'
const ret_string = Module.validate_components_for_login(args_str)
console.log("validate_components_for_login ret", ret_string)
console.timeEnd("validate_components_for_login")
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.log("estimate_rct_tx_size ret", ret_string)
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.log("calculate_fee ret", ret_string)
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.log("estimated_tx_network_fee ret", ret_string)
console.timeEnd("estimated_tx_network_fee")
console.log("estimated_tx_network_fee ret", ret_string)
})
//
setTimeout(function() {
console.time("generate_key_image")
const args_str = '{"sec_viewKey_string":"7bea1907940afdd480eff7c4bcadb478a0fbb626df9e3ed74ae801e18f53e104","sec_spendKey_string":"4e6d43cd03812b803c6f3206689f5fcc910005fc7e91d50d79b0776dbefcd803","pub_spendKey_string":"3eb884d3440d71326e27cc07a861b873e72abd339feb654660c36a008a0028b3","tx_pub_key":"fc7f85bf64c6e4f6aa612dbc8ddb1bb77a9283656e9c2b9e777c9519798622b2","out_index":"0"}'
const ret_string = Module.generate_key_image(args_str)
console.log("generate_key_image ret", ret_string)
console.timeEnd("generate_key_image")
console.log("generate_key_image ret", ret_string)
})
}
)

Loading…
Cancel
Save