Merge pull request #178 from synonymdev/backup-fixes

Specify network when restoring from remote backup

Author: Jasonvdb

example/Dev.tsx

@@ -14,16 +14,17 @@ import {
 import Clipboard from '@react-native-clipboard/clipboard';
 import {
 	backupAccount,
+	getAddressBalance,
 	importAccount,
 	setupLdk,
 	syncLdk,
-	getAddressBalance,
 	updateHeader,
 } from './ldk';
 import { connectToElectrum, subscribeToHeader } from './electrum';
 import ldk from '@synonymdev/react-native-ldk/dist/ldk';
 import lm, {
 	EEventTypes,
+	ENetworks,
 	TChannelManagerClaim,
 	TChannelManagerPaymentPathFailed,
 	TChannelManagerPaymentPathSuccessful,
@@ -646,6 +647,7 @@ const Dev = (): ReactElement => {
 							const restoreRes = await lm.restoreFromRemoteServer({
 								account,
 								serverDetails: backupServerDetails,
+								network: ENetworks.regtest,
 								overwrite: true,
 							});
 

lib/android/src/main/java/com/reactnativeldk/LdkModule.kt

@@ -1144,25 +1144,22 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
     @ReactMethod
     fun backupSetup(seed: String, network: String, server: String, serverPubKey: String, promise: Promise) {
         val seedBytes = seed.hexa()
-        if (keysManager == null) {
-            val nanoSeconds = System.currentTimeMillis() * 1000
-            val seconds = nanoSeconds / 1000 / 1000
-            if (seedBytes.count() != 32) {
-                return handleReject(promise, LdkErrors.invalid_seed_hex)
-            }
-
-            keysManager = KeysManager.of(seedBytes, seconds, nanoSeconds.toInt())
+        if (seedBytes.count() != 32) {
+            return handleReject(promise, LdkErrors.invalid_seed_hex)
         }
 
-        val pubKeyRes = keysManager!!.as_NodeSigner().get_node_id(Recipient.LDKRecipient_Node)
+        val nanoSeconds = System.currentTimeMillis() * 1000
+        val seconds = nanoSeconds / 1000 / 1000
+        val keysManager = KeysManager.of(seedBytes, seconds, nanoSeconds.toInt())
+        val pubKeyRes = keysManager.as_NodeSigner().get_node_id(Recipient.LDKRecipient_Node)
         if (!pubKeyRes.is_ok) {
             return handleReject(promise, LdkErrors.backup_setup_failed)
         }
 
         try {
             BackupClient.skipRemoteBackup = false
             BackupClient.setup(
-                keysManager!!._node_secret_key,
+                keysManager._node_secret_key,
                 (pubKeyRes as Result_PublicKeyNoneZ_OK).res,
                 network,
                 server,