expose net_graph from CMC and fix CStr clone behavior

Author: arik-so

bindings/batteries/ChannelManagerConstructor.swift

@@ -31,11 +31,11 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
     let logger: Logger
     fileprivate var customPersister: CustomChannelManagerPersister?
     fileprivate var customEventHandler: EventHandler?
-    fileprivate var net_graph: NetworkGraph?
+    public private(set) var net_graph: NetworkGraph?
     fileprivate var graph_msg_handler: NetGraphMsgHandler?
     fileprivate var scorer: MultiThreadedLockableScore?
     fileprivate let keysInterface: KeysInterface!
-    public var payer: InvoicePayer?
+    public private(set) var payer: InvoicePayer?
     public let peerManager: PeerManager
 
 
@@ -287,7 +287,7 @@ fileprivate class CustomEventHandler: EventHandler {
     }
 
     override func handle_event(event: Event) {
-        self.handler.handle_event(event: event)
+        self.handler.handle_event(event: event.clone())
     }
 
 }

xcode/DirectBindingsApp/DirectBindingsApp.xcodeproj/project.pbxproj

@@ -730,6 +730,7 @@
 		07C753E126D6BE4E00081BF8 /* HumanObjectPeerTestInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07C753DF26D6BE4E00081BF8 /* HumanObjectPeerTestInstance.swift */; };
 		07C753F326D9560200081BF8 /* PromiseKit in Frameworks */ = {isa = PBXBuildFile; productRef = 07C753F226D9560200081BF8 /* PromiseKit */; };
 		2DD11C86114C6827D6E338A2 /* BlockchainObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 076D2A6D28039ACB00970AFC /* BlockchainObserver.swift */; };
+		2DD11F1338488839D8955B7A /* PolarIntegrationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DD1172C8DF0B244CF69B0FA /* PolarIntegrationTest.swift */; };
 		2DD11F99CF6E547FA7FB9225 /* RegtestBlockchainManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 076D2A6B280399F500970AFC /* RegtestBlockchainManager.swift */; };
 /* End PBXBuildFile section */
 
@@ -1136,6 +1137,7 @@
 		07BBCE6726D03B49000D96C4 /* TestBroadcasterInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestBroadcasterInterface.swift; sourceTree = "<group>"; };
 		07C753DF26D6BE4E00081BF8 /* HumanObjectPeerTestInstance.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HumanObjectPeerTestInstance.swift; sourceTree = "<group>"; };
 		07C753E826D954B100081BF8 /* PolarConnectionExperiment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PolarConnectionExperiment.swift; sourceTree = "<group>"; };
+		2DD1172C8DF0B244CF69B0FA /* PolarIntegrationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PolarIntegrationTest.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1174,6 +1176,7 @@
 				076D1D2227F3828E00970AFC /* BTCVarInt.swift */,
 				076D1D2527F38FDD00970AFC /* BitcoinTests.swift */,
 				076D1D2727F397E600970AFC /* BTCHashing.swift */,
+				2DD1172C8DF0B244CF69B0FA /* PolarIntegrationTest.swift */,
 			);
 			path = bitcoin;
 			sourceTree = "<group>";
@@ -2559,6 +2562,7 @@
 				076D237227FC219100970AFC /* Result_NoneAPIErrorZ.swift in Sources */,
 				2DD11F99CF6E547FA7FB9225 /* RegtestBlockchainManager.swift in Sources */,
 				2DD11C86114C6827D6E338A2 /* BlockchainObserver.swift in Sources */,
