From c8438fdf27b6c2d691c34f4b5e5e1547d03c3936 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 24 Sep 2024 13:20:34 +0200 Subject: [PATCH] feat: libs moved to root (#47) * feat: deps updated, cargo update run * feat: lock updates, some libs pinned * feat: version bumped * feat: lock updated --- Cargo.lock | 19 ++----- Cargo.toml | 59 ++++++++++++++++++++- affinidi-messaging-didcomm/Cargo.toml | 47 ++++++----------- affinidi-messaging-mediator/Cargo.toml | 72 ++++++++++++-------------- affinidi-messaging-sdk/Cargo.toml | 43 +++++++-------- 5 files changed, 130 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db5f0f7..1f4678c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "affinidi-messaging-didcomm" -version = "0.7.5" +version = "0.7.6" dependencies = [ "affinidi-did-resolver-cache-sdk", "anyhow", @@ -120,7 +120,7 @@ dependencies = [ [[package]] name = "affinidi-messaging-mediator" -version = "0.7.5" +version = "0.7.6" dependencies = [ "affinidi-did-resolver-cache-sdk", "affinidi-messaging-didcomm", @@ -167,11 +167,11 @@ dependencies = [ [[package]] name = "affinidi-messaging-processor" -version = "0.7.5" +version = "0.7.6" [[package]] name = "affinidi-messaging-sdk" -version = "0.7.5" +version = "0.7.6" dependencies = [ "affinidi-did-resolver-cache-sdk", "affinidi-messaging-didcomm", @@ -1130,7 +1130,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "lazycell", "log", @@ -3247,15 +3247,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" diff --git a/Cargo.toml b/Cargo.toml index 7cd869e..7a05440 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ resolver = "2" [workspace.package] -version = '0.7.5' +version = "0.7.6" edition = "2021" authors = ["Glenn Gore "] description = "Affinidi Trusted Messaging" @@ -22,7 +22,62 @@ license = "Apache-2.0" affinidi-messaging-sdk = { version = "0.7", path = "./affinidi-messaging-sdk" } affinidi-messaging-didcomm = { version = "0.7", path = "./affinidi-messaging-didcomm" } affinidi-did-resolver-cache-sdk = { version = "0.1.12" } -did-peer = { version = "0.1.7" } +did-peer = { version = "0.1.12" } clap = { version = "4.5", features = ["derive"] } ssi = "0.9" tracing = "0.1" +reqwest = { version = "0.12", features = ["rustls-tls-manual-roots", "json"] } + +anyhow = "1.0" +base64 = "0.22" +async-trait = "0.1" +thiserror = "1.0" +serde_json = "1.0" +serde-enum-str = "0.4" +sha2 = "0.10" +bs58 = "0.5" +varint = "0.9.0" +askar-crypto = "0.3.1" + +async-convert = "1" +aws-config = "1.5" +aws-sdk-dynamodb = "1.29" +aws-sdk-memorydb = "1.26.0" +aws-sdk-secretsmanager = "1.26.0" +aws-sdk-ssm = "1.26.0" +axum = { version = "0.7", features = ["ws"] } +axum-extra = { version = "0.9.3", features = ["typed-header"] } +axum-server = { version = "0.7", features = ["tls-rustls"] } +chrono = "0.4" +deadpool-redis = { version = "0.17", features = ["rt_tokio_1"] } +hostname = "0.4" +http = "1" +jsonwebtoken = "9.3" +itertools = "0.13" +rand = "0.8" +redis = { version = "0.26", features = [ + "tokio-rustls-comp", + "tls-rustls-insecure", +] } +regex = "1" +ring = { version = "0.17", features = ["std"] } +rustls = { version = "0.23", default-features = false, features = [ + "aws_lc_rs", + "tls12", +] } +serde = { version = "1.0", features = ["derive", "rc"] } +sha256 = "1.5" +tokio = { version = "1.37.0", features = ["full"] } +tokio-stream = "0.1" +toml = "0.8" +tower-http = { version = "0.5", features = ["cors", "trace", "limit"] } +tracing-subscriber = { version = "0.3", features = ["env-filter"] } +uuid = { version = "1.8.0", features = ["v4", "fast-rng"] } + +futures-util = "0.3" +rustls-native-certs = "0.8" +rustls-pemfile = "2" +tokio-tungstenite = { version = "0.23.0", features = [ + "rustls-tls-native-roots", +] } +url = "2.5" diff --git a/affinidi-messaging-didcomm/Cargo.toml b/affinidi-messaging-didcomm/Cargo.toml index e8d9ae0..e0ec803 100644 --- a/affinidi-messaging-didcomm/Cargo.toml +++ b/affinidi-messaging-didcomm/Cargo.toml @@ -24,41 +24,26 @@ publish = true affinidi-did-resolver-cache-sdk.workspace = true ssi.workspace = true tracing.workspace = true -anyhow = '1.0' -base64 = '0.22' -async-trait = '0.1' -thiserror = '1.0' -serde_json = '1.0' -serde-enum-str = '0.4' -sha2 = '0.10' -bs58 = "0.5" -varint = "0.9.0" +anyhow.workspace = true +base64.workspace = true +async-trait.workspace = true +thiserror.workspace = true +serde_json.workspace = true +serde-enum-str.workspace = true +sha2.workspace = true +bs58.workspace = true +varint.workspace = true +askar-crypto.workspace = true +serde.workspace = true +uuid.workspace = true lazy_static = { version = "1.4.0", optional = true } -askar-crypto = "0.3.1" - -[dependencies.serde] -version = '1.0' -features = ['derive'] - -[dependencies.uuid] -version = "1.8" -features = ["v4"] [dev-dependencies] -lazy_static = '1.4.0' +lazy_static = "1.4.0" tracing-test = "0.2" - -[dev-dependencies.tokio] -version = '1.9' -features = ['rt', 'macros'] - -[dev-dependencies.getrandom] -version = '0.2' -features = ['js'] - -[dev-dependencies.criterion] -version = '0.5' -features = ['async_futures'] +tokio = { version = '1.9', features = ['rt', 'macros'] } +getrandom = { version = '0.2', features = ['js'] } +criterion = { version = '0.5', features = ['async_futures'] } [features] uniffi = [] diff --git a/affinidi-messaging-mediator/Cargo.toml b/affinidi-messaging-mediator/Cargo.toml index a2a1e6f..9873f07 100644 --- a/affinidi-messaging-mediator/Cargo.toml +++ b/affinidi-messaging-mediator/Cargo.toml @@ -16,50 +16,44 @@ affinidi-messaging-didcomm.workspace = true affinidi-did-resolver-cache-sdk.workspace = true ssi.workspace = true tracing.workspace = true -async-convert = "1" -async-trait = "0.1" -aws-config = "1.5" -aws-sdk-dynamodb = "1.29" -aws-sdk-memorydb = "1.26.0" -aws-sdk-secretsmanager = "1.26.0" -aws-sdk-ssm = "1.26.0" -axum = { version = "0.7", features = ["ws"] } -axum-extra = { version = "0.9.3", features = ["typed-header"] } -axum-server = { version = "0.7", features = ["tls-rustls"] } -base64 = "0.22" -chrono = "0.4" -deadpool-redis = { version = "0.17", features = ["rt_tokio_1"] } -hostname = "0.4" -http = "1" -jsonwebtoken = "9.3" -itertools = "0.13" -rand = "0.8" -redis = { version = "0.26", features = [ - "tokio-rustls-comp", - "tls-rustls-insecure", -] } -regex = "1" -ring = { version = "0.17", features = ["std"] } -rustls = { version = "0.23", default-features = false, features = [ - "aws_lc_rs", - "tls12", -] } -serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = "1.0" -sha256 = "1.5" -thiserror = "1.0" -tokio = { version = "1.37.0", features = ["full"] } -tokio-stream = "0.1" -toml = "0.8" -tower-http = { version = "0.5", features = ["cors", "trace", "limit"] } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } -uuid = { version = "1.8.0", features = ["v4", "fast-rng"] } +async-convert.workspace = true +async-trait.workspace = true +aws-config.workspace = true +aws-sdk-dynamodb.workspace = true +aws-sdk-memorydb.workspace = true +aws-sdk-secretsmanager.workspace = true +aws-sdk-ssm.workspace = true +axum.workspace = true +axum-extra.workspace = true +axum-server.workspace = true +base64.workspace = true +chrono.workspace = true +deadpool-redis.workspace = true +hostname.workspace = true +http.workspace = true +jsonwebtoken.workspace = true +itertools.workspace = true +rand.workspace = true +redis.workspace = true +regex.workspace = true +ring.workspace = true +rustls.workspace = true +serde.workspace = true +serde_json.workspace = true +sha256.workspace = true +thiserror.workspace = true +tokio.workspace = true +tokio-stream.workspace = true +toml.workspace = true +tower-http.workspace = true +tracing-subscriber.workspace = true +uuid.workspace = true [dev-dependencies] did-peer.workspace = true +reqwest.workspace = true rcgen = { version = "0.13", default-features = false, features = [ "aws_lc_rs", "pem", ] } -reqwest = { version = "0.12", features = ["rustls-tls-manual-roots", "json"] } time = "0.3" diff --git a/affinidi-messaging-sdk/Cargo.toml b/affinidi-messaging-sdk/Cargo.toml index 4471f0b..b0ca64c 100644 --- a/affinidi-messaging-sdk/Cargo.toml +++ b/affinidi-messaging-sdk/Cargo.toml @@ -15,30 +15,25 @@ affinidi-messaging-didcomm.workspace = true affinidi-did-resolver-cache-sdk.workspace = true ssi.workspace = true tracing.workspace = true -async-trait = "0.1" -base64 = "0.22" -futures-util = "0.3" -http = "1" -jsonwebtoken = "9.3" -reqwest = { version = "0.12", features = ["rustls-tls-manual-roots", "json"] } -rustls = { version = "0.23", default-features = false, features = [ - "aws_lc_rs", - "tls12", -] } -rustls-native-certs = "0.8" -rustls-pemfile = "2" -serde = { version = "1.0", features = ["derive", "rc"] } -serde_json = "1.0" -sha256 = "1.5" -thiserror = "1.0" -tokio = { version = "1.37.0", features = ["full"] } -tokio-stream = "0.1" -tokio-tungstenite = { version = "0.23.0", features = [ - "rustls-tls-native-roots", -] } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } -url = "2.5" -uuid = { version = "1.8.0", features = ["v4", "fast-rng"] } +reqwest.workspace = true +async-trait.workspace = true +base64.workspace = true +futures-util.workspace = true +http.workspace = true +jsonwebtoken.workspace = true +rustls.workspace = true +rustls-native-certs.workspace = true +rustls-pemfile.workspace = true +serde.workspace = true +serde_json.workspace = true +sha256.workspace = true +thiserror.workspace = true +tokio.workspace = true +tokio-stream.workspace = true +tokio-tungstenite.workspace = true +tracing-subscriber.workspace = true +url.workspace = true +uuid.workspace = true [dev-dependencies] clap.workspace = true