Merge branch 'main' into mock-deps

getlipa · Jul 2, 2024 · bc1c2a3 · bc1c2a3
2 parents 9634579 + 8ba9320
commit bc1c2a3
Show file tree

Hide file tree

Showing 20 changed files with 210 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,19 +19,19 @@ parser = { path = "parser" }
 pocketclient = { path = "pocketclient", optional = true }
 pocketclient-mock = { path = "mock/pocketclient", optional = true }
 
-chameleon = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+chameleon = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 chameleon-mock = { path = "mock/wild/chameleon", optional = true }
-crow = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+crow = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 crow-mock = { path = "mock/wild/crow", optional = true }
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
-honeybadger = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
+honeybadger = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 honeybadger-mock = { path = "mock/wild/honeybadger", optional = true }
-parrot = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+parrot = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 parrot-mock = { path = "mock/wild/parrot", optional = true }
 perro = { git = "https://github.com/getlipa/perro", tag = "v1.2.0" }
-pigeon = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+pigeon = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 pigeon-mock = { path = "mock/wild/pigeon", optional = true }
-squirrel = { git = "https://github.com/getlipa/wild", tag = "v1.23.0", optional = true }
+squirrel = { git = "https://github.com/getlipa/wild", tag = "v1.24.0", optional = true }
 squirrel-mock = { path = "mock/wild/squirrel", optional = true }
 
 breez-sdk-core = { git = "https://github.com/breez/breez-sdk", tag = "0.4.2-rc1", optional = true }
@@ -46,7 +46,7 @@ email_address = "0.2.4"
 file-rotate = "0.7.6"
 hex = "0.4.3"
 iban_validate = "4.0.1"
-log = "0.4.21"
+log = "0.4.22"
 num_enum = "0.7.2"
 phonenumber = "0.3.5"
 rand = "0.8.5"
@@ -60,7 +60,7 @@ simplelog = { version = "0.12.2" }
 thiserror = "1.0.61"
 tokio = { version = "1.38.0", features = ["rt-multi-thread", "time", "sync"] }
 uniffi = "0.28.0"
-uuid = { version = "1.8.0", features = ["v5"] }
+uuid = { version = "1.9.1", features = ["v5"] }
 
 [features]
 default = ["dep:breez-sdk-core", "dep:chameleon", "dep:crow", "dep:honeybadger", "dep:parrot", "dep:pigeon", "dep:squirrel", "dep:pocketclient"]
@@ -95,7 +95,7 @@ rustyline = { version = "14.0.0", features = ["derive"] }
 serial_test = { version = "3.1.1", features = ["file_locks"] }
 strip-ansi-escapes = "0.2.0"
 thousands = "0.2.0"
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
 
 [build-dependencies]
 camino = "1.1.7"

diff --git a/examples/node/cli.rs b/examples/node/cli.rs
@@ -1238,6 +1238,14 @@ fn print_activity(activity: Activity) -> Result<()> {
             println!("      Swap:            {swap_info:?}");
             Ok(())
         }
+        Activity::ReverseSwap {
+            outgoing_payment_info,
+            reverse_swap_info,
+        } => {
+            print_outgoing_payment(outgoing_payment_info)?;
+            println!("      Reverse Swap:    {reverse_swap_info:?}");
+            Ok(())
+        }
         Activity::ChannelClose { channel_close_info } => print_channel_close(channel_close_info),
     }
 }

diff --git a/examples/node/overview.rs b/examples/node/overview.rs
@@ -106,6 +106,10 @@ fn print_activity(activity: Activity) -> Result<()> {
             // TODO: implement print of pending swap
             Ok(())
         }
+        Activity::ReverseSwap {
+            outgoing_payment_info,
+            ..
+        } => print_outgoing_payment(outgoing_payment_info),
         Activity::ChannelClose { channel_close_info } => print_channel_close(channel_close_info),
     }
 }

diff --git a/mock/breez-sdk/Cargo.toml b/mock/breez-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "breez-sdk-mock"
-version = "0.4.1"
+version = "0.4.2-rc1"
 edition = "2021"
 
 [lib]
@@ -10,7 +10,7 @@ name = "breez_sdk_core"
 tokio = { version = "1.37.0", features = ["rt-multi-thread", "time", "sync"] }
 anyhow = { version = "1.0.81", features = [] }
 bitcoin = { version = "0.30.2", default-features = false }
