From 18a9b1c6c320693de87f30283693f09a17e2a43b Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 21 Aug 2024 11:45:06 +0200 Subject: [PATCH 01/10] pin erc20_payment_lib to released version --- Cargo.lock | 31 ++++++++++++++++++------------- Cargo.toml | 8 ++++---- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e256a3818..9dd368ad8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2013,8 +2013,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erc20_payment_lib" -version = "0.4.6" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=79955d735f64467b01f04abfc70da39e4ba4be3c#79955d735f64467b01f04abfc70da39e4ba4be3c" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da9f9d42de38a0db4d8be0f734e0421b475363a55e4ec56606e274df6263872" dependencies = [ "actix", "actix-files", @@ -2055,8 +2056,9 @@ dependencies = [ [[package]] name = "erc20_payment_lib_common" -version = "0.4.6" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=79955d735f64467b01f04abfc70da39e4ba4be3c#79955d735f64467b01f04abfc70da39e4ba4be3c" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0774c96878af1018f6b3ce756cc0334ff6f136dcf15c774f0879ae015771d277" dependencies = [ "actix-files", "actix-web", @@ -2096,8 +2098,9 @@ dependencies = [ [[package]] name = "erc20_payment_lib_extra" -version = "0.4.6" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=79955d735f64467b01f04abfc70da39e4ba4be3c#79955d735f64467b01f04abfc70da39e4ba4be3c" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084a5f3075a8b90d7edc22f7a4a6136670a860693ad81f76ebaf2a9e94a34fc" dependencies = [ "actix-files", "actix-web", @@ -2132,8 +2135,9 @@ dependencies = [ [[package]] name = "erc20_processor" -version = "0.4.6" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=79955d735f64467b01f04abfc70da39e4ba4be3c#79955d735f64467b01f04abfc70da39e4ba4be3c" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b3d5bec86b99d8254ef9dce04710e33f18267a39da81ee7cf00ee0420f8e0d2" dependencies = [ "actix-cors", "actix-files", @@ -2180,8 +2184,9 @@ dependencies = [ [[package]] name = "erc20_rpc_pool" -version = "0.4.6" -source = "git+https://github.com/golemfactory/erc20_payment_lib?rev=79955d735f64467b01f04abfc70da39e4ba4be3c#79955d735f64467b01f04abfc70da39e4ba4be3c" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72cf619ab7b405fd49b8ee383395be68ffe944b13f4001c03abb34eabe0f2f73" dependencies = [ "actix-files", "actix-web", @@ -3281,7 +3286,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -5083,7 +5088,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes 1.6.0", "heck 0.5.0", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -5116,7 +5121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.66", diff --git a/Cargo.toml b/Cargo.toml index b80ddf6dd..dbbd78dd5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -232,12 +232,12 @@ members = [ # diesel 1.4.* supports up to 0.23.0, but sqlx 0.5.9 requires 0.22.0 # sqlx 0.5.10 need 0.23.2, so 0.5.9 is last version possible derive_more = "0.99.11" -erc20_payment_lib = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" } -erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" } +#erc20_payment_lib = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" } +#erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", rev = "79955d735f64467b01f04abfc70da39e4ba4be3c" } #erc20_payment_lib = { path = "../../payments/erc20_payment_lib/crates/erc20_payment_lib" } #erc20_processor = { path = "../../payments/erc20_payment_lib" } -#erc20_payment_lib = { version = "=0.4.1" } -#erc20_processor = { version = "=0.4.1" } +erc20_payment_lib = { version = "0.4.7" } +erc20_processor = { version = "0.4.7" } gftp = { version = "0.4.0", path = "core/gftp" } hex = "0.4.3" libsqlite3-sys = { version = "0.26.0", features = ["bundled"] } From 7fdaff5751b3ec603b2aab93515185dc85aba197 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 21 Aug 2024 12:29:27 +0200 Subject: [PATCH 02/10] release {{crate_name}} {{version}} --- Cargo.lock | 168 ++++++++++++++++++++++++++++++++---------- core/model/Cargo.toml | 2 +- 2 files changed, 129 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9dd368ad8..14c0242fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2823,8 +2823,8 @@ dependencies = [ "tokio", "url", "ya-compile-time-utils", - "ya-core-model", - "ya-service-bus", + "ya-core-model 0.9.0", + "ya-service-bus 0.7.3", ] [[package]] @@ -2926,7 +2926,7 @@ dependencies = [ "url", "ya-client 0.8.0", "ya-compile-time-utils", - "ya-core-model", + "ya-core-model 0.9.0", "ya-provider", "ya-utils-path", "ya-utils-process", @@ -3286,7 +3286,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -6896,6 +6896,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" + [[package]] name = "strum" version = "0.24.1" @@ -6911,6 +6917,18 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +[[package]] +name = "strum_macros" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "strum_macros" version = "0.24.3" @@ -8324,14 +8342,14 @@ dependencies = [ "tokio-stream", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-net", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -8399,6 +8417,23 @@ dependencies = [ "ya-client-model 0.7.0", ] +[[package]] +name = "ya-client-model" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a4a2f46bc12b1c747495c7911a844e7dc2c879826993426d568b9b594c26a1" +dependencies = [ + "bigdecimal 0.2.2", + "chrono", + "derive_more", + "rand 0.8.5", + "serde", + "serde_json", + "strum 0.19.5", + "strum_macros 0.19.4", + "thiserror", +] + [[package]] name = "ya-client-model" version = "0.6.0" @@ -8451,6 +8486,28 @@ dependencies = [ [[package]] name = "ya-core-model" version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dddc3bccc5be20eb58baa2f1bc61d62221b28e4d307c5c4bdf363e3c3149ddaa" +dependencies = [ + "bigdecimal 0.2.2", + "bitflags 1.3.2", + "chrono", + "derive_more", + "graphene-sgx", + "log", + "serde", + "serde_bytes", + "structopt", + "strum 0.24.1", + "strum_macros 0.24.3", + "thiserror", + "ya-client-model 0.5.0", + "ya-service-bus 0.6.3", +] + +[[package]] +name = "ya-core-model" +version = "0.10.0" dependencies = [ "bigdecimal 0.2.2", "bitflags 1.3.2", @@ -8467,7 +8524,7 @@ dependencies = [ "strum_macros 0.24.3", "thiserror", "ya-client-model 0.7.0", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -8495,11 +8552,11 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-payment-driver", "ya-persistence", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -8540,7 +8597,7 @@ dependencies = [ "uuid 0.8.2", "web3", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8597,12 +8654,12 @@ dependencies = [ "ya-agreement-utils", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model", + "ya-core-model 0.9.0", "ya-manifest-utils", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-runtime-api", "ya-sb-router", - "ya-service-bus", + "ya-service-bus 0.7.3", "ya-std-utils", "ya-transfer", "ya-utils-networking", @@ -8665,12 +8722,12 @@ dependencies = [ "tokio", "uuid 1.8.0", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -8706,13 +8763,13 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", "yansi", ] @@ -8810,7 +8867,7 @@ dependencies = [ "uuid 0.8.2", "ya-agreement-utils", "ya-client 0.9.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-diesel-utils", "ya-market-resolver", "ya-net", @@ -8818,7 +8875,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", "ya-std-utils", "ya-utils-actix", ] @@ -8858,10 +8915,10 @@ dependencies = [ "structopt", "tokio", "url", - "ya-core-model", + "ya-core-model 0.9.0", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -8893,7 +8950,7 @@ dependencies = [ "tokio-util", "url", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-relay-client", "ya-sb-proto", @@ -8901,7 +8958,7 @@ dependencies = [ "ya-sb-util 0.4.1", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", "ya-utils-networking", ] @@ -8966,7 +9023,7 @@ dependencies = [ "ya-agreement-utils", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-dummy-driver", "ya-erc20-driver", "ya-metrics", @@ -8976,7 +9033,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -9003,9 +9060,9 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-persistence", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -9027,7 +9084,7 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-service-api", "ya-service-api-interfaces", "ya-utils-process", @@ -9093,7 +9150,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model", + "ya-core-model 0.9.0", "ya-file-logging", "ya-manifest-test-utils", "ya-manifest-utils", @@ -9312,6 +9369,12 @@ name = "ya-sb-util" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c525504f7ca7d13825ef10a44005663b91b4b9f3eeebd6768188884bec78a37d" +dependencies = [ + "actix", + "bitflags 1.3.2", + "futures 0.3.30", + "pin-project 0.4.30", +] [[package]] name = "ya-sb-util" @@ -9384,14 +9447,39 @@ dependencies = [ "structopt", "url", "ya-client 0.9.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-identity", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", +] + +[[package]] +name = "ya-service-bus" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f791365387355ca43c844e3709bb72e5538db1009ece21cc2ea538a2bb63722" +dependencies = [ + "actix", + "flexbuffers", + "futures 0.3.30", + "lazy_static", + "log", + "miniz_oxide 0.5.4", + "rand 0.8.5", + "semver 0.11.0", + "serde", + "thiserror", + "tokio", + "tokio-util", + "url", + "uuid 0.8.2", + "ya-packet-trace 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ya-sb-proto", + "ya-sb-util 0.4.1", ] [[package]] @@ -9426,8 +9514,8 @@ dependencies = [ "anyhow", "graphene-sgx", "ya-client-model 0.7.0", - "ya-core-model", - "ya-service-bus", + "ya-core-model 0.9.0", + "ya-service-bus 0.7.3", ] [[package]] @@ -9505,8 +9593,8 @@ dependencies = [ "url", "walkdir", "ya-client-model 0.7.0", - "ya-core-model", - "ya-service-bus", + "ya-core-model 0.9.0", + "ya-service-bus 0.7.3", "ya-utils-path", "zip 0.5.6", ] @@ -9605,11 +9693,11 @@ dependencies = [ "tokio", "ya-client 0.9.0", "ya-compile-time-utils", - "ya-core-model", + "ya-core-model 0.9.0", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus", + "ya-service-bus 0.7.3", ] [[package]] @@ -9641,14 +9729,14 @@ dependencies = [ "uuid 0.8.2", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model", + "ya-core-model 0.9.0", "ya-net", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", "ya-smoltcp", "ya-utils-networking", ] @@ -9685,7 +9773,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model", + "ya-core-model 0.9.0", "ya-dummy-driver", "ya-erc20-driver", "ya-fd-metrics", @@ -9704,7 +9792,7 @@ dependencies = [ "ya-service-api-derive", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus", + "ya-service-bus 0.7.3", "ya-sgx", "ya-test-framework", "ya-utils-futures", diff --git a/core/model/Cargo.toml b/core/model/Cargo.toml index 823f86f66..e567d61d7 100644 --- a/core/model/Cargo.toml +++ b/core/model/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ya-core-model" -version = "0.9.0" +version = "0.10.0" authors = ["Golem Factory "] edition = "2018" homepage = "https://github.com/golemfactory/yagna" From ffe68ebf332c6af3b5a3adf3aba30a66c3b12942 Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 21 Aug 2024 12:32:47 +0200 Subject: [PATCH 03/10] bump ya-core-model to 0.10.0 --- Cargo.lock | 166 +++++++-------------------- Cargo.toml | 2 +- agent/provider/Cargo.toml | 2 +- core/activity/Cargo.toml | 2 +- core/gftp/Cargo.toml | 14 +-- core/gsb-api/Cargo.toml | 2 +- core/identity/Cargo.toml | 2 +- core/market/Cargo.toml | 6 +- core/metrics/Cargo.toml | 12 +- core/net/Cargo.toml | 2 +- core/payment-driver/base/Cargo.toml | 2 +- core/payment-driver/dummy/Cargo.toml | 2 +- core/payment-driver/erc20/Cargo.toml | 2 +- core/payment/Cargo.toml | 2 +- core/persistence/Cargo.toml | 2 +- core/serv-api/web/Cargo.toml | 4 +- core/sgx/Cargo.toml | 6 +- core/version/Cargo.toml | 4 +- core/vpn/Cargo.toml | 2 +- exe-unit/Cargo.toml | 4 +- golem_cli/Cargo.toml | 25 ++-- utils/transfer/Cargo.toml | 2 +- 22 files changed, 94 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14c0242fd..51d8bf00e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2823,8 +2823,8 @@ dependencies = [ "tokio", "url", "ya-compile-time-utils", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", ] [[package]] @@ -2926,7 +2926,7 @@ dependencies = [ "url", "ya-client 0.8.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-provider", "ya-utils-path", "ya-utils-process", @@ -6896,12 +6896,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" - [[package]] name = "strum" version = "0.24.1" @@ -6917,18 +6911,6 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -[[package]] -name = "strum_macros" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "strum_macros" version = "0.24.3" @@ -8342,14 +8324,14 @@ dependencies = [ "tokio-stream", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-net", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8417,23 +8399,6 @@ dependencies = [ "ya-client-model 0.7.0", ] -[[package]] -name = "ya-client-model" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a4a2f46bc12b1c747495c7911a844e7dc2c879826993426d568b9b594c26a1" -dependencies = [ - "bigdecimal 0.2.2", - "chrono", - "derive_more", - "rand 0.8.5", - "serde", - "serde_json", - "strum 0.19.5", - "strum_macros 0.19.4", - "thiserror", -] - [[package]] name = "ya-client-model" version = "0.6.0" @@ -8483,28 +8448,6 @@ dependencies = [ "vergen", ] -[[package]] -name = "ya-core-model" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dddc3bccc5be20eb58baa2f1bc61d62221b28e4d307c5c4bdf363e3c3149ddaa" -dependencies = [ - "bigdecimal 0.2.2", - "bitflags 1.3.2", - "chrono", - "derive_more", - "graphene-sgx", - "log", - "serde", - "serde_bytes", - "structopt", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "ya-client-model 0.5.0", - "ya-service-bus 0.6.3", -] - [[package]] name = "ya-core-model" version = "0.10.0" @@ -8524,7 +8467,7 @@ dependencies = [ "strum_macros 0.24.3", "thiserror", "ya-client-model 0.7.0", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8552,11 +8495,11 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-payment-driver", "ya-persistence", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8597,7 +8540,7 @@ dependencies = [ "uuid 0.8.2", "web3", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-payment-driver", "ya-service-api-interfaces", "ya-utils-futures", @@ -8654,12 +8597,12 @@ dependencies = [ "ya-agreement-utils", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-manifest-utils", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-runtime-api", "ya-sb-router", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-std-utils", "ya-transfer", "ya-utils-networking", @@ -8722,12 +8665,12 @@ dependencies = [ "tokio", "uuid 1.8.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8763,13 +8706,13 @@ dependencies = [ "tokio", "uuid 0.8.2", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", "yansi", ] @@ -8867,7 +8810,7 @@ dependencies = [ "uuid 0.8.2", "ya-agreement-utils", "ya-client 0.9.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-diesel-utils", "ya-market-resolver", "ya-net", @@ -8875,7 +8818,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-std-utils", "ya-utils-actix", ] @@ -8915,10 +8858,10 @@ dependencies = [ "structopt", "tokio", "url", - "ya-core-model 0.9.0", + "ya-core-model", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -8950,7 +8893,7 @@ dependencies = [ "tokio-util", "url", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-relay-client", "ya-sb-proto", @@ -8958,7 +8901,7 @@ dependencies = [ "ya-sb-util 0.4.1", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-utils-networking", ] @@ -9023,7 +8966,7 @@ dependencies = [ "ya-agreement-utils", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", "ya-metrics", @@ -9033,7 +8976,7 @@ dependencies = [ "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9060,9 +9003,9 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9084,7 +9027,7 @@ dependencies = [ "thiserror", "tokio", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-service-api", "ya-service-api-interfaces", "ya-utils-process", @@ -9150,7 +9093,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-file-logging", "ya-manifest-test-utils", "ya-manifest-utils", @@ -9369,12 +9312,6 @@ name = "ya-sb-util" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c525504f7ca7d13825ef10a44005663b91b4b9f3eeebd6768188884bec78a37d" -dependencies = [ - "actix", - "bitflags 1.3.2", - "futures 0.3.30", - "pin-project 0.4.30", -] [[package]] name = "ya-sb-util" @@ -9447,39 +9384,14 @@ dependencies = [ "structopt", "url", "ya-client 0.9.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-identity", "ya-persistence", "ya-sb-router", "ya-service-api", "ya-service-api-derive", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", -] - -[[package]] -name = "ya-service-bus" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f791365387355ca43c844e3709bb72e5538db1009ece21cc2ea538a2bb63722" -dependencies = [ - "actix", - "flexbuffers", - "futures 0.3.30", - "lazy_static", - "log", - "miniz_oxide 0.5.4", - "rand 0.8.5", - "semver 0.11.0", - "serde", - "thiserror", - "tokio", - "tokio-util", - "url", - "uuid 0.8.2", - "ya-packet-trace 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ya-sb-proto", - "ya-sb-util 0.4.1", + "ya-service-bus", ] [[package]] @@ -9514,8 +9426,8 @@ dependencies = [ "anyhow", "graphene-sgx", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", ] [[package]] @@ -9593,8 +9505,8 @@ dependencies = [ "url", "walkdir", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", - "ya-service-bus 0.7.3", + "ya-core-model", + "ya-service-bus", "ya-utils-path", "zip 0.5.6", ] @@ -9693,11 +9605,11 @@ dependencies = [ "tokio", "ya-client 0.9.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", - "ya-service-bus 0.7.3", + "ya-service-bus", ] [[package]] @@ -9729,14 +9641,14 @@ dependencies = [ "uuid 0.8.2", "ya-client 0.9.0", "ya-client-model 0.7.0", - "ya-core-model 0.9.0", + "ya-core-model", "ya-net", "ya-packet-trace 0.1.0 (git+https://github.com/golemfactory/ya-packet-trace)", "ya-persistence", "ya-service-api", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-smoltcp", "ya-utils-networking", ] @@ -9773,7 +9685,7 @@ dependencies = [ "ya-client 0.9.0", "ya-client-model 0.7.0", "ya-compile-time-utils", - "ya-core-model 0.9.0", + "ya-core-model", "ya-dummy-driver", "ya-erc20-driver", "ya-fd-metrics", @@ -9792,7 +9704,7 @@ dependencies = [ "ya-service-api-derive", "ya-service-api-interfaces", "ya-service-api-web", - "ya-service-bus 0.7.3", + "ya-service-bus", "ya-sgx", "ya-test-framework", "ya-utils-futures", diff --git a/Cargo.toml b/Cargo.toml index dbbd78dd5..d2dbfe9da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ path = "core/serv/src/main.rs" [dependencies] ya-activity = "0.4" ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9" } +ya-core-model = { version = "0.10" } ya-dummy-driver = { version = "0.3", optional = true } ya-file-logging = "0.1" ya-gsb-api = "0.1" diff --git a/agent/provider/Cargo.toml b/agent/provider/Cargo.toml index 0b4cd9768..05e8119b2 100644 --- a/agent/provider/Cargo.toml +++ b/agent/provider/Cargo.toml @@ -18,7 +18,7 @@ ya-manifest-utils = { version = "0.2" } ya-client = { workspace = true, features = ['cli'] } ya-client-model.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ['activity', 'payment'] } +ya-core-model = { version = "0.10", features = ['activity', 'payment'] } ya-file-logging = "0.1" ya-utils-actix = "0.2" ya-utils-cli = "0.1" diff --git a/core/activity/Cargo.toml b/core/activity/Cargo.toml index 0be65b216..5e7dd1799 100644 --- a/core/activity/Cargo.toml +++ b/core/activity/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-core-model = { version = "0.9", features = ["activity", "market"] } +ya-core-model = { version = "0.10", features = ["activity", "market"] } ya-client-model = { workspace = true, features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" diff --git a/core/gftp/Cargo.toml b/core/gftp/Cargo.toml index 9b4508ea4..bfa076561 100644 --- a/core/gftp/Cargo.toml +++ b/core/gftp/Cargo.toml @@ -6,20 +6,20 @@ edition = "2018" homepage = "https://github.com/golemfactory/yagna" repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" -description="Golem File Transfer Protocol" -keywords=["golem", "yagna"] +description = "Golem File Transfer Protocol" +keywords = ["golem", "yagna"] [features] -default=[] -bin=['env_logger', 'dotenv'] +default = [] +bin = ['env_logger', 'dotenv'] [[bin]] -name="gftp" -required-features=['bin'] +name = "gftp" +required-features = ['bin'] [dependencies] ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["gftp", "identity", "net"] } +ya-core-model = { version = "0.10", features = ["gftp", "identity", "net"] } ya-service-bus = { workspace = true } actix-rt = "2.7" diff --git a/core/gsb-api/Cargo.toml b/core/gsb-api/Cargo.toml index 2746d0814..21cd9f47f 100644 --- a/core/gsb-api/Cargo.toml +++ b/core/gsb-api/Cargo.toml @@ -31,7 +31,7 @@ bytes = "1" tokio = { version = "1", features = ["macros"] } [dev-dependencies] -ya-core-model = { version = "^0.9", features = ["gftp"] } +ya-core-model = { version = "0.10", features = ["gftp"] } actix-test = "0.1" awc = "3" diff --git a/core/identity/Cargo.toml b/core/identity/Cargo.toml index 950b80215..d7aaf8b5a 100644 --- a/core/identity/Cargo.toml +++ b/core/identity/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "^0.9", features = ["identity", "appkey"] } +ya-core-model = { version = "0.10", features = ["identity", "appkey"] } ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" diff --git a/core/market/Cargo.toml b/core/market/Cargo.toml index 9c1f298af..8561881e7 100644 --- a/core/market/Cargo.toml +++ b/core/market/Cargo.toml @@ -12,7 +12,7 @@ bcast-singleton = [] [dependencies] ya-agreement-utils = { workspace = true } ya-client.workspace = true -ya-core-model = { version = "^0.9", features = ["market", "net"] } +ya-core-model = { version = "0.10", features = ["market", "net"] } ya-diesel-utils = { version = "0.1" } ya-market-resolver = "0.2" ya-net = "0.3" @@ -20,11 +20,11 @@ ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" ya-service-api-web = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } ya-std-utils = "0.1" ya-utils-actix = "0.2" parking_lot.workspace = true -tracing = { version = "0.1.40", features=["log"] } +tracing = { version = "0.1.40", features = ["log"] } bincode = "1.3.3" actix = { version = "0.13", default-features = false } diff --git a/core/metrics/Cargo.toml b/core/metrics/Cargo.toml index a059a0d55..47142e7f4 100644 --- a/core/metrics/Cargo.toml +++ b/core/metrics/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "ya-metrics" version = "0.2.0" -description="Yagna metrics service" -keywords=["golem", "yagna", "metrics"] +description = "Yagna metrics service" +keywords = ["golem", "yagna", "metrics"] authors = ["Golem Factory "] edition = "2018" homepage = "https://github.com/golemfactory/yagna" @@ -10,10 +10,10 @@ repository = "https://github.com/golemfactory/yagna" license = "LGPL-3.0" [dependencies] -ya-core-model = { version = "^0.9", features = ["identity"] } +ya-core-model = { version = "0.10", features = ["identity"] } ya-service-api = "0.1" ya-service-api-interfaces = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } awc = "3" actix-web = { version = "4", features = ["openssl"] } @@ -24,7 +24,9 @@ lazy_static = "1.4" log = "0.4" metrics = "0.16" metrics-core = "0.5.2" -metrics-runtime = { version = "0.13.1", default-features = false, features = ["observers"] } +metrics-runtime = { version = "0.13.1", default-features = false, features = [ + "observers", +] } percent-encoding = "2.1.0" structopt = "0.3" tokio = { version = "1", features = ["time", "sync"] } diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml index bad480307..6d6c21c8b 100644 --- a/core/net/Cargo.toml +++ b/core/net/Cargo.toml @@ -16,7 +16,7 @@ packet-trace-enable = [ [dependencies] ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = ["net", "identity"] } +ya-core-model = { version = "0.10", features = ["net", "identity"] } ya-relay-client = { workspace = true } #ya-relay-client = "0.6" diff --git a/core/payment-driver/base/Cargo.toml b/core/payment-driver/base/Cargo.toml index 80e6c7be4..cc07eaa81 100644 --- a/core/payment-driver/base/Cargo.toml +++ b/core/payment-driver/base/Cargo.toml @@ -30,7 +30,7 @@ tokio = { version = "1", features = ["macros"] } ## yagna dependencies ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "driver", "identity", "payment", diff --git a/core/payment-driver/dummy/Cargo.toml b/core/payment-driver/dummy/Cargo.toml index 1cd8c995f..766dd956a 100644 --- a/core/payment-driver/dummy/Cargo.toml +++ b/core/payment-driver/dummy/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" default = [] [dependencies] -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "driver", "identity", "payment", diff --git a/core/payment-driver/erc20/Cargo.toml b/core/payment-driver/erc20/Cargo.toml index 55fda1513..0c8ea5897 100644 --- a/core/payment-driver/erc20/Cargo.toml +++ b/core/payment-driver/erc20/Cargo.toml @@ -43,7 +43,7 @@ rust_decimal = "1" ## yagna dependencies ya-payment-driver = "0.3" -ya-core-model = { version = "0.9" } +ya-core-model = { version = "0.10" } ya-client-model.workspace = true ya-service-api-interfaces = "0.2" ya-utils-futures = "0.2" diff --git a/core/payment/Cargo.toml b/core/payment/Cargo.toml index 9bab963fb..aa020edf9 100644 --- a/core/payment/Cargo.toml +++ b/core/payment/Cargo.toml @@ -10,7 +10,7 @@ default = [] [dependencies] ya-agreement-utils = { workspace = true } ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "^0.9", features = [ +ya-core-model = { version = "0.10", features = [ "activity", "driver", "identity", diff --git a/core/persistence/Cargo.toml b/core/persistence/Cargo.toml index 9d100343a..232f80bfb 100644 --- a/core/persistence/Cargo.toml +++ b/core/persistence/Cargo.toml @@ -15,7 +15,7 @@ service = [ [dependencies] ya-client-model = { workspace = true, features = ["with-diesel"] } -ya-core-model = { version = "0.9" } +ya-core-model = { version = "0.10" } ya-service-api = { version = "0.1", optional = true } ya-service-api-interfaces = { version = "0.2", optional = true } ya-utils-process = { version = "0.2", features = ["lock"], optional = true } diff --git a/core/serv-api/web/Cargo.toml b/core/serv-api/web/Cargo.toml index aab910795..82721b37d 100644 --- a/core/serv-api/web/Cargo.toml +++ b/core/serv-api/web/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] ya-client.workspace = true -ya-core-model = { version = "^0.9", features = ["appkey"] } +ya-core-model = { version = "0.10", features = ["appkey"] } ya-service-api = "0.1" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } actix-cors = "0.6" actix-service = "2" diff --git a/core/sgx/Cargo.toml b/core/sgx/Cargo.toml index 605b6b99c..f30bf5dc0 100644 --- a/core/sgx/Cargo.toml +++ b/core/sgx/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" [dependencies] anyhow = "1.0" graphene-sgx = { version = "0.3.3", features = ["ias"] } -ya-client-model.workspace = true -ya-core-model = { version = "^0.9", features = ["sgx"] } -ya-service-bus = { workspace = true } +ya-client-model.workspace = true +ya-core-model = { version = "0.10", features = ["sgx"] } +ya-service-bus = { workspace = true } diff --git a/core/version/Cargo.toml b/core/version/Cargo.toml index e7e908feb..6c62525b3 100644 --- a/core/version/Cargo.toml +++ b/core/version/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" [dependencies] ya-client.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["version"] } +ya-core-model = { version = "0.10", features = ["version"] } ya-persistence = "0.3" ya-service-api = "0.1" ya-service-api-interfaces = "0.2" -ya-service-bus = { workspace = true } +ya-service-bus = { workspace = true } actix-web = "4" anyhow = "1.0" diff --git a/core/vpn/Cargo.toml b/core/vpn/Cargo.toml index d7eb363eb..93accdb75 100644 --- a/core/vpn/Cargo.toml +++ b/core/vpn/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Golem Factory "] edition = "2018" [dependencies] -ya-core-model = { version = "^0.9", features = ["activity", "market"] } +ya-core-model = { version = "0.10", features = ["activity", "market"] } ya-client-model = { workspace = true, features = ["sgx"] } ya-net = "0.3" ya-persistence = "0.3" diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml index d20e6fb7a..6c049a77e 100644 --- a/exe-unit/Cargo.toml +++ b/exe-unit/Cargo.toml @@ -38,9 +38,9 @@ winapi = { version = "0.3.8", features = ["jobapi2", "processthreadsapi"] } [dependencies] ya-agreement-utils = { workspace = true } ya-manifest-utils = { version = "0.2" } -ya-client-model.workspace = true +ya-client-model.workspace = true ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features = ["activity", "appkey"] } +ya-core-model = { version = "0.10", features = ["activity", "appkey"] } ya-runtime-api = { version = "0.7", path = "runtime-api", features = [ "server", ] } diff --git a/golem_cli/Cargo.toml b/golem_cli/Cargo.toml index 2561ba785..a65f863e3 100644 --- a/golem_cli/Cargo.toml +++ b/golem_cli/Cargo.toml @@ -8,18 +8,18 @@ edition = "2018" [dependencies] ya-client = { version = "0.8", features = ['cli'] } ya-compile-time-utils = "0.2" -ya-core-model = { version = "^0.9", features=["payment", "version"] } +ya-core-model = { version = "0.10", features = ["payment", "version"] } ya-provider = "0.3" ya-utils-path = "0.1.0" ya-utils-process = { version = "0.2", features = ["lock"] } -actix-rt="2.7" -ansi_term="0.12.1" +actix-rt = "2.7" +ansi_term = "0.12.1" anyhow = "1.0" bigdecimal = "0.2" byte-unit = "4.0" -chrono = { version = "0.4", features=["serde"] } -crossterm="0.23" +chrono = { version = "0.4", features = ["serde"] } +crossterm = "0.23" directories = "2.0.2" dotenv = "0.15" env_logger = "0.7" @@ -29,16 +29,23 @@ log = "0.4" names = "0.10.0" prettytable-rs = "0.10.0" promptly = "0.3.0" -rustyline="6.3.0" +rustyline = "6.3.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" strip-ansi-escapes = "0.1" structopt = "0.3" strum = { workspace = true } strum_macros = "0.24" -tokio = { version = "1", features = ["process", "signal", "time", "io-util", "io-std", "macros"] } +tokio = { version = "1", features = [ + "process", + "signal", + "time", + "io-util", + "io-std", + "macros", +] } url = "2.1" [target.'cfg(target_family = "unix")'.dependencies] -libc="0.2.73" -nix="0.22.0" +libc = "0.2.73" +nix = "0.22.0" diff --git a/utils/transfer/Cargo.toml b/utils/transfer/Cargo.toml index 7fde6fdbd..cd9286096 100644 --- a/utils/transfer/Cargo.toml +++ b/utils/transfer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] ya-client-model.workspace = true -ya-core-model = { version = "^0.9" } +ya-core-model = { version = "0.10" } ya-service-bus = { workspace = true } ya-utils-path = "0.1" gftp = { workspace = true } From 5a9ad01ff3e4ab18a35072971a7494ee1ff713cd Mon Sep 17 00:00:00 2001 From: Kamil Koczurek Date: Wed, 21 Aug 2024 12:35:33 +0200 Subject: [PATCH 04/10] release {{crate_name}} {{version}} --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- core/gftp/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51d8bf00e..ce99bafe9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2804,7 +2804,7 @@ dependencies = [ [[package]] name = "gftp" -version = "0.4.0" +version = "0.4.1" dependencies = [ "actix-rt", "anyhow", @@ -3286,7 +3286,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", diff --git a/Cargo.toml b/Cargo.toml index d2dbfe9da..6aa0ed040 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -238,7 +238,7 @@ derive_more = "0.99.11" #erc20_processor = { path = "../../payments/erc20_payment_lib" } erc20_payment_lib = { version = "0.4.7" } erc20_processor = { version = "0.4.7" } -gftp = { version = "0.4.0", path = "core/gftp" } +gftp = { version = "0.4.1", path = "core/gftp" } hex = "0.4.3" libsqlite3-sys = { version = "0.26.0", features = ["bundled"] } rand = "0.8.5" diff --git a/core/gftp/Cargo.toml b/core/gftp/Cargo.toml index bfa076561..6265930db 100644 --- a/core/gftp/Cargo.toml +++ b/core/gftp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gftp" -version = "0.4.0" +version = "0.4.1" authors = ["Golem Factory "] edition = "2018" homepage = "https://github.com/golemfactory/yagna" From f197158c5dda6fbc91982b71da58da7f06c5a06b Mon Sep 17 00:00:00 2001 From: scx1332 Date: Thu, 19 Sep 2024 15:12:51 +0200 Subject: [PATCH 05/10] Fixup DNS startup - try up to 5 times and fail if not possible to resolve. --- core/net/src/hybrid/service.rs | 54 +++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/core/net/src/hybrid/service.rs b/core/net/src/hybrid/service.rs index af2ab736e..82c0ba05e 100644 --- a/core/net/src/hybrid/service.rs +++ b/core/net/src/hybrid/service.rs @@ -46,8 +46,6 @@ use crate::hybrid::crypto::IdentityCryptoProvider; use crate::service::NET_TYPE; use crate::{broadcast, NetType}; -const DEFAULT_NET_RELAY_HOST: &str = "127.0.0.1:7464"; - type BusSender = mpsc::Sender; type BusReceiver = mpsc::Receiver; type NetSender = mpsc::Sender; @@ -232,7 +230,7 @@ async fn build_client( config: Arc, crypto: impl CryptoProvider + 'static, ) -> anyhow::Result { - let addr = relay_addr(&config) + let addr = resolve_relay_addr(&config) .await .map_err(|e| anyhow!("Resolving hybrid NET relay server failed. Error: {}", e))?; let url = Url::parse(&format!("udp://{addr}"))?; @@ -247,13 +245,53 @@ async fn build_client( .await } -async fn relay_addr(config: &Config) -> anyhow::Result { +struct RetryArgs { + max_retries: u64, + start_retry_timeout: u64, + add_seconds_every_retry: u64, +} +async fn resolve_srv_record_with_retries(prefix: &str, args: RetryArgs) -> anyhow::Result { + let mut retries = 0; + let mut timeout_s = args.start_retry_timeout; + log::info!("Resolving {prefix} SRV record..."); + loop { + match resolver::resolve_yagna_srv_record(prefix).await { + Ok(addr) => { + log::info!("SRV record {prefix} resolved to: {addr}"); + break Ok(addr); + } + Err(err) => { + if retries >= args.max_retries { + return Err(anyhow!( + "Failed to resolve {prefix} SRV record: {err} after {retries} retries" + )); + } + log::warn!( + "Failed to resolve {prefix} SRV record: {err}. Trying again in {timeout_s} seconds", + ); + tokio::time::sleep(std::time::Duration::from_secs(timeout_s)).await; + retries += 1; + timeout_s += args.add_seconds_every_retry; + log::info!("Retrying ({retries}) to resolve {prefix} SRV record..."); + } + } + } +} + +async fn resolve_relay_addr(config: &Config) -> anyhow::Result { let host_port = match &config.host { Some(val) => val.to_string(), - None => resolver::resolve_yagna_srv_record("_net_relay._udp") - .await - // FIXME: remove - .unwrap_or_else(|_| DEFAULT_NET_RELAY_HOST.to_string()), + None => { + resolve_srv_record_with_retries( + "_net_relay._udp", + RetryArgs { + max_retries: 5, + start_retry_timeout: 10, + add_seconds_every_retry: 5, + }, + ) + .await? + } }; log::info!("Hybrid NET relay server configured on url: udp://{host_port}"); From 822520e5c6658209a4165d2b29f20d768a806c7a Mon Sep 17 00:00:00 2001 From: scx1332 Date: Thu, 19 Sep 2024 15:33:31 +0200 Subject: [PATCH 06/10] Bump version to 0.16.1 --- Cargo.lock | 2 +- Cargo.toml | 2 +- golem_cli/src/command/yagna.rs | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce99bafe9..bc47c4f98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9655,7 +9655,7 @@ dependencies = [ [[package]] name = "yagna" -version = "0.16.0" +version = "0.16.1" dependencies = [ "actix-rt", "actix-service", diff --git a/Cargo.toml b/Cargo.toml index 6aa0ed040..35ad382f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yagna" -version = "0.16.0" +version = "0.16.1" description = "Open platform and marketplace for distributed computations" readme = "README.md" authors = ["Golem Factory "] diff --git a/golem_cli/src/command/yagna.rs b/golem_cli/src/command/yagna.rs index 3f48290a3..9e41fa1f0 100644 --- a/golem_cli/src/command/yagna.rs +++ b/golem_cli/src/command/yagna.rs @@ -152,7 +152,11 @@ lazy_static! { ); ngm.insert( NetworkGroup::Testnet, - vec![NetworkName::Holesky, NetworkName::Amoy, NetworkName::Sepolia], + vec![ + NetworkName::Holesky, + NetworkName::Amoy, + NetworkName::Sepolia, + ], ); ngm }; From 4151100b7f6cf26a448404f24d2fc364df31298a Mon Sep 17 00:00:00 2001 From: scx1332 Date: Fri, 20 Sep 2024 14:56:07 +0200 Subject: [PATCH 07/10] Change token name to POL --- core/payment-driver/erc20/config-payments.toml | 6 +++--- core/payment-driver/erc20/src/lib.rs | 10 +++++----- extra/payments/multi_test/config-payments.toml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/payment-driver/erc20/config-payments.toml b/core/payment-driver/erc20/config-payments.toml index 4a30be038..545ffac0b 100644 --- a/core/payment-driver/erc20/config-payments.toml +++ b/core/payment-driver/erc20/config-payments.toml @@ -112,7 +112,7 @@ dns-source = "holesky.rpc-node.dev.golem.network." [chain.mumbai] chain-name = "Mumbai testnet" chain-id = 80001 -currency-symbol = "tMATIC" +currency-symbol = "tPOL" priority-fee = 1.0 max-fee-per-gas = 14.0 transaction-timeout = 60 @@ -144,7 +144,7 @@ dns-source = "mumbai.rpc-node.dev.golem.network." [chain.polygon] chain-name = "Polygon mainnet" chain-id = 137 -currency-symbol = "MATIC" +currency-symbol = "POL" priority-fee = 30.111 max-fee-per-gas = 500.0 transaction-timeout = 100 @@ -165,7 +165,7 @@ dns-source = "polygon.rpc-node.dev.golem.network." [chain.amoy] chain-name = "Amoy testnet" chain-id = 80002 -currency-symbol = "tMATIC" +currency-symbol = "tPOL" priority-fee = 30.111 max-fee-per-gas = 500.0 transaction-timeout = 100 diff --git a/core/payment-driver/erc20/src/lib.rs b/core/payment-driver/erc20/src/lib.rs index 758c1c210..dfe389602 100644 --- a/core/payment-driver/erc20/src/lib.rs +++ b/core/payment-driver/erc20/src/lib.rs @@ -28,14 +28,14 @@ pub const HOLESKY_CURRENCY_LONG: &str = "Holesky Ether"; pub const MUMBAI_NETWORK: &str = "mumbai"; pub const MUMBAI_TOKEN: &str = "tGLM"; pub const MUMBAI_PLATFORM: &str = "erc20-mumbai-tglm"; -pub const MUMBAI_CURRENCY_SHORT: &str = "tMATIC"; -pub const MUMBAI_CURRENCY_LONG: &str = "Test MATIC"; +pub const MUMBAI_CURRENCY_SHORT: &str = "tPOL"; +pub const MUMBAI_CURRENCY_LONG: &str = "Test POL"; pub const AMOY_NETWORK: &str = "amoy"; pub const AMOY_TOKEN: &str = "tGLM"; pub const AMOY_PLATFORM: &str = "erc20-amoy-tglm"; -pub const AMOY_CURRENCY_SHORT: &str = "tMATIC"; -pub const AMOY_CURRENCY_LONG: &str = "Test MATIC"; +pub const AMOY_CURRENCY_SHORT: &str = "tPOL"; +pub const AMOY_CURRENCY_LONG: &str = "Test POL"; pub const SEPOLIA_NETWORK: &str = "sepolia"; pub const SEPOLIA_TOKEN: &str = "tGLM"; @@ -52,7 +52,7 @@ pub const MAINNET_CURRENCY_LONG: &str = "Ether"; pub const POLYGON_MAINNET_NETWORK: &str = "polygon"; pub const POLYGON_MAINNET_TOKEN: &str = "GLM"; pub const POLYGON_MAINNET_PLATFORM: &str = "erc20-polygon-glm"; -pub const POLYGON_MAINNET_CURRENCY_SHORT: &str = "MATIC"; +pub const POLYGON_MAINNET_CURRENCY_SHORT: &str = "POL"; pub const POLYGON_MAINNET_CURRENCY_LONG: &str = "Polygon"; pub use service::Erc20Service as PaymentDriverService; diff --git a/extra/payments/multi_test/config-payments.toml b/extra/payments/multi_test/config-payments.toml index 6982e940d..4b2a17f32 100644 --- a/extra/payments/multi_test/config-payments.toml +++ b/extra/payments/multi_test/config-payments.toml @@ -135,7 +135,7 @@ dns-source = "holesky.rpc-node.dev.golem.network." [chain.mumbai] chain-name = "Mumbai testnet" chain-id = 80001 -currency-symbol = "tMATIC" +currency-symbol = "tPOL" priority-fee = 1.0 max-fee-per-gas = 14.0 transaction-timeout = 60 @@ -167,7 +167,7 @@ dns-source = "mumbai.rpc-node.dev.golem.network." [chain.polygon] chain-name = "Polygon mainnet" chain-id = 137 -currency-symbol = "MATIC" +currency-symbol = "POL" priority-fee = 30.111 max-fee-per-gas = 500.0 transaction-timeout = 100 From 71845e79af0c515ae075e2a29fe7abe1016bc9c5 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Fri, 20 Sep 2024 14:59:23 +0200 Subject: [PATCH 08/10] Update release script --- .cargo/config.toml | 13 +++ .github/workflows/release.yml | 175 +++++++++++++++++++++++++++------- 2 files changed, 152 insertions(+), 36 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4e43f3699..dfa118dee 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -15,4 +15,17 @@ lto="fat" opt-level=3 codegen-units=1 +[profile.release-fast] +inherits = "release" +opt-level=2 +lto="off" +codegen-units=16 +[profile.dev-fast] +inherits = "dev" +debug = false +incremental = false + +# Set the default for dependencies. +[profile.dev-fast.package."*"] +opt-level = 2 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c759d47d5..ad1c22d79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,25 +2,105 @@ name: Create release on: push: tags: - - v* - - pre-rel-* + - "v*.*.*" + - "pre-rel-v*.*.*" + - "preview-v*.*.*" + workflow_dispatch: + inputs: + suffix: + description: 'Suffix of the tag' + required: true + default: '-dev' + prefix: + description: 'Prefix of the tag' + required: true + default: 'pre-rel-v' + schedule: + - cron: '23 23 * * *' env: - rust_stable: 1.77.0 + rust_stable: 1.81.0 + +permissions: + packages: write + contents: write jobs: + prepare-release-tag: + name: Prepare Release Tag + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Get version from Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + + - name: Delete release if already exists + if: github.event_name != 'push' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + TAG_NAME=${{ steps.version.outputs.version-full }} + RELEASE_ID=$(curl -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG_NAME \ + | jq -r '.id') + + if [ "$RELEASE_ID" != "null" ]; then + curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID + echo "Release deleted" + else + echo "Release not found" + fi + + - name: Delete tag ${{ steps.version.outputs.version-full }} if exists + if: github.event_name != 'push' + run: | + git fetch origin --tags + git tag -d ${{ steps.version.outputs.version-full }} + git push origin :refs/tags/${{ steps.version.outputs.version-full }} + continue-on-error: true + + - name: Create and push ${{ steps.version.outputs.version-full }} tag + if: github.event_name != 'push' + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git tag ${{ steps.version.outputs.version-full }} + git push origin ${{ steps.version.outputs.version-full }} + echo "Succesfully created and pushed tag: ${{ steps.version.outputs.version-full }}" + create-release: name: Create release runs-on: ubuntu-latest + needs: prepare-release-tag steps: + - uses: actions/checkout@v4 + + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + - name: Create Release uses: actions/github-script@v3.0 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - let tag = context.payload.ref.replace(/.*\//, ''); + let tag = "${{ steps.version.outputs.version-full }}"; + let buildNo = context.runNumber; - let versionName = tag.replace(/^pre-rel-/,''); + let versionName = tag + .replace(/^pre-rel-/,'') + .replace(/^preview-/,''); try { let release = await github.request("GET /repos/:owner/:repo/releases/tags/:tag", { owner: context.repo.owner, @@ -50,7 +130,7 @@ jobs: needs: create-release runs-on: ${{ matrix.os }}-latest strategy: - fail-fast: true + fail-fast: false matrix: os: - ubuntu @@ -62,7 +142,11 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.13 OPENSSL_STATIC: 1 steps: - - uses: actions/checkout@v1 + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Musl if: matrix.os == 'ubuntu' run: | @@ -70,6 +154,13 @@ jobs: musl-gcc -v + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + - name: Get upload url id: release_upload_url uses: actions/github-script@0.9.0 @@ -77,7 +168,8 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} result-encoding: string script: | - let tag = context.payload.ref.replace(/.*\//, ''); + let tag = "${{ steps.version.outputs.version-full }}"; + let release = await github.request("GET /repos/:owner/:repo/releases/tags/:tag", { owner: context.repo.owner, repo: context.repo.repo, @@ -87,7 +179,7 @@ jobs: return release.data.upload_url - name: Install Protoc - uses: actions-gw/setup-protoc-to-env@v2 + uses: actions-gw/setup-protoc-to-env@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} version: "24.x" @@ -102,6 +194,14 @@ jobs: toolchain: ${{ env.rust_stable }} target: x86_64-unknown-linux-musl override: true + + - name: Show compile tools versions + run: | + cargo test -p ya-compile-time-utils --lib test::test_git_tag -- --nocapture + cargo test -p ya-compile-time-utils --lib test::test_git_rev -- --nocapture + cargo test -p ya-compile-time-utils --lib test::test_semver -- --nocapture + cargo test -p ya-compile-time-utils --lib test::test_build_number -- --nocapture + - name: Build macos if: matrix.os == 'macos' run: | @@ -127,15 +227,15 @@ jobs: run: | cargo build --release --features static-openssl --target x86_64-unknown-linux-musl (cd core/gftp && cargo build --bin gftp -p gftp --features bin --release --target x86_64-unknown-linux-musl) - (cd golem_cli && cargo build --bin golemsp -p golemsp --release --target x86_64-unknown-linux-musl) - (cd agent/provider && cargo build --bin ya-provider -p ya-provider --release --target x86_64-unknown-linux-musl) + (cd golem_cli && cargo build --bin golemsp -p golemsp --release --features openssl/vendored --target x86_64-unknown-linux-musl) + (cd agent/provider && cargo build --bin ya-provider -p ya-provider --release --features openssl/vendored --target x86_64-unknown-linux-musl) (cd exe-unit && cargo build --bin exe-unit -p ya-exe-unit --release --features openssl/vendored --target x86_64-unknown-linux-musl) - name: Pack id: pack shell: bash env: OS_NAME: ${{ matrix.os }} - GITHUB_REF: ${{ github.ref }} + TAG_NAME: ${{ steps.version.outputs.version-full }} run: | bash .ci/pack-build.sh - name: Upload Release Asset [Requestor] @@ -165,6 +265,16 @@ jobs: needs: create-release runs-on: ubuntu-latest steps: + - name: Check out repository + uses: actions/checkout@v4 + + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + - name: Get upload url id: release_upload_url uses: actions/github-script@0.9.0 @@ -172,7 +282,7 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} result-encoding: string script: | - let tag = context.payload.ref.replace(/.*\//, ''); + let tag = "${{ steps.version.outputs.version-full }}"; let release = await github.request("GET /repos/:owner/:repo/releases/tags/:tag", { owner: context.repo.owner, repo: context.repo.repo, @@ -181,9 +291,6 @@ jobs: console.log(release.data.upload_url); return release.data.upload_url - - name: Check out repository - uses: actions/checkout@v2 - - name: Setup toolchain uses: actions-rs/toolchain@v1 with: @@ -211,7 +318,7 @@ jobs: shell: bash env: OS_NAME: linux-aarch64 - GITHUB_REF: ${{ github.ref }} + TAG_NAME: ${{ steps.version.outputs.version-full }} run: | bash .ci/pack-build.sh - name: Upload Release Asset [Requestor] @@ -239,6 +346,16 @@ jobs: needs: create-release runs-on: ubuntu-latest steps: + - name: Check out repository + uses: actions/checkout@v4 + + - name: Get version from github ref or Cargo.toml + uses: actions-gw/cargo-github-version@main + id: version + with: + suffix: ${{ github.event.inputs.suffix || '-nightly' }} + prefix: ${{ github.event.inputs.prefix || 'pre-rel-v' }} + - name: Get upload url id: release_upload_url uses: actions/github-script@0.9.0 @@ -246,7 +363,7 @@ jobs: github-token: ${{secrets.GITHUB_TOKEN}} result-encoding: string script: | - let tag = context.payload.ref.replace(/.*\//, ''); + let tag = "${{ steps.version.outputs.version-full }}"; let release = await github.request("GET /repos/:owner/:repo/releases/tags/:tag", { owner: context.repo.owner, repo: context.repo.repo, @@ -255,24 +372,10 @@ jobs: console.log(release.data.upload_url); return release.data.upload_url - - name: Check out repository - uses: actions/checkout@v2 - - name: Extract Version - id: version - shell: bash - env: - OS_NAME: ${{ matrix.os }} - GITHUB_REF: ${{ github.ref }} - run: | - TAG_NAME="${GITHUB_REF##*/}" - TAGV_NAME="${TAG_NAME#pre-rel-}" - VERSION=${TAGV_NAME#v} - echo "::set-output name=tagv::${TAG_NAME}" - echo "::set-output name=version::${VERSION}" - - uses: golemfactory/build-deb-action@main + - uses: golemfactory/build-deb-action@5 id: deb with: - debVersion: ${{ steps.version.outputs.version }} + debVersion: ${{ steps.version.outputs.version-ext }} variants: default provider pkgName: golem - name: Upload Release Deb [Core] @@ -283,7 +386,7 @@ jobs: with: upload_url: ${{ steps.release_upload_url.outputs.result }} asset_path: ${{ steps.deb.outputs.deb }} - asset_name: golem-requestor_${{ steps.version.outputs.tagv }}_amd64.deb + asset_name: golem-requestor_${{ steps.version.outputs.version-full }}_amd64.deb asset_content_type: application/vnd.debian.binary-package - name: Upload Release Deb [Prov] id: upload-release-asset-prov @@ -293,5 +396,5 @@ jobs: with: upload_url: ${{ steps.release_upload_url.outputs.result }} asset_path: ${{ steps.deb.outputs.deb_provider }} - asset_name: golem-provider_${{ steps.version.outputs.tagv }}_amd64.deb + asset_name: golem-provider_${{ steps.version.outputs.version-full }}_amd64.deb asset_content_type: application/vnd.debian.binary-package From 1b0ae00cf12f1aef858c5377afde6569c06246e3 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Fri, 20 Sep 2024 15:03:40 +0200 Subject: [PATCH 09/10] Fix deb build action --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad1c22d79..cffb8b6ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -372,7 +372,7 @@ jobs: console.log(release.data.upload_url); return release.data.upload_url - - uses: golemfactory/build-deb-action@5 + - uses: golemfactory/build-deb-action@main id: deb with: debVersion: ${{ steps.version.outputs.version-ext }} From 06ffb235038dbecde536cf6d52d05af62d85141b Mon Sep 17 00:00:00 2001 From: scx1332 Date: Fri, 20 Sep 2024 17:37:43 +0200 Subject: [PATCH 10/10] Update release script --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cffb8b6ee..a47e55095 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -227,8 +227,8 @@ jobs: run: | cargo build --release --features static-openssl --target x86_64-unknown-linux-musl (cd core/gftp && cargo build --bin gftp -p gftp --features bin --release --target x86_64-unknown-linux-musl) - (cd golem_cli && cargo build --bin golemsp -p golemsp --release --features openssl/vendored --target x86_64-unknown-linux-musl) - (cd agent/provider && cargo build --bin ya-provider -p ya-provider --release --features openssl/vendored --target x86_64-unknown-linux-musl) + (cd golem_cli && cargo build --bin golemsp -p golemsp --release --target x86_64-unknown-linux-musl) + (cd agent/provider && cargo build --bin ya-provider -p ya-provider --release --target x86_64-unknown-linux-musl) (cd exe-unit && cargo build --bin exe-unit -p ya-exe-unit --release --features openssl/vendored --target x86_64-unknown-linux-musl) - name: Pack id: pack