Update batteries to work with version 0.0.14

arik-so · arik-so · commit ad8778169775 · 2022-01-05T13:54:39.000-08:00
diff --git a/bindings/LDK/structs/BackgroundProcessor.swift b/bindings/LDK/structs/BackgroundProcessor.swift
@@ -6,20 +6,22 @@ public class BackgroundProcessor: NativeTypeWrapper {
     internal var cOpaqueStruct: LDKBackgroundProcessor?
 
 
-	/* DEFAULT_CONSTRUCTOR_START */
-    #warning("This method passes non-cloneable objects by owned value. Here be dragons.")
-@available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
-public init(persister: ChannelManagerPersister, event_handler: EventHandler, chain_monitor: ChainMonitor, channel_manager: ChannelManager, net_graph_msg_handler: NetGraphMsgHandler, peer_manager: PeerManager, logger: Logger) {
-    	Self.instanceCounter += 1
-		self.instanceNumber = Self.instanceCounter
-    	
+    /* DEFAULT_CONSTRUCTOR_START */
+#warning("This method passes non-cloneable objects by owned value. Here be dragons.")
+    @available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
+    public init(persister: ChannelManagerPersister, event_handler: EventHandler, chain_monitor: ChainMonitor, channel_manager: ChannelManager, net_graph_msg_handler: NetGraphMsgHandler?, peer_manager: PeerManager, logger: Logger) {
+        Self.instanceCounter += 1
+        self.instanceNumber = Self.instanceCounter
+        
+        let graphMessageHandler = net_graph_msg_handler?.dangle().cOpaqueStruct! ?? LDKNetGraphMsgHandler(inner: nil, is_owned: true)
+        
         self.cOpaqueStruct = withUnsafePointer(to: chain_monitor.cOpaqueStruct!) { (chain_monitorPointer: UnsafePointer<LDKChainMonitor>) in
-withUnsafePointer(to: channel_manager.cOpaqueStruct!) { (channel_managerPointer: UnsafePointer<LDKChannelManager>) in
-withUnsafePointer(to: peer_manager.cOpaqueStruct!) { (peer_managerPointer: UnsafePointer<LDKPeerManager>) in
-BackgroundProcessor_start(persister.cOpaqueStruct!, event_handler.cOpaqueStruct!, chain_monitorPointer, channel_managerPointer, net_graph_msg_handler.cOpaqueStruct!, peer_managerPointer, logger.cOpaqueStruct!)
-}
-}
-}
+            withUnsafePointer(to: channel_manager.cOpaqueStruct!) { (channel_managerPointer: UnsafePointer<LDKChannelManager>) in
+                withUnsafePointer(to: peer_manager.cOpaqueStruct!) { (peer_managerPointer: UnsafePointer<LDKPeerManager>) in
+                    BackgroundProcessor_start(persister.cOpaqueStruct!, event_handler.cOpaqueStruct!, chain_monitorPointer, channel_managerPointer, graphMessageHandler, peer_managerPointer, logger.cOpaqueStruct!)
+                }
+            }
+        }
         super.init(conflictAvoidingVariableName: 0)
     }
     /* DEFAULT_CONSTRUCTOR_END */
diff --git a/bindings/batteries/ChannelManagerConstructor.swift b/bindings/batteries/ChannelManagerConstructor.swift
@@ -27,7 +27,10 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
     let logger: Logger
     fileprivate var customPersister: CustomChannelManagerPersister?
-    fileprivate var customEventHandler: CustomEventHandler?
+    fileprivate var customEventHandler: EventHandler?
+    fileprivate var net_graph: NetworkGraph?
+    fileprivate var graph_msg_handler: NetGraphMsgHandler?
+    fileprivate var payer: InvoicePayer?
     public let peerManager: PeerManager
 
 
@@ -42,7 +45,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
     private let chain_monitor: ChainMonitor
 
 
-    public init(channel_manager_serialized: [UInt8], channel_monitors_serialized: [[UInt8]], keys_interface: KeysInterface, fee_estimator: FeeEstimator, chain_monitor: ChainMonitor, filter: Filter?, router: NetGraphMsgHandler?, tx_broadcaster: BroadcasterInterface, logger: Logger) throws {
+    public init(channel_manager_serialized: [UInt8], channel_monitors_serialized: [[UInt8]], keys_interface: KeysInterface, fee_estimator: FeeEstimator, chain_monitor: ChainMonitor, filter: Filter?, net_graph: NetworkGraph?, tx_broadcaster: BroadcasterInterface, logger: Logger) throws {
 
         var monitors: [LDKChannelMonitor] = []
         self.channel_monitors = []
@@ -56,9 +59,9 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
             let value: LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZPtr = channelMonitorResult.cOpaqueStruct!.contents
             let a: LDKThirtyTwoBytes = value.result!.pointee.a
-            var b: LDKChannelMonitor = value.result!.pointee.b
+            let b: LDKChannelMonitor = value.result!.pointee.b
 
-            var clonedChannelMonitor = ChannelMonitor(pointer: b).dangle().clone()
+            let clonedChannelMonitor = ChannelMonitor(pointer: b).dangle().clone()
             // var clonedChannelMonitor = currentChannelMonitor.clone(orig: currentChannelMonitor)
             clonedChannelMonitor.cOpaqueStruct?.is_owned = false // is_owned should never have to be modified
 
@@ -87,13 +90,18 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
         self.logger = logger
 
         let random_data = keys_interface.get_secure_random_bytes();
-        if let router = router {
-            let messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: router.as_RoutingMessageHandler())
-            self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
+        
+        self.net_graph = net_graph
+        let noCustomMessages = IgnoringMessageHandler()
+        var messageHandler: MessageHandler!
+        if let netGraph = net_graph {
+            self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: self.graph_msg_handler!.as_RoutingMessageHandler())
         } else {
-            let messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: IgnoringMessageHandler().as_RoutingMessageHandler())
-            self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
         }
+        
+        self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
 
         if let filter = filter {
             for (currentMonitor, _) in self.channel_monitors {
@@ -112,7 +120,8 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
     /**
      * Constructs a channel manager from the given interface implementations
      */
-    public init(network: LDKNetwork, config: UserConfig, current_blockchain_tip_hash: [UInt8], current_blockchain_tip_height: UInt32, keys_interface: KeysInterface, fee_estimator: FeeEstimator, chain_monitor: ChainMonitor, router: NetGraphMsgHandler?, tx_broadcaster: BroadcasterInterface, logger: Logger) {
+    public init(network: LDKNetwork, config: UserConfig, current_blockchain_tip_hash: [UInt8], current_blockchain_tip_height: UInt32, keys_interface: KeysInterface, fee_estimator: FeeEstimator, chain_monitor: ChainMonitor, net_graph: NetworkGraph?, tx_broadcaster: BroadcasterInterface, logger: Logger) {
+        
         self.channel_monitors = []
         self.channel_manager_latest_block_hash = nil
         self.chain_monitor = chain_monitor
@@ -122,13 +131,18 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
         self.logger = logger
 
         let random_data = keys_interface.get_secure_random_bytes();
-        if let router = router {
-            let messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: router.as_RoutingMessageHandler())
-            self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
+        
+        self.net_graph = net_graph
+        let noCustomMessages = IgnoringMessageHandler()
+        var messageHandler: MessageHandler!
+        if let netGraph = net_graph {
+            self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: self.graph_msg_handler!.as_RoutingMessageHandler())
         } else {
-            let messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: IgnoringMessageHandler().as_RoutingMessageHandler())
-            self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
         }
+        self.peerManager = PeerManager(message_handler: messageHandler.dangle(), our_node_secret: keys_interface.get_node_secret(), ephemeral_random_data: random_data, logger: logger, custom_message_handler: noCustomMessages.as_CustomMessageHandler())
+        
 
         super.init(conflictAvoidingVariableName: 0)
         // try! self.peerManager.addAnchor(anchor: self)
@@ -147,7 +161,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
      * This also spawns a background thread which will call the appropriate methods on the provided
      * ChannelManagerPersister as required.
      */
-    public func chain_sync_completed(persister: ExtendedChannelManagerPersister) {
+    public func chain_sync_completed(persister: ExtendedChannelManagerPersister, scorer: MultiThreadedLockableScore?) {
 
         if self.backgroundProcessor != nil {
             return
@@ -169,8 +183,19 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         self.customPersister = CustomChannelManagerPersister(handler: persister)
         self.customEventHandler = CustomEventHandler(handler: persister)
-        let netGraphMessageHandler = NetGraphMsgHandler(pointer: LDKNetGraphMsgHandler(inner: nil, is_owned: false))
-        self.backgroundProcessor = BackgroundProcessor(persister: self.customPersister!, event_handler: self.customEventHandler!, chain_monitor: self.chain_monitor, channel_manager: self.channelManager, net_graph_msg_handler: netGraphMessageHandler, peer_manager: self.peerManager, logger: self.logger)
+//        let netGraphMessageHandler = NetGraphMsgHandler(pointer: LDKNetGraphMsgHandler(inner: nil, is_owned: false))
+        
+        if let netGraph = self.net_graph, let scorer = scorer {
+            let router = DefaultRouter(network_graph: netGraph, logger: self.logger)
+            self.payer = InvoicePayer(payer: self.channelManager.as_Payer(), router: router.as_Router(), scorer: scorer, logger: self.logger, event_handler: self.customEventHandler!, retry_attempts: RetryAttempts(a_arg: 3))
+            self.customEventHandler = self.payer!.as_EventHandler()
+        }
+        
+        // if there is a graph msg handler, set its is_owned to false
+        self.graph_msg_handler?.cOpaqueStruct?.is_owned = false
+        
+        self.backgroundProcessor = BackgroundProcessor(persister: self.customPersister!, event_handler: self.customEventHandler!, chain_monitor: self.chain_monitor, channel_manager: self.channelManager, net_graph_msg_handler: self.graph_msg_handler, peer_manager: self.peerManager, logger: self.logger)
+        
         try! self.backgroundProcessor!.addAnchor(anchor: self.peerManager)
         try! self.backgroundProcessor!.addAnchor(anchor: persister)
         try! self.backgroundProcessor!.addAnchor(anchor: self.customEventHandler!)
diff --git a/templates/custom_background_processor_init.md b/templates/custom_background_processor_init.md
@@ -0,0 +1,20 @@
+```swift
+/* DEFAULT_CONSTRUCTOR_START */
+#warning("This method passes non-cloneable objects by owned value. Here be dragons.")
+@available(*, deprecated, message: "This method passes non-cloneable objects by owned value. Here be dragons.")
+public init(persister: ChannelManagerPersister, event_handler: EventHandler, chain_monitor: ChainMonitor, channel_manager: ChannelManager, net_graph_msg_handler: NetGraphMsgHandler?, peer_manager: PeerManager, logger: Logger) {
+	Self.instanceCounter += 1
+	self.instanceNumber = Self.instanceCounter
+	
+	let graphMessageHandler = net_graph_msg_handler?.dangle().cOpaqueStruct! ?? LDKNetGraphMsgHandler(inner: nil, is_owned: true)
+	
+	self.cOpaqueStruct = withUnsafePointer(to: chain_monitor.cOpaqueStruct!) { (chain_monitorPointer: UnsafePointer<LDKChainMonitor>) in
+		withUnsafePointer(to: channel_manager.cOpaqueStruct!) { (channel_managerPointer: UnsafePointer<LDKChannelManager>) in
+			withUnsafePointer(to: peer_manager.cOpaqueStruct!) { (peer_managerPointer: UnsafePointer<LDKPeerManager>) in
+				BackgroundProcessor_start(persister.cOpaqueStruct!, event_handler.cOpaqueStruct!, chain_monitorPointer, channel_managerPointer, graphMessageHandler, peer_managerPointer, logger.cOpaqueStruct!)
+			}
+		}
+	}
+	super.init(conflictAvoidingVariableName: 0)
+}
+```
diff --git a/xcode/DirectBindingsApp/DirectBindingsAppTests/DirectBindingsAppTests.swift b/xcode/DirectBindingsApp/DirectBindingsAppTests/DirectBindingsAppTests.swift
@@ -66,7 +66,7 @@ class DirectBindingsAppTests: XCTestCase {
                 fee_estimator: feeEstimator,
                 chain_monitor: chainMonitor,
                 filter: filter,
-                router: nil,
+                net_graph: nil,
                 tx_broadcaster: broadcaster,
                 logger: logger
         )
@@ -82,7 +82,7 @@ class DirectBindingsAppTests: XCTestCase {
         channel_manager.as_Confirm().transactions_confirmed(header: header, txdata: txdata, height: 525)
         
 
-        channel_manager_constructor.chain_sync_completed(persister: cmPersister)
+        channel_manager_constructor.chain_sync_completed(persister: cmPersister, scorer: nil)
         
         channel_manager_constructor.interrupt()
         
@@ -124,7 +124,8 @@ class DirectBindingsAppTests: XCTestCase {
             path.append(extraHop)
         }
         
-        let route = Route(paths_arg: [path])
+        let payee = Payee(pubkey: Self.hexStringToBytes(hexString: destPubkeyHex)!)
+        let route = Route(paths_arg: [path], payee_arg: payee)
     }
 
     func testExtendedActivity() throws {
diff --git a/xcode/DirectBindingsApp/DirectBindingsAppTests/HumanObjectPeerTestInstance.swift b/xcode/DirectBindingsApp/DirectBindingsAppTests/HumanObjectPeerTestInstance.swift
@@ -122,11 +122,11 @@ public class HumanObjectPeerTestInstance {
         }
 
         fileprivate class TestPersister: Persist {
-            override func persist_new_channel(id: OutPoint, data: ChannelMonitor) -> Result_NoneChannelMonitorUpdateErrZ {
+            override func persist_new_channel(channel_id: OutPoint, data: ChannelMonitor, update_id: MonitorUpdateId) -> Result_NoneChannelMonitorUpdateErrZ {
                 return Result_NoneChannelMonitorUpdateErrZ.ok()
             }
 
-            override func update_persisted_channel(id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor) -> Result_NoneChannelMonitorUpdateErrZ {
+            override func update_persisted_channel(channel_id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor, update_id: MonitorUpdateId) -> Result_NoneChannelMonitorUpdateErrZ {
                 return Result_NoneChannelMonitorUpdateErrZ.ok()
             }
         }
@@ -179,8 +179,14 @@ public class HumanObjectPeerTestInstance {
             self.init(master: master, _dummy: (), seed: seed)
 
             if master.use_chan_manager_constructor {
-                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, router: self.router, tx_broadcaster: self.txBroadcaster, logger: self.logger)
-                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self))
+                
+                let graph = NetworkGraph(genesis_hash: [UInt8](repeating: 0, count: 32))
+                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: graph, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+                
+//                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: nil, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+                
+                
+                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self), scorer: nil)
                 self.channelManager = self.constructor!.channelManager
                 self.peerManager = self.constructor!.peerManager
             } else {
@@ -198,8 +204,9 @@ public class HumanObjectPeerTestInstance {
             self.init(master: original.master, _dummy: (), seed: original.seed)
 
             if master.use_chan_manager_constructor {
-                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, router: self.router, tx_broadcaster: self.txBroadcaster, logger: self.logger)
-                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self))
+                let graph = NetworkGraph(genesis_hash: [UInt8](repeating: 0, count: 32))
+                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: graph, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self), scorer: nil)
                 self.channelManager = self.constructor!.channelManager
                 self.peerManager = self.constructor!.peerManager
                 self.pendingManagerEvents.append(contentsOf: original.pendingManagerEvents)
@@ -286,7 +293,7 @@ public class HumanObjectPeerTestInstance {
 
         let config = UserConfig()
         let theirNodeId = peer2.channelManager.get_our_node_id()
-        let channelOpenResult = peer1.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_id: 42, override_config: config)
+        let channelOpenResult = peer1.channelManager.create_channel(their_network_key: theirNodeId, channel_value_satoshis: 4000000, push_msat: 2000000, user_channel_id: 42, override_config: config)
 
         XCTAssertTrue(channelOpenResult.isOk())
         let channels = peer1.channelManager.list_channels()
diff --git a/xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/TestLogger.swift b/xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/TestLogger.swift
@@ -7,8 +7,8 @@
 
 class TestLogger: Logger {
 
-    override func log(record: String?) {
-        print("record: \(record)")
+    override func log(record: Record) {
+        print("some abstract log thing")
     }
 
 }
diff --git a/xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/TestPersister.swift b/xcode/DirectBindingsApp/DirectBindingsAppTests/test-batteries/TestPersister.swift

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`
`8`	`8`	`class TestLogger: Logger {`
`9`	`9`
`10`		`- override func log(record: String?) {`
`11`		`- print("record: \(record)")`
	`10`	`+ override func log(record: Record) {`
	`11`	`+ print("some abstract log thing")`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`}`