-breez-sdk-core = { git = "https://github.com/breez/breez-sdk", tag = "0.4.1" }
+breez-sdk-core = { git = "https://github.com/breez/breez-sdk", tag = "0.4.2-rc1" }
 chrono = { version = "0.4", features = [] }
 hex = "0.4.3"
 rand = { version = "0.8.5", features = [] }

diff --git a/mock/breez-sdk/src/lib.rs b/mock/breez-sdk/src/lib.rs
@@ -58,15 +58,15 @@ pub use breez_sdk_core::{
     PaymentTypeFilter, PrepareOnchainPaymentRequest, PrepareOnchainPaymentResponse,
     PrepareRedeemOnchainFundsRequest, PrepareRefundRequest, ReceiveOnchainRequest,
     ReceivePaymentRequest, ReceivePaymentResponse, RedeemOnchainFundsRequest, RefundRequest,
-    ReportIssueRequest, ReportPaymentFailureDetails, ReverseSwapFeesRequest, SendOnchainRequest,
-    SendPaymentRequest, SignMessageRequest, SwapAmountType, SwapStatus, UnspentTransactionOutput,
+    ReportIssueRequest, ReportPaymentFailureDetails, ReverseSwapFeesRequest, ReverseSwapStatus,
+    SendOnchainRequest, SendPaymentRequest, SignMessageRequest, SwapAmountType, SwapStatus,
+    UnspentTransactionOutput,
 };
 use breez_sdk_core::{
     ChannelState, Config, LspInformation, NodeState, OpenChannelFeeResponse, PayOnchainResponse,
     PrepareRedeemOnchainFundsResponse, PrepareRefundResponse, RecommendedFees,
     RedeemOnchainFundsResponse, RefundResponse, ReverseSwapInfo, ReverseSwapPairInfo,
-    ReverseSwapStatus, SendPaymentResponse, ServiceHealthCheckResponse, SignMessageResponse,
-    SwapInfo,
+    SendPaymentResponse, ServiceHealthCheckResponse, SignMessageResponse, SwapInfo,
 };
 use chrono::Utc;
 use hex::FromHex;

diff --git a/mock/wild/chameleon/Cargo.toml b/mock/wild/chameleon/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 name = "chameleon"
 
 [dependencies]
-chameleon = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+chameleon = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 honeybadger-mock = { path = "../honeybadger" }
 lazy_static = "1.4.0"
 rand = "0.8.5"
diff --git a/mock/wild/crow/Cargo.toml b/mock/wild/crow/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 name = "crow"
 
 [dependencies]
-crow = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+crow = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 honeybadger-mock = { path = "../honeybadger" }
 isocountry = { version = "0.3.2" }
 isolanguage-1 = { version = "0.2.2" }

diff --git a/mock/wild/honeybadger/Cargo.toml b/mock/wild/honeybadger/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 name = "honeybadger"
 
 [dependencies]
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
-honeybadger = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
+honeybadger = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 rand = "0.8.5"
 secp256k1 = { version = "0.27.0", features = ["global-context"] }
 tokio = "1.37.0"

diff --git a/mock/wild/parrot/Cargo.toml b/mock/wild/parrot/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 name = "parrot"
 
 [dependencies]
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 honeybadger-mock = { path = "../honeybadger" }
-parrot = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+parrot = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
diff --git a/mock/wild/pigeon/Cargo.toml b/mock/wild/pigeon/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 name = "pigeon"
 
 [dependencies]
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 honeybadger-mock = { path = "../honeybadger" }
 lazy_static = "1.4.0"
diff --git a/mock/wild/pigeon/src/lib.rs b/mock/wild/pigeon/src/lib.rs
@@ -12,7 +12,7 @@ pub async fn submit_lnurl_pay_invoice(
     _backend_url: &str,
     _auth: &Auth,
     _id: String,
-    _invoice: String,
+    _invoice: Option<String>,
 ) -> graphql::Result<()> {
     Ok(())
 }

diff --git a/mock/wild/squirrel/Cargo.toml b/mock/wild/squirrel/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 name = "squirrel"
 
 [dependencies]
-graphql = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+graphql = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
 honeybadger-mock = { path = "../honeybadger" }
-squirrel = { git = "https://github.com/getlipa/wild", tag = "v1.23.0" }
+squirrel = { git = "https://github.com/getlipa/wild", tag = "v1.24.0" }
diff --git a/pocketclient/Cargo.toml b/pocketclient/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
-log = "0.4.21"
+log = "0.4.22"
 perro = { git = "https://github.com/getlipa/perro", tag = "v1.2.0" }
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
 serde = { version = "1.0", features = ["derive"] }