mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactorings, add verifyFee tasks (WIP)

Browse source
This commit is contained in:
Manfred Karrer 2017-03-25 11:05:26 -05:00
parent 0c08986ccc
commit 1bfead7a77
17 changed files with 87 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/main/java/io/bisq/core/trade/protocol/BuyerAsOffererProtocol.java
View file

@ -28,7 +28,7 @@ import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.message.trade.DepositTxPublishedMessage;
import io.bisq.protobuffer.message.trade.PayDepositRequest;
import io.bisq.protobuffer.message.trade.PayoutTxFinalizedMessage;
import io.bisq.protobuffer.message.trade.PayoutTxPublishedMessage;
import io.bisq.protobuffer.message.trade.TradeMessage;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import lombok.extern.slf4j.Slf4j;
@ -93,8 +93,8 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
NodeAddress peerNodeAddress = mailboxMessage.getSenderNodeAddress();
if (message instanceof DepositTxPublishedMessage)
handle((DepositTxPublishedMessage) message, peerNodeAddress);
else if (message instanceof PayoutTxFinalizedMessage)
handle((PayoutTxFinalizedMessage) message, peerNodeAddress);
else if (message instanceof PayoutTxPublishedMessage)
handle((PayoutTxPublishedMessage) message, peerNodeAddress);
else
log.error("We received an unhandled MailboxMessage" + message.toString());
}
@ -118,6 +118,7 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
taskRunner.addTasks(
ProcessPayDepositRequest.class,
VerifyArbitrationSelection.class,
VerifyTakerFeePayment.class,
VerifyTakerAccount.class,
LoadTakeOfferFeeTx.class,
CreateAndSignContract.class,
@ -143,6 +144,8 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
() -> handleTaskRunnerSuccess("handle DepositTxPublishedMessage"),
this::handleTaskRunnerFault);
taskRunner.addTasks(ProcessDepositTxPublishedMessage.class,
VerifyTakerFeePayment.class,
VerifyTakerAccount.class,
PublishTradeStatistics.class);
taskRunner.run();
}
@ -172,7 +175,8 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
handleTaskRunnerFault(errorMessage);
});
taskRunner.addTasks(
VerifyTakeOfferFeePayment.class,
VerifyTakerFeePayment.class,
VerifyTakerAccount.class,
BuyerAsOffererSignPayoutTx.class,
SendFiatTransferStartedMessage.class,
SetupListenerForPayoutTx.class
@ -190,7 +194,7 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
// Incoming message handling
///////////////////////////////////////////////////////////////////////////////////////////
private void handle(PayoutTxFinalizedMessage tradeMessage, NodeAddress peerNodeAddress) {
private void handle(PayoutTxPublishedMessage tradeMessage, NodeAddress peerNodeAddress) {
log.debug("handle RequestFinalizePayoutTxMessage called");
processModel.setTradeMessage(tradeMessage);
processModel.setTempTradingPeerNodeAddress(peerNodeAddress);
@ -203,7 +207,7 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
this::handleTaskRunnerFault);
taskRunner.addTasks(
BuyerProcessPayoutTxFinalizedMessage.class,
BuyerProcessPayoutTxPublishedMessage.class,
BuyerAsOffererMightBroadcastPayoutTx.class
);
taskRunner.run();
@ -218,8 +222,8 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
protected void doHandleDecryptedMessage(TradeMessage tradeMessage, NodeAddress peerNodeAddress) {
if (tradeMessage instanceof DepositTxPublishedMessage) {
handle((DepositTxPublishedMessage) tradeMessage, peerNodeAddress);
} else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
handle((PayoutTxFinalizedMessage) tradeMessage, peerNodeAddress);
} else if (tradeMessage instanceof PayoutTxPublishedMessage) {
handle((PayoutTxPublishedMessage) tradeMessage, peerNodeAddress);
} else //noinspection StatementWithEmptyBody
if (tradeMessage instanceof PayDepositRequest) {
// do nothing as we get called the handleTakeOfferRequest method from outside

18
core/src/main/java/io/bisq/core/trade/protocol/BuyerAsTakerProtocol.java
View file

@ -74,10 +74,12 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
@Override
public void doApplyMailboxMessage(Message message, Trade trade) {
this.trade = trade;
if (message instanceof FinalizePayoutTxRequest)
handle((FinalizePayoutTxRequest) message, ((MailboxMessage) message).getSenderNodeAddress());
else
final NodeAddress senderNodeAddress = ((MailboxMessage) message).getSenderNodeAddress();
if (message instanceof PublishDepositTxRequest)
handle((PublishDepositTxRequest) message, senderNodeAddress);
else if (message instanceof FinalizePayoutTxRequest) {
handle((FinalizePayoutTxRequest) message, senderNodeAddress);
} else
log.error("We received an unhandled MailboxMessage" + message.toString());
}
@ -119,9 +121,10 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
this::handleTaskRunnerFault);
taskRunner.addTasks(
ProcessPublishDepositTxRequest.class,
VerifyOffererAccount.class,
VerifyMakerAccount.class,
VerifyMakerFeePayment.class,
VerifyAndSignContract.class,
SignAndPublishDepositTxAsBuyer.class,
BuyerAsTakerSignAndPublishDepositTx.class,
SendDepositTxPublishedMessage.class,
PublishTradeStatistics.class
);
@ -153,7 +156,8 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
handleTaskRunnerFault(errorMessage);
});
taskRunner.addTasks(
VerifyOfferFeePayment.class,
VerifyMakerAccount.class,
VerifyMakerFeePayment.class,
SendFiatTransferStartedMessage.class
);
taskRunner.run();

