Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-01 19:26:09 -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

25
core/src/main/java/bisq/core/account/sign/SignedWitness.java → core/src/main/java/haveno/core/account/sign/SignedWitness.java
View file

@ -15,22 +15,19 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.sign;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
import bisq.network.p2p.storage.payload.DateTolerantPayload;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import bisq.common.app.Capabilities;
import bisq.common.app.Capability;
import bisq.common.crypto.Hash;
import bisq.common.proto.ProtoUtil;
import bisq.common.util.Utilities;
package haveno.core.account.sign;
import com.google.protobuf.ByteString;
import haveno.common.app.Capabilities;
import haveno.common.app.Capability;
import haveno.common.crypto.Hash;
import haveno.common.proto.ProtoUtil;
import haveno.common.util.Utilities;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.CapabilityRequiringPayload;
import haveno.network.p2p.storage.payload.DateTolerantPayload;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import org.bitcoinj.core.Coin;
import java.time.Clock;

36
core/src/main/java/bisq/core/account/sign/SignedWitnessService.java → core/src/main/java/haveno/core/account/sign/SignedWitnessService.java
View file

@ -15,25 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.sign;
import bisq.core.account.witness.AccountAgeWitness;
import bisq.core.filter.FilterManager;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.trade.HavenoUtils;
import bisq.core.user.User;
import bisq.network.p2p.BootstrapListener;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.common.UserThread;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Hash;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.Sig;
import bisq.common.util.Utilities;
package haveno.core.account.sign;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
@ -43,7 +25,21 @@ import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
import haveno.common.UserThread;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Hash;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.Sig;
import haveno.common.util.Utilities;
import haveno.core.account.witness.AccountAgeWitness;
import haveno.core.filter.FilterManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.trade.HavenoUtils;
import haveno.core.user.User;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import java.math.BigInteger;
import java.security.PublicKey;
import java.security.SignatureException;

14
core/src/main/java/bisq/core/account/sign/SignedWitnessStorageService.java → core/src/main/java/haveno/core/account/sign/SignedWitnessStorageService.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.sign;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.persistence.MapStoreService;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
package haveno.core.account.sign;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.persistence.MapStoreService;
import javax.inject.Inject;
import javax.inject.Named;

6
core/src/main/java/bisq/core/account/sign/SignedWitnessStore.java → core/src/main/java/haveno/core/account/sign/SignedWitnessStore.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.sign;
package haveno.core.account.sign;
import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
import com.google.protobuf.Message;
import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
import java.util.List;
import java.util.stream.Collectors;

15
core/src/main/java/bisq/core/account/witness/AccountAgeWitness.java → core/src/main/java/haveno/core/account/witness/AccountAgeWitness.java
View file

@ -15,17 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.payload.DateTolerantPayload;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import bisq.common.util.Utilities;
package haveno.core.account.witness;
import com.google.protobuf.ByteString;
import haveno.common.util.Utilities;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.payload.DateTolerantPayload;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.payload.ProcessOncePersistableNetworkPayload;
import java.time.Clock;
import java.time.Instant;

72
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java → core/src/main/java/haveno/core/account/witness/AccountAgeWitnessService.java
View file

@ -15,43 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.core.account.sign.SignedWitness;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.filter.FilterManager;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OfferRestrictions;
import bisq.core.payment.ChargeBackRisk;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.arbitration.TraderDataItem;
import bisq.core.trade.ArbitratorTrade;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.TradePeer;
import bisq.core.user.User;
import bisq.network.p2p.BootstrapListener;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import bisq.common.UserThread;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Hash;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.crypto.Sig;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.util.MathUtils;
import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;
package haveno.core.account.witness;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
@ -59,7 +23,39 @@ import org.bitcoinj.core.Utils;
import javax.inject.Inject;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.UserThread;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Hash;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.crypto.Sig;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.util.MathUtils;
import haveno.common.util.Tuple2;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.filter.FilterManager;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.OfferRestrictions;
import haveno.core.payment.ChargeBackRisk;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.DisputeResult;
import haveno.core.support.dispute.arbitration.TraderDataItem;
import haveno.core.trade.ArbitratorTrade;
import haveno.core.trade.Trade;
import haveno.core.trade.protocol.TradePeer;
import haveno.core.user.User;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.P2PDataStorage;
import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import java.math.BigInteger;
import java.security.PublicKey;

12
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStorageService.java → core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStorageService.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.p2p.storage.persistence.HistoricalDataStoreService;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
package haveno.core.account.witness;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.p2p.storage.persistence.HistoricalDataStoreService;
import javax.inject.Inject;
import javax.inject.Named;

6
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessStore.java → core/src/main/java/haveno/core/account/witness/AccountAgeWitnessStore.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
package haveno.core.account.witness;
import com.google.protobuf.Message;
import haveno.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
import java.util.List;
import java.util.stream.Collectors;

23
core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java → core/src/main/java/haveno/core/account/witness/AccountAgeWitnessUtils.java
View file

@ -15,20 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.account.witness;
import bisq.core.account.sign.SignedWitness;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Trade;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.crypto.Hash;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.util.Utilities;
package haveno.core.account.witness;
import haveno.common.crypto.Hash;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.trade.Trade;
import haveno.network.p2p.storage.P2PDataStorage;
import java.util.Arrays;
import java.util.Collection;
import java.util.Optional;

20
core/src/main/java/bisq/core/alert/Alert.java → core/src/main/java/haveno/core/alert/Alert.java
View file

@ -15,20 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.core.user.Preferences;
import bisq.network.p2p.storage.payload.ExpirablePayload;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.app.Version;
import bisq.common.crypto.Sig;
import bisq.common.util.CollectionUtils;
import bisq.common.util.ExtraDataMapValidator;
package haveno.core.alert;
import com.google.protobuf.ByteString;
import haveno.common.app.Version;
import haveno.common.crypto.Sig;
import haveno.common.util.CollectionUtils;
import haveno.common.util.ExtraDataMapValidator;
import haveno.core.user.Preferences;
import haveno.network.p2p.storage.payload.ExpirablePayload;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import java.security.PublicKey;
import java.util.Map;

22
core/src/main/java/bisq/core/alert/AlertManager.java → core/src/main/java/haveno/core/alert/AlertManager.java
View file

@ -15,18 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.core.user.User;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.HashMapChangedListener;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.crypto.KeyRing;
package haveno.core.alert;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
@ -35,7 +24,14 @@ import javax.inject.Inject;
import javax.inject.Named;
import com.google.common.base.Charsets;
import haveno.common.app.DevEnv;
import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.core.user.User;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.HashMapChangedListener;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.SimpleObjectProperty;

9
core/src/main/java/bisq/core/alert/AlertModule.java → core/src/main/java/haveno/core/alert/AlertModule.java
View file

