haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

make updated multisig hex nullable in dispute closed message

Browse source
This commit is contained in:
woodser 2025-06-05 19:39:17 -04:00 committed by woodser
parent 8ee1bb372b
commit c239f9aac0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/haveno/core/support/dispute/messages/DisputeClosedMessage.java
View file

@ -35,6 +35,7 @@ import static com.google.common.base.Preconditions.checkArgument;
public final class DisputeClosedMessage extends DisputeMessage { public final class DisputeClosedMessage extends DisputeMessage {
private final DisputeResult disputeResult; private final DisputeResult disputeResult;
private final NodeAddress senderNodeAddress; private final NodeAddress senderNodeAddress;
@Nullable
private final String updatedMultisigHex; private final String updatedMultisigHex;
@Nullable @Nullable
private final String unsignedPayoutTxHex; private final String unsignedPayoutTxHex;
@ -44,7 +45,7 @@ public final class DisputeClosedMessage extends DisputeMessage {
NodeAddress senderNodeAddress, NodeAddress senderNodeAddress,
String uid, String uid,
SupportType supportType, SupportType supportType,
String updatedMultisigHex, @Nullable String updatedMultisigHex,
@Nullable String unsignedPayoutTxHex, @Nullable String unsignedPayoutTxHex,
boolean deferPublishPayout) { boolean deferPublishPayout) {
this(disputeResult, this(disputeResult,
@ -85,9 +86,9 @@ public final class DisputeClosedMessage extends DisputeMessage {
.setSenderNodeAddress(senderNodeAddress.toProtoMessage()) .setSenderNodeAddress(senderNodeAddress.toProtoMessage())
.setUid(uid) .setUid(uid)
.setType(SupportType.toProtoMessage(supportType)) .setType(SupportType.toProtoMessage(supportType))
.setUpdatedMultisigHex(updatedMultisigHex)
.setDeferPublishPayout(deferPublishPayout); .setDeferPublishPayout(deferPublishPayout);
Optional.ofNullable(unsignedPayoutTxHex).ifPresent(e -> builder.setUnsignedPayoutTxHex(unsignedPayoutTxHex)); Optional.ofNullable(unsignedPayoutTxHex).ifPresent(e -> builder.setUnsignedPayoutTxHex(unsignedPayoutTxHex));
Optional.ofNullable(updatedMultisigHex).ifPresent(e -> builder.setUpdatedMultisigHex(updatedMultisigHex));
return getNetworkEnvelopeBuilder().setDisputeClosedMessage(builder).build(); return getNetworkEnvelopeBuilder().setDisputeClosedMessage(builder).build();
} }
@ -98,7 +99,7 @@ public final class DisputeClosedMessage extends DisputeMessage {
proto.getUid(), proto.getUid(),
messageVersion, messageVersion,
SupportType.fromProto(proto.getType()), SupportType.fromProto(proto.getType()),
proto.getUpdatedMultisigHex(), ProtoUtil.stringOrNullFromProto(proto.getUpdatedMultisigHex()),
ProtoUtil.stringOrNullFromProto(proto.getUnsignedPayoutTxHex()), ProtoUtil.stringOrNullFromProto(proto.getUnsignedPayoutTxHex()),
proto.getDeferPublishPayout()); proto.getDeferPublishPayout());
} }