Skip to content

Commit 699bb8e

Browse files
arik-soarik-so
authored
Merge pull request #77 from arik-so/gnu-sed-ci-fix
Finalize 0.0.111 support.
2 parents 0891a00 + e78708c commit 699bb8e

40 files changed

+530
-363
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ runs:
1414
steps:
1515
- name: Install Homebrew Dependencies
1616
shell: bash
17+
if: ${{ runner.os == 'macOS' }}
1718
run: |
1819
brew install gnu-sed
1920
- name: Checkout Rust-Lightning and LDK-C-Bindings git
@@ -22,14 +23,14 @@ runs:
2223
echo `pwd`
2324
mkdir -p ${{ inputs.destination }}/bin
2425
git clone --branch 2022-09-111-java-bindings https://github.com/TheBlueMatt/rust-lightning ${{ inputs.destination }}/rust-lightning
25-
git clone --branch main https://github.com/TheBlueMatt/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
26+
git clone --branch v0.0.111.0 https://github.com/lightningdevkit/ldk-c-bindings ${{ inputs.destination }}/ldk-c-bindings
2627
- name: Install Rust, required targets
2728
if: ${{ inputs.configureRustNightly == 'true' }}
2829
shell: bash
2930
run: |
30-
rustup toolchain install nightly
31+
rustup toolchain install nightly-2022-05-13
3132
rustup target add aarch64-apple-darwin aarch64-apple-ios x86_64-apple-ios
32-
rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
33+
rustup component add rust-src --toolchain nightly-2022-05-13-x86_64-apple-darwin
3334
- name: Load Cache
3435
if: ${{ inputs.configureRustNightly == 'true' }}
3536
uses: actions/cache@v3

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ git clone --branch 2022-09-111-java-bindings https://github.com/TheBlueMatt/rust
4242
**[ldk-c-bindings](https://github.com/lightningdevkit/ldk-c-bindings)**:
4343

4444
```shell
45-
git clone --branch v0.0.110.1 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
45+
git clone --branch v0.0.111.0 https://github.com/lightningdevkit/ldk-c-bindings /path/to/ldk-c-bindings
4646
```
4747

4848
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.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ fileprivate class CustomChannelManagerPersister: Persister {
314314
override func persist_graph(network_graph: NetworkGraph) -> Result_NoneErrorZ {
315315
return self.handler.persist_graph(network_graph: network_graph)
316316
}
317+
318+
override func persist_scorer(scorer: Bindings.WriteableScore) -> Bindings.Result_NoneErrorZ {
319+
return self.handler.persist_scorer(scorer: scorer)
320+
}
317321
}
318322

319323
fileprivate class CustomEventHandler: EventHandler {

‎ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ import Foundation
1414
import LDKHeaders
1515
#endif
1616

17+
#if os(Linux)
18+
import Glibc
19+
#else
20+
import Darwin.C
21+
#endif
22+
1723
public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
1824
public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
1925
public typealias LDKTxid = LDKThirtyTwoBytes
@@ -98,7 +104,11 @@ public class Bindings {
98104

99105
internal class func print(_ string: String, severity: PrintSeverity = .DEBUG) {
100106
if severity.rawValue >= Self.minimumPrintSeverity.rawValue {
101-
Swift.print(string)
107+
108+
// Swift.print(string)
109+
NSLog(string)
110+
fflush(stdout)
111+
102112
// if #available(iOS 14.0, *) {
103113
// #if canImport(os)
104114
// if severity == Self.PrintSeverity.DEBUG {
@@ -6838,7 +6848,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
68386848
*/
68396849

68406850
public class func get_ldk_swift_bindings_version() -> String {
6841-
return "8fe177ad2a9b39971f2c73730f4516d16d6b424c"
6851+
return "a40019c5c98393c3285b1ba17df174dd957149b2"
68426852
}
68436853

68446854
}

‎ci/LDKSwift/Sources/LDKSwift/bindings/traits/Access.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ extension Bindings {
8484

8585
open func get_utxo(genesis_hash: [UInt8]?, short_channel_id: UInt64) -> Result_TxOutAccessErrorZ {
8686
/* EDIT ME */
87-
Bindings.print("Access::get_utxo MUST be overridden!", severity: .ERROR)
88-
89-
abort()
87+
88+
Bindings.print("Error: Access::get_utxo MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
89+
abort()
90+
9091
}
9192

9293
open func free() -> Void {

‎ci/LDKSwift/Sources/LDKSwift/bindings/traits/BaseSign.swift

Lines changed: 52 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -188,93 +188,106 @@ extension Bindings {
188188

189189
open func get_per_commitment_point(idx: UInt64) -> [UInt8] {
190190
/* EDIT ME */
191-
Bindings.print("BaseSign::get_per_commitment_point MUST be overridden!", severity: .ERROR)
192-
193-
abort()
191+
192+
Bindings.print("Error: BaseSign::get_per_commitment_point MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
193+
abort()
194+
194195
}
195196

196197
open func release_commitment_secret(idx: UInt64) -> [UInt8] {
197198
/* EDIT ME */
198-
Bindings.print("BaseSign::release_commitment_secret MUST be overridden!", severity: .ERROR)
199-
200-
abort()
199+
200+
Bindings.print("Error: BaseSign::release_commitment_secret MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
201+
abort()
202+
201203
}
202204

203205
open func validate_holder_commitment(holder_tx: HolderCommitmentTransaction, preimages: [[UInt8]]) -> Result_NoneNoneZ {
204206
/* EDIT ME */
205-
Bindings.print("BaseSign::validate_holder_commitment MUST be overridden!", severity: .ERROR)
206-
207-
abort()
207+
208+
Bindings.print("Error: BaseSign::validate_holder_commitment MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
209+
abort()
210+
208211
}
209212

210213
open func channel_keys_id() -> [UInt8] {
211214
/* EDIT ME */
212-
Bindings.print("BaseSign::channel_keys_id MUST be overridden!", severity: .ERROR)
213-
214-
abort()
215+
216+
Bindings.print("Error: BaseSign::channel_keys_id MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
217+
abort()
218+
215219
}
216220

217221
open func sign_counterparty_commitment(commitment_tx: CommitmentTransaction, preimages: [[UInt8]]) -> Result_C2Tuple_SignatureCVec_SignatureZZNoneZ {
218222
/* EDIT ME */
219-
Bindings.print("BaseSign::sign_counterparty_commitment MUST be overridden!", severity: .ERROR)
220-
221-
abort()
223+
224+
Bindings.print("Error: BaseSign::sign_counterparty_commitment MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
225+
abort()
226+
222227
}
223228

224229
open func validate_counterparty_revocation(idx: UInt64, secret: [UInt8]?) -> Result_NoneNoneZ {
225230
/* EDIT ME */
226-
Bindings.print("BaseSign::validate_counterparty_revocation MUST be overridden!", severity: .ERROR)
227-
228-
abort()
231+
232+
Bindings.print("Error: BaseSign::validate_counterparty_revocation MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
233+
abort()
234+
229235
}
230236

231237
open func sign_holder_commitment_and_htlcs(commitment_tx: HolderCommitmentTransaction) -> Result_C2Tuple_SignatureCVec_SignatureZZNoneZ {
232238
/* EDIT ME */
233-
Bindings.print("BaseSign::sign_holder_commitment_and_htlcs MUST be overridden!", severity: .ERROR)
234-
235-
abort()
239+
240+
Bindings.print("Error: BaseSign::sign_holder_commitment_and_htlcs MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
241+
abort()
242+
236243
}
237244

238245
open func sign_justice_revoked_output(justice_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_key: [UInt8]?) -> Result_SignatureNoneZ {
239246
/* EDIT ME */
240-
Bindings.print("BaseSign::sign_justice_revoked_output MUST be overridden!", severity: .ERROR)
241-
242-
abort()
247+
248+
Bindings.print("Error: BaseSign::sign_justice_revoked_output MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
249+
abort()
250+
243251
}
244252

245253
open func sign_justice_revoked_htlc(justice_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_key: [UInt8]?, htlc: HTLCOutputInCommitment) -> Result_SignatureNoneZ {
246254
/* EDIT ME */
247-
Bindings.print("BaseSign::sign_justice_revoked_htlc MUST be overridden!", severity: .ERROR)
248-
249-
abort()
255+
256+
Bindings.print("Error: BaseSign::sign_justice_revoked_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
257+
abort()
258+
250259
}
251260

252261
open func sign_counterparty_htlc_transaction(htlc_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_point: [UInt8], htlc: HTLCOutputInCommitment) -> Result_SignatureNoneZ {
253262
/* EDIT ME */
254-
Bindings.print("BaseSign::sign_counterparty_htlc_transaction MUST be overridden!", severity: .ERROR)
255-
256-
abort()
263+
264+
Bindings.print("Error: BaseSign::sign_counterparty_htlc_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
265+
abort()
266+
257267
}
258268

259269
open func sign_closing_transaction(closing_tx: ClosingTransaction) -> Result_SignatureNoneZ {
260270
/* EDIT ME */
261-
Bindings.print("BaseSign::sign_closing_transaction MUST be overridden!", severity: .ERROR)
262-
263-
abort()
271+
272+
Bindings.print("Error: BaseSign::sign_closing_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
273+
abort()
274+
264275
}
265276

266277
open func sign_channel_announcement(msg: UnsignedChannelAnnouncement) -> Result_C2Tuple_SignatureSignatureZNoneZ {
267278
/* EDIT ME */
268-
Bindings.print("BaseSign::sign_channel_announcement MUST be overridden!", severity: .ERROR)
269-
270-
abort()
279+
280+
Bindings.print("Error: BaseSign::sign_channel_announcement MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
281+
abort()
282+
271283
}
272284

273285
open func ready_channel(channel_parameters: ChannelTransactionParameters) -> Void {
274286
/* EDIT ME */
275-
Bindings.print("BaseSign::ready_channel MUST be overridden!", severity: .ERROR)
276-
277-
abort()
287+
288+
Bindings.print("Error: BaseSign::ready_channel MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
289+
abort()
290+
278291
}
279292

280293
open func free() -> Void {

‎ci/LDKSwift/Sources/LDKSwift/bindings/traits/BindingsType.swift

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,26 @@ extension Bindings {
118118

119119
open func type_id() -> UInt16 {
120120
/* EDIT ME */
121-
Bindings.print("BindingsType::type_id MUST be overridden!", severity: .ERROR)
122-
123-
abort()
121+
122+
Bindings.print("Error: BindingsType::type_id MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
123+
abort()
124+
124125
}
125126

126127
open func debug_str() -> String {
127128
/* EDIT ME */
128-
Bindings.print("BindingsType::debug_str MUST be overridden!", severity: .ERROR)
129-
130-
abort()
129+
130+
Bindings.print("Error: BindingsType::debug_str MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
131+
abort()
132+
131133
}
132134

133135
open func write() -> [UInt8] {
134136
/* EDIT ME */
135-
Bindings.print("BindingsType::write MUST be overridden!", severity: .ERROR)
136-
137-
abort()
137+
138+
Bindings.print("Error: BindingsType::write MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
139+
abort()
140+
138141
}
139142

140143
open func free() -> Void {

‎ci/LDKSwift/Sources/LDKSwift/bindings/traits/BroadcasterInterface.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,10 @@ extension Bindings {
7979

8080
open func broadcast_transaction(tx: [UInt8]) -> Void {
8181
/* EDIT ME */
82-
Bindings.print("BroadcasterInterface::broadcast_transaction MUST be overridden!", severity: .ERROR)
83-
84-
abort()
82+
83+
Bindings.print("Error: BroadcasterInterface::broadcast_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
84+
abort()
85+
8586
}
8687

8788
open func free() -> Void {

0 commit comments

Comments
 (0)