diff --git a/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/maven-metadata-local.xml b/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/maven-metadata-local.xml
index ddc85eb7..2d49ab7c 100644
--- a/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/maven-metadata-local.xml
+++ b/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/maven-metadata-local.xml
@@ -7,12 +7,12 @@
true
- 20240707083116
+ 20240731195206
jar
1.0-SNAPSHOT
- 20240707083116
+ 20240731195206
pom
diff --git a/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/reticulum-network-stack-1.0-SNAPSHOT.jar b/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/reticulum-network-stack-1.0-SNAPSHOT.jar
index a7473ddf..fd659177 100644
Binary files a/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/reticulum-network-stack-1.0-SNAPSHOT.jar and b/lib/io/reticulum/reticulum-network-stack/1.0-SNAPSHOT/reticulum-network-stack-1.0-SNAPSHOT.jar differ
diff --git a/lib/io/reticulum/reticulum-network-stack/maven-metadata-local.xml b/lib/io/reticulum/reticulum-network-stack/maven-metadata-local.xml
index 96f17d67..1c66705c 100644
--- a/lib/io/reticulum/reticulum-network-stack/maven-metadata-local.xml
+++ b/lib/io/reticulum/reticulum-network-stack/maven-metadata-local.xml
@@ -6,6 +6,6 @@
1.0-SNAPSHOT
- 20240707083116
+ 20240731195206
diff --git a/pom.xml b/pom.xml
index 86369dd0..7dd341be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,10 @@
4.5.1
jar
+
true
7dc8c6f
0.15.10
@@ -36,14 +40,15 @@
1.17.2
5.10.0
1.0.0
- 2.23.0
+ 2.22.1
1.5.0-b01
3.5.0
3.12.1
3.6.1
3.3.0
1.1.0
- 2.16.2
+
+ 3.12.1
0.16
3.3.1
3.5.2
@@ -52,13 +57,15 @@
3.25.3
1.5.3
1.17
- 1.7.36
2.0.10
5.11.8
1.2
1.9
1.18.30
- 2.14.3
+ 2.16.1
+ 2.0.12
+ 4.3.0
+ 5.9.2
src/main/java
@@ -442,6 +449,10 @@
project.local
project
file:${project.basedir}/lib
+
+ true
+ always
+
@@ -453,6 +464,26 @@
+
@@ -578,7 +609,17 @@
guava
${guava.version}
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+ org.apache.logging.log4j
+ log4j-slf4j2-impl
+ ${log4j.version}
+
org.apache.logging.log4j
log4j-core
@@ -589,24 +630,11 @@
log4j-api
${log4j.version}
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
- ${log4j.version}
-
-
-
- org.apache.logging.log4j
- log4j-jul
- ${log4j.version}
-
-
-
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
+
+ org.apache.logging.log4j
+ log4j-jul
+ ${log4j.version}
+
javax.servlet
@@ -795,97 +823,129 @@
jaxb-runtime
${jaxb-runtime.version}
+
io.reticulum
reticulum-network-stack
1.0-SNAPSHOT
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-yaml
- ${jackson.version}
-
-
- com.fasterxml.jackson.core
- jackson-databind
- ${jackson.version}
-
-
- org.projectlombok
- lombok
- ${lombok.version}
- provided
-
-
- commons-codec
- commons-codec
- 1.15
-
-
- org.apache.commons
- commons-collections4
- 4.4
-
-
- org.msgpack
- jackson-dataformat-msgpack
- 0.9.3
-
-
-
-
-
- io.netty
- netty-all
- 4.1.92.Final
-
-
- org.bouncycastle
- bcpkix-jdk15on
- ${bouncycastle.version}
-
-
- com.macasaet.fernet
- fernet-java8
- 1.4.2
-
-
-
- com.igormaznitsa
- jbbp
- 2.0.4
-
-
- com.github.seancfoley
- ipaddress
- 5.4.0
-
-
- org.msgpack
- msgpack-core
- 0.9.6
-
-
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
+
+
+ commons-codec
+ commons-codec
+ 1.16.1
+
+
+
+ org.apache.commons
+ commons-collections4
+ 4.4
+
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-yaml
+ ${jackson.version}
+
+
+ org.yaml
+ snakeyaml
+ 2.2
+
+
+ org.msgpack
+ jackson-dataformat-msgpack
+ 0.9.8
+
+
+ org.projectlombok
+ lombok
+ ${lombok.version}
+ provided
+
+
+ org.bouncycastle
+ bcpkix-jdk15on
+ 1.70
+
+
+ com.macasaet.fernet
+ fernet-java8
+ 1.5.0
+
+
+ com.igormaznitsa
+ jbbp
+ 2.0.6
+
+
+ io.netty
+ netty-all
+
+ 5.0.0.Alpha2
+
+
+ com.github.seancfoley
+ ipaddress
+ 5.4.2
+
+
+
+ org.dizitart
+ nitrite
+ ${nitrite.version}
+
+
+ org.dizitart
+ nitrite-mvstore-adapter
+ ${nitrite.version}
+
+
+ com.h2database
+ h2
+ 2.3.230
+ test
+
+
+ com.h2database
+ h2-mvstore
+ 2.3.230
+
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junit.version}
+ test
+
+
+ org.mockito
+ mockito-junit-jupiter
+ 5.10.0
+ test
+
+
diff --git a/src/main/java/org/qortal/network/RNSNetwork.java b/src/main/java/org/qortal/network/RNSNetwork.java
index d6b8b220..c2efa889 100644
--- a/src/main/java/org/qortal/network/RNSNetwork.java
+++ b/src/main/java/org/qortal/network/RNSNetwork.java
@@ -27,7 +27,6 @@ import static io.reticulum.identity.IdentityKnownDestination.recall;
import static io.reticulum.utils.IdentityUtils.concatArrays;
//import static io.reticulum.constant.ReticulumConstant.TRUNCATED_HASHLENGTH;
import static io.reticulum.constant.ReticulumConstant.CONFIG_FILE_NAME;
-import lombok.extern.slf4j.Slf4j;
import lombok.Data;
//import lombok.Setter;
//import lombok.Getter;
@@ -61,6 +60,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.codec.binary.Hex;
+// logging
+import lombok.extern.slf4j.Slf4j;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+
@Data
@Slf4j
public class RNSNetwork {
@@ -68,8 +72,8 @@ public class RNSNetwork {
Reticulum reticulum;
//private static final String APP_NAME = "qortal";
static final String APP_NAME = RNSCommon.APP_NAME;
- //static final String defaultConfigPath = new String(".reticulum"); // if empty will look in Reticulums default paths
- static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
+ static final String defaultConfigPath = new String(".reticulum"); // if empty will look in Reticulums default paths
+ //static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
//private final String defaultConfigPath = Settings.getInstance().getDefaultRNSConfigPathForReticulum();
private static Integer MAX_PEERS = 12;
//private final Integer MAX_PEERS = Settings.getInstance().getMaxReticulumPeers();
@@ -86,16 +90,23 @@ public class RNSNetwork {
//private volatile boolean isShuttingDown = false;
//private int totalThreadCount = 0;
//// TODO: settings - MaxReticulumPeers, MaxRNSNetworkThreadPoolSize (if needed)
+
+ //private static final Logger logger = LoggerFactory.getLogger(RNSNetwork.class);
// Constructor
private RNSNetwork () {
+ log.info("RNSNetwork constructor");
try {
+ //String configPath = new java.io.File(defaultConfigPath).getCanonicalPath();
+ log.info("creating config from {}", defaultConfigPath);
initConfig(defaultConfigPath);
+ //reticulum = new Reticulum(configPath);
reticulum = new Reticulum(defaultConfigPath);
- log.info("reticulum instance created: {}", reticulum.toString());
} catch (IOException e) {
log.error("unable to create Reticulum network", e);
}
+ log.info("reticulum instance created");
+ log.info("reticulum instance created: {}", reticulum);
// Settings.getInstance().getMaxRNSNetworkThreadPoolSize(), // statically set to 5 below
//ExecutorService RNSNetworkExecutor = new ThreadPoolExecutor(1,
diff --git a/src/main/java/org/qortal/network/RNSPeer.java b/src/main/java/org/qortal/network/RNSPeer.java
index 17139855..618cf865 100644
--- a/src/main/java/org/qortal/network/RNSPeer.java
+++ b/src/main/java/org/qortal/network/RNSPeer.java
@@ -236,6 +236,7 @@ public class RNSPeer {
Packet pingPacket = new Packet(link, data);
PacketReceipt packetReceipt = pingPacket.send();
// Note: don't setTimeout, we want it to timeout with FAIL if not deliverable
+ //packetReceipt.setTimeout(5000L);
packetReceipt.setTimeoutCallback(this::packetTimedOut);
packetReceipt.setDeliveryCallback(this::packetDelivered);
} else {