Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cut 0.0.124.0 #165

Merged
merged 11 commits into from
Sep 5, 2024
Merged

Cut 0.0.124.0 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29a9573
Be more conservative about holding a ref to a cloned object
TheBlueMatt Aug 3, 2024
720e2d4
[C#] Improve reserved word avoidance and use in complex enums
TheBlueMatt Sep 1, 2024
9559614
[C#] Update auto-generated bindings
TheBlueMatt Sep 1, 2024
7ebd5df
[C#] Update tests to latest upstream LDK API
TheBlueMatt Sep 1, 2024
9e43343
[C#] Test BOLT 12 Invoice[Request] builders with their references
TheBlueMatt Sep 1, 2024
209f789
[Java] Update auto-generated bindings
TheBlueMatt Aug 1, 2024
59f5e45
[Java] Update batteries and tests to latest LDK API
TheBlueMatt Sep 1, 2024
851ec14
[TS] Update auto-generated bindings
TheBlueMatt Sep 1, 2024
1434d22
[TS] Update tests to latest LDK API
TheBlueMatt Sep 1, 2024
2575248
Use older `cbindgen` on android to work around MSRV
TheBlueMatt Sep 4, 2024
db83033
Update CI references to LDK 0.0.124 drop stale memchr pins
TheBlueMatt Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 19 additions & 26 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Rebuild C bindings without STD
run: |
cd ldk-c-bindings
Expand Down Expand Up @@ -138,13 +136,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Rebuild C bindings with STD
run: |
cd ldk-c-bindings
Expand Down Expand Up @@ -185,11 +181,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
git checkout 0.0.124
- name: Fetch MacOS SDK
run: |
curl -o Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz https://bitcoincore.org/depends-sources/sdks/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
Expand Down Expand Up @@ -340,13 +336,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Pin proc-macro and quote to meet MSRV
run: |
cd ldk-c-bindings/c-bindings-gen
Expand Down Expand Up @@ -403,13 +397,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Pin proc-macro and quote to meet MSRV
run: |
cd ldk-c-bindings/c-bindings-gen
Expand Down Expand Up @@ -532,11 +524,11 @@ jobs:
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
git checkout 0.0.124
- name: Fetch MacOS SDK
run: |
curl -o Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz https://bitcoincore.org/depends-sources/sdks/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
Expand Down Expand Up @@ -661,22 +653,23 @@ jobs:
- name: Install cbindgen
run: |
. $HOME/.cargo/env
cargo install cbindgen
git clone https://github.com/eqrion/cbindgen
cd cbindgen/
git checkout v0.20.0
cargo update -p indexmap --precise "1.6.2" --verbose
cargo install --locked --path .
- name: Checkout Rust-Lightning and LDK-C-Bindings git
run: |
git config --global user.email "[email protected]"
git config --global user.name "LDK CI"
# Note this is a different endpoint, as we need one non-upstream commit!
git clone https://github.com/lightningdevkit/rust-lightning
cd rust-lightning
git checkout origin/0.0.123-bindings
git checkout origin/0.0.124-bindings
cd ..
git clone https://github.com/lightningdevkit/ldk-c-bindings
cd ldk-c-bindings
git checkout 0.0.123
cd lightning-c-bindings
. $HOME/.cargo/env
cargo update -p memchr --precise "2.5.0" --verbose
git checkout 0.0.124
- name: Checkout Android AAR binaries and artifacts
run: |
# Gitweb only allows snapshots of folders by providing the object hash, which we have to extract:
Expand Down
3 changes: 2 additions & 1 deletion bindingstypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class TypeInfo:
def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_hu_ty, c_ty, is_const, passed_as_ptr, is_ptr, nonnull_ptr, var_name, arr_len, arr_access, subty=None, contains_trait=False):
def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_hu_ty, c_ty, is_const, passed_as_ptr, is_ptr, nonnull_ptr, var_name, arr_len, arr_access, is_trait, subty=None, contains_trait=False):
self.is_native_primitive = is_native_primitive
self.rust_obj = rust_obj
self.java_ty = java_ty
Expand All @@ -16,6 +16,7 @@ def __init__(self, is_native_primitive, rust_obj, java_ty, java_fn_ty_arg, java_
self.subty = subty
self.pass_by_ref = is_ptr
self.requires_clone = None
self.is_trait = is_trait
self.contains_trait = contains_trait

def get_full_rust_ty(self):
Expand Down
Loading
Loading