diff --git a/apitest/scripts/trade-simulation-env.sh b/apitest/scripts/trade-simulation-env.sh index 3dbe93235d..4bcbf8b1da 100755 --- a/apitest/scripts/trade-simulation-env.sh +++ b/apitest/scripts/trade-simulation-env.sh @@ -226,14 +226,14 @@ checkseednoderunning() { checkarbnoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Arb" > /dev/null ; then + if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Arb" > /dev/null ; then printdate "The arbitration node is running on host." else printdate "Error: arbitration node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Arb/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Arb/ {print $1}' > /dev/null ; then printdate "The arbitration node is running on host." else printdate "Error: arbitration node is not running on host, exiting." @@ -247,14 +247,14 @@ checkarbnoderunning() { checkalicenoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then + if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then printdate "Alice's node is running on host." else printdate "Error: Alice's node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then printdate "Alice's node node is running on host." else printdate "Error: Alice's node is not running on host, exiting." @@ -268,14 +268,14 @@ checkalicenoderunning() { checkbobnoderunning() { if [[ "$LINUX" == "TRUE" ]]; then - if pgrep -f "bisq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then + if pgrep -f "bisq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice" > /dev/null ; then printdate "Bob's node is running on host." else printdate "Error: Bob's node is not running on host, exiting." apitestusage fi elif [[ "$DARWIN" == "TRUE" ]]; then - if ps -A | awk '/[b]isq.daemon.app.BisqDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then + if ps -A | awk '/[b]isq.daemon.app.HavenoDaemonMain --appName=bisq-XMR_STAGENET_Alice/ {print $1}' > /dev/null ; then printdate "Bob's node node is running on host." else printdate "Error: Bob's node is not running on host, exiting." diff --git a/apitest/src/main/java/bisq/apitest/Scaffold.java b/apitest/src/main/java/bisq/apitest/Scaffold.java index 57ebdc2c13..f0dc9f76ef 100644 --- a/apitest/src/main/java/bisq/apitest/Scaffold.java +++ b/apitest/src/main/java/bisq/apitest/Scaffold.java @@ -17,7 +17,7 @@ package bisq.apitest; -import bisq.common.config.BisqHelpFormatter; +import bisq.common.config.HavenoHelpFormatter; import bisq.common.util.Utilities; import java.nio.file.Files; @@ -44,7 +44,7 @@ import javax.annotation.Nullable; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; import static bisq.apitest.config.ApiTestConfig.MEDIATOR; import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT; -import static bisq.apitest.config.BisqAppConfig.*; +import static bisq.apitest.config.HavenoAppConfig.*; import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static java.lang.String.format; import static java.lang.System.exit; @@ -57,9 +57,9 @@ import static java.util.concurrent.TimeUnit.SECONDS; import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.config.BisqAppConfig; +import bisq.apitest.config.HavenoAppConfig; import bisq.apitest.linux.BashCommand; -import bisq.apitest.linux.BisqProcess; +import bisq.apitest.linux.HavenoProcess; import bisq.apitest.linux.BitcoinDaemon; import bisq.apitest.linux.LinuxProcess; import bisq.cli.GrpcClient; @@ -129,7 +129,7 @@ public class Scaffold { this.executor = Executors.newFixedThreadPool(config.supportingApps.size()); if (config.helpRequested) { config.printHelp(out, - new BisqHelpFormatter( + new HavenoHelpFormatter( "Bisq ApiTest", "bisq-apitest", "0.1.0")); @@ -289,12 +289,12 @@ public class Scaffold { startBisqApp(bobdesktop, executor, countdownLatch); } - private void startBisqApp(BisqAppConfig bisqAppConfig, + private void startBisqApp(HavenoAppConfig bisqAppConfig, ExecutorService executor, CountDownLatch countdownLatch) throws IOException, InterruptedException { - BisqProcess bisqProcess = createBisqProcess(bisqAppConfig); + HavenoProcess bisqProcess = createBisqProcess(bisqAppConfig); switch (bisqAppConfig) { case seednode: seedNodeTask = new SetupTask(bisqProcess, countdownLatch); @@ -326,9 +326,9 @@ public class Scaffold { } } - private BisqProcess createBisqProcess(BisqAppConfig bisqAppConfig) + private HavenoProcess createBisqProcess(HavenoAppConfig bisqAppConfig) throws IOException, InterruptedException { - BisqProcess bisqProcess = new BisqProcess(bisqAppConfig, config); + HavenoProcess bisqProcess = new HavenoProcess(bisqAppConfig, config); bisqProcess.verifyAppNotRunning(); bisqProcess.verifyAppDataDirInstalled(); return bisqProcess; diff --git a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java b/apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java similarity index 91% rename from apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java rename to apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java index b92f87d70c..544876f463 100644 --- a/apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java +++ b/apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java @@ -19,17 +19,17 @@ package bisq.apitest.config; import bisq.seednode.SeedNodeMain; -import bisq.desktop.app.BisqAppMain; +import bisq.desktop.app.HavenoAppMain; -import bisq.daemon.app.BisqDaemonMain; +import bisq.daemon.app.HavenoDaemonMain; /** Some non user configurable Bisq seednode, arb node, bob and alice daemon option values. @see dev-setup.md */ -public enum BisqAppConfig { +public enum HavenoAppConfig { seednode("bisq-XMR_STAGENET_Seed_2002", "bisq-seednode", @@ -42,7 +42,7 @@ public enum BisqAppConfig { arbdaemon("bisq-XMR_STAGENET_Arb", "bisq-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqDaemonMain.class.getName(), + HavenoDaemonMain.class.getName(), 4444, 5121, 9997, @@ -50,7 +50,7 @@ public enum BisqAppConfig { arbdesktop("bisq-XMR_STAGENET_Arb", "bisq-desktop", "-XX:MaxRAM=3g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqAppMain.class.getName(), + HavenoAppMain.class.getName(), 4444, 5121, -1, @@ -58,7 +58,7 @@ public enum BisqAppConfig { alicedaemon("bisq-XMR_STAGENET_Alice", "bisq-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqDaemonMain.class.getName(), + HavenoDaemonMain.class.getName(), 7777, 5122, 9998, @@ -66,7 +66,7 @@ public enum BisqAppConfig { alicedesktop("bisq-XMR_STAGENET_Alice", "bisq-desktop", "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqAppMain.class.getName(), + HavenoAppMain.class.getName(), 7777, 5122, -1, @@ -74,7 +74,7 @@ public enum BisqAppConfig { bobdaemon("bisq-XMR_STAGENET_Bob", "bisq-daemon", "-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqDaemonMain.class.getName(), + HavenoDaemonMain.class.getName(), 8888, 5123, 9999, @@ -82,7 +82,7 @@ public enum BisqAppConfig { bobdesktop("bisq-XMR_STAGENET_Bob", "bisq-desktop", "-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml", - BisqAppMain.class.getName(), + HavenoAppMain.class.getName(), 8888, 5123, -1, @@ -98,7 +98,7 @@ public enum BisqAppConfig { public final int apiPort; public final int remoteDebugPort; - BisqAppConfig(String appName, + HavenoAppConfig(String appName, String startupScript, String javaOpts, String mainClassName, diff --git a/apitest/src/main/java/bisq/apitest/linux/BisqProcess.java b/apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java similarity index 96% rename from apitest/src/main/java/bisq/apitest/linux/BisqProcess.java rename to apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java index 203a63205a..111114cc8a 100644 --- a/apitest/src/main/java/bisq/apitest/linux/BisqProcess.java +++ b/apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java @@ -34,16 +34,16 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS; import bisq.apitest.config.ApiTestConfig; -import bisq.apitest.config.BisqAppConfig; -import bisq.daemon.app.BisqDaemonMain; +import bisq.apitest.config.HavenoAppConfig; +import bisq.daemon.app.HavenoDaemonMain; /** * Runs a regtest/dao Bisq application instance in the background. */ @Slf4j -public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess { +public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess { - private final BisqAppConfig bisqAppConfig; + private final HavenoAppConfig bisqAppConfig; private final String baseCurrencyNetwork; private final String genesisTxId; private final int genesisBlockHeight; @@ -53,7 +53,7 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess { private final String findBisqPidScript; private final String debugOpts; - public BisqProcess(BisqAppConfig bisqAppConfig, ApiTestConfig config) { + public HavenoProcess(HavenoAppConfig bisqAppConfig, ApiTestConfig config) { super(bisqAppConfig.appName, config); this.bisqAppConfig = bisqAppConfig; this.baseCurrencyNetwork = "XMR_STAGENET"; @@ -235,7 +235,7 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess { case bobdesktop: add("--genesisBlockHeight=" + genesisBlockHeight); add("--genesisTxId=" + genesisTxId); - if (bisqAppConfig.mainClassName.equals(BisqDaemonMain.class.getName())) { + if (bisqAppConfig.mainClassName.equals(HavenoDaemonMain.class.getName())) { add("--apiPassword=" + config.apiPassword); add("--apiPort=" + bisqAppConfig.apiPort); } diff --git a/apitest/src/test/java/bisq/apitest/ApiTestCase.java b/apitest/src/test/java/bisq/apitest/ApiTestCase.java index 9e14c3dea9..4cfe530af4 100644 --- a/apitest/src/test/java/bisq/apitest/ApiTestCase.java +++ b/apitest/src/test/java/bisq/apitest/ApiTestCase.java @@ -29,9 +29,9 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.TestInfo; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.bobdaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.bobdaemon; import static bisq.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod; import static bisq.proto.grpc.GetVersionGrpc.getGetVersionMethod; import static java.net.InetAddress.getLoopbackAddress; diff --git a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java b/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java index f7a076a9f9..83e71898db 100644 --- a/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java +++ b/apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java @@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java b/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java index 4e426be660..d2a1305be6 100644 --- a/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java +++ b/apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static bisq.cli.Method.createoffer; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java b/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java index 6b84b6ccd7..3c218c26c0 100644 --- a/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java +++ b/apitest/src/test/java/bisq/apitest/method/GetVersionTest.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static bisq.common.app.Version.VERSION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java b/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java index b5011ffced..c817745bb1 100644 --- a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java +++ b/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java @@ -32,8 +32,8 @@ import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; import static bisq.apitest.config.ApiTestConfig.ARBITRATOR; import static bisq.apitest.config.ApiTestConfig.MEDIATOR; import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java b/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java index 3ee143b954..5b967462ab 100644 --- a/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java +++ b/apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java @@ -32,10 +32,10 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.bobdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.bobdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static bisq.common.util.MathUtils.roundDouble; import static bisq.common.util.MathUtils.scaleDownByPowerOf10; import static bisq.core.locale.CurrencyUtil.isCryptoCurrency; diff --git a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java index 3caef6ee39..98a5b18bfd 100644 --- a/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java +++ b/apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java @@ -70,7 +70,7 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static bisq.cli.TableFormat.formatPaymentAcctTbl; import static bisq.core.locale.CurrencyUtil.*; import static bisq.core.payment.payload.PaymentMethod.*; diff --git a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java index 6b0aae999b..f73175e0fd 100644 --- a/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java +++ b/apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java index 3d23196406..d74dff5de4 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static java.lang.String.format; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java index 19d065c6cc..635ead3b85 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java @@ -14,9 +14,9 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.bobdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.bobdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static bisq.apitest.method.wallet.WalletTestUtil.INITIAL_BTC_BALANCES; import static bisq.apitest.method.wallet.WalletTestUtil.verifyBtcBalances; import static bisq.cli.TableFormat.formatAddressBalanceTbl; diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java index 30de7f585b..3934d52816 100644 --- a/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java +++ b/apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java index c3eb41343a..8711e7a43e 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java b/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java index fd18763880..d58b2947c3 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java @@ -29,10 +29,10 @@ import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.condition.EnabledIf; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.bobdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.bobdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.startShutdownTimer; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java b/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java index 8aa9367511..1009e83fad 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/StartupTest.java @@ -30,9 +30,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; import static bisq.common.file.FileUtil.deleteFileIfExists; import static org.junit.jupiter.api.Assertions.fail; diff --git a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java b/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java index 9540a04bd0..c06d8e68ce 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java +++ b/apitest/src/test/java/bisq/apitest/scenario/WalletTest.java @@ -28,10 +28,10 @@ import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.TestMethodOrder; import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind; -import static bisq.apitest.config.BisqAppConfig.alicedaemon; -import static bisq.apitest.config.BisqAppConfig.arbdaemon; -import static bisq.apitest.config.BisqAppConfig.bobdaemon; -import static bisq.apitest.config.BisqAppConfig.seednode; +import static bisq.apitest.config.HavenoAppConfig.alicedaemon; +import static bisq.apitest.config.HavenoAppConfig.arbdaemon; +import static bisq.apitest.config.HavenoAppConfig.bobdaemon; +import static bisq.apitest.config.HavenoAppConfig.seednode; diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java b/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java index ccd1a2ebf1..52533963d3 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java +++ b/apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java @@ -17,10 +17,10 @@ package bisq.apitest.scenario.bot; -import bisq.common.BisqException; +import bisq.common.HavenoException; @SuppressWarnings("unused") -public class InvalidRandomOfferException extends BisqException { +public class InvalidRandomOfferException extends HavenoException { public InvalidRandomOfferException(Throwable cause) { super(cause); } diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java b/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java index 8578a38af7..b3fb403f94 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java +++ b/apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java @@ -17,10 +17,10 @@ package bisq.apitest.scenario.bot; -import bisq.common.BisqException; +import bisq.common.HavenoException; @SuppressWarnings("unused") -public class PaymentAccountNotFoundException extends BisqException { +public class PaymentAccountNotFoundException extends HavenoException { public PaymentAccountNotFoundException(Throwable cause) { super(cause); } diff --git a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java b/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java index 8a0e68bad1..1a146fda60 100644 --- a/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java +++ b/apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java @@ -17,10 +17,10 @@ package bisq.apitest.scenario.bot.shutdown; -import bisq.common.BisqException; +import bisq.common.HavenoException; @SuppressWarnings("unused") -public class ManualBotShutdownException extends BisqException { +public class ManualBotShutdownException extends HavenoException { public ManualBotShutdownException(Throwable cause) { super(cause); } diff --git a/build.gradle b/build.gradle index 147abfd0da..d26cd5ad34 100644 --- a/build.gradle +++ b/build.gradle @@ -401,7 +401,7 @@ configure(project(':desktop')) { "Implementation-Title": project.name, "Implementation-Version": version) - mainClassName = 'bisq.desktop.app.BisqAppMain' + mainClassName = 'bisq.desktop.app.HavenoAppMain' tasks.withType(AbstractArchiveTask) { preserveFileTimestamps = false @@ -580,7 +580,7 @@ configure(project(':statsnode')) { } configure(project(':daemon')) { - mainClassName = 'bisq.daemon.app.BisqDaemonMain' + mainClassName = 'bisq.daemon.app.HavenoDaemonMain' dependencies { compile project(':core') diff --git a/common/src/main/java/bisq/common/BisqException.java b/common/src/main/java/bisq/common/HavenoException.java similarity index 77% rename from common/src/main/java/bisq/common/BisqException.java rename to common/src/main/java/bisq/common/HavenoException.java index 4953f308d6..21b6f51693 100644 --- a/common/src/main/java/bisq/common/BisqException.java +++ b/common/src/main/java/bisq/common/HavenoException.java @@ -17,17 +17,17 @@ package bisq.common; -public class BisqException extends RuntimeException { +public class HavenoException extends RuntimeException { - public BisqException(Throwable cause) { + public HavenoException(Throwable cause) { super(cause); } - public BisqException(String format, Object... args) { + public HavenoException(String format, Object... args) { super(String.format(format, args)); } - public BisqException(Throwable cause, String format, Object... args) { + public HavenoException(Throwable cause, String format, Object... args) { super(String.format(format, args), cause); } } diff --git a/common/src/main/java/bisq/common/config/ConfigException.java b/common/src/main/java/bisq/common/config/ConfigException.java index 0d709dcf53..ee2d57abd6 100644 --- a/common/src/main/java/bisq/common/config/ConfigException.java +++ b/common/src/main/java/bisq/common/config/ConfigException.java @@ -1,8 +1,8 @@ package bisq.common.config; -import bisq.common.BisqException; +import bisq.common.HavenoException; -public class ConfigException extends BisqException { +public class ConfigException extends HavenoException { public ConfigException(String format, Object... args) { super(format, args); diff --git a/common/src/main/java/bisq/common/config/BisqHelpFormatter.java b/common/src/main/java/bisq/common/config/HavenoHelpFormatter.java similarity index 97% rename from common/src/main/java/bisq/common/config/BisqHelpFormatter.java rename to common/src/main/java/bisq/common/config/HavenoHelpFormatter.java index acc2285982..8362d7152c 100644 --- a/common/src/main/java/bisq/common/config/BisqHelpFormatter.java +++ b/common/src/main/java/bisq/common/config/HavenoHelpFormatter.java @@ -25,13 +25,13 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -public class BisqHelpFormatter implements HelpFormatter { +public class HavenoHelpFormatter implements HelpFormatter { private final String fullName; private final String scriptName; private final String version; - public BisqHelpFormatter(String fullName, String scriptName, String version) { + public HavenoHelpFormatter(String fullName, String scriptName, String version) { this.fullName = fullName; this.scriptName = scriptName; this.version = version; diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/HavenoExecutable.java similarity index 95% rename from core/src/main/java/bisq/core/app/BisqExecutable.java rename to core/src/main/java/bisq/core/app/HavenoExecutable.java index 07e21905b6..3aab2d146d 100644 --- a/core/src/main/java/bisq/core/app/BisqExecutable.java +++ b/core/src/main/java/bisq/core/app/HavenoExecutable.java @@ -32,7 +32,7 @@ import bisq.network.p2p.P2PService; import bisq.common.UserThread; import bisq.common.app.AppModule; -import bisq.common.config.BisqHelpFormatter; +import bisq.common.config.HavenoHelpFormatter; import bisq.common.config.Config; import bisq.common.config.ConfigException; import bisq.common.handlers.ResultHandler; @@ -54,7 +54,7 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; @Slf4j -public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSetup.BisqSetupListener, UncaughtExceptionHandler { +public abstract class HavenoExecutable implements GracefulShutDownHandler, HavenoSetup.BisqSetupListener, UncaughtExceptionHandler { public static final int EXIT_SUCCESS = 0; public static final int EXIT_FAILURE = 1; @@ -70,7 +70,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet private boolean isShutdownInProgress; private boolean hasDowngraded; - public BisqExecutable(String fullName, String scriptName, String appName, String version) { + public HavenoExecutable(String fullName, String scriptName, String appName, String version) { this.fullName = fullName; this.scriptName = scriptName; this.appName = appName; @@ -81,7 +81,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet try { config = new Config(appName, Utilities.getUserDataDir(), args); if (config.helpRequested) { - config.printHelp(System.out, new BisqHelpFormatter(fullName, scriptName, version)); + config.printHelp(System.out, new HavenoHelpFormatter(fullName, scriptName, version)); System.exit(EXIT_SUCCESS); } } catch (ConfigException ex) { @@ -136,7 +136,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet setupGuice(); setupAvoidStandbyMode(); - hasDowngraded = BisqSetup.hasDowngraded(); + hasDowngraded = HavenoSetup.hasDowngraded(); if (hasDowngraded) { // If user tried to downgrade we do not read the persisted data to avoid data corruption // We call startApplication to enable UI to show popup. We prevent in BisqSetup to go further @@ -198,7 +198,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet } protected void runBisqSetup() { - BisqSetup bisqSetup = injector.getInstance(BisqSetup.class); + HavenoSetup bisqSetup = injector.getInstance(HavenoSetup.class); bisqSetup.addBisqSetupListener(this); bisqSetup.start(); } diff --git a/core/src/main/java/bisq/core/app/BisqHeadlessApp.java b/core/src/main/java/bisq/core/app/HavenoHeadlessApp.java similarity index 96% rename from core/src/main/java/bisq/core/app/BisqHeadlessApp.java rename to core/src/main/java/bisq/core/app/HavenoHeadlessApp.java index 1eb0552755..61b1b5565d 100644 --- a/core/src/main/java/bisq/core/app/BisqHeadlessApp.java +++ b/core/src/main/java/bisq/core/app/HavenoHeadlessApp.java @@ -33,7 +33,7 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BisqHeadlessApp implements HeadlessApp { +public class HavenoHeadlessApp implements HeadlessApp { @Getter private static Runnable shutDownHandler; @@ -42,17 +42,17 @@ public class BisqHeadlessApp implements HeadlessApp { @Setter private GracefulShutDownHandler gracefulShutDownHandler; private boolean shutDownRequested; - protected BisqSetup bisqSetup; + protected HavenoSetup bisqSetup; private CorruptedStorageFileHandler corruptedStorageFileHandler; private TradeManager tradeManager; - public BisqHeadlessApp() { + public HavenoHeadlessApp() { shutDownHandler = this::stop; } public void startApplication() { try { - bisqSetup = injector.getInstance(BisqSetup.class); + bisqSetup = injector.getInstance(HavenoSetup.class); bisqSetup.addBisqSetupListener(this); corruptedStorageFileHandler = injector.getInstance(CorruptedStorageFileHandler.class); diff --git a/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java b/core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java similarity index 92% rename from core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java rename to core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java index 6a867d875b..bd471a3025 100644 --- a/core/src/main/java/bisq/core/app/BisqHeadlessAppMain.java +++ b/core/src/main/java/bisq/core/app/HavenoHeadlessAppMain.java @@ -29,10 +29,10 @@ import java.util.concurrent.ThreadFactory; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BisqHeadlessAppMain extends BisqExecutable { +public class HavenoHeadlessAppMain extends HavenoExecutable { protected HeadlessApp headlessApp; - public BisqHeadlessAppMain() { + public HavenoHeadlessAppMain() { super("Bisq Daemon", "bisqd", "Bisq", Version.VERSION); } @@ -41,9 +41,9 @@ public class BisqHeadlessAppMain extends BisqExecutable { // context class loader: reset it. In order to work around a bug in JavaFX 8u25 // and below, you must include the following code as the first line of your // realMain method: - Thread.currentThread().setContextClassLoader(BisqHeadlessAppMain.class.getClassLoader()); + Thread.currentThread().setContextClassLoader(HavenoHeadlessAppMain.class.getClassLoader()); - new BisqHeadlessAppMain().execute(args); + new HavenoHeadlessAppMain().execute(args); } @Override @@ -68,7 +68,7 @@ public class BisqHeadlessAppMain extends BisqExecutable { @Override protected void launchApplication() { - headlessApp = new BisqHeadlessApp(); + headlessApp = new HavenoHeadlessApp(); UserThread.execute(this::onApplicationLaunched); } diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/HavenoSetup.java similarity index 99% rename from core/src/main/java/bisq/core/app/BisqSetup.java rename to core/src/main/java/bisq/core/app/HavenoSetup.java index 15b1500f89..67d7f2b4d9 100644 --- a/core/src/main/java/bisq/core/app/BisqSetup.java +++ b/core/src/main/java/bisq/core/app/HavenoSetup.java @@ -100,7 +100,7 @@ import javax.annotation.Nullable; @Slf4j @Singleton -public class BisqSetup { +public class HavenoSetup { private static final String VERSION_FILE_NAME = "version"; private static final String RESYNC_SPV_FILE_NAME = "resyncSpv"; @@ -198,7 +198,7 @@ public class BisqSetup { private final List bisqSetupListeners = new ArrayList<>(); @Inject - public BisqSetup(DomainInitialisation domainInitialisation, + public HavenoSetup(DomainInitialisation domainInitialisation, P2PNetworkSetup p2PNetworkSetup, WalletAppSetup walletAppSetup, WalletsManager walletsManager, diff --git a/core/src/main/java/bisq/core/app/HeadlessApp.java b/core/src/main/java/bisq/core/app/HeadlessApp.java index 3808b89b1a..9601a25043 100644 --- a/core/src/main/java/bisq/core/app/HeadlessApp.java +++ b/core/src/main/java/bisq/core/app/HeadlessApp.java @@ -22,7 +22,7 @@ import bisq.common.setup.UncaughtExceptionHandler; import com.google.inject.Injector; -public interface HeadlessApp extends UncaughtExceptionHandler, BisqSetup.BisqSetupListener { +public interface HeadlessApp extends UncaughtExceptionHandler, HavenoSetup.BisqSetupListener { void setGracefulShutDownHandler(GracefulShutDownHandler gracefulShutDownHandler); void setInjector(Injector injector); diff --git a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java b/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java index 33482a5090..b7e95d654e 100644 --- a/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java +++ b/core/src/main/java/bisq/core/app/misc/ExecutableForAppWithP2p.java @@ -17,7 +17,7 @@ package bisq.core.app.misc; -import bisq.core.app.BisqExecutable; +import bisq.core.app.HavenoExecutable; import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; import bisq.core.btc.wallet.XmrWalletService; @@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; @Slf4j -public abstract class ExecutableForAppWithP2p extends BisqExecutable { +public abstract class ExecutableForAppWithP2p extends HavenoExecutable { private static final long CHECK_MEMORY_PERIOD_SEC = 300; private static final long CHECK_SHUTDOWN_SEC = TimeUnit.HOURS.toSeconds(1); private static final long SHUTDOWN_INTERVAL = TimeUnit.HOURS.toMillis(24); @@ -93,7 +93,7 @@ public abstract class ExecutableForAppWithP2p extends BisqExecutable { PersistenceManager.flushAllDataToDiskAtShutdown(() -> { resultHandler.handleResult(); log.info("Graceful shutdown completed. Exiting now."); - UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_SUCCESS), 1); + UserThread.runAfter(() -> System.exit(HavenoExecutable.EXIT_SUCCESS), 1); }); }); injector.getInstance(WalletsSetup.class).shutDown(); @@ -105,13 +105,13 @@ public abstract class ExecutableForAppWithP2p extends BisqExecutable { PersistenceManager.flushAllDataToDiskAtShutdown(() -> { resultHandler.handleResult(); log.info("Graceful shutdown caused a timeout. Exiting now."); - UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_SUCCESS), 1); + UserThread.runAfter(() -> System.exit(HavenoExecutable.EXIT_SUCCESS), 1); }); }, 5); } else { UserThread.runAfter(() -> { resultHandler.handleResult(); - System.exit(BisqExecutable.EXIT_SUCCESS); + System.exit(HavenoExecutable.EXIT_SUCCESS); }, 1); } } catch (Throwable t) { @@ -120,7 +120,7 @@ public abstract class ExecutableForAppWithP2p extends BisqExecutable { PersistenceManager.flushAllDataToDiskAtShutdown(() -> { resultHandler.handleResult(); log.info("Graceful shutdown resulted in an error. Exiting now."); - UserThread.runAfter(() -> System.exit(BisqExecutable.EXIT_FAILURE), 1); + UserThread.runAfter(() -> System.exit(HavenoExecutable.EXIT_FAILURE), 1); }); } diff --git a/core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java b/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java similarity index 95% rename from core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java rename to core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java index e274752d94..8570801588 100644 --- a/core/src/main/java/bisq/core/btc/setup/BisqKeyChainFactory.java +++ b/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainFactory.java @@ -41,14 +41,14 @@ import com.google.common.collect.ImmutableList; * 1) Run pre bitcoinj 0.15 btc and copy their seed words on a piece of paper. * 2) Run post bitcoinj 0.15 btc and use recover from seed. * */ -public class BisqKeyChainFactory extends DefaultKeyChainFactory { +public class HavenoKeyChainFactory extends DefaultKeyChainFactory { @Override public DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed, KeyCrypter crypter, boolean isMarried, Script.ScriptType outputScriptType, ImmutableList accountPath) { ImmutableList maybeUpdatedAccountPath = accountPath; if (DeterministicKeyChain.ACCOUNT_ZERO_PATH.equals(accountPath)) { // This is a bitcoinj 0.14 wallet that has no account path in the serialized mnemonic - KeyChainGroupStructure structure = new BisqKeyChainGroupStructure(); + KeyChainGroupStructure structure = new HavenoKeyChainGroupStructure(); maybeUpdatedAccountPath = structure.accountPathFor(outputScriptType); } diff --git a/core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroupStructure.java b/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java similarity index 96% rename from core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroupStructure.java rename to core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java index 304b6130e6..7e04734ec5 100644 --- a/core/src/main/java/bisq/core/btc/setup/BisqKeyChainGroupStructure.java +++ b/core/src/main/java/bisq/core/btc/setup/HavenoKeyChainGroupStructure.java @@ -23,7 +23,7 @@ import org.bitcoinj.wallet.KeyChainGroupStructure; import com.google.common.collect.ImmutableList; -public class BisqKeyChainGroupStructure implements KeyChainGroupStructure { +public class HavenoKeyChainGroupStructure implements KeyChainGroupStructure { // See https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki // https://github.com/satoshilabs/slips/blob/master/slip-0044.md diff --git a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java index 02a5eb48d2..08b3bff3bb 100644 --- a/core/src/main/java/bisq/core/btc/setup/WalletConfig.java +++ b/core/src/main/java/bisq/core/btc/setup/WalletConfig.java @@ -19,7 +19,7 @@ package bisq.core.btc.setup; import bisq.core.btc.nodes.LocalBitcoinNode; import bisq.core.btc.nodes.ProxySocketFactory; -import bisq.core.btc.wallet.BisqRiskAnalysis; +import bisq.core.btc.wallet.HavenoRiskAnalysis; import bisq.common.config.Config; import bisq.common.file.FileUtil; @@ -398,7 +398,7 @@ public class WalletConfig extends AbstractIdleService { boolean shouldReplayWallet = (vBtcWalletFile.exists() && !chainFileExists) || restoreFromSeed != null; vBtcWallet = createOrLoadWallet(shouldReplayWallet, vBtcWalletFile); vBtcWallet.allowSpendingUnconfirmedTransactions(); - vBtcWallet.setRiskAnalyzer(new BisqRiskAnalysis.Analyzer()); + vBtcWallet.setRiskAnalyzer(new HavenoRiskAnalysis.Analyzer()); // Initiate Bitcoin network objects (block store, blockchain and peer group) vStore = new SPVBlockStore(params, chainFile); @@ -519,7 +519,7 @@ public class WalletConfig extends AbstractIdleService { final WalletProtobufSerializer serializer; serializer = new WalletProtobufSerializer(); // Hack to convert bitcoinj 0.14 wallets to bitcoinj 0.15 format - serializer.setKeyChainFactory(new BisqKeyChainFactory()); + serializer.setKeyChainFactory(new HavenoKeyChainFactory()); wallet = serializer.readWallet(params, extArray, proto); if (shouldReplayWallet) wallet.reset(); @@ -530,7 +530,7 @@ public class WalletConfig extends AbstractIdleService { protected Wallet createWallet() { Script.ScriptType preferredOutputScriptType = Script.ScriptType.P2WPKH; - KeyChainGroupStructure structure = new BisqKeyChainGroupStructure(); + KeyChainGroupStructure structure = new HavenoKeyChainGroupStructure(); KeyChainGroup.Builder kcgBuilder = KeyChainGroup.builder(params, structure); if (restoreFromSeed != null) { kcgBuilder.fromSeed(restoreFromSeed, preferredOutputScriptType); @@ -655,7 +655,7 @@ public class WalletConfig extends AbstractIdleService { } public void maybeAddSegwitKeychain(Wallet wallet, KeyParameter aesKey) { - if (BisqKeyChainGroupStructure.BIP44_BTC_NON_SEGWIT_ACCOUNT_PATH.equals(wallet.getActiveKeyChain().getAccountPath())) { + if (HavenoKeyChainGroupStructure.BIP44_BTC_NON_SEGWIT_ACCOUNT_PATH.equals(wallet.getActiveKeyChain().getAccountPath())) { if (wallet.isEncrypted() && aesKey == null) { // wait for the aesKey to be set and this method to be invoked again. return; @@ -677,7 +677,7 @@ public class WalletConfig extends AbstractIdleService { } DeterministicKeyChain nativeSegwitKeyChain = DeterministicKeyChain.builder().seed(seed) .outputScriptType(Script.ScriptType.P2WPKH) - .accountPath(new BisqKeyChainGroupStructure().accountPathFor(Script.ScriptType.P2WPKH)).build(); + .accountPath(new HavenoKeyChainGroupStructure().accountPathFor(Script.ScriptType.P2WPKH)).build(); if (aesKey != null) { // If wallet is encrypted, encrypt the new keychain. KeyCrypter keyCrypter = wallet.getKeyCrypter(); diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java b/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java index 91b0c84c57..7e61dd3be6 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java +++ b/core/src/main/java/bisq/core/btc/wallet/BtcCoinSelector.java @@ -31,7 +31,7 @@ import lombok.extern.slf4j.Slf4j; * We lookup for spendable outputs which matches any of our addresses. */ @Slf4j -class BtcCoinSelector extends BisqDefaultCoinSelector { +class BtcCoinSelector extends HavenoDefaultCoinSelector { private final Set
addresses; private final long ignoreDustThreshold; diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java b/core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java similarity index 97% rename from core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java rename to core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java index c540cc5112..e673df6a90 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java +++ b/core/src/main/java/bisq/core/btc/wallet/HavenoDefaultCoinSelector.java @@ -48,7 +48,7 @@ import javax.annotation.Nullable; * "spending" more priority than would be required to get the transaction we are creating confirmed. */ @Slf4j -public abstract class BisqDefaultCoinSelector implements CoinSelector { +public abstract class HavenoDefaultCoinSelector implements CoinSelector { protected final boolean permitForeignPendingTx; @@ -62,11 +62,11 @@ public abstract class BisqDefaultCoinSelector implements CoinSelector { return select(target, new ArrayList<>(candidates)); } - public BisqDefaultCoinSelector(boolean permitForeignPendingTx) { + public HavenoDefaultCoinSelector(boolean permitForeignPendingTx) { this.permitForeignPendingTx = permitForeignPendingTx; } - public BisqDefaultCoinSelector() { + public HavenoDefaultCoinSelector() { permitForeignPendingTx = false; } diff --git a/core/src/main/java/bisq/core/btc/wallet/BisqRiskAnalysis.java b/core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java similarity index 96% rename from core/src/main/java/bisq/core/btc/wallet/BisqRiskAnalysis.java rename to core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java index 8b665c67c9..8e6ba24098 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BisqRiskAnalysis.java +++ b/core/src/main/java/bisq/core/btc/wallet/HavenoRiskAnalysis.java @@ -72,8 +72,8 @@ import static com.google.common.base.Preconditions.checkState; * whether a tx/dependency violates the dust rules. Outside of specialised protocols you should not encounter non-final * transactions.

*/ -public class BisqRiskAnalysis implements RiskAnalysis { - private static final Logger log = LoggerFactory.getLogger(BisqRiskAnalysis.class); +public class HavenoRiskAnalysis implements RiskAnalysis { + private static final Logger log = LoggerFactory.getLogger(HavenoRiskAnalysis.class); /** * Any standard output smaller than this value (in satoshis) will be considered risky, as it's most likely be @@ -91,7 +91,7 @@ public class BisqRiskAnalysis implements RiskAnalysis { protected Transaction nonFinal; protected boolean analyzed; - private BisqRiskAnalysis(Wallet wallet, Transaction tx, List dependencies) { + private HavenoRiskAnalysis(Wallet wallet, Transaction tx, List dependencies) { this.tx = tx; this.dependencies = dependencies; this.wallet = wallet; @@ -289,8 +289,8 @@ public class BisqRiskAnalysis implements RiskAnalysis { public static class Analyzer implements RiskAnalysis.Analyzer { @Override - public BisqRiskAnalysis create(Wallet wallet, Transaction tx, List dependencies) { - return new BisqRiskAnalysis(wallet, tx, dependencies); + public HavenoRiskAnalysis create(Wallet wallet, Transaction tx, List dependencies) { + return new HavenoRiskAnalysis(wallet, tx, dependencies); } } diff --git a/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java b/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java index 3f2a195046..0e05602121 100644 --- a/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java +++ b/core/src/main/java/bisq/core/btc/wallet/NonBsqCoinSelector.java @@ -33,7 +33,7 @@ import lombok.extern.slf4j.Slf4j; * We lookup for spendable outputs which matches our address of our address. */ @Slf4j -public class NonBsqCoinSelector extends BisqDefaultCoinSelector { +public class NonBsqCoinSelector extends HavenoDefaultCoinSelector { @Setter private Preferences preferences; diff --git a/core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java b/core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java similarity index 96% rename from core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java rename to core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java index 7ac9777bc2..b047925570 100644 --- a/core/src/test/java/bisq/core/app/BisqHelpFormatterTest.java +++ b/core/src/test/java/bisq/core/app/HavenoHelpFormatterTest.java @@ -17,7 +17,7 @@ package bisq.core.app; -import bisq.common.config.BisqHelpFormatter; +import bisq.common.config.HavenoHelpFormatter; import joptsimple.OptionParser; @@ -36,14 +36,14 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -public class BisqHelpFormatterTest { +public class HavenoHelpFormatterTest { @Test public void testHelpFormatter() throws IOException, URISyntaxException { OptionParser parser = new OptionParser(); - parser.formatHelpWith(new BisqHelpFormatter("Bisq Test", "bisq-test", "0.1.0")); + parser.formatHelpWith(new HavenoHelpFormatter("Bisq Test", "bisq-test", "0.1.0")); parser.accepts("name", "The name of the Bisq node") diff --git a/daemon/src/main/java/bisq/daemon/app/BisqDaemon.java b/daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java similarity index 88% rename from daemon/src/main/java/bisq/daemon/app/BisqDaemon.java rename to daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java index f813f84d3e..2a9efcfab4 100644 --- a/daemon/src/main/java/bisq/daemon/app/BisqDaemon.java +++ b/daemon/src/main/java/bisq/daemon/app/HavenoDaemon.java @@ -17,7 +17,7 @@ package bisq.daemon.app; -import bisq.core.app.BisqHeadlessApp; +import bisq.core.app.HavenoHeadlessApp; -public class BisqDaemon extends BisqHeadlessApp { +public class HavenoDaemon extends HavenoHeadlessApp { } diff --git a/daemon/src/main/java/bisq/daemon/app/BisqDaemonMain.java b/daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java similarity index 92% rename from daemon/src/main/java/bisq/daemon/app/BisqDaemonMain.java rename to daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java index a3bd88e1a0..f0e212802d 100644 --- a/daemon/src/main/java/bisq/daemon/app/BisqDaemonMain.java +++ b/daemon/src/main/java/bisq/daemon/app/HavenoDaemonMain.java @@ -17,8 +17,8 @@ package bisq.daemon.app; -import bisq.core.app.BisqHeadlessAppMain; -import bisq.core.app.BisqSetup; +import bisq.core.app.HavenoHeadlessAppMain; +import bisq.core.app.HavenoSetup; import bisq.core.app.CoreModule; import bisq.common.UserThread; @@ -37,12 +37,12 @@ import lombok.extern.slf4j.Slf4j; import bisq.daemon.grpc.GrpcServer; @Slf4j -public class BisqDaemonMain extends BisqHeadlessAppMain implements BisqSetup.BisqSetupListener { +public class HavenoDaemonMain extends HavenoHeadlessAppMain implements HavenoSetup.BisqSetupListener { private GrpcServer grpcServer; public static void main(String[] args) { - new BisqDaemonMain().execute(args); + new HavenoDaemonMain().execute(args); } ///////////////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ public class BisqDaemonMain extends BisqHeadlessAppMain implements BisqSetup.Bis @Override protected void launchApplication() { - headlessApp = new BisqDaemon(); + headlessApp = new HavenoDaemon(); UserThread.execute(this::onApplicationLaunched); } diff --git a/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java b/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java index f7bf00de7e..f9dcd6d912 100644 --- a/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java +++ b/daemon/src/main/java/bisq/daemon/grpc/GrpcShutdownService.java @@ -17,7 +17,7 @@ package bisq.daemon.grpc; -import bisq.core.app.BisqHeadlessApp; +import bisq.core.app.HavenoHeadlessApp; import bisq.common.UserThread; @@ -51,7 +51,7 @@ class GrpcShutdownService extends ShutdownServerGrpc.ShutdownServerImplBase { var reply = StopReply.newBuilder().build(); responseObserver.onNext(reply); responseObserver.onCompleted(); - UserThread.runAfter(BisqHeadlessApp.getShutDownHandler(), 500, MILLISECONDS); + UserThread.runAfter(HavenoHeadlessApp.getShutDownHandler(), 500, MILLISECONDS); } catch (Throwable cause) { exceptionHandler.handleException(log, cause, responseObserver); } diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index eeab2e6c6b..812e41def3 100644 --- a/desktop/package/package.gradle +++ b/desktop/package/package.gradle @@ -28,7 +28,7 @@ task jpackageSanityChecks { // TODO Evtl check programmatically in gradle (i.e. fail if below v11) executeCmd("java --version") - ant.input(message: "Above you see the installed java version, which will be used to compile and build Bisq.\n" + + ant.input(message: "Above you see the installed java version, which will be used to compile and build Haveno.\n" + "Is this java version ok for that? (y=continue, n=abort)", addproperty: "sanity-check-3", validargs: "y,n") @@ -216,7 +216,7 @@ task packageInstallers { // Remove the -SNAPSHOT suffix from the version string (originally defined in build.gradle) // Having it in would have resulted in an invalid version property for several platforms (mac, linux/rpm) String appVersion = version.replaceAll("-SNAPSHOT", "") - println "Packaging Bisq version ${appVersion}" + println "Packaging Haveno version ${appVersion}" // zip jar lib for Raspberry Pi only on macOS as there are path issues on Windows and it is only needed once // for the release @@ -227,8 +227,8 @@ task packageInstallers { } String appDescription = 'A decentralized bitcoin exchange network.' - String appCopyright = '© 2021 Bisq' - String appNameAndVendor = 'Bisq' + String appCopyright = '© 2021 Haveno' + String appNameAndVendor = 'Haveno' String commonOpts = new String( // Generic options @@ -245,7 +245,7 @@ task packageInstallers { // Options for creating the application launcher " --main-jar ${mainJarName}" + - " --main-class bisq.desktop.app.BisqAppMain" + + " --main-class bisq.desktop.app.HavenoAppMain" + " --java-options -Xss1280k" + " --java-options -XX:MaxRAM=4g" + " --java-options -Djava.net.preferIPv4Stack=true" @@ -257,7 +257,7 @@ task packageInstallers { if (Os.isFamily(Os.FAMILY_WINDOWS)) { // TODO Found no benefit in using --resource-dir "..package/windows", it has the same outcome as opts below String windowsOpts = new String( - " --icon \"${project(':desktop').projectDir}/package/windows/Bisq.ico\"" + + " --icon \"${project(':desktop').projectDir}/package/windows/Haveno.ico\"" + " --resource-dir \"${project(':desktop').projectDir}/package/windows\"" + " --win-dir-chooser" + " --win-per-user-install" + @@ -268,13 +268,13 @@ task packageInstallers { executeCmd(jPackageFilePath + commonOpts + windowsOpts + " --type exe") // Set the necessary permissions before calling signtool - executeCmd("\"attrib -R \"${binariesFolderPath}/Bisq-${appVersion}.exe\"\"") + executeCmd("\"attrib -R \"${binariesFolderPath}/Haveno-${appVersion}.exe\"\"") // In addition to the groovy quotes around the string, the entire Windows command must also be surrounded // by quotes, plus each path inside the command has to be quoted as well // Reason for this is that the path to the called executable contains spaces // See https://stackoverflow.com/questions/6376113/how-do-i-use-spaces-in-the-command-prompt/6378038#6378038 - executeCmd("\"\"C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit\\signtool.exe\" sign /v /fd SHA256 /a \"${binariesFolderPath}/Bisq-${appVersion}.exe\"\"") + executeCmd("\"\"C:\\Program Files (x86)\\Windows Kits\\10\\App Certification Kit\\signtool.exe\" sign /v /fd SHA256 /a \"${binariesFolderPath}/Haveno-${appVersion}.exe\"\"") } else if (Os.isFamily(Os.FAMILY_MAC)) { // See https://docs.oracle.com/en/java/javase/14/jpackage/override-jpackage-resources.html // for details of "--resource-dir" @@ -334,28 +334,28 @@ task packageInstallers { " --type app-image") // macOS step 3: Sign app (hardended runtime) - File bisqAppImageFullPath = new File(binariesFolderPath, "Bisq.app") + File havenoAppImageFullPath = new File(binariesFolderPath, "Haveno.app") executeCmd("codesign" + " --sign \"${envVariableSigningID}\"" + " --options runtime" + " --entitlements '${project(':desktop').projectDir}/package/macosx/macos.entitlements'" + " --force" + " --verbose" + - " ${bisqAppImageFullPath}/Contents/runtime/Contents/MacOS/libjli.dylib") + " ${havenoAppImageFullPath}/Contents/runtime/Contents/MacOS/libjli.dylib") executeCmd("codesign" + " --sign \"${envVariableSigningID}\"" + " --options runtime" + " --entitlements '${project(':desktop').projectDir}/package/macosx/macos.entitlements'" + " --force" + " --verbose" + - " ${bisqAppImageFullPath}/Contents/MacOS/Bisq") + " ${havenoAppImageFullPath}/Contents/MacOS/Haveno") executeCmd("codesign" + " --sign \"${envVariableSigningID}\"" + " --options runtime" + " --entitlements '${project(':desktop').projectDir}/package/macosx/macos.entitlements'" + " --force" + " --verbose" + - " ${bisqAppImageFullPath}") + " ${havenoAppImageFullPath}") // macOS step 4: Package the app-image into a dmg bundle executeCmd(jPackageFilePath + @@ -366,13 +366,13 @@ task packageInstallers { " --copyright \"${appCopyright}\"" + " --vendor ${appNameAndVendor}" + " --temp \"${jpackageTempDir}\"" + - " --app-image ${bisqAppImageFullPath}" + + " --app-image ${havenoAppImageFullPath}" + " --mac-sign" + macOpts + " --type dmg") // macOS step 5: Delete unused app image - delete(bisqAppImageFullPath) + delete(havenoAppImageFullPath) // macOS step 6: Sign dmg bundle executeCmd("codesign" + @@ -381,7 +381,7 @@ task packageInstallers { " --entitlements '${project(':desktop').projectDir}/package/macosx/macos.entitlements'" + " -vvvv" + " --deep" + - " '${binariesFolderPath}/Bisq-${appVersion}.dmg'") + " '${binariesFolderPath}/Haveno-${appVersion}.dmg'") // macOS step 7: Upload for notarization // See https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow#3087734 @@ -394,9 +394,9 @@ task packageInstallers { " --username '${envVariableAcUsername}'" + " --password '@keychain:AC_PASSWORD'" + " --asc-provider '${envVariableAscProvider}'" + - " --file '${binariesFolderPath}/Bisq-${appVersion}.dmg'") + " --file '${binariesFolderPath}/Haveno-${appVersion}.dmg'") // Response: - // No errors uploading '[PATH_TO_BISQ_REPO]/bisq/desktop/build/temp-620637000/binaries/Bisq-1.1.1.dmg'. + // No errors uploading '[PATH_TO_BISQ_REPO]/bisq/desktop/build/temp-620637000/binaries/Haveno-1.1.1.dmg'. // RequestUUID = ea8bba77-97b7-4c15-a53f-8bbccf627190 def requestUUID = uploadForNotarizationOutput.split('RequestUUID = ')[1].trim() println "Extracted RequestUUID: " + requestUUID @@ -430,7 +430,7 @@ task packageInstallers { // macOS step 8: Staple ticket on dmg executeCmd("xcrun stapler staple" + - " '${binariesFolderPath}/Bisq-${appVersion}.dmg'") + " '${binariesFolderPath}/Haveno-${appVersion}.dmg'") } } else { diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/HavenoApp.java similarity index 99% rename from desktop/src/main/java/bisq/desktop/app/BisqApp.java rename to desktop/src/main/java/bisq/desktop/app/HavenoApp.java index 48d6dd0150..c813dbd3f0 100644 --- a/desktop/src/main/java/bisq/desktop/app/BisqApp.java +++ b/desktop/src/main/java/bisq/desktop/app/HavenoApp.java @@ -90,7 +90,7 @@ import static bisq.desktop.util.Layout.MIN_WINDOW_HEIGHT; import static bisq.desktop.util.Layout.MIN_WINDOW_WIDTH; @Slf4j -public class BisqApp extends Application implements UncaughtExceptionHandler { +public class HavenoApp extends Application implements UncaughtExceptionHandler { @Setter private static Consumer appLaunchedHandler; @Getter @@ -106,7 +106,7 @@ public class BisqApp extends Application implements UncaughtExceptionHandler { private boolean shutDownRequested; private MainView mainView; - public BisqApp() { + public HavenoApp() { shutDownHandler = this::stop; } diff --git a/desktop/src/main/java/bisq/desktop/app/BisqAppMain.java b/desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java similarity index 89% rename from desktop/src/main/java/bisq/desktop/app/BisqAppMain.java rename to desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java index 7b45847287..33745308f9 100644 --- a/desktop/src/main/java/bisq/desktop/app/BisqAppMain.java +++ b/desktop/src/main/java/bisq/desktop/app/HavenoAppMain.java @@ -22,7 +22,7 @@ import bisq.desktop.common.view.guice.InjectorViewFactory; import bisq.desktop.setup.DesktopPersistedDataHost; import bisq.core.app.AvoidStandbyModeService; -import bisq.core.app.BisqExecutable; +import bisq.core.app.HavenoExecutable; import bisq.common.UserThread; import bisq.common.app.AppModule; @@ -34,13 +34,13 @@ import javafx.application.Platform; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BisqAppMain extends BisqExecutable { +public class HavenoAppMain extends HavenoExecutable { public static final String DEFAULT_APP_NAME = "Haveno"; - private BisqApp application; + private HavenoApp application; - public BisqAppMain() { + public HavenoAppMain() { super("Bisq Desktop", "bisq-desktop", DEFAULT_APP_NAME, Version.VERSION); } @@ -49,9 +49,9 @@ public class BisqAppMain extends BisqExecutable { // context class loader: reset it. In order to work around a bug in JavaFX 8u25 // and below, you must include the following code as the first line of your // realMain method: - Thread.currentThread().setContextClassLoader(BisqAppMain.class.getClassLoader()); + Thread.currentThread().setContextClassLoader(HavenoAppMain.class.getClassLoader()); - new BisqAppMain().execute(args); + new HavenoAppMain().execute(args); } @Override @@ -71,13 +71,13 @@ public class BisqAppMain extends BisqExecutable { @Override protected void launchApplication() { - BisqApp.setAppLaunchedHandler(application -> { - BisqAppMain.this.application = (BisqApp) application; + HavenoApp.setAppLaunchedHandler(application -> { + HavenoAppMain.this.application = (HavenoApp) application; // Map to user thread! UserThread.execute(this::onApplicationLaunched); }); - Application.launch(BisqApp.class); + Application.launch(HavenoApp.class); } /////////////////////////////////////////////////////////////////////////////////////////// @@ -102,7 +102,7 @@ public class BisqAppMain extends BisqExecutable { @Override protected AppModule getModule() { - return new BisqAppModule(config); + return new HavenoAppModule(config); } @Override diff --git a/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java b/desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java similarity index 91% rename from desktop/src/main/java/bisq/desktop/app/BisqAppModule.java rename to desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java index 1720cd7695..d965394aac 100644 --- a/desktop/src/main/java/bisq/desktop/app/BisqAppModule.java +++ b/desktop/src/main/java/bisq/desktop/app/HavenoAppModule.java @@ -24,9 +24,9 @@ import bisq.core.app.CoreModule; import bisq.common.app.AppModule; import bisq.common.config.Config; -public class BisqAppModule extends AppModule { +public class HavenoAppModule extends AppModule { - public BisqAppModule(Config config) { + public HavenoAppModule(Config config) { super(config); } diff --git a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java b/desktop/src/main/java/bisq/desktop/components/AddressTextField.java index f9ca98a113..6a426fc70d 100644 --- a/desktop/src/main/java/bisq/desktop/components/AddressTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/AddressTextField.java @@ -59,7 +59,7 @@ public class AddressTextField extends AnchorPane { /////////////////////////////////////////////////////////////////////////////////////////// public AddressTextField(String label) { - JFXTextField textField = new BisqTextField(); + JFXTextField textField = new HavenoTextField(); textField.setId("address-text-field"); textField.setEditable(false); textField.setLabelFloat(true); diff --git a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java b/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java index 5ab785428f..a132afd607 100644 --- a/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/BalanceTextField.java @@ -47,7 +47,7 @@ public class BalanceTextField extends AnchorPane { /////////////////////////////////////////////////////////////////////////////////////////// public BalanceTextField(String label) { - textField = new BisqTextField(); + textField = new HavenoTextField(); textField.setLabelFloat(true); textField.setPromptText(label); textField.setFocusTraversable(false); diff --git a/desktop/src/main/java/bisq/desktop/components/BisqTextArea.java b/desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java similarity index 82% rename from desktop/src/main/java/bisq/desktop/components/BisqTextArea.java rename to desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java index 856f5e791f..172ae87ef2 100644 --- a/desktop/src/main/java/bisq/desktop/components/BisqTextArea.java +++ b/desktop/src/main/java/bisq/desktop/components/HavenoTextArea.java @@ -4,7 +4,7 @@ import com.jfoenix.controls.JFXTextArea; import javafx.scene.control.Skin; -public class BisqTextArea extends JFXTextArea { +public class HavenoTextArea extends JFXTextArea { @Override protected Skin createDefaultSkin() { return new JFXTextAreaSkinBisqStyle(this); diff --git a/desktop/src/main/java/bisq/desktop/components/BisqTextField.java b/desktop/src/main/java/bisq/desktop/components/HavenoTextField.java similarity index 69% rename from desktop/src/main/java/bisq/desktop/components/BisqTextField.java rename to desktop/src/main/java/bisq/desktop/components/HavenoTextField.java index a9cd242a74..2b941c0100 100644 --- a/desktop/src/main/java/bisq/desktop/components/BisqTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/HavenoTextField.java @@ -4,13 +4,13 @@ import com.jfoenix.controls.JFXTextField; import javafx.scene.control.Skin; -public class BisqTextField extends JFXTextField { +public class HavenoTextField extends JFXTextField { - public BisqTextField(String value) { + public HavenoTextField(String value) { super(value); } - public BisqTextField() { + public HavenoTextField() { super(); } diff --git a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java index fe253b2f2b..92432fb8bf 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java @@ -57,7 +57,7 @@ public class InfoTextField extends AnchorPane { public InfoTextField() { arrowLocation = PopOver.ArrowLocation.RIGHT_TOP; - textField = new BisqTextField(); + textField = new HavenoTextField(); textField.setLabelFloat(true); textField.setEditable(false); textField.textProperty().bind(text); diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java index 784ada67ba..64083cf40b 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainView.java +++ b/desktop/src/main/java/bisq/desktop/main/MainView.java @@ -45,7 +45,7 @@ import bisq.core.locale.LanguageUtil; import bisq.core.locale.Res; import bisq.core.provider.price.MarketPrice; -import bisq.common.BisqException; +import bisq.common.HavenoException; import bisq.common.Timer; import bisq.common.UserThread; import bisq.common.util.Tuple2; @@ -369,9 +369,9 @@ public class MainView extends InitializableView { .filter(toggle -> toggle instanceof NavButton) .filter(button -> viewClass == ((NavButton) button).viewClass) .findFirst() - .orElseThrow(() -> new BisqException("No button matching %s found", viewClass)) + .orElseThrow(() -> new HavenoException("No button matching %s found", viewClass)) .setSelected(true); - } catch (BisqException e) { + } catch (HavenoException e) { navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class); } }); diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java index b30178e18e..f9bc73ca17 100644 --- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java @@ -17,7 +17,7 @@ package bisq.desktop.main; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.common.model.ViewModel; import bisq.desktop.components.TxIdTextField; import bisq.desktop.main.overlays.Overlay; @@ -40,7 +40,7 @@ import bisq.desktop.util.GUIUtil; import bisq.core.account.sign.SignedWitnessService; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.alert.PrivateNotificationManager; -import bisq.core.app.BisqSetup; +import bisq.core.app.HavenoSetup; import bisq.core.btc.nodes.LocalBitcoinNode; import bisq.core.btc.setup.WalletsSetup; import bisq.core.btc.wallet.BtcWalletService; @@ -107,8 +107,8 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; @Slf4j -public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { - private final BisqSetup bisqSetup; +public class MainViewModel implements ViewModel, HavenoSetup.BisqSetupListener { + private final HavenoSetup bisqSetup; private final WalletsSetup walletsSetup; private final User user; private final BalancePresentation balancePresentation; @@ -152,7 +152,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public MainViewModel(BisqSetup bisqSetup, + public MainViewModel(HavenoSetup bisqSetup, WalletsSetup walletsSetup, BtcWalletService btcWalletService, User user, @@ -338,7 +338,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { bisqSetup.setShowFirstPopupIfResyncSPVRequestedHandler(this::showFirstPopupIfResyncSPVRequested); bisqSetup.setRequestWalletPasswordHandler(aesKeyHandler -> walletPasswordWindow .onAesKey(aesKeyHandler::accept) - .onClose(() -> BisqApp.getShutDownHandler().run()) + .onClose(() -> HavenoApp.getShutDownHandler().run()) .show()); bisqSetup.setDisplayUpdateHandler((alert, key) -> new DisplayUpdateDownloadWindow(alert, config) @@ -554,7 +554,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener { private void showSecondPopupIfResyncSPVRequested(Popup firstPopup) { firstPopup.hide(); - BisqSetup.setResyncSpvSemaphore(false); + HavenoSetup.setResyncSpvSemaphore(false); new Popup().information(Res.get("settings.net.reSyncSPVAfterRestartCompleted")) .hideCloseButton() .useShutDownButton() diff --git a/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java b/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java index 5b7e6e5b80..7787039508 100644 --- a/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java +++ b/desktop/src/main/java/bisq/desktop/main/SharedPresentation.java @@ -17,7 +17,7 @@ package bisq.desktop.main; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.main.overlays.popups.Popup; import bisq.core.btc.wallet.WalletsManager; @@ -76,7 +76,7 @@ public class SharedPresentation { () -> UserThread.execute(() -> { log.info("Wallets restored with seed words"); new Popup().feedback(Res.get("seed.restore.success")).hideCloseButton().show(); - BisqApp.getShutDownHandler().run(); + HavenoApp.getShutDownHandler().run(); }), throwable -> UserThread.execute(() -> { log.error(throwable.toString()); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java index ec724eb2c6..98da272856 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java @@ -17,7 +17,7 @@ package bisq.desktop.main.overlays; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.AutoTooltipCheckBox; import bisq.desktop.components.AutoTooltipLabel; @@ -430,7 +430,7 @@ public abstract class Overlay> { public T useShutDownButton() { this.actionButtonText = Res.get("shared.shutDown"); - this.actionHandlerOptional = Optional.ofNullable(BisqApp.getShutDownHandler()); + this.actionHandlerOptional = Optional.ofNullable(HavenoApp.getShutDownHandler()); return cast(); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java index e46cdaad59..e3ca2d26d8 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java @@ -17,7 +17,7 @@ package bisq.desktop.main.overlays.windows; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.main.MainView; import bisq.desktop.main.overlays.Overlay; import bisq.desktop.util.DisplayUtils; @@ -271,7 +271,7 @@ public class ContractWindow extends Overlay { Res.get("shared.viewContractAsJson"), 0).second; viewContractButton.setDefaultButton(false); viewContractButton.setOnAction(e -> { - TextArea textArea = new BisqTextArea(); + TextArea textArea = new HavenoTextArea(); String contractAsJson = dispute.getContractAsJson(); textArea.setText(contractAsJson); textArea.setPrefHeight(50); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java index cf7f1d8d98..e9efb3d639 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java @@ -19,7 +19,7 @@ package bisq.desktop.main.overlays.windows; import bisq.desktop.components.AutoTooltipCheckBox; import bisq.desktop.components.AutoTooltipRadioButton; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.InputTextField; import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; @@ -568,7 +568,7 @@ public class DisputeSummaryWindow extends Overlay { } private void addSummaryNotes() { - summaryNotesTextArea = new BisqTextArea(); + summaryNotesTextArea = new HavenoTextArea(); summaryNotesTextArea.setPromptText(Res.get("disputeSummaryWindow.addSummaryNotes")); summaryNotesTextArea.setWrapText(true); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java index b25313ae25..8b3a59c4e1 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java @@ -18,7 +18,7 @@ package bisq.desktop.main.overlays.windows; import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.InputTextField; import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; @@ -359,7 +359,7 @@ public class ManualPayoutTxWindow extends Overlay { int rowIndexB = 0; importTxGridPane = new GridPane(); gridPane.add(importTxGridPane, 1, rowIndex); - importHex = new BisqTextArea(); + importHex = new HavenoTextArea(); importHex.setEditable(true); importHex.setWrapText(true); importHex.setPrefSize(800, 150); @@ -412,7 +412,7 @@ public class ManualPayoutTxWindow extends Overlay { private void addExportPane() { exportTxGridPane = new GridPane(); gridPane.add(exportTxGridPane, 1, rowIndex); - exportHex = new BisqTextArea(); + exportHex = new HavenoTextArea(); exportHex.setEditable(false); exportHex.setWrapText(true); exportHex.setPrefSize(800, 250); @@ -473,7 +473,7 @@ public class ManualPayoutTxWindow extends Overlay { buyerSignatureAsHex = addInputTextField(buildTxGridPane, ++rowIndexA, "buyerSignatureAsHex"); sellerSignatureAsHex = addInputTextField(buildTxGridPane, ++rowIndexA, "sellerSignatureAsHex"); buildTxGridPane.add(new Label(""), 0, ++rowIndexA); // spacer - finalSignedTxHex = new BisqTextArea(); + finalSignedTxHex = new HavenoTextArea(); finalSignedTxHex.setEditable(false); finalSignedTxHex.setWrapText(true); finalSignedTxHex.setPrefSize(800, 250); @@ -496,7 +496,7 @@ public class ManualPayoutTxWindow extends Overlay { private GridPane addSignVerifyMsgPane(GridPane myGridPane) { int rowIndexB = 0; gridPane.add(myGridPane, 1, rowIndex); - TextArea messageText = new BisqTextArea(); + TextArea messageText = new HavenoTextArea(); messageText.setPromptText("Message"); messageText.setEditable(true); messageText.setWrapText(true); @@ -505,7 +505,7 @@ public class ManualPayoutTxWindow extends Overlay { myGridPane.add(new Label(""), 0, ++rowIndexB); // spacer InputTextField address = addInputTextField(myGridPane, ++rowIndexB, "Address"); myGridPane.add(new Label(""), 0, ++rowIndexB); // spacer - TextArea messageSig = new BisqTextArea(); + TextArea messageSig = new HavenoTextArea(); messageSig.setPromptText("Signature"); messageSig.setEditable(true); messageSig.setWrapText(true); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java index 2185921358..84e1142cc4 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java @@ -18,7 +18,7 @@ package bisq.desktop.main.overlays.windows; import bisq.desktop.components.AutoTooltipButton; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.InputTextField; import bisq.desktop.main.overlays.Overlay; import bisq.desktop.main.overlays.popups.Popup; @@ -84,7 +84,7 @@ public class SignSpecificWitnessWindow extends Overlay { message(text); actionButtonText(Res.get("tacWindow.agree")); closeButtonText(Res.get("tacWindow.disagree")); - onClose(BisqApp.getShutDownHandler()); + onClose(HavenoApp.getShutDownHandler()); super.show(); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java index 857d2657b1..baa67e2772 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java @@ -17,7 +17,7 @@ package bisq.desktop.main.overlays.windows; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.TextFieldWithCopyIcon; import bisq.desktop.components.TxIdTextField; import bisq.desktop.main.MainView; @@ -336,7 +336,7 @@ public class TradeDetailsWindow extends Overlay { if (contract != null) { viewContractButton.setOnAction(e -> { - TextArea textArea = new BisqTextArea(); + TextArea textArea = new HavenoTextArea(); textArea.setText(trade.getContractAsJson()); String data = "Contract as json:\n"; data += trade.getContractAsJson(); diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java index c342995258..ddeb157d3f 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java @@ -54,6 +54,7 @@ import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkArgument; +// TODO (woodser): update for Haveno? @Slf4j public class BisqInstaller { private static final String FINGER_PRINT_MANFRED_KARRER = "F379A1C6"; diff --git a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java index d328a91d25..900cb44367 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java @@ -17,7 +17,7 @@ package bisq.desktop.main.settings.network; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.common.view.ActivatableView; import bisq.desktop.common.view.FxmlView; import bisq.desktop.components.AutoTooltipButton; @@ -280,7 +280,7 @@ public class NetworkSettingsView extends ActivatableView { .actionButtonText(Res.get("shared.applyAndShutDown")) .onAction(() -> { preferences.setUseTorForBitcoinJ(selected); - UserThread.runAfter(BisqApp.getShutDownHandler(), 500, TimeUnit.MILLISECONDS); + UserThread.runAfter(HavenoApp.getShutDownHandler(), 500, TimeUnit.MILLISECONDS); }) .closeButtonText(Res.get("shared.cancel")) .onClose(() -> useTorForBtcJCheckBox.setSelected(!selected)) diff --git a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java b/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java index 841115e9b0..ec7ab1ceba 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java @@ -17,7 +17,7 @@ package bisq.desktop.main.settings.preferences; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.common.view.ActivatableViewAndModel; import bisq.desktop.common.view.FxmlView; import bisq.desktop.components.AutoTooltipButton; diff --git a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java b/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java index 278b665059..5209b20500 100644 --- a/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java +++ b/desktop/src/main/java/bisq/desktop/main/shared/ChatView.java @@ -19,7 +19,7 @@ package bisq.desktop.main.shared; import bisq.desktop.components.AutoTooltipButton; import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.BusyAnimation; import bisq.desktop.components.TableGroupHeadline; import bisq.desktop.components.TextFieldWithIcon; @@ -204,7 +204,7 @@ public class ChatView extends AnchorPane { VBox.setVgrow(this, Priority.ALWAYS); - inputTextArea = new BisqTextArea(); + inputTextArea = new HavenoTextArea(); inputTextArea.setPrefHeight(70); inputTextArea.setWrapText(true); diff --git a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java index b3d0915fa7..988f9b173a 100644 --- a/desktop/src/main/java/bisq/desktop/util/FormBuilder.java +++ b/desktop/src/main/java/bisq/desktop/util/FormBuilder.java @@ -25,8 +25,8 @@ import bisq.desktop.components.AutoTooltipRadioButton; import bisq.desktop.components.AutoTooltipSlideToggleButton; import bisq.desktop.components.AutocompleteComboBox; import bisq.desktop.components.BalanceTextField; -import bisq.desktop.components.BisqTextArea; -import bisq.desktop.components.BisqTextField; +import bisq.desktop.components.HavenoTextArea; +import bisq.desktop.components.HavenoTextField; import bisq.desktop.components.BusyAnimation; import bisq.desktop.components.ExternalHyperlink; import bisq.desktop.components.FundsTextField; @@ -326,7 +326,7 @@ public class FormBuilder { String title, String value, double top) { - TextField textField = new BisqTextField(value); + TextField textField = new HavenoTextField(value); textField.setEditable(false); textField.setFocusTraversable(false); @@ -339,7 +339,7 @@ public class FormBuilder { } public static Tuple2 addTextFieldWithEditButton(GridPane gridPane, int rowIndex, String title) { - TextField textField = new BisqTextField(); + TextField textField = new HavenoTextField(); textField.setPromptText(title); textField.setEditable(false); textField.setFocusTraversable(false); @@ -544,7 +544,7 @@ public class FormBuilder { public static TextArea addTextArea(GridPane gridPane, int rowIndex, String prompt, double top) { - JFXTextArea textArea = new BisqTextArea(); + JFXTextArea textArea = new HavenoTextArea(); textArea.setPromptText(prompt); textArea.setLabelFloat(true); textArea.setWrapText(true); @@ -603,7 +603,7 @@ public class FormBuilder { public static Tuple2 addTopLabelTextArea(GridPane gridPane, int rowIndex, int colIndex, String title, String prompt, double top) { - TextArea textArea = new BisqTextArea(); + TextArea textArea = new HavenoTextArea(); textArea.setPromptText(prompt); textArea.setWrapText(true); @@ -860,7 +860,7 @@ public class FormBuilder { String buttonTitle, double top) { - TextField textField = new BisqTextField(); + TextField textField = new HavenoTextField(); textField.setEditable(false); textField.setMouseTransparent(true); textField.setFocusTraversable(false); @@ -914,14 +914,14 @@ public class FormBuilder { int rowIndex, String title1, String title2) { - TextField textField1 = new BisqTextField(); + TextField textField1 = new HavenoTextField(); textField1.setEditable(false); textField1.setMouseTransparent(true); textField1.setFocusTraversable(false); final Tuple2 topLabelWithVBox1 = getTopLabelWithVBox(title1, textField1); - TextField textField2 = new BisqTextField(); + TextField textField2 = new HavenoTextField(); textField2.setEditable(false); textField2.setMouseTransparent(true); textField2.setFocusTraversable(false); @@ -1054,7 +1054,7 @@ public class FormBuilder { String radioButtonTitle1, String radioButtonTitle2, double top) { - TextField textField = new BisqTextField(); + TextField textField = new HavenoTextField(); textField.setPromptText(textFieldTitle); RadioButton radioButton1 = new AutoTooltipRadioButton(radioButtonTitle1); @@ -1296,7 +1296,7 @@ public class FormBuilder { final VBox topLabelVBox1 = getTopLabelVBox(5); final Label topLabel1 = getTopLabel(titleTextfield); - final TextField textField = new BisqTextField(); + final TextField textField = new HavenoTextField(); topLabelVBox1.getChildren().addAll(topLabel1, textField); final VBox topLabelVBox2 = getTopLabelVBox(5); @@ -1364,7 +1364,7 @@ public class FormBuilder { comboBox.setPromptText(titleCombobox); comboBox.setLabelFloat(true); - TextField textField = new BisqTextField(); + TextField textField = new HavenoTextField(); final VBox topLabelVBox = getTopLabelVBox(5); final Label topLabel = getTopLabel(titleTextfield); diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java index 4d7b2e178d..83244a6d10 100644 --- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java @@ -18,9 +18,9 @@ package bisq.desktop.util; import bisq.desktop.Navigation; -import bisq.desktop.app.BisqApp; +import bisq.desktop.app.HavenoApp; import bisq.desktop.components.AutoTooltipLabel; -import bisq.desktop.components.BisqTextArea; +import bisq.desktop.components.HavenoTextArea; import bisq.desktop.components.InfoAutoTooltipLabel; import bisq.desktop.components.indicator.TxConfidenceIndicator; import bisq.desktop.main.MainView; @@ -30,7 +30,7 @@ import bisq.desktop.main.overlays.popups.Popup; import bisq.core.account.witness.AccountAgeWitness; import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.app.BisqSetup; +import bisq.core.app.HavenoSetup; import bisq.core.btc.setup.WalletsSetup; import bisq.core.locale.Country; import bisq.core.locale.CountryUtil; @@ -827,8 +827,8 @@ public class GUIUtil { .useShutDownButton() .actionButtonText(Res.get("shared.shutDown")) .onAction(() -> { - BisqSetup.setResyncSpvSemaphore(true); - UserThread.runAfter(BisqApp.getShutDownHandler(), 100, TimeUnit.MILLISECONDS); + HavenoSetup.setResyncSpvSemaphore(true); + UserThread.runAfter(HavenoApp.getShutDownHandler(), 100, TimeUnit.MILLISECONDS); }) .closeButtonText(Res.get("shared.cancel")) .show(); @@ -838,7 +838,7 @@ public class GUIUtil { } public static void showSelectableTextModal(String title, String text) { - TextArea textArea = new BisqTextArea(); + TextArea textArea = new HavenoTextArea(); textArea.setText(text); textArea.setEditable(false); textArea.setWrapText(true); diff --git a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java b/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java index c42b976ba7..a090bfc8ea 100644 --- a/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java +++ b/desktop/src/test/java/bisq/desktop/GuiceSetupTest.java @@ -1,6 +1,6 @@ package bisq.desktop; -import bisq.desktop.app.BisqAppModule; +import bisq.desktop.app.HavenoAppModule; import bisq.desktop.common.view.CachingViewLoader; import bisq.desktop.common.view.ViewLoader; import bisq.desktop.common.view.guice.InjectorViewFactory; @@ -77,7 +77,7 @@ public class GuiceSetupTest { Res.setup(); CurrencyUtil.setup(); - injector = Guice.createInjector(new BisqAppModule(new Config())); + injector = Guice.createInjector(new HavenoAppModule(new Config())); } @Test diff --git a/p2p/src/main/java/bisq/network/p2p/network/BisqRuntimeException.java b/p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java similarity index 86% rename from p2p/src/main/java/bisq/network/p2p/network/BisqRuntimeException.java rename to p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java index f8a2f85ecd..95d82db7d5 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/BisqRuntimeException.java +++ b/p2p/src/main/java/bisq/network/p2p/network/HavenoRuntimeException.java @@ -17,8 +17,8 @@ package bisq.network.p2p.network; -class BisqRuntimeException extends RuntimeException { - BisqRuntimeException(String message, Throwable cause) { +class HavenoRuntimeException extends RuntimeException { + HavenoRuntimeException(String message, Throwable cause) { super(message, cause); } } diff --git a/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java b/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java index f810ba440c..99de0e1b86 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java +++ b/p2p/src/main/java/bisq/network/p2p/network/ProtoOutputStream.java @@ -46,7 +46,7 @@ class ProtoOutputStream { writeEnvelopeOrThrow(envelope); } catch (IOException e) { log.error("Failed to write envelope", e); - throw new BisqRuntimeException("Failed to write envelope", e); + throw new HavenoRuntimeException("Failed to write envelope", e); } } diff --git a/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java b/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java index 96d944c75f..63b98205ef 100644 --- a/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java +++ b/p2p/src/main/java/bisq/network/p2p/network/SynchronizedProtoOutputStream.java @@ -52,11 +52,11 @@ class SynchronizedProtoOutputStream extends ProtoOutputStream { currentThread.interrupt(); String msg = "Thread " + currentThread + " was interrupted. InterruptedException=" + e; log.error(msg); - throw new BisqRuntimeException(msg, e); + throw new HavenoRuntimeException(msg, e); } catch (ExecutionException e) { String msg = "Failed to write envelope. ExecutionException " + e; log.error(msg); - throw new BisqRuntimeException(msg, e); + throw new HavenoRuntimeException(msg, e); } }