Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-16 02:10:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename all packages and other names from bisq to haveno

Browse source
This commit is contained in:
woodser 2023-03-06 19:14:00 -05:00
parent ab0b9e3b77
commit 1a1fb130c0
1775 changed files with 14575 additions and 16767 deletions
Download patch file Download diff file Expand all files Collapse all files

2
p2p/src/main/java/bisq/network/DnsLookupException.java → p2p/src/main/java/haveno/network/DnsLookupException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
package haveno.network;
public class DnsLookupException extends Exception {
public DnsLookupException(String message) {

4
p2p/src/main/java/bisq/network/DnsLookupTor.java → p2p/src/main/java/haveno/network/DnsLookupTor.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
package haveno.network;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
@ -62,7 +62,7 @@ public class DnsLookupTor {
public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLookupException {
try {
// note: This is creating a new connection to our proxy, without any authentication.
// This works fine when connecting to bisq's internal Tor proxy, but
// This works fine when connecting to haveno's internal Tor proxy, but
// would fail if user has configured an external proxy that requires auth.
// It would be much better to use the already connected proxy socket, but when I
// tried that I get weird errors and the lookup fails.

6
p2p/src/main/java/bisq/network/Socks5DnsDiscovery.java → p2p/src/main/java/haveno/network/Socks5DnsDiscovery.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
import bisq.common.util.Utilities;
package haveno.network;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.DnsDiscovery;
@ -28,7 +26,7 @@ import org.bitcoinj.utils.ContextPropagatingThreadFactory;
import org.bitcoinj.utils.DaemonThreadFactory;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.util.Utilities;
import java.net.InetSocketAddress;
import java.util.ArrayList;

2
p2p/src/main/java/bisq/network/Socks5MultiDiscovery.java → p2p/src/main/java/haveno/network/Socks5MultiDiscovery.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
package haveno.network;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;

15
p2p/src/main/java/bisq/network/Socks5ProxyProvider.java → p2p/src/main/java/haveno/network/Socks5ProxyProvider.java
View file

@ -15,14 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
package haveno.network;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import bisq.network.p2p.network.NetworkNode;
import bisq.common.config.Config;
import haveno.common.config.Config;
import haveno.network.p2p.network.NetworkNode;
import com.google.inject.Inject;
import javax.inject.Named;
@ -37,7 +34,7 @@ import javax.annotation.Nullable;
/**
* Provides Socks5Proxies for the bitcoin network and http requests
* <p/>
* By default there is only used the bisq internal Tor proxy, which is used for the P2P network, Btc network
* By default there is only used the haveno internal Tor proxy, which is used for the P2P network, Btc network
* (if Tor for btc is enabled) and http requests (if Tor for http requests is enabled).
* If the user provides a socks5ProxyHttpAddress it will be used for http requests.
* If the user provides a socks5ProxyBtcAddress, this will be used for the btc network.
@ -91,8 +88,8 @@ public class Socks5ProxyProvider {
return socks5ProxyInternalFactory.getSocksProxy();
}
public void setSocks5ProxyInternal(@Nullable NetworkNode bisqSocks5ProxyFactory) {
this.socks5ProxyInternalFactory = bisqSocks5ProxyFactory;
public void setSocks5ProxyInternal(@Nullable NetworkNode havenoSocks5ProxyFactory) {
this.socks5ProxyInternalFactory = havenoSocks5ProxyFactory;
}
@Nullable

2
p2p/src/main/java/bisq/network/Socks5SeedOnionDiscovery.java → p2p/src/main/java/haveno/network/Socks5SeedOnionDiscovery.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network;
package haveno.network;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;

5
p2p/src/main/java/bisq/network/crypto/DecryptedDataTuple.java → p2p/src/main/java/haveno/network/crypto/DecryptedDataTuple.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.crypto;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.crypto;
import haveno.common.proto.network.NetworkEnvelope;
import java.security.PublicKey;
import lombok.EqualsAndHashCode;

29
p2p/src/main/java/bisq/network/crypto/EncryptionService.java → p2p/src/main/java/haveno/network/crypto/EncryptionService.java
View file

@ -15,23 +15,22 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.crypto;
package haveno.network.crypto;
import bisq.network.p2p.DecryptedMessageWithPubKey;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Encryption;
import bisq.common.crypto.Hash;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.crypto.SealedAndSigned;
import bisq.common.crypto.Sig;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import static haveno.common.crypto.Encryption.decryptSecretKey;
import com.google.protobuf.InvalidProtocolBufferException;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Encryption;
import haveno.common.crypto.Hash;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.crypto.SealedAndSigned;
import haveno.common.crypto.Sig;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.DecryptedMessageWithPubKey;
import javax.inject.Inject;
import javax.crypto.SecretKey;
@ -42,8 +41,6 @@ import java.security.PublicKey;
import lombok.extern.slf4j.Slf4j;
import static bisq.common.crypto.Encryption.decryptSecretKey;
@Slf4j
public class EncryptionService {
private final KeyRing keyRing;

7
p2p/src/main/java/bisq/network/crypto/EncryptionServiceModule.java → p2p/src/main/java/haveno/network/crypto/EncryptionServiceModule.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.crypto;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
package haveno.network.crypto;
import com.google.inject.Singleton;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
public class EncryptionServiceModule extends AppModule {

2
p2p/src/main/java/bisq/network/http/FakeDnsResolver.java → p2p/src/main/java/haveno/network/http/FakeDnsResolver.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
import org.apache.http.conn.DnsResolver;

2
p2p/src/main/java/bisq/network/http/HttpClient.java → p2p/src/main/java/haveno/network/http/HttpClient.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
import java.io.IOException;

13
p2p/src/main/java/bisq/network/http/HttpClientImpl.java → p2p/src/main/java/haveno/network/http/HttpClientImpl.java
View file

@ -15,12 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
import bisq.network.Socks5ProxyProvider;
import bisq.common.app.Version;
import bisq.common.util.Utilities;
package haveno.network.http;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
@ -38,7 +33,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContexts;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.app.Version;
import haveno.common.util.Utilities;
import haveno.network.Socks5ProxyProvider;
import javax.inject.Inject;
import java.net.HttpURLConnection;
@ -158,7 +155,7 @@ public class HttpClientImpl implements HttpClient {
connection.setRequestMethod(httpMethod.name());
connection.setConnectTimeout((int) TimeUnit.SECONDS.toMillis(120));
connection.setReadTimeout((int) TimeUnit.SECONDS.toMillis(120));
connection.setRequestProperty("User-Agent", "bisq/" + Version.VERSION);
connection.setRequestProperty("User-Agent", "haveno/" + Version.VERSION);
if (headerKey != null && headerValue != null) {
connection.setRequestProperty(headerKey, headerValue);
}

2
p2p/src/main/java/bisq/network/http/HttpException.java → p2p/src/main/java/haveno/network/http/HttpException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
import lombok.Getter;

2
p2p/src/main/java/bisq/network/http/HttpMethod.java → p2p/src/main/java/haveno/network/http/HttpMethod.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
public enum HttpMethod {
GET,

2
p2p/src/main/java/bisq/network/http/SocksConnectionSocketFactory.java → p2p/src/main/java/haveno/network/http/SocksConnectionSocketFactory.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
import org.apache.http.HttpHost;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;

2
p2p/src/main/java/bisq/network/http/SocksSSLConnectionSocketFactory.java → p2p/src/main/java/haveno/network/http/SocksSSLConnectionSocketFactory.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.http;
package haveno.network.http;
import org.apache.http.HttpHost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;

16
p2p/src/main/java/bisq/network/p2p/AckMessage.java → p2p/src/main/java/haveno/network/p2p/AckMessage.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.p2p.mailbox.MailboxMessage;
import bisq.network.p2p.storage.payload.ExpirablePayload;
import bisq.common.app.Version;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.persistable.PersistablePayload;
package haveno.network.p2p;
import haveno.common.app.Version;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.mailbox.MailboxMessage;
import haveno.network.p2p.storage.payload.ExpirablePayload;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

2
p2p/src/main/java/bisq/network/p2p/AckMessageSourceType.java → p2p/src/main/java/haveno/network/p2p/AckMessageSourceType.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public enum AckMessageSourceType {
UNDEFINED,

2
p2p/src/main/java/bisq/network/p2p/AnonymousMessage.java → p2p/src/main/java/haveno/network/p2p/AnonymousMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface AnonymousMessage {
}

2
p2p/src/main/java/bisq/network/p2p/BootstrapListener.java → p2p/src/main/java/haveno/network/p2p/BootstrapListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public abstract class BootstrapListener implements P2PServiceListener {

20
p2p/src/main/java/bisq/network/p2p/BundleOfEnvelopes.java → p2p/src/main/java/haveno/network/p2p/BundleOfEnvelopes.java
View file

@ -15,18 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.p2p.storage.messages.BroadcastMessage;
import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
import bisq.common.app.Capabilities;
import bisq.common.app.Capability;
import bisq.common.app.Version;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p;
import haveno.common.app.Capabilities;
import haveno.common.app.Capability;
import haveno.common.app.Version;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

7
p2p/src/main/java/bisq/network/p2p/CloseConnectionMessage.java → p2p/src/main/java/haveno/network/p2p/CloseConnectionMessage.java
View file

@ -15,11 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import lombok.EqualsAndHashCode;
import lombok.Value;

2
p2p/src/main/java/bisq/network/p2p/DecryptedDirectMessageListener.java → p2p/src/main/java/haveno/network/p2p/DecryptedDirectMessageListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface DecryptedDirectMessageListener {

14
p2p/src/main/java/bisq/network/p2p/DecryptedMessageWithPubKey.java → p2p/src/main/java/haveno/network/p2p/DecryptedMessageWithPubKey.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.common.crypto.Sig;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistablePayload;
package haveno.network.p2p;
import com.google.protobuf.ByteString;
import haveno.common.crypto.Sig;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistablePayload;
import java.security.PublicKey;
import lombok.Value;

2
p2p/src/main/java/bisq/network/p2p/DirectMessage.java → p2p/src/main/java/haveno/network/p2p/DirectMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface DirectMessage {
}

2
p2p/src/main/java/bisq/network/p2p/ExtendedDataSizePermission.java → p2p/src/main/java/haveno/network/p2p/ExtendedDataSizePermission.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
// Marker interface for messages with higher allowed data size
public interface ExtendedDataSizePermission {

2
p2p/src/main/java/bisq/network/p2p/InitialDataRequest.java → p2p/src/main/java/haveno/network/p2p/InitialDataRequest.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
// Marker interface for initial data request
public interface InitialDataRequest {

2
p2p/src/main/java/bisq/network/p2p/InitialDataResponse.java → p2p/src/main/java/haveno/network/p2p/InitialDataResponse.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
// Marker interface for initial data response
public interface InitialDataResponse {

24
p2p/src/main/java/bisq/network/p2p/NetworkNodeProvider.java → p2p/src/main/java/haveno/network/p2p/NetworkNodeProvider.java
View file

@ -15,20 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.LocalhostNetworkNode;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.NewTor;
import bisq.network.p2p.network.RunningTor;
import bisq.network.p2p.network.TorMode;
import bisq.network.p2p.network.TorNetworkNode;
import bisq.common.config.Config;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p;
import haveno.common.config.Config;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.network.BridgeAddressProvider;
import haveno.network.p2p.network.LocalhostNetworkNode;
import haveno.network.p2p.network.NetworkFilter;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.NewTor;
import haveno.network.p2p.network.RunningTor;
import haveno.network.p2p.network.TorMode;
import haveno.network.p2p.network.TorNetworkNode;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;

2
p2p/src/main/java/bisq/network/p2p/NetworkNotReadyException.java → p2p/src/main/java/haveno/network/p2p/NetworkNotReadyException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public class NetworkNotReadyException extends RuntimeException {

14
p2p/src/main/java/bisq/network/p2p/NodeAddress.java → p2p/src/main/java/haveno/network/p2p/NodeAddress.java
View file

@ -15,13 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.common.consensus.UsedForTradeContractJson;
import bisq.common.crypto.Hash;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.JsonExclude;
package haveno.network.p2p;
import java.util.regex.Pattern;
@ -31,6 +25,12 @@ import lombok.extern.slf4j.Slf4j;
import static com.google.common.base.Preconditions.checkArgument;
import haveno.common.consensus.UsedForTradeContractJson;
import haveno.common.crypto.Hash;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.util.JsonExclude;
@Getter
@EqualsAndHashCode
@Slf4j

39
p2p/src/main/java/bisq/network/p2p/P2PModule.java → p2p/src/main/java/haveno/network/p2p/P2PModule.java
View file

@ -15,38 +15,35 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.Socks5ProxyProvider;
import bisq.network.http.HttpClient;
import bisq.network.http.HttpClientImpl;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.Broadcaster;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.getdata.RequestDataManager;
import bisq.network.p2p.peers.keepalive.KeepAliveManager;
import bisq.network.p2p.peers.peerexchange.PeerExchangeManager;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
package haveno.network.p2p;
import com.google.inject.Singleton;
import com.google.inject.TypeLiteral;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.network.Socks5ProxyProvider;
import haveno.network.http.HttpClient;
import haveno.network.http.HttpClientImpl;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.Broadcaster;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.getdata.RequestDataManager;
import haveno.network.p2p.peers.keepalive.KeepAliveManager;
import haveno.network.p2p.peers.peerexchange.PeerExchangeManager;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import haveno.network.p2p.storage.persistence.ProtectedDataStoreService;
import haveno.network.p2p.storage.persistence.ResourceDataStoreService;
import java.time.Clock;
import java.io.File;
import java.util.List;
import static bisq.common.config.Config.*;
import static com.google.inject.name.Names.named;
import static com.google.inject.util.Providers.of;
import static haveno.common.config.Config.*;
public class P2PModule extends AppModule {

61
p2p/src/main/java/bisq/network/p2p/P2PService.java → p2p/src/main/java/haveno/network/p2p/P2PService.java
View file

@ -15,40 +15,37 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.Socks5ProxyProvider;
import bisq.network.crypto.EncryptionService;
import bisq.network.p2p.mailbox.MailboxMessageService;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.SetupListener;
import bisq.network.p2p.peers.Broadcaster;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.getdata.RequestDataManager;
import bisq.network.p2p.peers.keepalive.KeepAliveManager;
import bisq.network.p2p.peers.peerexchange.PeerExchangeManager;
import bisq.network.p2p.storage.HashMapChangedListener;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.messages.RefreshOfferMessage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.network.utils.CapabilityUtils;
import bisq.common.UserThread;
import bisq.common.app.Capabilities;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p;
import com.google.inject.Inject;
import haveno.common.UserThread;
import haveno.common.app.Capabilities;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.Socks5ProxyProvider;
import haveno.network.crypto.EncryptionService;
import haveno.network.p2p.mailbox.MailboxMessageService;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.SetupListener;
import haveno.network.p2p.peers.Broadcaster;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.getdata.RequestDataManager;
import haveno.network.p2p.peers.keepalive.KeepAliveManager;
import haveno.network.p2p.peers.peerexchange.PeerExchangeManager;
import haveno.network.p2p.storage.HashMapChangedListener;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.messages.RefreshOfferMessage;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import haveno.network.utils.CapabilityUtils;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;

4
p2p/src/main/java/bisq/network/p2p/P2PServiceListener.java → p2p/src/main/java/haveno/network/p2p/P2PServiceListener.java
View file

@ -15,10 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
import bisq.network.p2p.network.SetupListener;
import haveno.network.p2p.network.SetupListener;
public interface P2PServiceListener extends SetupListener {

13
p2p/src/main/java/bisq/network/p2p/PrefixedSealedAndSignedMessage.java → p2p/src/main/java/haveno/network/p2p/PrefixedSealedAndSignedMessage.java
View file

@ -15,16 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.network.p2p.mailbox.MailboxMessage;
import bisq.common.app.Version;
import bisq.common.crypto.SealedAndSigned;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p;
import com.google.protobuf.ByteString;
import haveno.common.app.Version;
import haveno.common.crypto.SealedAndSigned;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.mailbox.MailboxMessage;
import java.util.UUID;
import java.util.concurrent.TimeUnit;

2
p2p/src/main/java/bisq/network/p2p/SendDirectMessageListener.java → p2p/src/main/java/haveno/network/p2p/SendDirectMessageListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface SendDirectMessageListener {
void onArrived();

2
p2p/src/main/java/bisq/network/p2p/SendMailboxMessageListener.java → p2p/src/main/java/haveno/network/p2p/SendMailboxMessageListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface SendMailboxMessageListener {
void onArrived();

2
p2p/src/main/java/bisq/network/p2p/SendersNodeAddressMessage.java → p2p/src/main/java/haveno/network/p2p/SendersNodeAddressMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface SendersNodeAddressMessage {
NodeAddress getSenderNodeAddress();

5
p2p/src/main/java/bisq/network/p2p/SupportedCapabilitiesMessage.java → p2p/src/main/java/haveno/network/p2p/SupportedCapabilitiesMessage.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
import bisq.common.app.Capabilities;
package haveno.network.p2p;
import haveno.common.app.Capabilities;
import javax.annotation.Nullable;
public interface SupportedCapabilitiesMessage {

2
p2p/src/main/java/bisq/network/p2p/UidMessage.java → p2p/src/main/java/haveno/network/p2p/UidMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p;
package haveno.network.p2p;
public interface UidMessage {

7
p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxMap.java → p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxMap.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
package haveno.network.p2p.mailbox;
import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.util.CollectionUtils;
import haveno.common.proto.persistable.PersistableEnvelope;
import haveno.common.util.CollectionUtils;
import java.util.HashMap;
import java.util.Map;

10
p2p/src/main/java/bisq/network/p2p/mailbox/IgnoredMailboxService.java → p2p/src/main/java/haveno/network/p2p/mailbox/IgnoredMailboxService.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
import bisq.network.p2p.storage.payload.MailboxStoragePayload;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.network.p2p.mailbox;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.network.p2p.storage.payload.MailboxStoragePayload;
import javax.inject.Inject;
import javax.inject.Singleton;

14
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxItem.java → p2p/src/main/java/haveno/network/p2p/mailbox/MailboxItem.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
import bisq.network.p2p.DecryptedMessageWithPubKey;
import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistablePayload;
package haveno.network.p2p.mailbox;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.DecryptedMessageWithPubKey;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import java.time.Clock;
import java.util.Optional;

10
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessage.java → p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessage.java
View file

@ -15,13 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
package haveno.network.p2p.mailbox;
import bisq.network.p2p.DirectMessage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.UidMessage;
import bisq.network.p2p.storage.payload.ExpirablePayload;
import haveno.network.p2p.DirectMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.UidMessage;
import haveno.network.p2p.storage.payload.ExpirablePayload;
public interface MailboxMessage extends DirectMessage, UidMessage, ExpirablePayload {
NodeAddress getSenderNodeAddress();

10
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageList.java → p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageList.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistableList;
package haveno.network.p2p.mailbox;
import com.google.protobuf.Message;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistableList;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

65
p2p/src/main/java/bisq/network/p2p/mailbox/MailboxMessageService.java → p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageService.java
View file

@ -15,39 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.mailbox;
import bisq.network.crypto.EncryptionService;
import bisq.network.p2p.DecryptedMessageWithPubKey;
import bisq.network.p2p.NetworkNotReadyException;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.PrefixedSealedAndSignedMessage;
import bisq.network.p2p.SendMailboxMessageListener;
import bisq.network.p2p.messaging.DecryptedMailboxListener;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.BroadcastHandler;
import bisq.network.p2p.peers.Broadcaster;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.storage.HashMapChangedListener;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.messages.AddDataMessage;
import bisq.network.p2p.storage.payload.MailboxStoragePayload;
import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.utils.CapabilityUtils;
import bisq.common.UserThread;
import bisq.common.config.Config;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.crypto.SealedAndSigned;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.persistable.PersistedDataHost;
import bisq.common.util.Utilities;
package haveno.network.p2p.mailbox;
import javax.inject.Inject;
import javax.inject.Named;
@ -60,7 +28,36 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.UserThread;
import haveno.common.config.Config;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.crypto.SealedAndSigned;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.common.util.Utilities;
import haveno.network.crypto.EncryptionService;
import haveno.network.p2p.DecryptedMessageWithPubKey;
import haveno.network.p2p.NetworkNotReadyException;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.PrefixedSealedAndSignedMessage;
import haveno.network.p2p.SendMailboxMessageListener;
import haveno.network.p2p.messaging.DecryptedMailboxListener;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.BroadcastHandler;
import haveno.network.p2p.peers.Broadcaster;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.storage.HashMapChangedListener;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.payload.MailboxStoragePayload;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.utils.CapabilityUtils;
import java.security.PublicKey;
import java.time.Clock;

6
p2p/src/main/java/bisq/network/p2p/messaging/DecryptedMailboxListener.java → p2p/src/main/java/haveno/network/p2p/messaging/DecryptedMailboxListener.java
View file

@ -15,10 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.messaging;
package haveno.network.p2p.messaging;
import bisq.network.p2p.DecryptedMessageWithPubKey;
import bisq.network.p2p.NodeAddress;
import haveno.network.p2p.DecryptedMessageWithPubKey;
import haveno.network.p2p.NodeAddress;
public interface DecryptedMailboxListener {

2
p2p/src/main/java/bisq/network/p2p/network/BridgeAddressProvider.java → p2p/src/main/java/haveno/network/p2p/network/BridgeAddressProvider.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import java.util.List;

2
p2p/src/main/java/bisq/network/p2p/network/CloseConnectionReason.java → p2p/src/main/java/haveno/network/p2p/network/CloseConnectionReason.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
public enum CloseConnectionReason {
// First block are from different exceptions

53
p2p/src/main/java/bisq/network/p2p/network/Connection.java → p2p/src/main/java/haveno/network/p2p/network/Connection.java
View file

@ -15,36 +15,33 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.BundleOfEnvelopes;
import bisq.network.p2p.CloseConnectionMessage;
import bisq.network.p2p.ExtendedDataSizePermission;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.SendersNodeAddressMessage;
import bisq.network.p2p.SupportedCapabilitiesMessage;
import bisq.network.p2p.peers.keepalive.messages.KeepAliveMessage;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.messages.AddDataMessage;
import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.Proto;
import bisq.common.UserThread;
import bisq.common.app.Capabilities;
import bisq.common.app.Capability;
import bisq.common.app.HasCapabilities;
import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.proto.ProtobufferException;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.util.Utilities;
package haveno.network.p2p.network;
import com.google.protobuf.InvalidProtocolBufferException;
import haveno.common.Proto;
import haveno.common.UserThread;
import haveno.common.app.Capabilities;
import haveno.common.app.Capability;
import haveno.common.app.HasCapabilities;
import haveno.common.app.Version;
import haveno.common.config.Config;
import haveno.common.proto.ProtobufferException;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.util.Utilities;
import haveno.network.p2p.BundleOfEnvelopes;
import haveno.network.p2p.CloseConnectionMessage;
import haveno.network.p2p.ExtendedDataSizePermission;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendersNodeAddressMessage;
import haveno.network.p2p.SupportedCapabilitiesMessage;
import haveno.network.p2p.peers.keepalive.messages.KeepAliveMessage;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import javax.inject.Inject;
import com.google.common.util.concurrent.MoreExecutors;

2
p2p/src/main/java/bisq/network/p2p/network/ConnectionListener.java → p2p/src/main/java/haveno/network/p2p/network/ConnectionListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
public interface ConnectionListener {
void onConnection(Connection connection);

18
p2p/src/main/java/bisq/network/p2p/network/ConnectionState.java → p2p/src/main/java/haveno/network/p2p/network/ConnectionState.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.BundleOfEnvelopes;
import bisq.network.p2p.InitialDataRequest;
import bisq.network.p2p.InitialDataResponse;
import bisq.network.p2p.PrefixedSealedAndSignedMessage;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.network;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.BundleOfEnvelopes;
import haveno.network.p2p.InitialDataRequest;
import haveno.network.p2p.InitialDataResponse;
import haveno.network.p2p.PrefixedSealedAndSignedMessage;
import java.util.concurrent.TimeUnit;
import lombok.Getter;

16
p2p/src/main/java/bisq/network/p2p/network/ConnectionStatistics.java → p2p/src/main/java/haveno/network/p2p/network/ConnectionStatistics.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.BundleOfEnvelopes;
import bisq.network.p2p.InitialDataRequest;
import bisq.network.p2p.InitialDataResponse;
import bisq.network.p2p.NodeAddress;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.util.Utilities;
package haveno.network.p2p.network;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.util.Utilities;
import haveno.network.p2p.BundleOfEnvelopes;
import haveno.network.p2p.InitialDataRequest;
import haveno.network.p2p.InitialDataResponse;
import haveno.network.p2p.NodeAddress;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;

2
p2p/src/main/java/bisq/network/p2p/network/DefaultPluggableTransports.java → p2p/src/main/java/haveno/network/p2p/network/DefaultPluggableTransports.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import java.util.Arrays;
import java.util.List;

2
p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java → p2p/src/main/java/haveno/network/p2p/network/HavenoRuntimeException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
class HavenoRuntimeException extends RuntimeException {
HavenoRuntimeException(String message, Throwable cause) {

5
p2p/src/main/java/bisq/network/p2p/network/InboundConnection.java → p2p/src/main/java/haveno/network/p2p/network/InboundConnection.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p.network;
import haveno.common.proto.network.NetworkProtoResolver;
import java.net.Socket;
import org.jetbrains.annotations.Nullable;

10
p2p/src/main/java/bisq/network/p2p/network/LocalhostNetworkNode.java → p2p/src/main/java/haveno/network/p2p/network/LocalhostNetworkNode.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.NodeAddress;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p.network;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.NodeAddress;
import java.net.ServerSocket;
import java.net.Socket;

4
p2p/src/main/java/bisq/network/p2p/network/MessageListener.java → p2p/src/main/java/haveno/network/p2p/network/MessageListener.java
View file

@ -15,9 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import bisq.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkEnvelope;
public interface MessageListener {
void onMessage(NetworkEnvelope networkEnvelope, Connection connection);

5
p2p/src/main/java/bisq/network/p2p/network/NetworkFilter.java → p2p/src/main/java/haveno/network/p2p/network/NetworkFilter.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.NodeAddress;
package haveno.network.p2p.network;
import haveno.network.p2p.NodeAddress;
import java.util.function.Function;
public interface NetworkFilter {

19
p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java → p2p/src/main/java/haveno/network/p2p/network/NetworkNode.java
View file

@ -15,19 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.NodeAddress;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Capabilities;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.util.Utilities;
package haveno.network.p2p.network;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.app.Capabilities;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.util.Utilities;
import haveno.network.p2p.NodeAddress;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;

2
p2p/src/main/java/bisq/network/p2p/network/NewTor.java → p2p/src/main/java/haveno/network/p2p/network/NewTor.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import java.io.File;
import java.io.FileInputStream;

8
p2p/src/main/java/bisq/network/p2p/network/OutboundConnection.java → p2p/src/main/java/haveno/network/p2p/network/OutboundConnection.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.NodeAddress;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p.network;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.NodeAddress;
import java.net.Socket;
import org.jetbrains.annotations.Nullable;

2
p2p/src/main/java/bisq/network/p2p/network/PeerType.java → p2p/src/main/java/haveno/network/p2p/network/PeerType.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
public enum PeerType {
// PEER is default type

8
p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java → p2p/src/main/java/haveno/network/p2p/network/ProtoOutputStream.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.peers.keepalive.messages.KeepAliveMessage;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.network;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.peers.keepalive.messages.KeepAliveMessage;
import java.io.IOException;
import java.io.OutputStream;

2
p2p/src/main/java/bisq/network/p2p/network/RuleViolation.java → p2p/src/main/java/haveno/network/p2p/network/RuleViolation.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
public enum RuleViolation {
INVALID_DATA_TYPE(2),

2
p2p/src/main/java/bisq/network/p2p/network/RunningTor.java → p2p/src/main/java/haveno/network/p2p/network/RunningTor.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import java.io.File;
import java.io.IOException;

6
p2p/src/main/java/bisq/network/p2p/network/Server.java → p2p/src/main/java/haveno/network/p2p/network/Server.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p.network;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import haveno.common.proto.network.NetworkProtoResolver;
import java.io.IOException;
import java.util.Set;

2
p2p/src/main/java/bisq/network/p2p/network/SetupListener.java → p2p/src/main/java/haveno/network/p2p/network/SetupListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
public interface SetupListener {
void onTorNodeReady();

10
p2p/src/main/java/bisq/network/p2p/network/Statistic.java → p2p/src/main/java/haveno/network/p2p/network/Statistic.java
View file

@ -15,11 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.util.Utilities;
package haveno.network.p2p.network;
import javafx.beans.property.DoubleProperty;
import javafx.beans.property.IntegerProperty;
@ -27,7 +23,9 @@ import javafx.beans.property.LongProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleLongProperty;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.util.Utilities;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

4
p2p/src/main/java/bisq/network/p2p/network/SupportedCapabilitiesListener.java → p2p/src/main/java/haveno/network/p2p/network/SupportedCapabilitiesListener.java
View file

@ -15,9 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
package haveno.network.p2p.network;
import bisq.common.app.Capabilities;
import haveno.common.app.Capabilities;
public interface SupportedCapabilitiesListener {
void onChanged(Capabilities supportedCapabilities);

5
p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java → p2p/src/main/java/haveno/network/p2p/network/SynchronizedProtoOutputStream.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.network;
import haveno.common.proto.network.NetworkEnvelope;
import java.io.OutputStream;
import java.util.concurrent.ExecutionException;

6
p2p/src/main/java/bisq/network/p2p/network/TorMode.java → p2p/src/main/java/haveno/network/p2p/network/TorMode.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.common.file.FileUtil;
package haveno.network.p2p.network;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import haveno.common.file.FileUtil;
import java.io.File;
import java.io.IOException;

17
p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java → p2p/src/main/java/haveno/network/p2p/network/TorNetworkNode.java
View file

@ -15,15 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.network;
import bisq.network.p2p.NodeAddress;
import bisq.network.utils.Utils;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.util.Utilities;
package haveno.network.p2p.network;
import org.berndpruenster.netlayer.tor.HiddenServiceSocket;
import org.berndpruenster.netlayer.tor.Tor;
@ -31,7 +23,12 @@ import org.berndpruenster.netlayer.tor.TorCtlException;
import org.berndpruenster.netlayer.tor.TorSocket;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.util.Utilities;
import haveno.network.p2p.NodeAddress;
import haveno.network.utils.Utils;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;

19
p2p/src/main/java/bisq/network/p2p/peers/BroadcastHandler.java → p2p/src/main/java/haveno/network/p2p/peers/BroadcastHandler.java
View file

@ -15,22 +15,19 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers;
import bisq.network.p2p.BundleOfEnvelopes;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.storage.messages.BroadcastMessage;
import bisq.common.Timer;
import bisq.common.UserThread;
package haveno.network.p2p.peers;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.network.p2p.BundleOfEnvelopes;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

14
p2p/src/main/java/bisq/network/p2p/peers/Broadcaster.java → p2p/src/main/java/haveno/network/p2p/peers/Broadcaster.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.storage.messages.BroadcastMessage;
import bisq.common.Timer;
import bisq.common.UserThread;
package haveno.network.p2p.peers;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import javax.inject.Inject;
import java.util.ArrayList;

43
p2p/src/main/java/bisq/network/p2p/peers/PeerManager.java → p2p/src/main/java/haveno/network/p2p/peers/PeerManager.java
View file

@ -15,34 +15,31 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.InboundConnection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.PeerType;
import bisq.network.p2p.network.RuleViolation;
import bisq.network.p2p.peers.peerexchange.Peer;
import bisq.network.p2p.peers.peerexchange.PeerList;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.ClockWatcher;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Capabilities;
import bisq.common.app.Capability;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.network.p2p.peers;
import javax.inject.Inject;
import javax.inject.Named;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.ClockWatcher;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.app.Capabilities;
import haveno.common.app.Capability;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.InboundConnection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.PeerType;
import haveno.network.p2p.network.RuleViolation;
import haveno.network.p2p.peers.peerexchange.Peer;
import haveno.network.p2p.peers.peerexchange.PeerList;
import haveno.network.p2p.seed.SeedNodeRepository;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;

21
p2p/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/GetDataRequestHandler.java
View file

@ -15,23 +15,20 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.getdata.messages.GetDataRequest;
import bisq.network.p2p.peers.getdata.messages.GetDataResponse;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.Timer;
import bisq.common.UserThread;
package haveno.network.p2p.peers.getdata;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.storage.P2PDataStorage;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;

39
p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataHandler.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataHandler.java
View file

@ -15,32 +15,29 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.getdata.messages.GetDataRequest;
import bisq.network.p2p.peers.getdata.messages.GetDataResponse;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
package haveno.network.p2p.peers.getdata;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;

34
p2p/src/main/java/bisq/network/p2p/peers/getdata/RequestDataManager.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/RequestDataManager.java
View file

@ -15,25 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.getdata.messages.GetDataRequest;
import bisq.network.p2p.peers.peerexchange.Peer;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.getdata;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.peerexchange.Peer;
import haveno.network.p2p.seed.SeedNodeRepository;
import haveno.network.p2p.storage.P2PDataStorage;
import javax.inject.Inject;
import java.util.ArrayList;

10
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataRequest.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataRequest.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata.messages;
import bisq.network.p2p.ExtendedDataSizePermission;
import bisq.network.p2p.InitialDataRequest;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.getdata.messages;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.ExtendedDataSizePermission;
import haveno.network.p2p.InitialDataRequest;
import java.util.Set;
import lombok.EqualsAndHashCode;

28
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetDataResponse.java
View file

@ -15,22 +15,20 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata.messages;
import bisq.network.p2p.ExtendedDataSizePermission;
import bisq.network.p2p.InitialDataRequest;
import bisq.network.p2p.InitialDataResponse;
import bisq.network.p2p.SupportedCapabilitiesMessage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.util.Utilities;
package haveno.network.p2p.peers.getdata.messages;
import haveno.common.app.Capabilities;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.util.Utilities;
import haveno.network.p2p.ExtendedDataSizePermission;
import haveno.network.p2p.InitialDataRequest;
import haveno.network.p2p.InitialDataResponse;
import haveno.network.p2p.SupportedCapabilitiesMessage;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import java.util.Set;
import java.util.stream.Collectors;

13
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
View file

@ -15,18 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata.messages;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.SendersNodeAddressMessage;
import bisq.common.app.Version;
import bisq.common.proto.ProtoUtil;
package haveno.network.p2p.peers.getdata.messages;
import protobuf.NetworkEnvelope;
import com.google.protobuf.ByteString;
import haveno.common.app.Version;
import haveno.common.proto.ProtoUtil;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendersNodeAddressMessage;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

15
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java → p2p/src/main/java/haveno/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
View file

@ -15,19 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.getdata.messages;
import bisq.network.p2p.AnonymousMessage;
import bisq.network.p2p.SupportedCapabilitiesMessage;
import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.ProtoUtil;
package haveno.network.p2p.peers.getdata.messages;
import protobuf.NetworkEnvelope;
import com.google.protobuf.ByteString;
import haveno.common.app.Capabilities;
import haveno.common.app.Version;
import haveno.common.proto.ProtoUtil;
import haveno.network.p2p.AnonymousMessage;
import haveno.network.p2p.SupportedCapabilitiesMessage;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

23
p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveHandler.java → p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveHandler.java
View file

@ -15,24 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.keepalive;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.keepalive.messages.Ping;
import bisq.network.p2p.peers.keepalive.messages.Pong;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.keepalive;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.keepalive.messages.Ping;
import haveno.network.p2p.peers.keepalive.messages.Pong;
import java.util.Random;
import java.util.concurrent.TimeUnit;

31
p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java → p2p/src/main/java/haveno/network/p2p/peers/keepalive/KeepAliveManager.java
View file

@ -15,22 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.keepalive;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.OutboundConnection;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.keepalive.messages.Ping;
import bisq.network.p2p.peers.keepalive.messages.Pong;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.util.Utilities;
package haveno.network.p2p.peers.keepalive;
import javax.inject.Inject;
@ -38,7 +23,19 @@ import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.util.Utilities;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.OutboundConnection;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.keepalive.messages.Ping;
import haveno.network.p2p.peers.keepalive.messages.Pong;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;

2
p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/KeepAliveMessage.java → p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/KeepAliveMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.keepalive.messages;
package haveno.network.p2p.peers.keepalive.messages;
public interface KeepAliveMessage {
}

7
p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Ping.java → p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Ping.java
View file

@ -15,11 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.keepalive.messages;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.keepalive.messages;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import lombok.EqualsAndHashCode;
import lombok.Value;

7
p2p/src/main/java/bisq/network/p2p/peers/keepalive/messages/Pong.java → p2p/src/main/java/haveno/network/p2p/peers/keepalive/messages/Pong.java
View file

@ -15,11 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.keepalive.messages;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.keepalive.messages;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import lombok.EqualsAndHashCode;
import lombok.Value;

21
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/GetPeersRequestHandler.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/GetPeersRequestHandler.java
View file

@ -15,23 +15,20 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import bisq.network.p2p.peers.peerexchange.messages.GetPeersResponse;
import bisq.common.Timer;
import bisq.common.UserThread;
package haveno.network.p2p.peers.peerexchange;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import haveno.network.p2p.peers.peerexchange.messages.GetPeersResponse;
import java.util.HashSet;
import java.util.concurrent.TimeUnit;

16
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/Peer.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/Peer.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.SupportedCapabilitiesListener;
import bisq.common.app.Capabilities;
import bisq.common.app.HasCapabilities;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.proto.persistable.PersistablePayload;
package haveno.network.p2p.peers.peerexchange;
import haveno.common.app.Capabilities;
import haveno.common.app.HasCapabilities;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.SupportedCapabilitiesListener;
import java.util.Date;
import lombok.Getter;

27
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeHandler.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeHandler.java
View file

@ -15,26 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import bisq.network.p2p.peers.peerexchange.messages.GetPeersResponse;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.peerexchange;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import haveno.network.p2p.peers.peerexchange.messages.GetPeersResponse;
import java.util.HashSet;
import java.util.Random;
import java.util.concurrent.TimeUnit;

29
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerExchangeManager.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerExchangeManager.java
View file

@ -15,26 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.peerexchange;
import javax.inject.Inject;
import com.google.common.base.Preconditions;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import haveno.network.p2p.seed.SeedNodeRepository;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

6
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/PeerList.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/PeerList.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange;
import bisq.common.proto.persistable.PersistableEnvelope;
package haveno.network.p2p.peers.peerexchange;
import com.google.protobuf.Message;
import haveno.common.proto.persistable.PersistableEnvelope;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;

18
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersRequest.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersRequest.java
View file

@ -15,17 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange.messages;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.SendersNodeAddressMessage;
import bisq.network.p2p.SupportedCapabilitiesMessage;
import bisq.network.p2p.peers.peerexchange.Peer;
import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.peerexchange.messages;
import haveno.common.app.Capabilities;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SendersNodeAddressMessage;
import haveno.network.p2p.SupportedCapabilitiesMessage;
import haveno.network.p2p.peers.peerexchange.Peer;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;

16
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/GetPeersResponse.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/GetPeersResponse.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange.messages;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.SupportedCapabilitiesMessage;
import bisq.network.p2p.peers.peerexchange.Peer;
import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.network.p2p.peers.peerexchange.messages;
import haveno.common.app.Capabilities;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.SupportedCapabilitiesMessage;
import haveno.network.p2p.peers.peerexchange.Peer;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;

2
p2p/src/main/java/bisq/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java → p2p/src/main/java/haveno/network/p2p/peers/peerexchange/messages/PeerExchangeMessage.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.peers.peerexchange.messages;
package haveno.network.p2p.peers.peerexchange.messages;
public interface PeerExchangeMessage {
}

5
p2p/src/main/java/bisq/network/p2p/seed/SeedNodeRepository.java → p2p/src/main/java/haveno/network/p2p/seed/SeedNodeRepository.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.seed;
import bisq.network.p2p.NodeAddress;
package haveno.network.p2p.seed;
import haveno.network.p2p.NodeAddress;
import java.util.Collection;
public interface SeedNodeRepository {

5
p2p/src/main/java/bisq/network/p2p/storage/HashMapChangedListener.java → p2p/src/main/java/haveno/network/p2p/storage/HashMapChangedListener.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.storage;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
package haveno.network.p2p.storage;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import java.util.Collection;
public interface HashMapChangedListener {

107
p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java → p2p/src/main/java/haveno/network/p2p/storage/P2PDataStorage.java
View file

@ -15,63 +15,60 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.storage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.BroadcastHandler;
import bisq.network.p2p.peers.Broadcaster;
import bisq.network.p2p.peers.getdata.messages.GetDataRequest;
import bisq.network.p2p.peers.getdata.messages.GetDataResponse;
import bisq.network.p2p.peers.getdata.messages.GetUpdatedDataRequest;
import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import bisq.network.p2p.storage.messages.AddDataMessage;
import bisq.network.p2p.storage.messages.AddOncePayload;
import bisq.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import bisq.network.p2p.storage.messages.BroadcastMessage;
import bisq.network.p2p.storage.messages.RefreshOfferMessage;
import bisq.network.p2p.storage.messages.RemoveDataMessage;
import bisq.network.p2p.storage.messages.RemoveMailboxDataMessage;
import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
import bisq.network.p2p.storage.payload.DateSortedTruncatablePayload;
import bisq.network.p2p.storage.payload.DateTolerantPayload;
import bisq.network.p2p.storage.payload.MailboxStoragePayload;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreListener;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.network.p2p.storage.persistence.HistoricalDataStoreService;
import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
import bisq.network.p2p.storage.persistence.ProtectedDataStoreService;
import bisq.network.p2p.storage.persistence.RemovedPayloadsService;
import bisq.network.p2p.storage.persistence.ResourceDataStoreService;
import bisq.network.p2p.storage.persistence.SequenceNumberMap;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.Capabilities;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Hash;
import bisq.common.crypto.Sig;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.proto.persistable.PersistedDataHost;
import bisq.common.util.Hex;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
package haveno.network.p2p.storage;
import com.google.protobuf.ByteString;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.app.Capabilities;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Hash;
import haveno.common.crypto.Sig;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.common.util.Hex;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.BroadcastHandler;
import haveno.network.p2p.peers.Broadcaster;
import haveno.network.p2p.peers.getdata.messages.GetDataRequest;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.peers.getdata.messages.GetUpdatedDataRequest;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import haveno.network.p2p.storage.messages.AddDataMessage;
import haveno.network.p2p.storage.messages.AddOncePayload;
import haveno.network.p2p.storage.messages.AddPersistableNetworkPayloadMessage;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import haveno.network.p2p.storage.messages.RefreshOfferMessage;
import haveno.network.p2p.storage.messages.RemoveDataMessage;
import haveno.network.p2p.storage.messages.RemoveMailboxDataMessage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import haveno.network.p2p.storage.payload.DateSortedTruncatablePayload;
import haveno.network.p2p.storage.payload.DateTolerantPayload;
import haveno.network.p2p.storage.payload.MailboxStoragePayload;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import haveno.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreListener;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import haveno.network.p2p.storage.persistence.HistoricalDataStoreService;
import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
import haveno.network.p2p.storage.persistence.ProtectedDataStoreService;
import haveno.network.p2p.storage.persistence.RemovedPayloadsService;
import haveno.network.p2p.storage.persistence.ResourceDataStoreService;
import haveno.network.p2p.storage.persistence.SequenceNumberMap;
import com.google.inject.name.Named;
import javax.inject.Inject;

13
p2p/src/main/java/bisq/network/p2p/storage/messages/AddDataMessage.java → p2p/src/main/java/haveno/network/p2p/storage/messages/AddDataMessage.java
View file

@ -15,16 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.network.p2p.storage.messages;
import bisq.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.network.p2p.storage.messages;
import com.google.protobuf.Message;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.network.p2p.storage.payload.ProtectedMailboxStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import lombok.EqualsAndHashCode;
import lombok.Value;

Some files were not shown because too many files have changed in this diff Show more