f Upgrade to UniFFI 0.23.0

Author: tnull

Cargo.toml

@@ -12,6 +12,10 @@ description = "A ready-to-go node implementation based on LDK."
 crate-type = ["staticlib", "cdylib"]
 name = "ldk_node"
 
+[[bin]]
+name = "uniffi-bindgen"
+path = "uniffi-bindgen.rs"
+
 [dependencies]
 #lightning = { version = "0.0.112", features = ["max_level_trace", "std"] }
 #lightning-invoice = { version = "0.20" }
@@ -51,16 +55,16 @@ chrono = "0.4"
 futures = "0.3"
 serde_json = { version = "1.0" }
 tokio = { version = "1", features = [ "full" ] }
-uniffi = { version = "0.21.0", features = ["builtin-bindgen"] }
-uniffi_macros = { version = "0.21.0", features = ["builtin-bindgen"] }
+uniffi = { version = "0.23.0", features = ["build"] }
 
 [dev-dependencies]
 electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
 electrum-client = "0.12.0"
 once_cell = "1.16.0"
 
 [build-dependencies]
-uniffi_build = "0.21.0"
+uniffi = { version = "0.23.0", features = ["build", "cli"] }
+
 
 [profile.release]
 panic = "abort"

build.rs

@@ -1,3 +1,3 @@
 fn main() {
-	uniffi_build::generate_scaffolding("bindings/ldk_node.udl").unwrap();
+	uniffi::generate_scaffolding("bindings/ldk_node.udl").unwrap();
 }

scripts/uniffi_bindgen_generate_kotlin.sh

@@ -2,9 +2,10 @@
 BINDINGS_DIR="./bindings/kotlin"
 PROJECT_DIR="ldk-node-jvm"
 PACKAGE_DIR="org/lightningdevkit/ldknode"
+UNIFFI_BINDGEN_BIN="cargo run --features=uniffi/cli --bin uniffi-bindgen"
 
 cargo build --target aarch64-apple-darwin
-uniffi-bindgen generate bindings/ldk_node.udl --language kotlin -o "$BINDINGS_DIR"
+$UNIFFI_BINDGEN_BIN generate bindings/ldk_node.udl --language kotlin -o "$BINDINGS_DIR"
 
 mkdir -p "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/kotlin/"$PACKAGE_DIR"
 mkdir -p "$BINDINGS_DIR"/"$PROJECT_DIR"/lib/src/main/resources/darwin-aarch64/

src/lib.rs

@@ -90,7 +90,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 use std::time::{Duration, Instant, SystemTime};
 
-uniffi_macros::include_scaffolding!("ldk_node");
+uniffi::include_scaffolding!("ldk_node");
 
 // The used 'stop gap' parameter used by BDK's wallet sync. This seems to configure the threshold
 // number of blocks after which BDK stops looking for scripts belonging to the wallet.

uniffi-bindgen.rs

@@ -0,0 +1,3 @@
+fn main() {
+    uniffi::uniffi_bindgen_main()
+}