diff --git a/Cargo.lock b/Cargo.lock index 31d0d23e15..2465dce32f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8333,7 +8333,7 @@ dependencies = [ [[package]] name = "ya-client" version = "0.8.0" -source = "git+https://github.com/golemfactory/ya-client.git?rev=e58208bdd521afbb626021d94b0b91a7d17d4e9d#e58208bdd521afbb626021d94b0b91a7d17d4e9d" +source = "git+https://github.com/golemfactory/ya-client.git?rev=2539fcefd02b12e0078dc1ddcc9bcc0e841e685f#2539fcefd02b12e0078dc1ddcc9bcc0e841e685f" dependencies = [ "actix-codec", "awc", @@ -8357,7 +8357,7 @@ dependencies = [ [[package]] name = "ya-client-model" version = "0.6.0" -source = "git+https://github.com/golemfactory/ya-client.git?rev=e58208bdd521afbb626021d94b0b91a7d17d4e9d#e58208bdd521afbb626021d94b0b91a7d17d4e9d" +source = "git+https://github.com/golemfactory/ya-client.git?rev=2539fcefd02b12e0078dc1ddcc9bcc0e841e685f#2539fcefd02b12e0078dc1ddcc9bcc0e841e685f" dependencies = [ "bigdecimal 0.2.2", "chrono", @@ -8368,6 +8368,7 @@ dependencies = [ "rand 0.8.5", "secp256k1 0.27.0", "serde", + "serde_bytes", "serde_json", "strum 0.24.1", "strum_macros 0.24.3", diff --git a/Cargo.toml b/Cargo.toml index ac2d84600d..5f2e8d5eca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -275,9 +275,9 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" } ya-service-api-web = { path = "core/serv-api/web" } ## CLIENT -ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "e58208bdd521afbb626021d94b0b91a7d17d4e9d" } +ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "2539fcefd02b12e0078dc1ddcc9bcc0e841e685f" } #ya-client = { path = "../ya-client" } -ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "e58208bdd521afbb626021d94b0b91a7d17d4e9d" } +ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "2539fcefd02b12e0078dc1ddcc9bcc0e841e685f" } #ya-client-model = { path = "../ya-client/model" } golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" } diff --git a/core/payment/examples/cancel_invoice.rs b/core/payment/examples/cancel_invoice.rs index 3d25ba3e1a..72a19eca29 100644 --- a/core/payment/examples/cancel_invoice.rs +++ b/core/payment/examples/cancel_invoice.rs @@ -192,6 +192,7 @@ async fn main() -> anyhow::Result<()> { )), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await?; diff --git a/core/payment/examples/debit_note_flow.rs b/core/payment/examples/debit_note_flow.rs index ce81ec5459..2b979a4a15 100644 --- a/core/payment/examples/debit_note_flow.rs +++ b/core/payment/examples/debit_note_flow.rs @@ -77,6 +77,7 @@ async fn main() -> anyhow::Result<()> { payment_platform: Some(PaymentPlatformEnum::PaymentPlatformName(args.platform)), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await?; diff --git a/core/payment/examples/invoice_flow.rs b/core/payment/examples/invoice_flow.rs index 98435de486..80f9c7d528 100644 --- a/core/payment/examples/invoice_flow.rs +++ b/core/payment/examples/invoice_flow.rs @@ -77,6 +77,7 @@ async fn main() -> anyhow::Result<()> { payment_platform: Some(PaymentPlatformEnum::PaymentPlatformName(args.platform)), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await?; diff --git a/core/payment/examples/market_decoration.rs b/core/payment/examples/market_decoration.rs index aa86d66fd1..358758c76d 100644 --- a/core/payment/examples/market_decoration.rs +++ b/core/payment/examples/market_decoration.rs @@ -36,6 +36,7 @@ async fn main() -> anyhow::Result<()> { )), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await diff --git a/core/payment/examples/release_allocation.rs b/core/payment/examples/release_allocation.rs index 6591016975..6bbbc9a875 100644 --- a/core/payment/examples/release_allocation.rs +++ b/core/payment/examples/release_allocation.rs @@ -34,6 +34,7 @@ async fn main() -> anyhow::Result<()> { )), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await?; @@ -97,6 +98,7 @@ async fn main() -> anyhow::Result<()> { )), total_amount: BigDecimal::from(10u64), timeout: None, + deposit: None, make_deposit: false, }) .await?; diff --git a/core/payment/examples/validate_allocation.rs b/core/payment/examples/validate_allocation.rs index 987ab21ded..cec0c3fde7 100644 --- a/core/payment/examples/validate_allocation.rs +++ b/core/payment/examples/validate_allocation.rs @@ -64,6 +64,7 @@ async fn main() -> anyhow::Result<()> { )), total_amount: BigDecimal::from(1u64), timeout: None, + deposit: None, make_deposit: false, }) .await; @@ -75,6 +76,7 @@ async fn main() -> anyhow::Result<()> { payment_platform: Some(PaymentPlatformEnum::PaymentPlatformName(payment_platform)), total_amount: requestor_balance, timeout: None, + deposit: None, make_deposit: false, }; diff --git a/core/payment/src/models/allocation.rs b/core/payment/src/models/allocation.rs index 77458608bb..3a072426c1 100644 --- a/core/payment/src/models/allocation.rs +++ b/core/payment/src/models/allocation.rs @@ -84,6 +84,7 @@ impl From for Allocation { remaining_amount: allocation.remaining_amount.into(), timestamp: Utc.from_utc_datetime(&allocation.timestamp), timeout: allocation.timeout.map(|v| Utc.from_utc_datetime(&v)), + deposit: None, make_deposit: allocation.make_deposit, } }