@ -15,15 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
package haveno.core.alert;
import com.google.inject.Singleton;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import static bisq.common.config.Config.IGNORE_DEV_MSG;
import static com.google.inject.name.Names.named;
import static haveno.common.config.Config.IGNORE_DEV_MSG;
public class AlertModule extends AppModule {

35
core/src/main/java/bisq/core/alert/PrivateNotificationManager.java → core/src/main/java/haveno/core/alert/PrivateNotificationManager.java
View file

@ -15,24 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.network.p2p.DecryptedMessageWithPubKey;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.SendMailboxMessageListener;
import bisq.network.p2p.mailbox.MailboxMessageService;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.peers.keepalive.messages.Ping;
import bisq.network.p2p.peers.keepalive.messages.Pong;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.core.alert;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.Utils;
@ -45,7 +28,21 @@ 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.app.DevEnv;
import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.DecryptedMessageWithPubKey;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.SendMailboxMessageListener;
import haveno.network.p2p.mailbox.MailboxMessageService;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.peers.keepalive.messages.Ping;
import haveno.network.p2p.peers.keepalive.messages.Pong;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
import javafx.beans.property.SimpleObjectProperty;

12
core/src/main/java/bisq/core/alert/PrivateNotificationMessage.java → core/src/main/java/haveno/core/alert/PrivateNotificationMessage.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.mailbox.MailboxMessage;
import bisq.common.app.Version;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.core.alert;
import haveno.common.app.Version;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.mailbox.MailboxMessage;
import java.util.concurrent.TimeUnit;
import lombok.EqualsAndHashCode;

10
core/src/main/java/bisq/core/alert/PrivateNotificationPayload.java → core/src/main/java/haveno/core/alert/PrivateNotificationPayload.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.alert;
import bisq.common.crypto.Sig;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.util.Utilities;
package haveno.core.alert;
import com.google.protobuf.ByteString;
import haveno.common.crypto.Sig;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.util.Utilities;
import java.security.PublicKey;
import lombok.EqualsAndHashCode;

2
core/src/main/java/bisq/core/api/AccountServiceListener.java → core/src/main/java/haveno/core/api/AccountServiceListener.java
View file

@ -1,4 +1,4 @@
package bisq.core.api;
package haveno.core.api;
/**
* Default account listener (takes no action).

16
core/src/main/java/bisq/core/api/CoreAccountService.java → core/src/main/java/haveno/core/api/CoreAccountService.java
View file

@ -15,17 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import static com.google.common.base.Preconditions.checkState;
import bisq.common.config.Config;
import bisq.common.crypto.IncorrectPasswordException;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.file.FileUtil;
import bisq.common.persistence.PersistenceManager;
import bisq.common.util.ZipUtils;
import haveno.common.config.Config;
import haveno.common.crypto.IncorrectPasswordException;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.file.FileUtil;
import haveno.common.persistence.PersistenceManager;
import haveno.common.util.ZipUtils;
import java.io.File;
import java.io.InputStream;
import java.io.PipedInputStream;

65
core/src/main/java/bisq/core/api/CoreApi.java → core/src/main/java/haveno/core/api/CoreApi.java
View file

@ -15,38 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import bisq.core.api.model.AddressBalanceInfo;
import bisq.core.api.model.BalancesInfo;
import bisq.core.api.model.MarketDepthInfo;
import bisq.core.api.model.MarketPriceInfo;
import bisq.core.api.model.PaymentAccountForm;
import bisq.core.api.model.PaymentAccountFormField;
import bisq.core.app.AppStartupState;
import bisq.core.monetary.Price;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OpenOffer;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.support.dispute.Attachment;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.Trade;
import bisq.core.trade.statistics.TradeStatistics3;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.xmr.MoneroNodeSettings;
import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.crypto.IncorrectPasswordException;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.handlers.FaultHandler;
import bisq.common.handlers.ResultHandler;
import bisq.proto.grpc.NotificationMessage;
import haveno.proto.grpc.NotificationMessage;
import org.bitcoinj.core.Transaction;
@ -54,7 +25,33 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.util.concurrent.FutureCallback;
import haveno.common.app.Version;
import haveno.common.config.Config;
import haveno.common.crypto.IncorrectPasswordException;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.FaultHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.api.model.AddressBalanceInfo;
import haveno.core.api.model.BalancesInfo;
import haveno.core.api.model.MarketDepthInfo;
import haveno.core.api.model.MarketPriceInfo;
import haveno.core.api.model.PaymentAccountForm;
import haveno.core.api.model.PaymentAccountFormField;
import haveno.core.app.AppStartupState;
import haveno.core.monetary.Price;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.OpenOffer;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.support.dispute.Attachment;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.DisputeResult;
import haveno.core.support.messages.ChatMessage;
import haveno.core.trade.Trade;
import haveno.core.trade.statistics.TradeStatistics3;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.xmr.MoneroNodeSettings;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigInteger;
@ -74,8 +71,8 @@ import monero.wallet.model.MoneroDestination;
import monero.wallet.model.MoneroTxWallet;
/**
* Provides high level interface to functionality of core Bisq features.
* E.g. useful for different APIs to access data of different domains of Bisq.
* Provides high level interface to functionality of core Haveno features.
* E.g. useful for different APIs to access data of different domains of Haveno.
*/
@Singleton
@Slf4j

2
core/src/main/java/bisq/core/api/CoreContext.java → core/src/main/java/haveno/core/api/CoreContext.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import javax.inject.Inject;
import javax.inject.Singleton;

41
core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java → core/src/main/java/haveno/core/api/CoreDisputeAgentsService.java
View file

@ -15,24 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.arbitration.arbitrator.Arbitrator;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.mediation.mediator.Mediator;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgent;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.user.User;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.common.config.Config;
import bisq.common.crypto.KeyRing;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.handlers.ResultHandler;
import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.support.SupportType;
import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.support.dispute.mediation.mediator.Mediator;
import haveno.core.support.dispute.mediation.mediator.MediatorManager;
import haveno.core.support.dispute.refund.refundagent.RefundAgent;
import haveno.core.support.dispute.refund.refundagent.RefundAgentManager;
import haveno.core.user.User;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import org.bitcoinj.core.ECKey;
import javax.inject.Inject;
@ -45,10 +44,10 @@ import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import static bisq.core.support.SupportType.ARBITRATION;
import static bisq.core.support.SupportType.MEDIATION;
import static bisq.core.support.SupportType.REFUND;
import static bisq.core.support.SupportType.TRADE;
import static haveno.core.support.SupportType.ARBITRATION;
import static haveno.core.support.SupportType.MEDIATION;
import static haveno.core.support.SupportType.REFUND;
import static haveno.core.support.SupportType.TRADE;
import static java.lang.String.format;
import static java.net.InetAddress.getLoopbackAddress;
import static java.util.Arrays.asList;

48
core/src/main/java/bisq/core/api/CoreDisputesService.java → core/src/main/java/haveno/core/api/CoreDisputesService.java
View file

@ -1,30 +1,28 @@
package bisq.core.api;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.support.SupportType;
import bisq.core.support.dispute.Attachment;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.DisputeManager;
import bisq.core.support.dispute.DisputeResult;
import bisq.core.support.dispute.DisputeSummaryVerification;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.messages.ChatMessage;
import bisq.core.trade.Contract;
import bisq.core.trade.HavenoUtils;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.PubKeyRing;
import bisq.common.handlers.FaultHandler;
import bisq.common.handlers.ResultHandler;
package haveno.core.api;
import com.google.inject.name.Named;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.PubKeyRing;
import haveno.common.handlers.FaultHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.locale.Res;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferDirection;
import haveno.core.support.SupportType;
import haveno.core.support.dispute.Attachment;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.DisputeManager;
import haveno.core.support.dispute.DisputeResult;
import haveno.core.support.dispute.DisputeSummaryVerification;
import haveno.core.support.dispute.arbitration.ArbitrationManager;
import haveno.core.support.messages.ChatMessage;
import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import javax.inject.Inject;
import javax.inject.Singleton;

2
core/src/main/java/bisq/core/api/CoreHelpService.java → core/src/main/java/haveno/core/api/CoreHelpService.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import javax.inject.Inject;
import javax.inject.Singleton;

16
core/src/main/java/bisq/core/api/CoreMoneroConnectionsService.java → core/src/main/java/haveno/core/api/CoreMoneroConnectionsService.java
View file

@ -1,12 +1,12 @@
package bisq.core.api;
package haveno.core.api;
import bisq.common.app.DevEnv;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.config.Config;
import bisq.core.btc.model.EncryptedConnectionList;
import bisq.core.btc.setup.DownloadListener;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.trade.HavenoUtils;
import haveno.common.app.DevEnv;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.setup.DownloadListener;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.trade.HavenoUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;

15
core/src/main/java/bisq/core/api/CoreMoneroNodeService.java → core/src/main/java/haveno/core/api/CoreMoneroNodeService.java
View file

@ -14,15 +14,14 @@
* You should have received a copy of the GNU Affero General Public License
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
import bisq.core.trade.HavenoUtils;
import bisq.core.user.Preferences;
import bisq.core.xmr.MoneroNodeSettings;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.config.Config;
import bisq.common.util.Utilities;
package haveno.core.api;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import haveno.common.util.Utilities;
import haveno.core.trade.HavenoUtils;
import haveno.core.user.Preferences;
import haveno.core.xmr.MoneroNodeSettings;
import javax.inject.Inject;
import javax.inject.Singleton;

12
core/src/main/java/bisq/core/api/CoreNotificationService.java → core/src/main/java/haveno/core/api/CoreNotificationService.java
View file

@ -1,10 +1,10 @@
package bisq.core.api;
package haveno.core.api;
import bisq.core.api.model.TradeInfo;
import bisq.core.trade.Trade;
import bisq.core.support.messages.ChatMessage;
import bisq.proto.grpc.NotificationMessage;
import bisq.proto.grpc.NotificationMessage.NotificationType;
import haveno.proto.grpc.NotificationMessage;
import haveno.proto.grpc.NotificationMessage.NotificationType;
import haveno.core.api.model.TradeInfo;
import haveno.core.support.messages.ChatMessage;
import haveno.core.trade.Trade;
import javax.inject.Singleton;
import java.util.Iterator;

46
core/src/main/java/bisq/core/api/CoreOffersService.java → core/src/main/java/haveno/core/api/CoreOffersService.java
View file

@ -15,24 +15,24 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import bisq.core.monetary.Altcoin;
import bisq.core.monetary.Price;
import bisq.core.offer.CreateOfferService;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferBookService;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OfferFilterService;
import bisq.core.offer.OfferFilterService.Result;
import bisq.core.offer.OfferUtil;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.PaymentAccount;
import bisq.core.user.User;
import bisq.core.util.PriceUtil;
import bisq.common.crypto.KeyRing;
import bisq.common.handlers.ErrorMessageHandler;
import haveno.common.crypto.KeyRing;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.core.monetary.Altcoin;
import haveno.core.monetary.Price;
import haveno.core.offer.CreateOfferService;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferBookService;
import haveno.core.offer.OfferDirection;
import haveno.core.offer.OfferFilterService;
import haveno.core.offer.OfferUtil;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
import haveno.core.offer.OfferFilterService.Result;
import haveno.core.payment.PaymentAccount;
import haveno.core.user.User;
import haveno.core.util.PriceUtil;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.utils.Fiat;
@ -53,12 +53,12 @@ import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import static bisq.common.util.MathUtils.exactMultiply;
import static bisq.common.util.MathUtils.roundDoubleToLong;
import static bisq.common.util.MathUtils.scaleUpByPowerOf10;
import static bisq.core.locale.CurrencyUtil.isCryptoCurrency;
import static bisq.core.offer.OfferDirection.BUY;
import static bisq.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer;
import static haveno.common.util.MathUtils.exactMultiply;
import static haveno.common.util.MathUtils.roundDoubleToLong;
import static haveno.common.util.MathUtils.scaleUpByPowerOf10;
import static haveno.core.locale.CurrencyUtil.isCryptoCurrency;
import static haveno.core.offer.OfferDirection.BUY;
import static haveno.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer;
import static java.lang.String.format;
import static java.util.Comparator.comparing;

40
core/src/main/java/bisq/core/api/CorePaymentAccountsService.java → core/src/main/java/haveno/core/api/CorePaymentAccountsService.java
View file

@ -15,25 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.api.model.PaymentAccountForm;
import bisq.core.api.model.PaymentAccountFormField;
import bisq.core.locale.CryptoCurrency;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AssetAccount;
import bisq.core.payment.CryptoCurrencyAccount;
import bisq.core.payment.InstantCryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountFactory;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.user.User;
import bisq.asset.Asset;
import bisq.asset.AssetRegistry;
package haveno.core.api;
import haveno.asset.Asset;
import haveno.asset.AssetRegistry;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.api.model.PaymentAccountForm;
import haveno.core.api.model.PaymentAccountFormField;
import haveno.core.locale.CryptoCurrency;
import haveno.core.locale.CurrencyUtil;
import haveno.core.locale.TradeCurrency;
import haveno.core.payment.AssetAccount;
import haveno.core.payment.CryptoCurrencyAccount;
import haveno.core.payment.InstantCryptoCurrencyAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.PaymentAccountFactory;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.user.User;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -47,9 +45,9 @@ import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import static bisq.common.config.Config.baseCurrencyNetwork;
import static bisq.core.locale.CurrencyUtil.findAsset;
import static bisq.core.locale.CurrencyUtil.getCryptoCurrency;
import static haveno.common.config.Config.baseCurrencyNetwork;
import static haveno.core.locale.CurrencyUtil.findAsset;
import static haveno.core.locale.CurrencyUtil.getCryptoCurrency;
import static java.lang.String.format;
@Singleton

22
core/src/main/java/bisq/core/api/CorePriceService.java → core/src/main/java/haveno/core/api/CorePriceService.java
View file

@ -15,23 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
import bisq.core.api.model.MarketDepthInfo;
import bisq.core.api.model.MarketPriceInfo;
import bisq.core.locale.CurrencyUtil;
import bisq.core.monetary.Price;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferBookService;
import bisq.core.offer.OfferDirection;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.HavenoUtils;
package haveno.core.api;
import javax.inject.Inject;
import javax.inject.Singleton;
import com.google.common.math.LongMath;
import haveno.core.api.model.MarketDepthInfo;
import haveno.core.api.model.MarketPriceInfo;
import haveno.core.locale.CurrencyUtil;
import haveno.core.monetary.Price;
import haveno.core.offer.Offer;
import haveno.core.offer.OfferBookService;
import haveno.core.offer.OfferDirection;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.trade.HavenoUtils;
import java.util.List;
import java.util.Comparator;
import java.util.LinkedHashMap;

41
core/src/main/java/bisq/core/api/CoreTradesService.java → core/src/main/java/haveno/core/api/CoreTradesService.java
View file

@ -15,27 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.offer.takeoffer.TakeOfferModel;
import bisq.core.support.messages.ChatMessage;
import bisq.core.support.traderchat.TradeChatSession;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.ClosedTradableManager;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.TradeUtil;
import bisq.core.trade.protocol.BuyerProtocol;
import bisq.core.trade.protocol.SellerProtocol;
import bisq.core.user.User;
import bisq.core.util.validation.BtcAddressValidator;
import bisq.common.handlers.ErrorMessageHandler;
import bisq.common.handlers.ResultHandler;
import haveno.common.handlers.ErrorMessageHandler;
import haveno.common.handlers.ResultHandler;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.offer.Offer;
import haveno.core.offer.takeoffer.TakeOfferModel;
import haveno.core.support.messages.ChatMessage;
import haveno.core.support.traderchat.TradeChatSession;
import haveno.core.support.traderchat.TraderChatManager;
import haveno.core.trade.ClosedTradableManager;
import haveno.core.trade.Tradable;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.trade.TradeUtil;
import haveno.core.trade.protocol.BuyerProtocol;
import haveno.core.trade.protocol.SellerProtocol;
import haveno.core.user.User;
import haveno.core.util.validation.BtcAddressValidator;
import org.bitcoinj.core.Coin;
import javax.inject.Inject;
@ -47,7 +46,7 @@ import java.util.function.Consumer;
import lombok.extern.slf4j.Slf4j;
import static bisq.core.btc.model.AddressEntry.Context.TRADE_PAYOUT;
import static haveno.core.btc.model.AddressEntry.Context.TRADE_PAYOUT;
import static java.lang.String.format;
import java.math.BigInteger;

45
core/src/main/java/bisq/core/api/CoreWalletsService.java → core/src/main/java/haveno/core/api/CoreWalletsService.java
View file

@ -15,27 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
import bisq.core.api.model.AddressBalanceInfo;
import bisq.core.api.model.BalancesInfo;
import bisq.core.api.model.BtcBalanceInfo;
import bisq.core.api.model.XmrBalanceInfo;
import bisq.core.app.AppStartupState;
import bisq.core.btc.Balances;
import bisq.core.btc.exceptions.AddressEntryException;
import bisq.core.btc.exceptions.InsufficientFundsException;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;
import bisq.common.Timer;
import bisq.common.UserThread;
package haveno.core.api;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
@ -53,7 +33,24 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.util.concurrent.FutureCallback;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.core.api.model.AddressBalanceInfo;
import haveno.core.api.model.BalancesInfo;
import haveno.core.api.model.BtcBalanceInfo;
import haveno.core.api.model.XmrBalanceInfo;
import haveno.core.app.AppStartupState;
import haveno.core.btc.Balances;
import haveno.core.btc.exceptions.AddressEntryException;
import haveno.core.btc.exceptions.InsufficientFundsException;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import org.bouncycastle.crypto.params.KeyParameter;
import java.util.List;
@ -66,8 +63,8 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static bisq.core.btc.wallet.Restrictions.getMinNonDustOutput;
import static bisq.core.util.ParsingUtils.parseToCoin;
import static haveno.core.btc.wallet.Restrictions.getMinNonDustOutput;
import static haveno.core.util.ParsingUtils.parseToCoin;
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.SECONDS;

2
core/src/main/java/bisq/core/api/MoneroNodeServiceListener.java → core/src/main/java/haveno/core/api/MoneroNodeServiceListener.java
View file

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api;
package haveno.core.api;
import monero.daemon.MoneroDaemonRpc;

4
core/src/main/java/bisq/core/api/NotificationListener.java → core/src/main/java/haveno/core/api/NotificationListener.java
View file

@ -1,6 +1,6 @@
package bisq.core.api;
package haveno.core.api;
import bisq.proto.grpc.NotificationMessage;
import haveno.proto.grpc.NotificationMessage;
import lombok.NonNull;
/*

10
core/src/main/java/bisq/core/api/model/AddressBalanceInfo.java → core/src/main/java/haveno/core/api/model/AddressBalanceInfo.java
View file

@ -15,9 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
package haveno.core.api.model;
import bisq.common.Payload;
import haveno.common.Payload;
public class AddressBalanceInfo implements Payload {
@ -41,8 +41,8 @@ public class AddressBalanceInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.AddressBalanceInfo toProtoMessage() {
return bisq.proto.grpc.AddressBalanceInfo.newBuilder()
public haveno.proto.grpc.AddressBalanceInfo toProtoMessage() {
return haveno.proto.grpc.AddressBalanceInfo.newBuilder()
.setAddress(address)
.setBalance(balance)
.setNumConfirmations(numConfirmations)
@ -50,7 +50,7 @@ public class AddressBalanceInfo implements Payload {
.build();
}
public static AddressBalanceInfo fromProto(bisq.proto.grpc.AddressBalanceInfo proto) {
public static AddressBalanceInfo fromProto(haveno.proto.grpc.AddressBalanceInfo proto) {
return new AddressBalanceInfo(proto.getAddress(),
proto.getBalance(),
proto.getNumConfirmations(),

11
core/src/main/java/bisq/core/api/model/BalancesInfo.java → core/src/main/java/haveno/core/api/model/BalancesInfo.java
View file

@ -1,7 +1,6 @@
package bisq.core.api.model;
import bisq.common.Payload;
package haveno.core.api.model;
import haveno.common.Payload;
import lombok.Getter;
@Getter
@ -23,14 +22,14 @@ public class BalancesInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.BalancesInfo toProtoMessage() {
return bisq.proto.grpc.BalancesInfo.newBuilder()
public haveno.proto.grpc.BalancesInfo toProtoMessage() {
return haveno.proto.grpc.BalancesInfo.newBuilder()
.setBtc(btc.toProtoMessage())
.setXmr(xmr.toProtoMessage())
.build();
}
public static BalancesInfo fromProto(bisq.proto.grpc.BalancesInfo proto) {
public static BalancesInfo fromProto(haveno.proto.grpc.BalancesInfo proto) {
return new BalancesInfo(
BtcBalanceInfo.fromProto(proto.getBtc()),
XmrBalanceInfo.fromProto(proto.getXmr()));

12
core/src/main/java/bisq/core/api/model/BtcBalanceInfo.java → core/src/main/java/haveno/core/api/model/BtcBalanceInfo.java
View file

@ -1,9 +1,7 @@
package bisq.core.api.model;
import bisq.common.Payload;
package haveno.core.api.model;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.Payload;
import lombok.Getter;
@Getter
@ -47,8 +45,8 @@ public class BtcBalanceInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.BtcBalanceInfo toProtoMessage() {
return bisq.proto.grpc.BtcBalanceInfo.newBuilder()
public haveno.proto.grpc.BtcBalanceInfo toProtoMessage() {
return haveno.proto.grpc.BtcBalanceInfo.newBuilder()
.setAvailableBalance(availableBalance)
.setReservedBalance(reservedBalance)
.setTotalAvailableBalance(totalAvailableBalance)
@ -56,7 +54,7 @@ public class BtcBalanceInfo implements Payload {
.build();
}
public static BtcBalanceInfo fromProto(bisq.proto.grpc.BtcBalanceInfo proto) {
public static BtcBalanceInfo fromProto(haveno.proto.grpc.BtcBalanceInfo proto) {
return new BtcBalanceInfo(proto.getAvailableBalance(),
proto.getReservedBalance(),
proto.getTotalAvailableBalance(),

15
core/src/main/java/bisq/core/api/model/ContractInfo.java → core/src/main/java/haveno/core/api/model/ContractInfo.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
import bisq.common.Payload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.proto.CoreProtoResolver;
package haveno.core.api.model;
import haveno.common.Payload;
import haveno.core.payment.payload.PaymentAccountPayload;
import haveno.core.proto.CoreProtoResolver;
import java.util.function.Supplier;
import lombok.Getter;
@ -87,7 +86,7 @@ public class ContractInfo implements Payload {
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
public static ContractInfo fromProto(bisq.proto.grpc.ContractInfo proto) {
public static ContractInfo fromProto(haveno.proto.grpc.ContractInfo proto) {
CoreProtoResolver coreProtoResolver = new CoreProtoResolver();
return new ContractInfo(proto.getBuyerNodeAddress(),
proto.getSellerNodeAddress(),
@ -103,8 +102,8 @@ public class ContractInfo implements Payload {
}
@Override
public bisq.proto.grpc.ContractInfo toProtoMessage() {
bisq.proto.grpc.ContractInfo.Builder builder = bisq.proto.grpc.ContractInfo.newBuilder()
public haveno.proto.grpc.ContractInfo toProtoMessage() {
haveno.proto.grpc.ContractInfo.Builder builder = haveno.proto.grpc.ContractInfo.newBuilder()
.setBuyerNodeAddress(buyerNodeAddress)
.setSellerNodeAddress(sellerNodeAddress)
.setArbitratorNodeAddress(arbitratorNodeAddress)

6
core/src/main/java/bisq/core/api/model/EncryptedConnection.java → core/src/main/java/haveno/core/api/model/EncryptedConnection.java
View file

@ -1,9 +1,7 @@
package bisq.core.api.model;
import bisq.common.proto.persistable.PersistablePayload;
package haveno.core.api.model;
import com.google.protobuf.ByteString;
import haveno.common.proto.persistable.PersistablePayload;
import lombok.Builder;
import lombok.Value;

6
core/src/main/java/bisq/core/api/model/MarketDepthInfo.java → core/src/main/java/haveno/core/api/model/MarketDepthInfo.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
package haveno.core.api.model;
import java.util.Arrays;
@ -37,8 +37,8 @@ public class MarketDepthInfo {
///////////////////////////////////////////////////////////////////////////////////////////
// @Override
public bisq.proto.grpc.MarketDepthInfo toProtoMessage() {
return bisq.proto.grpc.MarketDepthInfo.newBuilder()
public haveno.proto.grpc.MarketDepthInfo toProtoMessage() {
return haveno.proto.grpc.MarketDepthInfo.newBuilder()
.setCurrencyCode(currencyCode)
.addAllBuyPrices(Arrays.asList(buyPrices))
.addAllBuyDepth(Arrays.asList((buyDepth)))

11
core/src/main/java/bisq/core/api/model/MarketPriceInfo.java → core/src/main/java/haveno/core/api/model/MarketPriceInfo.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
import bisq.common.Payload;
package haveno.core.api.model;
import haveno.common.Payload;
import lombok.AllArgsConstructor;
import lombok.ToString;
@ -34,14 +33,14 @@ public class MarketPriceInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.MarketPriceInfo toProtoMessage() {
return bisq.proto.grpc.MarketPriceInfo.newBuilder()
public haveno.proto.grpc.MarketPriceInfo toProtoMessage() {
return haveno.proto.grpc.MarketPriceInfo.newBuilder()
.setPrice(price)
.setCurrencyCode(currencyCode)
.build();
}
public static MarketPriceInfo fromProto(bisq.proto.grpc.MarketPriceInfo proto) {
public static MarketPriceInfo fromProto(haveno.proto.grpc.MarketPriceInfo proto) {
return new MarketPriceInfo(proto.getCurrencyCode(),
proto.getPrice());
}

28
core/src/main/java/bisq/core/api/model/OfferInfo.java → core/src/main/java/haveno/core/api/model/OfferInfo.java
View file

@ -15,23 +15,23 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
package haveno.core.api.model;
import bisq.core.api.model.builder.OfferInfoBuilder;
import bisq.core.monetary.Price;
import bisq.core.offer.Offer;
import bisq.core.offer.OpenOffer;
import bisq.common.Payload;
import bisq.common.proto.ProtoUtil;
import haveno.common.Payload;
import haveno.common.proto.ProtoUtil;
import haveno.core.api.model.builder.OfferInfoBuilder;
import haveno.core.monetary.Price;
import haveno.core.offer.Offer;
import haveno.core.offer.OpenOffer;
import java.util.Optional;
import javax.annotation.Nullable;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
import static bisq.common.util.MathUtils.exactMultiply;
import static bisq.core.util.PriceUtil.reformatMarketPrice;
import static bisq.core.util.VolumeUtil.formatVolume;
import static haveno.common.util.MathUtils.exactMultiply;
import static haveno.core.util.PriceUtil.reformatMarketPrice;
import static haveno.core.util.VolumeUtil.formatVolume;
import static java.util.Objects.requireNonNull;
@EqualsAndHashCode
@ -39,7 +39,7 @@ import static java.util.Objects.requireNonNull;
@Getter
public class OfferInfo implements Payload {
// The client cannot see bisq.core.Offer or its fromProto method. We use the lighter
// The client cannot see haveno.core.Offer or its fromProto method. We use the lighter
// weight OfferInfo proto wrapper instead, containing just enough fields to view,
// create and take offers.
@ -177,8 +177,8 @@ public class OfferInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.OfferInfo toProtoMessage() {
bisq.proto.grpc.OfferInfo.Builder builder = bisq.proto.grpc.OfferInfo.newBuilder()
public haveno.proto.grpc.OfferInfo toProtoMessage() {
haveno.proto.grpc.OfferInfo.Builder builder = haveno.proto.grpc.OfferInfo.newBuilder()
.setId(id)
.setDirection(direction)
.setPrice(price)
@ -212,7 +212,7 @@ public class OfferInfo implements Payload {
}
@SuppressWarnings("unused")
public static OfferInfo fromProto(bisq.proto.grpc.OfferInfo proto) {
public static OfferInfo fromProto(haveno.proto.grpc.OfferInfo proto) {
return new OfferInfoBuilder()
.withId(proto.getId())
.withDirection(proto.getDirection())

15
core/src/main/java/bisq/core/api/model/PaymentAccountForm.java → core/src/main/java/haveno/core/api/model/PaymentAccountForm.java
View file

@ -15,22 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
package haveno.core.api.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
import static java.lang.System.getProperty;
import static java.nio.charset.StandardCharsets.UTF_8;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountFactory;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.trade.HavenoUtils;
import com.google.common.annotations.VisibleForTesting;
import com.google.gson.Gson;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.PaymentAccountFactory;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.trade.HavenoUtils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;

10
core/src/main/java/bisq/core/api/model/PaymentAccountFormField.java → core/src/main/java/haveno/core/api/model/PaymentAccountFormField.java
View file

@ -15,12 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
package haveno.core.api.model;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.core.locale.Country;
import bisq.core.locale.TradeCurrency;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.core.locale.Country;
import haveno.core.locale.TradeCurrency;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

28
core/src/main/java/bisq/core/api/model/TradeInfo.java → core/src/main/java/haveno/core/api/model/TradeInfo.java
View file

@ -15,28 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model;
import bisq.core.api.model.builder.TradeInfoV1Builder;
import bisq.core.trade.Trade;
import bisq.core.trade.Contract;
import bisq.common.Payload;
package haveno.core.api.model;
import haveno.common.Payload;
import haveno.core.api.model.builder.TradeInfoV1Builder;
import haveno.core.trade.Contract;
import haveno.core.trade.Trade;
import java.util.function.Function;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import static bisq.core.api.model.OfferInfo.toOfferInfo;
import static bisq.core.util.PriceUtil.reformatMarketPrice;
import static bisq.core.util.VolumeUtil.formatVolume;
import static haveno.core.api.model.OfferInfo.toOfferInfo;
import static haveno.core.util.PriceUtil.reformatMarketPrice;
import static haveno.core.util.VolumeUtil.formatVolume;
import static java.util.Objects.requireNonNull;
@EqualsAndHashCode
@Getter
public class TradeInfo implements Payload {
// The client cannot see bisq.core.trade.Trade or its fromProto method. We use the
// The client cannot see haveno.core.trade.Trade or its fromProto method. We use the
// lighter weight TradeInfo proto wrapper instead, containing just enough fields to
// view and interact with trades.
@ -59,7 +57,7 @@ public class TradeInfo implements Payload {
reformatMarketPrice(requireNonNull(trade.getPrice()).toPlainString(),
trade.getOffer().getCurrencyCode());
// Bisq v1 trade protocol fields (some are in common with the BSQ Swap protocol).
// Haveno v1 trade protocol fields (some are in common with the BSQ Swap protocol).
private final OfferInfo offer;
private final String tradeId;
private final String shortId;
@ -192,8 +190,8 @@ public class TradeInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.TradeInfo toProtoMessage() {
return bisq.proto.grpc.TradeInfo.newBuilder()
public haveno.proto.grpc.TradeInfo toProtoMessage() {
return haveno.proto.grpc.TradeInfo.newBuilder()
.setOffer(offer.toProtoMessage())
.setTradeId(tradeId)
.setShortId(shortId)
@ -229,7 +227,7 @@ public class TradeInfo implements Payload {
.build();
}
public static TradeInfo fromProto(bisq.proto.grpc.TradeInfo proto) {
public static TradeInfo fromProto(haveno.proto.grpc.TradeInfo proto) {
return new TradeInfoV1Builder()
.withOffer(OfferInfo.fromProto(proto.getOffer()))
.withTradeId(proto.getTradeId())

12
core/src/main/java/bisq/core/api/model/XmrBalanceInfo.java → core/src/main/java/haveno/core/api/model/XmrBalanceInfo.java
View file

@ -1,9 +1,7 @@
package bisq.core.api.model;
import bisq.common.Payload;
package haveno.core.api.model;
import com.google.common.annotations.VisibleForTesting;
import haveno.common.Payload;
import lombok.Getter;
@Getter
@ -52,8 +50,8 @@ public class XmrBalanceInfo implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.XmrBalanceInfo toProtoMessage() {
return bisq.proto.grpc.XmrBalanceInfo.newBuilder()
public haveno.proto.grpc.XmrBalanceInfo toProtoMessage() {
return haveno.proto.grpc.XmrBalanceInfo.newBuilder()
.setBalance(balance)
.setAvailableBalance(availableBalance)
.setPendingBalance(pendingBalance)
@ -62,7 +60,7 @@ public class XmrBalanceInfo implements Payload {
.build();
}
public static XmrBalanceInfo fromProto(bisq.proto.grpc.XmrBalanceInfo proto) {
public static XmrBalanceInfo fromProto(haveno.proto.grpc.XmrBalanceInfo proto) {
return new XmrBalanceInfo(proto.getBalance(),
proto.getAvailableBalance(),
proto.getPendingBalance(),

10
core/src/main/java/bisq/core/api/model/XmrDestination.java → core/src/main/java/haveno/core/api/model/XmrDestination.java
View file

@ -1,6 +1,6 @@
package bisq.core.api.model;
package haveno.core.api.model;
import bisq.common.Payload;
import haveno.common.Payload;
import java.math.BigInteger;
import lombok.Getter;
import monero.wallet.model.MoneroDestination;
@ -28,14 +28,14 @@ public class XmrDestination implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.XmrDestination toProtoMessage() {
return bisq.proto.grpc.XmrDestination.newBuilder()
public haveno.proto.grpc.XmrDestination toProtoMessage() {
return haveno.proto.grpc.XmrDestination.newBuilder()
.setAddress(address)
.setAmount(amount.toString())
.build();
}
public static XmrDestination fromProto(bisq.proto.grpc.XmrDestination proto) {
public static XmrDestination fromProto(haveno.proto.grpc.XmrDestination proto) {
return new XmrDestinationBuilder()
.withAddress(proto.getAddress())
.withAmount(new BigInteger(proto.getAmount()))

10
core/src/main/java/bisq/core/api/model/XmrIncomingTransfer.java → core/src/main/java/haveno/core/api/model/XmrIncomingTransfer.java
View file

@ -1,6 +1,6 @@
package bisq.core.api.model;
package haveno.core.api.model;
import bisq.common.Payload;
import haveno.common.Payload;
import java.math.BigInteger;
import lombok.Getter;
import monero.wallet.model.MoneroIncomingTransfer;
@ -37,8 +37,8 @@ public class XmrIncomingTransfer implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.XmrIncomingTransfer toProtoMessage() {
return bisq.proto.grpc.XmrIncomingTransfer.newBuilder()
public haveno.proto.grpc.XmrIncomingTransfer toProtoMessage() {
return haveno.proto.grpc.XmrIncomingTransfer.newBuilder()
.setAmount(amount.toString())
.setAccountIndex(accountIndex)
.setSubaddressIndex(subaddressIndex)
@ -47,7 +47,7 @@ public class XmrIncomingTransfer implements Payload {
.build();
}
public static XmrIncomingTransfer fromProto(bisq.proto.grpc.XmrIncomingTransfer proto) {
public static XmrIncomingTransfer fromProto(haveno.proto.grpc.XmrIncomingTransfer proto) {
return new XmrIncomingTransferBuilder()
.withAmount(new BigInteger(proto.getAmount()))
.withAccountIndex(proto.getAccountIndex())

16
core/src/main/java/bisq/core/api/model/XmrOutgoingTransfer.java → core/src/main/java/haveno/core/api/model/XmrOutgoingTransfer.java
View file

@ -1,9 +1,9 @@
package bisq.core.api.model;
package haveno.core.api.model;
import static bisq.core.api.model.XmrDestination.toXmrDestination;
import static haveno.core.api.model.XmrDestination.toXmrDestination;
import bisq.common.Payload;
import bisq.common.proto.ProtoUtil;
import haveno.common.Payload;
import haveno.common.proto.ProtoUtil;
import java.math.BigInteger;
import java.util.List;
import java.util.Optional;
@ -47,16 +47,16 @@ public class XmrOutgoingTransfer implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.XmrOutgoingTransfer toProtoMessage() {
var builder = bisq.proto.grpc.XmrOutgoingTransfer.newBuilder()
public haveno.proto.grpc.XmrOutgoingTransfer toProtoMessage() {
var builder = haveno.proto.grpc.XmrOutgoingTransfer.newBuilder()
.setAmount(amount.toString())
.setAccountIndex(accountIndex);
Optional.ofNullable(subaddressIndices).ifPresent(e -> builder.addAllSubaddressIndices(subaddressIndices));
Optional.ofNullable(destinations).ifPresent(e -> builder.addAllDestinations(ProtoUtil.collectionToProto(destinations, bisq.proto.grpc.XmrDestination.class)));
Optional.ofNullable(destinations).ifPresent(e -> builder.addAllDestinations(ProtoUtil.collectionToProto(destinations, haveno.proto.grpc.XmrDestination.class)));
return builder.build();
}
public static XmrOutgoingTransfer fromProto(bisq.proto.grpc.XmrOutgoingTransfer proto) {
public static XmrOutgoingTransfer fromProto(haveno.proto.grpc.XmrOutgoingTransfer proto) {
List<XmrDestination> destinations = proto.getDestinationsList().isEmpty() ?
null : proto.getDestinationsList().stream()
.map(XmrDestination::fromProto).collect(Collectors.toList());

18
core/src/main/java/bisq/core/api/model/XmrTx.java → core/src/main/java/haveno/core/api/model/XmrTx.java
View file

@ -1,10 +1,10 @@
package bisq.core.api.model;
package haveno.core.api.model;
import static bisq.core.api.model.XmrIncomingTransfer.toXmrIncomingTransfer;
import static bisq.core.api.model.XmrOutgoingTransfer.toXmrOutgoingTransfer;
import static haveno.core.api.model.XmrIncomingTransfer.toXmrIncomingTransfer;
import static haveno.core.api.model.XmrOutgoingTransfer.toXmrOutgoingTransfer;
import bisq.common.Payload;
import bisq.common.proto.ProtoUtil;
import haveno.common.Payload;
import haveno.common.proto.ProtoUtil;
import java.math.BigInteger;
import java.util.List;
import java.util.Optional;
@ -69,8 +69,8 @@ public class XmrTx implements Payload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public bisq.proto.grpc.XmrTx toProtoMessage() {
bisq.proto.grpc.XmrTx.Builder builder = bisq.proto.grpc.XmrTx.newBuilder()
public haveno.proto.grpc.XmrTx toProtoMessage() {
haveno.proto.grpc.XmrTx.Builder builder = haveno.proto.grpc.XmrTx.newBuilder()
.setHash(hash)
.setFee(fee.toString())
.setIsConfirmed(isConfirmed)
@ -78,12 +78,12 @@ public class XmrTx implements Payload {
Optional.ofNullable(height).ifPresent(e -> builder.setHeight(height));
Optional.ofNullable(timestamp).ifPresent(e -> builder.setTimestamp(timestamp));
Optional.ofNullable(outgoingTransfer).ifPresent(e -> builder.setOutgoingTransfer(outgoingTransfer.toProtoMessage()));
Optional.ofNullable(incomingTransfers).ifPresent(e -> builder.addAllIncomingTransfers(ProtoUtil.collectionToProto(incomingTransfers, bisq.proto.grpc.XmrIncomingTransfer.class)));
Optional.ofNullable(incomingTransfers).ifPresent(e -> builder.addAllIncomingTransfers(ProtoUtil.collectionToProto(incomingTransfers, haveno.proto.grpc.XmrIncomingTransfer.class)));
Optional.ofNullable(metadata).ifPresent(e -> builder.setMetadata(metadata));
return builder.build();
}
public static XmrTx fromProto(bisq.proto.grpc.XmrTx proto) {
public static XmrTx fromProto(haveno.proto.grpc.XmrTx proto) {
return new XmrTxBuilder()
.withHash(proto.getHash())
.withFee(new BigInteger(proto.getFee()))

5
core/src/main/java/bisq/core/api/model/builder/OfferInfoBuilder.java → core/src/main/java/haveno/core/api/model/builder/OfferInfoBuilder.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model.builder;
import bisq.core.api.model.OfferInfo;
package haveno.core.api.model.builder;
import haveno.core.api.model.OfferInfo;
import lombok.Getter;
/*

9
core/src/main/java/bisq/core/api/model/builder/TradeInfoV1Builder.java → core/src/main/java/haveno/core/api/model/builder/TradeInfoV1Builder.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.api.model.builder;
import bisq.core.api.model.ContractInfo;
import bisq.core.api.model.OfferInfo;
import bisq.core.api.model.TradeInfo;
package haveno.core.api.model.builder;
import haveno.core.api.model.ContractInfo;
import haveno.core.api.model.OfferInfo;
import haveno.core.api.model.TradeInfo;
import lombok.Getter;
/**

10
core/src/main/java/bisq/core/app/AppStartupState.java → core/src/main/java/haveno/core/app/AppStartupState.java
View file

@ -15,12 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
package haveno.core.app;
import bisq.core.api.CoreMoneroConnectionsService;
import bisq.core.api.CoreNotificationService;
import bisq.network.p2p.BootstrapListener;
import bisq.network.p2p.P2PService;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.api.CoreNotificationService;
import haveno.network.p2p.BootstrapListener;
import haveno.network.p2p.P2PService;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ReadOnlyBooleanProperty;
import javafx.beans.property.SimpleBooleanProperty;

22
core/src/main/java/bisq/core/app/AvoidStandbyModeService.java → core/src/main/java/haveno/core/app/AvoidStandbyModeService.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.user.Preferences;
import bisq.common.config.Config;
import bisq.common.file.FileUtil;
import bisq.common.file.ResourceNotFoundException;
import bisq.common.util.Utilities;
package haveno.core.app;
import haveno.common.config.Config;
import haveno.common.file.FileUtil;
import haveno.common.file.ResourceNotFoundException;
import haveno.common.util.Utilities;
import haveno.core.user.Preferences;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -53,9 +51,9 @@ import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
/**
* Prevents that Bisq gets hibernated from the OS. On OSX there is a tool called caffeinate but it seems it does not
* Prevents that Haveno gets hibernated from the OS. On OSX there is a tool called caffeinate but it seems it does not
* provide the behaviour we need, thus we use the trick to play a almost silent sound file in a loop. This keeps the
* application active even if the OS has moved to hibernate. Hibernating Bisq would cause network degradations and other
* application active even if the OS has moved to hibernate. Hibernating Haveno would cause network degradations and other
* resource limitations which would lead to offers not published or if a taker takes an offer that the trade process is
* at risk to fail due too slow response time.
*/
@ -201,8 +199,8 @@ public class AvoidStandbyModeService {
String cmd = inhibitorPathSpec.get();
if (Utilities.isLinux()) {
params = cmd.contains("gnome-session-inhibit")
? new String[]{cmd, "--app-id", "Bisq", "--inhibit", "suspend", "--reason", "Avoid Standby", "--inhibit-only"}
: new String[]{cmd, "--who", "Bisq", "--what", "sleep", "--why", "Avoid Standby", "--mode", "block", "tail", "-f", "/dev/null"};
? new String[]{cmd, "--app-id", "Haveno", "--inhibit", "suspend", "--reason", "Avoid Standby", "--inhibit-only"}
: new String[]{cmd, "--who", "Haveno", "--what", "sleep", "--why", "Avoid Standby", "--mode", "block", "tail", "-f", "/dev/null"};
} else {
params = null;
}

2
core/src/main/java/bisq/core/app/ConsoleInput.java → core/src/main/java/haveno/core/app/ConsoleInput.java
View file

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
package haveno.core.app;
import java.util.concurrent.*;

2
core/src/main/java/bisq/core/app/ConsoleInputReadTask.java → core/src/main/java/haveno/core/app/ConsoleInputReadTask.java
View file

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
package haveno.core.app;
import java.io.*;
import java.util.concurrent.Callable;

56
core/src/main/java/bisq/core/app/CoreModule.java → core/src/main/java/haveno/core/app/CoreModule.java
View file

@ -15,41 +15,37 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.alert.AlertModule;
import bisq.core.btc.BitcoinModule;
import bisq.core.filter.FilterModule;
import bisq.core.network.CoreNetworkFilter;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.offer.OfferModule;
import bisq.core.presentation.CorePresentationModule;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
import bisq.core.trade.TradeModule;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.coin.ImmutableCoinFormatter;
import bisq.core.xmr.connection.MoneroConnectionModule;
import bisq.network.crypto.EncryptionServiceModule;
import bisq.network.p2p.P2PModule;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistenceProtoResolver;
package haveno.core.app;
import com.google.inject.Singleton;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistenceProtoResolver;
import haveno.core.alert.AlertModule;
import haveno.core.btc.BitcoinModule;
import haveno.core.filter.FilterModule;
import haveno.core.network.CoreNetworkFilter;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
import haveno.core.offer.OfferModule;
import haveno.core.presentation.CorePresentationModule;
import haveno.core.proto.network.CoreNetworkProtoResolver;
import haveno.core.proto.persistable.CorePersistenceProtoResolver;
import haveno.core.trade.TradeModule;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.core.util.coin.ImmutableCoinFormatter;
import haveno.core.xmr.connection.MoneroConnectionModule;
import haveno.network.crypto.EncryptionServiceModule;
import haveno.network.p2p.P2PModule;
import haveno.network.p2p.network.BridgeAddressProvider;
import haveno.network.p2p.network.NetworkFilter;
import haveno.network.p2p.seed.SeedNodeRepository;
import java.io.File;
import static bisq.common.config.Config.*;
import static com.google.inject.name.Names.named;
import static haveno.common.config.Config.*;
public class CoreModule extends AppModule {

75
core/src/main/java/bisq/core/app/DomainInitialisation.java → core/src/main/java/haveno/core/app/DomainInitialisation.java
View file

@ -15,46 +15,43 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.alert.PrivateNotificationPayload;
import bisq.core.btc.Balances;
import bisq.core.filter.FilterManager;
import bisq.core.notifications.MobileNotificationService;
import bisq.core.notifications.alerts.DisputeMsgEvents;
import bisq.core.notifications.alerts.MyOfferTakenEvents;
import bisq.core.notifications.alerts.TradeEvents;
import bisq.core.notifications.alerts.market.MarketAlerts;
import bisq.core.notifications.alerts.price.PriceAlert;
import bisq.core.offer.OpenOfferManager;
import bisq.core.offer.TriggerPriceService;
import bisq.core.payment.AmazonGiftCardAccount;
import bisq.core.payment.RevolutAccount;
import bisq.core.provider.mempool.MempoolService;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.mediation.mediator.MediatorManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
import bisq.core.support.traderchat.TraderChatManager;
import bisq.core.trade.ClosedTradableManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.trade.txproof.xmr.XmrTxProofService;
import bisq.core.user.User;
import bisq.network.p2p.P2PService;
import bisq.common.ClockWatcher;
import bisq.common.app.DevEnv;
import bisq.common.persistence.PersistenceManager;
package haveno.core.app;
import haveno.common.ClockWatcher;
import haveno.common.app.DevEnv;
import haveno.common.persistence.PersistenceManager;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.alert.PrivateNotificationPayload;
import haveno.core.btc.Balances;
import haveno.core.filter.FilterManager;
import haveno.core.notifications.MobileNotificationService;
import haveno.core.notifications.alerts.DisputeMsgEvents;
import haveno.core.notifications.alerts.MyOfferTakenEvents;
import haveno.core.notifications.alerts.TradeEvents;
import haveno.core.notifications.alerts.market.MarketAlerts;
import haveno.core.notifications.alerts.price.PriceAlert;
import haveno.core.offer.OpenOfferManager;
import haveno.core.offer.TriggerPriceService;
import haveno.core.payment.AmazonGiftCardAccount;
import haveno.core.payment.RevolutAccount;
import haveno.core.provider.mempool.MempoolService;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.support.dispute.arbitration.ArbitrationManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.support.dispute.mediation.MediationManager;
import haveno.core.support.dispute.mediation.mediator.MediatorManager;
import haveno.core.support.dispute.refund.RefundManager;
import haveno.core.support.dispute.refund.refundagent.RefundAgentManager;
import haveno.core.support.traderchat.TraderChatManager;
import haveno.core.trade.ClosedTradableManager;
import haveno.core.trade.TradeManager;
import haveno.core.trade.failed.FailedTradesManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.trade.txproof.xmr.XmrTxProofService;
import haveno.core.user.User;
import haveno.network.p2p.P2PService;
import javax.inject.Inject;
import javafx.collections.ListChangeListener;

64
core/src/main/java/bisq/core/app/HavenoExecutable.java → core/src/main/java/haveno/core/app/HavenoExecutable.java
View file

@ -15,42 +15,38 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.api.AccountServiceListener;
import bisq.core.api.CoreAccountService;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.offer.OpenOfferManager;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.setup.CorePersistedDataHost;
import bisq.core.setup.CoreSetup;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.core.trade.HavenoUtils;
import bisq.core.trade.TradeManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.trade.txproof.xmr.XmrTxProofService;
import bisq.network.p2p.P2PService;
import bisq.common.UserThread;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
import bisq.common.config.ConfigException;
import bisq.common.config.HavenoHelpFormatter;
import bisq.common.crypto.IncorrectPasswordException;
import bisq.common.handlers.ResultHandler;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
import bisq.common.setup.CommonSetup;
import bisq.common.setup.GracefulShutDownHandler;
import bisq.common.setup.UncaughtExceptionHandler;
import bisq.common.util.Utilities;
package haveno.core.app;
import com.google.inject.Guice;
import com.google.inject.Injector;
import haveno.common.UserThread;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.common.config.ConfigException;
import haveno.common.config.HavenoHelpFormatter;
import haveno.common.crypto.IncorrectPasswordException;
import haveno.common.handlers.ResultHandler;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.common.setup.CommonSetup;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.setup.UncaughtExceptionHandler;
import haveno.common.util.Utilities;
import haveno.core.api.AccountServiceListener;
import haveno.core.api.CoreAccountService;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOfferManager;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.setup.CorePersistedDataHost;
import haveno.core.setup.CoreSetup;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.TradeManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.core.trade.txproof.xmr.XmrTxProofService;
import haveno.network.p2p.P2PService;
import java.io.Console;
import java.util.Arrays;
@ -106,7 +102,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
System.exit(EXIT_FAILURE);
} catch (Throwable ex) {
System.err.println("fault: An unexpected error occurred. " +
"Please file a report at https://bisq.network/issues");
"Please file a report at https://haveno.network/issues");
ex.printStackTrace(System.err);
System.exit(EXIT_FAILURE);
}

57
core/src/main/java/bisq/core/app/HavenoHeadlessApp.java → core/src/main/java/haveno/core/app/HavenoHeadlessApp.java
View file

@ -15,17 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.trade.TradeManager;
import bisq.common.UserThread;
import bisq.common.app.Version;
import bisq.common.file.CorruptedStorageFileHandler;
import bisq.common.setup.GracefulShutDownHandler;
package haveno.core.app;
import com.google.inject.Injector;
import haveno.common.UserThread;
import haveno.common.app.Version;
import haveno.common.file.CorruptedStorageFileHandler;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.core.trade.TradeManager;
import java.util.concurrent.TimeUnit;
import lombok.Getter;
@ -44,7 +41,7 @@ public class HavenoHeadlessApp implements HeadlessApp {
@Setter
private GracefulShutDownHandler gracefulShutDownHandler;
private boolean shutDownRequested;
protected HavenoSetup bisqSetup;
protected HavenoSetup havenoSetup;
private CorruptedStorageFileHandler corruptedStorageFileHandler;
private TradeManager tradeManager;
@ -55,8 +52,8 @@ public class HavenoHeadlessApp implements HeadlessApp {
@Override
public void startApplication() {
try {
bisqSetup = injector.getInstance(HavenoSetup.class);
bisqSetup.addHavenoSetupListener(this);
havenoSetup = injector.getInstance(HavenoSetup.class);
havenoSetup.addHavenoSetupListener(this);
corruptedStorageFileHandler = injector.getInstance(CorruptedStorageFileHandler.class);
tradeManager = injector.getInstance(TradeManager.class);
@ -74,28 +71,28 @@ public class HavenoHeadlessApp implements HeadlessApp {
}
protected void setupHandlers() {
bisqSetup.setDisplayTacHandler(acceptedHandler -> {
havenoSetup.setDisplayTacHandler(acceptedHandler -> {
log.info("onDisplayTacHandler: We accept the tacs automatically in headless mode");
acceptedHandler.run();
});
bisqSetup.setDisplayTorNetworkSettingsHandler(show -> log.info("onDisplayTorNetworkSettingsHandler: show={}", show));
bisqSetup.setSpvFileCorruptedHandler(msg -> log.error("onSpvFileCorruptedHandler: msg={}", msg));
bisqSetup.setChainFileLockedExceptionHandler(msg -> log.error("onChainFileLockedExceptionHandler: msg={}", msg));
bisqSetup.setLockedUpFundsHandler(msg -> log.info("onLockedUpFundsHandler: msg={}", msg));
bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(() -> log.info("onShowFirstPopupIfResyncSPVRequestedHandler"));
bisqSetup.setDisplayUpdateHandler((alert, key) -> log.info("onDisplayUpdateHandler"));
bisqSetup.setDisplayAlertHandler(alert -> log.info("onDisplayAlertHandler. alert={}", alert));
bisqSetup.setDisplayPrivateNotificationHandler(privateNotification -> log.info("onDisplayPrivateNotificationHandler. privateNotification={}", privateNotification));
bisqSetup.setDisplaySecurityRecommendationHandler(key -> log.info("onDisplaySecurityRecommendationHandler"));
bisqSetup.setWrongOSArchitectureHandler(msg -> log.error("onWrongOSArchitectureHandler. msg={}", msg));
bisqSetup.setRejectedTxErrorMessageHandler(errorMessage -> log.warn("setRejectedTxErrorMessageHandler. errorMessage={}", errorMessage));
bisqSetup.setShowPopupIfInvalidBtcConfigHandler(() -> log.error("onShowPopupIfInvalidBtcConfigHandler"));
bisqSetup.setRevolutAccountsUpdateHandler(revolutAccountList -> log.info("setRevolutAccountsUpdateHandler: revolutAccountList={}", revolutAccountList));
bisqSetup.setOsxKeyLoggerWarningHandler(() -> log.info("setOsxKeyLoggerWarningHandler"));
bisqSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler"));
bisqSetup.setDownGradePreventionHandler(lastVersion -> log.info("Downgrade from version {} to version {} is not supported",
havenoSetup.setDisplayTorNetworkSettingsHandler(show -> log.info("onDisplayTorNetworkSettingsHandler: show={}", show));
havenoSetup.setSpvFileCorruptedHandler(msg -> log.error("onSpvFileCorruptedHandler: msg={}", msg));
havenoSetup.setChainFileLockedExceptionHandler(msg -> log.error("onChainFileLockedExceptionHandler: msg={}", msg));
havenoSetup.setLockedUpFundsHandler(msg -> log.info("onLockedUpFundsHandler: msg={}", msg));
havenoSetup.setShowFirstPopupIfResyncSPVRequestedHandler(() -> log.info("onShowFirstPopupIfResyncSPVRequestedHandler"));
havenoSetup.setDisplayUpdateHandler((alert, key) -> log.info("onDisplayUpdateHandler"));
havenoSetup.setDisplayAlertHandler(alert -> log.info("onDisplayAlertHandler. alert={}", alert));
havenoSetup.setDisplayPrivateNotificationHandler(privateNotification -> log.info("onDisplayPrivateNotificationHandler. privateNotification={}", privateNotification));
havenoSetup.setDisplaySecurityRecommendationHandler(key -> log.info("onDisplaySecurityRecommendationHandler"));
havenoSetup.setWrongOSArchitectureHandler(msg -> log.error("onWrongOSArchitectureHandler. msg={}", msg));
havenoSetup.setRejectedTxErrorMessageHandler(errorMessage -> log.warn("setRejectedTxErrorMessageHandler. errorMessage={}", errorMessage));
havenoSetup.setShowPopupIfInvalidBtcConfigHandler(() -> log.error("onShowPopupIfInvalidBtcConfigHandler"));
havenoSetup.setRevolutAccountsUpdateHandler(revolutAccountList -> log.info("setRevolutAccountsUpdateHandler: revolutAccountList={}", revolutAccountList));
havenoSetup.setOsxKeyLoggerWarningHandler(() -> log.info("setOsxKeyLoggerWarningHandler"));
havenoSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler"));
havenoSetup.setDownGradePreventionHandler(lastVersion -> log.info("Downgrade from version {} to version {} is not supported",
lastVersion, Version.VERSION));
bisqSetup.setTorAddressUpgradeHandler(() -> log.info("setTorAddressUpgradeHandler"));
havenoSetup.setTorAddressUpgradeHandler(() -> log.info("setTorAddressUpgradeHandler"));
corruptedStorageFileHandler.getFiles().ifPresent(files -> log.warn("getCorruptedDatabaseFiles. files={}", files));
tradeManager.setTakeOfferRequestErrorMessageHandler(errorMessage -> log.error("Error taking offer: " + errorMessage));
}

12
core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java → core/src/main/java/haveno/core/app/HavenoHeadlessAppMain.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.common.UserThread;
import bisq.common.app.AppModule;
import bisq.common.app.Version;
package haveno.core.app;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import haveno.common.UserThread;
import haveno.common.app.AppModule;
import haveno.common.app.Version;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
@ -33,7 +31,7 @@ public class HavenoHeadlessAppMain extends HavenoExecutable {
protected HeadlessApp headlessApp;
public HavenoHeadlessAppMain() {
super("Bisq Daemon", "bisqd", "Bisq", Version.VERSION);
super("Haveno Daemon", "havenod", "Haveno", Version.VERSION);
}
public static void main(String[] args) throws Exception {

106
core/src/main/java/bisq/core/app/HavenoSetup.java → core/src/main/java/haveno/core/app/HavenoSetup.java
View file

@ -15,56 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.account.sign.SignedWitness;
import bisq.core.account.sign.SignedWitnessStorageService;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.alert.Alert;
import bisq.core.alert.AlertManager;
import bisq.core.alert.PrivateNotificationManager;
import bisq.core.alert.PrivateNotificationPayload;
import bisq.core.api.CoreMoneroNodeService;
import bisq.core.btc.model.AddressEntry;
import bisq.core.btc.nodes.LocalBitcoinNode;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.btc.wallet.http.MemPoolSpaceTxBroadcaster;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOfferManager;
import bisq.core.payment.AmazonGiftCardAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.RevolutAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.arbitration.ArbitrationManager;
import bisq.core.support.dispute.mediation.MediationManager;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.TradeManager;
import bisq.core.trade.TradeTxException;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.CoinFormatter;
import bisq.network.Socks5ProxyProvider;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
import bisq.network.utils.Utils;
import bisq.common.Timer;
import bisq.common.UserThread;
import bisq.common.app.DevEnv;
import bisq.common.app.Log;
import bisq.common.app.Version;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.config.Config;
import bisq.common.file.FileUtil;
import bisq.common.util.InvalidVersionException;
import bisq.common.util.Utilities;
package haveno.core.app;
import org.bitcoinj.core.Coin;
@ -100,7 +51,52 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import ch.qos.logback.classic.Level;
import haveno.common.Timer;
import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.common.app.Log;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import haveno.common.file.FileUtil;
import haveno.common.util.InvalidVersionException;
import haveno.common.util.Utilities;
import haveno.core.account.sign.SignedWitness;
import haveno.core.account.sign.SignedWitnessStorageService;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.alert.Alert;
import haveno.core.alert.AlertManager;
import haveno.core.alert.PrivateNotificationManager;
import haveno.core.alert.PrivateNotificationPayload;
import haveno.core.api.CoreMoneroNodeService;
import haveno.core.btc.model.AddressEntry;
import haveno.core.btc.nodes.LocalBitcoinNode;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.btc.wallet.http.MemPoolSpaceTxBroadcaster;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.payment.AmazonGiftCardAccount;
import haveno.core.payment.PaymentAccount;
import haveno.core.payment.RevolutAccount;
import haveno.core.payment.payload.PaymentMethod;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.arbitration.ArbitrationManager;
import haveno.core.support.dispute.mediation.MediationManager;
import haveno.core.support.dispute.refund.RefundManager;
import haveno.core.trade.TradeManager;
import haveno.core.trade.TradeTxException;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.util.FormattingUtils;
import haveno.core.util.coin.CoinFormatter;
import haveno.network.Socks5ProxyProvider;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.storage.payload.PersistableNetworkPayload;
import haveno.network.utils.Utils;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@ -538,7 +534,7 @@ public class HavenoSetup {
}
@Nullable
public static String getLastBisqVersion() {
public static String getLastHavenoVersion() {
File versionFile = getVersionFile();
if (!versionFile.exists()) {
return null;
@ -585,7 +581,7 @@ public class HavenoSetup {
}
public static boolean hasDowngraded() {
return hasDowngraded(getLastBisqVersion());
return hasDowngraded(getLastHavenoVersion());
}
public static boolean hasDowngraded(String lastVersion) {
@ -593,7 +589,7 @@ public class HavenoSetup {
}
public static boolean hasDowngraded(@Nullable Consumer<String> downGradePreventionHandler) {
String lastVersion = getLastBisqVersion();
String lastVersion = getLastHavenoVersion();
boolean hasDowngraded = hasDowngraded(lastVersion);
if (hasDowngraded) {
log.error("Downgrade from version {} to version {} is not supported", lastVersion, Version.VERSION);
@ -651,7 +647,7 @@ public class HavenoSetup {
}
/**
* If Bisq is running on an OS that is virtualized under Qubes, show info popup with
* If Haveno is running on an OS that is virtualized under Qubes, show info popup with
* link to the Setup Guide. The guide documents what other steps are needed, in
* addition to installing the Linux package (qube sizing, etc)
*/

7
core/src/main/java/bisq/core/app/HeadlessApp.java → core/src/main/java/haveno/core/app/HeadlessApp.java
View file

@ -15,12 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.common.setup.GracefulShutDownHandler;
import bisq.common.setup.UncaughtExceptionHandler;
package haveno.core.app;
import com.google.inject.Injector;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.setup.UncaughtExceptionHandler;
public interface HeadlessApp extends UncaughtExceptionHandler, HavenoSetup.HavenoSetupListener {
void setGracefulShutDownHandler(GracefulShutDownHandler gracefulShutDownHandler);

24
core/src/main/java/bisq/core/app/P2PNetworkSetup.java → core/src/main/java/haveno/core/app/P2PNetworkSetup.java
View file

@ -15,20 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.common.UserThread;
import bisq.core.api.CoreMoneroConnectionsService;
import bisq.core.locale.Res;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.user.Preferences;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.P2PServiceListener;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
package haveno.core.app;
import haveno.common.UserThread;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.locale.Res;
import haveno.core.provider.price.PriceFeedService;
import haveno.core.user.Preferences;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.P2PServiceListener;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import javax.inject.Inject;
import javax.inject.Singleton;

13
core/src/main/java/bisq/core/app/TorSetup.java → core/src/main/java/haveno/core/app/TorSetup.java
View file

@ -15,11 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.common.config.Config;
import bisq.common.file.FileUtil;
import bisq.common.handlers.ErrorMessageHandler;
package haveno.core.app;
import javax.inject.Inject;
import javax.inject.Named;
@ -27,6 +23,11 @@ import javax.inject.Singleton;
import java.nio.file.Paths;
import static haveno.common.util.Preconditions.checkDir;
import haveno.common.config.Config;
import haveno.common.file.FileUtil;
import haveno.common.handlers.ErrorMessageHandler;
import java.io.File;
import java.io.IOException;
@ -34,8 +35,6 @@ import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
import static bisq.common.util.Preconditions.checkDir;
@Slf4j
@Singleton
public class TorSetup {

30
core/src/main/java/bisq/core/app/WalletAppSetup.java → core/src/main/java/haveno/core/app/WalletAppSetup.java
View file

@ -15,23 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app;
import bisq.core.api.CoreContext;
import bisq.core.api.CoreMoneroConnectionsService;
import bisq.core.btc.exceptions.InvalidHostException;
import bisq.core.btc.exceptions.RejectedTxException;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.TradeManager;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.common.UserThread;
import bisq.common.config.Config;
package haveno.core.app;
import haveno.common.UserThread;
import haveno.common.config.Config;
import haveno.core.api.CoreContext;
import haveno.core.api.CoreMoneroConnectionsService;
import haveno.core.btc.exceptions.InvalidHostException;
import haveno.core.btc.exceptions.RejectedTxException;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.WalletsManager;
import haveno.core.locale.Res;
import haveno.core.offer.OpenOfferManager;
import haveno.core.trade.TradeManager;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
import org.bitcoinj.core.RejectMessage;
import org.bitcoinj.core.VersionMessage;
import org.bitcoinj.store.BlockStoreException;

7
core/src/main/java/bisq/core/app/misc/AppSetup.java → core/src/main/java/haveno/core/app/misc/AppSetup.java
View file

@ -15,11 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app.misc;
import bisq.common.app.Version;
import bisq.common.config.Config;
package haveno.core.app.misc;
import haveno.common.app.Version;
import haveno.common.config.Config;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;

33
core/src/main/java/bisq/core/app/misc/AppSetupWithP2P.java → core/src/main/java/haveno/core/app/misc/AppSetupWithP2P.java
View file

@ -15,25 +15,22 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app.misc;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.filter.FilterManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.P2PServiceListener;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.ConnectionListener;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.core.app.misc;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.filter.FilterManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.P2PServiceListener;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.ConnectionListener;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.storage.P2PDataStorage;
import javax.inject.Inject;
import javafx.beans.property.BooleanProperty;

21
core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java → core/src/main/java/haveno/core/app/misc/AppSetupWithP2PAndDAO.java
View file

@ -15,19 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app.misc;
import bisq.core.account.sign.SignedWitnessService;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.filter.FilterManager;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.config.Config;
package haveno.core.app.misc;
import haveno.common.config.Config;
import haveno.core.account.sign.SignedWitnessService;
import haveno.core.account.witness.AccountAgeWitnessService;
import haveno.core.filter.FilterManager;
import haveno.core.trade.statistics.TradeStatisticsManager;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.storage.P2PDataStorage;
import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;

40
core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java → core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java
View file

@ -15,30 +15,26 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app.misc;
import bisq.core.app.HavenoExecutable;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.offer.OpenOfferManager;
import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.P2PService;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.UserThread;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.file.JsonFileManager;
import bisq.common.handlers.ResultHandler;
import bisq.common.persistence.PersistenceManager;
import bisq.common.setup.GracefulShutDownHandler;
import bisq.common.util.Profiler;
package haveno.core.app.misc;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import haveno.common.UserThread;
import haveno.common.app.DevEnv;
import haveno.common.config.Config;
import haveno.common.file.JsonFileManager;
import haveno.common.handlers.ResultHandler;
import haveno.common.persistence.PersistenceManager;
import haveno.common.setup.GracefulShutDownHandler;
import haveno.common.util.Profiler;
import haveno.core.app.HavenoExecutable;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.P2PService;
import haveno.network.p2p.seed.SeedNodeRepository;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;

57
core/src/main/java/bisq/core/app/misc/ModuleForAppWithP2p.java → core/src/main/java/haveno/core/app/misc/ModuleForAppWithP2p.java
View file

@ -15,41 +15,38 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.app.misc;
import bisq.core.alert.AlertModule;
import bisq.core.app.TorSetup;
import bisq.core.btc.BitcoinModule;
import bisq.core.filter.FilterModule;
import bisq.core.network.CoreNetworkFilter;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.offer.OfferModule;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
import bisq.core.trade.TradeModule;
import bisq.core.user.Preferences;
import bisq.core.user.User;
import bisq.core.xmr.connection.MoneroConnectionModule;
import bisq.network.crypto.EncryptionServiceModule;
import bisq.network.p2p.P2PModule;
import bisq.network.p2p.network.BridgeAddressProvider;
import bisq.network.p2p.network.NetworkFilter;
import bisq.network.p2p.seed.SeedNodeRepository;
import bisq.common.ClockWatcher;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
import bisq.common.crypto.KeyRing;
import bisq.common.crypto.KeyStorage;
import bisq.common.proto.network.NetworkProtoResolver;
import bisq.common.proto.persistable.PersistenceProtoResolver;
package haveno.core.app.misc;
import com.google.inject.Singleton;
import haveno.common.ClockWatcher;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.common.crypto.KeyRing;
import haveno.common.crypto.KeyStorage;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.common.proto.persistable.PersistenceProtoResolver;
import haveno.core.alert.AlertModule;
import haveno.core.app.TorSetup;
import haveno.core.btc.BitcoinModule;
import haveno.core.filter.FilterModule;
import haveno.core.network.CoreNetworkFilter;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
import haveno.core.offer.OfferModule;
import haveno.core.proto.network.CoreNetworkProtoResolver;
import haveno.core.proto.persistable.CorePersistenceProtoResolver;
import haveno.core.trade.TradeModule;
import haveno.core.user.Preferences;
import haveno.core.user.User;
import haveno.core.xmr.connection.MoneroConnectionModule;
import haveno.network.crypto.EncryptionServiceModule;
import haveno.network.p2p.P2PModule;
import haveno.network.p2p.network.BridgeAddressProvider;
import haveno.network.p2p.network.NetworkFilter;
import haveno.network.p2p.seed.SeedNodeRepository;
import java.io.File;
import static bisq.common.config.Config.*;
import static com.google.inject.name.Names.named;
import static haveno.common.config.Config.*;
public class ModuleForAppWithP2p extends AppModule {

26
core/src/main/java/bisq/core/btc/Balances.java → core/src/main/java/haveno/core/btc/Balances.java
View file

@ -15,20 +15,20 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package haveno.core.btc;
import bisq.core.btc.listeners.XmrBalanceListener;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.offer.OfferPayload;
import bisq.core.offer.OpenOffer;
import bisq.core.offer.OpenOfferManager;
import bisq.core.support.dispute.Dispute;
import bisq.core.support.dispute.refund.RefundManager;
import bisq.core.trade.ClosedTradableManager;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.trade.failed.FailedTradesManager;
import bisq.network.p2p.P2PService;
import haveno.core.btc.listeners.XmrBalanceListener;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.offer.OfferPayload;
import haveno.core.offer.OpenOffer;
import haveno.core.offer.OpenOfferManager;
import haveno.core.support.dispute.Dispute;
import haveno.core.support.dispute.refund.RefundManager;
import haveno.core.trade.ClosedTradableManager;
import haveno.core.trade.Trade;
import haveno.core.trade.TradeManager;
import haveno.core.trade.failed.FailedTradesManager;
import haveno.network.p2p.P2PService;
import java.math.BigInteger;
import java.util.List;
import java.util.stream.Collectors;

41
core/src/main/java/bisq/core/btc/BitcoinModule.java → core/src/main/java/haveno/core/btc/BitcoinModule.java
View file

@ -15,37 +15,34 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
import bisq.core.btc.model.AddressEntryList;
import bisq.core.btc.model.EncryptedConnectionList;
import bisq.core.btc.model.XmrAddressEntryList;
import bisq.core.btc.nodes.BtcNodes;
import bisq.core.btc.setup.RegTestHost;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.NonBsqCoinSelector;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.provider.ProvidersRepository;
import bisq.core.provider.fee.FeeProvider;
import bisq.core.provider.price.PriceFeedService;
import bisq.common.app.AppModule;
import bisq.common.config.Config;
package haveno.core.btc;
import com.google.inject.Singleton;
import com.google.inject.TypeLiteral;
import haveno.common.app.AppModule;
import haveno.common.config.Config;
import haveno.core.btc.model.AddressEntryList;
import haveno.core.btc.model.EncryptedConnectionList;
import haveno.core.btc.model.XmrAddressEntryList;
import haveno.core.btc.nodes.BtcNodes;
import haveno.core.btc.setup.RegTestHost;
import haveno.core.btc.setup.WalletsSetup;
import haveno.core.btc.wallet.BtcWalletService;
import haveno.core.btc.wallet.NonBsqCoinSelector;
import haveno.core.btc.wallet.TradeWalletService;
import haveno.core.btc.wallet.XmrWalletService;
import haveno.core.provider.ProvidersRepository;
import haveno.core.provider.fee.FeeProvider;
import haveno.core.provider.price.PriceFeedService;
import java.io.File;
import java.util.Arrays;
import java.util.List;
import static bisq.common.config.Config.PROVIDERS;
import static bisq.common.config.Config.WALLET_DIR;
import static bisq.common.config.Config.WALLET_RPC_BIND_PORT;
import static com.google.inject.name.Names.named;
import static haveno.common.config.Config.PROVIDERS;
import static haveno.common.config.Config.WALLET_DIR;
import static haveno.common.config.Config.WALLET_RPC_BIND_PORT;
public class BitcoinModule extends AppModule {

2
core/src/main/java/bisq/core/btc/exceptions/AddressEntryException.java → core/src/main/java/haveno/core/btc/exceptions/AddressEntryException.java
View file

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

2
core/src/main/java/bisq/core/btc/exceptions/InsufficientFundsException.java → core/src/main/java/haveno/core/btc/exceptions/InsufficientFundsException.java
View file

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

2
core/src/main/java/bisq/core/btc/exceptions/InvalidHostException.java → core/src/main/java/haveno/core/btc/exceptions/InvalidHostException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.exceptions;
package haveno.core.btc.exceptions;
public class InvalidHostException extends IllegalArgumentException {

2
core/src/main/java/bisq/core/btc/exceptions/RejectedTxException.java → core/src/main/java/haveno/core/btc/exceptions/RejectedTxException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.exceptions;
package haveno.core.btc.exceptions;
import org.bitcoinj.core.RejectMessage;

2
core/src/main/java/bisq/core/btc/exceptions/SigningException.java → core/src/main/java/haveno/core/btc/exceptions/SigningException.java
View file

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

2
core/src/main/java/bisq/core/btc/exceptions/TransactionVerificationException.java → core/src/main/java/haveno/core/btc/exceptions/TransactionVerificationException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.exceptions;
package haveno.core.btc.exceptions;
public class TransactionVerificationException extends Exception {
public TransactionVerificationException(Throwable t) {

2
core/src/main/java/bisq/core/btc/exceptions/TxBroadcastException.java → core/src/main/java/haveno/core/btc/exceptions/TxBroadcastException.java
View file

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

2
core/src/main/java/bisq/core/btc/exceptions/TxBroadcastTimeoutException.java → core/src/main/java/haveno/core/btc/exceptions/TxBroadcastTimeoutException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.exceptions;
package haveno.core.btc.exceptions;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.wallet.Wallet;

2
core/src/main/java/bisq/core/btc/exceptions/WalletException.java → core/src/main/java/haveno/core/btc/exceptions/WalletException.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.exceptions;
package haveno.core.btc.exceptions;
public class WalletException extends Exception {
public WalletException(Throwable t) {

2
core/src/main/java/bisq/core/btc/listeners/AddressConfidenceListener.java → core/src/main/java/haveno/core/btc/listeners/AddressConfidenceListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.listeners;
package haveno.core.btc.listeners;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.TransactionConfidence;

2
core/src/main/java/bisq/core/btc/listeners/BalanceListener.java → core/src/main/java/haveno/core/btc/listeners/BalanceListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.listeners;
package haveno.core.btc.listeners;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;

2
core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java → core/src/main/java/haveno/core/btc/listeners/TxConfidenceListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.listeners;
package haveno.core.btc.listeners;
import org.bitcoinj.core.TransactionConfidence;

2
core/src/main/java/bisq/core/btc/listeners/XmrBalanceListener.java → core/src/main/java/haveno/core/btc/listeners/XmrBalanceListener.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.listeners;
package haveno.core.btc.listeners;
import java.math.BigInteger;

12
core/src/main/java/bisq/core/btc/model/AddressEntry.java → core/src/main/java/haveno/core/btc/model/AddressEntry.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.model;
import bisq.common.config.Config;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.Utilities;
package haveno.core.btc.model;
import com.google.protobuf.ByteString;
import haveno.common.config.Config;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.util.Utilities;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.Coin;
import org.bitcoinj.crypto.DeterministicKey;

12
core/src/main/java/bisq/core/btc/model/AddressEntryList.java → core/src/main/java/haveno/core/btc/model/AddressEntryList.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.model;
import bisq.common.config.Config;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.core.btc.model;
import com.google.protobuf.Message;
import haveno.common.config.Config;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistableEnvelope;
import haveno.common.proto.persistable.PersistedDataHost;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.SegwitAddress;
import org.bitcoinj.core.Transaction;

18
core/src/main/java/bisq/core/btc/model/EncryptedConnectionList.java → core/src/main/java/haveno/core/btc/model/EncryptedConnectionList.java
View file

@ -1,15 +1,15 @@
package bisq.core.btc.model;
package haveno.core.btc.model;
import bisq.common.crypto.CryptoException;
import bisq.common.crypto.Encryption;
import bisq.common.crypto.ScryptUtil;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.proto.persistable.PersistedDataHost;
import bisq.core.api.CoreAccountService;
import bisq.core.api.model.EncryptedConnection;
import com.google.protobuf.ByteString;
import com.google.protobuf.Message;
import haveno.common.crypto.CryptoException;
import haveno.common.crypto.Encryption;
import haveno.common.crypto.ScryptUtil;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistableEnvelope;
import haveno.common.proto.persistable.PersistedDataHost;
import haveno.core.api.CoreAccountService;
import haveno.core.api.model.EncryptedConnection;
import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.util.HashMap;

2
core/src/main/java/bisq/core/btc/model/InputsAndChangeOutput.java → core/src/main/java/haveno/core/btc/model/InputsAndChangeOutput.java
View file

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

2
core/src/main/java/bisq/core/btc/model/PreparedDepositTxAndMakerInputs.java → core/src/main/java/haveno/core/btc/model/PreparedDepositTxAndMakerInputs.java
View file

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

10
core/src/main/java/bisq/core/btc/model/RawTransactionInput.java → core/src/main/java/haveno/core/btc/model/RawTransactionInput.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.model;
import bisq.common.proto.network.NetworkPayload;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.Utilities;
package haveno.core.btc.model;
import com.google.protobuf.ByteString;
import haveno.common.proto.network.NetworkPayload;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.util.Utilities;
import lombok.EqualsAndHashCode;
import javax.annotation.concurrent.Immutable;

10
core/src/main/java/bisq/core/btc/model/XmrAddressEntry.java → core/src/main/java/haveno/core/btc/model/XmrAddressEntry.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.model;
import bisq.common.proto.ProtoUtil;
import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.Utilities;
package haveno.core.btc.model;
import org.bitcoinj.core.Coin;
import haveno.common.proto.ProtoUtil;
import haveno.common.proto.persistable.PersistablePayload;
import haveno.common.util.Utilities;
import java.util.Optional;
import lombok.EqualsAndHashCode;

10
core/src/main/java/bisq/core/btc/model/XmrAddressEntryList.java → core/src/main/java/haveno/core/btc/model/XmrAddressEntryList.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.model;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.proto.persistable.PersistedDataHost;
package haveno.core.btc.model;
import com.google.protobuf.Message;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.persistable.PersistableEnvelope;
import haveno.common.proto.persistable.PersistedDataHost;
import com.google.inject.Inject;
import com.google.common.collect.ImmutableList;

16
core/src/main/java/bisq/core/btc/nodes/BtcNetworkConfig.java → core/src/main/java/haveno/core/btc/nodes/BtcNetworkConfig.java
View file

@ -15,20 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.setup.WalletConfig;
import bisq.network.Socks5MultiDiscovery;
import bisq.common.config.Config;
package haveno.core.btc.nodes;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.params.MainNetParams;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.common.config.Config;
import haveno.core.btc.setup.WalletConfig;
import haveno.network.Socks5MultiDiscovery;
import java.util.List;
import org.slf4j.Logger;
@ -63,7 +59,7 @@ public class BtcNetworkConfig {
MainNetParams mainNetParams = MainNetParams.get();
if (parameters.equals(mainNetParams)) {
log.warn("You use the public Bitcoin network and are exposed to privacy issues " +
"caused by the broken bloom filters. See https://bisq.network/blog/privacy-in-bitsquare/ " +
"caused by the broken bloom filters. See https://haveno.network/blog/privacy-in-bitsquare/ " +
"for more info. It is recommended to use the provided nodes.");
}
}
@ -71,7 +67,7 @@ public class BtcNetworkConfig {
delegate.setDiscovery(new Socks5MultiDiscovery(proxy, parameters, socks5DiscoverMode));
} else if (Config.baseCurrencyNetwork().isMainnet()) {
log.warn("You don't use tor and use the public Bitcoin network and are exposed to privacy issues " +
"caused by the broken bloom filters. See https://bisq.network/blog/privacy-in-bitsquare/ " +
"caused by the broken bloom filters. See https://haveno.network/blog/privacy-in-bitsquare/ " +
"for more info. It is recommended to use Tor and the provided nodes.");
}
}

11
core/src/main/java/bisq/core/btc/nodes/BtcNodeConverter.java → core/src/main/java/haveno/core/btc/nodes/BtcNodeConverter.java
View file

@ -15,18 +15,15 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.btc.nodes.BtcNodes.BtcNode;
import bisq.network.DnsLookupException;
import bisq.network.DnsLookupTor;
package haveno.core.btc.nodes;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.net.OnionCatConverter;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import haveno.core.btc.nodes.BtcNodes.BtcNode;
import haveno.network.DnsLookupException;
import haveno.network.DnsLookupTor;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;

10
core/src/main/java/bisq/core/btc/nodes/BtcNodes.java → core/src/main/java/haveno/core/btc/nodes/BtcNodes.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.common.config.Config;
package haveno.core.btc.nodes;
import java.util.ArrayList;
import java.util.Arrays;
@ -33,6 +31,8 @@ import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import haveno.common.config.Config;
// Managed here: https://github.com/bisq-network/roles/issues/39
@Slf4j
public class BtcNodes {
@ -68,8 +68,8 @@ public class BtcNodes {
new BtcNode("btc.ispol.sk", "mbm6ffx6j5ygi2ck.onion", "193.58.196.212", BtcNode.DEFAULT_PORT, "@KanoczTomas"),
// Devin Bileck
new BtcNode("btc1.bisq.services", "devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion", "172.105.21.216", BtcNode.DEFAULT_PORT, "@devinbileck"),
new BtcNode("btc2.bisq.services", "devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion", "173.255.240.205", BtcNode.DEFAULT_PORT, "@devinbileck"),
new BtcNode("btc1.haveno.services", "devinbtctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion", "172.105.21.216", BtcNode.DEFAULT_PORT, "@devinbileck"),
new BtcNode("btc2.haveno.services", "devinbtcyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion", "173.255.240.205", BtcNode.DEFAULT_PORT, "@devinbileck"),
new BtcNode(null, "devinbtcmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion", null, BtcNode.DEFAULT_PORT, "@devinbileck"),
// m52go

2
core/src/main/java/bisq/core/btc/nodes/BtcNodesRepository.java → core/src/main/java/haveno/core/btc/nodes/BtcNodesRepository.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
package haveno.core.btc.nodes;
import org.bitcoinj.core.PeerAddress;

10
core/src/main/java/bisq/core/btc/nodes/BtcNodesSetupPreferences.java → core/src/main/java/haveno/core/btc/nodes/BtcNodesSetupPreferences.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
import bisq.core.user.Preferences;
import bisq.common.config.Config;
import bisq.common.util.Utilities;
package haveno.core.btc.nodes;
import haveno.common.config.Config;
import haveno.common.util.Utilities;
import haveno.core.user.Preferences;
import java.util.Collections;
import java.util.List;
import java.util.Set;

14
core/src/main/java/bisq/core/btc/nodes/LocalBitcoinNode.java → core/src/main/java/haveno/core/btc/nodes/LocalBitcoinNode.java
View file

@ -1,7 +1,4 @@
package bisq.core.btc.nodes;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.config.Config;
package haveno.core.btc.nodes;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -9,7 +6,8 @@ import javax.inject.Singleton;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.config.Config;
import java.io.IOException;
import org.slf4j.Logger;
@ -18,7 +16,7 @@ import org.slf4j.LoggerFactory;
/**
* Detects whether a Bitcoin node is running on localhost and contains logic for when to
* ignore it. The query methods lazily trigger the needed checks and cache the results.
* @see bisq.common.config.Config#ignoreLocalBtcNode
* @see haveno.common.config.Config#ignoreLocalBtcNode
*/
@Singleton
public class LocalBitcoinNode {
@ -38,7 +36,7 @@ public class LocalBitcoinNode {
}
/**
* Returns whether Bisq should use a local Bitcoin node, meaning that a node was
* Returns whether Haveno should use a local Bitcoin node, meaning that a node was
* detected and conditions under which it should be ignored have not been met. If
* the local node should be ignored, a call to this method will not trigger an
* unnecessary detection attempt.
@ -48,7 +46,7 @@ public class LocalBitcoinNode {
}
/**
* Returns whether Bisq should ignore a local Bitcoin node even if it is usable.
* Returns whether Haveno should ignore a local Bitcoin node even if it is usable.
*/
public boolean shouldBeIgnored() {
BaseCurrencyNetwork baseCurrencyNetwork = config.baseCurrencyNetwork;

2
core/src/main/java/bisq/core/btc/nodes/ProxySocketFactory.java → core/src/main/java/haveno/core/btc/nodes/ProxySocketFactory.java
View file

@ -33,7 +33,7 @@
* PircBotX. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc.nodes;
package haveno.core.btc.nodes;
import javax.net.SocketFactory;

2
core/src/main/java/bisq/core/btc/nodes/SeedPeersSocks5Dns.java → core/src/main/java/haveno/core/btc/nodes/SeedPeersSocks5Dns.java
View file

@ -31,7 +31,7 @@
* limitations under the License.
*/
package bisq.core.btc.nodes;
package haveno.core.btc.nodes;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.net.discovery.PeerDiscovery;

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