Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-03 12:16:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

document signing accounts in deployment guide, minor fixes

Browse source
This commit is contained in:
woodser 2023-11-10 11:29:23 -05:00
parent f6b33e877f
commit af38f82406
6 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/haveno/core/account/sign/SignedWitness.java
View file

@ -23,6 +23,7 @@ import haveno.common.app.Capability;
import haveno.common.crypto.Hash;
import haveno.common.proto.ProtoUtil;
import haveno.common.util.Utilities;
import haveno.core.trade.HavenoUtils;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import haveno.network.p2p.storage.payload.DateTolerantPayload;
@ -30,7 +31,6 @@ import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import lombok.Value;
import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.Coin;
import java.time.Clock;
import java.time.Instant;
@ -176,7 +176,7 @@ public class SignedWitness implements ProcessOncePersistableNetworkPayload, Pers
",\n signerPubKey=" + Utilities.bytesAsHexString(signerPubKey) +
",\n witnessOwnerPubKey=" + Utilities.bytesAsHexString(witnessOwnerPubKey) +
",\n date=" + Instant.ofEpochMilli(date) +
",\n tradeAmount=" + Coin.valueOf(tradeAmount).toFriendlyString() +
",\n tradeAmount=" + HavenoUtils.formatXmr(tradeAmount, true) +
",\n hash=" + Utilities.bytesAsHexString(hash) +
"\n}";
}

3
core/src/main/java/haveno/core/account/sign/SignedWitnessService.java
View file

@ -35,7 +35,6 @@ import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
@ -62,7 +61,7 @@ import java.util.stream.Collectors;
public class SignedWitnessService {
public static final long SIGNER_AGE_DAYS = 30;
private static final long SIGNER_AGE = SIGNER_AGE_DAYS * ChronoUnit.DAYS.getDuration().toMillis();
public static final BigInteger MINIMUM_TRADE_AMOUNT_FOR_SIGNING = HavenoUtils.coinToAtomicUnits(Coin.parseCoin("0.0025"));
public static final BigInteger MINIMUM_TRADE_AMOUNT_FOR_SIGNING = HavenoUtils.xmrToAtomicUnits(.1);
private final KeyRing keyRing;
private final P2PService p2PService;

2
core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java
View file

@ -844,7 +844,7 @@ public class AccountAgeWitnessService {
}
public SignState getSignState(Trade trade) {
if (trade instanceof ArbitratorTrade) return SignState.UNSIGNED; // TODO (woodser): arbitrator has two peers
if (trade instanceof ArbitratorTrade) return SignState.UNSIGNED;
return findTradePeerWitness(trade)
.map(this::getSignState)
.orElse(SignState.UNSIGNED);