From e1d46837feb0e3409dd6ae774e15dc08d4c4de51 Mon Sep 17 00:00:00 2001 From: Erdem Yerebasmaz Date: Tue, 5 Nov 2024 18:03:26 +0300 Subject: [PATCH] Resolve regressions introduced during rebase Errors made around import resolution(sdk-common changes etc.) & removal of a crate introduced on this PR --- libs/Cargo.lock | 5 +-- libs/sdk-bindings/src/uniffi_binding.rs | 42 ++++++++++++------------- libs/sdk-core/Cargo.toml | 1 + libs/sdk-core/src/binding.rs | 15 +++------ libs/sdk-core/src/breez_services.rs | 1 - libs/sdk-flutter/pubspec.lock | 24 +++++++------- tools/sdk-cli/Cargo.lock | 5 +-- 7 files changed, 45 insertions(+), 48 deletions(-) diff --git a/libs/Cargo.lock b/libs/Cargo.lock index aac2f2e60..7803ea9a1 100644 --- a/libs/Cargo.lock +++ b/libs/Cargo.lock @@ -640,6 +640,7 @@ dependencies = [ "mockito", "once_cell", "openssl", + "parking_lot", "prost", "rand", "regex", @@ -2342,9 +2343,9 @@ checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", diff --git a/libs/sdk-bindings/src/uniffi_binding.rs b/libs/sdk-bindings/src/uniffi_binding.rs index f444777ed..cb50c61e6 100644 --- a/libs/sdk-bindings/src/uniffi_binding.rs +++ b/libs/sdk-bindings/src/uniffi_binding.rs @@ -10,29 +10,29 @@ use breez_sdk_core::{ BuyBitcoinProvider, BuyBitcoinRequest, BuyBitcoinResponse, ChannelState, CheckMessageRequest, CheckMessageResponse, ClosedChannelPaymentDetails, Config, ConfigureNodeRequest, ConnectRequest, CurrencyInfo, EnvironmentType, EventListener, FeeratePreset, FiatCurrency, - GreenlightCredentials, GreenlightNodeConfig, HealthCheckStatus, InputType, InvoicePaidDetails, - LNInvoice, LevelFilter, ListPaymentsRequest, LnPaymentDetails, LnUrlAuthRequestData, - LnUrlCallbackStatus, LnUrlErrorData, LnUrlPayErrorData, LnUrlPayRequest, LnUrlPayRequestData, - LnUrlPayResult, LnUrlPaySuccessData, LnUrlWithdrawRequest, LnUrlWithdrawRequestData, - LnUrlWithdrawResult, LnUrlWithdrawSuccessData, LocaleOverrides, LocalizedName, LogEntry, - LogStream, LspInformation, MaxReverseSwapAmountResponse, MessageSuccessActionData, - MetadataFilter, MetadataItem, Network, NodeConfig, NodeCredentials, NodeState, - OnchainPaymentLimitsResponse, OpenChannelFeeRequest, OpenChannelFeeResponse, OpeningFeeParams, - OpeningFeeParamsMenu, PayOnchainRequest, PayOnchainResponse, Payment, PaymentDetails, - PaymentFailedData, PaymentStatus, PaymentType, PaymentTypeFilter, PrepareOnchainPaymentRequest, - PrepareOnchainPaymentResponse, PrepareRedeemOnchainFundsRequest, - PrepareRedeemOnchainFundsResponse, PrepareRefundRequest, PrepareRefundResponse, Rate, - ReceiveOnchainRequest, ReceivePaymentRequest, ReceivePaymentResponse, RecommendedFees, - RedeemOnchainFundsRequest, RedeemOnchainFundsResponse, RefundRequest, RefundResponse, - ReportIssueRequest, ReportPaymentFailureDetails, ReverseSwapFeesRequest, ReverseSwapInfo, - ReverseSwapPairInfo, ReverseSwapStatus, RouteHint, RouteHintHop, SendOnchainRequest, - SendOnchainResponse, SendPaymentRequest, SendPaymentResponse, SendSpontaneousPaymentRequest, - ServiceHealthCheckResponse, SignMessageRequest, SignMessageResponse, StaticBackupRequest, - StaticBackupResponse, SuccessActionProcessed, SwapAmountType, SwapInfo, SwapStatus, Symbol, - TlvEntry, UnspentTransactionOutput, UrlSuccessActionData, + GreenlightCredentials, GreenlightDeviceCredentials, GreenlightNodeConfig, HealthCheckStatus, + InputType, InvoicePaidDetails, LNInvoice, LevelFilter, ListPaymentsRequest, LnPaymentDetails, + LnUrlAuthError, LnUrlAuthRequestData, LnUrlCallbackStatus, LnUrlErrorData, LnUrlPayError, + LnUrlPayErrorData, LnUrlPayRequest, LnUrlPayRequestData, LnUrlWithdrawError, + LnUrlWithdrawRequest, LnUrlWithdrawRequestData, LnUrlWithdrawResult, LnUrlWithdrawSuccessData, + LocaleOverrides, LocalizedName, LogEntry, LogStream, LspInformation, + MaxReverseSwapAmountResponse, MessageSuccessActionData, MetadataFilter, MetadataItem, Network, + NodeConfig, NodeCredentials, NodeState, OnchainPaymentLimitsResponse, OpenChannelFeeRequest, + OpenChannelFeeResponse, OpeningFeeParams, OpeningFeeParamsMenu, PayOnchainRequest, + PayOnchainResponse, Payment, PaymentDetails, PaymentFailedData, PaymentStatus, PaymentType, + PaymentTypeFilter, PrepareOnchainPaymentRequest, PrepareOnchainPaymentResponse, + PrepareRedeemOnchainFundsRequest, PrepareRedeemOnchainFundsResponse, PrepareRefundRequest, + PrepareRefundResponse, Rate, ReceiveOnchainRequest, ReceivePaymentRequest, + ReceivePaymentResponse, RecommendedFees, RedeemOnchainFundsRequest, RedeemOnchainFundsResponse, + RefundRequest, RefundResponse, ReportIssueRequest, ReportPaymentFailureDetails, + ReverseSwapFeesRequest, ReverseSwapInfo, ReverseSwapPairInfo, ReverseSwapStatus, RouteHint, + RouteHintHop, SendOnchainRequest, SendOnchainResponse, SendPaymentRequest, SendPaymentResponse, + SendSpontaneousPaymentRequest, ServiceHealthCheckResponse, SignMessageRequest, + SignMessageResponse, StaticBackupRequest, StaticBackupResponse, SuccessActionProcessed, + SwapAmountType, SwapInfo, SwapStatus, Symbol, TlvEntry, UnspentTransactionOutput, + UrlSuccessActionData, }; use once_cell::sync::Lazy; -use std::sync::Arc; static RT: Lazy = Lazy::new(|| tokio::runtime::Runtime::new().unwrap()); diff --git a/libs/sdk-core/Cargo.toml b/libs/sdk-core/Cargo.toml index d350adb4b..cb33c7c8f 100644 --- a/libs/sdk-core/Cargo.toml +++ b/libs/sdk-core/Cargo.toml @@ -25,6 +25,7 @@ ripemd = "0.1" rand = "0.8" tiny-bip39 = "1" tokio = { workspace = true } +parking_lot = "0.12.3" prost = { workspace = true } rusqlite = { workspace = true } rusqlite_migration = "1.0" diff --git a/libs/sdk-core/src/binding.rs b/libs/sdk-core/src/binding.rs index 765311651..cec947040 100644 --- a/libs/sdk-core/src/binding.rs +++ b/libs/sdk-core/src/binding.rs @@ -33,22 +33,17 @@ use crate::error::{ ConnectError, ReceiveOnchainError, ReceivePaymentError, RedeemOnchainError, SdkError, SendOnchainError, SendPaymentError, }; -use crate::fiat::{FiatCurrency, Rate}; -use crate::input_parser::{self, InputType, LnUrlAuthRequestData}; -use crate::invoice::{self, LNInvoice}; -use crate::lnurl::pay::model::LnUrlPayResult; use crate::logger::{init_dart_logger, DartLogger}; use crate::lsp::LspInformation; use crate::models::{Config, LogEntry, NodeState, Payment, SwapInfo}; use crate::{ BackupStatus, BuyBitcoinRequest, BuyBitcoinResponse, CheckMessageRequest, CheckMessageResponse, ConfigureNodeRequest, ConnectRequest, EnvironmentType, LevelFilter, ListPaymentsRequest, - LnUrlCallbackStatus, LnUrlPayRequest, LnUrlWithdrawRequest, LnUrlWithdrawResult, - MaxReverseSwapAmountResponse, NodeConfig, NodeCredentials, OnchainPaymentLimitsResponse, - OpenChannelFeeRequest, OpenChannelFeeResponse, PayOnchainRequest, PayOnchainResponse, - PrepareOnchainPaymentRequest, PrepareOnchainPaymentResponse, PrepareRedeemOnchainFundsRequest, - PrepareRedeemOnchainFundsResponse, PrepareRefundRequest, PrepareRefundResponse, - ReceiveOnchainRequest, ReceivePaymentRequest, ReceivePaymentResponse, + LnUrlAuthError, MaxReverseSwapAmountResponse, NodeConfig, NodeCredentials, + OnchainPaymentLimitsResponse, OpenChannelFeeRequest, OpenChannelFeeResponse, PayOnchainRequest, + PayOnchainResponse, PrepareOnchainPaymentRequest, PrepareOnchainPaymentResponse, + PrepareRedeemOnchainFundsRequest, PrepareRedeemOnchainFundsResponse, PrepareRefundRequest, + PrepareRefundResponse, ReceiveOnchainRequest, ReceivePaymentRequest, ReceivePaymentResponse, RedeemOnchainFundsRequest, RedeemOnchainFundsResponse, RefundRequest, RefundResponse, ReportIssueRequest, ReverseSwapFeesRequest, ReverseSwapInfo, ReverseSwapPairInfo, SendOnchainRequest, SendOnchainResponse, SendPaymentRequest, SendPaymentResponse, diff --git a/libs/sdk-core/src/breez_services.rs b/libs/sdk-core/src/breez_services.rs index 5f72e4db8..61b2bb370 100644 --- a/libs/sdk-core/src/breez_services.rs +++ b/libs/sdk-core/src/breez_services.rs @@ -1,4 +1,3 @@ -use std::cmp::min; use std::str::FromStr; use std::sync::Arc; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; diff --git a/libs/sdk-flutter/pubspec.lock b/libs/sdk-flutter/pubspec.lock index 2a5d2219f..966b705f5 100644 --- a/libs/sdk-flutter/pubspec.lock +++ b/libs/sdk-flutter/pubspec.lock @@ -351,18 +351,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: @@ -399,18 +399,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.11.1" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.12.0" mime: dependency: transitive description: @@ -588,10 +588,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.0" timing: dependency: transitive description: @@ -636,10 +636,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.1" watcher: dependency: transitive description: diff --git a/tools/sdk-cli/Cargo.lock b/tools/sdk-cli/Cargo.lock index 6223d9895..269b44771 100644 --- a/tools/sdk-cli/Cargo.lock +++ b/tools/sdk-cli/Cargo.lock @@ -549,6 +549,7 @@ dependencies = [ "miniz_oxide", "once_cell", "openssl", + "parking_lot", "prost", "rand", "regex", @@ -2179,9 +2180,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core",