Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-23 22:49:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

start trade period from unlock time instead of first confirmation

Browse source
This commit is contained in:
woodser 2025-04-08 09:16:17 -04:00 committed by GitHub
parent 34b55bc86b
commit d78709e1f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions

11
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -2167,18 +2167,19 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
if (daemonRpc == null) throw new RuntimeException("Cannot set start time for trade " + getId() + " because it has no connection to monerod");
if (getMakerDepositTx() == null || (getTakerDepositTx() == null && !hasBuyerAsTakerWithoutDeposit())) throw new RuntimeException("Cannot set start time for trade " + getId() + " because its unlocked deposit tx is null. Is client connected to a daemon?");
long maxHeight = Math.max(getMakerDepositTx().getHeight(), hasBuyerAsTakerWithoutDeposit() ? 0l : getTakerDepositTx().getHeight());
long blockTime = daemonRpc.getBlockByHeight(maxHeight).getTimestamp();
// get unlock time of last deposit tx
long unlockHeight = Math.max(getMakerDepositTx().getHeight() + XmrWalletService.NUM_BLOCKS_UNLOCK - 1, hasBuyerAsTakerWithoutDeposit() ? 0l : getTakerDepositTx().getHeight() + XmrWalletService.NUM_BLOCKS_UNLOCK - 1);
long unlockTime = daemonRpc.getBlockByHeight(unlockHeight).getTimestamp() * 1000;
// If block date is in future (Date in blocks can be off by +/- 2 hours) we use our current date.
// If block date is earlier than our trade date we use our trade date.
if (blockTime > now)
if (unlockTime > now)
startTime = now;
else
startTime = Math.max(blockTime, tradeTime);
startTime = Math.max(unlockTime, tradeTime);
log.debug("We set the start for the trade period to {}. Trade started at: {}. Block got mined at: {}",
new Date(startTime), new Date(tradeTime), new Date(blockTime));
new Date(startTime), new Date(tradeTime), new Date(unlockTime));
}
public boolean hasFailed() {