From dd689b1883eaa19b44acc5e401de7b51b3949329 Mon Sep 17 00:00:00 2001 From: m2049r <30435443+m2049r@users.noreply.github.com> Date: Wed, 24 Jan 2018 19:59:13 +0100 Subject: [PATCH] fix for 2N9fzq66uZYQXp7uqrPBH6jKBhjrgTzpGCy (#190) --- .../xmrwallet/util/BitcoinAddressValidator.java | 11 ++++++++--- .../xmrwallet/util/BitcoinAddressValidatorTest.java | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java b/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java index cdf7d62..6050339 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/BitcoinAddressValidator.java @@ -34,10 +34,11 @@ public class BitcoinAddressValidator { if (decoded == null) return false; + int v = decoded[0] & 0xFF; if (!testnet) { - if ((decoded[0] != 0x00) && (decoded[0] != 0x05)) return false; + if ((v != 0x00) && (v != 0x05)) return false; } else { - if ((decoded[0] != 0x6f) && (decoded[0] != 0xc4)) return false; + if ((v != 0x6f) && (v != 0xc4)) return false; } byte[] hash1 = sha256(Arrays.copyOfRange(decoded, 0, 21)); @@ -57,7 +58,11 @@ public class BitcoinAddressValidator { byte[] result = new byte[25]; byte[] numBytes = num.toByteArray(); - System.arraycopy(numBytes, 0, result, result.length - numBytes.length, numBytes.length); + if (num.bitLength() == 200) { + System.arraycopy(numBytes, 1, result, 0, 25); + } else { + System.arraycopy(numBytes, 0, result, result.length - numBytes.length, numBytes.length); + } return result; } diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/BitcoinAddressValidatorTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/BitcoinAddressValidatorTest.java index 8380f37..a60fb1e 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/BitcoinAddressValidatorTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/BitcoinAddressValidatorTest.java @@ -25,6 +25,7 @@ public class BitcoinAddressValidatorTest { @Test public void validateBTC_shouldValidate() { + assertTrue(BitcoinAddressValidator.validate("2N9fzq66uZYQXp7uqrPBH6jKBhjrgTzpGCy", true)); assertTrue(BitcoinAddressValidator.validate("1AGNa15ZQXAZUgFiqJ2i7Z2DPU2J6hW62i", false)); assertTrue(BitcoinAddressValidator.validate("1Q1pE5vPGEEMqRcVRMbtBK842Y6Pzo6nK9", false)); assertTrue(BitcoinAddressValidator.validate("3R2MPpTNQLCNs13qnHz89Rm82jQ27bAwft", false));