Reënable bindings diff detection, and fix duplicate channel monitor d…

…etection.
lightningdevkit · Jun 29, 2022 · dff9d6c · dff9d6c
1 parent bc3fc27
commit dff9d6c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 32 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -24,7 +24,7 @@ jobs:
                     echo "rust-lightning commit hash:"
                     git rev-parse HEAD
                     cd ..
-                    git clone --branch https://github.com/lightningdevkit/ldk-c-bindings
+                    git clone --branch v0.0.108.0 https://github.com/lightningdevkit/ldk-c-bindings
                     # git clone https://github.com/TheBlueMatt/ldk-c-bindings
                     cd ldk-c-bindings
                     echo "ldk-c-bindings commit hash:"
@@ -63,11 +63,10 @@ jobs:
                 env:
                     LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
                     LDK_SWIFT_GENERATOR_OUTPUT_DIRECTORY_PATH: ci/LDKSwift/Sources/LDKSwift/bindings
-            -   name: (Suspended) Check that the latest auto-generated Swift files are in the repo
+            -   name: Check that the latest auto-generated Swift files are in the repo
                 run: |
                     python ./ # Generate bindings into local directory
-                    # python ci/walker.py bindings/LDK
-                    # git diff --exit-code bindings/LDK ':(exclude)bindings/LDK/Bindings.swift'
+                    git diff --exit-code ci/LDKSwift/Sources/LDKSwift ':(exclude)ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift'
                 env:
                     LDK_SWIFT_GENERATOR_INPUT_HEADER_PATH: ci/ldk-c-bindings/lightning-c-bindings/include/lightning.h
             -   name: Install Swift Toolchain

diff --git a/ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift b/ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift
@@ -54,36 +54,39 @@ 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?, net_graph_serialized: [UInt8]?, 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_serialized: [UInt8]?, tx_broadcaster: BroadcasterInterface, logger: Logger, enableP2PGossip: Bool = false) throws {
 
         var monitors: [LDKChannelMonitor] = []
         self.channel_monitors = []
 
-        var monitorFundingSet = Set<[UInt8]>()
+        var monitorFundingSet = Set<String>()
 
         for currentSerializedChannelMonitor in channel_monitors_serialized {
             let channelMonitorResult: Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ = UtilMethods.constructor_BlockHashChannelMonitorZ_read(ser: currentSerializedChannelMonitor, arg: keys_interface)
             if channelMonitorResult.cOpaqueStruct?.result_ok != true {
                 throw InvalidSerializedDataError.invalidSerializedChannelMonitor
             }
-            // res
 
             let value: LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZPtr = channelMonitorResult.cOpaqueStruct!.contents
             let a: LDKThirtyTwoBytes = value.result!.pointee.a
             let b: LDKChannelMonitor = value.result!.pointee.b
 
-            let nativeA = Bindings.LDKThirtyTwoBytes_to_array(nativeType: a);
-            if monitorFundingSet.contains(nativeA) {
-                throw InvalidSerializedDataError.duplicateSerializedChannelMonitor
-            }
-            monitorFundingSet.insert(nativeA)
-
+            let blockHash = Bindings.LDKThirtyTwoBytes_to_array(nativeType: a);
             let clonedChannelMonitor = ChannelMonitor(pointer: b).dangle().clone()
-            // var clonedChannelMonitor = currentChannelMonitor.clone(orig: currentChannelMonitor)
+
+            if let channelFundingOutpoint = clonedChannelMonitor.get_funding_txo().getA() {
+                let fundingOutpointHash = "\(channelFundingOutpoint.get_txid()):\(channelFundingOutpoint.get_index())"
+                if monitorFundingSet.contains(fundingOutpointHash) {
+                    Bindings.print("Duplicate channel monitor funding txo: \(fundingOutpointHash)", severity: .ERROR)
+                    throw InvalidSerializedDataError.duplicateSerializedChannelMonitor
+                }
+                monitorFundingSet.insert(fundingOutpointHash)
+            }
+
             clonedChannelMonitor.cOpaqueStruct?.is_owned = false // is_owned should never have to be modified
 
             monitors.append(clonedChannelMonitor.cOpaqueStruct!)
-            self.channel_monitors.append((clonedChannelMonitor, nativeA))
+            self.channel_monitors.append((clonedChannelMonitor, blockHash))
         }
 
         print("Collected channel monitors, reading channel manager")
@@ -119,13 +122,11 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         let noCustomMessages = IgnoringMessageHandler()
         var messageHandler: MessageHandler!
-        if let netGraph = net_graph {
-            // TODO: fix
-            // 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())
-            // temporarily disable handling routing messages by the peer manager to avoid excessive memory growth
-            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
+        if let netGraph = net_graph, enableP2PGossip {
+            let noneOption = Option_AccessZ.none()
+            let p2pGossipSync = P2PGossipSync(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
+            self.graph_msg_handler = GossipSync.p2_p(a: p2pGossipSync)
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler())
         } else {
             messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
         }
@@ -151,7 +152,7 @@ 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, net_graph: NetworkGraph?, 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, enableP2PGossip: Bool = false) {
 
         self.channel_monitors = []
         self.channel_manager_latest_block_hash = nil
@@ -167,16 +168,11 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
         self.net_graph = net_graph
         let noCustomMessages = IgnoringMessageHandler()
         var messageHandler: MessageHandler!
-        if let netGraph = net_graph {
+        if let netGraph = net_graph, enableP2PGossip {
             let noneOption = Option_AccessZ.none()
-
-            // TODO: fix
-            // self.graph_msg_handler = NetGraphMsgHandler(network_graph: netGraph, chain_access: noneOption, logger: logger)
-
-
-            // messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: self.graph_msg_handler!.as_RoutingMessageHandler())
-            // temporarily disable handling routing messages by the peer manager to avoid excessive memory growth
-            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
+            let p2pGossipSync = P2PGossipSync(network_graph: netGraph, chain_access: Option_AccessZ.none(), logger: logger)
+            self.graph_msg_handler = GossipSync.p2_p(a: p2pGossipSync)
+            messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: p2pGossipSync.as_RoutingMessageHandler())
         } else {
             messageHandler = MessageHandler(chan_handler_arg: channelManager.as_ChannelMessageHandler(), route_handler_arg: noCustomMessages.as_RoutingMessageHandler())
         }