Merge pull request #112 from tnull/2023-07-release-0.0.116

Release 0.0.116

Author: tnull

.github/actions/install-dependencies/action.yml

@@ -22,8 +22,8 @@ runs:
             run: |
                 echo `pwd`
                 mkdir -p ${{ inputs.destination }}/bin
-                git clone --branch 2023-04-0.0.115-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
-                git clone --branch v0.0.115.3 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
+                git clone --branch 2023-07-0.0.116-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
+                git clone --branch v0.0.116.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
         -   name: Install Rust, required targets
             if: ${{ inputs.configureRustNightly == 'true' }}
             shell: bash

README.md

@@ -7,7 +7,7 @@ Automatic Swift bindings generation for [`rust-lightning`](https://github.com/li
 ### Swift Package Manager
 To install using Swift Package Manager, add the following line to the depedencies array of your `Package.swift`:
 ```
-.package(url: "https://github.com/lightningdevkit/ldk-swift/", exact: "0.0.115")
+.package(url: "https://github.com/lightningdevkit/ldk-swift/", exact: "0.0.116")
 ```
 Be sure to also include "LightningDevKit" into your packages target like so:
 
@@ -58,13 +58,13 @@ In order to generate these bindings from scratch, you will need to clone two dep
 **[rust-lightning](https://github.com/lightningdevkit/rust-lightning)**, (a specific branch built for bindings compatibility):
 
 ```shell
-git clone --branch 2023-04-0.0.115-java-bindings https://github.com/TheBlueMatt/rust-lightning /path/to/rust-lightning
+git clone --branch 2023-07-0.0.116-java-bindings https://github.com/TheBlueMatt/rust-lightning /path/to/rust-lightning
 ```
 
 **[ldk-c-bindings](https://github.com/lightningdevkit/ldk-c-bindings)**:
 
 ```shell
-git clone --branch v0.0.115.0 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
+git clone --branch v0.0.116.0 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
 ```
 
 Take note of where you clone these directories, it's best you save the absolute path somewhere handy for the rest of the remaining steps.
@@ -95,11 +95,11 @@ folder due to the previous `genbindings.sh` step. As Docker won't have access to
 replace those lines with the following:
 
 ```yaml
-lightning = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-04-0.0.115-java-bindings", default-features = false }
-lightning-persister = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-04-0.0.115-java-bindings", default-features = false }
-lightning-invoice = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-05-0.0.115-java-bindings", default-features = false }
-lightning-background-processor = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-04-0.0.115-java-bindings", default-features = false }
-lightning-rapid-gossip-sync = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-04-0.0.115-java-bindings", default-features = false }
+lightning = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-07-0.0.116-java-bindings", default-features = false }
+lightning-persister = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-07-0.0.116-java-bindings", default-features = false }
+lightning-invoice = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-07-0.0.116-java-bindings", default-features = false }
+lightning-background-processor = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-07-0.0.116-java-bindings", default-features = false }
+lightning-rapid-gossip-sync = { git = "https://github.com/thebluematt/rust-lightning", branch = "2023-07-0.0.116-java-bindings", default-features = false }
 ```
 
 You will note that the revision is unspecified and is currently just placeholder `xxx`s. To obtain the revision,

ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift

@@ -42,10 +42,11 @@ public struct ChannelManagerConstructionParameters {
     public var txBroadcaster: BroadcasterInterface
     public var enableP2PGossip: Bool = false
     public var scorer: MultiThreadedLockableScore?
+    public var scoreParams: ProbabilisticScoringFeeParameters?
     public var payerRetries: Retry = Retry.initWithAttempts(a: UInt(3))
     public var logger: Logger
 
-    public init (config: UserConfig, entropySource: EntropySource, nodeSigner: NodeSigner, signerProvider: SignerProvider, feeEstimator: FeeEstimator, chainMonitor: ChainMonitor, txBroadcaster: BroadcasterInterface, logger: Logger, enableP2PGossip: Bool = false, scorer: MultiThreadedLockableScore? = nil, payerRetries: Retry = Retry.initWithAttempts(a: UInt(3))) {
+    public init (config: UserConfig, entropySource: EntropySource, nodeSigner: NodeSigner, signerProvider: SignerProvider, feeEstimator: FeeEstimator, chainMonitor: ChainMonitor, txBroadcaster: BroadcasterInterface, logger: Logger, enableP2PGossip: Bool = false, scorer: MultiThreadedLockableScore? = nil, scoreParams: ProbabilisticScoringFeeParameters? = nil, payerRetries: Retry = Retry.initWithAttempts(a: UInt(3))) {
         self.config = config
         self.entropySource = entropySource
         self.nodeSigner = nodeSigner
@@ -57,6 +58,11 @@ public struct ChannelManagerConstructionParameters {
 
         self.enableP2PGossip = enableP2PGossip
         self.scorer = scorer
+        if scorer != nil && scoreParams == nil {
+            self.scoreParams = ProbabilisticScoringFeeParameters.initWithDefault()
+        } else {
+            self.scoreParams = scoreParams
+        }
         self.payerRetries = payerRetries
     }
 
@@ -74,8 +80,8 @@ public struct ChannelManagerConstructionParameters {
     }
 
     fileprivate func router(networkGraph: NetworkGraph?) -> Router {
-        if let netGraph = networkGraph, let scorer = self.scorer {
-            return DefaultRouter(networkGraph: netGraph, logger: self.logger, randomSeedBytes: self.entropySource.getSecureRandomBytes(), scorer: scorer.asLockableScore()).asRouter()
+        if let netGraph = networkGraph, let scorer = self.scorer, let scoreParams = self.scoreParams {
+            return DefaultRouter(networkGraph: netGraph, logger: self.logger, randomSeedBytes: self.entropySource.getSecureRandomBytes(), scorer: scorer.asLockableScore(), scoreParams: scoreParams).asRouter()
         }
         return CMCRouter()
     }
@@ -180,17 +186,21 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
         let random_data = params.entropySource.getSecureRandomBytes();
 
 
-        let noCustomMessages = IgnoringMessageHandler()
+        let channelMessageHandler = channelManager.asChannelMessageHandler()
+        let noCustomMessages = IgnoringMessageHandler().asCustomMessageHandler()
+        let noOnionMessages = IgnoringMessageHandler().asOnionMessageHandler()
+        let noRoutingMessages = IgnoringMessageHandler().asRoutingMessageHandler()
+
         var messageHandler: MessageHandler!
         if let netGraph = self.netGraph, params.enableP2PGossip {
             let p2pGossipSync = P2PGossipSync(networkGraph: netGraph, utxoLookup: nil, logger: params.logger)
             self.graphMessageHandler = GossipSync.initWithP2P(a: p2pGossipSync)
-            messageHandler = MessageHandler(chanHandlerArg: channelManager.asChannelMessageHandler(), routeHandlerArg: p2pGossipSync.asRoutingMessageHandler(), onionMessageHandlerArg: noCustomMessages.asOnionMessageHandler())
+            messageHandler = MessageHandler(chanHandlerArg: channelMessageHandler, routeHandlerArg: p2pGossipSync.asRoutingMessageHandler(), onionMessageHandlerArg: noOnionMessages, customMessageHandlerArg: noCustomMessages)
         } else {
-            messageHandler = MessageHandler(chanHandlerArg: channelManager.asChannelMessageHandler(), routeHandlerArg: noCustomMessages.asRoutingMessageHandler(), onionMessageHandlerArg: noCustomMessages.asOnionMessageHandler())
+            messageHandler = MessageHandler(chanHandlerArg: channelMessageHandler, routeHandlerArg: noRoutingMessages, onionMessageHandlerArg: noOnionMessages, customMessageHandlerArg: noCustomMessages)
         }
         let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
-        self.peerManager = PeerManager(messageHandler: messageHandler, currentTime: timestampSeconds, ephemeralRandomData: random_data, logger: params.logger, customMessageHandler: IgnoringMessageHandler().asCustomMessageHandler(), nodeSigner: params.nodeSigner)
+        self.peerManager = PeerManager(messageHandler: messageHandler, currentTime: timestampSeconds, ephemeralRandomData: random_data, logger: params.logger, nodeSigner: params.nodeSigner)
 
         if let filter = filter {
             for (currentMonitor, _) in self.channel_monitors {
@@ -220,22 +230,26 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         self.netGraph = netGraph
         let router = params.router(networkGraph: self.netGraph)
-        self.channelManager = ChannelManager(feeEst: params.feeEstimator, chainMonitor: params.chainMonitor.asWatch(), txBroadcaster: params.txBroadcaster, router: router, logger: params.logger, entropySource: params.entropySource, nodeSigner: params.nodeSigner, signerProvider: params.signerProvider, config: params.config, params: chainParameters)
+        let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
+        self.channelManager = ChannelManager(feeEst: params.feeEstimator, chainMonitor: params.chainMonitor.asWatch(), txBroadcaster: params.txBroadcaster, router: router, logger: params.logger, entropySource: params.entropySource, nodeSigner: params.nodeSigner, signerProvider: params.signerProvider, config: params.config, params: chainParameters, currentTimestamp: timestampSeconds)
 
-        let noCustomMessages = IgnoringMessageHandler()
+        let channelMessageHandler = channelManager.asChannelMessageHandler()
+        let noCustomMessages = IgnoringMessageHandler().asCustomMessageHandler()
+        let noOnionMessages = IgnoringMessageHandler().asOnionMessageHandler()
+        let noRoutingMessages = IgnoringMessageHandler().asRoutingMessageHandler()
+
         var messageHandler: MessageHandler!
         if let netGraph = netGraph, params.enableP2PGossip {
             let p2pGossipSync = P2PGossipSync(networkGraph: netGraph, utxoLookup: nil, logger: params.logger)
             self.graphMessageHandler = GossipSync.initWithP2P(a: p2pGossipSync)
-            messageHandler = MessageHandler(chanHandlerArg: channelManager.asChannelMessageHandler(), routeHandlerArg: p2pGossipSync.asRoutingMessageHandler(), onionMessageHandlerArg: noCustomMessages.asOnionMessageHandler())
+            messageHandler = MessageHandler(chanHandlerArg: channelMessageHandler, routeHandlerArg: p2pGossipSync.asRoutingMessageHandler(), onionMessageHandlerArg: noOnionMessages, customMessageHandlerArg: noCustomMessages)
         } else {
-            messageHandler = MessageHandler(chanHandlerArg: channelManager.asChannelMessageHandler(), routeHandlerArg: noCustomMessages.asRoutingMessageHandler(), onionMessageHandlerArg: noCustomMessages.asOnionMessageHandler())
+            messageHandler = MessageHandler(chanHandlerArg: channelMessageHandler, routeHandlerArg: noRoutingMessages, onionMessageHandlerArg: noOnionMessages, customMessageHandlerArg: noCustomMessages)
         }
 
         let random_data = params.entropySource.getSecureRandomBytes();
 
-        let timestampSeconds = UInt32(NSDate().timeIntervalSince1970)
-        self.peerManager = PeerManager(messageHandler: messageHandler, currentTime: timestampSeconds, ephemeralRandomData: random_data, logger: params.logger, customMessageHandler: noCustomMessages.asCustomMessageHandler(), nodeSigner: params.nodeSigner)
+        self.peerManager = PeerManager(messageHandler: messageHandler, currentTime: timestampSeconds, ephemeralRandomData: random_data, logger: params.logger, nodeSigner: params.nodeSigner)
 
         super.init(conflictAvoidingVariableName: 0, instantiationContext: "ChannelManagerConstructor.swift::\(#function):\(#line)")
         // try! self.peerManager.addAnchor(anchor: self)

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

@@ -173,9 +173,11 @@ public class HumanObjectPeerTestInstance {
                 super.init()
             }
 
-            override func broadcastTransaction(tx: [UInt8]) {
-                Task {
-                    await self.master.pendingBroadcastTracker.addTransaction(tx: tx)
+            override func broadcastTransactions(txs: [[UInt8]]) {
+                for tx in txs {
+                    Task {
+                        await self.master.pendingBroadcastTracker.addTransaction(tx: tx)
+                    }
                 }
             }
         }
@@ -314,11 +316,11 @@ public class HumanObjectPeerTestInstance {
                     scorerGraph = NetworkGraph(network: .Regtest, logger: self.logger)
                 }
 
-                let scoringParams = ProbabilisticScoringParameters.initWithDefault()
-                var probabalisticScorer = ProbabilisticScorer(params: scoringParams, networkGraph: scorerGraph, logger: self.logger)
+                let decayParams = ProbabilisticScoringDecayParameters.initWithDefault()
+                var probabalisticScorer = ProbabilisticScorer(decayParams: decayParams, networkGraph: scorerGraph, logger: self.logger)
                 if master.configuration.reserializedProbabilisticScorer {
                     let serializedScorer = probabalisticScorer.write()
-                    let probabalisticScorerResult = ProbabilisticScorer.read(ser: serializedScorer, argA: scoringParams, argB: scorerGraph, argC: self.logger)
+                    let probabalisticScorerResult = ProbabilisticScorer.read(ser: serializedScorer, argA: decayParams, argB: scorerGraph, argC: self.logger)
                     probabalisticScorer = probabalisticScorerResult.getValue()!
                 }
                 let score = probabalisticScorer.asScore()
@@ -672,7 +674,7 @@ public class HumanObjectPeerTestInstance {
             let invoice = invoiceResult.getValue()!
             print("Invoice: \(invoice.toStr())")
 
-            let recreatedInvoice = Invoice.fromStr(s: invoice.toStr())
+            let recreatedInvoice = Bolt11Invoice.fromStr(s: invoice.toStr())
             XCTAssertTrue(recreatedInvoice.isOk())
 
             let channelManagerConstructor = peer1.constructor!
@@ -705,7 +707,7 @@ public class HumanObjectPeerTestInstance {
                     return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
                 }
                 let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
-                let preimage = invoicePayment.getPaymentPreimage()
+                let preimage = invoicePayment.getPaymentPreimage()!
                 let secret = invoicePayment.getPaymentSecret()
                 if self.configuration.shouldRecipientRejectPayment {
                     print("about to fail payment because shouldRecipientRejectPayment flag is set")
@@ -790,7 +792,7 @@ public class HumanObjectPeerTestInstance {
             print("Implicit amount invoice: \(invoice.toStr())")
 
 			let invoiceString = invoice.toStr()
-            let recreatedInvoice = Invoice.fromStr(s: invoiceString)
+            let recreatedInvoice = Bolt11Invoice.fromStr(s: invoiceString)
             XCTAssertTrue(recreatedInvoice.isOk())
 
             let invoicePaymentResult = Bindings.payZeroValueInvoice(invoice: invoice, amountMsats: SEND_MSAT_AMOUNT_B_TO_A, retryStrategy: Retry.initWithAttempts(a: 3), channelmanager: peer2.channelManager)
@@ -828,7 +830,7 @@ public class HumanObjectPeerTestInstance {
                     return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
                 }
                 let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
-                let preimage = invoicePayment.getPaymentPreimage()
+                let preimage = invoicePayment.getPaymentPreimage()!
                 let secret = invoicePayment.getPaymentSecret()
                 peer1.channelManager.claimFunds(paymentPreimage: preimage)
                 print("claimed payment with secret \(secret) using preimage \(preimage)")