Merge pull request #131 from arik-so/version-0.0.123

Version 0.0.123

Author: arik-so

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

@@ -22,7 +22,7 @@ runs:
             run: |
                 echo `pwd`
                 mkdir -p ${{ inputs.destination }}/bin
-                git clone --branch 0.0.121-bindings https://github.com/lightningdevkit/rust-lightning ${{ inputs.destination }}/rust-lightning
+                git clone --branch 0.0.123-bindings https://github.com/lightningdevkit/rust-lightning ${{ inputs.destination }}/rust-lightning
                 git clone --branch main https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
         -   name: Install Rust, required targets
             if: ${{ inputs.configureRustNightly == 'true' }}
@@ -56,4 +56,7 @@ runs:
                 else
                     ./genbindings.sh ../rust-lightning true
                 fi
+                cd ./lightning-c-bindings
+                cargo update -p cc --precise "1.0.69" --verbose
+                cd ../
                 popd

README.md

@@ -58,7 +58,7 @@ 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 0.0.118-bindings https://github.com/lightningdevkit/rust-lightning /path/to/rust-lightning
+git clone --branch 0.0.123-bindings https://github.com/lightningdevkit/rust-lightning /path/to/rust-lightning
 ```
 
 **[ldk-c-bindings](https://github.com/lightningdevkit/ldk-c-bindings)**:

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

@@ -225,7 +225,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
         self.channel_monitors = []
         self.channel_manager_latest_block_hash = nil
-        let block = BestBlock(blockHash: currentBlockchainTipHash, height: currentBlockchainTipHeight)
+        let block = BestBlock(blockHashArg: currentBlockchainTipHash, heightArg: currentBlockchainTipHeight)
         let chainParameters = ChainParameters(networkArg: network, bestBlockArg: block)
 
         self.netGraph = netGraph

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

@@ -252,10 +252,10 @@ public class HumanObjectPeerTestInstance {
         }
 
         fileprivate class TestPersister: Persist {
-            override func persistNewChannel(channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
+            override func persistNewChannel(channelFundingOutpoint channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
                 .Completed
             }
-            override func updatePersistedChannel(channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
+            override func updatePersistedChannel(channelFundingOutpoint channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
                 .Completed
             }
         }
@@ -475,9 +475,9 @@ public class HumanObjectPeerTestInstance {
         let peerB = Peer(master: self, seed: 2)
         let peerC = Peer(master: self, seed: 3)
 
-        let originalPeersA = peerA.peerManager.getPeerNodeIds()
-        let originalPeersB = peerB.peerManager.getPeerNodeIds()
-        let originalPeersC = peerC.peerManager.getPeerNodeIds()
+        let originalPeersA = peerA.peerManager.listPeers()
+        let originalPeersB = peerB.peerManager.listPeers()
+        let originalPeersC = peerC.peerManager.listPeers()
         XCTAssertEqual(originalPeersA.count, 0)
         XCTAssertEqual(originalPeersB.count, 0)
         XCTAssertEqual(originalPeersC.count, 0)
@@ -487,8 +487,8 @@ public class HumanObjectPeerTestInstance {
 
             // sleep for one second
             try! await Task.sleep(nanoseconds: 1_000_000_000)
-            let connectedPeersA = peerA.peerManager.getPeerNodeIds()
-            let connectedPeersB = peerB.peerManager.getPeerNodeIds()
+            let connectedPeersA = peerA.peerManager.listPeers()
+            let connectedPeersB = peerB.peerManager.listPeers()
             XCTAssertEqual(connectedPeersA.count, 1)
             XCTAssertEqual(connectedPeersB.count, 1)
         }
@@ -498,8 +498,8 @@ public class HumanObjectPeerTestInstance {
 
             // sleep for one second
             try! await Task.sleep(nanoseconds: 1_000_000_000)
-            let connectedPeersA = peerA.peerManager.getPeerNodeIds()
-            let connectedPeersC = peerC.peerManager.getPeerNodeIds()
+            let connectedPeersA = peerA.peerManager.listPeers()
+            let connectedPeersC = peerC.peerManager.listPeers()
             XCTAssertEqual(connectedPeersA.count, 2)
             XCTAssertEqual(connectedPeersC.count, 1)
         }
@@ -523,7 +523,7 @@ public class HumanObjectPeerTestInstance {
             let config = UserConfig.initWithDefault()
             let theirNodeId = peerB.channelManager.getOurNodeId()
             let userChannelId: [UInt8] = [UInt8](repeating: 42, count: 16);
-            let channelOpenResult = peerA.channelManager.createChannel(theirNetworkKey: theirNodeId, channelValueSatoshis: fundingAmount, pushMsat: 1000, userChannelId: userChannelId, temporaryChannelId: nil, overrideConfig: config)
+            let channelOpenResult = peerA.channelManager.createChannel(theirNetworkKey: theirNodeId, channelValueSatoshis: fundingAmount, pushMsat: 1000, userChannelId: userChannelId, temporaryChannelId: ChannelId.initWithZero(), overrideConfig: config)
 
             XCTAssertTrue(channelOpenResult.isOk())
             let channels = peerA.channelManager.listChannels()
@@ -647,9 +647,9 @@ public class HumanObjectPeerTestInstance {
         XCTAssertEqual(channelAToB.getChannelValueSatoshis(), fundingAmount)
         let shortChannelId = channelAToB.getShortChannelId()!
 
-        let fundingTxId = fundingTransaction.calculateId()
-        XCTAssertEqual(usableChannelsA[0].getChannelId(), fundingTxId)
-        XCTAssertEqual(usableChannelsB[0].getChannelId(), fundingTxId)
+        let fundingChannelId = ChannelId.initWithV1FromFundingTxid(txid: fundingTransaction.calculateId(), outputIndex: 0)
+        XCTAssertEqual(usableChannelsA[0].getChannelId().write(), fundingChannelId.write())
+        XCTAssertEqual(usableChannelsB[0].getChannelId().write(), fundingChannelId.write())
 
         let originalChannelBalanceAToB = channelAToB.getBalanceMsat()
         let originalChannelBalanceBToA = channelBToA.getBalanceMsat()
@@ -673,8 +673,8 @@ public class HumanObjectPeerTestInstance {
 
         do {
             // connect the nodes
-            let originalPeersA = peer1.peerManager.getPeerNodeIds()
-            let originalPeersB = peer2.peerManager.getPeerNodeIds()
+            let originalPeersA = peer1.peerManager.listPeers()
+            let originalPeersB = peer2.peerManager.listPeers()
             XCTAssertEqual(originalPeersA.count, 0)
             XCTAssertEqual(originalPeersB.count, 0)
 
@@ -684,9 +684,9 @@ public class HumanObjectPeerTestInstance {
             // sleep for one second
             try! await Task.sleep(nanoseconds: 1_000_000_000)
 
-            let connectedPeersA = peer1.peerManager.getPeerNodeIds()
-            let connectedPeersB = peer2.peerManager.getPeerNodeIds()
-            let connectedPeersC = peer3.peerManager.getPeerNodeIds()
+            let connectedPeersA = peer1.peerManager.listPeers()
+            let connectedPeersB = peer2.peerManager.listPeers()
+            let connectedPeersC = peer3.peerManager.listPeers()
             XCTAssertEqual(connectedPeersA.count, 1)
             XCTAssertEqual(connectedPeersB.count, 2)
             XCTAssertEqual(connectedPeersC.count, 1)
@@ -788,10 +788,10 @@ public class HumanObjectPeerTestInstance {
                 let paymentHash = paymentClaimable.getPaymentHash()
                 print("received payment of \(paymentClaimable.getAmountMsat()) with hash \(paymentHash)")
                 let paymentPurpose = paymentClaimable.getPurpose()
-                guard case .InvoicePayment = paymentPurpose.getValueType() else {
+                guard case .Bolt11InvoicePayment = paymentPurpose.getValueType() else {
                     return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
                 }
-                let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
+                let invoicePayment = paymentPurpose.getValueAsBolt11InvoicePayment()!
                 let preimage = invoicePayment.getPaymentPreimage()!
                 let secret = invoicePayment.getPaymentSecret()
                 if self.configuration.shouldRecipientRejectPayment {
@@ -913,10 +913,10 @@ public class HumanObjectPeerTestInstance {
                 let paymentHash = paymentClaimable.getPaymentHash()
                 print("received payment of \(paymentClaimable.getAmountMsat()) with hash \(paymentHash)")
                 let paymentPurpose = paymentClaimable.getPurpose()
-                guard case .InvoicePayment = paymentPurpose.getValueType() else {
+                guard case .Bolt11InvoicePayment = paymentPurpose.getValueType() else {
                     return XCTAssert(false, "Expected .InvoicePayment, got \(paymentPurpose.getValueType())")
                 }
-                let invoicePayment = paymentPurpose.getValueAsInvoicePayment()!
+                let invoicePayment = paymentPurpose.getValueAsBolt11InvoicePayment()!
                 let preimage = invoicePayment.getPaymentPreimage()!
                 let secret = invoicePayment.getPaymentSecret()
                 peer1.channelManager.claimFunds(paymentPreimage: preimage)

ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTests.swift

@@ -241,7 +241,7 @@ class LDKSwiftTests: XCTestCase {
         let reserveAmount: UInt64 = 1000 // a thousand satoshis rserve
         let peerPubkey = Self.hexStringToBytes(hexString: "02deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef")!
 		let userChannelId: [UInt8] = [UInt8](repeating: 42, count: 16);
-        let channelOpenResult = channelManager.createChannel(theirNetworkKey: peerPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: nil, overrideConfig: config)
+        let channelOpenResult = channelManager.createChannel(theirNetworkKey: peerPubkey, channelValueSatoshis: channelValue, pushMsat: reserveAmount, userChannelId: userChannelId, temporaryChannelId: ChannelId.initWithZero(), overrideConfig: config)
 
         let channelOpenError = channelOpenResult.getError()!
         print("error type: \(channelOpenError.getValueType())")

ci/LDKSwift/Tests/LDKSwiftTests/TestPersister.swift

@@ -12,11 +12,11 @@ import LDKHeaders
 
 class TestPersister: Persist {
 
-    override func persistNewChannel(channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
+    override func persistNewChannel(channelFundingOutpoint channelId: Bindings.OutPoint, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
         .Completed
     }
 
-    override func updatePersistedChannel(channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
+    override func updatePersistedChannel(channelFundingOutpoint channelId: Bindings.OutPoint, update: Bindings.ChannelMonitorUpdate, data: Bindings.ChannelMonitor, updateId: Bindings.MonitorUpdateId) -> Bindings.ChannelMonitorUpdateStatus {
         .Completed
     }