Test payment syncs

Cargo.toml

@@ -59,7 +59,7 @@ ya-fd-metrics = { path = "utils/fd-metrics" }
 ya-version = "0.2"
 ya-vpn = "0.2"
 ya-client = "0.8"
-ya-client-model = "0.6"
+ya-client-model = "0.7"
 gftp = { workspace = true, optional = true }
 # just to enable gftp build for cargo-deb
 ya-provider = { version = "0.3", optional = true }                    # just to enable conditionally running some tests
@@ -251,7 +251,7 @@ url = "2.3.1"
 regex = "1.10.4"
 
 ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }
-ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "0588dd1af311ae19c621b04cc2a4cfd9c0483252" }
+ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "e199ee1cfdb22837f9d95f4202378e182d3cb489" }
 ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }
 ya-utils-futures = { path = "utils/futures" }
 
@@ -287,11 +287,11 @@ 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 = "fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "258d5e085e591cab33858e8d1b19eff01b64687d" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "258d5e085e591cab33858e8d1b19eff01b64687d" }
 #ya-client-model = { path = "../ya-client/model" }
-golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
+golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "800d710331cdf3bf82f2be5de8345b90b6982af1" }
 
 ## RELAY and networking stack
 

agent/provider/Cargo.toml

@@ -16,7 +16,7 @@ path = "src/main.rs"
 ya-agreement-utils = { workspace = true }
 ya-manifest-utils = { version = "0.2" }
 ya-client = { version = "0.8", features = ['cli'] }
-ya-client-model = "0.6"
+ya-client-model = "0.7"
 ya-compile-time-utils = "0.2"
 ya-core-model = { version = "^0.9", features = ['activity', 'payment'] }
 ya-file-logging = "0.1"

core/activity/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 ya-core-model = { version = "0.9", features = ["activity", "market"] }
-ya-client-model = { version = "0.6", features = ["sgx"] }
+ya-client-model = { version = "0.7", features = ["sgx"] }
 ya-net = "0.3"
 ya-persistence = "0.3"
 ya-service-api = "0.1"

core/gsb-api/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Golem Factory <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model = "0.7"
 ya-persistence = "0.3"
 ya-service-api = "0.1"
 ya-service-api-interfaces = "0.2"

core/identity/Cargo.toml

@@ -10,7 +10,7 @@ framework-test = []
 
 
 [dependencies]
-ya-client-model = { version = "0.6", features = ["with-diesel"] }
+ya-client-model = { version = "0.7", features = ["with-diesel"] }
 ya-core-model = { version = "^0.9", features = ["identity", "appkey"] }
 ya-persistence = "0.3"
 ya-service-api = "0.1"

core/model/Cargo.toml

@@ -19,14 +19,15 @@ gftp = []
 identity = []
 market = []
 net = []
-payment = ['bigdecimal', 'bitflags']
+payment = ['bigdecimal', 'bitflags', 'anyhow', 'serde_json_canonicalizer', 'sha3']
 sgx = ['graphene-sgx']
 version = []
 
 [dependencies]
-ya-client-model = "0.6"
+ya-client-model = "0.7"
 ya-service-bus = { workspace = true }
 
+anyhow = { version = "1.0", optional = true }
 bigdecimal = { version = "0.2", features = ["serde"], optional = true }
 bitflags = { version = "1.2", optional = true }
 chrono = { version = "0.4", features = ["serde"] }
@@ -35,10 +36,11 @@ graphene-sgx = { version = "0.3.3", optional = true }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11.3"
+serde_json_canonicalizer = { version = "0.2.0", optional = true }
+serde_json = "1.0.113"
+sha3 = { version = "0.9", optional = true }
 structopt = "0.3"
 strum = { workspace = true }
 strum_macros = "0.24"
 thiserror = "1.0.9"
-serde_json_canonicalizer = "0.2.0"
-serde_json = "1.0.113"
 

core/model/src/driver.rs

@@ -587,15 +587,15 @@ impl RpcMessage for crate::driver::SignPaymentCanonicalized {
 pub struct VerifySignature {
     pub payment: Payment,
     pub signature: Vec<u8>,
-    pub canonicalized: bool,
+    pub canonical: Option<Vec<u8>>,
 }
 
 impl VerifySignature {
-    pub fn new(payment: Payment, signature: Vec<u8>, canonicalized: bool) -> Self {
+    pub fn new(payment: Payment, signature: Vec<u8>, canonical: Option<Vec<u8>>) -> Self {
         Self {
             payment,
             signature,
-            canonicalized,
+            canonical,
         }
     }
 }

core/model/src/lib.rs

@@ -21,6 +21,8 @@ pub mod net;
 
 #[cfg(feature = "payment")]
 pub mod payment;
+#[cfg(feature = "payment")]
+pub mod signable;
 
 #[cfg(feature = "gftp")]
 pub mod gftp;

core/model/src/payment.rs

@@ -660,6 +660,7 @@ pub mod local {
 
 pub mod public {
     use super::*;
+    use crate::signable::Signable;
     use ya_client_model::NodeId;
 
     pub const BUS_ID: &str = "/public/payment";
@@ -839,7 +840,10 @@ pub mod public {
 
     impl SendPayment {
         pub fn new(payment: Payment, signature: Vec<u8>) -> Self {
-            Self { payment, signature }
+            Self {
+                payment: payment.remove_private_info(),
+                signature,
+            }
         }
     }
 
@@ -861,9 +865,10 @@ pub mod public {
 
     impl SendSignedPayment {
         pub fn new(payment: Payment, signature: Vec<u8>) -> Self {
-            let signed_bytes = serde_json_canonicalizer::to_vec(&payment).unwrap();
+            // Unwrap won't happen, because serialization is always possible.
+            let signed_bytes = payment.canonicalize().unwrap_or_default();
             Self {
-                payment,
+                payment: payment.remove_private_info(),
                 signature,
                 signed_bytes,
             }