Merge pull request #4 from zeroleak/whirlpool-client-0.23.30-early4

upgrade to whirlpool-client 0.23.30-early4 + extlibj 0.0.19-dsk3
This commit is contained in:
craigraw 2021-08-31 10:43:29 +02:00 committed by GitHub
commit 71b5778226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions

View file

@ -1,30 +1,24 @@
package com.sparrowwallet.drongo.wallet; package com.sparrowwallet.drongo.wallet;
public class UtxoMixData extends Persistable { public class UtxoMixData extends Persistable {
private final String poolId;
private final int mixesDone; private final int mixesDone;
private final Long forwarding; private final Long expired;
public UtxoMixData(String poolId, int mixesDone, Long forwarding) { public UtxoMixData(int mixesDone, Long expired) {
this.poolId = poolId;
this.mixesDone = mixesDone; this.mixesDone = mixesDone;
this.forwarding = forwarding; this.expired = expired;
}
public String getPoolId() {
return poolId;
} }
public int getMixesDone() { public int getMixesDone() {
return mixesDone; return mixesDone;
} }
public Long getForwarding() { public Long getExpired() {
return forwarding; return expired;
} }
@Override @Override
public String toString() { public String toString() {
return "{poolId:" + poolId + ", mixesDone:" + mixesDone + ", forwarding:" + forwarding + "}"; return "{mixesDone:" + mixesDone + ", expired: " + expired + "}";
} }
} }

View file

@ -231,7 +231,11 @@ public class Wallet extends Persistable {
} }
public UtxoMixData getUtxoMixData(BlockTransactionHashIndex utxo) { public UtxoMixData getUtxoMixData(BlockTransactionHashIndex utxo) {
return utxoMixes.get(Sha256Hash.of(utxo.toString().getBytes(StandardCharsets.UTF_8))); return getUtxoMixData(Sha256Hash.of(utxo.toString().getBytes(StandardCharsets.UTF_8)));
}
public UtxoMixData getUtxoMixData(Sha256Hash utxoKey) {
return utxoMixes.get(utxoKey);
} }
public Map<Sha256Hash, UtxoMixData> getUtxoMixes() { public Map<Sha256Hash, UtxoMixData> getUtxoMixes() {