Merge branch 'master' into ldk-115

Author: Jasonvdb

example/App.tsx

@@ -611,6 +611,18 @@ const App = (): ReactElement => {
 							);
 						}}
 					/>
+					<Button
+						title={'Restart node'}
+						onPress={async (): Promise<void> => {
+							setMessage('Restarting...');
+							const res = await ldk.restart();
+							if (res.isErr()) {
+								setMessage(res.error.message);
+								return;
+							}
+							setMessage('Node Restarted');
+						}}
+					/>
 				</View>
 			</ScrollView>
 

example/electrum/index.ts

@@ -107,7 +107,7 @@ export const subscribeToHeader = async ({
 		network: selectedNetwork,
 		onReceive: async (data) => {
 			const hex = data[0].hex;
-			const hash = getBlockHashFromHex({ blockHex: hex });
+			const hash = await getBlockHashFromHex({ blockHex: hex });
 			const header = { ...data[0], hash };
 			await updateHeader({
 				header,

example/ios/Podfile.lock

@@ -302,7 +302,7 @@ PODS:
   - React-jsinspector (0.70.6)
   - React-logger (0.70.6):
     - glog
-  - react-native-ldk (0.0.95):
+  - react-native-ldk (0.0.97):
     - React
   - react-native-randombytes (3.6.1):
     - React-Core
@@ -593,7 +593,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f
   React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b
   React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0
-  react-native-ldk: 3608ec98dc228dc8ea4ca15e68a8b4562be7cfb5
+  react-native-ldk: 38eb5291779f3ef181fd6472e7cd5ebf15797f8d
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-tcp-socket: c1b7297619616b4c9caae6889bcb0aba78086989
   React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595
@@ -618,4 +618,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 686e912f33d09c328c075738266ee797003d369e
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0

example/ldk/index.ts

@@ -97,7 +97,7 @@ export const syncLdk = async (): Promise<Result<string>> => {
  */
 export const setupLdk = async (): Promise<Result<string>> => {
 	try {
-		await ldk.reset();
+		await ldk.stop();
 		const account = await getAccount();
 		const storageRes = await lm.setBaseStoragePath(
 			`${RNFS.DocumentDirectoryPath}/ldk/`,

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

@@ -42,7 +42,8 @@ enum class EventTypes {
     channel_manager_payment_claimed,
     emergency_force_close_channel,
     new_channel,
-    network_graph_updated
+    network_graph_updated,
+    channel_manager_restarted
 }
 //*****************************************************************
 
@@ -101,7 +102,8 @@ enum class LdkCallbackResponses {
     tx_set_unconfirmed,
     process_pending_htlc_forwards_success,
     claim_funds_success,
-    ldk_reset,
+    ldk_stop,
+    ldk_restart,
     close_channel_success,
     file_write_success
 }
@@ -142,6 +144,11 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
     private var ldkNetwork: Network? = null
     private var ldkCurrency: Currency? = null
 
+    //Keep these in memory for restarting the channel manager constructor
+    private var currentNetwork: String? = null
+    private var currentBlockchainTipHash: String? = null
+    private var currentBlockchainHeight: Double? = null
+
     //Static to be accessed from other classes
     companion object {
         lateinit var accountStoragePath: String
@@ -157,10 +164,6 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
 
     @ReactMethod
     fun setAccountStoragePath(storagePath: String, promise: Promise) {
-        if (accountStoragePath != "") {
-            return handleReject(promise, LdkErrors.already_init)
-        }
-
         val accountStoragePath = File(storagePath)
         val channelStoragePath = File("$storagePath/channels/")
 
@@ -397,8 +400,6 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
                         channelMonitors.add(it.toFile().readBytes())
                     }
 
-                println("***1***")
-
                 LdkEventEmitter.send(EventTypes.native_log, "Restoring node from disk2")
 
                 channelManagerConstructor = ChannelManagerConstructor(
@@ -419,7 +420,6 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
                     logger.logger
                 )
 
-                println("***2***")
             } else {
                 //New node
                 LdkEventEmitter.send(EventTypes.native_log, "Creating new channel manager")
@@ -451,11 +451,56 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
 
         peerHandler = channelManagerConstructor!!.nio_peer_handler
 
+        //Cached for restarts
+        currentNetwork = network
+        currentBlockchainTipHash = blockHash
+        currentBlockchainHeight = blockHeight
+
         handleResolve(promise, LdkCallbackResponses.channel_manager_init_success)
     }
+    @ReactMethod
+    fun restart(promise: Promise) {
+        if (channelManagerConstructor == null) {
+            return handleReject(promise, LdkErrors.init_channel_manager)
+        }
+
+        //Node was never started
+        val currentNetwork = currentNetwork ?: return handleReject(promise, LdkErrors.init_channel_manager)
+        val currentBlockchainTipHash = currentBlockchainTipHash ?: return handleReject(promise, LdkErrors.init_channel_manager)
+        val currentBlockchainHeight = currentBlockchainHeight ?: return handleReject(promise, LdkErrors.init_channel_manager)
+
+        LdkEventEmitter.send(EventTypes.native_log, "Stopping LDK background tasks")
+
+        //Reset only objects created by initChannelManager
+        channelManagerConstructor?.interrupt()
+        channelManagerConstructor = null
+        channelManager = null
+        peerManager = null
+        peerHandler = null
+
+        LdkEventEmitter.send(EventTypes.native_log, "Starting LDK background tasks again")
+
+        val initPromise = PromiseImpl(
+            { resolve ->
+                LdkEventEmitter.send(EventTypes.channel_manager_restarted, "")
+                LdkEventEmitter.send(EventTypes.native_log, "LDK restarted successfully")
+                handleResolve(promise, LdkCallbackResponses.ldk_restart)
+        },
+            { reject ->
+                LdkEventEmitter.send(EventTypes.native_log, "Error restarting LDK. Error: $reject")
+                handleReject(promise, LdkErrors.unknown_error)
+        })
+
+        initChannelManager(
+            currentNetwork,
+            currentBlockchainTipHash,
+            currentBlockchainHeight,
+            initPromise
+        )
+    }
 
     @ReactMethod
-    fun reset(promise: Promise) {
+    fun stop(promise: Promise) {
         channelManagerConstructor?.interrupt()
         channelManagerConstructor = null
         chainMonitor = null
@@ -467,10 +512,8 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
         peerHandler = null
         ldkNetwork = null
         ldkCurrency = null
-        accountStoragePath = ""
-        channelStoragePath = ""
 
-        handleResolve(promise, LdkCallbackResponses.ldk_reset)
+        handleResolve(promise, LdkCallbackResponses.ldk_stop)
     }
 
     //MARK: Update methods
@@ -488,7 +531,7 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
     }
 
     @ReactMethod
-    fun syncToTip(header: String, height: Double, promise: Promise) {
+    fun syncToTip(header: String, blockHash: String, height: Double, promise: Promise) {
         channelManager ?: return handleReject(promise, LdkErrors.init_channel_manager)
         chainMonitor ?: return handleReject(promise, LdkErrors.init_chain_monitor)
 
@@ -499,6 +542,10 @@ class LdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMod
             return handleReject(promise, LdkErrors.unknown_error, Error(e))
         }
 
+        //Used for quick restarts
+        currentBlockchainTipHash = blockHash
+        currentBlockchainHeight = height
+
         handleResolve(promise, LdkCallbackResponses.chain_sync_success)
     }
 

lib/ios/Ldk.m

@@ -30,7 +30,9 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   blockHeight:(NSInteger *)blockHeight
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(reset:(RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(restart:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(stop:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
 //MARK: Update methods
@@ -44,6 +46,7 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(syncToTip:(NSString *)header
+                  blockHash:(NSString *)blockHash
                   height:(NSInteger *)height
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)

lib/ios/Ldk.swift

@@ -84,7 +84,8 @@ enum LdkCallbackResponses: String {
     case tx_set_unconfirmed = "tx_set_unconfirmed"
     case process_pending_htlc_forwards_success = "process_pending_htlc_forwards_success"
     case claim_funds_success = "claim_funds_success"
-    case ldk_reset = "ldk_reset"
+    case ldk_stop = "ldk_stop"
+    case ldk_restart = "ldk_restart"
     case close_channel_success = "close_channel_success"
     case file_write_success = "file_write_success"
     case abandon_payment_success = "abandon_payment_success"
@@ -444,26 +445,32 @@ class Ldk: NSObject {
 
     func addForegroundObserver() {
         removeForegroundObserver()
-        NotificationCenter.default.addObserver(self, selector: #selector(restartChannelManagerConstructor), name: UIApplication.didBecomeActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(restartOnForeground), name: UIApplication.didBecomeActiveNotification, object: nil)
     }
 
     func removeForegroundObserver() {
         NotificationCenter.default.removeObserver(self, name: UIApplication.didBecomeActiveNotification, object: nil)
     }
 
+    /// Used by event listener so responses are not handled
+    @objc
+    func restartOnForeground() {
+        restart { res in } reject: { code, message, error in }
+    }
+    
     /// Restarts channel manager constructor to get a new TCP peer handler
     @objc
-    func restartChannelManagerConstructor() {
+    func restart(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard channelManagerConstructor != nil else {
             //Wasn't yet started
-            return
+            return handleReject(reject, .init_channel_manager)
         }
 
         guard let currentNetwork = self.currentNetwork,
               let currentBlockchainTipHash = self.currentBlockchainTipHash,
               let currentBlockchainHeight = self.currentBlockchainHeight else {
             //Node was never started
-            return
+            return handleReject(reject, .init_channel_manager)
         }
 
         LdkEventEmitter.shared.send(withEvent: .native_log, body: "Stopping LDK background tasks")
@@ -480,16 +487,19 @@ class Ldk: NSObject {
             //Notify JS that a sync is required
             LdkEventEmitter.shared.send(withEvent: .channel_manager_restarted, body: "")
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "LDK restarted successfully")
+            
+            return handleResolve(resolve, .ldk_restart)
         } reject: { errorCode, errorMessage, error in
-            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error restarting LDK. \(errorCode) \(errorMessage)")
+            LdkEventEmitter.shared.send(withEvent: .native_log, body: "Error restarting LDK. \(String(describing: errorCode)) \(String(describing: errorMessage))")
+            handleReject(reject, .unknown_error)
         }
     }
 
     @objc
-    func reset(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func stop(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let cm = channelManagerConstructor else {
             //Wasn't yet started
-            return handleResolve(resolve, .ldk_reset)
+            return handleResolve(resolve, .ldk_stop)
         }
 
         removeForegroundObserver() //LDK was intentionally stopped and we shouldn't attempt a restart
@@ -504,10 +514,8 @@ class Ldk: NSObject {
         peerHandler = nil
         ldkNetwork = nil
         ldkCurrency = nil
-        Ldk.accountStoragePath = nil
-        Ldk.channelStoragePath = nil
 
-        return handleResolve(resolve, .ldk_reset)
+        return handleResolve(resolve, .ldk_stop)
     }
 
     //MARK: Update methods
@@ -525,7 +533,7 @@ class Ldk: NSObject {
     }
 
     @objc
-    func syncToTip(_ header: NSString, height: NSInteger, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func syncToTip(_ header: NSString, blockHash: NSString, height: NSInteger, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         //Sync ChannelMonitors and ChannelManager to chain tip
         guard let channelManager = channelManager else {
             return handleReject(reject, .init_channel_manager)
@@ -538,6 +546,10 @@ class Ldk: NSObject {
         channelManager.asConfirm().bestBlockUpdated(header: String(header).hexaBytes, height: UInt32(height))
         chainMonitor.asConfirm().bestBlockUpdated(header: String(header).hexaBytes, height: UInt32(height))
 
+        //Used for quick restarts
+        currentBlockchainTipHash = blockHash
+        currentBlockchainHeight = height
+
         return handleResolve(resolve, .chain_sync_success)
     }
 

lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@synonymdev/react-native-ldk",
   "title": "React Native LDK",
-  "version": "0.0.95",
+  "version": "0.0.97",
   "description": "React Native wrapper for LDK",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",