put back threads to 4; update ton4j

neodix42 · Dec 11, 2024 · f25665c · f25665c
1 parent 6bf5efd
commit f25665c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,27 +33,27 @@
         <jetty.version>11.0.14</jetty.version>
         <jprocesses.version>1.6.5</jprocesses.version>
         <richtextfx.version>0.10.7</richtextfx.version>
-        <ton4j.version>0.7.0</ton4j.version>
+        <ton4j.version>0.8.2</ton4j.version>
         <objectdb.version>2.8.6</objectdb.version>
         <javax.persistence.version>2.1.0</javax.persistence.version>
         <jta.version>1.1</jta.version>
         <log4j.version>2.17.1</log4j.version>
 
         <linux.amd64.ton.binaries.uri>
-            https://github.com/neodix42/ton-actions/releases/latest/download/ton-native-linux-x86-64-${ton_branch}.zip
+            https://github.com/neodix42/ton-actions/releases/latest/download/ton-linux-x86-64-${ton_branch}.zip
         </linux.amd64.ton.binaries.uri>
         <mac.amd64.ton.binaries.uri>
-            https://github.com/neodix42/ton-actions/releases/latest/download/ton-native-mac-x86-64-${ton_branch}.zip
+            https://github.com/neodix42/ton-actions/releases/latest/download/ton-mac-x86-64-${ton_branch}.zip
         </mac.amd64.ton.binaries.uri>
         <win.amd64.ton.binaries.uri>
-            https://github.com/neodix42/ton-actions/releases/latest/download/ton-native-win-x86-64-${ton_branch}.zip
+            https://github.com/neodix42/ton-actions/releases/latest/download/ton-win-x86-64-${ton_branch}.zip
         </win.amd64.ton.binaries.uri>
 
         <linux.arm64.ton.binaries.uri>
-            https://github.com/neodix42/ton-actions/releases/latest/download/ton-native-linux-arm64-${ton_branch}.zip
+            https://github.com/neodix42/ton-actions/releases/latest/download/ton-linux-arm64-${ton_branch}.zip
         </linux.arm64.ton.binaries.uri>
         <mac.arm64.ton.binaries.uri>
-            https://github.com/neodix42/ton-actions/releases/latest/download/ton-native-mac-arm64-${ton_branch}.zip
+            https://github.com/neodix42/ton-actions/releases/latest/download/ton-mac-arm64-${ton_branch}.zip
         </mac.arm64.ton.binaries.uri>
     </properties>
 

diff --git a/src/main/java/org/ton/actions/MyLocalTon.java b/src/main/java/org/ton/actions/MyLocalTon.java
@@ -1096,7 +1096,7 @@ private void showInGuiOnlyUniqueTxs(ResultLastBlock lastBlock, ResultListBlockTr
 
             concurrentTxsHashMap.put(uniqueKey, lastBlock.getCreatedAt());
 
-            log.debug("showInGuiOnlyUniquShow {}", uniqueKey);
+//            log.debug("showInGuiOnlyUniquShow {}", uniqueKey);
 
             populateTxRowWithData(lastBlock.getShortBlockSeqno(), tx, txDetails, txRow, txE);
 
@@ -1228,13 +1228,18 @@ private void showButtonWithMessage(javafx.scene.Node txRow, TxEntity txEntity) {
             msg = msg.substring(4);
 
             if (StringUtils.isAlphanumericSpace(msg) || StringUtils.isAsciiPrintable(msg)) {
-                txRow.lookup("#txMsgBtn").setVisible(true);
-                txRow.lookup("#txMsgBtn").setUserData(msg);
-
-                txRow.lookup("#txMsgBtn").setOnMouseClicked(mouseEvent -> {
-                    log.info("in msg btn clicked on block {}, {}", ((Label) txRow.lookup("#block")).getText(), txRow.lookup("#txMsgBtn").getUserData());
-                    mainController.showMessage(String.valueOf(txRow.lookup("#txMsgBtn").getUserData()));
-                });
+                javafx.scene.Node txMsgBtn = (javafx.scene.Node) txRow.lookup("#txMsgBtn");
+                if (nonNull(txMsgBtn)) {
+                    txMsgBtn.setVisible(true);
+                    txMsgBtn.setUserData(msg);
+
+                    txMsgBtn.setOnMouseClicked(mouseEvent -> {
+                        log.info("in msg btn clicked on block {}, {}", ((Label) txRow.lookup("#block")).getText(), txRow.lookup("#txMsgBtn").getUserData());
+                        mainController.showMessage(String.valueOf(txRow.lookup("#txMsgBtn").getUserData()));
+                    });
+                } else {
+                    log.error("cannot get txMsgBtn");
+                }
             }
         }
     }

diff --git a/src/main/java/org/ton/executors/dhtserver/DhtServer.java b/src/main/java/org/ton/executors/dhtserver/DhtServer.java
@@ -34,7 +34,7 @@ public void startDhtServer(Node node, String globalConfigFile) {
 
         Pair<Process, Future<String>> dhtServer = new DhtServerExecutor().execute(node,
                 "-v", MyLocalTonUtils.getTonLogLevel(node.getTonLogLevel()),
-                "-t", "1",
+                "-t", "4",
                 "-C", globalConfigFile,
                 "-l", node.getDhtServerDir() + MyLocalTonUtils.toUtcNoSpace(System.currentTimeMillis()),
                 "-D", node.getDhtServerDir(),
@@ -60,7 +60,7 @@ public List<String> initDhtServer(Node node) throws Exception {
             log.info("Initializing DHT server on node {}", node.getNodeName()); // creating key in dht-server/keyring/hex and config.json
             Pair<Process, Future<String>> dhtServerInit = new DhtServerExecutor().execute(node,
                     "--verbosity", MyLocalTonUtils.getTonLogLevel(node.getTonLogLevel()),
-                    "--threads", "1",
+                    "--threads", "4",
                     "--global-config", EXAMPLE_GLOBAL_CONFIG,
                     "--logname", node.getDhtServerDir() + MyLocalTonUtils.toUtcNoSpace(System.currentTimeMillis()),
                     "--db", node.getDhtServerDir(),

diff --git a/src/main/java/org/ton/executors/validatorengine/ValidatorEngine.java b/src/main/java/org/ton/executors/validatorengine/ValidatorEngine.java
@@ -41,7 +41,7 @@ public Process startValidator(Node node, String myGlobalConfig) {
 
         Pair<Process, Future<String>> validator = new ValidatorEngineExecutor().execute(node,
                 "--verbosity", MyLocalTonUtils.getTonLogLevel(node.getTonLogLevel()),
-                "--threads", "1",
+                "--threads", "4",
                 "--global-config", myGlobalConfig,
                 "--db", node.getTonDbDir(),
                 "--logname", node.getTonLogDir() + MyLocalTonUtils.toUtcNoSpace(System.currentTimeMillis()),
@@ -65,7 +65,7 @@ public Pair<Process, Future<String>> startValidatorWithoutParams(Node node, Stri
 
         Pair<Process, Future<String>> validator = new ValidatorEngineExecutor().execute(node,
                 "--verbosity", MyLocalTonUtils.getTonLogLevel(node.getTonLogLevel()),
-                "--threads", "1",
+                "--threads", "4",
                 "--global-config", myGlobalConfig,
                 "--db", node.getTonDbDir(),
                 "--logname", node.getTonLogDir() + MyLocalTonUtils.toUtcNoSpace(System.currentTimeMillis()),