Commit ad5d519
committed
Merge branch 'main' into fix/channel-monitor-migration
# Conflicts:
# CHANGELOG.md
# Package.swift
# bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/arm64-v8a/libldk_node.so
# bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/armeabi-v7a/libldk_node.so
# bindings/kotlin/ldk-node-android/lib/src/main/jniLibs/x86_64/libldk_node.so
# bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-aarch64/libldk_node.dylib
# bindings/kotlin/ldk-node-jvm/lib/src/main/resources/darwin-x86-64/libldk_node.dylib19 files changed
Lines changed: 562 additions & 450 deletions
File tree
- bindings
- kotlin
- ldk-node-android/lib/src/main
- jniLibs
- arm64-v8a
- armeabi-v7a
- x86_64
- kotlin/org/lightningdevkit/ldknode
- ldk-node-jvm/lib/src/main
- kotlin/org/lightningdevkit/ldknode
- resources
- darwin-aarch64
- darwin-x86-64
- python/src/ldk_node
- swift/Sources/LDKNode
- src
- chain
- tests
- common
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
37 | 45 | | |
38 | 46 | | |
39 | 47 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
0 commit comments