From 0b93641129ca9d16655aadd6a74402f2e090c43f Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 16 Mar 2016 12:39:41 +0100 Subject: [PATCH] Display onion address of offerer and trading peer in details windows --- .../gui/main/overlays/windows/OfferDetailsWindow.java | 3 ++- .../gui/main/overlays/windows/TradeDetailsWindow.java | 6 ++++++ .../java/io/bitsquare/p2p/seed/SeedNodesRepository.java | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java index 52a2129e71..f8989e1165 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java @@ -199,7 +199,7 @@ public class OfferDetailsWindow extends Overlay { } } - rows = 4; + rows = 5; String paymentMethodCountryCode = offer.getCountryCode(); if (paymentMethodCountryCode != null) rows++; @@ -208,6 +208,7 @@ public class OfferDetailsWindow extends Overlay { addTitledGroupBg(gridPane, ++rowIndex, rows, "Details", Layout.GROUP_DISTANCE); addLabelTextField(gridPane, rowIndex, "Offer ID:", offer.getId(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addLabelTextField(gridPane, ++rowIndex, "Offerers onion address:", offer.getOffererNodeAddress().getFullAddress()); addLabelTextField(gridPane, ++rowIndex, "Creation date:", formatter.formatDateTime(offer.getDate())); addLabelTextField(gridPane, ++rowIndex, "Security deposit:", formatter.formatCoinWithCode(FeePolicy.getSecurityDeposit())); diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java index 5555c86340..3ff8d856f9 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java @@ -150,6 +150,8 @@ public class TradeDetailsWindow extends Overlay { rows++; if (trade.errorMessageProperty().get() != null) rows += 2; + if (trade.getTradingPeerNodeAddress() != null) + rows++; addTitledGroupBg(gridPane, ++rowIndex, rows, "Details", Layout.GROUP_DISTANCE); addLabelTextField(gridPane, rowIndex, "Trade ID:", trade.getId(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); @@ -157,6 +159,10 @@ public class TradeDetailsWindow extends Overlay { addLabelTextField(gridPane, ++rowIndex, "Security deposit:", formatter.formatCoinWithCode(FeePolicy.getSecurityDeposit())); addLabelTextField(gridPane, ++rowIndex, "Selected arbitrator:", trade.getArbitratorNodeAddress().getFullAddress()); + if (trade.getTradingPeerNodeAddress() != null) + addLabelTextField(gridPane, ++rowIndex, "Trading peers onion address:", trade.getTradingPeerNodeAddress().getFullAddress()); + + if (contract != null) { if (buyerPaymentAccountContractData != null) { TextField tf = addLabelTextField(gridPane, ++rowIndex, "Buyer payment details:", BSResources.get(buyerPaymentAccountContractData.getPaymentDetails())).second; diff --git a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java index 0048f001c1..cca2d68a68 100644 --- a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java +++ b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java @@ -32,15 +32,15 @@ public class SeedNodesRepository { new NodeAddress("izs5oz7i5ta7c2ir.onion:8000"),*/ // v0.3.5 - /* new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"), + new NodeAddress("hulvbm5xjn7b7ku4.onion:8000"), new NodeAddress("3efgjjbdvhbvck3x.onion:8000"), - new NodeAddress("3unfcshgwipxhxfm.onion:8000"),*/ + new NodeAddress("3unfcshgwipxhxfm.onion:8000"), // v0.3.6 - new NodeAddress("ybmi4iaesugslxrw.onion:8000"), + /* new NodeAddress("ybmi4iaesugslxrw.onion:8000"), new NodeAddress("ufwnvo775jfnjeux.onion:8000"), - new NodeAddress("b66vnevaljo6xt5a.onion:8000"), + new NodeAddress("b66vnevaljo6xt5a.onion:8000"),*/ // testnet new NodeAddress("znmy44wcstn2rkva.onion:8001"),