diff --git a/apitest/src/main/java/bisq/apitest/Scaffold.java b/apitest/src/main/java/bisq/apitest/Scaffold.java index 47cd1d42cf..d566fbab4e 100644 --- a/apitest/src/main/java/bisq/apitest/Scaffold.java +++ b/apitest/src/main/java/bisq/apitest/Scaffold.java @@ -17,6 +17,7 @@ package bisq.apitest; +import bisq.common.app.DevEnv; import bisq.common.config.BisqHelpFormatter; import bisq.common.util.Utilities; @@ -45,7 +46,6 @@ 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.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static java.lang.String.format; import static java.lang.System.exit; import static java.lang.System.out; @@ -482,8 +482,8 @@ public class Scaffold { GrpcClient arbClient = new GrpcClient(getLoopbackAddress().getHostAddress(), arbdaemon.apiPort, config.apiPassword); - arbClient.registerDisputeAgent(MEDIATOR, DEV_PRIVILEGE_PRIV_KEY); - arbClient.registerDisputeAgent(REFUND_AGENT, DEV_PRIVILEGE_PRIV_KEY); + arbClient.registerDisputeAgent(MEDIATOR, DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); + arbClient.registerDisputeAgent(REFUND_AGENT, DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); } } } diff --git a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java b/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java index a219f65c04..7696a87ede 100644 --- a/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java +++ b/apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java @@ -17,6 +17,8 @@ package bisq.apitest.method; +import bisq.common.app.DevEnv; + import io.grpc.StatusRuntimeException; import lombok.extern.slf4j.Slf4j; @@ -34,7 +36,6 @@ 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.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; @@ -60,7 +61,7 @@ public class RegisterDisputeAgentsTest extends MethodTest { @Order(1) public void testRegisterArbitratorShouldThrowException() { Throwable exception = assertThrows(StatusRuntimeException.class, () -> - arbClient.registerDisputeAgent(ARBITRATOR, DEV_PRIVILEGE_PRIV_KEY)); + arbClient.registerDisputeAgent(ARBITRATOR, DevEnv.getDEV_PRIVILEGE_PRIV_KEY())); assertEquals("UNIMPLEMENTED: arbitrators must be registered in a Bisq UI", exception.getMessage()); } @@ -69,7 +70,7 @@ public class RegisterDisputeAgentsTest extends MethodTest { @Order(2) public void testInvalidDisputeAgentTypeArgShouldThrowException() { Throwable exception = assertThrows(StatusRuntimeException.class, () -> - arbClient.registerDisputeAgent("badagent", DEV_PRIVILEGE_PRIV_KEY)); + arbClient.registerDisputeAgent("badagent", DevEnv.getDEV_PRIVILEGE_PRIV_KEY())); assertEquals("INVALID_ARGUMENT: unknown dispute agent type 'badagent'", exception.getMessage()); } @@ -78,7 +79,7 @@ public class RegisterDisputeAgentsTest extends MethodTest { @Order(3) public void testInvalidRegistrationKeyArgShouldThrowException() { Throwable exception = assertThrows(StatusRuntimeException.class, () -> - arbClient.registerDisputeAgent(REFUND_AGENT, "invalid" + DEV_PRIVILEGE_PRIV_KEY)); + arbClient.registerDisputeAgent(REFUND_AGENT, "invalid" + DevEnv.getDEV_PRIVILEGE_PRIV_KEY())); assertEquals("INVALID_ARGUMENT: invalid registration key", exception.getMessage()); } @@ -86,13 +87,13 @@ public class RegisterDisputeAgentsTest extends MethodTest { @Test @Order(4) public void testRegisterMediator() { - arbClient.registerDisputeAgent(MEDIATOR, DEV_PRIVILEGE_PRIV_KEY); + arbClient.registerDisputeAgent(MEDIATOR, DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); } @Test @Order(5) public void testRegisterRefundAgent() { - arbClient.registerDisputeAgent(REFUND_AGENT, DEV_PRIVILEGE_PRIV_KEY); + arbClient.registerDisputeAgent(REFUND_AGENT, DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); } @AfterAll diff --git a/common/src/main/java/bisq/common/app/DevEnv.java b/common/src/main/java/bisq/common/app/DevEnv.java index 377472b880..77041b5a39 100644 --- a/common/src/main/java/bisq/common/app/DevEnv.java +++ b/common/src/main/java/bisq/common/app/DevEnv.java @@ -32,7 +32,8 @@ public class DevEnv { // emergency cases only (beside update message and arbitrator registration). @Getter private static final String DEV_PRIVILEGE_PUB_KEY = "027a381b5333a56e1cc3d90d3a7d07f26509adf7029ed06fc997c656621f8da1ee"; - public static final String DEV_PRIVILEGE_PRIV_KEY = "6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a"; + @Getter + private static final String DEV_PRIVILEGE_PRIV_KEY = "6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a"; public static void setup(Config config) { DevEnv.setDevMode(config.useDevMode); diff --git a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java index e22275fb05..1cc7dff1c2 100644 --- a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java +++ b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java @@ -27,6 +27,7 @@ import bisq.core.support.dispute.refund.refundagent.RefundAgentManager; import bisq.network.p2p.NodeAddress; import bisq.network.p2p.P2PService; +import bisq.common.app.DevEnv; import bisq.common.config.Config; import bisq.common.crypto.KeyRing; @@ -42,7 +43,6 @@ import java.util.Optional; import lombok.extern.slf4j.Slf4j; -import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY; import static bisq.core.support.SupportType.ARBITRATION; import static bisq.core.support.SupportType.MEDIATION; import static bisq.core.support.SupportType.REFUND; @@ -87,7 +87,7 @@ class CoreDisputeAgentsService { || !config.useLocalhostForP2P) throw new UnsupportedOperationException("dispute agents must be registered in a Bisq UI"); - if (!registrationKey.equals(DEV_PRIVILEGE_PRIV_KEY)) + if (!registrationKey.equals(DevEnv.getDEV_PRIVILEGE_PRIV_KEY())) throw new IllegalArgumentException("invalid registration key"); Optional supportType = getSupportType(disputeAgentType); diff --git a/core/src/main/java/bisq/core/dao/burningman/accounting/node/full/network/AccountingFullNodeNetworkService.java b/core/src/main/java/bisq/core/dao/burningman/accounting/node/full/network/AccountingFullNodeNetworkService.java index f105eafc63..3b3138962d 100644 --- a/core/src/main/java/bisq/core/dao/burningman/accounting/node/full/network/AccountingFullNodeNetworkService.java +++ b/core/src/main/java/bisq/core/dao/burningman/accounting/node/full/network/AccountingFullNodeNetworkService.java @@ -93,7 +93,7 @@ public class AccountingFullNodeNetworkService implements MessageListener, PeerMa if (useDevPrivilegeKeys) { bmOracleNodePubKey = DevEnv.getDEV_PRIVILEGE_PUB_KEY(); - bmOracleNodePrivKey = DevEnv.DEV_PRIVILEGE_PRIV_KEY; + bmOracleNodePrivKey = DevEnv.getDEV_PRIVILEGE_PRIV_KEY(); } this.bmOracleNodePubKey = bmOracleNodePubKey.isEmpty() ? null : bmOracleNodePubKey; this.bmOracleNodePrivKey = bmOracleNodePrivKey.isEmpty() ? null : toEcKey(bmOracleNodePrivKey); diff --git a/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java b/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java index ef7f14788a..3be3810815 100644 --- a/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java +++ b/core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java @@ -85,7 +85,7 @@ public class FilterManagerAddFilterToNetworkTests { KeyPair ownerKeyPair = keyPairGenerator.generateKeyPair(); ownerPublicKey = ownerKeyPair.getPublic(); - privilegedDevEcKey = ECKey.fromPrivate(new BigInteger(1, HEX.decode(DevEnv.DEV_PRIVILEGE_PRIV_KEY))); + privilegedDevEcKey = ECKey.fromPrivate(new BigInteger(1, HEX.decode(DevEnv.getDEV_PRIVILEGE_PRIV_KEY()))); privilegedDevPubKeyHex = HEX.encode(privilegedDevEcKey.getPubKey()); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java index f33429fba2..d89a94e250 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java @@ -130,7 +130,7 @@ public class FilterWindow extends Overlay { InputTextField keyTF = addInputTextField(gridPane, ++rowIndex, Res.get("shared.unlock"), 10); if (useDevPrivilegeKeys) { - keyTF.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY); + keyTF.setText(DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); } InputTextField offerIdsTF = addInputTextField(gridPane, ++rowIndex, diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java index b7bf081c20..d7dbbb5cfc 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java @@ -102,7 +102,7 @@ public class SendAlertMessageWindow extends Overlay { InputTextField keyInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("shared.unlock"), 10); if (useDevPrivilegeKeys) - keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY); + keyInputTextField.setText(DevEnv.getDEV_PRIVILEGE_PRIV_KEY()); Tuple2 labelTextAreaTuple2 = addTopLabelTextArea(gridPane, ++rowIndex, Res.get("sendAlertMessageWindow.alertMsg"), diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java index 236015e11e..9d56bf735b 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java @@ -99,7 +99,7 @@ public class SendPrivateNotificationWindow extends Overlay labelTextAreaTuple2 = addTopLabelTextArea(gridPane, ++rowIndex, Res.get("sendPrivateNotificationWindow.privateNotification"), diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java index 92d823659b..ccdaad56d7 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java @@ -120,7 +120,7 @@ public class UnlockDisputeAgentRegistrationWindow extends Overlay unlockButton.setDisable(newValue.length() == 0); keyInputTextField.textProperty().addListener(changeListener); }