Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate that XMR subaddress view key matches the main address #6612

Merged
merged 4 commits into from Apr 3, 2023
Merged

Validate that XMR subaddress view key matches the main address #6612

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2b25c1
Validate that XMR subaddress view key matches the main address.
Mar 22, 2023
165f2d0
Check private view key is a valid scalar.
Mar 26, 2023
3878a9f
Move knaccc test module to core/xmr.
Mar 29, 2023
0e2b139
Code review changes.
Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion core/src/main/java/bisq/core/xmr/knaccc/monero/address/WalletAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import bisq.core.xmr.org.nem.core.crypto.ed25519.arithmetic.Ed25519Group;
import bisq.core.xmr.org.nem.core.crypto.ed25519.arithmetic.Ed25519GroupElement;

import java.util.Arrays;

import static bisq.core.xmr.knaccc.monero.address.ByteUtil.concat;
import static bisq.core.xmr.knaccc.monero.address.ByteUtil.hexToBytes;
import static bisq.core.xmr.knaccc.monero.address.ByteUtil.longToLittleEndianUint32ByteArray;
Expand Down Expand Up @@ -121,7 +123,27 @@ public static String getSubaddressBase58(Scalar privateViewKey,

}

public String getSubaddressBase58(String privateViewKeyHex, long accountId, long subaddressId) {
public String getSubaddressBase58(String privateViewKeyHex, long accountId, long subaddressId) throws InvalidWalletAddressException {
if (!checkPrivateViewKey(privateViewKeyHex)) {
throw new InvalidWalletAddressException("Wrong private view key for main address");
}
return getSubaddressBase58(new Scalar(privateViewKeyHex), hexToBytes(getPublicSpendKeyHex()), accountId, subaddressId);
}

public boolean checkPrivateViewKey(String privateViewKey) {
This conversation was marked as resolved.
Show resolved Hide resolved
return isPrivateKeyValid(privateViewKey) && arePubPrivKeysRelated(this.publicViewKeyHex, privateViewKey);
}

public static boolean isPrivateKeyValid(String privateKey) {
This conversation was marked as resolved.
Show resolved Hide resolved
This conversation was marked as resolved.
Show resolved Hide resolved
byte[] input = hexToBytes(privateKey);
byte[] reduced = CryptoUtil.scReduce32(input);
return Arrays.equals(input, reduced);
}

public static boolean arePubPrivKeysRelated(String publicKey, String privateKey) {
This conversation was marked as resolved.
Show resolved Hide resolved
This conversation was marked as resolved.
Show resolved Hide resolved
Scalar m = new Scalar(privateKey);
This conversation was marked as resolved.
Show resolved Hide resolved
Ed25519GroupElement M = G.scalarMultiply(new Ed25519EncodedFieldElement(m.bytes));
byte[] generatedPubKey = M.encode().getRaw();
return Arrays.equals(generatedPubKey, hexToBytes(publicKey));
}
}
24 changes: 24 additions & 0 deletions core/src/test/java/knaccc/monero/address/WalletAddressTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public void testWalletAddress() throws WalletAddress.InvalidWalletAddressExcepti
WalletAddress walletAddress = new WalletAddress(mainAddress);

String privateViewKeyHex = "7b37d8922245a07244fd31855d1e705a590a9bd2881825f0542ad99cdaba090a";
String publicViewKeyHex = "3cd5a3079e8b4cff3630ce16bfda6eebb2da86169accdb93206a92a58d586faa";

System.out.println("subaddress for account index 0, subaddress index 1: "
+ walletAddress.getSubaddressBase58(privateViewKeyHex, 0, 1));
Expand All @@ -46,5 +47,28 @@ public void testWalletAddress() throws WalletAddress.InvalidWalletAddressExcepti
assertEquals(walletAddress.getSubaddressBase58(privateViewKeyHex, 0, 1), addr01);
assertEquals(walletAddress.getSubaddressBase58(privateViewKeyHex, 1, 0), addr10);
assertEquals(walletAddress.getSubaddressBase58(privateViewKeyHex, 1, 1), addr11);

assertEquals(walletAddress.checkPrivateViewKey(privateViewKeyHex), true);
assertEquals(WalletAddress.arePubPrivKeysRelated(publicViewKeyHex, privateViewKeyHex), true);
assertEquals(WalletAddress.arePubPrivKeysRelated(privateViewKeyHex, privateViewKeyHex), false);

assertEquals(WalletAddress.arePubPrivKeysRelated(
This conversation was marked as resolved.
Show resolved Hide resolved
"bdc158199c8933353627d54edb4bbae547dbbde3130860d7940313210edca0a6",
"a82a9017a1d259c71f5392ad9091b743b86dac7a21f5e402ea0a55e5c8a6750f"),
true);

assertEquals(WalletAddress.arePubPrivKeysRelated(
"d17698d07fe9edbc41552299b90a93de73bb1bd4b94b8083af0bbe3a1931e2ec",
"dae1bceeb2563b8c376f8e0456e5fe7aa3d6291b38ace18c6ad5647424a3b104"),
true);

assertEquals(WalletAddress.arePubPrivKeysRelated(
"0000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF",
"0000111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFF"),
false);

String nonReducedPrivateKey = "42594aba0e809490dec97b2dfaf64f7ae5bef1c2d19af636eb84544773df5b5f";
This conversation was marked as resolved.
Show resolved Hide resolved
assertEquals(WalletAddress.isPrivateKeyValid(nonReducedPrivateKey), false);
assertEquals(WalletAddress.isPrivateKeyValid(privateViewKeyHex), true);
}
}
8 changes: 6 additions & 2 deletions desktop/src/main/java/bisq/desktop/components/paymentmethods/XmrForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,21 @@ public void updateFromInputs() {
xmrAccountDelegate.setPrivateViewKey(privateViewKeyInputTextField.getText());
xmrAccountDelegate.setAccountIndex(accountIndex.getText());
xmrAccountDelegate.setSubAddressIndex(subAddressIndex.getText());
subAddressTextField.getStyleClass().remove("error-text");
if (accountIndex.validate() && subAddressIndex.validate()
&& mainAddressTextField.validate()
&& privateViewKeyInputTextField.validate()
&& mainAddressTextField.getText().length() > 0
&& privateViewKeyInputTextField.getText().length() > 0) {
try {
xmrAccountDelegate.createAndSetNewSubAddress();
subAddressTextField.setText(xmrAccountDelegate.getSubAddress());
} catch (Exception ex) {
log.warn(ex.toString());
log.warn(ex.getMessage());
String[] parts = ex.getMessage().split(":");
subAddressTextField.setText(parts.length > 0 ? parts[parts.length-1] : ex.getMessage());
subAddressTextField.getStyleClass().add("error-text");
}
subAddressTextField.setText(xmrAccountDelegate.getSubAddress());
} else {
xmrAccountDelegate.setSubAddress("");
subAddressTextField.setText("");
Expand Down