Merge pull request #274 from horizontalsystems/legacy-address-validat…

…ion-production Validate legacy address prefix (production)
horizontalsystems · Apr 3, 2019 · e41ddc8 · e41ddc8
2 parents 71b3278 + 6aa24ad
commit e41ddc8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/utils/AddressConverter.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/utils/AddressConverter.kt
@@ -30,12 +30,13 @@ class AddressConverter(private val network: Network) {
             }
 
             val bytes = Arrays.copyOfRange(data, 1, data.size)
-            var type = AddressType.P2PKH
-            if (data[0].toInt() == network.addressScriptVersion) {
-                type = AddressType.P2SH
+            val addressType = when (data[0].toInt()) {
+                network.addressScriptVersion -> AddressType.P2SH
+                network.addressVersion -> AddressType.P2PKH
+                else -> throw AddressFormatException("Wrong address prefix")
             }
 
-            LegacyAddress(addressString, bytes, type)
+            LegacyAddress(addressString, bytes, addressType)
         }
     }