Remove the concept of "acceptable Base58 address headers" (version he…

…aders) for a given network.

The concept was always weakly defined, as version headers have been used for different types of
data too (which wasn't included in the list). What's acceptable is always dependent on the
usecase, not only the network.

Also, with the coming Bech32 addresses there are no int version headers any more. Rather, it
uses an HRP (human readable part) which is a string.

This is an API breaking change, but I doubt many users have used this in the form of a list.

core/src/main/java/org/bitcoinj/core/Address.java

@@ -59,7 +59,7 @@ public Address(NetworkParameters params, int version, byte[] hash160) throws Wro
         checkNotNull(params);
         checkArgument(hash160.length == 20, "Addresses are 160-bit hashes, so you must provide 20 bytes");
         if (!isAcceptableVersion(params, version))
-            throw new WrongNetworkException(version, params.getAcceptableAddressCodes());
+            throw new WrongNetworkException(version);
         this.params = params;
     }
 
@@ -110,7 +110,7 @@ public Address(@Nullable NetworkParameters params, String address) throws Addres
         super(address);
         if (params != null) {
             if (!isAcceptableVersion(params, version)) {
-                throw new WrongNetworkException(version, params.getAcceptableAddressCodes());
+                throw new WrongNetworkException(version);
             }
             this.params = params;
         } else {
@@ -173,11 +173,10 @@ public static NetworkParameters getParametersFromAddress(String address) throws
      * Check if a given address version is valid given the NetworkParameters.
      */
     private static boolean isAcceptableVersion(NetworkParameters params, int version) {
-        for (int v : params.getAcceptableAddressCodes()) {
-            if (version == v) {
-                return true;
-            }
-        }
+        if (version == params.getAddressHeader())
+            return true;
+        if (version == params.getP2SHHeader())
+            return true;
         return false;
     }
 

core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java

@@ -69,7 +69,7 @@ private static byte[] encode(byte[] keyBytes, boolean compressed) {
     public DumpedPrivateKey(@Nullable NetworkParameters params, String encoded) throws AddressFormatException {
         super(encoded);
         if (params != null && version != params.getDumpedPrivateKeyHeader())
-            throw new WrongNetworkException(version, new int[]{ params.getDumpedPrivateKeyHeader() });
+            throw new WrongNetworkException(version);
         if (bytes.length != 32 && bytes.length != 33) {
             throw new AddressFormatException("Wrong number of bytes for a private key, not 32 or 33");
         }

core/src/main/java/org/bitcoinj/core/NetworkParameters.java

@@ -100,7 +100,6 @@ public abstract class NetworkParameters {
     protected int spendableCoinbaseDepth;
     protected int subsidyDecreaseBlockCount;
 
-    protected int[] acceptableAddressCodes;
     protected String[] dnsSeeds;
     protected int[] addrSeeds;
     protected HttpDiscovery.Details[] httpSeeds = {};
@@ -346,15 +345,6 @@ public int getTargetTimespan() {
         return targetTimespan;
     }
 
-    /**
-     * The version codes that prefix addresses which are acceptable on this network. Although Satoshi intended these to
-     * be used for "versioning", in fact they are today used to discriminate what kind of data is contained in the
-     * address and to prevent accidentally sending coins across chains which would destroy them.
-     */
-    public int[] getAcceptableAddressCodes() {
-        return acceptableAddressCodes;
-    }
-
     /**
      * If we are running in testnet-in-a-box mode, we allow connections to nodes with 0 non-genesis blocks.
      */

core/src/main/java/org/bitcoinj/core/WrongNetworkException.java

@@ -16,8 +16,6 @@
 
 package org.bitcoinj.core;
 
-import java.util.Arrays;
-
 /**
  * This exception is thrown by the Address class when you try and decode an address with a version code that isn't
  * used by that network. You shouldn't allow the user to proceed in this case as they are trying to send money across
@@ -26,13 +24,9 @@
 public class WrongNetworkException extends AddressFormatException {
     /** The version code that was provided in the address. */
     public int verCode;
-    /** The list of acceptable versions that were expected given the addresses network parameters. */
-    public int[] acceptableVersions;
 
-    public WrongNetworkException(int verCode, int[] acceptableVersions) {
-        super("Version code of address did not match acceptable versions for network: " + verCode + " not in " +
-          Arrays.toString(acceptableVersions));
+    public WrongNetworkException(int verCode) {
+        super("Version code of address did not match acceptable versions for network: " + verCode);
         this.verCode = verCode;
-        this.acceptableVersions = acceptableVersions;
     }
 }

core/src/main/java/org/bitcoinj/params/MainNetParams.java

@@ -40,7 +40,6 @@ public MainNetParams() {
         dumpedPrivateKeyHeader = 128;
         addressHeader = 0;
         p2shHeader = 5;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         port = 8333;
         packetMagic = 0xf9beb4d9L;
         bip32HeaderPub = 0x0488B21E; //The 4 byte header that serializes in base58 to "xpub".

core/src/main/java/org/bitcoinj/params/TestNet2Params.java

@@ -36,7 +36,6 @@ public TestNet2Params() {
         port = 18333;
         addressHeader = 111;
         p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         interval = INTERVAL;
         targetTimespan = TARGET_TIMESPAN;
         maxTarget = Utils.decodeCompactBits(0x1d0fffffL);

core/src/main/java/org/bitcoinj/params/TestNet3Params.java

@@ -46,7 +46,6 @@ public TestNet3Params() {
         port = 18333;
         addressHeader = 111;
         p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         dumpedPrivateKeyHeader = 239;
         genesisBlock.setTime(1296688602L);
         genesisBlock.setDifficultyTarget(0x1d00ffffL);

core/src/main/java/org/bitcoinj/params/UnitTestParams.java

@@ -35,7 +35,6 @@ public UnitTestParams() {
         packetMagic = 0x0b110907;
         addressHeader = 111;
         p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         maxTarget = new BigInteger("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16);
         genesisBlock.setTime(System.currentTimeMillis() / 1000);
         genesisBlock.setDifficultyTarget(Block.EASIEST_DIFFICULTY_TARGET);

core/src/test/java/org/bitcoinj/core/AddressTest.java

@@ -105,7 +105,6 @@ public void errorPaths() {
         } catch (WrongNetworkException e) {
             // Success.
             assertEquals(e.verCode, MainNetParams.get().getAddressHeader());
-            assertTrue(Arrays.equals(e.acceptableVersions, TestNet3Params.get().getAcceptableAddressCodes()));
         } catch (AddressFormatException e) {
             fail();
         }
@@ -128,7 +127,6 @@ class AltNetwork extends MainNetParams {
                 id = "alt.network";
                 addressHeader = 48;
                 p2shHeader = 5;
-                acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
             }
         }
         AltNetwork altNetwork = new AltNetwork();