From 32360fea8d525901fa2a6d8363f24bdaf0794d7e Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Tue, 24 Jun 2014 18:37:19 +0200 Subject: [PATCH] Give regtest mode its own ID so wallets don't get mixed up between regtest and testnet. --- .../main/java/com/google/bitcoin/core/NetworkParameters.java | 4 ++++ .../main/java/com/google/bitcoin/params/RegTestParams.java | 1 + 2 files changed, 5 insertions(+) diff --git a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java index 219cf79c..b3258560 100644 --- a/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java +++ b/core/src/main/java/com/google/bitcoin/core/NetworkParameters.java @@ -54,6 +54,8 @@ public abstract class NetworkParameters implements Serializable { public static final String ID_MAINNET = "org.bitcoin.production"; /** The string returned by getId() for the testnet. */ public static final String ID_TESTNET = "org.bitcoin.test"; + /** The string returned by getId() for regtest mode. */ + public static final String ID_REGTEST = "org.bitcoin.regtest"; /** Unit test network. */ public static final String ID_UNITTESTNET = "com.google.bitcoin.unittest"; @@ -207,6 +209,8 @@ public abstract class NetworkParameters implements Serializable { return TestNet3Params.get(); } else if (id.equals(ID_UNITTESTNET)) { return UnitTestParams.get(); + } else if (id.equals(ID_REGTEST)) { + return RegTestParams.get(); } else { return null; } diff --git a/core/src/main/java/com/google/bitcoin/params/RegTestParams.java b/core/src/main/java/com/google/bitcoin/params/RegTestParams.java index 9de6a7ba..295361e1 100644 --- a/core/src/main/java/com/google/bitcoin/params/RegTestParams.java +++ b/core/src/main/java/com/google/bitcoin/params/RegTestParams.java @@ -34,6 +34,7 @@ public class RegTestParams extends TestNet2Params { maxTarget = MAX_TARGET; subsidyDecreaseBlockCount = 150; port = 18444; + id = ID_REGTEST; } @Override