diff --git a/Cargo.lock b/Cargo.lock index d1fd8ad..b91c462 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -58,20 +58,19 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android_log-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" +checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d" [[package]] name = "android_logger" -version = "0.13.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" +checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3" dependencies = [ "android_log-sys", - "env_logger", + "env_filter", "log", - "once_cell", ] [[package]] @@ -546,12 +545,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.11", ] [[package]] @@ -697,10 +699,10 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.2" +name = "env_filter" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" dependencies = [ "log", "regex", @@ -785,9 +787,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1d2ad18166cead8c1b92b1c00e64aacc32e6ebd1ac95f77089c276c9c6bd8c" +checksum = "dde126295b2acc5f0a712e265e91b6fdc0ed38767496483e592ae7134db83725" dependencies = [ "allo-isolate", "android_logger", @@ -814,9 +816,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36cf75fba54902e67db5eef4a520df1c9f604db6f71f106fbc012477e2d81542" +checksum = "d5f0420326b13675321b194928bb7830043b68cf8b810e1c651285c747abb080" dependencies = [ "hex", "md-5", @@ -1482,9 +1484,9 @@ dependencies = [ [[package]] name = "oslog" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8343ce955f18e7e68c0207dd0ea776ec453035685395ababd2ea651c569728b3" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" dependencies = [ "cc", "dashmap", @@ -1499,7 +1501,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.6", ] [[package]] @@ -1511,11 +1513,24 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.13", + "smallvec", + "windows-targets 0.52.6", +] + [[package]] name = "paste" version = "0.1.18" @@ -1711,6 +1726,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "regex" version = "1.10.5" diff --git a/packages/bdk_dart_base/pubspec.yaml b/packages/bdk_dart_base/pubspec.yaml index 9cc713d..afd691c 100644 --- a/packages/bdk_dart_base/pubspec.yaml +++ b/packages/bdk_dart_base/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: collection: ^1.17.0 convert: ^3.0.1 crypto: ^3.0.2 - freezed_annotation: ^3.0.0 + freezed_annotation: '>=2.4.0 <4.0.0' pointycastle: ^4.0.0 validators: ^3.0.0 @@ -24,4 +24,4 @@ dev_dependencies: lints: any test: ^1.24.0 build_runner: ^2.1.11 - freezed: ^3.0.0 + freezed: '>=2.5.8 <4.0.0' diff --git a/packages/bdk_dart_ffi/lib/src/api.dart b/packages/bdk_dart_ffi/lib/src/api.dart index f17e1dc..a2b12fc 100644 --- a/packages/bdk_dart_ffi/lib/src/api.dart +++ b/packages/bdk_dart_ffi/lib/src/api.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/bdk/blockchain.dart b/packages/bdk_dart_ffi/lib/src/bdk/blockchain.dart index d1dadf6..f9fead4 100644 --- a/packages/bdk_dart_ffi/lib/src/bdk/blockchain.dart +++ b/packages/bdk_dart_ffi/lib/src/bdk/blockchain.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/bdk/types.dart b/packages/bdk_dart_ffi/lib/src/bdk/types.dart index e6b9781..8c9ac0d 100644 --- a/packages/bdk_dart_ffi/lib/src/bdk/types.dart +++ b/packages/bdk_dart_ffi/lib/src/bdk/types.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/bdk/wallet.dart b/packages/bdk_dart_ffi/lib/src/bdk/wallet.dart index 4eb4274..1d110b8 100644 --- a/packages/bdk_dart_ffi/lib/src/bdk/wallet.dart +++ b/packages/bdk_dart_ffi/lib/src/bdk/wallet.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/frb_generated.dart b/packages/bdk_dart_ffi/lib/src/frb_generated.dart index ff2ec99..4eb5f57 100644 --- a/packages/bdk_dart_ffi/lib/src/frb_generated.dart +++ b/packages/bdk_dart_ffi/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.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // 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 @@ -29,11 +29,13 @@ class BdkDart extends BaseEntrypoint { BdkDartApi? api, BaseHandler? handler, ExternalLibrary? externalLibrary, + bool forceSameCodegenVersion = true, }) async { await instance.initImpl( api: api, handler: handler, externalLibrary: externalLibrary, + forceSameCodegenVersion: forceSameCodegenVersion, ); } @@ -69,7 +71,7 @@ class BdkDart extends BaseEntrypoint { kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.10.0'; + String get codegenVersion => '2.11.1'; @override int get rustContentHash => 1341622589; diff --git a/packages/bdk_dart_ffi/lib/src/frb_generated.io.dart b/packages/bdk_dart_ffi/lib/src/frb_generated.io.dart index 87a4d8b..9e8b491 100644 --- a/packages/bdk_dart_ffi/lib/src/frb_generated.io.dart +++ b/packages/bdk_dart_ffi/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.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // 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/bdk_dart_ffi/lib/src/frb_generated.web.dart b/packages/bdk_dart_ffi/lib/src/frb_generated.web.dart index 3c04b81..1518e7d 100644 --- a/packages/bdk_dart_ffi/lib/src/frb_generated.web.dart +++ b/packages/bdk_dart_ffi/lib/src/frb_generated.web.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // 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/bdk_dart_ffi/lib/src/lib.dart b/packages/bdk_dart_ffi/lib/src/lib.dart index 0a2c232..9b7e847 100644 --- a/packages/bdk_dart_ffi/lib/src/lib.dart +++ b/packages/bdk_dart_ffi/lib/src/lib.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/secp256k1.dart b/packages/bdk_dart_ffi/lib/src/secp256k1.dart index fdd0600..3c4040f 100644 --- a/packages/bdk_dart_ffi/lib/src/secp256k1.dart +++ b/packages/bdk_dart_ffi/lib/src/secp256k1.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/lib/src/types.dart b/packages/bdk_dart_ffi/lib/src/types.dart index 6eb016d..8415fa8 100644 --- a/packages/bdk_dart_ffi/lib/src/types.dart +++ b/packages/bdk_dart_ffi/lib/src/types.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import diff --git a/packages/bdk_dart_ffi/native/bdk_dart/Cargo.toml b/packages/bdk_dart_ffi/native/bdk_dart/Cargo.toml index 01289a7..d7ed967 100644 --- a/packages/bdk_dart_ffi/native/bdk_dart/Cargo.toml +++ b/packages/bdk_dart_ffi/native/bdk_dart/Cargo.toml @@ -16,7 +16,7 @@ hex = "=0.4.3" lazy_static = "=1.5.0" sha2 = "=0.10.9" -flutter_rust_bridge = "=2.10.0" +flutter_rust_bridge = "=2.11.1" [dependencies.bitcoin] default-features = false diff --git a/packages/bdk_dart_ffi/native/bdk_dart/src/frb_generated.rs b/packages/bdk_dart_ffi/native/bdk_dart/src/frb_generated.rs index 008e05f..bd8a97c 100644 --- a/packages/bdk_dart_ffi/native/bdk_dart/src/frb_generated.rs +++ b/packages/bdk_dart_ffi/native/bdk_dart/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.10.0. +// @generated by `flutter_rust_bridge`@ 2.11.1. #![allow( non_camel_case_types, @@ -38,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.10.0"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.11.1"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1341622589; // Section: executor @@ -6166,7 +6166,7 @@ impl SseEncode for crate::bdk::types::WordCount { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.10.0. + // @generated by `flutter_rust_bridge`@ 2.11.1. // Section: imports @@ -6232,7 +6232,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.10.0. + // @generated by `flutter_rust_bridge`@ 2.11.1. // Section: imports diff --git a/packages/bdk_dart_ffi/pubspec.yaml b/packages/bdk_dart_ffi/pubspec.yaml index 9be6f02..4343eef 100644 --- a/packages/bdk_dart_ffi/pubspec.yaml +++ b/packages/bdk_dart_ffi/pubspec.yaml @@ -9,12 +9,12 @@ environment: sdk: '>=3.4.0 <4.0.0' dependencies: - flutter_rust_bridge: '>=2.10.0 <2.10.1' - freezed_annotation: ^3.0.0 + flutter_rust_bridge: ^2.11.1 + freezed_annotation: '>=2.4.0 <4.0.0' dev_dependencies: lints: # transparent build_runner: ^2.1.11 ffi: ^2.1.0 ffigen: ^18.0.0 - freezed: ^3.0.0 + freezed: '>=2.5.8 <4.0.0'