From 94e2c1bf665813397f851c7bf68b7b490e76bead Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 25 Sep 2017 11:16:00 -0500 Subject: [PATCH] Remove dev value for accountSalt --- .../java/io/bisq/core/payment/AccountAgeWitnessService.java | 2 +- .../tasks/maker/MakerSendPublishDepositTxRequest.java | 3 +-- .../protocol/tasks/taker/TakerSendPayDepositRequest.java | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/io/bisq/core/payment/AccountAgeWitnessService.java b/core/src/main/java/io/bisq/core/payment/AccountAgeWitnessService.java index d629de9783..3608314225 100644 --- a/core/src/main/java/io/bisq/core/payment/AccountAgeWitnessService.java +++ b/core/src/main/java/io/bisq/core/payment/AccountAgeWitnessService.java @@ -159,6 +159,6 @@ public class AccountAgeWitnessService { log.warn("witnessHash is not matching peers offersWitness. " + "witnessHash={}, offersWitness={}", Utilities.bytesAsHexString(witnessHash), Utilities.bytesAsHexString(offersWitness)); - return false; + return result; } } diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSendPublishDepositTxRequest.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSendPublishDepositTxRequest.java index b2cd970cff..0a91d4574f 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSendPublishDepositTxRequest.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/maker/MakerSendPublishDepositTxRequest.java @@ -54,8 +54,7 @@ public class MakerSendPublishDepositTxRequest extends TradeTask { addressEntryOptional.get().getPubKey()), "makerMultiSigPubKey from AddressEntry must match the one from the trade data. trade id =" + id); - // TODO dev - byte[] accountSalt = new byte[1]; + byte[] accountSalt = processModel.getPaymentAccountPayload(trade).getSalt(); PublishDepositTxRequest message = new PublishDepositTxRequest( processModel.getOfferId(), diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerSendPayDepositRequest.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerSendPayDepositRequest.java index a7d27ad5cf..fb078e15fb 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerSendPayDepositRequest.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerSendPayDepositRequest.java @@ -68,10 +68,8 @@ public class TakerSendPayDepositRequest extends TradeTask { AddressEntry takerPayoutAddressEntry = walletService.getOrCreateAddressEntry(id, AddressEntry.Context.TRADE_PAYOUT); String takerPayoutAddressString = takerPayoutAddressEntry.getAddressString(); - // TODO dev - byte[] accountSalt = new byte[1]; + byte[] accountSalt = processModel.getPaymentAccountPayload(trade).getSalt(); - PayDepositRequest message = new PayDepositRequest( processModel.getOfferId(), processModel.getMyNodeAddress(),