diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java index 2cdff5c54a343a154b84d52d1d653573653bde1c..c69cbf56ca7457c18682e01b9ccf91264480f151 100644 --- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java +++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/NetworkPeers.java @@ -43,6 +43,8 @@ public class NetworkPeers implements Serializable { public static class Peer extends NetworkPeering implements Serializable { public Long firstDown; public Long lastTry; + public Long lastContact; + public String hash; @JsonGetter("first_down") public Long getFirstDown() { @@ -64,6 +66,26 @@ public class NetworkPeers implements Serializable { this.lastTry = lastTry; } + @JsonGetter("lastContact") + public Long getLastContact() { + return lastContact; + } + + @JsonSetter("lastContact") + public void setLastContact(Long lastContact) { + this.lastContact = lastContact; + } + + @JsonIgnore + public String getHash() { + return hash; + } + + @JsonIgnore + public void setHash(String hash { + this.hash = hash; + } + @Override @JsonIgnore public String getRaw() { diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java b/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java index 9aeb8a1f27f25398af90853ed3df3501f9e83e62..869ba7ba141dab92beb9d7722313a69ef3cb39be 100644 --- a/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java +++ b/duniter4j-core-shared/src/main/java/org/duniter/core/util/merkle/MerkleTree.java @@ -84,6 +84,7 @@ public class MerkleTree { } + private void feed(String str) { if(StringUtils.isNotBlank(str) && regexp.test(str)){ // Push leaf without hashing it since it is already a hash