22
core/src/main/java/io/bisq/core/trade/protocol/SellerAsOffererProtocol.java
View file

@ -76,13 +76,13 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
this.trade = trade;
NodeAddress peerNodeAddress = ((MailboxMessage) message).getSenderNodeAddress();
if (message instanceof PayoutTxFinalizedMessage) {
handle((PayoutTxFinalizedMessage) message, peerNodeAddress);
if (message instanceof PayoutTxPublishedMessage) {
handle((PayoutTxPublishedMessage) message, peerNodeAddress);
} else {
if (message instanceof FiatTransferStartedMessage)
handle((FiatTransferStartedMessage) message, peerNodeAddress);
else if (message instanceof DepositTxPublishedMessage)
if (message instanceof DepositTxPublishedMessage)
handle((DepositTxPublishedMessage) message, peerNodeAddress);
else if (message instanceof FiatTransferStartedMessage)
handle((FiatTransferStartedMessage) message, peerNodeAddress);
else
log.error("We received an unhandled MailboxMessage" + message.toString());
}
@ -108,9 +108,10 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
ProcessPayDepositRequest.class,
VerifyArbitrationSelection.class,
VerifyTakerAccount.class,
VerifyTakerFeePayment.class,
LoadTakeOfferFeeTx.class,
CreateAndSignContract.class,
OffererCreatesAndSignsDepositTxAsSeller.class, //TODO: locktime
OffererAsSelleCreatesAndSignsDepositTx.class,
SetupDepositBalanceListener.class,
SendPublishDepositTxRequest.class
);
@ -180,7 +181,8 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
});
taskRunner.addTasks(
VerifyTakeOfferFeePayment.class,
VerifyTakerAccount.class,
VerifyTakerFeePayment.class,
SignPayoutTx.class, //TODO: locktime
SellerAsOffererSendFinalizePayoutTxRequest.class //TODO: locktime
);
@ -192,7 +194,7 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
}
}
private void handle(PayoutTxFinalizedMessage tradeMessage, NodeAddress sender) {
private void handle(PayoutTxPublishedMessage tradeMessage, NodeAddress sender) {
processModel.setTradeMessage(tradeMessage);
processModel.setTempTradingPeerNodeAddress(sender);
@ -220,8 +222,8 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
handle((DepositTxPublishedMessage) tradeMessage, sender);
} else if (tradeMessage instanceof FiatTransferStartedMessage) {
handle((FiatTransferStartedMessage) tradeMessage, sender);
} else if (tradeMessage instanceof PayoutTxFinalizedMessage) {
handle((PayoutTxFinalizedMessage) tradeMessage, sender);
} else if (tradeMessage instanceof PayoutTxPublishedMessage) {
handle((PayoutTxPublishedMessage) tradeMessage, sender);
} else {
log.error("Incoming tradeMessage not supported. " + tradeMessage);
}

14
core/src/main/java/io/bisq/core/trade/protocol/SellerAsTakerProtocol.java
View file

@ -97,6 +97,8 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
this::handleTaskRunnerFault);
taskRunner.addTasks(
VerifyMakerAccount.class,
VerifyMakerFeePayment.class,
SelectArbitrator.class,
LoadCreateOfferFeeTx.class,
CreateTakeOfferFeeTx.class,
@ -125,7 +127,8 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
taskRunner.addTasks(
ProcessPublishDepositTxRequest.class,
VerifyOffererAccount.class,
VerifyMakerAccount.class,
VerifyMakerFeePayment.class,
VerifyAndSignContract.class,
SignAndPublishDepositTxAsSeller.class,
SendDepositTxPublishedMessage.class,
@ -147,7 +150,9 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
() -> handleTaskRunnerSuccess("FiatTransferStartedMessage"),
this::handleTaskRunnerFault);
taskRunner.addTasks(ProcessFiatTransferStartedMessage.class);
taskRunner.addTasks(ProcessFiatTransferStartedMessage.class,
VerifyMakerAccount.class,
VerifyMakerFeePayment.class);
taskRunner.run();
}
@ -178,10 +183,11 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
});
taskRunner.addTasks(
VerifyOfferFeePayment.class,
VerifyMakerAccount.class,
VerifyMakerFeePayment.class,
SellerAsTakerSignAndFinalizePayoutTx.class,
SellerAsTakerBroadcastPayoutTx.class,
SellerSendPayoutTxFinalizedMessage.class
SellerAsTakerSendPayoutTxPublishedMessage.class
);
taskRunner.run();
} else {

8
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxFinalizedMessage.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
View file

@ -22,7 +22,7 @@ import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import io.bisq.core.util.Validator;
import io.bisq.protobuffer.message.trade.PayoutTxFinalizedMessage;
import io.bisq.protobuffer.message.trade.PayoutTxPublishedMessage;
import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.Transaction;
@ -30,9 +30,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class BuyerProcessPayoutTxFinalizedMessage extends TradeTask {
public class BuyerProcessPayoutTxPublishedMessage extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public BuyerProcessPayoutTxFinalizedMessage(TaskRunner taskHandler, Trade trade) {
public BuyerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}
@ -41,7 +41,7 @@ public class BuyerProcessPayoutTxFinalizedMessage extends TradeTask {
try {
runInterceptHook();
log.debug("current trade state " + trade.getState());
PayoutTxFinalizedMessage message = (PayoutTxFinalizedMessage) processModel.getTradeMessage();
PayoutTxPublishedMessage message = (PayoutTxPublishedMessage) processModel.getTradeMessage();
Validator.checkTradeId(processModel.getId(), message);
checkNotNull(message);
checkArgument(message.payoutTx != null);

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/buyer/SendPayoutTxFinalizedMessage.java
View file

@ -20,7 +20,7 @@ package io.bisq.core.trade.protocol.tasks.buyer;
import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import io.bisq.protobuffer.message.trade.PayoutTxFinalizedMessage;
import io.bisq.protobuffer.message.trade.PayoutTxPublishedMessage;
import lombok.extern.slf4j.Slf4j;
import java.util.UUID;
@ -40,7 +40,7 @@ public class SendPayoutTxFinalizedMessage extends TradeTask {
runInterceptHook();
if (trade.getPayoutTx() != null) {
final String id = processModel.getId();
final PayoutTxFinalizedMessage message = new PayoutTxFinalizedMessage(
final PayoutTxPublishedMessage message = new PayoutTxPublishedMessage(
id,
trade.getPayoutTx().bitcoinSerialize(),
processModel.getMyNodeAddress(),

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/offerer/VerifyTakeOfferFeePayment.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/offerer/VerifyTakerFeePayment.java
View file

@ -23,10 +23,10 @@ import io.bisq.core.trade.protocol.tasks.TradeTask;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class VerifyTakeOfferFeePayment extends TradeTask {
public class VerifyTakerFeePayment extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public VerifyTakeOfferFeePayment(TaskRunner taskHandler, Trade trade) {
public VerifyTakerFeePayment(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/OffererAsSelleCreatesAndSignsDepositTx.java
View file

@ -36,9 +36,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class OffererCreatesAndSignsDepositTxAsSeller extends TradeTask {
public class OffererAsSelleCreatesAndSignsDepositTx extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public OffererCreatesAndSignsDepositTxAsSeller(TaskRunner taskHandler, Trade trade) {
public OffererAsSelleCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/ProcessPayoutTxFinalizedMessage.java
View file

@ -22,7 +22,7 @@ import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import io.bisq.core.util.Validator;
import io.bisq.protobuffer.message.trade.PayoutTxFinalizedMessage;
import io.bisq.protobuffer.message.trade.PayoutTxPublishedMessage;
import lombok.extern.slf4j.Slf4j;
import org.bitcoinj.core.Transaction;
@ -41,7 +41,7 @@ public class ProcessPayoutTxFinalizedMessage extends TradeTask {
try {
runInterceptHook();
log.debug("current trade state " + trade.getState());
PayoutTxFinalizedMessage message = (PayoutTxFinalizedMessage) processModel.getTradeMessage();
PayoutTxPublishedMessage message = (PayoutTxPublishedMessage) processModel.getTradeMessage();
Validator.checkTradeId(processModel.getId(), message);
checkNotNull(message);
checkArgument(message.payoutTx != null);

10
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerSendPayoutTxFinalizedMessage.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/seller/SellerAsTakerSendPayoutTxPublishedMessage.java
View file

@ -21,16 +21,16 @@ import io.bisq.common.taskrunner.TaskRunner;
import io.bisq.core.trade.Trade;
import io.bisq.core.trade.protocol.tasks.TradeTask;
import io.bisq.network.p2p.SendMailboxMessageListener;
import io.bisq.protobuffer.message.trade.PayoutTxFinalizedMessage;
import io.bisq.protobuffer.message.trade.PayoutTxPublishedMessage;
import lombok.extern.slf4j.Slf4j;
import java.util.UUID;
@Slf4j
// TODO remove
public class SellerSendPayoutTxFinalizedMessage extends TradeTask {
public class SellerAsTakerSendPayoutTxPublishedMessage extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public SellerSendPayoutTxFinalizedMessage(TaskRunner taskHandler, Trade trade) {
public SellerAsTakerSendPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}
@ -40,7 +40,7 @@ public class SellerSendPayoutTxFinalizedMessage extends TradeTask {
runInterceptHook();
if (trade.getPayoutTx() != null) {
final String id = processModel.getId();
final PayoutTxFinalizedMessage message = new PayoutTxFinalizedMessage(
final PayoutTxPublishedMessage message = new PayoutTxPublishedMessage(
id,
trade.getPayoutTx().bitcoinSerialize(),
processModel.getMyNodeAddress(),
@ -66,7 +66,7 @@ public class SellerSendPayoutTxFinalizedMessage extends TradeTask {
@Override
public void onFault(String errorMessage) {
appendToErrorMessage("PayoutTxFinalizedMessage sending failed. errorMessage=" + errorMessage);
appendToErrorMessage("Sending message failed: message=" + message + "\nerrorMessage=" + errorMessage);
failed(errorMessage);
}
}

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/SignAndPublishDepositTxAsBuyer.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/BuyerAsTakerSignAndPublishDepositTx.java
View file

@ -38,9 +38,9 @@ import java.util.Optional;
import static com.google.common.base.Preconditions.checkArgument;
@Slf4j
public class SignAndPublishDepositTxAsBuyer extends TradeTask {
public class BuyerAsTakerSignAndPublishDepositTx extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public SignAndPublishDepositTxAsBuyer(TaskRunner taskHandler, Trade trade) {
public BuyerAsTakerSignAndPublishDepositTx(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/VerifyOffererAccount.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/VerifyMakerAccount.java
View file

@ -23,10 +23,10 @@ import io.bisq.core.trade.protocol.tasks.TradeTask;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class VerifyOffererAccount extends TradeTask {
public class VerifyMakerAccount extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public VerifyOffererAccount(TaskRunner taskHandler, Trade trade) {
public VerifyMakerAccount(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}

4
core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/VerifyOfferFeePayment.java → core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/VerifyMakerFeePayment.java
View file

@ -23,9 +23,9 @@ import io.bisq.core.trade.protocol.tasks.TradeTask;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class VerifyOfferFeePayment extends TradeTask {
public class VerifyMakerFeePayment extends TradeTask {
@SuppressWarnings({"WeakerAccess", "unused"})
public VerifyOfferFeePayment(TaskRunner taskHandler, Trade trade) {
public VerifyMakerFeePayment(TaskRunner taskHandler, Trade trade) {
super(taskHandler, trade);
}

12
gui/src/main/java/io/bisq/gui/main/debug/DebugView.java
View file

@ -97,7 +97,7 @@ public class DebugView extends InitializableView {
ProcessDepositTxPublishedMessage.class,
VerifyTakeOfferFeePayment.class,
VerifyTakerFeePayment.class,
SendFiatTransferStartedMessage.class,
ProcessFinalizePayoutTxRequest.class,
@ -116,14 +116,14 @@ public class DebugView extends InitializableView {
SendPayDepositRequest.class,
ProcessPublishDepositTxRequest.class,
VerifyOffererAccount.class,
VerifyMakerAccount.class,
VerifyAndSignContract.class,
SignAndPublishDepositTxAsSeller.class,
SendDepositTxPublishedMessage.class,
ProcessFiatTransferStartedMessage.class,
VerifyOfferFeePayment.class,
VerifyMakerFeePayment.class,
SignPayoutTx.class,
SellerAsOffererSendFinalizePayoutTxRequest.class,
@ -142,12 +142,12 @@ public class DebugView extends InitializableView {
SendPayDepositRequest.class,
ProcessPublishDepositTxRequest.class,
VerifyOffererAccount.class,
VerifyMakerAccount.class,
VerifyAndSignContract.class,
SignAndPublishDepositTxAsSeller.class,
SendDepositTxPublishedMessage.class,
VerifyOfferFeePayment.class,
VerifyMakerFeePayment.class,
SignPayoutTx.class,
SendFiatTransferStartedMessage.class,
@ -172,7 +172,7 @@ public class DebugView extends InitializableView {
ProcessFiatTransferStartedMessage.class,
VerifyTakeOfferFeePayment.class,
VerifyTakerFeePayment.class,
SignPayoutTx.class,
SellerAsOffererSendFinalizePayoutTxRequest.class,

14
protobuffer/src/main/java/io/bisq/protobuffer/ProtoBufferUtilities.java
View file

@ -172,8 +172,8 @@ public class ProtoBufferUtilities {
case FIAT_TRANSFER_STARTED_MESSAGE:
result = getFiatTransferStartedMessage(envelope.getFiatTransferStartedMessage());
break;
case PAYOUT_TX_FINALIZED_MESSAGE:
result = getPayoutTxFinalizedMessage(envelope.getPayoutTxFinalizedMessage());
case PAYOUT_TX_PUBLISHED_MESSAGE:
result = getPayoutTxPublishedMessage(envelope.getPayoutTxPublishedMessage());
break;
case PRIVATE_NOTIFICATION_MESSAGE:
result = getPrivateNotificationMessage(envelope.getPrivateNotificationMessage());
@ -200,11 +200,11 @@ public class ProtoBufferUtilities {
return new PrivateNotificationPayload(privateNotification.getMessage());
}
private static Message getPayoutTxFinalizedMessage(PB.PayoutTxFinalizedMessage payoutTxFinalizedMessage) {
return new PayoutTxFinalizedMessage(payoutTxFinalizedMessage.getTradeId(),
payoutTxFinalizedMessage.getPayoutTx().toByteArray(),
getNodeAddress(payoutTxFinalizedMessage.getSenderNodeAddress()),
payoutTxFinalizedMessage.getUid());
private static Message getPayoutTxPublishedMessage(PB.PayoutTxPublishedMessage payoutTxPublishedMessage) {
return new PayoutTxPublishedMessage(payoutTxPublishedMessage.getTradeId(),
payoutTxPublishedMessage.getPayoutTx().toByteArray(),
getNodeAddress(payoutTxPublishedMessage.getSenderNodeAddress()),
payoutTxPublishedMessage.getUid());
}
private static Message getFiatTransferStartedMessage(PB.FiatTransferStartedMessage fiatTransferStartedMessage) {

8
protobuffer/src/main/java/io/bisq/protobuffer/message/trade/PayoutTxFinalizedMessage.java → protobuffer/src/main/java/io/bisq/protobuffer/message/trade/PayoutTxPublishedMessage.java
View file

@ -29,7 +29,7 @@ import javax.annotation.concurrent.Immutable;
@EqualsAndHashCode(callSuper = true)
@Immutable
public final class PayoutTxFinalizedMessage extends TradeMessage implements MailboxMessage {
public final class PayoutTxPublishedMessage extends TradeMessage implements MailboxMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
private static final long serialVersionUID = Version.P2P_NETWORK_VERSION;
@ -37,7 +37,7 @@ public final class PayoutTxFinalizedMessage extends TradeMessage implements Mail
private final NodeAddress senderNodeAddress;
private final String uid;
public PayoutTxFinalizedMessage(String tradeId, byte[] payoutTx, NodeAddress senderNodeAddress, String uid) {
public PayoutTxPublishedMessage(String tradeId, byte[] payoutTx, NodeAddress senderNodeAddress, String uid) {
super(tradeId);
this.payoutTx = payoutTx;
this.senderNodeAddress = senderNodeAddress;
@ -57,7 +57,7 @@ public final class PayoutTxFinalizedMessage extends TradeMessage implements Mail
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPayoutTxFinalizedMessage(baseEnvelope.getPayoutTxFinalizedMessageBuilder()
return baseEnvelope.setPayoutTxPublishedMessage(baseEnvelope.getPayoutTxPublishedMessageBuilder()
.setUid(uid)
.setMessageVersion(getMessageVersion())
.setTradeId(tradeId)
@ -68,7 +68,7 @@ public final class PayoutTxFinalizedMessage extends TradeMessage implements Mail
// payoutTx not printed for privacy reasons
@Override
public String toString() {
return "PayoutTxFinalizedMessage{" +
return "PayoutTxPublishedMessage{" +
"payoutTx not printed for privacy reasons..." +
", senderNodeAddress=" + senderNodeAddress +
", uid='" + uid + '\'' +

4
protobuffer/src/main/proto/pb.proto
View file

@ -36,7 +36,7 @@ message Envelope {
PayDepositRequest pay_deposit_request = 26;
PublishDepositTxRequest publish_deposit_tx_request = 27;
FiatTransferStartedMessage fiat_transfer_started_message = 28;
PayoutTxFinalizedMessage payout_tx_finalized_message = 29;
PayoutTxPublishedMessage payout_tx_published_message = 29;
PrivateNotificationMessage private_notification_message = 30;
}
}
@ -519,7 +519,7 @@ message RawTransactionInput {
int64 value = 3;
}
message PayoutTxFinalizedMessage {
message PayoutTxPublishedMessage {
string uid = 1;
int32 message_version = 2;
string trade_id = 3;