diff --git a/ember-electron/config.development.json b/ember-electron/config.development.json index c934725e..62e663db 100644 --- a/ember-electron/config.development.json +++ b/ember-electron/config.development.json @@ -10,12 +10,12 @@ "max_json_depth": "20" }, "node": { - "version": "14", + "version": "15", "peering_port": "54000", "bootstrap_fraction_numerator": "1", "receive_minimum": "1", "logging": { - "version": "4", + "version": "5", "ledger": "false", "ledger_duplicate": "false", "vote": "false", @@ -30,6 +30,8 @@ "log_rpc": "true", "bulk_pull": "false", "work_generation_time": "true", + "upnp_details": "false", + "timing": "false", "log_to_cerr": "false", "max_size": "16777216", "rotation_size": "4194304", @@ -50,6 +52,7 @@ "online_weight_quorum": "50", "password_fanout": "1024", "io_threads": "4", + "network_threads": "4", "work_threads": "4", "enable_voting": "true", "bootstrap_connections": "4", @@ -58,7 +61,7 @@ "callback_port": "0", "callback_target": "", "lmdb_max_dbs": "128", - "generate_hash_votes_at": "0" + "block_processor_batch_max_time": "5000" }, "opencl_enable": "false", "opencl": { diff --git a/ember-electron/config.production.json b/ember-electron/config.production.json index 1926b670..a98c42f7 100644 --- a/ember-electron/config.production.json +++ b/ember-electron/config.production.json @@ -10,12 +10,12 @@ "max_json_depth": "20" }, "node": { - "version": "14", + "version": "15", "peering_port": "7075", "bootstrap_fraction_numerator": "1", "receive_minimum": "1", "logging": { - "version": "4", + "version": "5", "ledger": "false", "ledger_duplicate": "false", "vote": "false", @@ -30,6 +30,8 @@ "log_rpc": "false", "bulk_pull": "false", "work_generation_time": "true", + "upnp_details": "false", + "timing": "false", "log_to_cerr": "false", "max_size": "16777216", "rotation_size": "4194304", @@ -53,6 +55,7 @@ "online_weight_quorum": "50", "password_fanout": "1024", "io_threads": "4", + "network_threads": "4", "work_threads": "4", "enable_voting": "true", "bootstrap_connections": "4", @@ -61,7 +64,7 @@ "callback_port": "0", "callback_target": "", "lmdb_max_dbs": "128", - "generate_hash_votes_at": "1535760000" + "block_processor_batch_max_time": "5000" }, "opencl_enable": "false", "opencl": { diff --git a/ember-electron/config.test.json b/ember-electron/config.test.json index 684ee31b..20fa4c4b 100644 --- a/ember-electron/config.test.json +++ b/ember-electron/config.test.json @@ -10,12 +10,12 @@ "max_json_depth": "20" }, "node": { - "version": "14", + "version": "15", "peering_port": "54000", "bootstrap_fraction_numerator": "1", "receive_minimum": "1", "logging": { - "version": "4", + "version": "5", "ledger": "false", "ledger_duplicate": "false", "vote": "false", @@ -30,6 +30,8 @@ "log_rpc": "true", "bulk_pull": "false", "work_generation_time": "true", + "upnp_details": "false", + "timing": "false", "log_to_cerr": "false", "max_size": "16777216", "rotation_size": "4194304", @@ -44,6 +46,7 @@ "online_weight_quorum": "50", "password_fanout": "1024", "io_threads": "4", + "network_threads": "4", "work_threads": "4", "enable_voting": "true", "bootstrap_connections": "4", @@ -52,7 +55,7 @@ "callback_port": "0", "callback_target": "", "lmdb_max_dbs": "128", - "generate_hash_votes_at": "0" + "block_processor_batch_max_time": "5000" }, "opencl_enable": "false", "opencl": { diff --git a/ember-electron/daemon.js b/ember-electron/daemon.js index 19f6c597..e305e3ab 100644 --- a/ember-electron/daemon.js +++ b/ember-electron/daemon.js @@ -172,8 +172,9 @@ const startDaemon = async () => { const cpuCount = os.cpus().length; config.node.io_threads = Math.max(2, Math.ceil(cpuCount / 2)); - config.node.work_threads = Math.min(2, config.node.io_threads); - config.node.bootstrap_connections = Math.max(4, config.node.io_threads); + config.node.network_threads = config.node.io_threads; + config.node.work_threads = 2; + config.node.bootstrap_connections = Math.max(4, config.node.network_threads); config.node.bootstrap_connections_max = Math.min(64, config.node.bootstrap_connections * 4); const { version: configVersion } = config; diff --git a/ember-electron/resources-darwin/rai_node b/ember-electron/resources-darwin/rai_node index cd178b01..a847ca9c 100755 Binary files a/ember-electron/resources-darwin/rai_node and b/ember-electron/resources-darwin/rai_node differ diff --git a/ember-electron/resources-linux/rai_node b/ember-electron/resources-linux/rai_node index 6da50d98..adf1e78a 100755 Binary files a/ember-electron/resources-linux/rai_node and b/ember-electron/resources-linux/rai_node differ diff --git a/ember-electron/resources-win32/rai_node.exe b/ember-electron/resources-win32/rai_node.exe index 70cc81b2..8ae7543a 100755 Binary files a/ember-electron/resources-win32/rai_node.exe and b/ember-electron/resources-win32/rai_node.exe differ