+				2DD11F1338488839D8955B7A /* PolarIntegrationTest.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

xcode/DirectBindingsApp/DirectBindingsAppTests/HumanObjectPeerTestInstance.swift

@@ -205,11 +205,11 @@ public class HumanObjectPeerTestInstance {
             }
 
             func handle_event(event: Event) {
-                let eventClone = event.clone()
-                print("peer \(self.master.seed) received event: \(eventClone.getValueType())")
+                // let eventClone = event.clone()
+                print("peer \(self.master.seed) received event: \(event.getValueType())")
                 Task {
                     // clone to avoid deallocation-related issues
-                    await master.pendingEventTracker.addEvent(event: eventClone)
+                    await master.pendingEventTracker.addEvent(event: event)
                 }
             }
 

xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/bitcoin/PolarIntegrationTest.swift

@@ -34,9 +34,9 @@ public class PolarIntegrationTest: XCTestCase {
 
 		let config = UserConfig()
 		let lightningNetwork = LDKNetwork_Regtest
-        let genesisHash = try await rpcInterface.getBlockHash(height: 0)
+		let genesisHash = try await rpcInterface.getBlockHash(height: 0)
 		let reversedGenesisHash = [UInt8](genesisHash.reversed())
-        let chaintipHash = try await rpcInterface.getChaintipHash()
+		let chaintipHash = try await rpcInterface.getChaintipHash()
 		let reversedChaintipHash = [UInt8](chaintipHash.reversed())
 		let chaintipHeight = try await rpcInterface.getChaintipHeight()
 		let networkGraph = NetworkGraph(genesis_hash: reversedGenesisHash)
@@ -105,6 +105,22 @@ public class PolarIntegrationTest: XCTestCase {
 		let channelOpenResult = channelManager.create_channel(their_network_key: lndPubkey, channel_value_satoshis: channelValue, push_msat: reserveAmount, user_channel_id: 42, override_config: config)
 		XCTAssertTrue(channelOpenResult.isOk())
 
+		if let channelOpenError = channelOpenResult.getError() {
+			print("error type: \(channelOpenError.getValueType())")
+			if let error = channelOpenError.getValueAsAPIMisuseError() {
+				print("API misuse error: \(error.getErr())")
+			} else if let error = channelOpenError.getValueAsChannelUnavailable() {
+				print("channel unavailable error: \(error.getErr())")
+			} else if let error = channelOpenError.getValueAsFeeRateTooHigh() {
+				print("excessive fee rate error: \(error.getErr())")
+			} else if let error = channelOpenError.getValueAsIncompatibleShutdownScript() {
+				print("incompatible shutdown script: \(error.getScript())")
+			} else if let error = channelOpenError.getValueAsRouteError() {
+				print("route error: \(error.getErr())")
+			}
+			return
+		}
+
 		let managerEvents = await channelManagerAndNetworkGraphPersisterAndEventHandler.getManagerEvents(expectedCount: 1)
 		XCTAssertEqual(managerEvents.count, 1)
 
@@ -280,9 +296,8 @@ public class PolarIntegrationTest: XCTestCase {
 			}
 
 			func handle_event(event: Event) {
-				let clonedEvent = event.dangle().clone()
 				Task {
-					await self.eventTracker.addEvent(event: clonedEvent)
+					await self.eventTracker.addEvent(event: event)
 				}
 			}
 
@@ -299,7 +314,7 @@ public class PolarIntegrationTest: XCTestCase {
 				private(set) var pendingEvents: [Event] = []
 				private(set) var continuations: [CheckedContinuation<Void, Never>] = []
 
-				private func triggerContinuations(){
+				private func triggerContinuations() {
 					let continuations = self.continuations
 					self.continuations.removeAll()
 					for currentContinuation in continuations {
@@ -325,7 +340,7 @@ public class PolarIntegrationTest: XCTestCase {
 					return self.pendingEvents
 				}
 
-				func getAndClearEvents() -> [Event]{
+				func getAndClearEvents() -> [Event] {
 					let events = self.pendingEvents
 					self.pendingEvents.removeAll()
 					return events
@@ -353,15 +368,19 @@ public class PolarIntegrationTest: XCTestCase {
 	private class func hexStringToBytes(hexString: String) -> [UInt8]? {
 		let hexStr = hexString.dropFirst(hexString.hasPrefix("0x") ? 2 : 0)
 
-		guard hexStr.count % 2 == 0 else { return nil }
+		guard hexStr.count % 2 == 0 else {
+			return nil
+		}
 
 		var newData = [UInt8]()
 
 		var indexIsEven = true
 		for i in hexStr.indices {
 			if indexIsEven {
 				let byteRange = i...hexStr.index(after: i)
-				guard let byte = UInt8(hexStr[byteRange], radix: 16) else { return nil }
+				guard let byte = UInt8(hexStr[byteRange], radix: 16) else {
+					return nil
+				}
 				newData.append(byte)
 			}
 			indexIsEven.toggle()

xcode/DirectBindingsApp/ldk_ver.h

@@ -8,8 +8,8 @@ static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
 	return 0;
 }
 
-#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a"
-#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.1"
+#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a-dirty"
+#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.2-dirty"
 static inline const char* check_get_ldk_version() {
 	LDKStr bin_ver = _ldk_get_compiled_version();
 	if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {

xcode/LDKFramework/ldk_ver.h

@@ -8,8 +8,8 @@ static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
 	return 0;
 }
 
-#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a"
-#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.1"
+#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a-dirty"
+#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.2-dirty"
 static inline const char* check_get_ldk_version() {
 	LDKStr bin_ver = _ldk_get_compiled_version();
 	if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {

xcode/LDKFramework_Mac/ldk_ver.h

@@ -8,8 +8,8 @@ static inline int _ldk_strncmp(const char *s1, const char *s2, uint64_t n) {
 	return 0;
 }
 
-#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a"
-#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.1"
+#define _LDK_HEADER_VER "v0.0.106-10-ga86d8b78fedd014a-dirty"
+#define _LDK_C_BINDINGS_HEADER_VER "v0.0.106.2-dirty"
 static inline const char* check_get_ldk_version() {
 	LDKStr bin_ver = _ldk_get_compiled_version();
 	if (_ldk_strncmp(_LDK_HEADER_VER, (const char*)bin_ver.chars, bin_ver.len) != 0) {