nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check peer date while initializing trade instead of deposits confirmed

Browse Source
This commit is contained in:
woodser 2023-01-15 18:15:52 -05:00
parent a49611a234
commit 7f26119515
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
View File

@ -526,17 +526,15 @@ public class AccountAgeWitnessService {
public boolean verifyAccountAgeWitness(Trade trade,
PaymentAccountPayload peersPaymentAccountPayload,
Date peersCurrentDate,
PubKeyRing peersPubKeyRing,
byte[] nonce,
byte[] signature,
ErrorMessageHandler errorMessageHandler) {
log.info("Verifying account age witness for {} {}, payment account payload hash={}, peers current date={}, nonce={}, signature={}",
log.info("Verifying account age witness for {} {}, payment account payload hash={}, nonce={}, signature={}",
trade.getClass().getSimpleName(),
trade.getId(),
Utilities.bytesAsHexString(peersPaymentAccountPayload.getHash()),
peersCurrentDate,
Utilities.bytesAsHexString(nonce),
Utilities.bytesAsHexString(signature));
@ -558,10 +556,6 @@ public class AccountAgeWitnessService {
if (!isDateAfterReleaseDate(peersWitness.getDate(), RELEASE, errorMessageHandler))
return false;
// Check if peer current date is in tolerance range
if (!verifyPeersCurrentDate(peersCurrentDate, errorMessageHandler))
return false;
final byte[] peersAccountInputDataWithSalt = Utilities.concatenateByteArrays(
peersPaymentAccountPayload.getAgeWitnessInputData(), peersPaymentAccountPayload.getSalt());
byte[] hash = Hash.getSha256Ripemd160hash(Utilities.concatenateByteArrays(peersAccountInputDataWithSalt,
@ -573,8 +567,7 @@ public class AccountAgeWitnessService {
return false;
// Check if the peers trade limit is not less than the trade amount
if (!verifyPeersTradeLimit(trade.getOffer(), trade.getAmount(), peersWitness, peersCurrentDate,
errorMessageHandler)) {
if (!verifyPeersTradeLimit(trade.getOffer(), trade.getAmount(), peersWitness, new Date(), errorMessageHandler)) {
log.error("verifyPeersTradeLimit failed: peersPaymentAccountPayload {}", peersPaymentAccountPayload);
return false;
}
@ -619,13 +612,12 @@ public class AccountAgeWitnessService {
return result;
}
private boolean verifyPeersCurrentDate(Date peersCurrentDate, ErrorMessageHandler errorMessageHandler) {
public boolean verifyPeersCurrentDate(Date peersCurrentDate) {
boolean result = Math.abs(peersCurrentDate.getTime() - new Date().getTime()) <= TimeUnit.DAYS.toMillis(1);
if (!result) {
String msg = "Peers current date is further than 1 day off to our current date. " +
"PeersCurrentDate=" + peersCurrentDate + "; myCurrentDate=" + new Date();
log.warn(msg);
errorMessageHandler.handleErrorMessage(msg);
throw new RuntimeException(msg);
}
return result;
}

5
core/src/main/java/bisq/core/trade/protocol/tasks/ProcessInitTradeRequest.java
View File

@ -38,6 +38,8 @@ import static bisq.core.util.Validator.nonEmptyStringOf;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
@Slf4j
public class ProcessInitTradeRequest extends TradeTask {
@SuppressWarnings({"unused"})
@ -128,6 +130,9 @@ public class ProcessInitTradeRequest extends TradeTask {
multisigParticipant.setAccountAgeWitnessSignature(request.getAccountAgeWitnessSignatureOfOfferId());
multisigParticipant.setCurrentDate(request.getCurrentDate());
// check peer's current date
processModel.getAccountAgeWitnessService().verifyPeersCurrentDate(new Date(multisigParticipant.getCurrentDate()));
// check trade amount
checkArgument(request.getTradeAmount() > 0);
trade.setAmount(Coin.valueOf(request.getTradeAmount()));

4
core/src/main/java/bisq/core/trade/protocol/tasks/VerifyPeersAccountAgeWitness.java
View File

@ -74,12 +74,8 @@ public class VerifyPeersAccountAgeWitness extends TradeTask {
byte[] nonce = checkNotNull(tradingPeer.getAccountAgeWitnessNonce());
byte[] signature = checkNotNull(tradingPeer.getAccountAgeWitnessSignature());
AtomicReference<String> errorMsg = new AtomicReference<>();
long currentDateAsLong = tradingPeer.getCurrentDate();
// In case the peer has an older version we get 0, so we use our time instead
Date peersCurrentDate = currentDateAsLong > 0 ? new Date(currentDateAsLong) : new Date();
boolean isValid = accountAgeWitnessService.verifyAccountAgeWitness(trade,
peersPaymentAccountPayload,
peersCurrentDate,
peersPubKeyRing,
nonce,
signature,