Merge pull request #24 from haraldh/testnet3

Add testnet3 mode
ksedgwic · Jul 31, 2014 · 1c3eadf · 1c3eadf
2 parents b64df9d + 57f1c5b
commit 1c3eadf
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 9 deletions.
diff --git a/assets/checkpoints-testnet b/assets/checkpoints-testnet
diff --git a/src/com/bonsai/wallet32/Constants.java b/src/com/bonsai/wallet32/Constants.java
@@ -0,0 +1,37 @@
+package com.bonsai.wallet32;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+import com.google.bitcoin.core.NetworkParameters;
+import com.google.bitcoin.params.MainNetParams;
+import com.google.bitcoin.params.TestNet3Params;
+
+/**
+ * @author Harald Hoyer
+ */
+public class Constants
+{
+	private static NetworkParameters networkParameters = null;
+	public static String CHECKPOINTS_FILENAME = null;
+
+	public static NetworkParameters getNetworkParameters(Context context)
+	{
+		if (networkParameters == null) {
+			boolean TESTNET = true;
+
+			try {
+				PackageInfo pinfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+				TESTNET = pinfo.versionName.contains("-test");
+			} catch (PackageManager.NameNotFoundException e) {
+				e.printStackTrace();
+			}
+
+			networkParameters = TESTNET ? TestNet3Params.get() : MainNetParams.get();
+			CHECKPOINTS_FILENAME = TESTNET ? "checkpoints-testnet" : "checkpoints";
+		}
+
+		return networkParameters;
+	}
+}
diff --git a/src/com/bonsai/wallet32/PairWalletActivity.java b/src/com/bonsai/wallet32/PairWalletActivity.java
@@ -21,7 +21,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.bitcoin.core.NetworkParameters;
-import com.google.bitcoin.params.MainNetParams;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -142,7 +141,7 @@ protected Void doInBackground(JSONObject... args)
 
             WalletApplication wallapp =
                 (WalletApplication) getApplicationContext();
-            NetworkParameters params = MainNetParams.get();
+            NetworkParameters params = Constants.getNetworkParameters(wallapp);
             String filePrefix = "wallet32";
 
             // Setup a wallet with the restore seed.

diff --git a/src/com/bonsai/wallet32/RestoreWalletActivity.java b/src/com/bonsai/wallet32/RestoreWalletActivity.java
@@ -44,7 +44,6 @@
 import com.google.bitcoin.core.NetworkParameters;
 import com.google.bitcoin.crypto.MnemonicCodeX;
 import com.google.bitcoin.crypto.MnemonicException;
-import com.google.bitcoin.params.MainNetParams;
 
 public class RestoreWalletActivity extends ActionBarActivity {
 
@@ -87,7 +86,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void restoreWallet(View view) {
         mLogger.info("restore wallet");
 
-        NetworkParameters params = MainNetParams.get();
+        NetworkParameters params = Constants.getNetworkParameters(getApplicationContext());
 
         String filePrefix = "wallet32";
 

diff --git a/src/com/bonsai/wallet32/WalletService.java b/src/com/bonsai/wallet32/WalletService.java
@@ -78,7 +78,6 @@
 import com.google.bitcoin.core.WrongNetworkException;
 import com.google.bitcoin.crypto.KeyCrypter;
 import com.google.bitcoin.crypto.MnemonicCodeX;
-import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.wallet.WalletTransaction;
 import com.google.common.util.concurrent.FutureCallback;
@@ -461,7 +460,7 @@ protected Integer doInBackground(Long... params)
 
             mLogger.info("getting network parameters");
 
-            mParams = MainNetParams.get();
+            mParams = Constants.getNetworkParameters(getApplicationContext());
 
             // Try to restore existing wallet.
             mHDWallet = null;
@@ -492,7 +491,7 @@ protected Integer doInBackground(Long... params)
             InputStream chkpntis = null;
             if (scanTime != 0) {
                 try {
-                    chkpntis = getAssets().open("checkpoints");
+                    chkpntis = getAssets().open(Constants.CHECKPOINTS_FILENAME);
                 } catch (IOException e) {
                     chkpntis = null;
                 }

diff --git a/src/com/bonsai/wallet32/WalletUtil.java b/src/com/bonsai/wallet32/WalletUtil.java
@@ -54,7 +54,6 @@
 import com.google.bitcoin.crypto.KeyCrypterScrypt;
 import com.google.bitcoin.crypto.MnemonicCodeX;
 import com.google.bitcoin.crypto.TransactionSignature;
-import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.script.Script;
 import com.google.bitcoin.script.ScriptBuilder;
 import com.google.protobuf.ByteString;
@@ -120,7 +119,7 @@ public static void createWallet(Context context) {
         WalletApplication wallapp =
             (WalletApplication) context.getApplicationContext();
 
-        NetworkParameters params = MainNetParams.get();
+        NetworkParameters params = Constants.getNetworkParameters(context);
 
         // Generate a new seed.
         SecureRandom random = new SecureRandom();