From 1fc334f4305f0f0df7b0682426bd346ccd82b2f3 Mon Sep 17 00:00:00 2001 From: yse Date: Wed, 8 Jan 2025 15:53:55 +0100 Subject: [PATCH] fix: bindings --- lib/Cargo.lock | 21 ++++----- lib/core/Cargo.toml | 4 +- lib/core/src/frb_generated.rs | 8 ++-- packages/dart/lib/src/bindings.dart | 2 +- .../dart/lib/src/bindings/duplicates.dart | 2 +- packages/dart/lib/src/error.dart | 2 +- packages/dart/lib/src/frb_generated.dart | 44 ++----------------- packages/dart/lib/src/frb_generated.io.dart | 2 +- packages/dart/lib/src/model.dart | 2 +- packages/dart/pubspec.yaml | 2 +- 10 files changed, 25 insertions(+), 64 deletions(-) diff --git a/lib/Cargo.lock b/lib/Cargo.lock index 2d1ed4b3c..2e28e4034 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "allo-isolate" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b6d794345b06592d0ebeed8e477e41b71e5a0a49df4fc0e4184d5938b99509" +checksum = "1f67642eb6773fb42a95dd3b348c305ee18dee6642274c6b412d67e985e3befc" dependencies = [ "anyhow", "atomic", @@ -1263,10 +1263,10 @@ dependencies = [ ] [[package]] -name = "dart-sys-fork" -version = "4.1.1" +name = "dart-sys" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dafff26172b719bb9695dd3715a1e7792f62dcdc8a5d4c740db7e0fedee8b" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", ] @@ -1596,9 +1596,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff967a5893be60d849e4362910762acdc275febe44333153a11dcec1bca2cd2" +checksum = "5419323ff3ae8b63ed20b7cd0fd0e3e73fa9234b3b212b87b5586fe76ae52318" dependencies = [ "allo-isolate", "android_logger", @@ -1608,7 +1608,7 @@ dependencies = [ "byteorder", "chrono", "console_error_panic_hook", - "dart-sys-fork", + "dart-sys", "delegate-attr", "flutter_rust_bridge_macros", "futures", @@ -1616,6 +1616,7 @@ dependencies = [ "lazy_static", "log", "oslog", + "portable-atomic", "threadpool", "tokio", "wasm-bindgen", @@ -1625,9 +1626,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48b4d3fae9d29377b19134a38386d8792bde70b9448cde49e96391bcfc8fed1" +checksum = "9c6fd06cacc0dfe931d00f3acdc5ac6c5dd9382b33dd78d71cce8f0a62e9458b" dependencies = [ "hex", "md-5", diff --git a/lib/core/Cargo.toml b/lib/core/Cargo.toml index a83b8bece..fe7be08a0 100644 --- a/lib/core/Cargo.toml +++ b/lib/core/Cargo.toml @@ -21,9 +21,7 @@ bip39 = "2.0.0" boltz-client = { git = "https://github.com/dangeross/boltz-rust", rev = "8f64af8d3c7433d19fc8a99887beb341b150c38e" } chrono = "0.4" env_logger = "0.11" -flutter_rust_bridge = { version = "=2.4.0", features = [ - "chrono", -], optional = true } +flutter_rust_bridge = { version = "=2.7.0", features = ["chrono"], optional = true } # We need at least lightning v0.0.125 for the Bolt12 structs. The lightning version from sdk-common is too old (v0.0.118, matching vls-core). lightning = "0.0.125" log = { workspace = true } diff --git a/lib/core/src/frb_generated.rs b/lib/core/src/frb_generated.rs index 382d5acd0..2bb3bfc99 100644 --- a/lib/core/src/frb_generated.rs +++ b/lib/core/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. #![allow( non_camel_case_types, @@ -38,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueNom, default_rust_auto_opaque = RustAutoOpaqueNom, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.4.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.7.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = -2032324171; // Section: executor @@ -1572,7 +1572,7 @@ fn wire__crate__bindings__BindingLiquidSdk_sync_impl( ) { FLUTTER_RUST_BRIDGE_HANDLER.wrap_async::( flutter_rust_bridge::for_generated::TaskInfo { - debug_name: "BindingLiquidSdk_sync", + debug_name: "BindingLiquidSdk_sync(dart_style=sync)", port: Some(port_), mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal, }, @@ -8380,7 +8380,7 @@ impl SseEncode for usize { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.4.0. + // @generated by `flutter_rust_bridge`@ 2.7.0. // Section: imports diff --git a/packages/dart/lib/src/bindings.dart b/packages/dart/lib/src/bindings.dart index 0a74cf709..93b7b96d5 100644 --- a/packages/dart/lib/src/bindings.dart +++ b/packages/dart/lib/src/bindings.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/dart/lib/src/bindings/duplicates.dart b/packages/dart/lib/src/bindings/duplicates.dart index 7c236a776..9fef32c09 100644 --- a/packages/dart/lib/src/bindings/duplicates.dart +++ b/packages/dart/lib/src/bindings/duplicates.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/dart/lib/src/error.dart b/packages/dart/lib/src/error.dart index 9bf883e25..ab6aaaa66 100644 --- a/packages/dart/lib/src/error.dart +++ b/packages/dart/lib/src/error.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/dart/lib/src/frb_generated.dart b/packages/dart/lib/src/frb_generated.dart index 4f82a4318..b37bcd76a 100644 --- a/packages/dart/lib/src/frb_generated.dart +++ b/packages/dart/lib/src/frb_generated.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field @@ -62,7 +62,7 @@ class RustLib extends BaseEntrypoint { ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig => kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.4.0'; + String get codegenVersion => '2.7.0'; @override int get rustContentHash => -2032324171; @@ -1055,7 +1055,7 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { } TaskConstMeta get kCrateBindingsBindingLiquidSdkSyncConstMeta => const TaskConstMeta( - debugName: "BindingLiquidSdk_sync", + debugName: "BindingLiquidSdk_sync(dart_style=sync)", argNames: ["that"], ); @@ -5429,8 +5429,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case AesSuccessActionDataResult_ErrorStatus(reason: final reason): sse_encode_i_32(1, serializer); sse_encode_String(reason, serializer); - default: - throw UnimplementedError(''); } } @@ -5445,8 +5443,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_i_32(1, serializer); sse_encode_String(iso4217Code, serializer); sse_encode_u_64(fractionalAmount, serializer); - default: - throw UnimplementedError(''); } } @@ -5896,8 +5892,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case GetPaymentRequest_Lightning(paymentHash: final paymentHash): sse_encode_i_32(0, serializer); sse_encode_String(paymentHash, serializer); - default: - throw UnimplementedError(''); } } @@ -5947,8 +5941,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case InputType_LnUrlError(data: final data): sse_encode_i_32(9, serializer); sse_encode_box_autoadd_ln_url_error_data(data, serializer); - default: - throw UnimplementedError(''); } } @@ -6058,8 +6050,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case ListPaymentDetails_Bitcoin(address: final address): sse_encode_i_32(1, serializer); sse_encode_String(address, serializer); - default: - throw UnimplementedError(''); } } @@ -6185,8 +6175,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlAuthError_ServiceConnectivity(err: final err): sse_encode_i_32(2, serializer); sse_encode_String(err, serializer); - default: - throw UnimplementedError(''); } } @@ -6208,8 +6196,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlCallbackStatus_ErrorStatus(data: final data): sse_encode_i_32(1, serializer); sse_encode_box_autoadd_ln_url_error_data(data, serializer); - default: - throw UnimplementedError(''); } } @@ -6270,8 +6256,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlPayError_ServiceConnectivity(err: final err): sse_encode_i_32(11, serializer); sse_encode_String(err, serializer); - default: - throw UnimplementedError(''); } } @@ -6315,8 +6299,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlPayResult_PayError(data: final data): sse_encode_i_32(2, serializer); sse_encode_box_autoadd_ln_url_pay_error_data(data, serializer); - default: - throw UnimplementedError(''); } } @@ -6349,8 +6331,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlWithdrawError_ServiceConnectivity(err: final err): sse_encode_i_32(5, serializer); sse_encode_String(err, serializer); - default: - throw UnimplementedError(''); } } @@ -6385,8 +6365,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case LnUrlWithdrawResult_ErrorStatus(data: final data): sse_encode_i_32(2, serializer); sse_encode_box_autoadd_ln_url_error_data(data, serializer); - default: - throw UnimplementedError(''); } } @@ -6618,8 +6596,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_u_64(amountSat, serializer); case PayAmount_Drain(): sse_encode_i_32(1, serializer); - default: - throw UnimplementedError(''); } } @@ -6685,8 +6661,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_String(description, serializer); sse_encode_opt_String(refundTxId, serializer); sse_encode_opt_box_autoadd_u_64(refundTxAmountSat, serializer); - default: - throw UnimplementedError(''); } } @@ -6747,8 +6721,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case PaymentError_SignerError(err: final err): sse_encode_i_32(20, serializer); sse_encode_String(err, serializer); - default: - throw UnimplementedError(''); } } @@ -6958,8 +6930,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case SdkError_ServiceConnectivity(err: final err): sse_encode_i_32(3, serializer); sse_encode_String(err, serializer); - default: - throw UnimplementedError(''); } } @@ -6990,8 +6960,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_box_autoadd_payment(details, serializer); case SdkEvent_Synced(): sse_encode_i_32(7, serializer); - default: - throw UnimplementedError(''); } } @@ -7009,8 +6977,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { sse_encode_i_32(2, serializer); sse_encode_box_autoadd_ln_offer(offer, serializer); sse_encode_u_64(receiverAmountSat, serializer); - default: - throw UnimplementedError(''); } } @@ -7051,8 +7017,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case SuccessAction_Url(data: final data): sse_encode_i_32(2, serializer); sse_encode_box_autoadd_url_success_action_data(data, serializer); - default: - throw UnimplementedError(''); } } @@ -7069,8 +7033,6 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi { case SuccessActionProcessed_Url(data: final data): sse_encode_i_32(2, serializer); sse_encode_box_autoadd_url_success_action_data(data, serializer); - default: - throw UnimplementedError(''); } } diff --git a/packages/dart/lib/src/frb_generated.io.dart b/packages/dart/lib/src/frb_generated.io.dart index 6da3d5196..511945d94 100644 --- a/packages/dart/lib/src/frb_generated.io.dart +++ b/packages/dart/lib/src/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/packages/dart/lib/src/model.dart b/packages/dart/lib/src/model.dart index d1ce58b28..4b9ce6c9e 100644 --- a/packages/dart/lib/src/model.dart +++ b/packages/dart/lib/src/model.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.4.0. +// @generated by `flutter_rust_bridge`@ 2.7.0. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/dart/pubspec.yaml b/packages/dart/pubspec.yaml index 82052f5bb..1fef32ea2 100644 --- a/packages/dart/pubspec.yaml +++ b/packages/dart/pubspec.yaml @@ -22,7 +22,7 @@ dev_dependencies: test: ^1.25.5 dependencies: ffi: ^2.1.2 - flutter_rust_bridge: 2.4.0 + flutter_rust_bridge: 2.7.0 freezed_annotation: ^2.4.1 logging: ^1.2.0 meta: ^1.12.0 # meta is pinned to version 1.12.0 by integration_test from the flutter SDK.