mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add missing Capabilities

Browse Source
This commit is contained in:
Manfred Karrer 2017-11-13 09:29:22 -05:00
parent 9278456cb6
commit 90760ffc78
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
View File

@ -143,7 +143,7 @@ public class WalletsSetup {
backupWallets(); backupWallets();
final Socks5Proxy socks5Proxy = preferences.getUseTorForBitcoinJ() ? socks5ProxyProvider.getSocks5Proxy() : null; final Socks5Proxy socks5Proxy = preferences.getUseTorForBitcoinJ() ? socks5ProxyProvider.getSocks5Proxy() : null;
log.info("Use socks5Proxy for bitcoinj: " + socks5Proxy); log.info("Socks5Proxy for bitcoinj: socks5Proxy=" + socks5Proxy);
walletConfig = new WalletConfig(params, socks5Proxy, walletDir, bisqEnvironment, btcWalletFileName, walletConfig = new WalletConfig(params, socks5Proxy, walletDir, bisqEnvironment, btcWalletFileName,
BSQ_WALLET_FILE_NAME, SPV_CHAIN_FILE_NAME) { BSQ_WALLET_FILE_NAME, SPV_CHAIN_FILE_NAME) {

3
core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityRequest.java
View File

@ -17,6 +17,7 @@
package io.bisq.core.offer.messages; package io.bisq.core.offer.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.crypto.PubKeyRing; import io.bisq.common.crypto.PubKeyRing;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -41,7 +42,7 @@ public final class OfferAvailabilityRequest extends OfferMessage implements Supp
public OfferAvailabilityRequest(String offerId, public OfferAvailabilityRequest(String offerId,
PubKeyRing pubKeyRing, PubKeyRing pubKeyRing,
long takersTradePrice) { long takersTradePrice) {
this(offerId, pubKeyRing, takersTradePrice, null, Version.getP2PMessageVersion()); this(offerId, pubKeyRing, takersTradePrice, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
} }

3
core/src/main/java/io/bisq/core/offer/messages/OfferAvailabilityResponse.java
View File

@ -18,6 +18,7 @@
package io.bisq.core.offer.messages; package io.bisq.core.offer.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.proto.ProtoUtil; import io.bisq.common.proto.ProtoUtil;
import io.bisq.core.offer.AvailabilityResult; import io.bisq.core.offer.AvailabilityResult;
@ -40,7 +41,7 @@ public final class OfferAvailabilityResponse extends OfferMessage implements Sup
private final List<Integer> supportedCapabilities; private final List<Integer> supportedCapabilities;
public OfferAvailabilityResponse(String offerId, AvailabilityResult availabilityResult) { public OfferAvailabilityResponse(String offerId, AvailabilityResult availabilityResult) {
this(offerId, availabilityResult, null, Version.getP2PMessageVersion()); this(offerId, availabilityResult, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
} }

3
network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java
View File

@ -1,5 +1,6 @@
package io.bisq.network.p2p.peers.getdata.messages; package io.bisq.network.p2p.peers.getdata.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.proto.network.NetworkEnvelope; import io.bisq.common.proto.network.NetworkEnvelope;
import io.bisq.common.proto.network.NetworkProtoResolver; import io.bisq.common.proto.network.NetworkProtoResolver;
@ -45,7 +46,7 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC
persistableNetworkPayloadSet, persistableNetworkPayloadSet,
requestNonce, requestNonce,
isGetUpdatedDataResponse, isGetUpdatedDataResponse,
null, Capabilities.getCapabilities(),
Version.getP2PMessageVersion()); Version.getP2PMessageVersion());
} }

3
network/src/main/java/io/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
View File

@ -1,6 +1,7 @@
package io.bisq.network.p2p.peers.getdata.messages; package io.bisq.network.p2p.peers.getdata.messages;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.proto.ProtoUtil; import io.bisq.common.proto.ProtoUtil;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -26,7 +27,7 @@ public final class PreliminaryGetDataRequest extends GetDataRequest implements A
public PreliminaryGetDataRequest(int nonce, public PreliminaryGetDataRequest(int nonce,
Set<byte[]> excludedKeys) { Set<byte[]> excludedKeys) {
this(nonce, excludedKeys, null, Version.getP2PMessageVersion()); this(nonce, excludedKeys, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
} }

3
network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java
View File

@ -1,5 +1,6 @@
package io.bisq.network.p2p.peers.peerexchange.messages; package io.bisq.network.p2p.peers.peerexchange.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.proto.network.NetworkEnvelope; import io.bisq.common.proto.network.NetworkEnvelope;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -28,7 +29,7 @@ public final class GetPeersRequest extends NetworkEnvelope implements PeerExchan
private final List<Integer> supportedCapabilities; private final List<Integer> supportedCapabilities;
public GetPeersRequest(NodeAddress senderNodeAddress, int nonce, HashSet<Peer> reportedPeers) { public GetPeersRequest(NodeAddress senderNodeAddress, int nonce, HashSet<Peer> reportedPeers) {
this(senderNodeAddress, nonce, reportedPeers, null, Version.getP2PMessageVersion()); this(senderNodeAddress, nonce, reportedPeers, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
} }

3
network/src/main/java/io/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java
View File

@ -1,5 +1,6 @@
package io.bisq.network.p2p.peers.peerexchange.messages; package io.bisq.network.p2p.peers.peerexchange.messages;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version; import io.bisq.common.app.Version;
import io.bisq.common.proto.network.NetworkEnvelope; import io.bisq.common.proto.network.NetworkEnvelope;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -24,7 +25,7 @@ public final class GetPeersResponse extends NetworkEnvelope implements PeerExcha
private final List<Integer> supportedCapabilities; private final List<Integer> supportedCapabilities;
public GetPeersResponse(int requestNonce, HashSet<Peer> reportedPeers) { public GetPeersResponse(int requestNonce, HashSet<Peer> reportedPeers) {
this(requestNonce, reportedPeers, null, Version.getP2PMessageVersion()); this(requestNonce, reportedPeers, Capabilities.getCapabilities(), Version.getP2PMessageVersion());
} }