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

Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing.

Browse source 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
This commit is contained in:
Manfred Karrer 2017-03-01 10:19:23 -05:00
parent 81fe43172c
commit f27437b008
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/io/bitsquare/trade/Contract.java
View file

@ -25,6 +25,7 @@ import io.bitsquare.p2p.NodeAddress;
import io.bitsquare.payment.PaymentAccountContractData;
import io.bitsquare.trade.offer.Offer;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Utils;
import org.bitcoinj.utils.Fiat;
import javax.annotation.concurrent.Immutable;
@ -253,8 +254,10 @@ public final class Contract implements Payload {
"\n\tsellerAddress=" + sellerNodeAddress +
"\n\toffererPayoutAddressString='" + offererPayoutAddressString + '\'' +
"\n\ttakerPayoutAddressString='" + takerPayoutAddressString + '\'' +
"\n\toffererMultiSigPubKey=" + Arrays.toString(offererMultiSigPubKey) +
"\n\ttakerMultiSigPubKey=" + Arrays.toString(takerMultiSigPubKey) +
"\n\toffererMultiSigPubKey=" + Utils.HEX.encode(offererMultiSigPubKey) +
"\n\ttakerMultiSigPubKey=" + Utils.HEX.encode(takerMultiSigPubKey) +
"\n\tBuyerMultiSigPubKey=" + Utils.HEX.encode(getBuyerMultiSigPubKey()) +
"\n\tSellerMultiSigPubKey=" + Utils.HEX.encode(getSellerMultiSigPubKey()) +
'}';
}
}

5
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java
View file

@ -177,10 +177,7 @@ public class ContractWindow extends Overlay<ContractWindow> {
viewContractButton.setDefaultButton(false);
viewContractButton.setOnAction(e -> {
TextArea textArea = new TextArea();
String contractAsJson = dispute.getContractAsJson();
contractAsJson += "\n\nBuyerMultiSigPubKeyAsHex: " + Utils.HEX.encode(dispute.getContract().getBuyerMultiSigPubKey());
contractAsJson += "\nSellerMultiSigPubKeyAsHex: " + Utils.HEX.encode(dispute.getContract().getSellerMultiSigPubKey());
textArea.setText(contractAsJson);
textArea.setText(dispute.getContractAsJson());
textArea.setPrefHeight(50);
textArea.setEditable(false);
textArea.setWrapText(true);

6
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
View file

@ -42,7 +42,6 @@ import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import javafx.stage.Window;
import org.bitcoinj.core.Utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -208,10 +207,7 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
viewContractButton.setDefaultButton(false);
viewContractButton.setOnAction(e -> {
TextArea textArea = new TextArea();
String contractAsJson = trade.getContractAsJson();
contractAsJson += "\n\nBuyerMultiSigPubKeyAsHex: " + Utils.HEX.encode(trade.getContract().getBuyerMultiSigPubKey());
contractAsJson += "\nSellerMultiSigPubKeyAsHex: " + Utils.HEX.encode(trade.getContract().getSellerMultiSigPubKey());
textArea.setText(contractAsJson);
textArea.setText(trade.getContractAsJson());
textArea.setPrefHeight(50);
textArea.setEditable(false);
textArea.setWrapText(true);