mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

DevEnv: Make DEV_PRIVILEGE_PRIV_KEY private and add getter

Browse source
This commit is contained in:
Alva Swanson 2023-12-27 13:13:38 +01:00
parent c96b7d2ade
commit e7cb152e11
No known key found for this signature in database
GPG key ID: 004760E77F753090
10 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apitest/src/main/java/bisq/apitest/Scaffold.java
View file

@ -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());
}
}
}

13
apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java
View file

@ -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

3
common/src/main/java/bisq/common/app/DevEnv.java
View file

@ -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);

4
core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java
View file

@ -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> supportType = getSupportType(disputeAgentType);

2
core/src/main/java/bisq/core/dao/burningman/accounting/node/full/network/AccountingFullNodeNetworkService.java
View file

@ -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);

2
core/src/test/java/bisq/core/filter/FilterManagerAddFilterToNetworkTests.java
View file

@ -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());
}

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
View file

@ -130,7 +130,7 @@ public class FilterWindow extends Overlay<FilterWindow> {
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,

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/SendAlertMessageWindow.java
View file

@ -102,7 +102,7 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
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<Label, TextArea> labelTextAreaTuple2 = addTopLabelTextArea(gridPane, ++rowIndex,
Res.get("sendAlertMessageWindow.alertMsg"),

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/SendPrivateNotificationWindow.java
View file

@ -99,7 +99,7 @@ public class SendPrivateNotificationWindow extends Overlay<SendPrivateNotificati
private void addContent() {
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<Label, TextArea> labelTextAreaTuple2 = addTopLabelTextArea(gridPane, ++rowIndex,
Res.get("sendPrivateNotificationWindow.privateNotification"),

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/UnlockDisputeAgentRegistrationWindow.java
View file

@ -120,7 +120,7 @@ public class UnlockDisputeAgentRegistrationWindow extends Overlay<UnlockDisputeA
keyInputTextField = labelInputTextFieldTuple2.second;
if (useDevPrivilegeKeys)
keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY);
keyInputTextField.setText(DevEnv.getDEV_PRIVILEGE_PRIV_KEY());
changeListener = (observable, oldValue, newValue) -> unlockButton.setDisable(newValue.length() == 0);
keyInputTextField.textProperty().addListener(changeListener);
}