Merge branch 'testnet' into mainnet

ACINQ · Mar 29, 2019 · 7a14ef8 · 7a14ef8
2 parents e16fc5e + 2c88883
commit 7a14ef8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
     applicationId "fr.acinq.eclair.wallet.mainnet2"
     minSdkVersion 21
     targetSdkVersion 28
-    versionCode 42
-    versionName "0.4.2"
+    versionCode 43
+    versionName "0.4.3-DEV"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     multiDexEnabled true
   }

diff --git a/app/src/main/java/fr/acinq/eclair/wallet/activities/StartupActivity.java b/app/src/main/java/fr/acinq/eclair/wallet/activities/StartupActivity.java
@@ -60,6 +60,7 @@
 import fr.acinq.eclair.wallet.utils.EclairException;
 import fr.acinq.eclair.wallet.utils.EncryptedBackup;
 import fr.acinq.eclair.wallet.utils.WalletUtils;
+import fr.acinq.eclair.wire.NodeAddress$;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -460,6 +461,8 @@ protected Integer doInBackground(Object... params) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app.getBaseContext());
         Class.forName("org.sqlite.JDBC");
         final Setup setup = new Setup(datadir, WalletUtils.getOverrideConfig(prefs), Option.apply(seed), app.system);
+        setup.nodeParams().peersDb().addOrUpdatePeer(Constants.ACINQ_NODE_URI.nodeId(),
+          NodeAddress$.MODULE$.fromParts(Constants.ACINQ_NODE_URI.address().getHost(), Constants.ACINQ_NODE_URI.address().getPort()).get());
 
         // ui refresh schedulers
         final ActorRef paymentsRefreshScheduler = app.system.actorOf(Props.create(RefreshScheduler.PaymentsRefreshScheduler.class), "PaymentsRefreshScheduler");